@drunk-pulumi/azure 1.0.13 → 1.0.15
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/Aks/index.d.ts +2 -2
- package/Apim/ApiProduct/SwaggerHelper.js +4 -4
- package/Automation/index.d.ts +1 -1
- package/Automation/index.js +8 -26
- package/AzAd/Identities/EnvUID.js +2 -2
- package/Builder/AksBuilder.js +1 -1
- package/Builder/ResourceBuilder.js +5 -5
- package/Builder/SqlBuilder.js +15 -10
- package/Builder/types/genericBuilder.d.ts +4 -1
- package/Builder/types/resourceBuilder.d.ts +2 -3
- package/Builder/types/sqlBuilder.d.ts +8 -9
- package/Common/Location.js +12 -12
- package/Core/KeyGenerators.js +4 -6
- package/KeyVault/Helper.d.ts +5 -24
- package/KeyVault/Helper.js +27 -80
- package/MySql/index.js +2 -2
- package/Postgresql/index.js +2 -2
- package/Sql/SqlDb.d.ts +2 -2
- package/Sql/SqlDb.js +1 -1
- package/Sql/index.d.ts +4 -3
- package/Sql/index.js +48 -37
- package/Storage/index.d.ts +3 -2
- package/Storage/index.js +20 -11
- package/VM/DiskEncryptionSet.js +2 -2
- package/VM/index.js +2 -2
- package/VNet/PrivateEndpoint.d.ts +1 -1
- package/VNet/PrivateEndpoint.js +9 -2
- package/package.json +3 -3
- package/types.d.ts +4 -3
package/Storage/index.js
CHANGED
|
@@ -35,15 +35,16 @@ const Locker_1 = require("../Core/Locker");
|
|
|
35
35
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
36
36
|
const ManagementRules_1 = require("./ManagementRules");
|
|
37
37
|
/** Storage Creator */
|
|
38
|
-
function Storage({ name, group, vaultInfo, enableEncryption, envRoles, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, dependsOn, ignoreChanges, }) {
|
|
38
|
+
function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInfo, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, dependsOn, ignoreChanges, }) {
|
|
39
39
|
name = (0, Common_2.getStorageName)(name);
|
|
40
40
|
const primaryKeyName = (0, Common_2.getKeyName)(name, 'primary');
|
|
41
41
|
const secondaryKeyName = (0, Common_2.getKeyName)(name, 'secondary');
|
|
42
42
|
const primaryConnectionKeyName = (0, Common_2.getConnectionName)(name, 'primary');
|
|
43
43
|
const secondConnectionKeyName = (0, Common_2.getConnectionName)(name, 'secondary');
|
|
44
44
|
const encryptionKey = enableEncryption
|
|
45
|
-
? (0, Helper_1.addEncryptKey)(
|
|
45
|
+
? (0, Helper_1.addEncryptKey)(name, vaultInfo)
|
|
46
46
|
: undefined;
|
|
47
|
+
const allowSharedKeyAccess = features.allowSharedKeyAccess || features.enableStaticWebsite;
|
|
47
48
|
//To fix identity issue then using this approach https://github.com/pulumi/pulumi-azure-native/blob/master/examples/keyvault/index.ts
|
|
48
49
|
const stg = new storage.StorageAccount(name, {
|
|
49
50
|
accountName: name,
|
|
@@ -58,12 +59,17 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
58
59
|
isHnsEnabled: true,
|
|
59
60
|
enableHttpsTrafficOnly: true,
|
|
60
61
|
allowBlobPublicAccess: Boolean(policies?.allowBlobPublicAccess),
|
|
61
|
-
allowSharedKeyAccess
|
|
62
|
+
allowSharedKeyAccess,
|
|
62
63
|
allowedCopyScope: network?.privateEndpoint ? 'PrivateLink' : 'AAD',
|
|
63
64
|
defaultToOAuthAuthentication: !Boolean(features.allowSharedKeyAccess),
|
|
64
65
|
isSftpEnabled: Boolean(features.isSftpEnabled),
|
|
65
66
|
allowCrossTenantReplication: Boolean(features.allowCrossTenantReplication),
|
|
66
|
-
identity: {
|
|
67
|
+
identity: {
|
|
68
|
+
type: envUIDInfo
|
|
69
|
+
? storage.IdentityType.SystemAssigned_UserAssigned
|
|
70
|
+
: storage.IdentityType.SystemAssigned,
|
|
71
|
+
userAssignedIdentities: envUIDInfo ? [envUIDInfo.id] : undefined,
|
|
72
|
+
},
|
|
67
73
|
minimumTlsVersion: 'TLS1_2',
|
|
68
74
|
//1 Year Months
|
|
69
75
|
keyPolicy: {
|
|
@@ -112,13 +118,16 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
112
118
|
},
|
|
113
119
|
}, { dependsOn, ignoreChanges });
|
|
114
120
|
if (network?.privateEndpoint) {
|
|
121
|
+
const linkTypes = Array.isArray(network.privateEndpoint.type)
|
|
122
|
+
? network.privateEndpoint.type
|
|
123
|
+
: [network.privateEndpoint.type];
|
|
115
124
|
//Create Private Endpoints
|
|
116
|
-
(0, PrivateEndpoint_1.default)({
|
|
125
|
+
linkTypes.map((type) => (0, PrivateEndpoint_1.default)({
|
|
117
126
|
...network.privateEndpoint,
|
|
118
127
|
resourceInfo: { name, group, id: stg.id },
|
|
119
|
-
privateDnsZoneName: `privatelink.${
|
|
120
|
-
linkServiceGroupIds: [
|
|
121
|
-
});
|
|
128
|
+
privateDnsZoneName: `privatelink.${type}.core.windows.net`,
|
|
129
|
+
linkServiceGroupIds: [type],
|
|
130
|
+
}));
|
|
122
131
|
}
|
|
123
132
|
//Life Cycle Management
|
|
124
133
|
if (policies?.defaultManagementRules) {
|
|
@@ -184,9 +193,9 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
184
193
|
return;
|
|
185
194
|
//Allows to Read Key Vault
|
|
186
195
|
if (envRoles)
|
|
187
|
-
envRoles.
|
|
196
|
+
envRoles.addIdentity('readOnly', stg.identity);
|
|
188
197
|
//Add connection into Key vault
|
|
189
|
-
if (vaultInfo &&
|
|
198
|
+
if (vaultInfo && allowSharedKeyAccess) {
|
|
190
199
|
const keys = (await storage.listStorageAccountKeys({
|
|
191
200
|
accountName: name,
|
|
192
201
|
resourceGroupName: group.resourceGroupName,
|
|
@@ -232,4 +241,4 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, container
|
|
|
232
241
|
};
|
|
233
242
|
}
|
|
234
243
|
exports.default = Storage;
|
|
235
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
244
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
|
package/VM/DiskEncryptionSet.js
CHANGED
|
@@ -30,7 +30,7 @@ exports.default = ({ name, group, vaultInfo, envUIDInfo, envRoles, dependsOn, ig
|
|
|
30
30
|
if (!envUIDInfo || !vaultInfo)
|
|
31
31
|
throw new Error('The "vaultInfo" and "envUIDInfo" are required for DiskEncryptionSet.');
|
|
32
32
|
name = (0, Common_1.getDiskEncryptionName)(name);
|
|
33
|
-
const keyEncryption = (0, Helper_1.addEncryptKey)(
|
|
33
|
+
const keyEncryption = (0, Helper_1.addEncryptKey)(name, vaultInfo);
|
|
34
34
|
const diskEncrypt = new compute.DiskEncryptionSet(name, {
|
|
35
35
|
...group,
|
|
36
36
|
diskEncryptionSetName: name,
|
|
@@ -52,4 +52,4 @@ exports.default = ({ name, group, vaultInfo, envUIDInfo, envRoles, dependsOn, ig
|
|
|
52
52
|
});
|
|
53
53
|
return { name, group, id: diskEncrypt.id, instance: diskEncrypt };
|
|
54
54
|
};
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlza0VuY3J5cHRpb25TZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vRGlza0VuY3J5cHRpb25TZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUN4RCxzQ0FBa0Q7QUFDbEQsK0NBQW1EO0FBV25ELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxVQUFVLEVBQ1YsUUFBUSxFQUNSLFNBQVMsRUFDVCxhQUFhLEdBQUcsRUFBRSxFQUNsQixTQUFTLEdBQ1csRUFBdUQsRUFBRTtJQUM3RSxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsU0FBUztRQUMzQixNQUFNLElBQUksS0FBSyxDQUNiLHVFQUF1RSxDQUN4RSxDQUFDO0lBRUosSUFBSSxHQUFHLElBQUEsOEJBQXFCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDbkMsTUFBTSxhQUFhLEdBQUcsSUFBQSxzQkFBYSxFQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNyRCxNQUFNLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxpQkFBaUIsQ0FDL0MsSUFBSSxFQUNKO1FBQ0UsR0FBRyxLQUFLO1FBQ1IscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixpQ0FBaUMsRUFBRSxJQUFJO1FBQ3ZDLGNBQWMsRUFBRSxpQ0FBaUM7UUFDakQsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQywyQkFBMkI7WUFDOUQsc0JBQXNCLEVBQUUsQ0FBQyxVQUFXLENBQUMsRUFBRSxDQUFDO1NBQ3pDO1FBQ0QsU0FBUyxFQUFFLEVBQUUsTUFBTSxFQUFFLGFBQWEsQ0FBQyxHQUFHLEVBQUU7S0FDekMsRUFDRDtRQUNFLFNBQVM7UUFDVCxhQUFhLEVBQUUsQ0FBQyxHQUFHLGFBQWEsRUFBRSx1QkFBdUIsQ0FBQztRQUMxRCxNQUFNLEVBQUUsU0FBUztLQUNsQixDQUNGLENBQUM7SUFFRixXQUFXLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQy9CLElBQUksQ0FBQztZQUFFLFFBQVEsRUFBRSxTQUFTLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUN4RCxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxXQUFXLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsQ0FBQztBQUNwRSxDQUFDLENBQUMifQ==
|
package/VM/index.js
CHANGED
|
@@ -50,7 +50,7 @@ vaultInfo, envUIDInfo, schedule = { timeZone: 'Singapore Standard Time' }, login
|
|
|
50
50
|
});
|
|
51
51
|
//All VM will use the same Key
|
|
52
52
|
const keyEncryption = enableEncryption && vaultInfo && !diskEncryptionSetId
|
|
53
|
-
? (0, Helper_1.addEncryptKey)(
|
|
53
|
+
? (0, Helper_1.addEncryptKey)(vmName, vaultInfo)
|
|
54
54
|
: undefined;
|
|
55
55
|
const diskEncryption = enableEncryption && vaultInfo && !diskEncryptionSetId
|
|
56
56
|
? (0, CustomHelper_1.addCustomSecret)({
|
|
@@ -234,4 +234,4 @@ vaultInfo, envUIDInfo, schedule = { timeZone: 'Singapore Standard Time' }, login
|
|
|
234
234
|
// }
|
|
235
235
|
return vm;
|
|
236
236
|
};
|
|
237
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
237
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLHNFQUF3RDtBQUN4RCxzRUFBd0Q7QUFDeEQsc0NBQWtEO0FBQ2xELDJDQUF3QztBQUN4QywyQ0FBZ0Q7QUFDaEQsMkRBQTJEO0FBQzNELCtDQUFtRDtBQU1uRCxzRUFBOEM7QUFDOUMsNERBQTBEO0FBc0MxRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxRQUFRLEVBQ1IsTUFBTSxHQUFHLFNBQVMsRUFDbEIsTUFBTSxHQUFHLGNBQWMsRUFDdkIsVUFBVSxFQUNWLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxXQUFXLEVBQzVELFlBQVksR0FBRyxHQUFHLEVBQ2xCLGNBQWMsRUFDZCxnQkFBZ0IsRUFDaEIsbUJBQW1CO0FBQ25CLG1CQUFtQjtBQUNuQixTQUFTLEVBQ1QsVUFBVSxFQUNWLFFBQVEsR0FBRyxFQUFFLFFBQVEsRUFBRSx5QkFBeUIsRUFBRSxFQUNsRCxLQUFLLEVBQ0wsS0FBSyxFQUNMLElBQUksR0FBRyxJQUFJLEVBQ1gsSUFBSSxHQUFHLEVBQUUsRUFDVCxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0gsRUFBRSxFQUFFO0lBQ1YsTUFBTSxNQUFNLEdBQUcsSUFBQSxrQkFBUyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9CLE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVqQyxNQUFNLEdBQUcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUU7UUFDaEQsb0JBQW9CLEVBQUUsT0FBTztRQUM3QixHQUFHLEtBQUs7UUFDUixnQkFBZ0IsRUFBRTtZQUNoQixFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFF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
|
|
@@ -5,7 +5,7 @@ export type PrivateEndpointProps = Omit<PrivateLinkPropsType, 'type'> & Pick<Opt
|
|
|
5
5
|
privateDnsZoneName: string;
|
|
6
6
|
linkServiceGroupIds: string[];
|
|
7
7
|
};
|
|
8
|
-
declare const _default: ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }: PrivateEndpointProps) => import("@pulumi/pulumi").Output<{
|
|
8
|
+
declare const _default: ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, privateIpAddress, dependsOn, }: PrivateEndpointProps) => import("@pulumi/pulumi").Output<{
|
|
9
9
|
instance: import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint;
|
|
10
10
|
ipAddresses: import("@pulumi/pulumi").Output<string[]>;
|
|
11
11
|
}[]>;
|
package/VNet/PrivateEndpoint.js
CHANGED
|
@@ -27,7 +27,7 @@ const network = __importStar(require("@pulumi/azure-native/network"));
|
|
|
27
27
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
28
28
|
const Common_1 = require("../Common");
|
|
29
29
|
const Builder_1 = require("../Builder");
|
|
30
|
-
exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }) => {
|
|
30
|
+
exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, privateIpAddress, dependsOn, }) => {
|
|
31
31
|
const name = (0, Common_1.getPrivateEndpointName)(resourceInfo.name);
|
|
32
32
|
const endpoints = (0, pulumi_1.output)(subnetIds).apply((ss) => ss.map((s) => {
|
|
33
33
|
const n = Common_1.rsInfo.getNameFromId(s);
|
|
@@ -35,6 +35,13 @@ exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName,
|
|
|
35
35
|
...resourceInfo.group,
|
|
36
36
|
privateEndpointName: `${name}-${n}`,
|
|
37
37
|
subnet: { id: s },
|
|
38
|
+
customDnsConfigs: privateIpAddress
|
|
39
|
+
? [
|
|
40
|
+
{
|
|
41
|
+
ipAddresses: [privateIpAddress],
|
|
42
|
+
},
|
|
43
|
+
]
|
|
44
|
+
: undefined,
|
|
38
45
|
privateLinkServiceConnections: [
|
|
39
46
|
{
|
|
40
47
|
groupIds: linkServiceGroupIds,
|
|
@@ -60,4 +67,4 @@ exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName,
|
|
|
60
67
|
.build());
|
|
61
68
|
return endpoints;
|
|
62
69
|
};
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsMkNBQXdDO0FBRXhDLHNDQUEyRDtBQUMzRCx3Q0FBbUQ7QUFVbkQsa0JBQWUsQ0FBQyxFQUNkLFlBQVksRUFDWixTQUFTLEVBQ1QsWUFBWSxFQUNaLGtCQUFrQixFQUNsQixtQkFBbUIsRUFDbkIsZ0JBQWdCLEVBQ2hCLFNBQVMsR0FDWSxFQUFFLEVBQUU7SUFDekIsTUFBTSxJQUFJLEdBQUcsSUFBQSwrQkFBc0IsRUFBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdkQsTUFBTSxTQUFTLEdBQUcsSUFBQSxlQUFNLEVBQUMsU0FBUyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FDL0MsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ1gsTUFBTSxDQUFDLEdBQUcsZUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNsQyxNQUFNLEVBQUUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQ3BDLEdBQUcsSUFBSSxJQUFJLENBQUMsRUFBRSxFQUNkO1lBQ0UsR0FBRyxZQUFZLENBQUMsS0FBSztZQUNyQixtQkFBbUIsRUFBRSxHQUFHLElBQUksSUFBSSxDQUFDLEVBQUU7WUFDbkMsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRTtZQUNqQixnQkFBZ0IsRUFBRSxnQkFBZ0I7Z0JBQ2hDLENBQUMsQ0FBQztvQkFDRTt3QkFDRSxXQUFXLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQztxQkFDaEM7aUJBQ0Y7Z0JBQ0gsQ0FBQyxDQUFDLFNBQVM7WUFDYiw2QkFBNkIsRUFBRTtnQkFDN0I7b0JBQ0UsUUFBUSxFQUFFLG1CQUFtQjtvQkFDN0IsSUFBSSxFQUFFLEdBQUcsSUFBSSxPQUFPO29CQUNwQixvQkFBb0IsRUFBRSxZQUFZLENBQUMsRUFBRTtpQkFDdEM7YUFDRjtTQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsQ0FDZCxDQUFDO1FBRUYsT0FBTztZQUNMLFFBQVEsRUFBRSxFQUFFO1lBQ1osV0FBVyxFQUFFLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUMzQyxDQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFFLENBQUMsV0FBWSxDQUFDLENBQ25DO1NBQ0YsQ0FBQztJQUNKLENBQUMsQ0FBQyxDQUNILENBQUM7SUFFRixrQkFBa0I7SUFDbEIsTUFBTSxXQUFXLEdBQUcsSUFBQSxlQUFNLEVBQUMsU0FBUyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDaEQsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFdBQVksQ0FBQyxDQUNqQyxDQUFDO0lBRUYsSUFBQSxlQUFNLEVBQUMsV0FBVyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FDL0IsSUFBQSwrQkFBcUIsRUFBQztRQUNwQixJQUFJLEVBQUUsR0FBRyxZQUFhLENBQUMsSUFBSSxJQUFJLGtCQUFrQixFQUFFO1FBQ25ELEtBQUssRUFBRSxZQUFhLENBQUMsS0FBSztRQUMxQixTQUFTO0tBQ1YsQ0FBQztTQUNDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxDQUFDO1NBQ2pELE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLENBQUM7U0FDNUMsS0FBSyxFQUFFLENBQ1gsQ0FBQztJQUVGLE9BQU8sU0FBUyxDQUFDO0FBQ25CLENBQUMsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@drunk-pulumi/azure",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.15",
|
|
4
4
|
"author": "drunkcoding@outlook.com",
|
|
5
5
|
"description": "The custom helpers pulumi-azure",
|
|
6
6
|
"license": "MIT",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"url": "https://github.com/baoduy/drunk-pulumi-azure.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@drunk-pulumi/azure-providers": "^1.0.
|
|
21
|
-
"@pulumi/azure-native": "^2.
|
|
20
|
+
"@drunk-pulumi/azure-providers": "^1.0.5",
|
|
21
|
+
"@pulumi/azure-native": "^2.55.0",
|
|
22
22
|
"@pulumi/azuread": "5.53.3",
|
|
23
23
|
"@pulumi/pulumi": "^3.128.0",
|
|
24
24
|
"@pulumi/random": "^4.16.3",
|
package/types.d.ts
CHANGED
|
@@ -11,9 +11,6 @@ export declare namespace NodeJS {
|
|
|
11
11
|
/** Omit all the key of OT from T */
|
|
12
12
|
export type TypeOmit<T, OT> = Omit<T, keyof OT>;
|
|
13
13
|
export type OmitOpts<T> = TypeOmit<T, OptsArgs>;
|
|
14
|
-
export type LockableType = {
|
|
15
|
-
lock?: boolean;
|
|
16
|
-
};
|
|
17
14
|
export type ResourceGroupInfo = {
|
|
18
15
|
resourceGroupName: string;
|
|
19
16
|
location?: Input<string>;
|
|
@@ -21,6 +18,9 @@ export type ResourceGroupInfo = {
|
|
|
21
18
|
export type ResourceGroupWithIdInfo = ResourceGroupInfo & {
|
|
22
19
|
id: Input<string>;
|
|
23
20
|
};
|
|
21
|
+
export type WithLockable = {
|
|
22
|
+
lock?: boolean;
|
|
23
|
+
};
|
|
24
24
|
export type WithDependsOn = {
|
|
25
25
|
dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
|
|
26
26
|
};
|
|
@@ -123,6 +123,7 @@ export interface BasicResourceInfoWithInstance<InstanceType> extends WithInstanc
|
|
|
123
123
|
export interface ResourceInfoWithInstance<InstanceType> extends WithInstance<InstanceType>, ResourceInfo {
|
|
124
124
|
}
|
|
125
125
|
export type PrivateLinkPropsType = {
|
|
126
|
+
privateIpAddress?: Input<string>;
|
|
126
127
|
/** The Subnet that private links will be created.*/
|
|
127
128
|
subnetIds: Input<string>[];
|
|
128
129
|
/** The extra Vnet that Private DNS Zone will be linked.*/
|