@drunk-pulumi/azure 1.0.21 → 1.0.23

package/KeyVault/Helper.js

@@ -3,11 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSecrets = exports.getSecret = exports.addEncryptKey = void 0;
+exports.getSecrets = exports.getSecret = exports.addEncryptKey = exports.getVaultItemName = void 0;
 const pulumi_1 = require("@pulumi/pulumi");
-const Common_1 = require("../Common");
 const KeyVaultBase_1 = __importDefault(require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase"));
 const azure_providers_1 = require("@drunk-pulumi/azure-providers");
+const Common_1 = require("../Common");
+/** Get Vault Secret Name. Remove the stack name and replace all _ with - then lower cases. */
+const getVaultItemName = (name, currentStack = Common_1.stack) => {
+    name = name
+        .replace(new RegExp(currentStack, 'g'), '') // Replace occurrences of "stack" variable with "-"
+        .replace(/\.|_|\s/g, '-') // Replace ".", "_", and spaces with "-"
+        .replace(/-+/g, '-') // Replace multiple dashes with a single dash
+        .toLowerCase(); // Convert the result to lowercase
+    return (0, Common_1.removeLeadingAndTrailingDash)(name);
+};
+exports.getVaultItemName = getVaultItemName;
 const addEncryptKey = (name, vaultInfo, keySize = 4096) => {
     const key = new azure_providers_1.VaultKeyResource(`${name}-encryptKey`, {
         name: `${name}-encryptKey`,
@@ -19,9 +29,25 @@ const addEncryptKey = (name, vaultInfo, keySize = 4096) => {
         keyVaultUri: key.vaultUrl,
         keyVersion: key.version,
         url: key.id,
+        urlWithoutVersion: (0, pulumi_1.output)([key.version, key.id]).apply(([v, id]) => id.replace(`/${v}`, '')),
     };
 };
 exports.addEncryptKey = addEncryptKey;
+/** Get Key */
+// export const getKey = async ({
+//   name,
+//   version,
+//   vaultInfo,
+//   nameFormatted,
+// }: GetVaultItemProps) => {
+//   const n = nameFormatted ? name : getSecretName(name);
+//   const client = getKeyVaultBase(vaultInfo.name);
+//   return client.getKey(n, version);
+// };
+// interface EncryptionPropertiesArgs {
+//   keySource: 'Microsoft.KeyVault';
+//   keyVaultProperties: Input<KeyVaultPropertiesResults>;
+// }
 /** Get or create encryption Key */
 // const getEncryptionKey = async ({
 //   name,
@@ -45,7 +71,7 @@ exports.addEncryptKey = addEncryptKey;
 // };
 /** Get Secret */
 const getSecret = async ({ name, version, vaultInfo, nameFormatted, }) => {
-    const n = nameFormatted ? name : (0, Common_1.getSecretName)(name);
+    const n = nameFormatted ? name : (0, exports.getVaultItemName)(name);
     const client = (0, KeyVaultBase_1.default)(vaultInfo.name);
     return client.getSecret(n, version);
 };
@@ -77,4 +103,4 @@ exports.getSecrets = getSecrets;
 //     vaultUrl: `https://${splits[2]}`,
 //   };
 // };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwyQ0FBaUU7QUFFakUsc0NBQTBDO0FBQzFDLHFHQUFnRjtBQUNoRixtRUFBaUU7QUF3QjFELE1BQU0sYUFBYSxHQUFHLENBQzNCLElBQVksRUFDWixTQUF1QixFQUN2QixVQUE4QixJQUFJLEVBQ1AsRUFBRTtJQUM3QixNQUFNLEdBQUcsR0FBRyxJQUFJLGtDQUFnQixDQUM5QixHQUFHLElBQUksYUFBYSxFQUNwQjtRQUNFLElBQUksRUFBRSxHQUFHLElBQUksYUFBYTtRQUMxQixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7UUFDekIsR0FBRyxFQUFFLEVBQUUsT0FBTyxFQUFFO0tBQ2pCLEVBQ0QsRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLENBQ3pCLENBQUM7SUFFRixPQUFPO1FBQ0wsT0FBTyxFQUFFLEdBQUcsQ0FBQyxJQUFJO1FBQ2pCLFdBQVcsRUFBRSxHQUFHLENBQUMsUUFBUTtRQUN6QixVQUFVLEVBQUUsR0FBRyxDQUFDLE9BQU87UUFDdkIsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFO0tBQ1osQ0FBQztBQUNKLENBQUMsQ0FBQztBQXJCVyxRQUFBLGFBQWEsaUJBcUJ4QjtBQW1CRixtQ0FBbUM7QUFDbkMsb0NBQW9DO0FBQ3BDLFVBQVU7QUFDVixlQUFlO0FBQ2YsNEVBQTRFO0FBQzVFLHFDQUFxQztBQUNyQyx5RUFBeUU7QUFDekUsYUFBYTtBQUNiLHFDQUFxQztBQUNyQyw2Q0FBNkM7QUFDN0MsMkNBQTJDO0FBQzNDLGtHQUFrRztBQUNsRyxPQUFPO0FBQ1AsS0FBSztBQUVMLDJDQUEyQztBQUMzQyxVQUFVO0FBQ1YsZUFBZTtBQUNmLDZFQUE2RTtBQUM3RSxzQ0FBc0M7QUFDdEMsMERBQTBEO0FBQzFELEtBQUs7QUFFTCxpQkFBaUI7QUFDVixNQUFNLFNBQVMsR0FBRyxLQUFLLEVBQUUsRUFDOUIsSUFBSSxFQUNKLE9BQU8sRUFDUCxTQUFTLEVBQ1QsYUFBYSxHQUNLLEVBQUUsRUFBRTtJQUN0QixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxzQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUEsc0JBQWUsRUFBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsT0FBTyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUN0QyxDQUFDLENBQUM7QUFUVyxRQUFBLFNBQVMsYUFTcEI7QUFFSyxNQUFNLFVBQVUsR0FBRyxDQUFtQyxFQUMzRCxLQUFLLEVBQ0wsU0FBUyxFQUNULGFBQWEsR0FJZCxFQUFtQyxFQUFFO0lBQ3BDLE1BQU0sRUFBRSxHQUFtQyxFQUFFLENBQUM7SUFFOUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUMvQixNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdEIsTUFBTSxJQUFJLEdBQUcsSUFBQSxlQUFNLEVBQUMsSUFBQSxpQkFBUyxFQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDbkUsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFNLENBQUMsQ0FBQztJQUN4QyxDQUFDLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBcUMsQ0FBQztBQUMvQyxDQUFDLENBQUM7QUFoQlcsUUFBQSxVQUFVLGNBZ0JyQjtBQUVGLHdCQUF3QjtBQUN4QixrQkFBa0I7QUFDbEIsa0VBQWtFO0FBQ2xFLHFCQUFxQjtBQUNyQiw0QkFBNEI7QUFDNUIsc0JBQXNCO0FBQ3RCLElBQUk7QUFFSixtQ0FBbUM7QUFDbkMsOERBQThEO0FBQzlELHNDQUFzQztBQUN0QyxhQUFhO0FBQ2IsOEJBQThCO0FBQzlCLHVCQUF1QjtBQUN2QixtREFBbUQ7QUFDbkQsd0NBQXdDO0FBQ3hDLE9BQU87QUFDUCxLQUFLIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwyQ0FBZ0Q7QUFFaEQscUdBQWdGO0FBQ2hGLG1FQUFpRTtBQUNqRSxzQ0FBZ0U7QUFFaEUsOEZBQThGO0FBQ3ZGLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsSUFBWSxFQUNaLGVBQXVCLGNBQUssRUFDNUIsRUFBRTtJQUNGLElBQUksR0FBRyxJQUFJO1NBQ1IsT0FBTyxDQUFDLElBQUksTUFBTSxDQUFDLFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxtREFBbUQ7U0FDOUYsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQyx3Q0FBd0M7U0FDakUsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyw2Q0FBNkM7U0FDakUsV0FBVyxFQUFFLENBQUMsQ0FBQyxrQ0FBa0M7SUFFcEQsT0FBTyxJQUFBLHFDQUE0QixFQUFDLElBQUksQ0FBQyxDQUFDO0FBQzVDLENBQUMsQ0FBQztBQVhXLFFBQUEsZ0JBQWdCLG9CQVczQjtBQXlCSyxNQUFNLGFBQWEsR0FBRyxDQUMzQixJQUFZLEVBQ1osU0FBdUIsRUFDdkIsVUFBOEIsSUFBSSxFQUNQLEVBQUU7SUFDN0IsTUFBTSxHQUFHLEdBQUcsSUFBSSxrQ0FBZ0IsQ0FDOUIsR0FBRyxJQUFJLGFBQWEsRUFDcEI7UUFDRSxJQUFJLEVBQUUsR0FBRyxJQUFJLGFBQWE7UUFDMUIsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJO1FBQ3pCLEdBQUcsRUFBRSxFQUFFLE9BQU8sRUFBRTtLQUNqQixFQUNELEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxDQUN6QixDQUFDO0lBRUYsT0FBTztRQUNMLE9BQU8sRUFBRSxHQUFHLENBQUMsSUFBSTtRQUNqQixXQUFXLEVBQUUsR0FBRyxDQUFDLFFBQVE7UUFDekIs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

package/KeyVault/index.js

@@ -52,7 +52,7 @@ exports.createVaultPrivateLink = createVaultPrivateLink;
 //     logsCategories: ['AuditEvent'],
 //   });
 exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignoreChanges = [], dependsOn, importUri, ...others }) => {
-    const vaultName = (0, Common_1.getKeyVaultName)(name);
+    const vaultName = Common_1.naming.getKeyVaultName(name);
     const vault = new keyvault.Vault(vaultName, {
         vaultName,
         ...group,
@@ -113,4 +113,4 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
         createPrivateLink,
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RUFBMEQ7QUFDMUQsc0RBQW1EO0FBRW5ELHNDQUFzRDtBQVF0RCw4RUFBc0Q7QUFPL0MsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLEVBQ3JDLFNBQVMsRUFDVCxHQUFHLEtBQUssRUFHVCxFQUFFLEVBQUUsQ0FDSCxJQUFBLHlCQUFlLEVBQUM7SUFDZCxZQUFZLEVBQUUsU0FBUztJQUN2QixHQUFHLEtBQUs7SUFDUixrQkFBa0IsRUFBRSxpQ0FBaUM7SUFDckQsbUJBQW1CLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDO0NBQzlELENBQUMsQ0FBQztBQVhRLFFBQUEsc0JBQXNCLDBCQVc5QjtBQUVMLDBDQUEwQztBQUMxQyxlQUFlO0FBQ2YsYUFBYTtBQUNiLE9BQU87QUFDUCw2QkFBNkI7QUFDN0IsK0JBQStCO0FBQy9CLFFBQVE7QUFDUix1QkFBdUI7QUFDdkIsdUNBQXVDO0FBQ3ZDLHNDQUFzQztBQUN0QyxrQkFBa0I7QUFDbEIsc0NBQXNDO0FBQ3RDLFFBQVE7QUFFUixrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEVBQ1AseUJBQXlCLEdBQUcsQ0FBQyxFQUM3QixhQUFhLEdBQUcsRUFBRSxFQUNsQixTQUFTLEVBQ1QsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNLLEVBQUUsRUFBRTtJQUNsQixNQUFNLFNBQVMsR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFeEMsTUFBTSxLQUFLLEdBQUcsSUFBSSxRQUFRLENBQUMsS0FBSyxDQUM5QixTQUFTLEVBQ1Q7UUFDRSxTQUFTO1FBQ1QsR0FBRyxLQUFLO1FBQ1IsR0FBRyxNQUFNO1FBRVQsVUFBVSxFQUFFO1lBQ1YsUUFBUSxFQUFSLGlCQUFRO1lBQ1IsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFO1lBQ3RDLFVBQVUsRUFBRSxTQUFTO1lBRXJCLHVCQUF1QixFQUFFLElBQUk7WUFDN0IsY0FBYyxFQUFFLFNBQVM7WUFFekIscUJBQXFCLEVBQUUsSUFBSTtZQUMzQixnQkFBZ0IsRUFBRSxJQUFJO1lBQ3RCLHlCQUF5QixFQUFFLDJFQUEyRTtZQUV0RyxvQkFBb0IsRUFBRSxJQUFJO1lBQzFCLHdCQUF3QixFQUFFLElBQUk7WUFDOUIsNEJBQTRCLEVBQUUsSUFBSTtZQUVsQyxXQUFXLEVBQUU7Z0JBQ1gsTUFBTSxFQUFFLGVBQWU7Z0JBQ3ZCLGFBQWEsRUFBRSxhQUFLLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFDLEtBQUs7Z0JBRXJELE9BQU8sRUFBRSxPQUFPLEVBQUUsV0FBVztvQkFDM0IsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7b0JBQ2hELENBQUMsQ0FBQyxFQUFFO2dCQUVOLG1CQUFtQixFQUFFLE9BQU8sRUFBRSxRQUFRO29CQUNwQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxPQUFPLENBQUMsUUFBUSxFQUFFLENBQUM7b0JBQzVCLENBQUMsQ0FBQyxTQUFTO2FBQ2Q7U0FDRjtLQUNGLEVBQ0Q7UUFDRSxTQUFTO1FBQ1QsTUFBTSxFQUFFLFNBQVM7UUFDakIsYUFBYSxFQUFFO1lBQ2IsMkJBQTJCO1lBQzNCLGtCQUFrQjtZQUNsQix1QkFBdUI7WUFDdkIsR0FBRyxhQUFhO1NBQ2pCO0tBQ0YsQ0FDRixDQUFDO0lBRUYsZUFBZTtJQUNmLE1BQU0sSUFBSSxHQUFHLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDbEIsSUFBSSxFQUFFLFNBQVM7UUFDZixLQUFLO1FBQ0wsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFO0tBQ2IsQ0FBQyxDQUFDO0lBRUgsc0JBQXNCO0lBQ3RCLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxLQUEyQixFQUFFLEVBQUUsQ0FDeEQsSUFBQSw4QkFBc0IsRUFBQyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsRUFBRSxHQUFHLEtBQUssRUFBRSxDQUFDLENBQUM7SUFFMUQscUJBQXFCO0lBQ3JCLElBQUksT0FBTyxFQUFFLFdBQVcsRUFBRSxDQUFDO1FBQ3pCLGlCQUFpQixDQUFDLE9BQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBRUQsZ0JBQWdCO0lBQ2hCLHVEQUF1RDtJQUN2RCwyREFBMkQ7SUFFM0QsT0FBTztRQUNMLElBQUksRUFBRSxTQUFTO1FBQ2YsS0FBSztRQUNMLElBQUk7UUFDSixnQkFBZ0I7UUFDaEIsaUJBQWlCO0tBQ2xCLENBQUM7QUFDSixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RUFBMEQ7QUFDMUQsc0RBQW1EO0FBRW5ELHNDQUE2QztBQU83Qyw4RUFBc0Q7QUFPL0MsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLEVBQ3JDLFNBQVMsRUFDVCxHQUFHLEtBQUssRUFHVCxFQUFFLEVBQUUsQ0FDSCxJQUFBLHlCQUFlLEVBQUM7SUFDZCxZQUFZLEVBQUUsU0FBUztJQUN2QixHQUFHLEtBQUs7SUFDUixrQkFBa0IsRUFBRSxpQ0FBaUM7SUFDckQsbUJBQW1CLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDO0NBQzlELENBQUMsQ0FBQztBQVhRLFFBQUEsc0JBQXNCLDBCQVc5QjtBQUVMLDBDQUEwQztBQUMxQyxlQUFlO0FBQ2YsYUFBYTtBQUNiLE9BQU87QUFDUCw2QkFBNkI7QUFDN0IsK0JBQStCO0FBQy9CLFFBQVE7QUFDUix1QkFBdUI7QUFDdkIsdUNBQXVDO0FBQ3ZDLHNDQUFzQztBQUN0QyxrQkFBa0I7QUFDbEIsc0NBQXNDO0FBQ3RDLFFBQVE7QUFFUixrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEVBQ1AseUJBQXlCLEdBQUcsQ0FBQyxFQUM3QixhQUFhLEdBQUcsRUFBRSxFQUNsQixTQUFTLEVBQ1QsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNLLEVBQUUsRUFBRTtJQUNsQixNQUFNLFNBQVMsR0FBRyxlQUFNLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9DLE1BQU0sS0FBSyxHQUFHLElBQUksUUFBUSxDQUFDLEtBQUssQ0FDOUIsU0FBUyxFQUNUO1FBQ0UsU0FBUztRQUNULEdBQUcsS0FBSztRQUNSLEdBQUcsTUFBTTtRQUVULFVBQVUsRUFBRTtZQUNWLFFBQVEsRUFBUixpQkFBUTtZQUNSLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRTtZQUN0QyxVQUFVLEVBQUUsU0FBUztZQUVyQix1QkFBdUIsRUFBRSxJQUFJO1lBQzdCLGNBQWMsRUFBRSxTQUFTO1lBRXpCLHFCQUFxQixFQUFFLElBQUk7WUFDM0IsZ0JBQWdCLEVBQUUsSUFBSTtZQUN0Qix5QkFBeUIsRUFBRSwyRUFBMkU7WUFFdEcsb0JBQW9CLEVBQUUsSUFBSTtZQUMxQix3QkFBd0IsRUFBRSxJQUFJO1lBQzlCLDRCQUE0QixFQUFFLElBQUk7WUFFbEMsV0FBVyxFQUFFO2dCQUNYLE1BQU0sRUFBRSxlQUFlO2dCQUN2QixhQUFhLEVBQUUsYUFBSyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLO2dCQUVyRCxPQUFPLEVBQUUsT0FBTyxFQUFFLFdBQVc7b0JBQzNCLENBQUMsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO29CQUNoRCxDQUFDLENBQUMsRUFBRTtnQkFFTixtQkFBbUIsRUFBRSxPQUFPLEVBQUUsUUFBUTtvQkFDcEMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO29CQUM1QixDQUFDLENBQUMsU0FBUzthQUNkO1NBQ0Y7S0FDRixFQUNEO1FBQ0UsU0FBUztRQUNULE1BQU0sRUFBRSxTQUFTO1FBQ2pCLGFBQWEsRUFBRTtZQUNiLDJCQUEyQjtZQUMzQixrQkFBa0I7WUFDbEIsdUJBQXVCO1lBQ3ZCLEdBQUcsYUFBYTtTQUNqQjtLQUNGLENBQ0YsQ0FBQztJQUVGLGVBQWU7SUFDZixNQUFNLElBQUksR0FBRyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLElBQUksRUFBRSxTQUFTO1FBQ2YsS0FBSztRQUNMLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRTtLQUNiLENBQUMsQ0FBQztJQUVILHNCQUFzQjtJQUN0QixNQUFNLGlCQUFpQixHQUFHLENBQUMsS0FBMkIsRUFBRSxFQUFFLENBQ3hELElBQUEsOEJBQXNCLEVBQUMsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLEVBQUUsR0FBRyxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBRTFELHFCQUFxQjtJQUNyQixJQUFJLE9BQU8sRUFBRSxXQUFXLEVBQUUsQ0FBQztRQUN6QixpQkFBaUIsQ0FBQyxPQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDMUMsQ0FBQztJQUVELGdCQUFnQjtJQUNoQix1REFBdUQ7SUFDdkQsMkRBQTJEO0lBRTNELE9BQU87UUFDTCxJQUFJLEVBQUUsU0FBUztRQUNmLEtBQUs7UUFDTCxJQUFJO1FBQ0osZ0JBQWdCO1FBQ2hCLGlCQUFpQjtLQUNsQixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/Logs/AppInsight.js

@@ -29,7 +29,7 @@ const Helper_1 = require("../KeyVault/Helper");
 const Common_1 = require("../Common");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 exports.default = ({ group, name, dailyCapGb = 0.023, immediatePurgeDataOn30Days = true, ingestionMode = native.insights.IngestionMode.ApplicationInsights, workspaceResourceId, vaultInfo, }) => {
-    name = (0, Common_1.getAppInsightName)(name);
+    name = Common_1.naming.getAppInsightName(name);
     const appInsight = new native.insights.Component(name, {
         resourceName: name,
         ...group,
@@ -73,4 +73,4 @@ const getAppInsightKey = async ({ resourceInfo, vaultInfo, }) => {
     return key?.value ?? '';
 };
 exports.getAppInsightKey = getAppInsightKey;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwSW5zaWdodC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0FwcEluc2lnaHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFNL0MsK0NBQStDO0FBQy9DLHNDQUE4QztBQUM5QywyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osVUFBVSxHQUFHLEtBQUssRUFDbEIsMEJBQTBCLEdBQUcsSUFBSSxFQUNqQyxhQUFhLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsbUJBQW1CLEVBQ2pFLG1CQUFtQixFQUNuQixTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFL0IsTUFBTSxVQUFVLEdBQUcsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7UUFDckQsWUFBWSxFQUFFLElBQUk7UUFDbEIsR0FBRyxLQUFLO1FBRVIsSUFBSSxFQUFFLEtBQUs7UUFDWCxnQkFBZ0IsRUFBRSxJQUFJO1FBQ3RCLGVBQWUsRUFBRSxLQUFLO1FBQ3RCLFFBQVEsRUFBRSxXQUFXO1FBRXJCLHVDQUF1QztRQUN2QyxlQUFlLEVBQUUsRUFBRTtRQUVuQiwwQkFBMEI7UUFDMUIsYUFBYTtRQUViLGdCQUFnQixFQUFFLElBQUk7UUFDdEIsbUJBQW1CO0tBQ3BCLENBQUMsQ0FBQztJQUVILElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyw4QkFBOEIsQ0FDaEQsR0FBRyxJQUFJLHdCQUF3QixFQUMvQjtRQUNFLHNCQUFzQixFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsZ0RBQWdEO1FBQ25GLGFBQWEsRUFBRTtZQUNiLEdBQUcsRUFBRSxVQUFVO1lBQ2YsOEJBQThCLEVBQUUsSUFBSTtTQUNyQztRQUNELGlCQUFpQixFQUFFLEtBQUssQ0FBQyxpQkFBaUI7UUFDMUMsWUFBWSxFQUFFLFVBQVUsQ0FBQyxJQUFJO0tBQzlCLENBQ0YsQ0FBQztJQUVGLElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxJQUFBLDhCQUFlLEVBQUM7WUFDZCxJQUFJO1lBQ0osYUFBYSxFQUFFLElBQUk7WUFDbkIsS0FBSyxFQUFFLFVBQVUsQ0FBQyxrQkFBa0I7WUFDcEMsU0FBUztZQUNULFdBQVcsRUFBRSxZQUFZO1lBQ3pCLFNBQVMsRUFBRSxVQUFVO1NBQ3RCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLFVBQVUsQ0FBQztBQUNwQixDQUFDLENBQUM7QUFFSyxNQUFNLGdCQUFnQixHQUFHLEtBQUssRUFBRSxFQUNyQyxZQUFZLEVBQ1osU0FBUyxHQUlWLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFBLGtCQUFTLEVBQUM7UUFDMUIsSUFBSSxFQUFFLFlBQVksQ0FBQyxJQUFJO1FBQ3ZCLFNBQVM7S0FDVixDQUFDLENBQUM7SUFDSCxPQUFPLEdBQUcsRUFBRSxLQUFLLElBQUksRUFBRSxDQUFDO0FBQzFCLENBQUMsQ0FBQztBQVpXLFFBQUEsZ0JBQWdCLG9CQVkzQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwSW5zaWdodC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0FwcEluc2lnaHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFNL0MsK0NBQStDO0FBQy9DLHNDQUFtQztBQUNuQywyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osVUFBVSxHQUFHLEtBQUssRUFDbEIsMEJBQTBCLEdBQUcsSUFBSSxFQUNqQyxhQUFhLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsbUJBQW1CLEVBQ2pFLG1CQUFtQixFQUNuQixTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLGVBQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV0QyxNQUFNLFVBQVUsR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtRQUNyRCxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFFUixJQUFJLEVBQUUsS0FBSztRQUNYLGdCQUFnQixFQUFFLElBQUk7UUFDdEIsZUFBZSxFQUFFLEtBQUs7UUFDdEIsUUFBUSxFQUFFLFdBQVc7UUFFckIsdUNBQXVDO1FBQ3ZDLGVBQWUsRUFBRSxFQUFFO1FBRW5CLDBCQUEwQjtRQUMxQixhQUFhO1FBRWIsZ0JBQWdCLEVBQUUsSUFBSTtRQUN0QixtQkFBbUI7S0FDcEIsQ0FBQyxDQUFDO0lBRUgsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLDhCQUE4QixDQUNoRCxHQUFHLElBQUksd0JBQXdCLEVBQy9CO1FBQ0Usc0JBQXNCLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxnREFBZ0Q7UUFDbkYsYUFBYSxFQUFFO1lBQ2IsR0FBRyxFQUFFLFVBQVU7WUFDZiw4QkFBOEIsRUFBRSxJQUFJO1NBQ3JDO1FBQ0QsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjtRQUMxQyxZQUFZLEVBQUUsVUFBVSxDQUFDLElBQUk7S0FDOUIsQ0FDRixDQUFDO0lBRUYsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLElBQUEsOEJBQWUsRUFBQztZQUNkLElBQUk7WUFDSixhQUFhLEVBQUUsSUFBSTtZQUNuQixLQUFLLEVBQUUsVUFBVSxDQUFDLGtCQUFrQjtZQUNwQyxTQUFTO1lBQ1QsV0FBVyxFQUFFLFlBQVk7WUFDekIsU0FBUyxFQUFFLFVBQVU7U0FDdEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMsQ0FBQztBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxFQUFFLEVBQ3JDLFlBQVksRUFDWixTQUFTLEdBSVYsRUFBbUIsRUFBRTtJQUNwQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUEsa0JBQVMsRUFBQztRQUMxQixJQUFJLEVBQUUsWUFBWSxDQUFDLElBQUk7UUFDdkIsU0FBUztLQUNWLENBQUMsQ0FBQztJQUNILE9BQU8sR0FBRyxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDMUIsQ0FBQyxDQUFDO0FBWlcsUUFBQSxnQkFBZ0Isb0JBWTNCIn0=

package/Logs/Helpers.js

@@ -85,7 +85,7 @@ const getLogWpSecrets = ({ workspaceName, vaultInfo, }) => {
     });
 };
 const getLogWpInfo = ({ name, group, vaultInfo, }) => {
-    const n = Common_1.naming.getLogWpName(Common_1.naming.cleanName(name));
+    const n = Common_1.naming.getLogWpName(name);
     const id = (0, pulumi_1.interpolate) `${Common_1.defaultSubScope}/resourceGroups/${group.resourceGroupName}/providers/microsoft.operationalinsights/workspaces/${n}`;
     const secrets = vaultInfo
         ? getLogWpSecrets({ workspaceName: n, vaultInfo })
@@ -98,7 +98,7 @@ const getAppInsightSecrets = ({ insightName, vaultInfo, }) => (0, Helper_1.getSe
     names: { instrumentationKey: insightName },
 });
 const getAppInsightInfo = ({ name, group, vaultInfo, }) => {
-    const n = Common_1.naming.getAppInsightName(Common_1.naming.cleanName(name));
+    const n = Common_1.naming.getAppInsightName(name);
     const id = (0, pulumi_1.interpolate) `${Common_1.defaultSubScope}/resourceGroups/${group.resourceGroupName}/providers/microsoft.insights/components/${n}`;
     const secrets = vaultInfo
         ? getAppInsightSecrets({ insightName: n, vaultInfo })
@@ -107,7 +107,10 @@ const getAppInsightInfo = ({ name, group, vaultInfo, }) => {
 };
 const getLogInfo = (groupName, vaultInfo = undefined) => {
     const rgName = Common_1.naming.getResourceGroupName(groupName);
-    const name = (0, Common_1.getResourceName)(Common_1.naming.cleanName(groupName), { suffix: 'logs' });
+    const name = (0, Common_1.getResourceName)(groupName, {
+        cleanName: true,
+        suffix: 'logs',
+    });
     const group = { resourceGroupName: rgName, location: Common_1.currentRegionName };
     const logWp = getLogWpInfo({
         name,
@@ -123,4 +126,4 @@ const getLogInfo = (groupName, vaultInfo = undefined) => {
     return { logWp, logStorage, appInsight };
 };
 exports.getLogInfo = getLogInfo;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQW9EO0FBQ3BELHNDQUttQjtBQUNuQiwrQ0FBZ0Q7QUFDaEQsOENBQW1EO0FBYTVDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osZ0JBQWdCLEVBQ2hCLE9BQU8sRUFDUCxpQkFBaUIsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUNsQyxjQUFjLEVBQ2QsU0FBUyxHQUNPLEVBQUUsRUFBRTtJQUNwQiw0Q0FBNEM7SUFDNUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FDWCxtQkFBbUIsSUFBSSw0Q0FBNEMsQ0FDcEUsQ0FBQztRQUNGLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxrQ0FBa0M7SUFDbEMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDdEIsT0FBTyxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsSUFBSSxzQkFBc0IsQ0FBQyxDQUFDO1FBQ2pFLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUMvQixNQUFNLENBQUMsR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDO0lBQ3pCLE9BQU8sSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUMxQyxDQUFDLEVBQ0Q7UUFDRSxJQUFJLEVBQUUsQ0FBQztRQUNQLFdBQVcsRUFBRSxnQkFBZ0I7UUFDN0IsMkJBQTJCLEVBQUUsa0JBQWtCO1FBRS9DLFdBQVcsRUFBRSxJQUFJO1FBQ2pCLGdCQUFnQixFQUFFLElBQUksQ0FBQyxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQW9EO0FBQ3BELHNDQUttQjtBQUNuQiwrQ0FBZ0Q7QUFDaEQsOENBQW1EO0FBYTVDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osZ0JBQWdCLEVBQ2hCLE9BQU8sRUFDUCxpQkFBaUIsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUNsQyxjQUFjLEVBQ2QsU0FBUyxHQUNPLEVBQUUsRUFBRTtJQUNwQiw0Q0FBNEM7SUFDNUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FDWCxtQkFBbUIsSUFBSSw0Q0FBNEMsQ0FDcEUsQ0FBQztRQUNGLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxrQ0FBa0M7SUFDbEMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDdEIsT0FBTyxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsSUFBSSxzQkFBc0IsQ0FBQyxDQUFDO1FBQ2pFLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUMvQixNQUFNLENBQUMsR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDO0lBQ3pCLE9BQU8sSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUMxQyxDQUFDLEVBQ0Q7UUFDRSxJQUFJLEVBQUUsQ0FBQztRQUNQLFdBQVcsRUFBRSxnQkFBZ0I7UUFDN0IsMkJBQTJCLEVBQUUsa0JBQWtCO1FBRS9DLFdBQVcsRUFBRSxJQUFJO1FBQ2pCLGdCQUFnQixFQUFFLElBQUksQ0FBQyxDQUFD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

package/Logs/LogAnalytics.js

@@ -27,7 +27,7 @@ const insights = __importStar(require("@pulumi/azure-native/operationalinsights"
 const Common_1 = require("../Common");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 exports.default = ({ name, group, sku = insights.WorkspaceSkuNameEnum.Free, dailyQuotaGb = 0.023, vaultInfo, dependsOn, ignoreChanges, importUri, }) => {
-    name = (0, Common_1.getLogWpName)(name);
+    name = Common_1.naming.getLogWpName(name);
     const workspaceIdKeyName = `${name}-Id`;
     const primaryKeyName = `${name}-primary`;
     const secondaryKeyName = `${name}-secondary`;
@@ -77,4 +77,4 @@ exports.default = ({ name, group, sku = insights.WorkspaceSkuNameEnum.Free, dail
     }
     return log;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nQW5hbHl0aWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0xvZ3MvTG9nQW5hbHl0aWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtRkFBcUU7QUFFckUsc0NBQXFEO0FBQ3JELDJEQUE2RTtBQU83RSxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxHQUFHLEdBQUcsUUFBUSxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFDeEMsWUFBWSxHQUFHLEtBQUssRUFDcEIsU0FBUyxFQUNULFNBQVMsRUFDVCxhQUFhLEVBQ2IsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLHFCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsTUFBTSxrQkFBa0IsR0FBRyxHQUFHLElBQUksS0FBSyxDQUFDO0lBQ3hDLE1BQU0sY0FBYyxHQUFHLEdBQUcsSUFBSSxVQUFVLENBQUM7SUFDekMsTUFBTSxnQkFBZ0IsR0FBRyxHQUFHLElBQUksWUFBWSxDQUFDO0lBRTdDLE1BQU0sR0FBRyxHQUFHLElBQUksUUFBUSxDQUFDLFNBQVMsQ0FDaEMsSUFBSSxFQUNKO1FBQ0UsYUFBYSxFQUFFLElBQUk7UUFDbkIsR0FBRyxLQUFLO1FBRVIsK0JBQStCLEVBQUUsU0FBUztRQUMxQywyQkFBMkIsRUFBRSxTQUFTO1FBQ3RDLFFBQVEsRUFBRTtZQUNSLDJDQUEyQztZQUMzQyx5QkFBeUI7WUFDekIsMEJBQTBCO1lBQzFCLHNFQUFzRTtZQUN0RSwwQkFBMEIsRUFBRSxJQUFJO1NBQ2pDO1FBQ0QsZ0JBQWdCLEVBQ2QsR0FBRyxLQUFLLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJO1lBQ3hDLENBQUMsQ0FBQyxTQUFTO1lBQ1gsQ0FBQyxDQUFDLEVBQUUsWUFBWSxFQUFFLEVBQUUsZ0NBQWdDO1FBRXhELGVBQWUsRUFBRSxHQUFHLEtBQUssUUFBUSxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUscUJBQXFCO1FBQzNGLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUU7S0FDbkIsRUFDRCxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsQ0FDN0IsQ0FBQztJQUVGLElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUU7WUFDaEMsSUFBSSxDQUFDLEVBQUU7Z0JBQUUsT0FBTztZQUVoQixNQUFNLElBQUksR0FBRyxNQUFNLFFBQVEsQ0FBQyxhQUFhLENBQUM7Z0JBQ3hDLGFBQWEsRUFBRSxJQUFJO2dCQUNuQixpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO2FBQzNDLENBQUMsQ0FBQztZQUNILElBQUEsK0JBQWdCLEVBQUM7Z0JBQ2YsV0FBVyxFQUFFLGVBQWU7Z0JBQzVCLGFBQWEsRUFBRSxJQUFJO2dCQUNuQixTQUFTO2dCQUNULEtBQUssRUFBRTtvQkFDTCxFQUFFLElBQUksRUFBRSxrQkFBa0IsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO29CQUN2Qzt3QkFDRSxJQUFJLEVBQUUsY0FBYzt3QkFDcEIsS0FBSyxFQUFFLElBQUksQ0FBQyxnQkFBaUI7cUJBQzlCO29CQUNEO3dCQUNFLElBQUksRUFBRSxnQkFBZ0I7d0JBQ3RCLEtBQUssRUFBRSxJQUFJLENBQUMsa0JBQW1CO3FCQUNoQztpQkFDRjthQUNGLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nQW5hbHl0aWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0xvZ3MvTG9nQW5hbHl0aWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtRkFBcUU7QUFFckUsc0NBQW1DO0FBQ25DLDJEQUE0RDtBQU81RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxHQUFHLEdBQUcsUUFBUSxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFDeEMsWUFBWSxHQUFHLEtBQUssRUFDcEIsU0FBUyxFQUNULFNBQVMsRUFDVCxhQUFhLEVBQ2IsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxlQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pDLE1BQU0sa0JBQWtCLEdBQUcsR0FBRyxJQUFJLEtBQUssQ0FBQztJQUN4QyxNQUFNLGNBQWMsR0FBRyxHQUFHLElBQUksVUFBVSxDQUFDO0lBQ3pDLE1BQU0sZ0JBQWdCLEdBQUcsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUU3QyxNQUFNLEdBQUcsR0FBRyxJQUFJLFFBQVEsQ0FBQyxTQUFTLENBQ2hDLElBQUksRUFDSjtRQUNFLGFBQWEsRUFBRSxJQUFJO1FBQ25CLEdBQUcsS0FBSztRQUVSLCtCQUErQixFQUFFLFNBQVM7UUFDMUMsMkJBQTJCLEVBQUUsU0FBUztRQUN0QyxRQUFRLEVBQUU7WUFDUiwyQ0FBMkM7WUFDM0MseUJBQXlCO1lBQ3pCLDBCQUEwQjtZQUMxQixzRUFBc0U7WUFDdEUsMEJBQTBCLEVBQUUsSUFBSTtTQUNqQztRQUNELGdCQUFnQixFQUNkLEdBQUcsS0FBSyxRQUFRLENBQUMsb0JBQW9CLENBQUMsSUFBSTtZQUN4QyxDQUFDLENBQUMsU0FBUztZQUNYLENBQUMsQ0FBQyxFQUFFLFlBQVksRUFBRSxFQUFFLGdDQUFnQztRQUV4RCxlQUFlLEVBQUUsR0FBRyxLQUFLLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLHFCQUFxQjtRQUMzRixHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFO0tBQ25CLEVBQ0QsRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLENBQzdCLENBQUM7SUFFRixJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ2hDLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFFaEIsTUFBTSxJQUFJLEdBQUcsTUFBTSxRQUFRLENBQUMsYUFBYSxDQUFDO2dCQUN4QyxhQUFhLEVBQUUsSUFBSTtnQkFDbkIsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjthQUMzQyxDQUFDLENBQUM7WUFDSCxJQUFBLCtCQUFnQixFQUFDO2dCQUNmLFdBQVcsRUFBRSxlQUFlO2dCQUM1QixhQUFhLEVBQUUsSUFBSTtnQkFDbkIsU0FBUztnQkFDVCxLQUFLLEVBQUU7b0JBQ0wsRUFBRSxJQUFJLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtvQkFDdkM7d0JBQ0UsSUFBSSxFQUFFLGNBQWM7d0JBQ3BCLEtBQUssRUFBRSxJQUFJLENBQUMsZ0JBQWlCO3FCQUM5QjtvQkFDRDt3QkFDRSxJQUFJLEVBQUUsZ0JBQWdCO3dCQUN0QixLQUFLLEVBQUUsSUFBSSxDQUFDLGtCQUFtQjtxQkFDaEM7aUJBQ0Y7YUFDRixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUMsQ0FBQyJ9

package/Logs/WebTest.js

@@ -36,7 +36,7 @@ const addInsightMonitor = ({ name, alertGroupAction, appInsight, url, frequency
         if (!g)
             return;
         const webTest = new native.insights.WebTest(name, {
-            webTestName: (0, Common_1.getWebTestName)(name),
+            webTestName: Common_1.naming.getWebTestName(name),
             resourceGroupName: appInsight.group.resourceGroupName,
             syntheticMonitorId: g,
             description: `Health check ${name}`,
@@ -68,7 +68,7 @@ const addInsightMonitor = ({ name, alertGroupAction, appInsight, url, frequency
         //Enable Alert
         if (alertGroupAction) {
             const alertGroup = await native.insights.getActionGroup(alertGroupAction);
-            const alertName = (0, Common_1.getAlertName)(name);
+            const alertName = Common_1.naming.getAlertName(name);
             new native.insights.MetricAlert(alertName, {
                 resourceGroupName: appInsight.group.resourceGroupName,
                 enabled: true,
@@ -88,4 +88,4 @@ const addInsightMonitor = ({ name, alertGroupAction, appInsight, url, frequency
     });
 };
 exports.addInsightMonitor = addInsightMonitor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViVGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL1dlYlRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQTRDO0FBQzVDLHNDQUF5RDtBQUN6RCx1REFBeUM7QUFjbEMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLEVBQ2hDLElBQUksRUFDSixnQkFBZ0IsRUFDaEIsVUFBVSxFQUNWLEdBQUcsRUFDSCxTQUFTLEdBQUcsR0FBRyxHQUNLLEVBQUUsRUFBRTtJQUN4QixNQUFNLElBQUksR0FBRyxJQUFBLG1CQUFVLEVBQUMsR0FBRyxJQUFJLFVBQVUsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNsRCxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7UUFBRSxHQUFHLEdBQUcsV0FBVyxHQUFHLEVBQUUsQ0FBQztJQUVuRCxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN4RCxJQUFJLENBQUMsQ0FBQztZQUFFLE9BQU87UUFFZixNQUFNLE9BQU8sR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtZQUNoRCxXQUFXLEVBQUUsSUFBQSx1QkFBYyxFQUFDLElBQUksQ0FBQztZQUNqQyxpQkFBaUIsRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLGlCQUFpQjtZQUNyRCxrQkFBa0IsRUFBRSxDQUFDO1lBRXJCLFdBQVcsRUFBRSxnQkFBZ0IsSUFBSSxFQUFFO1lBQ25DLFdBQVcsRUFBRSxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxJQUFJO1lBQzdDLElBQUksRUFBRSxNQUFNO1lBQ1osU0FBUyxFQUFFO2dCQUNULEVBQUUsUUFBUSxFQUFFLGlCQUFpQixFQUFFO2dCQUMvQixFQUFFLFFBQVEsRUFBRSxpQkFBaUIsRUFBRTtnQkFDL0IsRUFBRSxRQUFRLEVBQUUsa0JBQWtCLEVBQUU7YUFDakM7WUFDRCxPQUFPLEVBQUUsSUFBSTtZQUNiLFlBQVksRUFBRSxJQUFJO1lBQ2xCLFNBQVM7WUFDVCx3QkFBd0I7WUFDeEIsYUFBYTtZQUViLGFBQWEsRUFBRTtnQkFDYixPQUFPLEVBQUU7eUJBQ1EsSUFBSSxTQUFTLENBQUM7Ozs4Q0FHTyxDQUFDLHdCQUF3QixHQUFHOzttQkFFdkQ7YUFDWjtZQUVELElBQUksRUFBRTtnQkFDSixDQUFDLGVBQWUsRUFBRSxFQUFFLENBQUMsRUFBRSxVQUFVO2FBQ2xDO1NBQ0YsQ0FBQyxDQUFDO1FBRUgsY0FBYztRQUNkLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztZQUNyQixNQUFNLFVBQVUsR0FBRyxNQUFNLE1BQU0sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLGdCQUFnQixDQUFDLENBQUM7WUFFMUUsTUFBTSxTQUFTLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3JDLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsU0FBUyxFQUFFO2dCQUN6QyxpQkFBaUIsRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLGlCQUFpQjtnQkFDckQsT0FBTyxFQUFFLElBQUk7Z0JBQ2IsTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxVQUFVLENBQUMsRUFBRSxDQUFDO2dCQUNuQyxRQUFRLEVBQUUsR0FBRztnQkFDYixtQkFBbUIsRUFBRSxPQUFPO2dCQUM1QixRQUFRLEVBQUU7b0JBQ1IsU0FBUyxFQUFFLE9BQU8sQ0FBQyxFQUFFO29CQUNyQixXQUFXLEVBQUUsRUFBRTtvQkFDZixtQkFBbUIsRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU07b0JBQzdDLFNBQVMsRUFDUCw2REFBNkQ7aUJBQ2hFO2dCQUNELFVBQVUsRUFBRSxPQUFPO2dCQUNuQixPQUFPLEVBQUUsQ0FBQyxFQUFFLGFBQWEsRUFBRSxVQUFVLENBQUMsRUFBRSxFQUFFLENBQUM7YUFDNUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBdEVXLFFBQUEsaUJBQWlCLHFCQXNFNUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViVGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL1dlYlRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQTRDO0FBQzVDLHNDQUFtQztBQUNuQyx1REFBeUM7QUFjbEMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLEVBQ2hDLElBQUksRUFDSixnQkFBZ0IsRUFDaEIsVUFBVSxFQUNWLEdBQUcsRUFDSCxTQUFTLEdBQUcsR0FBRyxHQUNLLEVBQUUsRUFBRTtJQUN4QixNQUFNLElBQUksR0FBRyxJQUFBLG1CQUFVLEVBQUMsR0FBRyxJQUFJLFVBQVUsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNsRCxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7UUFBRSxHQUFHLEdBQUcsV0FBVyxHQUFHLEVBQUUsQ0FBQztJQUVuRCxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN4RCxJQUFJLENBQUMsQ0FBQztZQUFFLE9BQU87UUFFZixNQUFNLE9BQU8sR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRTtZQUNoRCxXQUFXLEVBQUUsZUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUM7WUFDeEMsaUJBQWlCLEVBQUUsVUFBVSxDQUFDLEtBQUssQ0FBQyxpQkFBaUI7WUFDckQsa0JBQWtCLEVBQUUsQ0FBQztZQUVyQixXQUFXLEVBQUUsZ0JBQWdCLElBQUksRUFBRTtZQUNuQyxXQUFXLEVBQUUsTUFBTSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsSUFBSTtZQUM3QyxJQUFJLEVBQUUsTUFBTTtZQUNaLFNBQVMsRUFBRTtnQkFDVCxFQUFFLFFBQVEsRUFBRSxpQkFBaUIsRUFBRTtnQkFDL0IsRUFBRSxRQUFRLEVBQUUsaUJBQWlCLEVBQUU7Z0JBQy9CLEVBQUUsUUFBUSxFQUFFLGtCQUFrQixFQUFFO2FBQ2pDO1lBQ0QsT0FBTyxFQUFFLElBQUk7WUFDYixZQUFZLEVBQUUsSUFBSTtZQUNsQixTQUFTO1lBQ1Qsd0JBQXdCO1lBQ3hCLGFBQWE7WUFFYixhQUFhLEVBQUU7Z0JBQ2IsT0FBTyxFQUFFO3lCQUNRLElBQUksU0FBUyxDQUFDOzs7OENBR08sQ0FBQyx3QkFBd0IsR0FBRzs7bUJBRXZEO2FBQ1o7WUFFRCxJQUFJLEVBQUU7Z0JBQ0osQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDLEVBQUUsVUFBVTthQUNsQztTQUNGLENBQUMsQ0FBQztRQUVILGNBQWM7UUFDZCxJQUFJLGdCQUFnQixFQUFFLENBQUM7WUFDckIsTUFBTSxVQUFVLEdBQUcsTUFBTSxNQUFNLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1lBRTFFLE1BQU0sU0FBUyxHQUFHLGVBQU0sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDNUMsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxTQUFTLEVBQUU7Z0JBQ3pDLGlCQUFpQixFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsaUJBQWlCO2dCQUNyRCxPQUFPLEVBQUUsSUFBSTtnQkFDYixNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLFVBQVUsQ0FBQyxFQUFFLENBQUM7Z0JBQ25DLFFBQVEsRUFBRSxHQUFHO2dCQUNiLG1CQUFtQixFQUFFLE9BQU87Z0JBQzVCLFFBQVEsRUFBRTtvQkFDUixTQUFTLEVBQUUsT0FBTyxDQUFDLEVBQUU7b0JBQ3JCLFdBQVcsRUFBRSxFQUFFO29CQUNmLG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTTtvQkFDN0MsU0FBUyxFQUNQLDZEQUE2RDtpQkFDaEU7Z0JBQ0QsVUFBVSxFQUFFLE9BQU87Z0JBQ25CLE9BQU8sRUFBRSxDQUFDLEVBQUUsYUFBYSxFQUFFLFVBQVUsQ0FBQyxFQUFFLEVBQUUsQ0FBQzthQUM1QyxDQUFDLENBQUM7UUFDTCxDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUF0RVcsUUFBQSxpQkFBaUIscUJBc0U1QiJ9

package/Logs/index.d.ts

@@ -10,7 +10,7 @@ interface Props extends BasicEncryptResourceArgs {
 }
 declare const _default: ({ group, name, workspace, vaultInfo, ...others }: Props) => {
     logWp: import("@pulumi/azure-native/operationalinsights/workspace").Workspace;
-    logStorage: import("../Storage").StorageResults;
+    logStorage: import("../types").ResourceInfoWithInstance<import("@pulumi/azure-native/storage/storageAccount").StorageAccount>;
     appInsight: import("@pulumi/azure-native/insights/component").Component;
 };
 export default _default;

package/Sql/Helper.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSqlServerInfo = void 0;
 const Common_1 = require("../Common");
 const getSqlServerInfo = ({ name, groupName, }) => {
-    const group = (0, Common_1.getResourceGroupName)(groupName);
-    const sqlServerName = (0, Common_1.getSqlServerName)(name);
+    const group = Common_1.naming.getResourceGroupName(groupName);
+    const sqlServerName = Common_1.naming.getSqlServerName(name);
     return { name: sqlServerName, group: { resourceGroupName: group } };
 };
 exports.getSqlServerInfo = getSqlServerInfo;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1NxbC9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0NBQW1FO0FBRTVELE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osU0FBUyxHQUlWLEVBQUUsRUFBRTtJQUNILE1BQU0sS0FBSyxHQUFHLElBQUEsNkJBQW9CLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFDOUMsTUFBTSxhQUFhLEdBQUcsSUFBQSx5QkFBZ0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU3QyxPQUFPLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxLQUFLLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDO0FBQ3RFLENBQUMsQ0FBQztBQVhXLFFBQUEsZ0JBQWdCLG9CQVczQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1NxbC9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0NBQW1DO0FBRTVCLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osU0FBUyxHQUlWLEVBQUUsRUFBRTtJQUNILE1BQU0sS0FBSyxHQUFHLGVBQU0sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNyRCxNQUFNLGFBQWEsR0FBRyxlQUFNLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFcEQsT0FBTyxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztBQUN0RSxDQUFDLENBQUM7QUFYVyxRQUFBLGdCQUFnQixvQkFXM0IifQ==

package/Sql/SqlDb.js

@@ -28,7 +28,7 @@ const Locker_1 = require("../Core/Locker");
 const Common_1 = require("../Common");
 //https://blog.bredvid.no/handling-azure-managed-identity-access-to-azure-sql-in-an-azure-devops-pipeline-1e74e1beb10b
 exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSecondaryFrom, sku = 'S0', dependsOn, importUri, ignoreChanges, lock, }) => {
-    name = (0, Common_1.getSqlDbName)(name);
+    name = Common_1.naming.getSqlDbName(name);
     const dbProps = {
         databaseName: name,
         ...group,
@@ -64,4 +64,4 @@ exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSeco
     }
     return { name, group, id: sqlDb.id, instance: sqlDb };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4REFBZ0Q7QUFDaEQsMkNBQXdDO0FBT3hDLHNDQUFnRDtBQXVCaEQsc0hBQXNIO0FBQ3RILGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsSUFBSSxFQUNKLGFBQWEsRUFDYixhQUFhLEVBQ2IsUUFBUSxFQUNSLGVBQWUsRUFDZixHQUFHLEdBQUcsSUFBSSxFQUNWLFNBQVMsRUFDVCxTQUFTLEVBQ1QsYUFBYSxFQUNiLElBQUksR0FDTyxFQUEwQyxFQUFFO0lBQ3ZELElBQUksR0FBRyxJQUFBLHFCQUFZLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFMUIsTUFBTSxPQUFPLEdBQXFCO1FBQ2hDLFlBQVksRUFBRSxJQUFJO1FBQ2xCLEdBQUcsS0FBSztRQUNSLFVBQVUsRUFBRSxhQUFhO1FBQ3pCLGFBQWE7UUFDYixHQUFHLEVBQUUsYUFBYTtZQUNoQixDQUFDLENBQUMsU0FBUztZQUNYLENBQUMsQ0FBQztnQkFDRSxJQUFJLEVBQUUsR0FBRzthQUNWO1FBQ0wsZ0NBQWdDLEVBQUUsY0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE9BQU87UUFDMUQsVUFBVSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsT0FBTztLQUNuQyxDQUFDO0lBRUYsSUFBSSxRQUFRLEVBQUUsQ0FBQztRQUNiLE9BQU8sQ0FBQyxnQkFBZ0IsR0FBRyxRQUFRLENBQUM7UUFDcEMsT0FBTyxDQUFDLFVBQVUsR0FBRyxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQztJQUMzQyxDQUFDO1NBQU0sSUFBSSxlQUFlLEVBQUUsQ0FBQztRQUMzQixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsZUFBZSxDQUFDO1FBQzNDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7UUFDOUMsT0FBTyxDQUFDLGFBQWEsR0FBRyxHQUFHLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQztJQUNoRCxDQUFDO0lBRUQsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUU7UUFDNUMsU0FBUztRQUNULGFBQWE7UUFDYixNQUFNLEVBQUUsU0FBUztRQUNqQixtQkFBbUIsRUFBRSxJQUFJO1FBQ3pCLE9BQU8sRUFBRSxJQUFJO0tBQ2QsQ0FBQyxDQUFDO0lBQ0gsa0JBQWtCO0lBQ2xCLElBQUksSUFBSSxFQUFFLENBQUM7UUFDVCxJQUFBLGVBQU0sRUFBQyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUNwQyxDQUFDO0lBRUQsT0FBTyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxDQUFDO0FBQ3hELENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4REFBZ0Q7QUFDaEQsMkNBQXdDO0FBT3hDLHNDQUEwQztBQXVCMUMsc0hBQXNIO0FBQ3RILGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsSUFBSSxFQUNKLGFBQWEsRUFDYixhQUFhLEVBQ2IsUUFBUSxFQUNSLGVBQWUsRUFDZixHQUFHLEdBQUcsSUFBSSxFQUNWLFNBQVMsRUFDVCxTQUFTLEVBQ1QsYUFBYSxFQUNiLElBQUksR0FDTyxFQUEwQyxFQUFFO0lBQ3ZELElBQUksR0FBRyxlQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpDLE1BQU0sT0FBTyxHQUFxQjtRQUNoQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixVQUFVLEVBQUUsYUFBYTtRQUN6QixhQUFhO1FBQ2IsR0FBRyxFQUFFLGFBQWE7WUFDaEIsQ0FBQyxDQUFDLFNBQVM7WUFDWCxDQUFDLENBQUM7Z0JBQ0UsSUFBSSxFQUFFLEdBQUc7YUFDVjtRQUNMLGdDQUFnQyxFQUFFLGNBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxPQUFPO1FBQzFELFVBQVUsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLE9BQU87S0FDbkMsQ0FBQztJQUVGLElBQUksUUFBUSxFQUFFLENBQUM7UUFDYixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsUUFBUSxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUM7SUFDM0MsQ0FBQztTQUFNLElBQUksZUFBZSxFQUFFLENBQUM7UUFDM0IsT0FBTyxDQUFDLGdCQUFnQixHQUFHLGVBQWUsQ0FBQztRQUMzQyxPQUFPLENBQUMsVUFBVSxHQUFHLEdBQUcsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO1FBQzlDLE9BQU8sQ0FBQyxhQUFhLEdBQUcsR0FBRyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUM7SUFDaEQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFO1FBQzVDLFNBQVM7UUFDVCxhQUFhO1FBQ2IsTUFBTSxFQUFFLFNBQVM7UUFDakIsbUJBQW1CLEVBQUUsSUFBSTtRQUN6QixPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUMsQ0FBQztJQUNILGtCQUFrQjtJQUNsQixJQUFJLElBQUksRUFBRSxDQUFDO1FBQ1QsSUFBQSxlQUFNLEVBQUMsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQztBQUN4RCxDQUFDLENBQUMifQ==

package/Sql/index.js

@@ -31,7 +31,6 @@ const pulumi_1 = require("@pulumi/pulumi");
 const Locker_1 = require("../Core/Locker");
 const Helper_1 = require("../KeyVault/Helper");
 const Common_1 = require("../Common");
-const Common_2 = require("../Common");
 const Helper_2 = require("../VNet/Helper");
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 const SqlDb_1 = __importDefault(require("./SqlDb"));
@@ -40,7 +39,7 @@ const createElasticPool = ({ group, name, sqlName,
 //Minimum is 50 GD
 maxSizeBytesGb, preferredEnclaveType = sql.v20230501preview.AlwaysEncryptedEnclaveType.VBS, sku = { name: Common_1.isPrd ? 'Standard' : 'Basic', capacity: 50 }, dependsOn, }) => {
     //Create Sql Elastic
-    const elasticName = (0, Common_2.getElasticPoolName)(name);
+    const elasticName = Common_1.naming.getElasticPoolName(name);
     const ep = new sql.v20230501preview.ElasticPool(elasticName, {
         elasticPoolName: elasticName,
         serverName: sqlName,
@@ -64,7 +63,7 @@ maxSizeBytesGb, preferredEnclaveType = sql.v20230501preview.AlwaysEncryptedEncla
     return { name: elasticName, group, id: ep.id, instance: ep };
 };
 exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, envUIDInfo, enableEncryption, envRoles, network, vulnerabilityAssessment, ignoreChanges = [], lock, dependsOn, }) => {
-    const sqlName = (0, Common_2.getSqlServerName)(name);
+    const sqlName = Common_1.naming.getSqlServerName(name);
     const encryptKey = enableEncryption
         ? (0, Helper_1.addEncryptKey)(sqlName, vaultInfo, 3072)
         : undefined;
@@ -294,4 +293,4 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, envUI
         databases: dbs,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
+//# 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

@@ -5,10 +5,10 @@ const Common_1 = require("../Common");
 const Helper_1 = require("../KeyVault/Helper");
 const pulumi_1 = require("@pulumi/pulumi");
 const getStorageSecrets = ({ storageName, vaultInfo, }) => {
-    const primaryKey = Common_1.naming.getKeyName(storageName, 'primary');
-    const secondaryKey = Common_1.naming.getKeyName(storageName, 'secondary');
-    const primaryConnection = Common_1.naming.getConnectionName(storageName, 'primary');
-    const secondaryConnection = Common_1.naming.getConnectionName(storageName, 'secondary');
+    const primaryKey = `${(0, Helper_1.getVaultItemName)(storageName)}-key-primary`;
+    const secondaryKey = `${(0, Helper_1.getVaultItemName)(storageName)}-key-secondary`;
+    const primaryConnection = `${(0, Helper_1.getVaultItemName)(storageName)}-conn-primary`;
+    const secondaryConnection = `${(0, Helper_1.getVaultItemName)(storageName)}-conn-secondary`;
     return (0, Helper_1.getSecrets)({
         nameFormatted: true,
         vaultInfo,
@@ -16,7 +16,7 @@ const getStorageSecrets = ({ storageName, vaultInfo, }) => {
     });
 };
 const getStorageInfo = ({ name, group, vaultInfo, }) => {
-    name = Common_1.naming.getStorageName(Common_1.naming.cleanName(name));
+    name = Common_1.naming.getStorageName((0, Common_1.cleanName)(name));
     const secrets = vaultInfo
         ? getStorageSecrets({ storageName: name, vaultInfo })
         : {};
@@ -67,4 +67,4 @@ exports.getStorageInfo = getStorageInfo;
 //     sharedAccessExpiryTime: expireDate.toISOString(),
 //   });
 // };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUFvRDtBQUNwRCwrQ0FBZ0Q7QUFPaEQsMkNBQTZDO0FBRTdDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxFQUN6QixXQUFXLEVBQ1gsU0FBUyxHQUlWLEVBQXlCLEVBQUU7SUFDMUIsTUFBTSxVQUFVLEdBQUcsZUFBTSxDQUFDLFVBQVUsQ0FBQyxXQUFXLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDN0QsTUFBTSxZQUFZLEdBQUcsZUFBTSxDQUFDLFVBQVUsQ0FBQyxXQUFXLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDakUsTUFBTSxpQkFBaUIsR0FBRyxlQUFNLENBQUMsaUJBQWlCLENBQUMsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQzNFLE1BQU0sbUJBQW1CLEdBQUcsZUFBTSxDQUFDLGlCQUFpQixDQUNsRCxXQUFXLEVBQ1gsV0FBVyxDQUNaLENBQUM7SUFFRixPQUFPLElBQUEsbUJBQVUsRUFBQztRQUNoQixhQUFhLEVBQUUsSUFBSTtRQUNuQixTQUFTO1FBQ1QsS0FBSyxFQUFFLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxtQkFBbUIsRUFBRTtLQUM1RSxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFSyxNQUFNLGNBQWMsR0FBRyxDQUFDLEVBQzdCLElBQUksRUFDSixLQUFLLEVBQ0wsU0FBUyxHQUNhLEVBQWUsRUFBRTtJQUN2QyxJQUFJLEdBQUcsZUFBTSxDQUFDLGNBQWMsQ0FBQyxlQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDckQsTUFBTSxPQUFPLEdBQUcsU0FBUztRQUN2QixDQUFDLENBQUMsaUJBQWlCLENBQUMsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDO1FBQ3JELENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFUCxPQUFPO1FBQ0wsSUFBSTtRQUNKLEtBQUs7UUFDTCxTQUFTLEVBQUU7WUFDVCxJQUFJLEVBQUUsV0FBVyxJQUFJLHdCQUF3QjtZQUM3QyxJQUFJLEVBQUUsV0FBVyxJQUFJLHdCQUF3QjtZQUM3QyxLQUFLLEVBQUUsV0FBVyxJQUFJLHlCQUF5QjtTQUNoRDtRQUNELEdBQUcsT0FBTztRQUNWLEVBQUUsRUFBRSxJQUFBLG9CQUFXLEVBQUEsR0FBRyx3QkFBZSxtQkFBbUIsS0FBSyxDQUFDLGlCQUFpQixnREFBZ0QsSUFBSSxFQUFFO0tBQ2xJLENBQUM7QUFDSixDQUFDLENBQUM7QUFyQlcsUUFBQSxjQUFjLGtCQXFCekI7QUFFRixnREFBZ0Q7QUFDaEQsZUFBZTtBQUNmLGVBQWU7QUFDZixPQUFPO0FBQ1AsdUJBQXVCO0FBQ3ZCLDZCQUE2QjtBQUM3QixVQUFVO0FBQ1YsMERBQTBEO0FBQzFELHlCQUF5QjtBQUN6QixrQ0FBa0M7QUFDbEMsMkJBQTJCO0FBQzNCLCtCQUErQjtBQUMvQixxQkFBcUI7QUFDckIsV0FBVztBQUNYLG1CQUFtQjtBQUNuQixFQUFFO0FBQ0Ysb0RBQW9EO0FBQ3BELEtBQUs7QUFFTCx5RUFBeUU7QUFDekUsNEJBQTRCO0FBQzVCLG1DQUFtQztBQUNuQyxvREFBb0Q7QUFDcEQsRUFBRTtBQUNGLDJDQUEyQztBQUMzQyx5QkFBeUI7QUFDekIsZ0JBQWdCO0FBQ2hCLG9EQUFvRDtBQUNwRCxvQ0FBb0M7QUFDcEMsMENBQTBDO0FBQzFDLDZDQUE2QztBQUM3QyxnREFBZ0Q7QUFDaEQsd0RBQXdEO0FBQ3hELFFBQVE7QUFDUixLQUFLIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUErRDtBQUMvRCwrQ0FBa0U7QUFPbEUsMkNBQTZDO0FBRTdDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxFQUN6QixXQUFXLEVBQ1gsU0FBUyxHQUlWLEVBQXlCLEVBQUU7SUFDMUIsTUFBTSxVQUFVLEdBQUcsR0FBRyxJQUFBLHlCQUFnQixFQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUM7SUFDbEUsTUFBTSxZQUFZLEdBQUcsR0FBRyxJQUFBLHlCQUFnQixFQUFDLFdBQVcsQ0FBQyxnQkFBZ0IsQ0FBQztJQUN0RSxNQUFNLGlCQUFpQixHQUFHLEdBQUcsSUFBQSx5QkFBZ0IsRUFBQyxXQUFXLENBQUMsZUFBZSxDQUFDO0lBQzFFLE1BQU0sbUJBQW1CLEdBQUcsR0FBRyxJQUFBLHlCQUFnQixFQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQztJQUU5RSxPQUFPLElBQUEsbUJBQVUsRUFBQztRQUNoQixhQUFhLEVBQUUsSUFBSTtRQUNuQixTQUFTO1FBQ1QsS0FBSyxFQUFFLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxtQkFBbUIsRUFBRTtLQUM1RSxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFSyxNQUFNLGNBQWMsR0FBRyxDQUFDLEVBQzdCLElBQUksRUFDSixLQUFLLEVBQ0wsU0FBUyxHQUNhLEVBQWUsRUFBRTtJQUN2QyxJQUFJLEdBQUcsZUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFBLGtCQUFTLEVBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUM5QyxNQUFNLE9BQU8sR0FBRyxTQUFTO1FBQ3ZCLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUM7UUFDckQsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVQLE9BQU87UUFDTCxJQUFJO1FBQ0osS0FBSztRQUNMLFNBQVMsRUFBRTtZQUNULElBQUksRUFBRSxXQUFXLElBQUksd0JBQXdCO1lBQzdDLElBQUksRUFBRSxXQUFXLElBQUksd0JBQXdCO1lBQzdDLEtBQUssRUFBRSxXQUFXLElBQUkseUJBQXlCO1NBQ2hEO1FBQ0QsR0FBRyxPQUFPO1FBQ1YsRUFBRSxFQUFFLElBQUEsb0JBQVcsRUFBQSxHQUFHLHdCQUFlLG1CQUFtQixLQUFLLENBQUMsaUJBQWlCLGdEQUFnRCxJQUFJLEVBQUU7S0FDbEksQ0FBQztBQUNKLENBQUMsQ0FBQztBQXJCVyxRQUFBLGNBQWMsa0JBcUJ6QjtBQUVGLGdEQUFnRDtBQUNoRCxlQUFlO0FBQ2YsZUFBZTtBQUNmLE9BQU87QUFDUCx1QkFBdUI7QUFDdkIsNkJBQTZCO0FBQzdCLFVBQVU7QUFDViwwREFBMEQ7QUFDMUQseUJBQXlCO0FBQ3pCLGtDQUFrQztBQUNsQywyQkFBMkI7QUFDM0IsK0JBQStCO0FBQy9CLHFCQUFxQjtBQUNyQixXQUFXO0FBQ1gsbUJBQW1CO0FBQ25CLEVBQUU7QUFDRixvREFBb0Q7QUFDcEQsS0FBSztBQUVMLHlFQUF5RTtBQUN6RSw0QkFBNEI7QUFDNUIsbUNBQW1DO0FBQ25DLG9EQUFvRDtBQUNwRCxFQUFFO0FBQ0YsMkNBQTJDO0FBQzNDLHlCQUF5QjtBQUN6QixnQkFBZ0I7QUFDaEIsb0RBQW9EO0FBQ3BELG9DQUFvQztBQUNwQywwQ0FBMEM7QUFDMUMsNkNBQTZDO0FBQzdDLGdEQUFnRDtBQUNoRCx3REFBd0Q7QUFDeEQsUUFBUTtBQUNSLEtBQUsifQ==

package/Storage/ManagementRules.d.ts

@@ -1,6 +1,6 @@
 import * as pulumi from '@pulumi/pulumi';
 import * as storage from '@pulumi/azure-native/storage';
-import { ResourceArgs } from '../types';
+import { ResourceArgs, WithDependsOn } from '../types';
 interface DateAfterModificationArgs {
     daysAfterLastAccessTimeGreaterThan?: pulumi.Input<number>;
     daysAfterModificationGreaterThan?: pulumi.Input<number>;
@@ -42,7 +42,7 @@ export type ManagementRules = {
     actions: ManagementRuleActions;
     filters?: ManagementRuleFilters;
 };
-export declare const createManagementRules: ({ name, storageAccount, group, rules, containerNames, }: ResourceArgs & {
+export declare const createManagementRules: ({ name, storageAccount, group, rules, containerNames, dependsOn, }: ResourceArgs & WithDependsOn & {
     storageAccount: storage.StorageAccount;
     containerNames?: pulumi.Input<string>[];
     rules: Array<ManagementRules | DefaultManagementRules>;

package/Storage/ManagementRules.js

@@ -25,12 +25,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createManagementRules = void 0;
 const storage = __importStar(require("@pulumi/azure-native/storage"));
-const createManagementRules = ({ name, storageAccount, group, rules, containerNames, }) => {
+const createManagementRules = ({ name, storageAccount, group, rules, containerNames, dependsOn, }) => {
     name = `${name}-mnp`;
     return new storage.ManagementPolicy(name, {
+        ...group,
         managementPolicyName: 'default',
         accountName: storageAccount.name,
-        ...group,
         policy: {
             rules: rules.map((m, i) => ({
                 enabled: true,
@@ -49,7 +49,7 @@ const createManagementRules = ({ name, storageAccount, group, rules, containerNa
                 },
             })),
         },
-    }, { dependsOn: storageAccount });
+    }, { dependsOn: dependsOn ?? storageAccount });
 };
 exports.createManagementRules = createManagementRules;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFuYWdlbWVudFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvTWFuYWdlbWVudFJ1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0VBQXdEO0FBa0RqRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsRUFDcEMsSUFBSSxFQUNKLGNBQWMsRUFDZCxLQUFLLEVBQ0wsS0FBSyxFQUNMLGNBQWMsR0FLZixFQUFFLEVBQUU7SUFDSCxJQUFJLEdBQUcsR0FBRyxJQUFJLE1BQU0sQ0FBQztJQUNyQixPQUFPLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUNqQyxJQUFJLEVBQ0o7UUFDRSxvQkFBb0IsRUFBRSxTQUFTO1FBQy9CLFdBQVcsRUFBRSxjQUFjLENBQUMsSUFBSTtRQUNoQyxHQUFHLEtBQUs7UUFFUixNQUFNLEVBQUU7WUFDTixLQUFLLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7Z0JBQzFCLE9BQU8sRUFBRSxJQUFJO2dCQUNiLElBQUksRUFBRSxHQUFHLElBQUksSUFBSSxDQUFDLEVBQUU7Z0JBQ3BCLElBQUksRUFBRSxXQUFXO2dCQUVqQixVQUFVLEVBQUU7b0JBQ1YsT0FBTyxFQUFFLENBQUMsQ0FBQyxPQUFPO29CQUNsQixPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU87d0JBQ2hCLENBQUMsQ0FBQzs0QkFDRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTOzRCQUM5QixXQUFXLEVBQ1QsY0FBYztnQ0FDYixDQUFDLENBQUMsT0FBd0MsQ0FBQyxjQUFjOzRCQUM1RCxjQUFjLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxVQUFVO3lCQUNyQzt3QkFDSCxDQUFDLENBQUMsU0FBUztpQkFDZDthQUNGLENBQUMsQ0FBQztTQUNKO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsQ0FDOUIsQ0FBQztBQUNKLENBQUMsQ0FBQztBQTFDVyxRQUFBLHFCQUFxQix5QkEwQ2hDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFuYWdlbWVudFJ1bGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvTWFuYWdlbWVudFJ1bGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0VBQXdEO0FBa0RqRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsRUFDcEMsSUFBSSxFQUNKLGNBQWMsRUFDZCxLQUFLLEVBQ0wsS0FBSyxFQUNMLGNBQWMsRUFDZCxTQUFTLEdBTVIsRUFBRSxFQUFFO0lBQ0wsSUFBSSxHQUFHLEdBQUcsSUFBSSxNQUFNLENBQUM7SUFDckIsT0FBTyxJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FDakMsSUFBSSxFQUNKO1FBQ0UsR0FBRyxLQUFLO1FBQ1Isb0JBQW9CLEVBQUUsU0FBUztRQUMvQixXQUFXLEVBQUUsY0FBYyxDQUFDLElBQUk7UUFFaEMsTUFBTSxFQUFFO1lBQ04sS0FBSyxFQUFFLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUMxQixPQUFPLEVBQUUsSUFBSTtnQkFDYixJQUFJLEVBQUUsR0FBRyxJQUFJLElBQUksQ0FBQyxFQUFFO2dCQUNwQixJQUFJLEVBQUUsV0FBVztnQkFFakIsVUFBVSxFQUFFO29CQUNWLE9BQU8sRUFBRSxDQUFDLENBQUMsT0FBTztvQkFDbEIsT0FBTyxFQUFFLENBQUMsQ0FBQyxPQUFPO3dCQUNoQixDQUFDLENBQUM7NEJBQ0UsU0FBUyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUzs0QkFDOUIsV0FBVyxFQUNULGNBQWM7Z0NBQ2IsQ0FBQyxDQUFDLE9BQXdDLENBQUMsY0FBYzs0QkFDNUQsY0FBYyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsVUFBVTt5QkFDckM7d0JBQ0gsQ0FBQyxDQUFDLFNBQVM7aUJBQ2Q7YUFDRixDQUFDLENBQUM7U0FDSjtLQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsU0FBUyxJQUFJLGNBQWMsRUFBRSxDQUMzQyxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBNUNXLFFBQUEscUJBQXFCLHlCQTRDaEMifQ==

package/Storage/index.d.ts

@@ -1,6 +1,5 @@
-import { KeyVaultSecret } from '@azure/keyvault-secrets';
 import * as storage from '@pulumi/azure-native/storage';
-import { BasicEncryptResourceArgs, PrivateLinkPropsType, ResourceInfo } from '../types';
+import { BasicEncryptResourceArgs, PrivateLinkPropsType, ResourceInfoWithInstance } from '../types';
 import { Input } from '@pulumi/pulumi';
 import { DefaultManagementRules, ManagementRules } from './ManagementRules';
 export type ContainerProps = {
@@ -11,6 +10,7 @@ export type ContainerProps = {
 };
 export type StorageFeatureType = {
     allowSharedKeyAccess?: boolean;
+    allowBlobPublicAccess?: boolean;
     /** Enable this storage as static website. */
     enableStaticWebsite?: boolean;
     allowCrossTenantReplication?: boolean;
@@ -19,7 +19,7 @@ export type StorageFeatureType = {
 export type StoragePolicyType = {
     keyExpirationPeriodInDays?: number;
     isBlobVersioningEnabled?: boolean;
-    allowBlobPublicAccess?: boolean;
+    blobProperties?: Omit<storage.BlobServicePropertiesArgs, 'blobServicesName' | 'resourceGroupName' | 'accountName'>;
     /** The management rule applied to Storage level (all containers)*/
     defaultManagementRules?: Array<DefaultManagementRules>;
 };
@@ -43,10 +43,6 @@ interface StorageProps extends BasicEncryptResourceArgs {
     network?: StorageNetworkType;
     lock?: boolean;
 }
-export type StorageResults = ResourceInfo & {
-    instance: storage.StorageAccount;
-    getConnectionString?: (name?: string) => Promise<KeyVaultSecret | undefined>;
-};
 /** Storage Creator */
-declare function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInfo, containers, queues, fileShares, network, features, policies, lock, dependsOn, ignoreChanges, }: StorageProps): StorageResults;
+declare function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInfo, containers, queues, fileShares, network, features, policies, lock, dependsOn, ignoreChanges, }: StorageProps): ResourceInfoWithInstance<storage.StorageAccount>;
 export default Storage;