@drunk-pulumi/azure 0.0.50 → 0.0.51

package/Core/ResourceCreator.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint  @typescript-eslint/no-explicit-any: "off" */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -18,17 +17,17 @@ const tryFindName = (props, isResourceGroup) => {
         return name;
     const keys = Object.keys(rs);
     //Try to find the name that is not a resourceGroupName
-    const key = keys.find((k) => k.endsWith("Name") && k !== "resourceGroupName");
+    const key = keys.find((k) => k.endsWith('Name') && k !== 'resourceGroupName');
     if (key) {
         name = rs[key];
     }
     if (!name)
-        throw new Error("Name is not able to find in: " + JSON.stringify(props));
+        throw new Error('Name is not able to find in: ' + JSON.stringify(props));
     return name;
 };
 /** Create Resource with Locker */
 function default_1(Class, { lock, monitoring, dependsOn, ignoreChanges, importUri, ...props }) {
-    const isResourceGroup = Class.name.endsWith("ResourceGroup");
+    const isResourceGroup = Class.name.endsWith('ResourceGroup');
     const name = tryFindName(props, isResourceGroup);
     const resource = new Class(name, { name, ...props }, { dependsOn, import: importUri, ignoreChanges, deleteBeforeReplace: true });
     //Lock Azure Resource from Delete
@@ -48,4 +47,4 @@ function default_1(Class, { lock, monitoring, dependsOn, ignoreChanges, importUr
     }
     return { resource, locker, diagnostic };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VDcmVhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvcmUvUmVzb3VyY2VDcmVhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSx1REFBdUQ7Ozs7O0FBb0R2RCw0QkFrQ0M7QUFoRkQsc0RBQThCO0FBQzlCLDZDQUFtRDtBQUVuRCxNQUFNLFdBQVcsR0FBRyxDQUFDLEtBQWMsRUFBRSxlQUF3QixFQUFVLEVBQUU7SUFDdkUsTUFBTSxFQUFFLEdBQUcsS0FLVixDQUFDO0lBQ0YsbUVBQW1FO0lBQ25FLElBQUksSUFBSSxHQUF1QixFQUFFLENBQUMsaUJBQWlCLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQztJQUMvRCxJQUFJLGVBQWUsSUFBSSxJQUFJO1FBQUUsT0FBTyxJQUFJLENBQUM7SUFFekMsSUFBSSxHQUFHLEVBQUUsQ0FBQyxZQUFZLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQztJQUNsQyxJQUFJLElBQUk7UUFBRSxPQUFPLElBQUksQ0FBQztJQUV0QixNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQzdCLHNEQUFzRDtJQUN0RCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxtQkFBbUIsQ0FBQyxDQUFDO0lBRTlFLElBQUksR0FBRyxFQUFFLENBQUM7UUFDUixJQUFJLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBVyxDQUFDO0lBQzNCLENBQUM7SUFFRCxJQUFJLENBQUMsSUFBSTtRQUNQLE1BQU0sSUFBSSxLQUFLLENBQUMsK0JBQStCLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBRTNFLE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQyxDQUFDO0FBZ0JGLGtDQUFrQztBQUNsQyxtQkFJRSxLQUFhLEVBQ2IsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLEdBQUcsS0FBSyxFQUFVO0lBRTNFLE1BQU0sZUFBZSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQzdELE1BQU0sSUFBSSxHQUFHLFdBQVcsQ0FBQyxLQUFLLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFFakQsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLENBQ3hCLElBQUksRUFDSixFQUFFLElBQUksRUFBRSxHQUFHLEtBQUssRUFBRSxFQUNsQixFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUUsQ0FDM0UsQ0FBQztJQUVGLGlDQUFpQztJQUNqQyxJQUFJLE1BQU0sR0FBb0QsU0FBUyxDQUFDO0lBQ3hFLElBQUksSUFBSSxFQUFFLENBQUM7UUFDVCxNQUFNLEdBQUcsSUFBQSxnQkFBTSxFQUFDLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVELHlCQUF5QjtJQUN6QixJQUFJLFVBQVUsR0FBa0MsU0FBUyxDQUFDO0lBQzFELElBQUksVUFBVSxFQUFFLENBQUM7UUFDZixVQUFVLEdBQUcsSUFBQSwwQkFBZ0IsRUFBQztZQUM1QixJQUFJO1lBQ0osZ0JBQWdCLEVBQUUsUUFBUSxDQUFDLEVBQUU7WUFDN0IsR0FBRyxVQUFVO1lBQ2IsU0FBUyxFQUFFLFFBQVE7U0FDcEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxDQUFDO0FBQzFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VDcmVhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvcmUvUmVzb3VyY2VDcmVhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBbURBLDRCQWtDQztBQWpGRCxzREFBOEI7QUFDOUIsNkNBQW1EO0FBR25ELE1BQU0sV0FBVyxHQUFHLENBQUMsS0FBYyxFQUFFLGVBQXdCLEVBQVUsRUFBRTtJQUN2RSxNQUFNLEVBQUUsR0FBRyxLQUtWLENBQUM7SUFDRixtRUFBbUU7SUFDbkUsSUFBSSxJQUFJLEdBQXVCLEVBQUUsQ0FBQyxpQkFBaUIsSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQy9ELElBQUksZUFBZSxJQUFJLElBQUk7UUFBRSxPQUFPLElBQUksQ0FBQztJQUV6QyxJQUFJLEdBQUcsRUFBRSxDQUFDLFlBQVksSUFBSSxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ2xDLElBQUksSUFBSTtRQUFFLE9BQU8sSUFBSSxDQUFDO0lBRXRCLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDN0Isc0RBQXNEO0lBQ3RELE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLG1CQUFtQixDQUFDLENBQUM7SUFFOUUsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNSLElBQUksR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFXLENBQUM7SUFDM0IsQ0FBQztJQUVELElBQUksQ0FBQyxJQUFJO1FBQ1AsTUFBTSxJQUFJLEtBQUssQ0FBQywrQkFBK0IsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFFM0UsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUM7QUFnQkYsa0NBQWtDO0FBQ2xDLG1CQUlFLEtBQWEsRUFDYixFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxTQUFTLEVBQUUsR0FBRyxLQUFLLEVBQVU7SUFFM0UsTUFBTSxlQUFlLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDN0QsTUFBTSxJQUFJLEdBQUcsV0FBVyxDQUFDLEtBQUssRUFBRSxlQUFlLENBQUMsQ0FBQztJQUVqRCxNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssQ0FDeEIsSUFBSSxFQUNKLEVBQUUsSUFBSSxFQUFFLEdBQUcsS0FBSyxFQUFFLEVBQ2xCLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRSxDQUMzRSxDQUFDO0lBRUYsaUNBQWlDO0lBQ2pDLElBQUksTUFBTSxHQUFvRCxTQUFTLENBQUM7SUFDeEUsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUNULE1BQU0sR0FBRyxJQUFBLGdCQUFNLEVBQUMsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRUQseUJBQXlCO0lBQ3pCLElBQUksVUFBVSxHQUFrQyxTQUFTLENBQUM7SUFDMUQsSUFBSSxVQUFVLEVBQUUsQ0FBQztRQUNmLFVBQVUsR0FBRyxJQUFBLDBCQUFnQixFQUFDO1lBQzVCLElBQUk7WUFDSixnQkFBZ0IsRUFBRSxRQUFRLENBQUMsRUFBRTtZQUM3QixHQUFHLFVBQVU7WUFDYixTQUFTLEVBQUUsUUFBUTtTQUNwQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFDMUMsQ0FBQyJ9

package/Core/ResourceGroup.d.ts

@@ -1,4 +1,4 @@
-import { DefaultResourceArgs, ResourceGroupInfo, ResourceResultProps, BasicResourceArgs } from '../types';
+import { BasicResourceArgs, BasicResourceInfoWithInstance, ResourceGroupInfo } from '../types';
 import { ResourceGroup } from '@pulumi/azure-native/resources';
 import { EnvRolesResults } from '../AzAd/EnvRoles';
 export type RGPermissionType = {
@@ -8,14 +8,14 @@ export type RGPermissionType = {
     enableIotRoles?: boolean;
     enableVaultRoles?: boolean;
 };
-interface Props extends Omit<DefaultResourceArgs, 'monitoring'>, Omit<BasicResourceArgs, 'group'> {
+interface Props extends Omit<BasicResourceArgs, 'group'> {
     formattedName?: boolean;
     location?: string;
     /** Grant permission of this group into Environment Roles groups*/
     permissions?: RGPermissionType;
     lock?: boolean;
 }
-declare const _default: ({ name, formattedName, permissions, ...others }: Props) => ResourceResultProps<ResourceGroup> & {
+declare const _default: ({ name, formattedName, permissions, ...others }: Props) => BasicResourceInfoWithInstance<ResourceGroup> & {
     info: () => ResourceGroupInfo;
 };
 export default _default;

package/Core/ResourceGroup.js

@@ -24,13 +24,12 @@ exports.default = ({ name, formattedName, permissions, ...others }) => {
     }
     return {
         name,
-        resource: resource,
-        locker,
-        diagnostic,
+        instance: resource,
+        id: resource.id,
         info: () => ({
             resourceGroupName: name,
             location: AzureEnv_1.currentRegionName,
         }),
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VHcm91cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL1Jlc291cmNlR3JvdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFNQSw4REFHd0M7QUFDeEMsd0VBQWdEO0FBQ2hELHNDQUFpRDtBQUVqRCxpREFBdUQ7QUFDdkQsNkRBQThEO0FBcUI5RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLGFBQWEsRUFDYixXQUFXLEVBQ1gsR0FBRyxNQUFNLEVBQ0gsRUFFTixFQUFFO0lBQ0YsSUFBSSxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLDZCQUFvQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXpELE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUEseUJBQWUsRUFBQyx5QkFBYSxFQUFFO1FBQ3RFLGlCQUFpQixFQUFFLElBQUk7UUFDdkIsR0FBRyxNQUFNO0tBQ2lDLENBQUMsQ0FBQztJQUU5QyxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2hCLElBQUEscUNBQW1CLEVBQUM7WUFDbEIsSUFBSTtZQUNKLEdBQUcsV0FBVztZQUNkLEtBQUssRUFBRSxRQUFRLENBQUMsRUFBRTtZQUNsQixTQUFTLEVBQUUsUUFBUTtTQUNwQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixRQUFRLEVBQUUsUUFBeUI7UUFDbkMsTUFBTTtRQUNOLFVBQVU7UUFDVixJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUNYLGlCQUFpQixFQUFFLElBQUk7WUFDdkIsUUFBUSxFQUFFLDRCQUFpQjtTQUM1QixDQUFDO0tBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VHcm91cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL1Jlc291cmNlR3JvdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFNQSw4REFHd0M7QUFDeEMsd0VBQWdEO0FBQ2hELHNDQUFpRDtBQUVqRCxpREFBdUQ7QUFDdkQsNkRBQThEO0FBbUI5RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLGFBQWEsRUFDYixXQUFXLEVBQ1gsR0FBRyxNQUFNLEVBQ0gsRUFFTixFQUFFO0lBQ0YsSUFBSSxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLDZCQUFvQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXpELE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUEseUJBQWUsRUFBQyx5QkFBYSxFQUFFO1FBQ3RFLGlCQUFpQixFQUFFLElBQUk7UUFDdkIsR0FBRyxNQUFNO0tBQ3VCLENBQUMsQ0FBQztJQUVwQyxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2hCLElBQUEscUNBQW1CLEVBQUM7WUFDbEIsSUFBSTtZQUNKLEdBQUcsV0FBVztZQUNkLEtBQUssRUFBRSxRQUFRLENBQUMsRUFBRTtZQUNsQixTQUFTLEVBQUUsUUFBUTtTQUNwQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixRQUFRLEVBQUUsUUFBeUI7UUFDbkMsRUFBRSxFQUFFLFFBQVEsQ0FBQyxFQUFFO1FBQ2YsSUFBSSxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUM7WUFDWCxpQkFBaUIsRUFBRSxJQUFJO1lBQ3ZCLFFBQVEsRUFBRSw0QkFBaUI7U0FDNUIsQ0FBQztLQUNILENBQUM7QUFDSixDQUFDLENBQUMifQ==

package/CosmosDb/index.js

@@ -27,12 +27,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const documentdb = __importStar(require("@pulumi/azure-native/documentdb"));
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 const ResourceCreator_1 = __importDefault(require("../Core/ResourceCreator"));
 const AzureEnv_1 = require("../Common/AzureEnv");
 const Helpers_1 = require("../Logs/Helpers");
 exports.default = ({ name, group, vaultInfo, locations, capabilities, enableMultipleWriteLocations, enableThreatProtection, network, sqlDbs, kind = documentdb.DatabaseAccountKind.GlobalDocumentDB, }) => {
-    name = (0, Naming_1.getCosmosDbName)(name);
+    name = (0, Common_1.getCosmosDbName)(name);
     const { resource } = (0, ResourceCreator_1.default)(documentdb.DatabaseAccount, {
         accountName: name,
         ...group,
@@ -42,7 +42,9 @@ exports.default = ({ name, group, vaultInfo, locations, capabilities, enableMult
         capabilities: capabilities
             ? capabilities.map((n) => ({ name: n }))
             : undefined,
-        locations: locations ? locations.map((n) => ({ locationName: n })) : [{ locationName: group.location }],
+        locations: locations
+            ? locations.map((n) => ({ locationName: n }))
+            : [{ locationName: group.location }],
         backupPolicy: AzureEnv_1.isPrd
             ? {
                 type: 'Periodic',
@@ -137,4 +139,4 @@ exports.default = ({ name, group, vaultInfo, locations, capabilities, enableMult
     }
     return resource;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29zbW9zRGIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDRFQUE4RDtBQUM5RCw2Q0FBbUQ7QUFFbkQsOEVBQXNEO0FBQ3RELGlEQUEwQztBQUMxQyw2Q0FBeUQ7QUFrQ3pELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxTQUFTLEVBQ1QsWUFBWSxFQUNaLDRCQUE0QixFQUM1QixzQkFBc0IsRUFDdEIsT0FBTyxFQUNQLE1BQU0sRUFDTixJQUFJLEdBQUcsVUFBVSxDQUFDLG1CQUFtQixDQUFDLGdCQUFnQixHQUN4QyxFQUFFLEVBQUU7SUFDbEIsSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU3QixNQUFNLEVBQUUsUUFBUSxFQUFFLEdBQUcsSUFBQSx5QkFBZSxFQUFDLFVBQVUsQ0FBQyxlQUFlLEVBQUU7UUFDL0QsV0FBVyxFQUFFLElBQUk7UUFDakIsR0FBRyxLQUFLO1FBQ1Isd0JBQXdCLEVBQUUsVUFBVSxDQUFDLHdCQUF3QixDQUFDLFFBQVE7UUFDdEUsSUFBSTtRQUNKLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUVwQyxZQUFZLEVBQUUsWUFBWTtZQUN4QixDQUFDLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ3hDLENBQUMsQ0FBQyxTQUFTO1FBRWIsU0FBUyxFQUFDLFNBQVMsQ0FBQSxDQUFDLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLFlBQVksRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUEsQ0FBQyxD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29zbW9zRGIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDRFQUE4RDtBQUM5RCxzQ0FBNEM7QUFFNUMsOEVBQXNEO0FBQ3RELGlEQUEyQztBQUMzQyw2Q0FBeUQ7QUFrQ3pELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxTQUFTLEVBQ1QsWUFBWSxFQUNaLDRCQUE0QixFQUM1QixzQkFBc0IsRUFDdEIsT0FBTyxFQUNQLE1BQU0sRUFDTixJQUFJLEdBQUcsVUFBVSxDQUFDLG1CQUFtQixDQUFDLGdCQUFnQixHQUN4QyxFQUFFLEVBQUU7SUFDbEIsSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU3QixNQUFNLEVBQUUsUUFBUSxFQUFFLEdBQUcsSUFBQSx5QkFBZSxFQUFDLFVBQVUsQ0FBQyxlQUFlLEVBQUU7UUFDL0QsV0FBVyxFQUFFLElBQUk7UUFDakIsR0FBRyxLQUFLO1FBQ1Isd0JBQXdCLEVBQUUsVUFBVSxDQUFDLHdCQUF3QixDQUFDLFFBQVE7UUFDdEUsSUFBSTtRQUNKLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUVwQyxZQUFZLEVBQUUsWUFBWTtZQUN4QixDQUFDLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ3hDLENBQUMsQ0FBQyxTQUFTO1FBRWIsU0FBUyxFQUFFLFNBQVM7WUFDbEIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxZQUFZLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUM3QyxDQUFD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

package/ServiceBus/index.d.ts

@@ -1,6 +1,6 @@
 import * as bus from '@pulumi/azure-native/servicebus';
 import * as pulumi from '@pulumi/pulumi';
-import { BasicArgs, BasicMonitorArgs, BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, NetworkPropsType, ResourceGroupInfo } from '../types';
+import { BasicArgs, BasicMonitorArgs, BasicResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceGroupInfo, ResourceInfoWithInstance } from '../types';
 import { BusConnectionTypes } from './ServiceBusHelper';
 type TransportTypes = 'AmqpWebSockets' | 'Amqp' | null;
 type OptionsType = {
@@ -47,7 +47,7 @@ interface QueueProps extends Pick<ConnCreatorProps, 'removeEntityPath' | 'transp
 interface TopicResultProps {
     name: string;
     topic: bus.Topic;
-    subs?: Array<BasicResourceResultProps<bus.Subscription>>;
+    subs?: Array<ResourceInfoWithInstance<bus.Subscription>>;
 }
 interface QueueResultProps {
     name: string;

package/ServiceBus/index.js

@@ -223,7 +223,9 @@ const subscriptionCreator = ({ group, shortName, topicFullName, namespaceFullNam
     }, { dependsOn });
     return {
         name,
-        resource,
+        group,
+        id: resource.id,
+        instance: resource,
     };
 };
 /** Queue creator */
@@ -404,4 +406,4 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
         diagnostic,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}

package/Sql/SqlDb.d.ts

@@ -1,7 +1,7 @@
-import * as sql from "@pulumi/azure-native/sql";
-import { BasicResourceArgs, BasicResourceResultProps } from "../types";
-import { Input, Output, Resource } from "@pulumi/pulumi";
-export type SqlDbSku = "Basic" | "S0" | "S1" | "S2" | "S3" | "P1" | "P2" | "P4" | "P6" | "P11";
+import * as sql from '@pulumi/azure-native/sql';
+import { BasicResourceArgs, ResourceInfoWithInstance } from '../types';
+import { Input, Output, Resource } from '@pulumi/pulumi';
+export type SqlDbSku = 'Basic' | 'S0' | 'S1' | 'S2' | 'S3' | 'P1' | 'P2' | 'P4' | 'P6' | 'P11';
 export interface SqlDbProps extends BasicResourceArgs {
     sqlServerName: Input<string>;
     elasticPoolId?: Output<string>;
@@ -9,5 +9,5 @@ export interface SqlDbProps extends BasicResourceArgs {
     sku?: SqlDbSku;
     dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
 }
-declare const _default: ({ group, name, sqlServerName, elasticPoolId, sku, dependsOn, }: SqlDbProps) => BasicResourceResultProps<sql.Database>;
+declare const _default: ({ group, name, sqlServerName, elasticPoolId, sku, dependsOn, }: SqlDbProps) => ResourceInfoWithInstance<sql.Database>;
 export default _default;

package/Sql/SqlDb.js

@@ -25,13 +25,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const sql = __importStar(require("@pulumi/azure-native/sql"));
 const AzureEnv_1 = require("../Common/AzureEnv");
-const Naming_1 = require("../Common/Naming");
+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, sku = "S0", dependsOn, }) => {
-    name = (0, Naming_1.getSqlDbName)(name);
+exports.default = ({ group, name, sqlServerName, elasticPoolId, sku = 'S0', dependsOn, }) => {
+    name = (0, Common_1.getSqlDbName)(name);
     const sqlDb = new sql.Database(name, {
         databaseName: name,
-        createMode: "Default",
+        createMode: 'Default',
         ...group,
         serverName: sqlServerName,
         elasticPoolId,
@@ -43,8 +43,8 @@ exports.default = ({ group, name, sqlServerName, elasticPoolId, sku = "S0", depe
                 // capacity: 5,
             },
         //zoneRedundant: isPrd,
-        requestedBackupStorageRedundancy: AzureEnv_1.isPrd ? "Zone" : "Local",
+        requestedBackupStorageRedundancy: AzureEnv_1.isPrd ? 'Zone' : 'Local',
     }, { dependsOn });
-    return { name, resource: sqlDb };
+    return { name, group, id: sqlDb.id, instance: sqlDb };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4REFBZ0Q7QUFLaEQsaURBQTJDO0FBQzNDLDZDQUFnRDtBQXVCaEQsc0hBQXNIO0FBQ3RILGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsSUFBSSxFQUNKLGFBQWEsRUFDYixhQUFhLEVBQ2IsR0FBRyxHQUFHLElBQUksRUFDVixTQUFTLEdBQ0UsRUFBMEMsRUFBRTtJQUN2RCxJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FDNUIsSUFBSSxFQUNKO1FBQ0UsWUFBWSxFQUFFLElBQUk7UUFDbEIsVUFBVSxFQUFFLFNBQVM7UUFDckIsR0FBRyxLQUFLO1FBQ1IsVUFBVSxFQUFFLGFBQWE7UUFDekIsYUFBYTtRQUViLEdBQUcsRUFBRSxhQUFhO1lBQ2hCLENBQUMsQ0FBQyxTQUFTO1lBQ1gsQ0FBQyxDQUFDO2dCQUNFLElBQUksRUFBRSxHQUFHO2dCQUNULGlCQUFpQjtnQkFDakIsZUFBZTthQUNoQjtRQUNMLHVCQUF1QjtRQUN2QixnQ0FBZ0MsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE9BQU87S0FDM0QsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7SUFFRixPQUFPLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQztBQUNuQyxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4REFBZ0Q7QUFLaEQsaURBQTJDO0FBQzNDLHNDQUF5QztBQXNCekMsc0hBQXNIO0FBQ3RILGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsSUFBSSxFQUNKLGFBQWEsRUFDYixhQUFhLEVBQ2IsR0FBRyxHQUFHLElBQUksRUFDVixTQUFTLEdBQ0UsRUFBMEMsRUFBRTtJQUN2RCxJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FDNUIsSUFBSSxFQUNKO1FBQ0UsWUFBWSxFQUFFLElBQUk7UUFDbEIsVUFBVSxFQUFFLFNBQVM7UUFDckIsR0FBRyxLQUFLO1FBQ1IsVUFBVSxFQUFFLGFBQWE7UUFDekIsYUFBYTtRQUViLEdBQUcsRUFBRSxhQUFhO1lBQ2hCLENBQUMsQ0FBQyxTQUFTO1lBQ1gsQ0FBQyxDQUFDO2dCQUNFLElBQUksRUFBRSxHQUFHO2dCQUNULGlCQUFpQjtnQkFDakIsZUFBZTthQUNoQjtRQUNMLHVCQUF1QjtRQUN2QixnQ0FBZ0MsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE9BQU87S0FDM0QsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7SUFFRixPQUFPLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUM7QUFDeEQsQ0FBQyxDQUFDIn0=

package/Sql/index.d.ts

@@ -1,7 +1,7 @@
 import * as sql from '@pulumi/azure-native/sql';
 import { Input } from '@pulumi/pulumi';
 import { EnvRolesResults } from '../AzAd/EnvRoles';
-import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, NetworkPropsType, ResourceInfo } from '../types';
+import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceInfo, ResourceInfoWithInstance } from '../types';
 import { SqlDbSku } from './SqlDb';
 type ElasticPoolCapacityProps = 50 | 100 | 200 | 300 | 400 | 800 | 1200;
 export type SqlAuthType = {
@@ -19,8 +19,8 @@ export type SqlElasticPoolType = {
 };
 export type SqlResults = ResourceInfo & {
     resource: sql.Server;
-    elasticPool?: BasicResourceResultProps<sql.ElasticPool>;
-    databases?: Record<string, BasicResourceResultProps<sql.Database>>;
+    elasticPool?: ResourceInfoWithInstance<sql.ElasticPool>;
+    databases?: Record<string, ResourceInfoWithInstance<sql.Database>>;
 };
 export type SqlVulnerabilityAssessmentType = {
     alertEmails: Array<string>;

package/Sql/index.js

@@ -31,7 +31,7 @@ const pulumi_1 = require("@pulumi/pulumi");
 const Helper_1 = require("../KeyVault/Helper");
 const RoleAssignment_1 = require("../AzAd/RoleAssignment");
 const AzureEnv_1 = require("../Common/AzureEnv");
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 const Helper_2 = require("../VNet/Helper");
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 const SqlDb_1 = __importDefault(require("./SqlDb"));
@@ -41,7 +41,7 @@ const createElasticPool = ({ group, name, sqlName,
 //Minimum is 50 GD
 maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? 'Standard' : 'Basic', capacity: 50 }, }) => {
     //Create Sql Elastic
-    const elasticName = (0, Naming_1.getElasticPoolName)(name);
+    const elasticName = (0, Common_1.getElasticPoolName)(name);
     const ep = new sql.ElasticPool(elasticName, {
         elasticPoolName: elasticName,
         serverName: sqlName,
@@ -60,10 +60,10 @@ maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? 'Standard' : 'Basic', capa
         //licenseType: sql.ElasticPoolLicenseType.BasePrice,
         //zoneRedundant: isPrd,
     });
-    return { name: elasticName, resource: ep };
+    return { name: elasticName, group, id: ep.id, instance: ep };
 };
 exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, ignoreChanges = ['administratorLogin', 'administrators'], }) => {
-    const sqlName = (0, Naming_1.getSqlServerName)(name);
+    const sqlName = (0, Common_1.getSqlServerName)(name);
     const encryptKey = enableEncryption
         ? (0, Helper_1.getEncryptionKeyOutput)(name, vaultInfo)
         : undefined;
@@ -242,7 +242,7 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
                 group,
                 sqlServerName: sqlName,
                 dependsOn: sqlServer,
-                elasticPoolId: ep ? ep.resource.id : undefined,
+                elasticPoolId: ep ? ep.id : undefined,
             });
             if (vaultInfo) {
                 const connectionString = auth?.azureAdOnlyAuthentication
@@ -253,7 +253,7 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
                     value: connectionString,
                     vaultInfo,
                     contentType: `Sql ${d.name} Connection String`,
-                    dependsOn: d.resource,
+                    dependsOn: d.instance,
                 });
             }
             dbs[key] = d;
@@ -277,4 +277,4 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
         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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,2CAAiE;AACjE,+CAA4D;AAE5D,2DAAwD;AACxD,iDAAqE;AACrE,sCAAiE;AAQjE,2CAAkD;AAClD,8EAA6D;AAC7D,oDAAiD;AACjD,2DAA2D;AAC3D,2CAA0D;AAW1D,MAAM,iBAAiB,GAAG,CAAC,EACzB,KAAK,EACL,IAAI,EACJ,OAAO;AACP,kBAAkB;AAClB,cAAc,GAAG,EAAE,EACnB,GAAG,GAAG,EAAE,IAAI,EAAE,gBAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,GACzC,EAA6C,EAAE;IAChE,oBAAoB;IACpB,MAAM,WAAW,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE;QAC1C,eAAe,EAAE,WAAW;QAC5B,UAAU,EAAE,OAAO;QACnB,GAAG,KAAK;QAER,YAAY,EAAE,gBAAK,CAAC,CAAC,CAAC,cAAc,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS;QACrE,GAAG,EAAE;YACH,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,MAAM;YACvB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB;QACD,mBAAmB,EAAE;YACnB,WAAW,EAAE,CAAC;YACd,WAAW,EAAE,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ;SACrD;QACD,aAAa,EAAE,gBAAK;QACpB,oDAAoD;QACpD,uBAAuB;KACxB,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;AAC/D,CAAC,CAAC;AA4CF,kBAAe,CAAC,EACd,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,gBAAgB,EAChB,WAAW,EACX,SAAS,EACT,SAAS,EACT,OAAO,EACP,uBAAuB,EACvB,aAAa,GAAG,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,GAClD,EAAc,EAAE;IACtB,MAAM,OAAO,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,gBAAgB;QACjC,CAAC,CAAC,IAAA,+BAAsB,EAAC,IAAI,EAAE,SAAS,CAAC;QACzC,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC;IAE9C,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACnC,aAAa,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACzC,aAAa,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAC9B,OAAO,EACP;QACE,UAAU,EAAE,OAAO;QACnB,GAAG,KAAK;QACR,OAAO,EAAE,MAAM;QACf,iBAAiB,EAAE,KAAK;QAExB,QAAQ,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;QACpC,kBAAkB,EAAE,IAAI,EAAE,UAAU;QACpC,0BAA0B,EAAE,IAAI,EAAE,QAAQ;QAE1C,cAAc,EAAE;YACd,iBAAiB,EAAE,UAAU;gBAC3B,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,eAAe;gBACvC,CAAC,CAAC,SAAS;YACb,yBAAyB,EAAE,OAAO,CAChC,UAAU,IAAI,IAAI,CAAC,yBAAyB,CAC7C;YAED,aAAa,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK;YACtC,QAAQ,EAAR,mBAAQ;YACR,GAAG,EAAE,UAAU,EAAE,QAAQ;YACzB,KAAK,EAAE,UAAU,EAAE,WAAW;SAC/B;QACD,mBAAmB,EAAE,OAAO,EAAE,WAAW;YACvC,CAAC,CAAC,GAAG,CAAC,uBAAuB,CAAC,QAAQ;YACtC,CAAC,CAAC,GAAG,CAAC,uBAAuB,CAAC,OAAO;KACxC,EACD;QACE,aAAa;KACd,CACF,CAAC;IAEF,0BAA0B;IAC1B,IAAA,iCAAwB,EAAC;QACvB,IAAI;QACJ,SAAS;QACT,OAAO,EAAE,UAAU;QACnB,WAAW,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC,WAAW,CAAC;KAC7D,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,WAAW;QACpB,CAAC,CAAC,iBAAiB,CAAC;YAChB,IAAI;YACJ,KAAK;YACL,OAAO,EAAE,SAAS,CAAC,IAAI;YACvB,GAAG,EAAE,WAAW;SACjB,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEd,QAAQ;IACR,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QACtB,cAAc;QACd,IAAI,GAAG,CAAC,kBAAkB,CAAC,OAAO,EAAE;YAClC,sBAAsB,EAAE,GAAG,OAAO,WAAW;YAC7C,UAAU,EAAE,SAAS,CAAC,IAAI;YAC1B,GAAG,KAAK;YAER,sBAAsB,EAAE,OAAO,CAAC,QAAQ;YACxC,gCAAgC,EAAE,KAAK;SACxC,CAAC,CAAC;IACL,CAAC;IACD,cAAc;IACd,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;QACzB,IAAA,yBAAsB,EAAC;YACrB,YAAY,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;YAC/C,kBAAkB,EAAE,kCAAkC;YACtD,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS;YACxC,mBAAmB,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI;gBAC3C,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC5B,CAAC,CAAC,CAAC,WAAW,CAAC;SAClB,CAAC,CAAC;IACL,CAAC;IAED,2BAA2B;IAC3B,IAAI,OAAO,EAAE,sBAAsB,EAAE,CAAC;QACpC,IAAI,GAAG,CAAC,YAAY,CAAC,uBAAuB,EAAE;YAC5C,gBAAgB,EAAE,uBAAuB;YACzC,UAAU,EAAE,SAAS,CAAC,IAAI;YAC1B,GAAG,KAAK;YACR,cAAc,EAAE,SAAS;YACzB,YAAY,EAAE,iBAAiB;SAChC,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;QAChC,IAAA,YAAG,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CACrC,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;YAClC,MAAM,CAAC,GAAG,GAAG,OAAO,WAAW,CAAC,EAAE,CAAC;YAEnC,OAAO,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE;gBAC7B,gBAAgB,EAAE,CAAC;gBACnB,UAAU,EAAE,SAAS,CAAC,IAAI;gBAC1B,GAAG,KAAK;gBACR,cAAc,EAAE,EAAE,CAAC,KAAK;gBACxB,YAAY,EAAE,EAAE,CAAC,GAAG;aACrB,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,uBAAuB,EAAE,CAAC;QAC5B,0BAA0B;QAC1B,IAAI,uBAAuB,CAAC,YAAY,EAAE,CAAC;YACzC,IAAA,+BAAc,EAAC;gBACb,IAAI;gBACJ,WAAW,EAAE,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,IAAI,EAAE,CAAC;gBAClE,aAAa,EAAE,kBAAkB;gBACjC,QAAQ,EAAE,+BAA+B;gBACzC,KAAK,EAAE,uBAAuB,CAAC,YAAY;aAC5C,CAAC,CAAC;QACL,CAAC;QAED,2BAA2B;QAC3B,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,yBAAyB,CACnD,IAAI,EACJ;YACE,uBAAuB,EAAE,SAAS;YAClC,GAAG,KAAK;YACR,UAAU,EAAE,SAAS,CAAC,IAAI;YAC1B,kBAAkB,EAAE,CAAC,uBAAuB,CAAC,WAAW;YACxD,cAAc,EAAE,uBAAuB,CAAC,WAAW;YAEnD,aAAa,EAAE,CAAC;YAEhB,uBAAuB,EAAE,uBAAuB,CAAC,gBAAgB;YACjE,eAAe,EAAE,uBAAuB,CAAC,eAAe;YACxD,KAAK,EAAE,SAAS;SACjB,EACD,EAAE,SAAS,EAAE,SAAS,EAAE,CACzB,CAAC;QAEF,cAAc;QACd,IAAI,GAAG,CAAC,gCAAgC,CACtC,IAAI,EACJ;YACE,qBAAqB,EAAE;gBACrB,0CAA0C;gBAC1C,sCAAsC;gBACtC,uBAAuB;aACxB;YACD,UAAU,EAAE,SAAS,CAAC,IAAI;YAC1B,GAAG,KAAK;YAER,sBAAsB,EAAE,SAAS;YACjC,2BAA2B,EAAE,IAAI;YACjC,0BAA0B,EAAE,KAAK;YACjC,mBAAmB,EAAE,+BAA+B;YACpD,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE,gBAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7B,KAAK,EAAE,SAAS;YAChB,oBAAoB,EAAE,IAAI;YAE1B,uBAAuB,EAAE,uBAAuB,CAAC,gBAAgB;YACjE,4BAA4B,EAAE,yBAAc;YAC5C,eAAe,EAAE,uBAAuB,CAAC,eAAe;SACzD,EACD,EAAE,SAAS,EAAE,WAAW,EAAE,CAC3B,CAAC;QAEF,+BAA+B;QAC/B,IAAI,GAAG,CAAC,6BAA6B,CACnC,IAAI,EACJ;YACE,2BAA2B,EAAE,IAAI;YACjC,GAAG,KAAK;YACR,UAAU,EAAE,SAAS,CAAC,IAAI;YAE1B,cAAc,EAAE;gBACd,SAAS,EAAE,IAAI;gBACf,uBAAuB,EAAE,CAAC,uBAAuB,CAAC,WAAW;gBAC7D,MAAM,EAAE,uBAAuB,CAAC,WAAW;aAC5C;YAED,oBAAoB,EAAE,IAAA,oBAAW,EAAA,GAAG,uBAAuB,CAAC,eAAe,IAAI,OAAO,EAAE;YACxF,uBAAuB,EAAE,uBAAuB,CAAC,gBAAgB;SAClE,EACD,EAAE,SAAS,EAAE,WAAW,EAAE,CAC3B,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,4EAA4E;QAE5E,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,SAAS,CACjC,GAAG,OAAO,YAAY,EACtB;YACE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,UAAU,EAAE,OAAO;YACnB,aAAa,EAAE,eAAe;YAC9B,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,GAAG,EAAE,UAAU,CAAC,GAAG;SACpB,EACD,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAC5D,CAAC;QAEF,IAAI,GAAG,CAAC,mBAAmB,CACzB,GAAG,OAAO,sBAAsB,EAChC;YACE,uBAAuB,EAAE,SAAS;YAClC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,UAAU,EAAE,OAAO;YACnB,aAAa,EAAE,eAAe;YAC9B,aAAa,EAAE,UAAU,CAAC,OAAO;YACjC,mBAAmB,EAAE,IAAI;SAC1B,EACD,EAAE,SAAS,EAAE,SAAS,EAAE,CACzB,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAA2D,EAAE,CAAC;IACvE,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACrC,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAC1B,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC;YACzB,MAAM,CAAC,GAAG,IAAA,eAAY,EAAC;gBACrB,GAAG,EAAE;gBACL,IAAI,EAAE,CAAC;gBACP,KAAK;gBACL,aAAa,EAAE,OAAO;gBACtB,SAAS,EAAE,SAAS;gBACpB,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;aACtC,CAAC,CAAC;YAEH,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,gBAAgB,GAAG,IAAI,EAAE,yBAAyB;oBACtD,CAAC,CAAC,IAAA,oBAAW,EAAA,eAAe,OAAO,yCAAyC,CAAC,CAAC,IAAI,+IAA+I;oBACjO,CAAC,CAAC,IAAA,oBAAW,EAAA,eAAe,OAAO,yCAAyC,CAAC,CAAC,IAAI,YAAY,IAAI,CAAC,UAAU,aAAa,IAAI,CAAC,QAAQ,mGAAmG,CAAC;gBAE7O,IAAA,8BAAe,EAAC;oBACd,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,KAAK,EAAE,gBAAgB;oBACvB,SAAS;oBACT,WAAW,EAAE,OAAO,CAAC,CAAC,IAAI,oBAAoB;oBAC9C,SAAS,EAAE,CAAC,CAAC,QAAQ;iBACtB,CAAC,CAAC;YACL,CAAC;YAED,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,oBAAoB;IACpB,yDAAyD;IACzD,iEAAiE;IACjE,2BAA2B;IAC3B,4BAA4B;IAC5B,kDAAkD;IAClD,wBAAwB;IACxB,QAAQ;IACR,IAAI;IAEJ,OAAO;QACL,IAAI,EAAE,OAAO;QACb,KAAK;QACL,EAAE,EAAE,SAAS,CAAC,EAAE;QAChB,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,GAAG;KACf,CAAC;AACJ,CAAC,CAAC"}

package/VNet/Firewall.d.ts

@@ -1,8 +1,8 @@
-import * as network from "@pulumi/azure-native/network";
-import * as pulumi from "@pulumi/pulumi";
-import { BasicMonitorArgs, BasicResourceArgs, DefaultResourceArgs } from "../types";
-import { FirewallPolicyProps } from "./types";
-import { Input } from "@pulumi/pulumi";
+import * as network from '@pulumi/azure-native/network';
+import * as pulumi from '@pulumi/pulumi';
+import { Input } from '@pulumi/pulumi';
+import { BasicMonitorArgs, BasicResourceArgs } from '../types';
+import { FirewallPolicyProps } from './types';
 export interface FwOutboundConfig {
     subnetId: pulumi.Input<string>;
     publicIpAddress?: network.PublicIPAddress;
@@ -11,7 +11,7 @@ export type FirewallSkus = {
     name: network.AzureFirewallSkuName;
     tier: network.AzureFirewallSkuTier;
 };
-export interface FirewallProps extends BasicResourceArgs, Omit<DefaultResourceArgs, "monitoring"> {
+export interface FirewallProps extends BasicResourceArgs {
     /** The public outbound IP address ignores this property if want to enable the Force Tunneling mode */
     outbound: Array<FwOutboundConfig>;
     /** This must be provided if sku is Basic or want to enable the Force Tunneling mode */
@@ -24,7 +24,7 @@ export interface FirewallProps extends BasicResourceArgs, Omit<DefaultResourceAr
     policy: FirewallPolicyProps;
     enableDnsProxy?: boolean;
     sku?: FirewallSkus;
-    monitorConfig?: Omit<BasicMonitorArgs, "dependsOn">;
+    monitorConfig?: Omit<BasicMonitorArgs, 'dependsOn'>;
 }
 export type FirewallResult = {
     firewall: network.AzureFirewall;

package/VNet/Firewall.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const network = __importStar(require("@pulumi/azure-native/network"));
 const AzureEnv_1 = require("../Common/AzureEnv");
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 const ResourceCreator_1 = __importDefault(require("../Core/ResourceCreator"));
 const FirewallPolicy_1 = __importStar(require("./FirewallPolicy"));
 const IpAddress_1 = __importDefault(require("./IpAddress"));
@@ -40,11 +40,11 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
     // Validation
     if (!StackEnv_1.isDryRun) {
         if (!outbound && !management)
-            throw new Error("Management Public Ip Address is required for the Force Tunneling mode.");
+            throw new Error('Management Public Ip Address is required for the Force Tunneling mode.');
         if (sku.tier === network.AzureFirewallSkuTier.Basic && !management)
-            throw new Error("Management Subnet is required for Firewall Basic tier.");
+            throw new Error('Management Subnet is required for Firewall Basic tier.');
     }
-    const fwName = (0, Naming_1.getFirewallName)(name);
+    const fwName = (0, Common_1.getFirewallName)(name);
     //Create Public IpAddress for Management
     const manageIpAddress = management
         ? management.publicIpAddress ??
@@ -56,15 +56,15 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
         : undefined;
     const additionalProperties = {};
     if (enableDnsProxy && sku.tier !== network.AzureFirewallSkuTier.Basic) {
-        additionalProperties["Network.DNS.EnableProxy"] = "Enabled";
+        additionalProperties['Network.DNS.EnableProxy'] = 'Enabled';
     }
     if (snat) {
         if (snat.privateRanges)
             additionalProperties.privateRanges = snat.privateRanges;
         if (snat.autoLearnPrivateRanges)
-            additionalProperties.autoLearnPrivateRanges = "Enabled";
+            additionalProperties.autoLearnPrivateRanges = 'Enabled';
         if (snat.routeServerId)
-            additionalProperties["Network.RouteServerInfo.RouteServerID"] =
+            additionalProperties['Network.RouteServerInfo.RouteServerID'] =
                 snat.routeServerId;
     }
     const fwPolicy = policy
@@ -73,7 +73,7 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
             group,
             basePolicyId: policy.parentPolicyId,
             sku: sku.tier,
-            dnsSettings: sku?.tier !== "Basic"
+            dnsSettings: sku?.tier !== 'Basic'
                 ? {
                     enableProxy: true,
                 }
@@ -85,13 +85,13 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
         ...group,
         sku,
         firewallPolicy: fwPolicy ? { id: fwPolicy.id } : undefined,
-        zones: AzureEnv_1.isPrd ? ["1", "2", "3"] : undefined,
-        threatIntelMode: sku.tier !== network.AzureFirewallSkuTier.Basic && sku.name !== "AZFW_Hub"
+        zones: AzureEnv_1.isPrd ? ['1', '2', '3'] : undefined,
+        threatIntelMode: sku.tier !== network.AzureFirewallSkuTier.Basic && sku.name !== 'AZFW_Hub'
             ? network.AzureFirewallThreatIntelMode.Deny
             : undefined,
         managementIpConfiguration: management && manageIpAddress
             ? {
-                name: "management",
+                name: 'management',
                 publicIPAddress: { id: manageIpAddress.id },
                 subnet: { id: management.subnetId },
             }
@@ -109,9 +109,9 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
         monitoring: {
             ...monitorConfig,
             logsCategories: [
-                "AzureFirewallApplicationRule",
-                "AzureFirewallNetworkRule",
-                "AzureFirewallDnsProxy",
+                'AzureFirewallApplicationRule',
+                'AzureFirewallNetworkRule',
+                'AzureFirewallDnsProxy',
             ],
         },
         ...others,
@@ -128,4 +128,4 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
     }
     return { firewall: resource, policy: fwPolicy };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmlyZXdhbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9GaXJld2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBR3hELGlEQUEyQztBQUMzQyw2Q0FBbUQ7QUFDbkQsOEVBQXNEO0FBTXRELG1FQUFxRTtBQUdyRSw0REFBb0M7QUFDcEMsaURBQThDO0FBcUM5QyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxJQUFJLEVBQ0osTUFBTSxFQUNOLFFBQVEsRUFDUixVQUFVLEVBQ1YsYUFBYSxFQUNiLGNBQWMsRUFDZCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFDLFNBQVM7SUFDNUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLO0NBQ3pDLEVBQ0QsR0FBRyxNQUFNLEVBQ0ssRUFBa0IsRUFBRTtJQUNsQyxhQUFhO0lBQ2IsSUFBSSxDQUFDLG1CQUFRLEVBQUUsQ0FBQztRQUNkLElBQUksQ0FBQyxRQUFRLElBQUksQ0FBQyxVQUFVO1lBQzFCLE1BQU0sSUFBSSxLQUFLLENBQ2Isd0VBQXdFLENBQ3pFLENBQUM7UUFFSixJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLG9CQUFvQixDQUFDLEtBQUssSUFBSSxDQUFDLFVBQVU7WUFDaEUsTUFBTSxJQUFJLEtBQUssQ0FBQyx3REFBd0QsQ0FBQyxDQUFDO0lBQzlFLENBQUM7SUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFckMsd0NBQXdDO0lBQ3hDLE1BQU0sZUFBZSxHQUFHLFVBQVU7UUFDaEMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxlQUFlO1lBQzFCLElBQUEsbUJBQVMsRUFBQztnQkFDUixJQUFJLEVBQUUsR0FBRyxJQUFJLE1BQU07Z0JBQ25CLEtBQUs7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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmlyZXdhbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9GaXJld2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBR3hELGlEQUEyQztBQUMzQyxzQ0FBNEM7QUFDNUMsOEVBQXNEO0FBRXRELG1FQUFxRTtBQUVyRSw0REFBb0M7QUFDcEMsaURBQThDO0FBbUM5QyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxJQUFJLEVBQ0osTUFBTSxFQUNOLFFBQVEsRUFDUixVQUFVLEVBQ1YsYUFBYSxFQUNiLGNBQWMsRUFDZCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFDLFNBQVM7SUFDNUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLO0NBQ3pDLEVBQ0QsR0FBRyxNQUFNLEVBQ0ssRUFBa0IsRUFBRTtJQUNsQyxhQUFhO0lBQ2IsSUFBSSxDQUFDLG1CQUFRLEVBQUUsQ0FBQztRQUNkLElBQUksQ0FBQyxRQUFRLElBQUksQ0FBQyxVQUFVO1lBQzFCLE1BQU0sSUFBSSxLQUFLLENBQ2Isd0VBQXdFLENBQ3pFLENBQUM7UUFFSixJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLG9CQUFvQixDQUFDLEtBQUssSUFBSSxDQUFDLFVBQVU7WUFDaEUsTUFBTSxJQUFJLEtBQUssQ0FBQyx3REFBd0QsQ0FBQyxDQUFDO0lBQzlFLENBQUM7SUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFckMsd0NBQXdDO0lBQ3hDLE1BQU0sZUFBZSxHQUFHLFVBQVU7UUFDaEMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxlQUFlO1lBQzFCLElBQUEsbUJBQVMsRUFBQztnQkFDUixJQUFJLEVBQUUsR0FBRyxJQUFJLE1BQU07Z0JBQ25CLEtBQUs7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

package/VNet/FirewallPolicy.d.ts

@@ -1,7 +1,7 @@
-import { enums, input as inputs } from "@pulumi/azure-native/types";
-import { Input, Resource } from "@pulumi/pulumi";
-import { BasicResourceArgs, DefaultResourceArgs, ResourceGroupInfo } from "../types";
-import { FirewallPolicyResults, FirewallPolicyRuleCollectionResults } from "./types";
+import { enums, input as inputs } from '@pulumi/azure-native/types';
+import { Input, Resource } from '@pulumi/pulumi';
+import { BasicResourceArgs, ResourceGroupInfo } from '../types';
+import { FirewallPolicyResults, FirewallPolicyRuleCollectionResults } from './types';
 interface PolicyRulesProps {
     group: ResourceGroupInfo;
     firewallPolicyName: Input<string>;
@@ -9,7 +9,7 @@ interface PolicyRulesProps {
     dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
 }
 export declare const linkRulesToPolicy: ({ firewallPolicyName, group, rules, dependsOn, }: PolicyRulesProps) => import("@pulumi/azure-native/network/firewallPolicyRuleCollectionGroup").FirewallPolicyRuleCollectionGroup[];
-interface Props extends BasicResourceArgs, Omit<DefaultResourceArgs, "monitoring">, Omit<PolicyRulesProps, "firewallPolicyName" | "rules"> {
+interface Props extends BasicResourceArgs, Omit<PolicyRulesProps, 'firewallPolicyName' | 'rules'> {
     basePolicyId?: Input<string>;
     dnsSettings?: Input<inputs.network.DnsSettingsArgs>;
     transportSecurityCA?: inputs.network.FirewallPolicyCertificateAuthorityArgs;