@drunk-pulumi/azure 1.0.21 → 1.0.23

package/Common/OpenApi/index.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getImportConfig = void 0;
+const Helpers_1 = require("../Helpers");
+const removeVersion = (data, version) => {
+    if (!data?.paths) {
+        console.error(`APIM-removeVersion: There is no paths found in`, data);
+        return data;
+    }
+    const newPaths = {};
+    //Replace version from path
+    Object.keys(data.paths).forEach((k) => {
+        const newKey = (0, Helpers_1.replaceAll)(k, `/${version}`, '');
+        newPaths[newKey] = data.paths[k];
+    });
+    data.paths = newPaths;
+    return data;
+};
+const downloadSpecFile = async (fileUrl) => {
+    //Get specs json from URL
+    return await fetch(fileUrl, { method: 'GET' })
+        .then((rs) => rs.json())
+        .catch((error) => {
+        console.error(`Not able to get spec file from: ${fileUrl}`, error);
+        return undefined;
+    });
+};
+const getImportConfig = async (specUrl, version) => {
+    const spec = await downloadSpecFile(specUrl);
+    if (!spec)
+        return undefined;
+    //Remove Version
+    const data = removeVersion(spec, version);
+    return JSON.stringify(data);
+};
+exports.getImportConfig = getImportConfig;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQ29tbW9uL09wZW5BcGkvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsd0NBQXdDO0FBR3hDLE1BQU0sYUFBYSxHQUFHLENBQUMsSUFBYyxFQUFFLE9BQWUsRUFBWSxFQUFFO0lBQ2xFLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDakIsT0FBTyxDQUFDLEtBQUssQ0FBQyxnREFBZ0QsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUN0RSxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxNQUFNLFFBQVEsR0FBRyxFQUFTLENBQUM7SUFFM0IsMkJBQTJCO0lBQzNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ3BDLE1BQU0sTUFBTSxHQUFHLElBQUEsb0JBQVUsRUFBQyxDQUFDLEVBQUUsSUFBSSxPQUFPLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNoRCxRQUFRLENBQUMsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNuQyxDQUFDLENBQUMsQ0FBQztJQUVILElBQUksQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDO0lBQ3RCLE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQyxDQUFDO0FBRUYsTUFBTSxnQkFBZ0IsR0FBRyxLQUFLLEVBQzVCLE9BQWUsRUFDZ0IsRUFBRTtJQUNqQyx5QkFBeUI7SUFDekIsT0FBTyxNQUFNLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUM7U0FDM0MsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUF5QixDQUFDO1NBQzlDLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1FBQ2YsT0FBTyxDQUFDLEtBQUssQ0FBQyxtQ0FBbUMsT0FBTyxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDbkUsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUM7QUFFSyxNQUFNLGVBQWUsR0FBRyxLQUFLLEVBQ2xDLE9BQWUsRUFDZixPQUFlLEVBQ2MsRUFBRTtJQUMvQixNQUFNLElBQUksR0FBRyxNQUFNLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzdDLElBQUksQ0FBQyxJQUFJO1FBQUUsT0FBTyxTQUFTLENBQUM7SUFFNUIsZ0JBQWdCO0lBQ2hCLE1BQU0sSUFBSSxHQUFHLGFBQWEsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDMUMsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQzlCLENBQUMsQ0FBQztBQVZXLFFBQUEsZUFBZSxtQkFVMUIifQ==

package/{Web → Common/OpenApi}/types.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvV2ViL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQ29tbW9uL09wZW5BcGkvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/Common/RsInfo/Helper.d.ts

@@ -1,4 +1,4 @@
-import { ConventionProps, ResourceInfo } from '../../types';
-type ResourceNamingFunc = (groupName: string, resourceNameOrConvention?: string | ConventionProps) => Omit<ResourceInfo, 'id'>;
-declare const _default: Record<"getStorageName" | "getSecretName" | "getAppPlanName" | "getCertName" | "getConnectionName" | "getKeyName" | "getPasswordName" | "getAutomationAccountName" | "getB2cName" | "getCosmosDbName" | "getAppConfigName" | "getApimName" | "getDiskEncryptionName" | "getSshName" | "getIdentityName" | "getUIDName" | "getAksName" | "getK8sProviderName" | "getAppInsightName" | "getLogWpName" | "getWebAppName" | "getFuncAppName" | "getWebTestName" | "getAlertName" | "getRedisCacheName" | "getServiceBusName" | "getPrivateEndpointName" | "getSignalRName" | "getElasticPoolName" | "getSqlDbName" | "getSqlServerName" | "getPostgresqlName" | "getMySqlName" | "getFirewallName" | "getFirewallPolicyName" | "getFirewallPolicyGroupName" | "getVMName" | "getNICName" | "getVdiName" | "getVpnName" | "getVnetName" | "getWanName" | "getHubName" | "getIotHubName" | "getRouteName" | "getRouteItemName" | "getWorkflowName" | "getNetworkSecurityGroupName" | "getIpAddressName" | "getIpAddressPrefixName" | "getAppGatewayName" | "getNatGatewayName" | "getBastionName" | "getKeyVaultName" | "getCdnEndpointName" | "getCdnProfileName" | "getAcrName" | "getCertOrderName", ResourceNamingFunc>;
+import { ResourceInfo, NamingType } from '../../types';
+type ResourceNamingFunc = (groupName: NamingType, resourceName?: NamingType) => Omit<ResourceInfo, 'id'>;
+declare const _default: Record<"getStorageName" | "getAppPlanName" | "getAutomationAccountName" | "getB2cName" | "getCosmosDbName" | "getAppConfigName" | "getApimName" | "getDiskEncryptionName" | "getSshName" | "getIdentityName" | "getUIDName" | "getAksName" | "getK8sProviderName" | "getAppInsightName" | "getLogWpName" | "getWebAppName" | "getFuncAppName" | "getWebTestName" | "getAlertName" | "getRedisCacheName" | "getServiceBusName" | "getPrivateEndpointName" | "getSignalRName" | "getElasticPoolName" | "getSqlDbName" | "getSqlServerName" | "getPostgresqlName" | "getMySqlName" | "getFirewallName" | "getFirewallPolicyName" | "getFirewallPolicyGroupName" | "getVMName" | "getNICName" | "getVdiName" | "getVpnName" | "getVnetName" | "getWanName" | "getHubName" | "getIotHubName" | "getRouteName" | "getWorkflowName" | "getNetworkSGName" | "getIpAddressName" | "getIpAddressPrefixName" | "getAppGatewayName" | "getNatGatewayName" | "getBastionName" | "getKeyVaultName" | "getCdnEndpointName" | "getCdnProfileName" | "getAcrName" | "getCertOrderName", ResourceNamingFunc>;
 export default _default;

