@drunk-pulumi/azure 0.0.29 → 0.0.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AzAd/Group.js +10 -2
- package/MySql/index.d.ts +5 -5
- package/MySql/index.js +16 -16
- package/Postgresql/index.d.ts +4 -4
- package/Postgresql/index.js +13 -13
- package/package.json +1 -1
package/AzAd/Group.js
CHANGED
|
@@ -5,6 +5,7 @@ const azuread = require("@pulumi/azuread");
|
|
|
5
5
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
6
6
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
7
7
|
const RoleAssignment_1 = require("./RoleAssignment");
|
|
8
|
+
const StackEnv_1 = require("../Common/StackEnv");
|
|
8
9
|
exports.default = async ({ name, permissions, members, owners }) => {
|
|
9
10
|
const group = new azuread.Group(name, {
|
|
10
11
|
displayName: name,
|
|
@@ -32,7 +33,14 @@ exports.default = async ({ name, permissions, members, owners }) => {
|
|
|
32
33
|
}
|
|
33
34
|
return group;
|
|
34
35
|
};
|
|
35
|
-
const getAdGroup = (displayName) =>
|
|
36
|
+
const getAdGroup = (displayName) => {
|
|
37
|
+
if (StackEnv_1.isDryRun)
|
|
38
|
+
return (0, pulumi_1.output)({
|
|
39
|
+
displayName,
|
|
40
|
+
objectId: "00000000-0000-0000-0000-000000000000",
|
|
41
|
+
});
|
|
42
|
+
return (0, pulumi_1.output)(azuread.getGroup({ displayName }));
|
|
43
|
+
};
|
|
36
44
|
exports.getAdGroup = getAdGroup;
|
|
37
45
|
const addMemberToGroup = ({ name, userName, objectId, groupObjectId, }) => {
|
|
38
46
|
if (userName && !userName.includes("@"))
|
|
@@ -67,4 +75,4 @@ const assignRolesToGroup = ({ roles, groupName, scope, }) => (0, pulumi_1.output
|
|
|
67
75
|
})));
|
|
68
76
|
});
|
|
69
77
|
exports.assignRolesToGroup = assignRolesToGroup;
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9Hcm91cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBMkM7QUFDM0MsMkNBQXVEO0FBQ3ZELGlEQUFrRDtBQUNsRCxxREFBa0Q7QUFDbEQsaURBQThDO0FBa0I5QyxrQkFBZSxLQUFLLEVBQUUsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQWdCLEVBQUUsRUFBRTtJQUM1RSxNQUFNLEtBQUssR0FBRyxJQUFJLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFO1FBQ3BDLFdBQVcsRUFBRSxJQUFJO1FBQ2pCLHNCQUFzQixFQUFFLEtBQUs7UUFDN0IsNkJBQTZCO1FBQzdCLCtCQUErQjtRQUMvQixXQUFXLEVBQUUsS0FBSztRQUNsQixlQUFlLEVBQUUsSUFBSTtRQUNyQixNQUFNO0tBQ1AsQ0FBQyxDQUFDO0lBRUgsSUFBSSxPQUFPLEVBQUUsQ0FBQztRQUNaLE9BQU8sQ0FBQyxHQUFHLENBQ1QsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FDUCxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxJQUFJLFdBQVcsQ0FBQyxFQUFFLEVBQUU7WUFDN0MsYUFBYSxFQUFFLEtBQUssQ0FBQyxFQUFFO1lBQ3ZCLGNBQWMsRUFBRSxDQUFDO1NBQ2xCLENBQUMsQ0FDTCxDQUFDO0lBQ0osQ0FBQztJQUVELElBQUksV0FBVyxFQUFFLENBQUM7UUFDaEIsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNmLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUNwQixJQUFBLCtCQUFjLEVBQUM7WUFDYixJQUFJO1lBQ0osV0FBVyxFQUFFLEtBQUssQ0FBQyxRQUFRO1lBQzNCLGFBQWEsRUFBRSxPQUFPO1lBQ3RCLFFBQVEsRUFBRSxDQUFDLENBQUMsUUFBUTtZQUNwQixLQUFLLEVBQUUsQ0FB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
|
package/MySql/index.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { BasicResourceArgs, KeyVaultInfo } from
|
|
2
|
-
import * as pulumi from
|
|
3
|
-
import * as dbformysql from
|
|
4
|
-
import * as inputs from
|
|
5
|
-
import { EnvRoleNamesType } from
|
|
1
|
+
import { BasicResourceArgs, KeyVaultInfo } from "../types";
|
|
2
|
+
import * as pulumi from "@pulumi/pulumi";
|
|
3
|
+
import * as dbformysql from "@pulumi/azure-native/dbformysql";
|
|
4
|
+
import * as inputs from "@pulumi/azure-native/types/input";
|
|
5
|
+
import { EnvRoleNamesType } from "../AzAd/EnvRoles";
|
|
6
6
|
export interface MySqlProps extends BasicResourceArgs {
|
|
7
7
|
enableEncryption?: boolean;
|
|
8
8
|
vaultInfo: KeyVaultInfo;
|
package/MySql/index.js
CHANGED
|
@@ -18,8 +18,8 @@ exports.default = ({ name, group, auth, enableEncryption, version = dbformysql.S
|
|
|
18
18
|
[Standard_B1ms, Standard_B1s, Standard_B2ms, Standard_B2s, Standard_B4ms, Standard_B8ms, Standard_D16s_v3, Standard_D2s_v3, Standard_D32s_v3, Standard_D4s_v3, Standard_D64s_v3, Standard_D8s_v3, Standard_E16s_v3, Standard_E2s_v3, Standard_E32s_v3, Standard_E4s_v3, Standard_E64s_v3, Standard_E8s_v3, Standard_M128ms, Standard_M128s, Standard_M64ms, Standard_M64s, Standard_E48s_v3, Standard_D2ds_v4, Standard_D4ds_v4, Standard_D8ds_v4, Standard_D16ds_v4, Standard_D32ds_v4, Standard_D48ds_v4, Standard_D64ds_v4, Standard_E2ds_v4, Standard_E4ds_v4, Standard_E8ds_v4, Standard_E16ds_v4, Standard_E32ds_v4, Standard_E48ds_v4, Standard_E64ds_v4, Standard_D48s_v3, Standard_E20ds_v4, Standard_M8ms, Standard_M16ms, Standard_M32ts, Standard_M32ls, Standard_M32ms, Standard_M64ls, Standard_M64, Standard_M64m, Standard_M128, Standard_M128m, Standard_B12ms, Standard_B16ms, Standard_B20ms, Standard_D2ads_v5, Standard_D4ads_v5, Standard_D8ads_v5, Standard_D16ads_v5, Standard_D32ads_v5, Standard_D48ads_v5, Standard_D64ads_v5, Standard_D96ads_v5, Standard_E2ads_v5, Standard_E4ads_v5, Standard_E8ads_v5, Standard_E16ads_v5, Standard_E20ads_v5, Standard_E32ads_v5, Standard_E48ads_v5, Standard_E64ads_v5, Standard_E96ads_v5, Standard_D2_v5, Standard_D4_v5, Standard_D8_v5, Standard_D16_v5, Standard_D32_v5, Standard_D48_v5, Standard_D64_v5, Standard_D96_v5, Standard_D2ds_v5, Standard_D4ds_v5, Standard_D8ds_v5, Standard_D16ds_v5, Standard_D32ds_v5, Standard_D48ds_v5, Standard_D64ds_v5, Standard_D96ds_v5, Standard_E2ds_v5, Standard_E4ds_v5, Standard_E8ds_v5, Standard_E16ds_v5, Standard_E20ds_v5, Standard_E32ds_v5, Standard_E48ds_v5, Standard_E64ds_v5, Standard_E96ds_v5, Standard_E104ids_v5, Standard_E2bds_v5, Standard_E4bds_v5, Standard_E8bds_v5, Standard_E16bds_v5, Standard_E32bds_v5, Standard_E48bds_v5, Standard_E64bds_v5, Standard_E112iads_v5, Standard_M32dms_v2, Standard_M64ds_v2, Standard_M64dms_v2, Standard_M128ds_v2, Standard_M128dms_v2, Standard_M192ids_v2, Standard_M192idms_v2]
|
|
19
19
|
*/
|
|
20
20
|
sku = {
|
|
21
|
-
name:
|
|
22
|
-
tier:
|
|
21
|
+
name: "Standard_B1ms",
|
|
22
|
+
tier: "Burstable",
|
|
23
23
|
}, network, databases, vaultInfo, dependsOn, lock = true, }) => {
|
|
24
24
|
name = (0, Naming_1.getMySqlName)(name);
|
|
25
25
|
const username = auth?.adminLogin ||
|
|
@@ -55,8 +55,8 @@ sku = {
|
|
|
55
55
|
version,
|
|
56
56
|
storage: {
|
|
57
57
|
storageSizeGB,
|
|
58
|
-
autoGrow: AzureEnv_1.isPrd ?
|
|
59
|
-
autoIoScaling: AzureEnv_1.isPrd ?
|
|
58
|
+
autoGrow: AzureEnv_1.isPrd ? "Enabled" : "Disabled",
|
|
59
|
+
autoIoScaling: AzureEnv_1.isPrd ? "Enabled" : "Disabled",
|
|
60
60
|
},
|
|
61
61
|
// identity: {
|
|
62
62
|
// type: dbformysql.ManagedServiceIdentityType.UserAssigned,
|
|
@@ -76,18 +76,18 @@ sku = {
|
|
|
76
76
|
//maintenanceWindow: { dayOfWeek: 6 },
|
|
77
77
|
sku,
|
|
78
78
|
backup: {
|
|
79
|
-
geoRedundantBackup: AzureEnv_1.isPrd ?
|
|
79
|
+
geoRedundantBackup: AzureEnv_1.isPrd ? "Enabled" : "Disabled",
|
|
80
80
|
backupRetentionDays: AzureEnv_1.isPrd ? 7 : 1,
|
|
81
81
|
},
|
|
82
82
|
highAvailability: {
|
|
83
|
-
mode: AzureEnv_1.isPrd ?
|
|
84
|
-
standbyAvailabilityZone:
|
|
83
|
+
mode: AzureEnv_1.isPrd ? "ZoneRedundant" : "Disabled",
|
|
84
|
+
standbyAvailabilityZone: "3",
|
|
85
85
|
},
|
|
86
|
-
availabilityZone:
|
|
86
|
+
availabilityZone: "1",
|
|
87
87
|
}, {
|
|
88
88
|
dependsOn,
|
|
89
89
|
protect: lock,
|
|
90
|
-
ignoreChanges: [
|
|
90
|
+
ignoreChanges: ["serverName", "administratorLogin", "dataEncryption"],
|
|
91
91
|
});
|
|
92
92
|
if (lock) {
|
|
93
93
|
(0, Locker_1.default)({ name, resource: mySql });
|
|
@@ -95,12 +95,12 @@ sku = {
|
|
|
95
95
|
if (auth?.enableAdAdministrator) {
|
|
96
96
|
const adminGroup = auth.envRoleNames
|
|
97
97
|
? (0, Group_1.getAdGroup)(auth.envRoleNames.admin)
|
|
98
|
-
: (0, Role_1.default)({ env: AzureEnv_1.currentEnv, roleName:
|
|
98
|
+
: (0, Role_1.default)({ env: AzureEnv_1.currentEnv, roleName: "ADMIN", appName: "MYSQL" });
|
|
99
99
|
new dbformysql.AzureADAdministrator(name, {
|
|
100
100
|
serverName: mySql.name,
|
|
101
101
|
...group,
|
|
102
102
|
login: username,
|
|
103
|
-
administratorType:
|
|
103
|
+
administratorType: "ActiveDirectory",
|
|
104
104
|
sid: adminGroup.objectId,
|
|
105
105
|
tenantId: AzureEnv_1.tenantId,
|
|
106
106
|
});
|
|
@@ -119,16 +119,16 @@ sku = {
|
|
|
119
119
|
firewallRuleName: `${name}-firewall-allowpublic`,
|
|
120
120
|
serverName: mySql.name,
|
|
121
121
|
...group,
|
|
122
|
-
startIpAddress:
|
|
123
|
-
endIpAddress:
|
|
122
|
+
startIpAddress: "0.0.0.0",
|
|
123
|
+
endIpAddress: "255.255.255.255",
|
|
124
124
|
});
|
|
125
125
|
if (network.privateLink) {
|
|
126
126
|
(0, PrivateEndpoint_1.default)({
|
|
127
127
|
name,
|
|
128
128
|
group,
|
|
129
129
|
resourceId: mySql.id,
|
|
130
|
-
privateDnsZoneName:
|
|
131
|
-
linkServiceGroupIds: [
|
|
130
|
+
privateDnsZoneName: "mysql.database.azure.com",
|
|
131
|
+
linkServiceGroupIds: ["mysql"],
|
|
132
132
|
subnetId: network.privateLink.subnetId,
|
|
133
133
|
});
|
|
134
134
|
}
|
|
@@ -156,4 +156,4 @@ sku = {
|
|
|
156
156
|
}
|
|
157
157
|
return mySql;
|
|
158
158
|
};
|
|
159
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSw2Q0FBZ0Q7QUFFaEQsOERBQThEO0FBQzlELDJDQUFnRDtBQUVoRCwyREFBMkQ7QUFDM0QsaURBQWlFO0FBQ2pFLHlDQUEyQztBQUMzQyx1Q0FBZ0M7QUFFaEMsK0NBQXNEO0FBQ3RELHVEQUFnRDtBQUNoRCxtRUFBMEU7QUFDMUUsMkNBQThDO0FBQzlDLDZEQUFzRDtBQUN0RCwyQ0FBb0M7QUE2QnBDLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLElBQUksRUFDSixnQkFBZ0IsRUFDaEIsT0FBTyxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQ3ZELGFBQWEsR0FBRyxFQUFFO0FBQ2xCOztHQUVHO0FBQ0gsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGVBQWU7SUFDckIsSUFBSSxFQUFFLFdBQVc7Q0FDbEIsRUFDRCxPQUFPLEVBQ1AsU0FBUyxFQUNULFNBQVMsRUFDVCxTQUFTLEVBQ1QsSUFBSSxHQUFHLElBQUksR0FDQSxFQUFFLEVBQUU7SUFDZixJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxVQUFVO1FBQ2hCLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7WUFDckIsT0FBTyxFQUFFLEtBQUs7WUFDZCxNQUFNLEVBQUUsQ0FBQztZQUNULEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXRDLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxRQUFRO1FBQ2QsSUFBQSx1QkFBYyxFQUFDO1lBQ2IsSUFBSTtZ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
|
package/Postgresql/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { BasicResourceArgs, KeyVaultInfo } from
|
|
2
|
-
import * as pulumi from
|
|
3
|
-
import * as azure from
|
|
4
|
-
import * as inputs from
|
|
1
|
+
import { BasicResourceArgs, KeyVaultInfo } from "../types";
|
|
2
|
+
import * as pulumi from "@pulumi/pulumi";
|
|
3
|
+
import * as azure from "@pulumi/azure-native";
|
|
4
|
+
import * as inputs from "@pulumi/azure-native/types/input";
|
|
5
5
|
export interface PostgresProps extends BasicResourceArgs {
|
|
6
6
|
sku?: pulumi.Input<inputs.dbforpostgresql.SkuArgs>;
|
|
7
7
|
vaultInfo?: KeyVaultInfo;
|
package/Postgresql/index.js
CHANGED
|
@@ -15,8 +15,8 @@ version = azure.dbforpostgresql.ServerVersion.ServerVersion_14, storageSizeGB =
|
|
|
15
15
|
[Standard_B1ms, Standard_B1s, Standard_B2ms, Standard_B2s, Standard_B4ms, Standard_B8ms, Standard_D16s_v3, Standard_D2s_v3, Standard_D32s_v3, Standard_D4s_v3, Standard_D64s_v3, Standard_D8s_v3, Standard_E16s_v3, Standard_E2s_v3, Standard_E32s_v3, Standard_E4s_v3, Standard_E64s_v3, Standard_E8s_v3, Standard_M128ms, Standard_M128s, Standard_M64ms, Standard_M64s, Standard_E48s_v3, Standard_D2ds_v4, Standard_D4ds_v4, Standard_D8ds_v4, Standard_D16ds_v4, Standard_D32ds_v4, Standard_D48ds_v4, Standard_D64ds_v4, Standard_E2ds_v4, Standard_E4ds_v4, Standard_E8ds_v4, Standard_E16ds_v4, Standard_E32ds_v4, Standard_E48ds_v4, Standard_E64ds_v4, Standard_D48s_v3, Standard_E20ds_v4, Standard_M8ms, Standard_M16ms, Standard_M32ts, Standard_M32ls, Standard_M32ms, Standard_M64ls, Standard_M64, Standard_M64m, Standard_M128, Standard_M128m, Standard_B12ms, Standard_B16ms, Standard_B20ms, Standard_D2ads_v5, Standard_D4ads_v5, Standard_D8ads_v5, Standard_D16ads_v5, Standard_D32ads_v5, Standard_D48ads_v5, Standard_D64ads_v5, Standard_D96ads_v5, Standard_E2ads_v5, Standard_E4ads_v5, Standard_E8ads_v5, Standard_E16ads_v5, Standard_E20ads_v5, Standard_E32ads_v5, Standard_E48ads_v5, Standard_E64ads_v5, Standard_E96ads_v5, Standard_D2_v5, Standard_D4_v5, Standard_D8_v5, Standard_D16_v5, Standard_D32_v5, Standard_D48_v5, Standard_D64_v5, Standard_D96_v5, Standard_D2ds_v5, Standard_D4ds_v5, Standard_D8ds_v5, Standard_D16ds_v5, Standard_D32ds_v5, Standard_D48ds_v5, Standard_D64ds_v5, Standard_D96ds_v5, Standard_E2ds_v5, Standard_E4ds_v5, Standard_E8ds_v5, Standard_E16ds_v5, Standard_E20ds_v5, Standard_E32ds_v5, Standard_E48ds_v5, Standard_E64ds_v5, Standard_E96ds_v5, Standard_E104ids_v5, Standard_E2bds_v5, Standard_E4bds_v5, Standard_E8bds_v5, Standard_E16bds_v5, Standard_E32bds_v5, Standard_E48bds_v5, Standard_E64bds_v5, Standard_E112iads_v5, Standard_M32dms_v2, Standard_M64ds_v2, Standard_M64dms_v2, Standard_M128ds_v2, Standard_M128dms_v2, Standard_M192ids_v2, Standard_M192idms_v2]
|
|
16
16
|
*/
|
|
17
17
|
sku = {
|
|
18
|
-
name:
|
|
19
|
-
tier:
|
|
18
|
+
name: "Standard_B1ms",
|
|
19
|
+
tier: "Burstable",
|
|
20
20
|
}, network, databases, vaultInfo, dependsOn, lock = true, }) => {
|
|
21
21
|
name = (0, Naming_1.getPostgresqlName)(name);
|
|
22
22
|
const username = new random_1.RandomString(name, {
|
|
@@ -36,26 +36,26 @@ sku = {
|
|
|
36
36
|
version,
|
|
37
37
|
storage: { storageSizeGB },
|
|
38
38
|
authConfig: {
|
|
39
|
-
passwordAuth:
|
|
40
|
-
activeDirectoryAuth:
|
|
39
|
+
passwordAuth: "Enabled",
|
|
40
|
+
activeDirectoryAuth: "Enabled",
|
|
41
41
|
tenantId: AzureEnv_1.tenantId,
|
|
42
42
|
},
|
|
43
43
|
administratorLogin: username,
|
|
44
44
|
administratorLoginPassword: password,
|
|
45
|
-
dataEncryption: { type:
|
|
45
|
+
dataEncryption: { type: "SystemManaged" },
|
|
46
46
|
//maintenanceWindow: { dayOfWeek: 6 },
|
|
47
47
|
sku,
|
|
48
48
|
//network: {},
|
|
49
49
|
backup: {
|
|
50
|
-
geoRedundantBackup: AzureEnv_1.isPrd ?
|
|
50
|
+
geoRedundantBackup: AzureEnv_1.isPrd ? "Enabled" : "Disabled",
|
|
51
51
|
backupRetentionDays: 7,
|
|
52
52
|
},
|
|
53
|
-
highAvailability: { mode: AzureEnv_1.isPrd ?
|
|
53
|
+
highAvailability: { mode: AzureEnv_1.isPrd ? "ZoneRedundant" : "Disabled" },
|
|
54
54
|
//availabilityZone: isPrd ? 3 : 1,
|
|
55
55
|
}, {
|
|
56
56
|
dependsOn,
|
|
57
57
|
protect: lock,
|
|
58
|
-
ignoreChanges: [
|
|
58
|
+
ignoreChanges: ["serverName", "administratorLogin", "dataEncryption"],
|
|
59
59
|
});
|
|
60
60
|
if (lock) {
|
|
61
61
|
(0, Locker_1.default)({ name, resource: postgres });
|
|
@@ -74,16 +74,16 @@ sku = {
|
|
|
74
74
|
firewallRuleName: `${name}-firewall-allowpublic`,
|
|
75
75
|
serverName: postgres.name,
|
|
76
76
|
...group,
|
|
77
|
-
startIpAddress:
|
|
78
|
-
endIpAddress:
|
|
77
|
+
startIpAddress: "0.0.0.0",
|
|
78
|
+
endIpAddress: "255.255.255.255",
|
|
79
79
|
});
|
|
80
80
|
if (network.privateLink) {
|
|
81
81
|
(0, PrivateEndpoint_1.default)({
|
|
82
82
|
name,
|
|
83
83
|
group,
|
|
84
84
|
resourceId: postgres.id,
|
|
85
|
-
privateDnsZoneName:
|
|
86
|
-
linkServiceGroupIds: [
|
|
85
|
+
privateDnsZoneName: "postgres.database.azure.com",
|
|
86
|
+
linkServiceGroupIds: ["postgresql"],
|
|
87
87
|
subnetId: network.privateLink.subnetId,
|
|
88
88
|
});
|
|
89
89
|
}
|
|
@@ -111,4 +111,4 @@ sku = {
|
|
|
111
111
|
}
|
|
112
112
|
return postgres;
|
|
113
113
|
};
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUG9zdGdyZXNxbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDZDQUFxRDtBQUVyRCw4Q0FBOEM7QUFDOUMsaURBQXFEO0FBQ3JELDJDQUFnRDtBQUVoRCwyREFBMkQ7QUFDM0QsMkNBQThDO0FBQzlDLDZEQUFzRDtBQUN0RCwyQ0FBb0M7QUF5QnBDLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSztBQUNMLE9BQU87QUFDUCxPQUFPLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQzlELGFBQWEsR0FBRyxHQUFHO0FBQ25COztHQUVHO0FBQ0gsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGVBQWU7SUFDckIsSUFBSSxFQUFFLFdBQVc7Q0FDbEIsRUFDRCxPQUFPLEVBQ1AsU0FBUyxFQUNULFNBQVMsRUFDVCxTQUFTLEVBQ1QsSUFBSSxHQUFHLElBQUksR0FDRyxFQUFFLEVBQUU7SUFDbEIsSUFBSSxHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFL0IsTUFBTSxRQUFRLEdBQUcsSUFBSSxxQkFBWSxDQUFDLElBQUksRUFBRTtRQUN0QyxPQUFPLEVBQUUsS0FBSztRQUNkLE1BQU0sRUFBRSxDQUFDO1FBQ1QsS0FBSyxFQUFFLElBQUk7UUFDWCxLQUFLLEVBQUUsS0FBSztLQUNiLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDdkMsTUFBTSxRQUFRLEdBQUcsSUFBQSx1QkFBYyxFQUFDO1FBQzlCLElBQUk7UUFDSixNQUFNLEVBQUUsRUFBRTtRQUNWLE9BQU8sRUFBRSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUU7S0FDNUIsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUVWLE1BQU0sUUFBUSxH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
|