@drunk-pulumi/azure 1.0.20 → 1.0.22
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/Helper.js +7 -6
- package/Aks/index.js +2 -2
- package/Apps/LogicApp.js +2 -2
- package/Automation/index.js +2 -2
- package/AzAd/B2C.d.ts +2 -2
- package/AzAd/B2C.js +13 -14
- package/AzAd/EnvRoles.Consts.d.ts +2 -1
- package/AzAd/EnvRoles.Consts.js +8 -2
- package/AzAd/EnvRoles.js +3 -3
- package/AzAd/Helper.js +8 -8
- package/AzAd/Identity.js +3 -2
- package/AzAd/UserAssignedIdentity.js +2 -2
- package/Builder/ApimBuilder.js +2 -2
- package/Builder/ApimProductBuilder.js +3 -4
- package/Builder/ResourceBuilder.js +42 -20
- package/Builder/ServiceBusBuilder.d.ts +3 -0
- package/Builder/ServiceBusBuilder.js +330 -0
- package/Builder/StorageBuilder.js +3 -3
- package/Builder/VdiBuilder.js +2 -2
- package/Builder/index.d.ts +1 -0
- package/Builder/index.js +4 -2
- package/Builder/types/index.d.ts +1 -0
- package/Builder/types/index.js +2 -1
- package/Builder/types/serviceBusBuilder.d.ts +23 -0
- package/Builder/types/serviceBusBuilder.js +3 -0
- package/Builder/types/storageBuilder.d.ts +3 -4
- package/Cdn/CdnEndpoint.js +2 -2
- package/Cdn/index.js +2 -2
- package/Common/AzureEnv.js +1 -1
- package/Common/GlobalEnv.js +6 -3
- package/Common/Naming/Rulers.d.ts +288 -0
- package/Common/Naming/Rulers.js +537 -0
- package/Common/Naming/index.d.ts +10 -0
- package/Common/Naming/index.js +112 -0
- package/Common/RsInfo/Helper.d.ts +3 -3
- package/Common/RsInfo/Helper.js +12 -34
- package/Common/RsInfo/index.d.ts +24 -24
- package/Common/RsInfo/index.js +14 -14
- package/Common/index.d.ts +1 -4
- package/Common/index.js +7 -6
- package/ContainerRegistry/Helper.js +2 -2
- package/ContainerRegistry/index.js +2 -2
- package/Core/KeyGenerators.js +2 -2
- package/Core/Random.d.ts +1 -0
- package/Core/Random.js +9 -4
- package/CosmosDb/index.js +2 -2
- package/IOT/Hub/index.js +3 -3
- package/KeyVault/CustomHelper.js +4 -3
- package/KeyVault/Helper.d.ts +3 -0
- package/KeyVault/Helper.js +29 -4
- package/KeyVault/index.js +2 -2
- package/Logs/AppInsight.js +2 -2
- package/Logs/Helpers.js +7 -4
- package/Logs/LogAnalytics.js +2 -2
- package/Logs/WebTest.js +3 -3
- package/Logs/index.d.ts +1 -1
- package/MySql/index.js +2 -2
- package/Postgresql/index.js +2 -2
- package/RedisCache/index.js +3 -4
- package/SignalR/index.js +3 -3
- package/Sql/Helper.js +3 -3
- package/Sql/SqlDb.js +2 -2
- package/Sql/index.js +3 -4
- package/Storage/Helper.js +6 -6
- package/Storage/ManagementRules.d.ts +2 -2
- package/Storage/ManagementRules.js +4 -4
- package/Storage/index.d.ts +4 -8
- package/Storage/index.js +50 -18
- package/VM/DiskEncryptionSet.js +2 -2
- package/VM/index.js +3 -3
- package/VNet/Bastion.js +2 -2
- package/VNet/Firewall.d.ts +2 -2
- package/VNet/Firewall.js +4 -4
- package/VNet/FirewallPolicy.js +2 -2
- package/VNet/GlobalNetworkPeering.js +4 -4
- package/VNet/IpAddress.js +1 -1
- package/VNet/IpAddressPrefix.js +2 -2
- package/VNet/NSGRules/ApimSecurityRule.d.ts +1 -1
- package/VNet/NSGRules/ApimSecurityRule.js +20 -20
- package/VNet/NatGateway.d.ts +2 -2
- package/VNet/NatGateway.js +3 -3
- package/VNet/NetworkPeering.js +1 -1
- package/VNet/PrivateEndpoint.js +2 -2
- package/VNet/RouteTable.js +4 -5
- package/VNet/SecurityGroup.d.ts +3 -3
- package/VNet/SecurityGroup.js +3 -3
- package/VNet/VPNGateway.js +2 -2
- package/VNet/Vnet.js +2 -2
- package/Web/AppCertOrder.js +2 -2
- package/Web/AppConfig.js +2 -2
- package/Web/AppGateway.js +2 -2
- package/package.json +3 -3
- package/types.d.ts +18 -1
- package/Common/Naming.d.ts +0 -68
- package/Common/Naming.js +0 -190
- package/Common/ResourceEnv.d.ts +0 -2
- package/Common/ResourceEnv.js +0 -65
- package/Core/ResourceGroup.d.ts +0 -18
- package/Core/ResourceGroup.js +0 -36
- package/ServiceBus/ServiceBusHelper.d.ts +0 -21
- package/ServiceBus/ServiceBusHelper.js +0 -35
- package/ServiceBus/index.d.ts +0 -88
- package/ServiceBus/index.js +0 -405
- package/Web/FuncApp.d.ts +0 -11
- package/Web/FuncApp.js +0 -41
- package/Web/WebAppPlan.d.ts +0 -6
- package/Web/WebAppPlan.js +0 -45
- package/z_tests/_tools/Mocks.d.ts +0 -2
- package/z_tests/_tools/Mocks.js +0 -69
package/KeyVault/Helper.js
CHANGED
|
@@ -3,11 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getSecrets = exports.getSecret = exports.addEncryptKey = void 0;
|
|
6
|
+
exports.getSecrets = exports.getSecret = exports.addEncryptKey = exports.getVaultItemName = void 0;
|
|
7
7
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
8
|
-
const Common_1 = require("../Common");
|
|
9
8
|
const KeyVaultBase_1 = __importDefault(require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase"));
|
|
10
9
|
const azure_providers_1 = require("@drunk-pulumi/azure-providers");
|
|
10
|
+
const Common_1 = require("../Common");
|
|
11
|
+
/** Get Vault Secret Name. Remove the stack name and replace all _ with - then lower cases. */
|
|
12
|
+
const getVaultItemName = (name, currentStack = Common_1.stack) => {
|
|
13
|
+
name = name
|
|
14
|
+
.replace(new RegExp(currentStack, 'g'), '') // Replace occurrences of "stack" variable with "-"
|
|
15
|
+
.replace(/\.|_|\s/g, '-') // Replace ".", "_", and spaces with "-"
|
|
16
|
+
.replace(/-+/g, '-') // Replace multiple dashes with a single dash
|
|
17
|
+
.toLowerCase(); // Convert the result to lowercase
|
|
18
|
+
return (0, Common_1.removeLeadingAndTrailingDash)(name);
|
|
19
|
+
};
|
|
20
|
+
exports.getVaultItemName = getVaultItemName;
|
|
11
21
|
const addEncryptKey = (name, vaultInfo, keySize = 4096) => {
|
|
12
22
|
const key = new azure_providers_1.VaultKeyResource(`${name}-encryptKey`, {
|
|
13
23
|
name: `${name}-encryptKey`,
|
|
@@ -22,6 +32,21 @@ const addEncryptKey = (name, vaultInfo, keySize = 4096) => {
|
|
|
22
32
|
};
|
|
23
33
|
};
|
|
24
34
|
exports.addEncryptKey = addEncryptKey;
|
|
35
|
+
/** Get Key */
|
|
36
|
+
// export const getKey = async ({
|
|
37
|
+
// name,
|
|
38
|
+
// version,
|
|
39
|
+
// vaultInfo,
|
|
40
|
+
// nameFormatted,
|
|
41
|
+
// }: GetVaultItemProps) => {
|
|
42
|
+
// const n = nameFormatted ? name : getSecretName(name);
|
|
43
|
+
// const client = getKeyVaultBase(vaultInfo.name);
|
|
44
|
+
// return client.getKey(n, version);
|
|
45
|
+
// };
|
|
46
|
+
// interface EncryptionPropertiesArgs {
|
|
47
|
+
// keySource: 'Microsoft.KeyVault';
|
|
48
|
+
// keyVaultProperties: Input<KeyVaultPropertiesResults>;
|
|
49
|
+
// }
|
|
25
50
|
/** Get or create encryption Key */
|
|
26
51
|
// const getEncryptionKey = async ({
|
|
27
52
|
// name,
|
|
@@ -45,7 +70,7 @@ exports.addEncryptKey = addEncryptKey;
|
|
|
45
70
|
// };
|
|
46
71
|
/** Get Secret */
|
|
47
72
|
const getSecret = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
48
|
-
const n = nameFormatted ? name : (0,
|
|
73
|
+
const n = nameFormatted ? name : (0, exports.getVaultItemName)(name);
|
|
49
74
|
const client = (0, KeyVaultBase_1.default)(vaultInfo.name);
|
|
50
75
|
return client.getSecret(n, version);
|
|
51
76
|
};
|
|
@@ -77,4 +102,4 @@ exports.getSecrets = getSecrets;
|
|
|
77
102
|
// vaultUrl: `https://${splits[2]}`,
|
|
78
103
|
// };
|
|
79
104
|
// };
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwyQ0FBZ0Q7QUFFaEQscUdBQWdGO0FBQ2hGLG1FQUFpRTtBQUNqRSxzQ0FBZ0U7QUFFaEUsOEZBQThGO0FBQ3ZGLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsSUFBWSxFQUNaLGVBQXVCLGNBQUssRUFDNUIsRUFBRTtJQUNGLElBQUksR0FBRyxJQUFJO1NBQ1IsT0FBTyxDQUFDLElBQUksTUFBTSxDQUFDLFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxtREFBbUQ7U0FDOUYsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQyx3Q0FBd0M7U0FDakUsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyw2Q0FBNkM7U0FDakUsV0FBVyxFQUFFLENBQUMsQ0FBQyxrQ0FBa0M7SUFFcEQsT0FBTyxJQUFBLHFDQUE0QixFQUFDLElBQUksQ0FBQyxDQUFDO0FBQzVDLENBQUMsQ0FBQztBQVhXLFFBQUEsZ0JBQWdCLG9CQVczQjtBQXdCSyxNQUFNLGFBQWEsR0FBRyxDQUMzQixJQUFZLEVBQ1osU0FBdUIsRUFDdkIsVUFBOEIsSUFBSSxFQUNQLEVBQUU7SUFDN0IsTUFBTSxHQUFHLEdBQUcsSUFBSSxrQ0FBZ0IsQ0FDOUIsR0FBRyxJQUFJLGFBQWEsRUFDcEI7UUFDRSxJQUFJLEVBQUUsR0FBRyxJQUFJLGFBQWE7UUFDMUIsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJO1FBQ3pCLEdBQUcsRUFBRSxFQUFFLE9BQU8sRUFBRTtLQUNqQixFQUNELEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxDQUN6QixDQUFDO0lBRUYsT0FBTztRQUNMLE9BQU8sRUFBRSxHQUFHLENBQUMsSUFBSTtRQUNqQixXQUFXLEVBQUUsR0FBRyxDQUFDLFFBQVE7UUFDekIs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
|
package/KeyVault/index.js
CHANGED
|
@@ -52,7 +52,7 @@ exports.createVaultPrivateLink = createVaultPrivateLink;
|
|
|
52
52
|
// logsCategories: ['AuditEvent'],
|
|
53
53
|
// });
|
|
54
54
|
exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignoreChanges = [], dependsOn, importUri, ...others }) => {
|
|
55
|
-
const vaultName =
|
|
55
|
+
const vaultName = Common_1.naming.getKeyVaultName(name);
|
|
56
56
|
const vault = new keyvault.Vault(vaultName, {
|
|
57
57
|
vaultName,
|
|
58
58
|
...group,
|
|
@@ -113,4 +113,4 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
|
|
|
113
113
|
createPrivateLink,
|
|
114
114
|
};
|
|
115
115
|
};
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
116
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RUFBMEQ7QUFDMUQsc0RBQW1EO0FBRW5ELHNDQUE2QztBQU83Qyw4RUFBc0Q7QUFPL0MsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLEVBQ3JDLFNBQVMsRUFDVCxHQUFHLEtBQUssRUFHVCxFQUFFLEVBQUUsQ0FDSCxJQUFBLHlCQUFlLEVBQUM7SUFDZCxZQUFZLEVBQUUsU0FBUztJQUN2QixHQUFHLEtBQUs7SUFDUixrQkFBa0IsRUFBRSxpQ0FBaUM7SUFDckQsbUJBQW1CLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDO0NBQzlELENBQUMsQ0FBQztBQVhRLFFBQUEsc0JBQXNCLDBCQVc5QjtBQUVMLDBDQUEwQztBQUMxQyxlQUFlO0FBQ2YsYUFBYTtBQUNiLE9BQU87QUFDUCw2QkFBNkI7QUFDN0IsK0JBQStCO0FBQy9CLFFBQVE7QUFDUix1QkFBdUI7QUFDdkIsdUNBQXVDO0FBQ3ZDLHNDQUFzQztBQUN0QyxrQkFBa0I7QUFDbEIsc0NBQXNDO0FBQ3RDLFFBQVE7QUFFUixrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEVBQ1AseUJBQXlCLEdBQUcsQ0FBQyxFQUM3QixhQUFhLEdBQUcsRUFBRSxFQUNsQixTQUFTLEVBQ1QsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNLLEVBQUUsRUFBRTtJQUNsQixNQUFNLFNBQVMsR0FBRyxlQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9DLE1BQU0sS0FBSyxHQUFHLElBQUksUUFBUSxDQUFDLEtBQUssQ0FDOUIsU0FBUyxFQUNUO1FBQ0UsU0FBUztRQUNULEdBQUcsS0FBSztRQUNSLEdBQUcsTUFBTTtRQUVULFVBQVUsRUFBRTtZQUNWLFFBQVEsRUFBUixpQkFBUTtZQUNSLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRTtZQUN0QyxVQUFVLEVBQUUsU0FBUztZQUVyQix1QkFBdUIsRUFBRSxJQUFJO1lBQzdCLGNBQWMsRUFBRSxTQUFTO1lBRXpCLHFCQUFxQixFQUFFLElBQUk7WUFDM0IsZ0JBQWdCLEVBQUUsSUFBSTtZQUN0Qix5QkFBeUIsRUFBRSwyRUFBMkU7WUFFdEcsb0JBQW9CLEVBQUUsSUFBSTtZQUMxQix3QkFBd0IsRUFBRSxJQUFJO1lBQzlCLDRCQUE0QixFQUFFLElBQUk7WUFFbEMsV0FBVyxFQUFFO2dCQUNYLE1BQU0sRUFBRSxlQUFlO2dCQUN2QixhQUFhLEVBQUUsYUFBSyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLO2dCQUVyRCxPQUFPLEVBQUUsT0FBTyxFQUFFLFdBQVc7b0JBQzNCLENBQUMsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO29CQUNoRCxDQUFDLENBQUMsRUFBRTtnQkFFTixtQkFBbUIsRUFBRSxPQUFPLEVBQUUsUUFBUTtvQkFDcEMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO29CQUM1QixDQUFDLENBQUMsU0FBUzthQUNkO1NBQ0Y7S0FDRixFQUNEO1FBQ0UsU0FBUztRQUNULE1BQU0sRUFBRSxTQUFTO1FBQ2pCLGFBQWEsRUFBRTtZQUNiLDJCQUEyQjtZQUMzQixrQkFBa0I7WUFDbEIsdUJBQXVCO1lBQ3ZCLEdBQUcsYUFBYTtTQUNqQjtLQUNGLENBQ0YsQ0FBQztJQUVGLGVBQWU7SUFDZixNQUFNLElBQUksR0FBRyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLElBQUksRUFBRSxTQUFTO1FBQ2YsS0FBSztRQUNMLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRTtLQUNiLENBQUMsQ0FBQztJQUVILHNCQUFzQjtJQUN0QixNQUFNLGlCQUFpQixHQUFHLENBQUMsS0FBMkIsRUFBRSxFQUFFLENBQ3hELElBQUEsOEJBQXNCLEVBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLEVBQUUsR0FBRyxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBRTFELHFCQUFxQjtJQUNyQixJQUFJLE9BQU8sRUFBRSxXQUFXLEVBQUUsQ0FBQztRQUN6QixpQkFBaUIsQ0FBQyxPQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUVELGdCQUFnQjtJQUNoQix1REFBdUQ7SUFDdkQsMkRBQTJEO0lBRTNELE9BQU87UUFDTCxJQUFJLEVBQUUsU0FBUztRQUNmLEtBQUs7UUFDTCxJQUFJO1FBQ0osZ0JBQWdCO1FBQ2hCLGlCQUFpQjtLQUNsQixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
package/Logs/AppInsight.js
CHANGED
|
@@ -29,7 +29,7 @@ const Helper_1 = require("../KeyVault/Helper");
|
|
|
29
29
|
const Common_1 = require("../Common");
|
|
30
30
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
31
31
|
exports.default = ({ group, name, dailyCapGb = 0.023, immediatePurgeDataOn30Days = true, ingestionMode = native.insights.IngestionMode.ApplicationInsights, workspaceResourceId, vaultInfo, }) => {
|
|
32
|
-
name =
|
|
32
|
+
name = Common_1.naming.getAppInsightName(name);
|
|
33
33
|
const appInsight = new native.insights.Component(name, {
|
|
34
34
|
resourceName: name,
|
|
35
35
|
...group,
|
|
@@ -73,4 +73,4 @@ const getAppInsightKey = async ({ resourceInfo, vaultInfo, }) => {
|
|
|
73
73
|
return key?.value ?? '';
|
|
74
74
|
};
|
|
75
75
|
exports.getAppInsightKey = getAppInsightKey;
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwSW5zaWdodC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0FwcEluc2lnaHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFNL0MsK0NBQStDO0FBQy9DLHNDQUFtQztBQUNuQywyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osVUFBVSxHQUFHLEtBQUssRUFDbEIsMEJBQTBCLEdBQUcsSUFBSSxFQUNqQyxhQUFhLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsbUJBQW1CLEVBQ2pFLG1CQUFtQixFQUNuQixTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLGVBQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV0QyxNQUFNLFVBQVUsR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtRQUNyRCxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFFUixJQUFJLEVBQUUsS0FBSztRQUNYLGdCQUFnQixFQUFFLElBQUk7UUFDdEIsZUFBZSxFQUFFLEtBQUs7UUFDdEIsUUFBUSxFQUFFLFdBQVc7UUFFckIsdUNBQXVDO1FBQ3ZDLGVBQWUsRUFBRSxFQUFFO1FBRW5CLDBCQUEwQjtRQUMxQixhQUFhO1FBRWIsZ0JBQWdCLEVBQUUsSUFBSTtRQUN0QixtQkFBbUI7S0FDcEIsQ0FBQyxDQUFDO0lBRUgsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLDhCQUE4QixDQUNoRCxHQUFHLElBQUksd0JBQXdCLEVBQy9CO1FBQ0Usc0JBQXNCLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxnREFBZ0Q7UUFDbkYsYUFBYSxFQUFFO1lBQ2IsR0FBRyxFQUFFLFVBQVU7WUFDZiw4QkFBOEIsRUFBRSxJQUFJO1NBQ3JDO1FBQ0QsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjtRQUMxQyxZQUFZLEVBQUUsVUFBVSxDQUFDLElBQUk7S0FDOUIsQ0FDRixDQUFDO0lBRUYsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLElBQUEsOEJBQWUsRUFBQztZQUNkLElBQUk7WUFDSixhQUFhLEVBQUUsSUFBSTtZQUNuQixLQUFLLEVBQUUsVUFBVSxDQUFDLGtCQUFrQjtZQUNwQyxTQUFTO1lBQ1QsV0FBVyxFQUFFLFlBQVk7WUFDekIsU0FBUyxFQUFFLFVBQVU7U0FDdEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMsQ0FBQztBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxFQUFFLEVBQ3JDLFlBQVksRUFDWixTQUFTLEdBSVYsRUFBbUIsRUFBRTtJQUNwQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUEsa0JBQVMsRUFBQztRQUMxQixJQUFJLEVBQUUsWUFBWSxDQUFDLElBQUk7UUFDdkIsU0FBUztLQUNWLENBQUMsQ0FBQztJQUNILE9BQU8sR0FBRyxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDMUIsQ0FBQyxDQUFDO0FBWlcsUUFBQSxnQkFBZ0Isb0JBWTNCIn0=
|
package/Logs/Helpers.js
CHANGED
|
@@ -85,7 +85,7 @@ const getLogWpSecrets = ({ workspaceName, vaultInfo, }) => {
|
|
|
85
85
|
});
|
|
86
86
|
};
|
|
87
87
|
const getLogWpInfo = ({ name, group, vaultInfo, }) => {
|
|
88
|
-
const n = Common_1.naming.getLogWpName(
|
|
88
|
+
const n = Common_1.naming.getLogWpName(name);
|
|
89
89
|
const id = (0, pulumi_1.interpolate) `${Common_1.defaultSubScope}/resourceGroups/${group.resourceGroupName}/providers/microsoft.operationalinsights/workspaces/${n}`;
|
|
90
90
|
const secrets = vaultInfo
|
|
91
91
|
? getLogWpSecrets({ workspaceName: n, vaultInfo })
|
|
@@ -98,7 +98,7 @@ const getAppInsightSecrets = ({ insightName, vaultInfo, }) => (0, Helper_1.getSe
|
|
|
98
98
|
names: { instrumentationKey: insightName },
|
|
99
99
|
});
|
|
100
100
|
const getAppInsightInfo = ({ name, group, vaultInfo, }) => {
|
|
101
|
-
const n = Common_1.naming.getAppInsightName(
|
|
101
|
+
const n = Common_1.naming.getAppInsightName(name);
|
|
102
102
|
const id = (0, pulumi_1.interpolate) `${Common_1.defaultSubScope}/resourceGroups/${group.resourceGroupName}/providers/microsoft.insights/components/${n}`;
|
|
103
103
|
const secrets = vaultInfo
|
|
104
104
|
? getAppInsightSecrets({ insightName: n, vaultInfo })
|
|
@@ -107,7 +107,10 @@ const getAppInsightInfo = ({ name, group, vaultInfo, }) => {
|
|
|
107
107
|
};
|
|
108
108
|
const getLogInfo = (groupName, vaultInfo = undefined) => {
|
|
109
109
|
const rgName = Common_1.naming.getResourceGroupName(groupName);
|
|
110
|
-
const name = (0, Common_1.getResourceName)(
|
|
110
|
+
const name = (0, Common_1.getResourceName)(groupName, {
|
|
111
|
+
cleanName: true,
|
|
112
|
+
suffix: 'logs',
|
|
113
|
+
});
|
|
111
114
|
const group = { resourceGroupName: rgName, location: Common_1.currentRegionName };
|
|
112
115
|
const logWp = getLogWpInfo({
|
|
113
116
|
name,
|
|
@@ -123,4 +126,4 @@ const getLogInfo = (groupName, vaultInfo = undefined) => {
|
|
|
123
126
|
return { logWp, logStorage, appInsight };
|
|
124
127
|
};
|
|
125
128
|
exports.getLogInfo = getLogInfo;
|
|
126
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQW9EO0FBQ3BELHNDQUttQjtBQUNuQiwrQ0FBZ0Q7QUFDaEQsOENBQW1EO0FBYTVDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osZ0JBQWdCLEVBQ2hCLE9BQU8sRUFDUCxpQkFBaUIsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUNsQyxjQUFjLEVBQ2QsU0FBUyxHQUNPLEVBQUUsRUFBRTtJQUNwQiw0Q0FBNEM7SUFDNUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FDWCxtQkFBbUIsSUFBSSw0Q0FBNEMsQ0FDcEUsQ0FBQztRQUNGLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxrQ0FBa0M7SUFDbEMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDdEIsT0FBTyxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsSUFBSSxzQkFBc0IsQ0FBQyxDQUFDO1FBQ2pFLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUMvQixNQUFNLENBQUMsR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDO0lBQ3pCLE9BQU8sSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUMxQyxDQUFDLEVBQ0Q7UUFDRSxJQUFJLEVBQUUsQ0FBQztRQUNQLFdBQVcsRUFBRSxnQkFBZ0I7UUFDN0IsMkJBQTJCLEVBQUUsa0JBQWtCO1FBRS9DLFdBQVcsRUFBRSxJQUFJO1FBQ2pCLGdCQUFnQixFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEVBQUU7UUFFM0QsUUFBUTtRQUNSLE9BQU8sRUFBRSxpQkFBaUI7WUFDeEIsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztnQkFDNUIsUUFBUSxFQUFFLENBQUM7Z0JBQ1gsZUFBZSxFQUFFLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFO2dCQUM1QyxPQUFPLEVBQUUsSUFBSTthQUNkLENBQUMsQ0FBQztZQUNMLENBQUMsQ0FBQyxTQUFTO1FBQ2IsTUFBTTtRQUNOLElBQUksRUFBRSxjQUFjO1lBQ2xCLENBQUMsQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUN6QixRQUFRLEVBQUUsQ0FBQztnQkFDWCxlQUFlLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUU7Z0JBQzVDLE9BQU8sRUFBRSxJQUFJO2FBQ2QsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLFNBQVM7S0FDZCxFQUNELEVBQUUsU0FBUyxFQUFFLENBQ2QsQ0FBQztBQUNKLENBQUMsQ0FBQztBQW5EVyxRQUFBLGdCQUFnQixvQkFtRDNCO0FBTUssTUFBTSxzQkFBc0IsR0FBRyxDQUFDLEVBQ3JDLElBQUksRUFDSixnQkFBZ0IsR0FDTSxFQUFFLEVBQUUsQ0FDMUIsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLHdCQUF3QixDQUFDLElBQUksRUFBRTtJQUNqRCxTQUFTLEVBQUUsSUFBSTtJQUNmLFVBQVUsRUFBRSxnQkFBZ0I7SUFDNUIsV0FBVyxFQUFFLFNBQVM7Q0FDdkIsQ0FBQyxDQUFDO0FBUlEsUUFBQSxzQkFBc0IsMEJBUTlCO0FBRUwsMkRBQTJEO0FBRTNELE1BQU0sZUFBZSxHQUFHLENBQUMsRUFDdkIsYUFBYSxFQUNiLFNBQVMsR0FJVixFQUEyQixFQUFFO0lBQzVCLE1BQU0sV0FBVyxHQUFHLEdBQUcsYUFBYSxLQUFLLENBQUM7SUFDMUMsTUFBTSxnQkFBZ0IsR0FBRyxHQUFHLGFBQWEsVUFBVSxDQUFDO0lBQ3BELE1BQU0sa0JBQWtCLEdBQUcsR0FBRyxhQUFhLFlBQVksQ0FBQztJQUV4RCxPQUFPLElBQUEsbUJBQVUsRUFBQztRQUNoQixhQUFhLEVBQUUsSUFBSTtRQUNuQixTQUFTO1FBQ1QsS0FBSyxFQUFFLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLGtCQUFrQixFQUFFO0tBQzdELENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQztBQUVGLE1BQU0sWUFBWSxHQUFHLENBQUMsRUFDcEIsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEdBQ2EsRUFBb0IsRUFBRTtJQUM1QyxNQUFNLENBQUMsR0FBRyxlQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sRUFBRSxHQUFHLElBQUEsb0JBQVcsRUFBQSxHQUFHLHdCQUFlLG1CQUFtQixLQUFLLENBQUMsaUJBQWlCLHVEQUF1RCxDQUFDLEVBQUUsQ0FBQztJQUU3SSxNQUFNLE9BQU8sR0FBRyxTQUFTO1FBQ3ZCLENBQUMsQ0FBQyxlQUFlLENBQUMsRUFBRSxhQUFhLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDO1FBQ2xELENBQUMsQ0FBQyxFQUFFLENBQUM7SUFDUCxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxFQUFFLENBQUM7QUFDNUMsQ0FBQyxDQUFDO0FBRUYsTUFBTSxvQkFBb0IsR0FBRyxDQUFDLEVBQzVCLFdBQVcsRUFDWCxTQUFTLEdBSVYsRUFBeUIsRUFBRSxDQUMxQixJQUFBLG1CQUFVLEVBQUM7SUFDVCxhQUFhLEVBQUUsSUFBSTtJQUNuQixTQUFTO0lBQ1QsS0FBSyxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsV0FBVyxFQUFFO0NBQzNDLENBQUMsQ0FBQztBQUVMLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxFQUN6QixJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsR0FDYSxFQUFrQixFQUFFO0lBQzFDLE1BQU0sQ0FBQyxHQUFHLGVBQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN6QyxNQUFNLEVBQUUsR0FBRyxJQUFBLG9CQUFXLEVBQUEsR0FBRyx3QkFBZSxtQkFBbUIsS0FBSyxDQUFDLGlCQUFpQiw0Q0FBNEMsQ0FBQyxFQUFFLENBQUM7SUFFbEksTUFBTSxPQUFPLEdBQUcsU0FBUztRQUN2QixDQUFDLENBQUMsb0JBQW9CLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDO1FBQ3JELENBQUMsQ0FBQyxFQUFFLENBQUM7SUFDUCxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxFQUFFLENBQUM7QUFDNUMsQ0FBQyxDQUFDO0FBRUssTUFBTSxVQUFVLEdBQUcsQ0FDeEIsU0FBaUIsRUFDakIsWUFBc0MsU0FBUyxFQUN0QyxFQUFFO0lBQ1gsTUFBTSxNQUFNLEdBQUcsZUFBTSxDQUFDLG9CQUFvQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3RELE1BQU0sSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxTQUFTLEVBQUU7UUFDdEMsU0FBUyxFQUFFLElBQUk7UUFDZixNQUFNLEVBQUUsTUFBTTtLQUNmLENBQUMsQ0FBQztJQUNILE1BQU0sS0FBSyxHQUFHLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSwwQkFBaUIsRUFBRSxDQUFDO0lBRXpFLE1BQU0sS0FBSyxHQUFHLFlBQVksQ0FBQztRQUN6QixJQUFJO1FBQ0osU0FBUztRQUNULEtBQUs7S0FDTixDQUFDLENBQUM7SUFFSCxNQUFNLFVBQVUsR0FBRyxJQUFBLHVCQUFjLEVBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFFOUQsTUFBTSxVQUFVLEdBQUcsaUJBQWlCLENBQUM7UUFDbkMsSUFBSTtRQUNKLFNBQVM7UUFDVCxLQUFLO0tBQ04sQ0FBQyxDQUFDO0lBRUgsT0FBTyxFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFDM0MsQ0FBQyxDQUFDO0FBMUJXLFFBQUEsVUFBVSxjQTBCckIifQ==
|
package/Logs/LogAnalytics.js
CHANGED
|
@@ -27,7 +27,7 @@ const insights = __importStar(require("@pulumi/azure-native/operationalinsights"
|
|
|
27
27
|
const Common_1 = require("../Common");
|
|
28
28
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
29
29
|
exports.default = ({ name, group, sku = insights.WorkspaceSkuNameEnum.Free, dailyQuotaGb = 0.023, vaultInfo, dependsOn, ignoreChanges, importUri, }) => {
|
|
30
|
-
name =
|
|
30
|
+
name = Common_1.naming.getLogWpName(name);
|
|
31
31
|
const workspaceIdKeyName = `${name}-Id`;
|
|
32
32
|
const primaryKeyName = `${name}-primary`;
|
|
33
33
|
const secondaryKeyName = `${name}-secondary`;
|
|
@@ -77,4 +77,4 @@ exports.default = ({ name, group, sku = insights.WorkspaceSkuNameEnum.Free, dail
|
|
|
77
77
|
}
|
|
78
78
|
return log;
|
|
79
79
|
};
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nQW5hbHl0aWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0xvZ3MvTG9nQW5hbHl0aWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtRkFBcUU7QUFFckUsc0NBQW1DO0FBQ25DLDJEQUE0RDtBQU81RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxHQUFHLEdBQUcsUUFBUSxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFDeEMsWUFBWSxHQUFHLEtBQUssRUFDcEIsU0FBUyxFQUNULFNBQVMsRUFDVCxhQUFhLEVBQ2IsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxlQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pDLE1BQU0sa0JBQWtCLEdBQUcsR0FBRyxJQUFJLEtBQUssQ0FBQztJQUN4QyxNQUFNLGNBQWMsR0FBRyxHQUFHLElBQUksVUFBVSxDQUFDO0lBQ3pDLE1BQU0sZ0JBQWdCLEdBQUcsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUU3QyxNQUFNLEdBQUcsR0FBRyxJQUFJLFFBQVEsQ0FBQyxTQUFTLENBQ2hDLElBQUksRUFDSjtRQUNFLGFBQWEsRUFBRSxJQUFJO1FBQ25CLEdBQUcsS0FBSztRQUVSLCtCQUErQixFQUFFLFNBQVM7UUFDMUMsMkJBQTJCLEVBQUUsU0FBUztRQUN0QyxRQUFRLEVBQUU7WUFDUiwyQ0FBMkM7WUFDM0MseUJBQXlCO1lBQ3pCLDBCQUEwQjtZQUMxQixzRUFBc0U7WUFDdEUsMEJBQTBCLEVBQUUsSUFBSTtTQUNqQztRQUNELGdCQUFnQixFQUNkLEdBQUcsS0FBSyxRQUFRLENBQUMsb0JBQW9CLENBQUMsSUFBSTtZQUN4QyxDQUFDLENBQUMsU0FBUztZQUNYLENBQUMsQ0FBQyxFQUFFLFlBQVksRUFBRSxFQUFFLGdDQUFnQztRQUV4RCxlQUFlLEVBQUUsR0FBRyxLQUFLLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLHFCQUFxQjtRQUMzRixHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFO0tBQ25CLEVBQ0QsRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLENBQzdCLENBQUM7SUFFRixJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ2hDLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFFaEIsTUFBTSxJQUFJLEdBQUcsTUFBTSxRQUFRLENBQUMsYUFBYSxDQUFDO2dCQUN4QyxhQUFhLEVBQUUsSUFBSTtnQkFDbkIsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjthQUMzQyxDQUFDLENBQUM7WUFDSCxJQUFBLCtCQUFnQixFQUFDO2dCQUNmLFdBQVcsRUFBRSxlQUFlO2dCQUM1QixhQUFhLEVBQUUsSUFBSTtnQkFDbkIsU0FBUztnQkFDVCxLQUFLLEVBQUU7b0JBQ0wsRUFBRSxJQUFJLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtvQkFDdkM7d0JBQ0UsSUFBSSxFQUFFLGNBQWM7d0JBQ3BCLEtBQUssRUFBRSxJQUFJLENBQUMsZ0JBQWlCO3FCQUM5QjtvQkFDRDt3QkFDRSxJQUFJLEVBQUUsZ0JBQWdCO3dCQUN0QixLQUFLLEVBQUUsSUFBSSxDQUFDLGtCQUFtQjtxQkFDaEM7aUJBQ0Y7YUFDRixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUMsQ0FBQyJ9
|
package/Logs/WebTest.js
CHANGED
|
@@ -36,7 +36,7 @@ const addInsightMonitor = ({ name, alertGroupAction, appInsight, url, frequency
|
|
|
36
36
|
if (!g)
|
|
37
37
|
return;
|
|
38
38
|
const webTest = new native.insights.WebTest(name, {
|
|
39
|
-
webTestName:
|
|
39
|
+
webTestName: Common_1.naming.getWebTestName(name),
|
|
40
40
|
resourceGroupName: appInsight.group.resourceGroupName,
|
|
41
41
|
syntheticMonitorId: g,
|
|
42
42
|
description: `Health check ${name}`,
|
|
@@ -68,7 +68,7 @@ const addInsightMonitor = ({ name, alertGroupAction, appInsight, url, frequency
|
|
|
68
68
|
//Enable Alert
|
|
69
69
|
if (alertGroupAction) {
|
|
70
70
|
const alertGroup = await native.insights.getActionGroup(alertGroupAction);
|
|
71
|
-
const alertName =
|
|
71
|
+
const alertName = Common_1.naming.getAlertName(name);
|
|
72
72
|
new native.insights.MetricAlert(alertName, {
|
|
73
73
|
resourceGroupName: appInsight.group.resourceGroupName,
|
|
74
74
|
enabled: true,
|
|
@@ -88,4 +88,4 @@ const addInsightMonitor = ({ name, alertGroupAction, appInsight, url, frequency
|
|
|
88
88
|
});
|
|
89
89
|
};
|
|
90
90
|
exports.addInsightMonitor = addInsightMonitor;
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViVGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL1dlYlRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQTRDO0FBQzVDLHNDQUFtQztBQUNuQyx1REFBeUM7QUFjbEMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLEVBQ2hDLElBQUksRUFDSixnQkFBZ0IsRUFDaEIsVUFBVSxFQUNWLEdBQUcsRUFDSCxTQUFTLEdBQUcsR0FBRyxHQUNLLEVBQUUsRUFBRTtJQUN4QixNQUFNLElBQUksR0FBRyxJQUFBLG1CQUFVLEVBQUMsR0FBRyxJQUFJLFVBQVUsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNsRCxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7UUFBRSxHQUFHLEdBQUcsV0FBVyxHQUFHLEVBQUUsQ0FBQztJQUVuRCxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN4RCxJQUFJLENBQUMsQ0FBQztZQUFFLE9BQU87UUFFZixNQUFNLE9BQU8sR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtZQUNoRCxXQUFXLEVBQUUsZUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUM7WUFDeEMsaUJBQWlCLEVBQUUsVUFBVSxDQUFDLEtBQUssQ0FBQyxpQkFBaUI7WUFDckQsa0JBQWtCLEVBQUUsQ0FBQztZQUVyQixXQUFXLEVBQUUsZ0JBQWdCLElBQUksRUFBRTtZQUNuQyxXQUFXLEVBQUUsTUFBTSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsSUFBSTtZQUM3QyxJQUFJLEVBQUUsTUFBTTtZQUNaLFNBQVMsRUFBRTtnQkFDVCxFQUFFLFFBQVEsRUFBRSxpQkFBaUIsRUFBRTtnQkFDL0IsRUFBRSxRQUFRLEVBQUUsaUJBQWlCLEVBQUU7Z0JBQy9CLEVBQUUsUUFBUSxFQUFFLGtCQUFrQixFQUFFO2FBQ2pDO1lBQ0QsT0FBTyxFQUFFLElBQUk7WUFDYixZQUFZLEVBQUUsSUFBSTtZQUNsQixTQUFTO1lBQ1Qsd0JBQXdCO1lBQ3hCLGFBQWE7WUFFYixhQUFhLEVBQUU7Z0JBQ2IsT0FBTyxFQUFFO3lCQUNRLElBQUksU0FBUyxDQUFDOzs7OENBR08sQ0FBQyx3QkFBd0IsR0FBRzs7bUJBRXZEO2FBQ1o7WUFFRCxJQUFJLEVBQUU7Z0JBQ0osQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDLEVBQUUsVUFBVTthQUNsQztTQUNGLENBQUMsQ0FBQztRQUVILGNBQWM7UUFDZCxJQUFJLGdCQUFnQixFQUFFLENBQUM7WUFDckIsTUFBTSxVQUFVLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1lBRTFFLE1BQU0sU0FBUyxHQUFHLGVBQU0sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDNUMsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxTQUFTLEVBQUU7Z0JBQ3pDLGlCQUFpQixFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsaUJBQWlCO2dCQUNyRCxPQUFPLEVBQUUsSUFBSTtnQkFDYixNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLFVBQVUsQ0FBQyxFQUFFLENBQUM7Z0JBQ25DLFFBQVEsRUFBRSxHQUFHO2dCQUNiLG1CQUFtQixFQUFFLE9BQU87Z0JBQzVCLFFBQVEsRUFBRTtvQkFDUixTQUFTLEVBQUUsT0FBTyxDQUFDLEVBQUU7b0JBQ3JCLFdBQVcsRUFBRSxFQUFFO29CQUNmLG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTTtvQkFDN0MsU0FBUyxFQUNQLDZEQUE2RDtpQkFDaEU7Z0JBQ0QsVUFBVSxFQUFFLE9BQU87Z0JBQ25CLE9BQU8sRUFBRSxDQUFDLEVBQUUsYUFBYSxFQUFFLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQzthQUM1QyxDQUFDLENBQUM7UUFDTCxDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUF0RVcsUUFBQSxpQkFBaUIscUJBc0U1QiJ9
|
package/Logs/index.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ interface Props extends BasicEncryptResourceArgs {
|
|
|
10
10
|
}
|
|
11
11
|
declare const _default: ({ group, name, workspace, vaultInfo, ...others }: Props) => {
|
|
12
12
|
logWp: import("@pulumi/azure-native/operationalinsights/workspace").Workspace;
|
|
13
|
-
logStorage: import("../
|
|
13
|
+
logStorage: import("../types").ResourceInfoWithInstance<import("@pulumi/azure-native/storage/storageAccount").StorageAccount>;
|
|
14
14
|
appInsight: import("@pulumi/azure-native/insights/component").Component;
|
|
15
15
|
};
|
|
16
16
|
export default _default;
|
package/MySql/index.js
CHANGED
|
@@ -46,7 +46,7 @@ sku = {
|
|
|
46
46
|
name: 'Standard_B1ms',
|
|
47
47
|
tier: 'Burstable',
|
|
48
48
|
}, network, databases, vaultInfo, dependsOn, }) => {
|
|
49
|
-
name =
|
|
49
|
+
name = Common_1.naming.getMySqlName(name);
|
|
50
50
|
const username = auth?.adminLogin ||
|
|
51
51
|
new random_1.RandomString(name, {
|
|
52
52
|
special: false,
|
|
@@ -182,4 +182,4 @@ sku = {
|
|
|
182
182
|
}
|
|
183
183
|
return mySql;
|
|
184
184
|
};
|
|
185
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDREQUE4QztBQU05QyxzQ0FBb0Q7QUFDcEQsdURBQXlDO0FBQ3pDLDRFQUE4RDtBQUM5RCwyQ0FBZ0Q7QUFFaEQsMkRBQTREO0FBQzVELHlDQUFpRDtBQUNqRCwrQ0FBbUQ7QUFDbkQsd0ZBQWdFO0FBQ2hFLDJDQUE4QztBQUM5QywyQ0FBa0Q7QUFDbEQsOEVBQXNEO0FBYXRELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLElBQUksRUFDSixnQkFBZ0IsRUFDaEIsT0FBTyxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQ3ZELGFBQWEsR0FBRyxFQUFFO0FBQ2xCOztHQUVHO0FBQ0gsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGVBQWU7SUFDckIsSUFBSSxFQUFFLFdBQVc7Q0FDbEIsRUFDRCxPQUFPLEVBQ1AsU0FBUyxFQUNULFNBQVMsRUFDVCxTQUFTLEdBQ0UsRUFBRSxFQUFFO0lBQ2YsSUFBSSxHQUFHLGVBQU0sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFakMsTUFBTSxRQUFRLEdBQ1osSUFBSSxFQUFFLFVBQVU7UUFDaEIsSUFBSSxxQkFBWSxDQUFDLElBQUksRUFBRTtZQUNyQixPQUFPLEVBQUUsS0FBSztZQUNkLE1BQU0sRUFBRSxDQUFDO1lBQ1QsS0FBSyxFQUFFLElBQUk7WUFDWCxLQUFLLEVBQUUsS0FBSztTQUNiLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUM7SUFFdEMsTUFBTSxRQUFRLEdBQ1osSUFBSSxFQUFFLFFBQVE7UUFDZCxJQUFBLHVCQUFjLEVBQUM7WUFDYixJQUFJO1lBQ0os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
|
package/Postgresql/index.js
CHANGED
|
@@ -45,7 +45,7 @@ sku = {
|
|
|
45
45
|
name: 'Standard_B1ms',
|
|
46
46
|
tier: 'Burstable',
|
|
47
47
|
}, network, databases, vaultInfo, enableEncryption, dependsOn, lock = true, }) => {
|
|
48
|
-
name =
|
|
48
|
+
name = Common_1.naming.getPostgresqlName(name);
|
|
49
49
|
const username = new random_1.RandomString(name, {
|
|
50
50
|
special: false,
|
|
51
51
|
length: 5,
|
|
@@ -154,4 +154,4 @@ sku = {
|
|
|
154
154
|
}
|
|
155
155
|
return postgres;
|
|
156
156
|
};
|
|
157
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUG9zdGdyZXNxbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsd0ZBQWdFO0FBQ2hFLCtDQUFtRDtBQUVuRCxzQ0FBb0Q7QUFDcEQsdURBQXlDO0FBQ3pDLDREQUE4QztBQUM5QywyQ0FBZ0Q7QUFFaEQsMkRBQTREO0FBQzVELDJDQUE4QztBQUM5QywyQ0FBa0Q7QUFDbEQsOEVBQXNEO0FBQ3RELDJDQUF3QztBQWN4QyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQzlELGFBQWEsR0FBRyxHQUFHO0FBQ25COztHQUVHO0FBQ0gsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGVBQWU7SUFDckIsSUFBSSxFQUFFLFdBQVc7Q0FDbEIsRUFDRCxPQUFPLEVBQ1AsU0FBUyxFQUNULFNBQVMsRUFDVCxnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULElBQUksR0FBRyxJQUFJLEdBQ0csRUFBRSxFQUFFO0lBQ2xCLElBQUksR0FBRyxlQUFNLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEMsTUFBTSxRQUFRLEdBQUcsSUFBSSxxQkFBWSxDQUFDLElBQUksRUFBRTtRQUN0QyxPQUFPLEVBQUUsS0FBSztRQUNkLE1BQU0sRUFBRSxDQUFDO1FBQ1QsS0FBSyxFQUFFLElBQUk7UUFDWCxLQUFLLEVBQUUsS0FBSztLQUNiLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDdkMsTUFBTSxRQUFRLEdBQUcsSUFBQSx1QkFBYyxFQUFDO1FBQzlCLElBQUk7UUFDSixNQUFNLEVBQUUsRUFBRTtRQUNWLE9BQU8s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
|
package/RedisCache/index.js
CHANGED
|
@@ -31,7 +31,6 @@ const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
|
31
31
|
const to_words_1 = require("to-words");
|
|
32
32
|
const Helper_1 = require("../VNet/Helper");
|
|
33
33
|
const Common_1 = require("../Common");
|
|
34
|
-
const Common_2 = require("../Common");
|
|
35
34
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
36
35
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
37
36
|
const toWord = new to_words_1.ToWords();
|
|
@@ -39,7 +38,7 @@ const toWord = new to_words_1.ToWords();
|
|
|
39
38
|
* There is no encryption available for Redis yet
|
|
40
39
|
* */
|
|
41
40
|
exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', family: 'C', capacity: 0 }, dependsOn, ignoreChanges, importUri, }) => {
|
|
42
|
-
name =
|
|
41
|
+
name = Common_1.naming.getRedisCacheName(name);
|
|
43
42
|
const redis = new cache.Redis(name, {
|
|
44
43
|
name,
|
|
45
44
|
...group,
|
|
@@ -47,7 +46,7 @@ exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', fam
|
|
|
47
46
|
enableNonSslPort: false,
|
|
48
47
|
identity: { type: cache.ManagedServiceIdentityType.SystemAssigned },
|
|
49
48
|
sku,
|
|
50
|
-
zones:
|
|
49
|
+
zones: Common_1.isPrd && sku.name === 'Premium' ? ['1', '2', '3'] : undefined,
|
|
51
50
|
subnetId: network?.subnetId,
|
|
52
51
|
publicNetworkAccess: network?.privateLink ? 'Disabled' : 'Enabled',
|
|
53
52
|
}, { dependsOn, import: importUri, ignoreChanges });
|
|
@@ -109,4 +108,4 @@ exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', fam
|
|
|
109
108
|
instance: redis,
|
|
110
109
|
};
|
|
111
110
|
};
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVkaXNDYWNoZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBQ3BELHVEQUF5QztBQU96Qyx1Q0FBbUM7QUFDbkMsMkNBQWtEO0FBQ2xELHNDQUEwQztBQUMxQywyREFBNEQ7QUFDNUQsOEVBQTZEO0FBRTdELE1BQU0sTUFBTSxHQUFHLElBQUksa0JBQU8sRUFBRSxDQUFDO0FBVTdCOztLQUVLO0FBQ0wsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsT0FBTyxFQUNQLFNBQVMsRUFDVCxHQUFHLEdBQUcsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsUUFBUSxFQUFFLENBQUMsRUFBRSxFQUNqRCxTQUFTLEVBQ1QsYUFBYSxFQUNiLFNBQVMsR0FDSCxFQUF5QyxFQUFFO0lBQ2pELElBQUksR0FBRyxlQUFNLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdEMsTUFBTSxLQUFLLEdBQUcsSUFBSSxLQUFLLENBQUMsS0FBSyxDQUMzQixJQUFJLEVBQ0o7UUFDRSxJQUFJO1FBQ0osR0FBRyxLQUFLO1FBQ1IsaUJBQWlCLEVBQUUsS0FBSztRQUN4QixnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsMEJBQTBCLENBQUMsY0FBYyxFQUFFO1FBQ25FLEdBQUc7UUFDSCxLQUFLLEVBQUUsY0FBSyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7UUFDcEUsUUFBUSxFQUFFLE9BQU8sRUFBRSxRQUFRO1FBQzNCLG1CQUFtQixFQUFFLE9BQU8sRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsU0FBUztLQUNuRSxFQUNELEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLENBQ2hELENBQUM7SUFFRixxQkFBcUI7SUFDckIsSUFBSSxPQUFPLEVBQUUsV0FBVyxFQUFFLENBQUM7UUFDekIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDL0MsSUFBQSx5QkFBZ0IsRUFBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQ3JDLE1BQU0sQ0FBQyxHQUFHLFlBQVksTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO2dCQUN4RCxPQUFPLElBQUksS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDLEVBQUU7b0JBQy9CLFFBQVEsRUFBRSxDQUFDO29CQUNYLFNBQVMsRUFBRSxLQUFLLENBQUMsSUFBSTtvQkFDckIsR0FBRyxLQUFLO29CQUNSLE9BQU8sRUFBRSxLQUFLLENBQUMsS0FBSztvQkFDcEIsS0FBSyxFQUFFLEtBQUssQ0FBQyxHQUFHO2lCQUNqQixDQUFDLENBQUM7WUFDTCxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELGNBQWM7SUFDZCxJQUFJLE9BQU8sRUFBRSxXQUFXLEVBQUUsQ0FBQztRQUN6QixJQUFBLHlCQUFzQixFQUFDO1lBQ3JCLEdBQUcsT0FBTyxDQUFDLFdBQVc7WUFDdEIsWUFBWSxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUMzQyxrQkFBa0IsRUFBRSxxQ0FBcUM7WUFDekQsbUJBQW1CLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQyxJQUFJO2dCQUMzQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztnQkFDNUIsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDO1NBQ25CLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQzlELElBQUksQ0FBQyxDQUFDO2dCQUFFLE9BQU87WUFFZixNQUFNLElBQUksR0FBRyxNQUFNLEtBQUssQ0FBQyxhQUFhLENBQUM7Z0JBQ3JDLElBQUksRUFBRSxDQUFDO2dCQUNQLGlCQUFpQixFQUFFLEtBQUssQ0FBQyxpQkFBaUI7YUFDM0MsQ0FBQyxDQUFDO1lBQ0gsSUFBQSwrQkFBZ0IsRUFBQztnQkFDZixTQUFTO2dCQUNULFdBQVcsRUFBRSxhQUFhO2dCQUMxQixTQUFTLEVBQUUsS0FBSztnQkFDaEIsS0FBSyxFQUFFO29CQUNMO3dCQUNFLElBQUksRUFBRSxHQUFHLElBQUkscUJBQXFCO3dCQUNsQyxLQUFLLEVBQUUsR0FBRyxJQUFJLDBDQUEwQyxJQUFJLENBQUMsVUFBVSw4QkFBOEI7cUJBQ3RHO29CQUNEO3dCQUNFLElBQUksRUFBRSxHQUFHLElBQUksdUJBQXVCO3dCQUNwQyxLQUFLLEVBQUUsR0FBRyxJQUFJLDBDQUEwQyxJQUFJLENBQUMsWUFBWSw4QkFBOEI7cUJBQ3hHO2lCQUNGO2FBQ0YsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixLQUFLO1FBQ0wsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFO1FBQ1osUUFBUSxFQUFFLEtBQUs7S0FDaEIsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
|
package/SignalR/index.js
CHANGED
|
@@ -43,7 +43,7 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = ss.ServiceKind.
|
|
|
43
43
|
name: 'Free_F1',
|
|
44
44
|
tier: 'Free',
|
|
45
45
|
}, allowedOrigins, }) => {
|
|
46
|
-
name =
|
|
46
|
+
name = Common_1.naming.getSignalRName(name);
|
|
47
47
|
const signalR = new ss.SignalR(name, {
|
|
48
48
|
resourceName: name,
|
|
49
49
|
...group,
|
|
@@ -65,7 +65,7 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = ss.ServiceKind.
|
|
|
65
65
|
},
|
|
66
66
|
privateEndpoints: [
|
|
67
67
|
{
|
|
68
|
-
name:
|
|
68
|
+
name: Common_1.naming.getPrivateEndpointName(name),
|
|
69
69
|
allow: [
|
|
70
70
|
ss.SignalRRequestType.ClientConnection,
|
|
71
71
|
ss.SignalRRequestType.ServerConnection,
|
|
@@ -125,4 +125,4 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = ss.ServiceKind.
|
|
|
125
125
|
}
|
|
126
126
|
return { name, group, id: signalR.id, instance: signalR };
|
|
127
127
|
};
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsd0VBQTBEO0FBRTFELHNDQUEwQztBQU0xQyw4RUFBc0Q7QUFDdEQsMkRBQTREO0FBZTVEOztLQUVLO0FBQ0wsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsU0FBUyxFQUNULFdBQVcsRUFDWCxJQUFJLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxPQUFPLEVBQzdCLEdBQUcsR0FBRyxjQUFLO0lBQ1QsQ0FBQyxDQUFDO1FBQ0UsSUFBSSxFQUFFLGFBQWE7UUFDbkIsSUFBSSxFQUFFLEVBQUUsQ0FBQyxjQUFjLENBQUMsUUFBUTtRQUNoQyxRQUFRLEVBQUUsQ0FBQztLQUNaO0lBQ0gsQ0FBQyxDQUFDO1FBQ0UsSUFBSSxFQUFFLFNBQVM7UUFDZixJQUFJLEVBQUUsTUFBTTtLQUNiLEVBQ0wsY0FBYyxHQUNSLEVBQXdDLEVBQUU7SUFDaEQsSUFBSSxHQUFHLGVBQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFbkMsTUFBTSxPQUFPLEdBQUcsSUFBSSxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtRQUNuQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixJQUFJO1FBRUosSUFBSSxFQUFFLEVBQUUsY0FBYyxFQUFFO1FBQ3hCLFFBQVEsRUFBRTtZQUNSLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFO1lBQ3pDLHVEQUF1RDtTQUN4RDtRQUNELFdBQVcsRUFBRSxXQUFXO1lBQ3RCLENBQUMsQ0FBQztnQkFDRSxhQUFhLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxLQUFLO2dCQUNqQyxhQUFhLEVBQUU7b0JBQ2IsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFD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
|
package/Sql/Helper.js
CHANGED
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getSqlServerInfo = void 0;
|
|
4
4
|
const Common_1 = require("../Common");
|
|
5
5
|
const getSqlServerInfo = ({ name, groupName, }) => {
|
|
6
|
-
const group =
|
|
7
|
-
const sqlServerName =
|
|
6
|
+
const group = Common_1.naming.getResourceGroupName(groupName);
|
|
7
|
+
const sqlServerName = Common_1.naming.getSqlServerName(name);
|
|
8
8
|
return { name: sqlServerName, group: { resourceGroupName: group } };
|
|
9
9
|
};
|
|
10
10
|
exports.getSqlServerInfo = getSqlServerInfo;
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1NxbC9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0NBQW1DO0FBRTVCLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osU0FBUyxHQUlWLEVBQUUsRUFBRTtJQUNILE1BQU0sS0FBSyxHQUFHLGVBQU0sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNyRCxNQUFNLGFBQWEsR0FBRyxlQUFNLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFcEQsT0FBTyxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztBQUN0RSxDQUFDLENBQUM7QUFYVyxRQUFBLGdCQUFnQixvQkFXM0IifQ==
|
package/Sql/SqlDb.js
CHANGED
|
@@ -28,7 +28,7 @@ const Locker_1 = require("../Core/Locker");
|
|
|
28
28
|
const Common_1 = require("../Common");
|
|
29
29
|
//https://blog.bredvid.no/handling-azure-managed-identity-access-to-azure-sql-in-an-azure-devops-pipeline-1e74e1beb10b
|
|
30
30
|
exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSecondaryFrom, sku = 'S0', dependsOn, importUri, ignoreChanges, lock, }) => {
|
|
31
|
-
name =
|
|
31
|
+
name = Common_1.naming.getSqlDbName(name);
|
|
32
32
|
const dbProps = {
|
|
33
33
|
databaseName: name,
|
|
34
34
|
...group,
|
|
@@ -64,4 +64,4 @@ exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSeco
|
|
|
64
64
|
}
|
|
65
65
|
return { name, group, id: sqlDb.id, instance: sqlDb };
|
|
66
66
|
};
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4REFBZ0Q7QUFDaEQsMkNBQXdDO0FBT3hDLHNDQUEwQztBQXVCMUMsc0hBQXNIO0FBQ3RILGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsSUFBSSxFQUNKLGFBQWEsRUFDYixhQUFhLEVBQ2IsUUFBUSxFQUNSLGVBQWUsRUFDZixHQUFHLEdBQUcsSUFBSSxFQUNWLFNBQVMsRUFDVCxTQUFTLEVBQ1QsYUFBYSxFQUNiLElBQUksR0FDTyxFQUEwQyxFQUFFO0lBQ3ZELElBQUksR0FBRyxlQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpDLE1BQU0sT0FBTyxHQUFxQjtRQUNoQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixVQUFVLEVBQUUsYUFBYTtRQUN6QixhQUFhO1FBQ2IsR0FBRyxFQUFFLGFBQWE7WUFDaEIsQ0FBQyxDQUFDLFNBQVM7WUFDWCxDQUFDLENBQUM7Z0JBQ0UsSUFBSSxFQUFFLEdBQUc7YUFDVjtRQUNMLGdDQUFnQyxFQUFFLGNBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxPQUFPO1FBQzFELFVBQVUsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLE9BQU87S0FDbkMsQ0FBQztJQUVGLElBQUksUUFBUSxFQUFFLENBQUM7UUFDYixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsUUFBUSxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUM7SUFDM0MsQ0FBQztTQUFNLElBQUksZUFBZSxFQUFFLENBQUM7UUFDM0IsT0FBTyxDQUFDLGdCQUFnQixHQUFHLGVBQWUsQ0FBQztRQUMzQyxPQUFPLENBQUMsVUFBVSxHQUFHLEdBQUcsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO1FBQzlDLE9BQU8sQ0FBQyxhQUFhLEdBQUcsR0FBRyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUM7SUFDaEQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFO1FBQzVDLFNBQVM7UUFDVCxhQUFhO1FBQ2IsTUFBTSxFQUFFLFNBQVM7UUFDakIsbUJBQW1CLEVBQUUsSUFBSTtRQUN6QixPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUMsQ0FBQztJQUNILGtCQUFrQjtJQUNsQixJQUFJLElBQUksRUFBRSxDQUFDO1FBQ1QsSUFBQSxlQUFNLEVBQUMsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQztBQUN4RCxDQUFDLENBQUMifQ==
|
package/Sql/index.js
CHANGED
|
@@ -31,7 +31,6 @@ const pulumi_1 = require("@pulumi/pulumi");
|
|
|
31
31
|
const Locker_1 = require("../Core/Locker");
|
|
32
32
|
const Helper_1 = require("../KeyVault/Helper");
|
|
33
33
|
const Common_1 = require("../Common");
|
|
34
|
-
const Common_2 = require("../Common");
|
|
35
34
|
const Helper_2 = require("../VNet/Helper");
|
|
36
35
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
37
36
|
const SqlDb_1 = __importDefault(require("./SqlDb"));
|
|
@@ -40,7 +39,7 @@ const createElasticPool = ({ group, name, sqlName,
|
|
|
40
39
|
//Minimum is 50 GD
|
|
41
40
|
maxSizeBytesGb, preferredEnclaveType = sql.v20230501preview.AlwaysEncryptedEnclaveType.VBS, sku = { name: Common_1.isPrd ? 'Standard' : 'Basic', capacity: 50 }, dependsOn, }) => {
|
|
42
41
|
//Create Sql Elastic
|
|
43
|
-
const elasticName =
|
|
42
|
+
const elasticName = Common_1.naming.getElasticPoolName(name);
|
|
44
43
|
const ep = new sql.v20230501preview.ElasticPool(elasticName, {
|
|
45
44
|
elasticPoolName: elasticName,
|
|
46
45
|
serverName: sqlName,
|
|
@@ -64,7 +63,7 @@ maxSizeBytesGb, preferredEnclaveType = sql.v20230501preview.AlwaysEncryptedEncla
|
|
|
64
63
|
return { name: elasticName, group, id: ep.id, instance: ep };
|
|
65
64
|
};
|
|
66
65
|
exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, envUIDInfo, enableEncryption, envRoles, network, vulnerabilityAssessment, ignoreChanges = [], lock, dependsOn, }) => {
|
|
67
|
-
const sqlName =
|
|
66
|
+
const sqlName = Common_1.naming.getSqlServerName(name);
|
|
68
67
|
const encryptKey = enableEncryption
|
|
69
68
|
? (0, Helper_1.addEncryptKey)(sqlName, vaultInfo, 3072)
|
|
70
69
|
: undefined;
|
|
@@ -294,4 +293,4 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, envUI
|
|
|
294
293
|
databases: dbs,
|
|
295
294
|
};
|
|
296
295
|
};
|
|
297
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
|
296
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
package/Storage/Helper.js
CHANGED
|
@@ -5,10 +5,10 @@ const Common_1 = require("../Common");
|
|
|
5
5
|
const Helper_1 = require("../KeyVault/Helper");
|
|
6
6
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
7
7
|
const getStorageSecrets = ({ storageName, vaultInfo, }) => {
|
|
8
|
-
const primaryKey =
|
|
9
|
-
const secondaryKey =
|
|
10
|
-
const primaryConnection =
|
|
11
|
-
const secondaryConnection =
|
|
8
|
+
const primaryKey = `${(0, Helper_1.getVaultItemName)(storageName)}-key-primary`;
|
|
9
|
+
const secondaryKey = `${(0, Helper_1.getVaultItemName)(storageName)}-key-secondary`;
|
|
10
|
+
const primaryConnection = `${(0, Helper_1.getVaultItemName)(storageName)}-conn-primary`;
|
|
11
|
+
const secondaryConnection = `${(0, Helper_1.getVaultItemName)(storageName)}-conn-secondary`;
|
|
12
12
|
return (0, Helper_1.getSecrets)({
|
|
13
13
|
nameFormatted: true,
|
|
14
14
|
vaultInfo,
|
|
@@ -16,7 +16,7 @@ const getStorageSecrets = ({ storageName, vaultInfo, }) => {
|
|
|
16
16
|
});
|
|
17
17
|
};
|
|
18
18
|
const getStorageInfo = ({ name, group, vaultInfo, }) => {
|
|
19
|
-
name = Common_1.naming.getStorageName(Common_1.
|
|
19
|
+
name = Common_1.naming.getStorageName((0, Common_1.cleanName)(name));
|
|
20
20
|
const secrets = vaultInfo
|
|
21
21
|
? getStorageSecrets({ storageName: name, vaultInfo })
|
|
22
22
|
: {};
|
|
@@ -67,4 +67,4 @@ exports.getStorageInfo = getStorageInfo;
|
|
|
67
67
|
// sharedAccessExpiryTime: expireDate.toISOString(),
|
|
68
68
|
// });
|
|
69
69
|
// };
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUErRDtBQUMvRCwrQ0FBa0U7QUFPbEUsMkNBQTZDO0FBRTdDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxFQUN6QixXQUFXLEVBQ1gsU0FBUyxHQUlWLEVBQXlCLEVBQUU7SUFDMUIsTUFBTSxVQUFVLEdBQUcsR0FBRyxJQUFBLHlCQUFnQixFQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUM7SUFDbEUsTUFBTSxZQUFZLEdBQUcsR0FBRyxJQUFBLHlCQUFnQixFQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQztJQUN0RSxNQUFNLGlCQUFpQixHQUFHLEdBQUcsSUFBQSx5QkFBZ0IsRUFBQyxXQUFXLENBQUMsZUFBZSxDQUFDO0lBQzFFLE1BQU0sbUJBQW1CLEdBQUcsR0FBRyxJQUFBLHlCQUFnQixFQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQztJQUU5RSxPQUFPLElBQUEsbUJBQVUsRUFBQztRQUNoQixhQUFhLEVBQUUsSUFBSTtRQUNuQixTQUFTO1FBQ1QsS0FBSyxFQUFFLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxtQkFBbUIsRUFBRTtLQUM1RSxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFSyxNQUFNLGNBQWMsR0FBRyxDQUFDLEVBQzdCLElBQUksRUFDSixLQUFLLEVBQ0wsU0FBUyxHQUNhLEVBQWUsRUFBRTtJQUN2QyxJQUFJLEdBQUcsZUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFBLGtCQUFTLEVBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUM5QyxNQUFNLE9BQU8sR0FBRyxTQUFTO1FBQ3ZCLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUM7UUFDckQsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVQLE9BQU87UUFDTCxJQUFJO1FBQ0osS0FBSztRQUNMLFNBQVMsRUFBRTtZQUNULElBQUksRUFBRSxXQUFXLElBQUksd0JBQXdCO1lBQzdDLElBQUksRUFBRSxXQUFXLElBQUksd0JBQXdCO1lBQzdDLEtBQUssRUFBRSxXQUFXLElBQUkseUJBQXlCO1NBQ2hEO1FBQ0QsR0FBRyxPQUFPO1FBQ1YsRUFBRSxFQUFFLElBQUEsb0JBQVcsRUFBQSxHQUFHLHdCQUFlLG1CQUFtQixLQUFLLENBQUMsaUJBQWlCLGdEQUFnRCxJQUFJLEVBQUU7S0FDbEksQ0FBQztBQUNKLENBQUMsQ0FBQztBQXJCVyxRQUFBLGNBQWMsa0JBcUJ6QjtBQUVGLGdEQUFnRDtBQUNoRCxlQUFlO0FBQ2YsZUFBZTtBQUNmLE9BQU87QUFDUCx1QkFBdUI7QUFDdkIsNkJBQTZCO0FBQzdCLFVBQVU7QUFDViwwREFBMEQ7QUFDMUQseUJBQXlCO0FBQ3pCLGtDQUFrQztBQUNsQywyQkFBMkI7QUFDM0IsK0JBQStCO0FBQy9CLHFCQUFxQjtBQUNyQixXQUFXO0FBQ1gsbUJBQW1CO0FBQ25CLEVBQUU7QUFDRixvREFBb0Q7QUFDcEQsS0FBSztBQUVMLHlFQUF5RTtBQUN6RSw0QkFBNEI7QUFDNUIsbUNBQW1DO0FBQ25DLG9EQUFvRDtBQUNwRCxFQUFFO0FBQ0YsMkNBQTJDO0FBQzNDLHlCQUF5QjtBQUN6QixnQkFBZ0I7QUFDaEIsb0RBQW9EO0FBQ3BELG9DQUFvQztBQUNwQywwQ0FBMEM7QUFDMUMsNkNBQTZDO0FBQzdDLGdEQUFnRDtBQUNoRCx3REFBd0Q7QUFDeEQsUUFBUTtBQUNSLEtBQUsifQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as pulumi from '@pulumi/pulumi';
|
|
2
2
|
import * as storage from '@pulumi/azure-native/storage';
|
|
3
|
-
import { ResourceArgs } from '../types';
|
|
3
|
+
import { ResourceArgs, WithDependsOn } from '../types';
|
|
4
4
|
interface DateAfterModificationArgs {
|
|
5
5
|
daysAfterLastAccessTimeGreaterThan?: pulumi.Input<number>;
|
|
6
6
|
daysAfterModificationGreaterThan?: pulumi.Input<number>;
|
|
@@ -42,7 +42,7 @@ export type ManagementRules = {
|
|
|
42
42
|
actions: ManagementRuleActions;
|
|
43
43
|
filters?: ManagementRuleFilters;
|
|
44
44
|
};
|
|
45
|
-
export declare const createManagementRules: ({ name, storageAccount, group, rules, containerNames, }: ResourceArgs & {
|
|
45
|
+
export declare const createManagementRules: ({ name, storageAccount, group, rules, containerNames, dependsOn, }: ResourceArgs & WithDependsOn & {
|
|
46
46
|
storageAccount: storage.StorageAccount;
|
|
47
47
|
containerNames?: pulumi.Input<string>[];
|
|
48
48
|
rules: Array<ManagementRules | DefaultManagementRules>;
|