package/Common/RsInfo/Helper.js

@@ -1,43 +1,21 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const naming = __importStar(require("../Naming"));
+const Naming_1 = __importDefault(require("../Naming"));
 const AzureEnv_1 = require("../AzureEnv");
 const resourceNamingCreator = () => {
     const rs = {};
-    Object.keys(naming).forEach((k) => {
-        const formater = naming[k];
-        rs[k] = (groupName, resourceNameOrConvention) => {
-            const rgName = typeof resourceNameOrConvention === 'object'
-                ? naming.getResourceGroupName(groupName, resourceNameOrConvention)
-                : naming.getResourceGroupName(groupName);
-            const resourceName = typeof resourceNameOrConvention === 'string'
-                ? formater(naming.cleanName(resourceNameOrConvention))
-                : formater(naming.cleanName(groupName), resourceNameOrConvention);
+    Object.keys(Naming_1.default).forEach((k) => {
+        const formater = Naming_1.default[k];
+        rs[k] = (groupName, resourceName = undefined) => {
+            const rgName = Naming_1.default.getResourceGroupName(groupName);
+            const rsName = resourceName
+                ? formater(resourceName)
+                : formater(groupName);
             return {
-                name: resourceName,
+                name: rsName,
                 group: { resourceGroupName: rgName, location: AzureEnv_1.currentRegionCode },
             };
         };
@@ -45,4 +23,4 @@ const resourceNamingCreator = () => {
     return rs;
 };
 exports.default = resourceNamingCreator();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0NvbW1vbi9Sc0luZm8vSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxrREFBb0M7QUFFcEMsMENBQWdEO0FBYWhELE1BQU0scUJBQXFCLEdBQUcsR0FBRyxFQUFFO0lBQ2pDLE1BQU0sRUFBRSxHQUF1QyxFQUFFLENBQUM7SUFFbEQsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFNLEVBQUUsRUFBRTtRQUNyQyxNQUFNLFFBQVEsR0FBSSxNQUFjLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDcEMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQ04sU0FBaUIsRUFDakIsd0JBQW1ELEVBQ3pCLEVBQUU7WUFDNUIsTUFBTSxNQUFNLEdBQ1YsT0FBTyx3QkFBd0IsS0FBSyxRQUFRO2dCQUMxQyxDQUFDLENBQUMsTUFBTSxDQUFDLG9CQUFvQixDQUFDLFNBQVMsRUFBRSx3QkFBd0IsQ0FBQztnQkFDbEUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUU3QyxNQUFNLFlBQVksR0FDaEIsT0FBTyx3QkFBd0IsS0FBSyxRQUFRO2dCQUMxQyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsd0JBQXdCLENBQUMsQ0FBQztnQkFDdEQsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxFQUFFLHdCQUF3QixDQUFDLENBQUM7WUFFdEUsT0FBTztnQkFDTCxJQUFJLEVBQUUsWUFBWTtnQkFDbEIsS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSw0QkFBaUIsRUFBRTthQUNsRSxDQUFDO1FBQ0osQ0FBQyxDQUFDO0lBQ0osQ0FBQyxDQUFDLENBQUM7SUFFSCxPQUFPLEVBQTBELENBQUM7QUFDcEUsQ0FBQyxDQUFDO0FBRUYsa0JBQWUscUJBQXFCLEVBQUUsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0NvbW1vbi9Sc0luZm8vSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsdURBQStCO0FBRS9CLDBDQUFnRDtBQWFoRCxNQUFNLHFCQUFxQixHQUFHLEdBQUcsRUFBRTtJQUNqQyxNQUFNLEVBQUUsR0FBdUMsRUFBRSxDQUFDO0lBRWxELE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0JBQU0sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ2hDLE1BQU0sUUFBUSxHQUFJLGdCQUFjLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFcEMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQ04sU0FBcUIsRUFDckIsZUFBdUMsU0FBUyxFQUN0QixFQUFFO1lBQzVCLE1BQU0sTUFBTSxHQUFHLGdCQUFNLENBQUMsb0JBQW9CLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDdEQsTUFBTSxNQUFNLEdBQUcsWUFBWTtnQkFDekIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUM7Z0JBQ3hCLENBQUMsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUM7WUFFeEIsT0FBTztnQkFDTCxJQUFJLEVBQUUsTUFBTTtnQkFDWixLQUFLLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLDRCQUFpQixFQUFFO2FBQ2xFLENBQUM7UUFDSixDQUFDLENBQUM7SUFDSixDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sRUFBMEQsQ0FBQztBQUNwRSxDQUFDLENBQUM7QUFFRixrQkFBZSxxQkFBcUIsRUFBRSxDQUFDIn0=

package/Common/RsInfo/index.d.ts

@@ -1,33 +1,33 @@
 import { Output } from '@pulumi/pulumi';
-import { ConventionProps, ResourceGroupInfo, ResourceGroupWithIdInfo, ResourceInfo, ResourceInfoWithSub } from '../../types';
+import { NamingType, ResourceGroupInfo, ResourceGroupWithIdInfo, ResourceInfo, ResourceInfoWithSub } from '../../types';
 export declare const getResourceInfoFromId: (id: string) => ResourceInfoWithSub | undefined;
 export declare const getNameFromId: (id: string) => string | undefined;
 /** The method to get Resource group Name*/
 export declare const getRGId: (group: ResourceGroupInfo) => Output<string>;
-export declare const getRGInfo: (name: string) => ResourceGroupWithIdInfo;
-export declare const getStorageInfo: (name: string) => ResourceInfo;
-export declare const getAutomationAccountInfo: (name: string) => ResourceInfo;
-export declare const getAppConfigInfo: (name: string) => ResourceInfo;
-export declare const getApimInfo: (name: string) => ResourceInfo;
-export declare const getAksInfo: (name: string) => ResourceInfo;
-export declare const getAppInsightInfo: (name: string) => ResourceInfo;
-export declare const getLogWpInfo: (name: string) => ResourceInfo;
-export declare const getRedisCacheInfo: (name: string) => ResourceInfo;
-export declare const getServiceBusInfo: (name: string) => ResourceInfo;
-export declare const getSignalRInfo: (name: string) => ResourceInfo;
-export declare const getSqlServerInfo: (name: string) => ResourceInfo;
-export declare const getPostgresqlInfo: (name: string) => ResourceInfo;
-export declare const getMySqlInfo: (name: string) => ResourceInfo;
-export declare const getFirewallInfo: (name: string, ops?: ConventionProps | undefined) => ResourceInfo;
-export declare const getVMInfo: (name: string) => ResourceInfo;
-export declare const getVnetInfo: (name: string, ops?: ConventionProps | undefined) => ResourceInfo;
+export declare const getRGInfo: (name: NamingType) => ResourceGroupWithIdInfo;
+export declare const getStorageInfo: (name: NamingType) => ResourceInfo;
+export declare const getAutomationAccountInfo: (name: NamingType) => ResourceInfo;
+export declare const getAppConfigInfo: (name: NamingType) => ResourceInfo;
+export declare const getApimInfo: (name: NamingType) => ResourceInfo;
+export declare const getAksInfo: (name: NamingType) => ResourceInfo;
+export declare const getAppInsightInfo: (name: NamingType) => ResourceInfo;
+export declare const getLogWpInfo: (name: NamingType) => ResourceInfo;
+export declare const getRedisCacheInfo: (name: NamingType) => ResourceInfo;
+export declare const getServiceBusInfo: (name: NamingType) => ResourceInfo;
+export declare const getSignalRInfo: (name: NamingType) => ResourceInfo;
+export declare const getSqlServerInfo: (name: NamingType) => ResourceInfo;
+export declare const getPostgresqlInfo: (name: NamingType) => ResourceInfo;
+export declare const getMySqlInfo: (name: NamingType) => ResourceInfo;
+export declare const getFirewallInfo: (name: NamingType) => ResourceInfo;
+export declare const getVMInfo: (name: NamingType) => ResourceInfo;
+export declare const getVnetInfo: (name: NamingType) => ResourceInfo;
 export declare const getVnetIdFromSubnetId: (subnetId: string) => string;
-export declare const getSubnetIdByName: (subnetName: string, vnetAndGroupName: string) => Output<string>;
+export declare const getSubnetIdByName: (subnetName: string, vnetAndGroupName: NamingType) => Output<string>;
 export declare const getIpAddressInfo: ({ name, groupName, }: {
     name: string;
-    groupName: string;
+    groupName: NamingType;
 }) => ResourceInfo;
-export declare const getKeyVaultInfo: (name: string, region?: string) => ResourceInfo;
-export declare const getCdnProfileInfo: (name: string) => ResourceInfo;
-export declare const getAcrInfo: (name: string) => ResourceInfo;
-export declare const getCertOrderInfo: (name: string) => ResourceInfo;
+export declare const getKeyVaultInfo: (name: NamingType) => ResourceInfo;
+export declare const getCdnProfileInfo: (name: NamingType) => ResourceInfo;
+export declare const getAcrInfo: (name: NamingType) => ResourceInfo;
+export declare const getCertOrderInfo: (name: NamingType) => ResourceInfo;

package/Common/RsInfo/index.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCertOrderInfo = exports.getAcrInfo = exports.getCdnProfileInfo = exports.getKeyVaultInfo = exports.getIpAddressInfo = exports.getSubnetIdByName = exports.getVnetIdFromSubnetId = exports.getVnetInfo = exports.getVMInfo = exports.getFirewallInfo = exports.getMySqlInfo = exports.getPostgresqlInfo = exports.getSqlServerInfo = exports.getSignalRInfo = exports.getServiceBusInfo = exports.getRedisCacheInfo = exports.getLogWpInfo = exports.getAppInsightInfo = exports.getAksInfo = exports.getApimInfo = exports.getAppConfigInfo = exports.getAutomationAccountInfo = exports.getStorageInfo = exports.getRGInfo = exports.getRGId = exports.getNameFromId = exports.getResourceInfoFromId = void 0;
 const Helper_1 = __importDefault(require("./Helper"));
-const naming = __importStar(require("../Naming"));
+const Naming_1 = __importStar(require("../Naming"));
 const pulumi_1 = require("@pulumi/pulumi");
 const AzureEnv_1 = require("../AzureEnv");
 const getResourceInfoFromId = (id) => {
@@ -71,7 +71,7 @@ exports.getNameFromId = getNameFromId;
 const getRGId = (group) => (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${group.resourceGroupName}`;
 exports.getRGId = getRGId;
 const getRGInfo = (name) => {
-    const rgName = naming.getResourceGroupName(name);
+    const rgName = Naming_1.default.getResourceGroupName(name);
     const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${rgName}`;
     return { resourceGroupName: rgName, id, location: AzureEnv_1.currentRegionCode };
 };
@@ -169,8 +169,8 @@ const getMySqlInfo = (name) => {
     return { ...info, id };
 };
 exports.getMySqlInfo = getMySqlInfo;
-const getFirewallInfo = (name, ops = undefined) => {
-    const info = Helper_1.default.getFirewallName(name, ops);
+const getFirewallInfo = (name) => {
+    const info = Helper_1.default.getFirewallName(name);
     const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${info.group.resourceGroupName}/providers/Microsoft.Network/azureFirewalls/${info.name}`;
     return { ...info, id };
 };
@@ -183,8 +183,8 @@ const getVMInfo = (name) => {
 exports.getVMInfo = getVMInfo;
 // export const getVpnName = (name: string) =>
 //   getResourceName(name, { suffix: 'vpn' });
-const getVnetInfo = (name, ops = undefined) => {
-    const info = Helper_1.default.getVnetName(name, ops);
+const getVnetInfo = (name) => {
+    const info = Helper_1.default.getVnetName(name);
     const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${info.group.resourceGroupName}/providers/Microsoft.Network/virtualNetworks/${info.name}`;
     return { ...info, id };
 };
@@ -195,14 +195,14 @@ const getVnetIdFromSubnetId = (subnetId) => {
 };
 exports.getVnetIdFromSubnetId = getVnetIdFromSubnetId;
 const getSubnetIdByName = (subnetName, vnetAndGroupName) => {
-    const vnetName = naming.getVnetName(naming.cleanName(vnetAndGroupName));
-    const group = naming.getResourceGroupName(vnetAndGroupName);
-    return (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${group}/providers/Microsoft.Network/virtualNetworks/${vnetName}/subnets/${naming.cleanName(subnetName)}`;
+    const vnetName = Naming_1.default.getVnetName(vnetAndGroupName);
+    const group = Naming_1.default.getResourceGroupName(vnetAndGroupName);
+    return (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${group}/providers/Microsoft.Network/virtualNetworks/${vnetName}/subnets/${(0, Naming_1.cleanName)(subnetName)}`;
 };
 exports.getSubnetIdByName = getSubnetIdByName;
 const getIpAddressInfo = ({ name, groupName, }) => {
-    name = naming.getIpAddressName(name);
-    const rgName = naming.getResourceGroupName(groupName);
+    name = Naming_1.default.getIpAddressName(name);
+    const rgName = Naming_1.default.getResourceGroupName(groupName);
     const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${rgName}/providers/Microsoft.Network/publicIPAddresses/${name}`;
     return {
         name,
@@ -237,8 +237,8 @@ exports.getIpAddressInfo = getIpAddressInfo;
 //
 // export const getBastionName = (name: string) =>
 //   getResourceName(name, { suffix: 'bst' });
-const getKeyVaultInfo = (name, region = AzureEnv_1.currentCountryCode) => {
-    const info = Helper_1.default.getKeyVaultName(name, { region });
+const getKeyVaultInfo = (name) => {
+    const info = Helper_1.default.getKeyVaultName(name);
     const id = (0, pulumi_1.interpolate) `${AzureEnv_1.defaultSubScope}/resourceGroups/${info.group.resourceGroupName}/providers/Microsoft.KeyVault/vaults/${info.name}`;
     return { ...info, id };
 };
@@ -261,4 +261,4 @@ const getCertOrderInfo = (name) => {
     return { ...info, id };
 };
 exports.getCertOrderInfo = getCertOrderInfo;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Common/RsInfo/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Common/RsInfo/index.ts"],"names":[],"mappings":"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"}

package/Common/index.d.ts

@@ -1,14 +1,12 @@
 export * as helpers from './Helpers';
 export * as azureEnv from './AzureEnv';
 export * as stackEnv from './StackEnv';
-export * as resourceEnv from './ResourceEnv';
 export * as global from './GlobalEnv';
-export * as naming from './Naming';
+export { default as naming } from './Naming';
 export * as rsInfo from './RsInfo';
+export * as openApi from './OpenApi';
 export * from './Helpers';
 export * from './AzureEnv';
 export * from './StackEnv';
-export * from './ResourceEnv';
 export * from './GlobalEnv';
 export * from './Naming';
-export * from './RsInfo';

package/Common/index.js

@@ -25,20 +25,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rsInfo = exports.naming = exports.global = exports.resourceEnv = exports.stackEnv = exports.azureEnv = exports.helpers = void 0;
+exports.openApi = exports.rsInfo = exports.naming = exports.global = exports.stackEnv = exports.azureEnv = exports.helpers = void 0;
 exports.helpers = __importStar(require("./Helpers"));
 exports.azureEnv = __importStar(require("./AzureEnv"));
 exports.stackEnv = __importStar(require("./StackEnv"));
-exports.resourceEnv = __importStar(require("./ResourceEnv"));
 exports.global = __importStar(require("./GlobalEnv"));
-exports.naming = __importStar(require("./Naming"));
+var Naming_1 = require("./Naming");
+Object.defineProperty(exports, "naming", { enumerable: true, get: function () { return __importDefault(Naming_1).default; } });
 exports.rsInfo = __importStar(require("./RsInfo"));
+exports.openApi = __importStar(require("./OpenApi"));
 __exportStar(require("./Helpers"), exports);
 __exportStar(require("./AzureEnv"), exports);
 __exportStar(require("./StackEnv"), exports);
-__exportStar(require("./ResourceEnv"), exports);
 __exportStar(require("./GlobalEnv"), exports);
 __exportStar(require("./Naming"), exports);
-__exportStar(require("./RsInfo"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscURBQXFDO0FBQ3JDLHVEQUF1QztBQUN2Qyx1REFBdUM7QUFDdkMsNkRBQTZDO0FBQzdDLHNEQUFzQztBQUN0QyxtREFBbUM7QUFDbkMsbURBQW1DO0FBRW5DLDRDQUEwQjtBQUMxQiw2Q0FBMkI7QUFDM0IsNkNBQTJCO0FBQzNCLGdEQUE4QjtBQUM5Qiw4Q0FBNEI7QUFDNUIsMkNBQXlCO0FBQ3pCLDJDQUF5QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscURBQXFDO0FBQ3JDLHVEQUF1QztBQUN2Qyx1REFBdUM7QUFDdkMsc0RBQXNDO0FBQ3RDLG1DQUE2QztBQUFwQyxpSEFBQSxPQUFPLE9BQVU7QUFDMUIsbURBQW1DO0FBQ25DLHFEQUFxQztBQUVyQyw0Q0FBMEI7QUFDMUIsNkNBQTJCO0FBQzNCLDZDQUEyQjtBQUMzQiw4Q0FBNEI7QUFDNUIsMkNBQXlCIn0=

package/Core/KeyGenerators.js

@@ -9,7 +9,7 @@ const Random_1 = require("./Random");
 const PGPGenerator_1 = require("@drunk-pulumi/azure-providers/PGPGenerator");
 const pulumi_1 = require("@pulumi/pulumi");
 const generateSsh = ({ name, loginPrefix, maxUserNameLength, vaultInfo, }) => {
-    name = (0, Common_1.getSshName)(name);
+    name = Common_1.naming.getSshName(name);
     const userNameKey = `${name}-user`;
     const passwordKeyName = `${name}-password`;
     const publicKeyName = `${name}-publicKey`;
@@ -57,4 +57,4 @@ const generatePGP = ({ name, options, vaultInfo, }) => {
     };
 };
 exports.generatePGP = generatePGP;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiS2V5R2VuZXJhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL0tleUdlbmVyYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0Esc0NBQXVDO0FBQ3ZDLG1GQUErRTtBQUMvRSwyREFBNEQ7QUFDNUQsK0NBQStDO0FBQy9DLHFDQUFzRTtBQUN0RSw2RUFHb0Q7QUFDcEQsMkNBQWdEO0FBZXpDLE1BQU0sV0FBVyxHQUFHLENBQUMsRUFDMUIsSUFBSSxFQUNKLFdBQVcsRUFDWCxpQkFBaUIsRUFDakIsU0FBUyxHQUNVLEVBQWMsRUFBRTtJQUNuQyxJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXhCLE1BQU0sV0FBVyxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUM7SUFDbkMsTUFBTSxlQUFlLEdBQUcsR0FBRyxJQUFJLFdBQVcsQ0FBQztJQUMzQyxNQUFNLGFBQWEsR0FBRyxHQUFHLElBQUksWUFBWSxDQUFDO0lBQzFDLE1BQU0sY0FBYyxHQUFHLEdBQUcsSUFBSSxhQUFhLENBQUM7SUFFNUMsTUFBTSxRQUFRLEdBQUcsSUFBQSx1QkFBYyxFQUFDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUM7SUFDMUUsTUFBTSxJQUFJLEdBQUcsSUFBQSx1QkFBYyxFQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBRXJELE1BQU0sRUFBRSxHQUFHLElBQUksZ0NBQWMsQ0FDM0IsSUFBSSxFQUNKO1FBQ0UsUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNO1FBQ3JCLFNBQVMsRUFBRSxTQUFTLENBQUMsSUFBSTtLQUMxQixFQUNELEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUNwQixDQUFDO0lBRUYsc0JBQXNCO0lBQ3RCLElBQUEsK0JBQWdCLEVBQUM7UUFDZixhQUFhLEVBQUUsSUFBSTtRQUNuQixTQUFT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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiS2V5R2VuZXJhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL0tleUdlbmVyYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0Esc0NBQW1DO0FBQ25DLG1GQUErRTtBQUMvRSwyREFBNEQ7QUFDNUQsK0NBQStDO0FBQy9DLHFDQUFzRTtBQUN0RSw2RUFHb0Q7QUFDcEQsMkNBQWdEO0FBZXpDLE1BQU0sV0FBVyxHQUFHLENBQUMsRUFDMUIsSUFBSSxFQUNKLFdBQVcsRUFDWCxpQkFBaUIsRUFDakIsU0FBUyxHQUNVLEVBQWMsRUFBRTtJQUNuQyxJQUFJLEdBQUcsZUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUUvQixNQUFNLFdBQVcsR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDO0lBQ25DLE1BQU0sZUFBZSxHQUFHLEdBQUcsSUFBSSxXQUFXLENBQUM7SUFDM0MsTUFBTSxhQUFhLEdBQUcsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUMxQyxNQUFNLGNBQWMsR0FBRyxHQUFHLElBQUksYUFBYSxDQUFDO0lBRTVDLE1BQU0sUUFBUSxHQUFHLElBQUEsdUJBQWMsRUFBQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sSUFBSSxHQUFHLElBQUEsdUJBQWMsRUFBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUVyRCxNQUFNLEVBQUUsR0FBRyxJQUFJLGdDQUFjLENBQzNCLElBQUksRUFDSjtRQUNFLFFBQVEsRUFBRSxJQUFJLENBQUMsTUFBTTtRQUNyQixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7S0FDMUIsRUFDRCxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FDcEIsQ0FBQztJQUVGLHNCQUFzQjtJQUN0QixJQUFBLCtCQUFnQixFQUFDO1FBQ2YsYUFBYSxFQUFFLElBQUk7UUFDbkIsU0FBUztRQUNULFdBQVcsRUFBRSxZQUFZO1FBQ3pCLFNBQVMsRUFBRSxFQUFFO1FBQ2IsS0FBSyxFQUFFO1lBQ0wsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUU7WUFDdEMsRUFBRSxJQUFJLEVBQUUsZUFBZSxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFO1NBQzlDO0tBQ0YsQ0FBQyxDQUFDO0lBRUgsT0FBTztRQUNMLFFBQVE7UUFDUixLQUFLLEVBQUU7WUFDTCxZQUFZLEVBQUUsR0FBbUIsRUFBRSxDQUNqQyxJQUFBLGVBQU0sRUFDSixJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsYUFBYSxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUUsQ0FDcEUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFNLENBQUM7WUFDM0IsYUFBYSxFQUFFLEdBQW1CLEVBQUUsQ0FDbEMsSUFBQSxlQUFNLEVBQ0osSUFBQSxrQkFBUyxFQUFDLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxhQUFhLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFFLENBQ3JFLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFFLENBQUMsS0FBTSxDQUFDO1lBQzNCLFdBQVcsRUFBRSxHQUFtQixFQUFFLENBQ2hDLElBQUEsZUFBTSxFQUNKLElBQUEsa0JBQVMsRUFBQyxFQUFFLElBQUksRUFBRSxlQUFlLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBRSxDQUN0RSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBRSxDQUFDLEtBQU0sQ0FBQztTQUM1QjtLQUNGLENBQUM7QUFDSixDQUFDLENBQUM7QUF0RFcsUUFBQSxXQUFXLGVBc0R0QjtBQUVLLE1BQU0sV0FBVyxHQUFHLENBQUMsRUFDMUIsSUFBSSxFQUNKLE9BQU8sRUFDUCxTQUFTLEdBR1YsRUFBRSxFQUFFO0lBQ0gsTUFBTSxFQUFFLEdBQUcsSUFBSSwwQkFBVyxDQUFDLElBQUksRUFBRTtRQUMvQixHQUFHLE9BQU87UUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7S0FDMUIsQ0FBQyxDQUFDO0lBRUgsT0FBTztRQUNMLElBQUk7UUFDSixHQUFHLEVBQUUsRUFBRTtRQUNQLEtBQUssRUFBRTtZQUNMLFlBQVksRUFBRSxHQUFHLEVBQUUsQ0FDakIsSUFBQSxlQUFNLEVBQUMsSUFBQSxrQkFBUyxFQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsSUFBSSxZQUFZLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FDL0QsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxLQUFNLENBQ2pCO1lBQ0gsYUFBYSxFQUFFLEdBQUcsRUFBRSxDQUNsQixJQUFBLGVBQU0sRUFBQyxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsR0FBRyxJQUFJLGFBQWEsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUNoRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBRSxDQUFDLEtBQU0sQ0FDakI7WUFDSCx3QkFBd0IsRUFBRSxHQUFHLEVBQUUsQ0FDN0IsSUFBQSxlQUFNLEVBQ0osSUFBQSxrQkFBUyxFQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsSUFBSSx3QkFBd0IsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUNoRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBRSxDQUFDLEtBQU0sQ0FBQztTQUM1QjtLQUNGLENBQUM7QUFDSixDQUFDLENBQUM7QUE5QlcsUUFBQSxXQUFXLGVBOEJ0QiJ9

package/Core/Random.d.ts

@@ -1,5 +1,6 @@
 import { Output } from '@pulumi/pulumi';
 import { KeyVaultInfo, WithNamedType, NamedWithVaultType } from '../types';
+export declare const getPasswordName: (name: string, type: "primary" | "secondary" | null) => string;
 interface RandomPassProps extends NamedWithVaultType {
     policy?: 'monthly' | 'yearly' | boolean;
     length?: number;

package/Core/Random.js

@@ -23,10 +23,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomLogin = exports.randomUserName = exports.randomUuId = exports.randomPassword = void 0;
+exports.randomLogin = exports.randomUserName = exports.randomUuId = exports.randomPassword = exports.getPasswordName = void 0;
 const random = __importStar(require("@pulumi/random"));
 const Common_1 = require("../Common");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
+const Helper_1 = require("../KeyVault/Helper");
+const getPasswordName = (name, type) => type === null
+    ? (0, Common_1.getResourceName)(name, { suffix: 'pwd' })
+    : `${(0, Helper_1.getVaultItemName)(name)}-pwd-${type}`;
+exports.getPasswordName = getPasswordName;
 /**
  * Genera random password with 50 characters length.
  * @param name the name of password
@@ -40,7 +45,7 @@ const randomPassword = ({ length = 50, name, policy = 'yearly', options, vaultIn
         : policy === 'yearly'
             ? `${new Date().getFullYear()}`
             : '';
-    name = (0, Common_1.getPasswordName)(name, null);
+    name = (0, exports.getPasswordName)(name, null);
     const randomPass = new random.RandomPassword(name, {
         keepers: { keepKey },
         length,
@@ -58,7 +63,7 @@ const randomPassword = ({ length = 50, name, policy = 'yearly', options, vaultIn
     });
     if (vaultInfo) {
         (0, CustomHelper_1.addCustomSecret)({
-            name: (0, Common_1.getPasswordName)(name, null),
+            name: (0, exports.getPasswordName)(name, null),
             vaultInfo,
             value: randomPass.result,
             contentType: name,
@@ -104,4 +109,4 @@ const randomLogin = ({ name, loginPrefix, maxUserNameLength, passwordOptions = {
     return { userName, password, vaultKeys: { userNameKey, passwordKey } };
 };
 exports.randomLogin = randomLogin;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmFuZG9tLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvcmUvUmFuZG9tLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsdURBQXlDO0FBQ3pDLHNDQUE0QztBQUM1QywyREFBNkU7QUFjN0U7Ozs7R0FJRztBQUNJLE1BQU0sY0FBYyxHQUFHLENBQUMsRUFDN0IsTUFBTSxHQUFHLEVBQUUsRUFDWCxJQUFJLEVBQ0osTUFBTSxHQUFHLFFBQVEsRUFDakIsT0FBTyxFQUNQLFNBQVMsR0FDTyxFQUFFLEVBQUU7SUFDcEIsSUFBSSxNQUFNLEdBQUcsRUFBRTtRQUFFLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFFN0IsTUFBTSxPQUFPLEdBQ1gsTUFBTSxLQUFLLFNBQVM7UUFDbEIsQ0FBQyxDQUFDLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUUsSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFO1FBQ3hELENBQUMsQ0FBQyxNQUFNLEtBQUssUUFBUTtZQUNuQixDQUFDLENBQUMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFO1lBQy9CLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFWCxJQUFJLEdBQUcsSUFBQSx3QkFBZSxFQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUVuQyxNQUFNLFVBQVUsR0FBRyxJQUFJLE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFO1FBQ2pELE9BQU8sRUFBRSxFQUFFLE9BQU8sRUFBRTtRQUNwQixNQUFNO1FBQ04sS0FBSyxFQUFFLElBQUk7UUFDWCxRQUFRLEVBQUUsQ0FBQztRQUNYLEtBQUssRUFBRSxJQUFJO1FBQ1gsUUFBUSxFQUFFLENBQUM7UUFDWCxPQUFPLEVBQUUsSUFBSTtRQUNiLFVBQVUsRUFBRSxDQUFDO1FBQ2IsT0FBTyxFQUFFLElBQUk7UUFDYixVQUFVLEVBQUUs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmFuZG9tLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvcmUvUmFuZG9tLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsdURBQXlDO0FBQ3pDLHNDQUE0QztBQUM1QywyREFBNkU7QUFFN0UsK0NBQXNEO0FBRS9DLE1BQU0sZUFBZSxHQUFHLENBQzdCLElBQVksRUFDWixJQUFvQyxFQUNwQyxFQUFFLENBQ0YsSUFBSSxLQUFLLElBQUk7SUFDWCxDQUFDLENBQUMsSUFBQSx3QkFBZSxFQUFDLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQztJQUMxQyxDQUFDLENBQUMsR0FBRyxJQUFBLHlCQUFnQixFQUFDLElBQUksQ0FBQyxRQUFRLElBQUksRUFBRSxDQUFDO0FBTmpDLFFBQUEsZUFBZSxtQkFNa0I7QUFhOUM7Ozs7R0FJRztBQUNJLE1BQU0sY0FBYyxHQUFHLENBQUMsRUFDN0IsTUFBTSxHQUFHLEVBQUUsRUFDWCxJQUFJLEVBQ0osTUFBTSxHQUFHLFFBQVEsRUFDakIsT0FBTyxFQUNQLFNBQVMsR0FDTyxFQUFFLEVBQUU7SUFDcEIsSUFBSSxNQUFNLEdBQUcsRUFBRTtRQUFFLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFFN0IsTUFBTSxPQUFPLEdBQ1gsTUFBTSxLQUFLLFNBQVM7UUFDbEIsQ0FBQyxDQUFDLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUUsSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFO1FBQ3hELENBQUMsQ0FBQyxNQUFNLEtBQUssUUFBUTtZQUNuQixDQUFDLENBQUMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFO1lBQy9CLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFWCxJQUFJLEdBQUcsSUFBQSx1QkFBZSxFQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUVu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

package/CustomRoles/index.js

@@ -23,14 +23,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const AzureEnv_1 = require("../Common/AzureEnv");
+const Common_1 = require("../Common");
 const authorization = __importStar(require("@pulumi/azure-native/authorization"));
 exports.default = ({ enableJustInTimeRemoteRole = true }) => {
     if (enableJustInTimeRemoteRole) {
         new authorization.RoleDefinition('JustInTime-User-Remote-Request', {
             roleName: 'Just-In-Time-User-Remote-Request-Role',
             description: 'Just-in-time virtual machine user remote request role',
-            scope: AzureEnv_1.defaultSubScope,
+            scope: Common_1.defaultSubScope,
             permissions: [
                 {
                     actions: [
@@ -43,8 +43,8 @@ exports.default = ({ enableJustInTimeRemoteRole = true }) => {
                     notActions: [],
                 },
             ],
-            assignableScopes: [AzureEnv_1.defaultSubScope],
+            assignableScopes: [Common_1.defaultSubScope],
         });
     }
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ3VzdG9tUm9sZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlEQUFxRDtBQUNyRCxrRkFBb0U7QUFLcEUsa0JBQWUsQ0FBQyxFQUFFLDBCQUEwQixHQUFHLElBQUksRUFBUyxFQUFFLEVBQUU7SUFDOUQsSUFBSSwwQkFBMEIsRUFBRSxDQUFDO1FBQy9CLElBQUksYUFBYSxDQUFDLGNBQWMsQ0FBQyxnQ0FBZ0MsRUFBRTtZQUNqRSxRQUFRLEVBQUUsdUNBQXVDO1lBQ2pELFdBQVcsRUFBRSx1REFBdUQ7WUFDcEUsS0FBSyxFQUFFLDBCQUFlO1lBQ3RCLFdBQVcsRUFBRTtnQkFDWDtvQkFDRSxPQUFPLEVBQUU7d0JBQ1AsdUVBQXVFO3dCQUN2RSw4REFBOEQ7d0JBQzlELGtDQUFrQzt3QkFDbEMsd0NBQXdDO3dCQUN4Qyw0Q0FBNEM7cUJBQzdDO29CQUNELFVBQVUsRUFBRSxFQUFFO2lCQUNmO2FBQ0Y7WUFDRCxnQkFBZ0IsRUFBRSxDQUFDLDBCQUFlLENBQUM7U0FDcEMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztBQUNILENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ3VzdG9tUm9sZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUE0QztBQUM1QyxrRkFBb0U7QUFLcEUsa0JBQWUsQ0FBQyxFQUFFLDBCQUEwQixHQUFHLElBQUksRUFBUyxFQUFFLEVBQUU7SUFDOUQsSUFBSSwwQkFBMEIsRUFBRSxDQUFDO1FBQy9CLElBQUksYUFBYSxDQUFDLGNBQWMsQ0FBQyxnQ0FBZ0MsRUFBRTtZQUNqRSxRQUFRLEVBQUUsdUNBQXVDO1lBQ2pELFdBQVcsRUFBRSx1REFBdUQ7WUFDcEUsS0FBSyxFQUFFLHdCQUFlO1lBQ3RCLFdBQVcsRUFBRTtnQkFDWDtvQkFDRSxPQUFPLEVBQUU7d0JBQ1AsdUVBQXVFO3dCQUN2RSw4REFBOEQ7d0JBQzlELGtDQUFrQzt3QkFDbEMsd0NBQXdDO3dCQUN4Qyw0Q0FBNEM7cUJBQzdDO29CQUNELFVBQVUsRUFBRSxFQUFFO2lCQUNmO2FBQ0Y7WUFDRCxnQkFBZ0IsRUFBRSxDQUFDLHdCQUFlLENBQUM7U0FDcEMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztBQUNILENBQUMsQ0FBQyJ9

package/KeyVault/CustomHelper.js

@@ -5,6 +5,7 @@ const pulumi_1 = require("@pulumi/pulumi");
 const Common_1 = require("../Common");
 const VaultSecret_1 = require("@drunk-pulumi/azure-providers/VaultSecret");
 const ConfigHelper_1 = require("../Common/ConfigHelper");
+const Helper_1 = require("./Helper");
 /**Add key vault secret from a value or from pulumi configuration secret. */
 const addVaultSecretFrom = ({ name, value, vaultInfo, dependsOn, }) => {
     if (!value)
@@ -22,10 +23,10 @@ const addVaultSecretFrom = ({ name, value, vaultInfo, dependsOn, }) => {
 exports.addVaultSecretFrom = addVaultSecretFrom;
 /** Add a secret to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
 const addCustomSecret = ({ name, formattedName, vaultInfo, value, contentType, dependsOn, ...others }) => {
-    const n = formattedName ? name : (0, Common_1.getSecretName)(name);
+    const n = formattedName ? name : (0, Helper_1.getVaultItemName)(name);
     //This KeyVault Secret is not auto recovery the deleted one.
     return new VaultSecret_1.VaultSecretResource((0, Common_1.replaceAll)(name, '.', '-'), {
-        name: (0, Common_1.replaceAll)(n, '.', '-'),
+        name: n,
         value: value ? (0, pulumi_1.output)(value).apply((v) => v || '') : '',
         vaultName: vaultInfo.name,
         contentType: contentType || name,
@@ -36,4 +37,4 @@ exports.addCustomSecret = addCustomSecret;
 /** Add multi secrets to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
 const addCustomSecrets = ({ items, ...others }) => items.map((i) => (0, exports.addCustomSecret)({ ...i, ...others }));
 exports.addCustomSecrets = addCustomSecrets;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0N1c3RvbUhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBeUQ7QUFDekQsc0NBQXNEO0FBQ3RELDJFQUFnRjtBQUVoRix5REFBbUQ7QUFRbkQsNEVBQTRFO0FBQ3JFLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxFQUNqQyxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxDQUFDLEtBQUs7UUFBRSxLQUFLLEdBQUcsSUFBQSx3QkFBUyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLElBQUksQ0FBQyxLQUFLO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxtQkFBbUIsQ0FBQyxDQUFDO0lBRXRFLE9BQU8sSUFBQSx1QkFBZSxFQUFDO1FBQ3JCLElBQUk7UUFDSixLQUFLO1FBQ0wsU0FBUztRQUNULFdBQVcsRUFBRSxrQkFBa0I7UUFDL0IsU0FBUztLQUNWLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQztBQWhCVyxRQUFBLGtCQUFrQixzQkFnQjdCO0FBYUYsaUhBQWlIO0FBQzFHLE1BQU0sZUFBZSxHQUFHLENBQUMsRUFDOUIsSUFBSSxFQUNKLGFBQWEsRUFDYixTQUFTLEVBQ1QsS0FBSyxFQUNMLFdBQVcsRUFDWCxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0csRUFBRSxFQUFFO0lBQ2hCLE1BQU0sQ0FBQyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLHNCQUFhLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDckQsNERBQTREO0lBQzVELE9BQU8sSUFBSSxpQ0FBbUIsQ0FDNUIsSUFBQSxtQkFBVSxFQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQzFCO1FBQ0UsSUFBSSxFQUFFLElBQUEsbUJBQVUsRUFBQyxDQUFDLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQztRQUM3QixLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFBLGVBQU0sRUFBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRTtRQUN2RCxTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7UUFDekIsV0FBVyxFQUFFLFdBQVcsSUFBSSxJQUFJO1FBQ2hDLEdBQUcsTUFBTTtLQUNWLEVBQ0QsRUFBRSxTQUFTLEVBQUUsQ0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBdEJXLFFBQUEsZUFBZSxtQkFzQjFCO0FBTUYsc0hBQXNIO0FBQy9HLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sRUFBb0IsRUFBRSxFQUFFLENBQ3pFLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLElBQUEsdUJBQWUsRUFBQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLEdBQUcsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBRDVDLFFBQUEsZ0JBQWdCLG9CQUM0QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0N1c3RvbUhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBeUQ7QUFDekQsc0NBQXVDO0FBQ3ZDLDJFQUFnRjtBQUVoRix5REFBbUQ7QUFDbkQscUNBQTRDO0FBUTVDLDRFQUE0RTtBQUNyRSxNQUFNLGtCQUFrQixHQUFHLENBQUMsRUFDakMsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksQ0FBQyxLQUFLO1FBQUUsS0FBSyxHQUFHLElBQUEsd0JBQVMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNwQyxJQUFJLENBQUMsS0FBSztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLElBQUksbUJBQW1CLENBQUMsQ0FBQztJQUV0RSxPQUFPLElBQUEsdUJBQWUsRUFBQztRQUNyQixJQUFJO1FBQ0osS0FBSztRQUNMLFNBQVM7UUFDVCxXQUFXLEVBQUUsa0JBQWtCO1FBQy9CLFNBQVM7S0FDVixDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFoQlcsUUFBQSxrQkFBa0Isc0JBZ0I3QjtBQWFGLGlIQUFpSDtBQUMxRyxNQUFNLGVBQWUsR0FBRyxDQUFDLEVBQzlCLElBQUksRUFDSixhQUFhLEVBQ2IsU0FBUyxFQUNULEtBQUssRUFDTCxXQUFXLEVBQ1gsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNHLEVBQUUsRUFBRTtJQUNoQixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSx5QkFBZ0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCw0REFBNEQ7SUFDNUQsT0FBTyxJQUFJLGlDQUFtQixDQUM1QixJQUFBLG1CQUFVLEVBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFDMUI7UUFDRSxJQUFJLEVBQUUsQ0FBQztRQUNQLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUEsZUFBTSxFQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQ3ZELFNBQVMsRUFBRSxTQUFTLENBQUMsSUFBSTtRQUN6QixXQUFXLEVBQUUsV0FBVyxJQUFJLElBQUk7UUFDaEMsR0FBRyxNQUFNO0tBQ1YsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7QUFDSixDQUFDLENBQUM7QUF0QlcsUUFBQSxlQUFlLG1CQXNCMUI7QUFNRixzSEFBc0g7QUFDL0csTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxFQUFvQixFQUFFLEVBQUUsQ0FDekUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBQSx1QkFBZSxFQUFDLEVBQUUsR0FBRyxDQUFDLEVBQUUsR0FBRyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFENUMsUUFBQSxnQkFBZ0Isb0JBQzRCIn0=

package/KeyVault/Helper.d.ts

@@ -1,5 +1,7 @@
 import { Output } from '@pulumi/pulumi';
 import { KeyVaultInfo, NamedWithVaultType, WithVaultInfo } from '../types';
+/** Get Vault Secret Name. Remove the stack name and replace all _ with - then lower cases. */
+export declare const getVaultItemName: (name: string, currentStack?: string) => string;
 type GetVaultItemProps = Required<NamedWithVaultType> & {
     version?: string;
     nameFormatted?: boolean;
@@ -7,10 +9,12 @@ type GetVaultItemProps = Required<NamedWithVaultType> & {
 interface KeyVaultPropertiesResults {
     keyName: Output<string>;
     url: Output<string>;
+    urlWithoutVersion: Output<string>;
     keyVaultUri: Output<string>;
     keyVersion: Output<string>;
 }
 export declare const addEncryptKey: (name: string, vaultInfo: KeyVaultInfo, keySize?: 2048 | 3072 | 4096) => KeyVaultPropertiesResults;
+/** Get Key */
 /** Get or create encryption Key */
 /** Get Secret */
 export declare const getSecret: ({ name, version, vaultInfo, nameFormatted, }: GetVaultItemProps) => Promise<import("@azure/keyvault-secrets").KeyVaultSecret | undefined>;