@drunk-pulumi/azure 1.0.4 → 1.0.6

package/VM/index.js

@@ -28,14 +28,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const compute = __importStar(require("@pulumi/azure-native/compute"));
 const network = __importStar(require("@pulumi/azure-native/network"));
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 const Locker_1 = __importDefault(require("../Core/Locker"));
+const Random_1 = require("../Core/Random");
+const CustomHelper_1 = require("../KeyVault/CustomHelper");
 const Helper_1 = require("../KeyVault/Helper");
 const GlobalSchedule_1 = __importDefault(require("./GlobalSchedule"));
 const Extension_1 = __importDefault(require("./Extension"));
-exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standard_B2s', extensions, storageAccountType = compute.StorageAccountTypes.Premium_LRS, osDiskSizeGB = 128, dataDiskSizeGB, enableEncryption, vaultInfo, schedule = { timeZone: 'Singapore Standard Time' }, login, image, lock = true, tags = {}, dependsOn, ...others }) => {
-    const vmName = (0, Naming_1.getVMName)(name);
-    const nicName = (0, Naming_1.getNICName)(name);
+exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standard_B2s', extensions, storageAccountType = compute.StorageAccountTypes.Premium_LRS, osDiskSizeGB = 128, dataDiskSizeGB, enableEncryption, vaultInfo, envRoles, schedule = { timeZone: 'Singapore Standard Time' }, login, image, lock = true, tags = {}, dependsOn, ...others }) => {
+    const vmName = (0, Common_1.getVMName)(name);
+    const nicName = (0, Common_1.getNICName)(name);
     const nic = new network.NetworkInterface(nicName, {
         networkInterfaceName: nicName,
         ...group,
@@ -46,10 +48,16 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
     });
     //All VM will using the same Key
     const keyEncryption = enableEncryption
-        ? (0, Helper_1.getEncryptionKeyOutput)(`az-vm-key-encryption`, vaultInfo)
+        ? (0, Helper_1.addEncryptKey)({ name: vmName, vaultInfo: vaultInfo })
         : undefined;
     const diskEncryption = enableEncryption
-        ? (0, Helper_1.getEncryptionKeyOutput)(`az-vm-disk-encryption`, vaultInfo)
+        ? (0, CustomHelper_1.addCustomSecret)({
+            name: `${vmName}-disk-secret`,
+            vaultInfo: vaultInfo,
+            formattedName: true,
+            value: (0, Random_1.randomPassword)({ name: vmName, policy: false, length: 50 })
+                .result,
+        })
         : undefined;
     const vm = new compute.VirtualMachine(vmName, {
         vmName,
@@ -63,7 +71,7 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
         },
         osProfile: {
             computerName: name,
-            adminUsername: login.userName,
+            adminUsername: login.adminLogin,
             adminPassword: login.password,
             allowExtensionOperations: true,
             //Need to be enabled at subscription level
@@ -112,7 +120,7 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
                     ? {
                         diskEncryptionKey: diskEncryption
                             ? {
-                                secretUrl: diskEncryption.url,
+                                secretUrl: diskEncryption.id,
                                 sourceVault: {
                                     id: vaultInfo.id,
                                 },
@@ -156,9 +164,9 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
     }, {
         dependsOn,
         ignoreChanges: [
-            'storageProfile.osDisk.managedDisk.storageAccountType',
-            'storageProfile.osDisk.managedDisk.id',
-            'osDisk.osType',
+        // 'storageProfile.osDisk.managedDisk.storageAccountType',
+        // 'storageProfile.osDisk.managedDisk.id',
+        // 'osDisk.osType',
         ],
     });
     if (extensions) {
@@ -172,6 +180,10 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
     if (lock) {
         (0, Locker_1.default)({ name: vmName, resource: vm });
     }
+    //Add Identity to readonly to be able to read key from vault
+    if (envRoles) {
+        envRoles.addMember('readOnly', vm.identity.apply((i) => i.principalId));
+    }
     //Auto shutdown
     if (schedule?.autoShutdownTime) {
         (0, GlobalSchedule_1.default)({
@@ -198,4 +210,4 @@ exports.default = ({ name, group, subnetId, osType = 'Windows', vmSize = 'Standa
     // }
     return vm;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLHNFQUF3RDtBQUN4RCxzRUFBd0Q7QUFFeEQsNkNBQXlEO0FBQ3pELDREQUFvQztBQUNwQywrQ0FBNEQ7QUFDNUQsc0VBQThDO0FBQzlDLDREQUEwRDtBQTJDMUQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsUUFBUSxFQUNSLE1BQU0sR0FBRyxTQUFTLEVBQ2xCLE1BQU0sR0FBRyxjQUFjLEVBQ3ZCLFVBQVUsRUFDVixrQkFBa0IsR0FBRyxPQUFPLENBQUMsbUJBQW1CLENBQUMsV0FBVyxFQUM1RCxZQUFZLEdBQUcsR0FBRyxFQUNsQixjQUFjLEVBQ2QsZ0JBQWdCLEVBQ2hCLFNBQVMsRUFDVCxRQUFRLEdBQUcsRUFBRSxRQUFRLEVBQUUseUJBQXlCLEVBQUUsRUFDbEQsS0FBSyxFQUNMLEtBQUssRUFDTCxJQUFJLEdBQUcsSUFBSSxFQUNYLElBQUksR0FBRyxFQUFFLEVBQ1QsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNILEVBQUUsRUFBRTtJQUNWLE1BQU0sTUFBTSxHQUFHLElBQUEsa0JBQVMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFakMsTUFBTSxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxFQUFFO1FBQ2hELG9CQUFvQixFQUFFLE9BQU87UUFDN0IsR0FBRyxLQUFLO1FBQ1IsZ0JBQWdCLEVBQUU7WUFDaEIsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFO1NBQzlEO1FBQ0QsT0FBTyxFQUFFLE9BQU8s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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk0vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLHNFQUF3RDtBQUN4RCxzRUFBd0Q7QUFDeEQsc0NBQWtEO0FBQ2xELDREQUFvQztBQUNwQywyQ0FBZ0Q7QUFDaEQsMkRBQTJEO0FBQzNELCtDQUFtRDtBQUVuRCxzRUFBOEM7QUFDOUMsNERBQTBEO0FBc0MxRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxRQUFRLEVBQ1IsTUFBTSxHQUFHLFNBQVMsRUFDbEIsTUFBTSxHQUFHLGNBQWMsRUFDdkIsVUFBVSxFQUNWLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxXQUFXLEVBQzVELFlBQVksR0FBRyxHQUFHLEVBQ2xCLGNBQWMsRUFDZCxnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULFFBQVEsRUFDUixRQUFRLEdBQUcsRUFBRSxRQUFRLEVBQUUseUJBQXlCLEVBQUUsRUFDbEQsS0FBSyxFQUNMLEtBQUssRUFDTCxJQUFJLEdBQUcsSUFBSSxFQUNYLElBQUksR0FBRyxFQUFFLEVBQ1QsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNILEVBQUUsRUFBRTtJQUNWLE1BQU0sTUFBTSxHQUFHLElBQUEsa0JBQVMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixNQUFNLE9BQU8sR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFakMsTUFBTSxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxFQUFFO1FBQ2hELG9CQUFvQixFQUFFLE9BQU87UUFDN0IsR0FBRyxLQUFLO1FBQ1IsZ0JBQWdCLEVBQUU7WUFDaEIsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxPQUFPLEVBQUUs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

package/VNet/Firewall.js

@@ -27,18 +27,16 @@ 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 Common_1 = require("../Common");
 const ResourceCreator_1 = __importDefault(require("../Core/ResourceCreator"));
 const FirewallPolicy_1 = __importStar(require("./FirewallPolicy"));
 const IpAddress_1 = __importDefault(require("./IpAddress"));
-const StackEnv_1 = require("../Common/StackEnv");
 exports.default = ({ name, group, snat, policy, outbound, management, monitorConfig, enableDnsProxy, sku = {
     name: network.AzureFirewallSkuName.AZFW_VNet,
     tier: network.AzureFirewallSkuTier.Basic,
 }, ...others }) => {
     // Validation
-    if (!StackEnv_1.isDryRun) {
+    if (!Common_1.isDryRun) {
         if (!outbound && !management)
             throw new Error('Management Public Ip Address is required for the Force Tunneling mode.');
         if (sku.tier === network.AzureFirewallSkuTier.Basic && !management)
@@ -85,7 +83,7 @@ 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,
+        zones: Common_1.isPrd ? ['1', '2', '3'] : undefined,
         threatIntelMode: sku.tier !== network.AzureFirewallSkuTier.Basic && sku.name !== 'AZFW_Hub'
             ? network.AzureFirewallThreatIntelMode.Deny
             : undefined,
@@ -128,4 +126,4 @@ exports.default = ({ name, group, snat, policy, outbound, management, monitorCon
     }
     return { firewall: resource, policy: fwPolicy };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmlyZXdhbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9GaXJld2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBR3hELGlEQUEyQztBQUMzQyxzQ0FBNEM7QUFDNUMsOEVBQXNEO0FBRXRELG1FQUFxRTtBQUVyRSw0REFBb0M7QUFDcEMsaURBQThDO0FBbUM5QyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxJQUFJLEVBQ0osTUFBTSxFQUNOLFFBQVEsRUFDUixVQUFVLEVBQ1YsYUFBYSxFQUNiLGNBQWMsRUFDZCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsT0FBTyxDQUFDLG9CQUFvQixDQUFDLFNBQVM7SUFDNUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLO0NBQ3pDLEVBQ0QsR0FBRyxNQUFNLEVBQ0ssRUFBa0IsRUFBRTtJQUNsQyxhQUFhO0lBQ2IsSUFBSSxDQUFDLG1CQUFRLEVBQUUsQ0FBQztRQUNkLElBQUksQ0FBQyxRQUFRLElBQUksQ0FBQyxVQUFVO1lBQzFCLE1BQU0sSUFBSSxLQUFLLENBQ2Isd0VBQXdFLENBQ3pFLENBQUM7UUFFSixJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLG9CQUFvQixDQUFDLEtBQUssSUFBSSxDQUFDLFVBQVU7WUFDaEUsTUFBTSxJQUFJLEtBQUssQ0FBQyx3REFBd0QsQ0FBQyxDQUFDO0lBQzlFLENBQUM7SUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFckMsd0NBQXdDO0lBQ3hDLE1BQU0sZUFBZSxHQUFHLFVBQVU7UUFDaEMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxlQUFlO1lBQzFCLElBQUEsbUJBQVMsRUFBQztnQkFDUixJQUFJLEVBQUUsR0FBRyxJQUFJLE1BQU07Z0JBQ25CLEtBQUs7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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmlyZXdhbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9GaXJld2FsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBR3hELHNDQUE2RDtBQUM3RCw4RUFBc0Q7QUFFdEQsbUVBQXFFO0FBRXJFLDREQUFvQztBQW1DcEMsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLE1BQU0sRUFDTixRQUFRLEVBQ1IsVUFBVSxFQUNWLGFBQWEsRUFDYixjQUFjLEVBQ2QsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTO0lBQzVDLElBQUksRUFBRSxPQUFPLENBQUMsb0JBQW9CLENBQUMsS0FBSztDQUN6QyxFQUNELEdBQUcsTUFBTSxFQUNLLEVBQWtCLEVBQUU7SUFDbEMsYUFBYTtJQUNiLElBQUksQ0FBQyxpQkFBUSxFQUFFLENBQUM7UUFDZCxJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsVUFBVTtZQUMxQixNQUFNLElBQUksS0FBSyxDQUNiLHdFQUF3RSxDQUN6RSxDQUFDO1FBRUosSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLElBQUksQ0FBQyxVQUFVO1lBQ2hFLE1BQU0sSUFBSSxLQUFLLENBQUMsd0RBQXdELENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRUQsTUFBTSxNQUFNLEdBQUcsSUFBQSx3QkFBZSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXJDLHdDQUF3QztJQUN4QyxNQUFNLGVBQWUsR0FBRyxVQUFVO1FBQ2hDLENBQUMsQ0FBQyxVQUFVLENBQUMsZUFBZTtZQUMxQixJQUFBLG1CQUFTLEVBQUM7Z0JBQ1IsSUFBSSxFQUFFLEdBQUcsSUFBSSxNQUFNO2dCQUNuQixLQUFLO2dCQUNMLElBQUksRUFBRSxLQUFLO2FBQ1os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

package/VNet/FirewallPolicies/AksFirewallPolicy.d.ts

@@ -5,6 +5,7 @@ interface AzureFirewallPolicyProps {
     subnetSpaces: Array<Input<string>>;
     /** Allows access to Docker and Kubernetes registries */
     allowAccessPublicRegistries?: boolean;
+    trustedAcrs?: string[];
     dNATs?: [
         {
             name: string;
@@ -16,5 +17,5 @@ interface AzureFirewallPolicyProps {
         }
     ];
 }
-declare const _default: ({ priority, allowAccessPublicRegistries, subnetSpaces, dNATs, }: AzureFirewallPolicyProps) => FirewallPolicyRuleCollectionResults;
+declare const _default: ({ priority, allowAccessPublicRegistries, subnetSpaces, trustedAcrs, dNATs, }: AzureFirewallPolicyProps) => FirewallPolicyRuleCollectionResults;
 export default _default;

package/VNet/FirewallPolicies/AksFirewallPolicy.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const AzureEnv_1 = require("../../Common/AzureEnv");
+const Common_1 = require("../../Common");
 const FirewallPolicy_1 = require("../FirewallPolicy");
-exports.default = ({ priority, allowAccessPublicRegistries, subnetSpaces, dNATs, }) => {
+exports.default = ({ priority, allowAccessPublicRegistries, subnetSpaces, trustedAcrs = [], dNATs, }) => {
     const dnatRules = new Array();
     const netRules = new Array();
     const appRules = new Array();
@@ -40,7 +40,7 @@ exports.default = ({ priority, allowAccessPublicRegistries, subnetSpaces, dNATs,
         description: 'For OPEN VPN tunneled secure communication between the nodes and the control plane for AzureCloud',
         ipProtocols: ['UDP'],
         sourceAddresses: subnetSpaces,
-        destinationAddresses: [`AzureCloud.${AzureEnv_1.currentRegionCode}`],
+        destinationAddresses: [`AzureCloud.${Common_1.currentRegionCode}`],
         destinationPorts: ['1194'],
     }, {
         ruleType: 'NetworkRule',
@@ -48,8 +48,8 @@ exports.default = ({ priority, allowAccessPublicRegistries, subnetSpaces, dNATs,
         description: 'For tunneled secure communication between the nodes and the control plane for AzureCloud',
         ipProtocols: ['TCP'],
         sourceAddresses: subnetSpaces,
-        destinationAddresses: [`AzureCloud.${AzureEnv_1.currentRegionCode}`],
-        destinationPorts: AzureEnv_1.allAzurePorts,
+        destinationAddresses: [`AzureCloud.${Common_1.currentRegionCode}`],
+        destinationPorts: Common_1.allAzurePorts,
     }, {
         ruleType: 'NetworkRule',
         name: 'aks-time',
@@ -60,15 +60,17 @@ exports.default = ({ priority, allowAccessPublicRegistries, subnetSpaces, dNATs,
         destinationPorts: ['123'],
     }, 
     //TODO: Remove this
+    // {
+    //   ruleType: 'NetworkRule',
+    //   name: 'aks-time-others',
+    //   description:
+    //     'Required for Network Time Protocol (NTP) time synchronization on Linux nodes.',
+    //   ipProtocols: ['UDP'],
+    //   sourceAddresses: subnetSpaces,
+    //   destinationAddresses: ['*'],
+    //   destinationPorts: ['123'],
+    // },
     {
-        ruleType: 'NetworkRule',
-        name: 'aks-time-others',
-        description: 'Required for Network Time Protocol (NTP) time synchronization on Linux nodes.',
-        ipProtocols: ['UDP'],
-        sourceAddresses: subnetSpaces,
-        destinationAddresses: ['*'],
-        destinationPorts: ['123'],
-    }, {
         ruleType: 'NetworkRule',
         name: 'azure-services-tags',
         description: 'Allows internal services to connect to Azure Resources.',
@@ -107,12 +109,13 @@ exports.default = ({ priority, allowAccessPublicRegistries, subnetSpaces, dNATs,
         sourceAddresses: subnetSpaces,
         targetFqdns: [
             //AKS mater
-            '*.hcp.southeastasia.azmk8s.io',
+            `*.hcp.${Common_1.currentRegionCode}.azmk8s.io`,
             //Microsoft Container Registry
-            '*.azurecr.io',
+            ...trustedAcrs?.map((s) => `${s}.azurecr.io`),
             'mcr.microsoft.com',
-            'data.mcr.microsoft.com',
-            '*.data.mcr.microsoft.com',
+            '*.mcr.microsoft.com',
+            //'data.mcr.microsoft.com',
+            //'*.data.mcr.microsoft.com',
             //Azure management
             'management.azure.com',
             'login.microsoftonline.com',
@@ -161,7 +164,7 @@ exports.default = ({ priority, allowAccessPublicRegistries, subnetSpaces, dNATs,
                 'quay.io', //For Cert Manager
                 '*.quay.io',
                 'k8s.gcr.io', //nginx images
-                '*.k8s.io',
+                'registry.k8s.io',
                 '*.cloudfront.net',
                 '*.amazonaws.com',
                 '*.gcr.io',
@@ -186,4 +189,4 @@ exports.default = ({ priority, allowAccessPublicRegistries, subnetSpaces, dNATs,
         action: 'Allow',
     });
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWtzRmlyZXdhbGxQb2xpY3kuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvVk5ldC9GaXJld2FsbFBvbGljaWVzL0Frc0ZpcmV3YWxsUG9saWN5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsb0RBQXlFO0FBTXpFLHNEQUF3RDtBQXFCeEQsa0JBQWUsQ0FBQyxFQUNkLFFBQVEsRUFDUiwyQkFBMkIsRUFDM0IsWUFBWSxFQUNaLEtBQUssR0FDb0IsRUFBdUMsRUFBRTtJQUNsRSxNQUFNLFNBQVMsR0FBRyxJQUFJLEtBQUssRUFBcUMsQ0FBQztJQUNqRSxNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssRUFBMEIsQ0FBQztJQUNyRCxNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssRUFBOEIsQ0FBQztJQUV6RCxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQ1YsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQ3BCLFNBQVMsQ0FBQyxJQUFJLENBQUM7Z0JBQ2IsUUFBUSxFQUFFLFNBQVM7Z0JBQ25CLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQyxJQUFJLGNBQWM7Z0JBQy9CLFdBQVcsRUFBRSwwQ0FBMEMsR0FBRyxDQUFDLElBQUksd0JBQXdCO2dCQUN2RixlQUFlLEVBQUUsQ0FBQyxHQUFHLENBQUMsZUFBZSxJQUFJLEdBQUcsQ0FBQztnQkFDN0Msb0JBQW9CLEVBQUUsR0FBRyxDQUFDLGlCQUFpQjtnQkFDM0MsZ0JBQWdCLEVBQUUsQ0FBQyxLQUFLLENBQUM7Z0JBQ3pCLFdBQVcsRUFBRSxDQUFDLEtBQUssQ0FBQztnQkFDcEIsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLGlCQUFpQjtnQkFDeEMsY0FBYyxFQUFFLEtBQUs7YUFDdEIsQ0FBQyxDQUFDO1lBRUgsSUFBSSxHQUFHLENBQUMsU0FBUztnQkFDZixTQUFTLENBQUMsSUFBSSxDQUFDO29CQUNiLFFBQVEsRUFBRSxTQUFTO29CQUNuQixJQUFJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWtzRmlyZXdhbGxQb2xpY3kuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvVk5ldC9GaXJld2FsbFBvbGljaWVzL0Frc0ZpcmV3YWxsUG9saWN5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEseUNBQWdFO0FBTWhFLHNEQUF3RDtBQXNCeEQsa0JBQWUsQ0FBQyxFQUNkLFFBQVEsRUFDUiwyQkFBMkIsRUFDM0IsWUFBWSxFQUNaLFdBQVcsR0FBRyxFQUFFLEVBQ2hCLEtBQUssR0FDb0IsRUFBdUMsRUFBRTtJQUNsRSxNQUFNLFNBQVMsR0FBRyxJQUFJLEtBQUssRUFBcUMsQ0FBQztJQUNqRSxNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssRUFBMEIsQ0FBQztJQUNyRCxNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssRUFBOEIsQ0FBQztJQUV6RCxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQ1YsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQ3BCLFNBQVMsQ0FBQyxJQUFJLENBQUM7Z0JBQ2IsUUFBUSxFQUFFLFNBQVM7Z0JBQ25CLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQyxJQUFJLGNBQWM7Z0JBQy9CLFdBQVcsRUFBRSwwQ0FBMEMsR0FBRyxDQUFDLElBQUksd0JBQXdCO2dCQUN2RixlQUFlLEVBQUUsQ0FBQyxHQUFHLENBQUMsZUFBZSxJQUFJLEdBQUcsQ0FBQztnQkFDN0Msb0JBQW9CLEVBQUUsR0FBRyxDQUFDLGlCQUFpQjtnQkFDM0MsZ0JBQWdCLEVBQUUsQ0FBQyxLQUFLLENBQUM7Z0JBQ3pCLFdBQVcsRUFBRSxDQUFDLEtBQUssQ0FBQztnQkFDcEIsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLGlCQUFpQjtnQkFDeEMsY0FBYyxFQUFFLEtBQUs7YUFDdEIsQ0FBQyxDQUFDO1lBRUgsSUFBSSxHQUFHLENBQUMsU0FBUztnQkFDZixTQUFTLENBQUMsSUFBSSxDQUFDO29CQUNiLFFBQVEs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

package/VNet/Helper.d.ts

@@ -1,7 +1,7 @@
 import * as network from '@pulumi/azure-native/network';
 import { Input, Output } from '@pulumi/pulumi';
 import * as netmask from 'netmask';
-import { ResourceGroupInfo } from '../types';
+import { ResourceArgs } from '../types';
 import { VnetInfoType } from './types';
 export declare const appGatewaySubnetName = "app-gateway";
 export declare const gatewaySubnetName = "GatewaySubnet";
@@ -32,7 +32,7 @@ export declare const getIpAddressResource: ({ name, groupName, }: {
 export declare const getVnetInfo: (groupName: string, region?: string) => VnetInfoType;
 export declare const getVnetIdByName: (groupName: string, region?: string) => Output<string>;
 export declare const parseVnetInfoFromId: (vnetId: Input<string>) => Output<VnetInfoType>;
-export declare const getFirewallIpAddress: (name: string, group: ResourceGroupInfo) => Output<string>;
+export declare const getFirewallIpAddress: ({ name, group }: ResourceArgs) => Output<string>;
 export declare const getFirewallIpAddressByGroupName: (groupName: string) => Output<string>;
 export declare const getIpAddressFromHost: (host: string) => Output<import("@pulumi/pulumi").UnwrappedObject<import("dns").LookupAddress>>;
 export {};

package/VNet/Helper.js

@@ -100,7 +100,7 @@ const parseVnetInfoFromId = (vnetId) => (0, pulumi_1.output)(vnetId).apply((id)
     };
 });
 exports.parseVnetInfoFromId = parseVnetInfoFromId;
-const getFirewallIpAddress = (name, group) => {
+const getFirewallIpAddress = ({ name, group }) => {
     const firewall = network.getAzureFirewallOutput({
         azureFirewallName: name,
         ...group,
@@ -111,9 +111,12 @@ exports.getFirewallIpAddress = getFirewallIpAddress;
 const getFirewallIpAddressByGroupName = (groupName) => {
     const fireWallName = (0, Common_2.getFirewallName)(groupName);
     const rsName = (0, Common_2.getResourceGroupName)(groupName);
-    return (0, exports.getFirewallIpAddress)(fireWallName, { resourceGroupName: rsName });
+    return (0, exports.getFirewallIpAddress)({
+        name: fireWallName,
+        group: { resourceGroupName: rsName },
+    });
 };
 exports.getFirewallIpAddressByGroupName = getFirewallIpAddressByGroupName;
 const getIpAddressFromHost = (host) => (0, pulumi_1.output)(promises_1.default.lookup(host, { family: 4 }));
 exports.getIpAddressFromHost = getIpAddressFromHost;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBQ3hELDJDQUFvRTtBQUNwRSxpREFBbUM7QUFDbkMsaUVBQW9DO0FBQ3BDLHNDQUltQjtBQUNuQixzQ0FLbUI7QUFJTixRQUFBLG9CQUFvQixHQUFHLGFBQWEsQ0FBQztBQUNyQyxRQUFBLGlCQUFpQixHQUFHLGVBQWUsQ0FBQztBQUNwQyxRQUFBLGdCQUFnQixHQUFHLHFCQUFxQixDQUFDO0FBQ3pDLFFBQUEsMEJBQTBCLEdBQUcsK0JBQStCLENBQUM7QUFDN0QsUUFBQSxtQkFBbUIsR0FBRyxvQkFBb0IsQ0FBQztBQUVqRCxNQUFNLFdBQVcsR0FBRyxDQUFDLE1BQWMsRUFBRSxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQTlELFFBQUEsV0FBVyxlQUFtRDtBQUUzRSx5REFBeUQ7QUFDbEQsTUFBTSxnQkFBZ0IsR0FBRyxDQUM5QixTQUFtQixFQUNvQixFQUFFLENBQ3pDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRTtJQUNuQixJQUFJLEVBQUUsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNyQixNQUFNLEtBQUssR0FBRyxJQUFBLG1CQUFXLEVBQUMsRUFBRSxDQUFDLENBQUM7UUFDOUIsT0FBTyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDckQsQ0FBQztJQUNELE9BQU8sRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsQ0FBQztBQUNoQyxDQUFDLENBQUMsQ0FBQztBQVRRLFFBQUEsZ0JBQWdCLG9CQVN4QjtB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBQ3hELDJDQUFvRTtBQUNwRSxpREFBbUM7QUFDbkMsaUVBQW9DO0FBQ3BDLHNDQUltQjtBQUNuQixzQ0FLbUI7QUFJTixRQUFBLG9CQUFvQixHQUFHLGFBQWEsQ0FBQztBQUNyQyxRQUFBLGlCQUFpQixHQUFHLGVBQWUsQ0FBQztBQUNwQyxRQUFBLGdCQUFnQixHQUFHLHFCQUFxQixDQUFDO0FBQ3pDLFFBQUEsMEJBQTBCLEdBQUcsK0JBQStCLENBQUM7QUFDN0QsUUFBQSxtQkFBbUIsR0FBRyxvQkFBb0IsQ0FBQztBQUVqRCxNQUFNLFdBQVcsR0FBRyxDQUFDLE1BQWMsRUFBRSxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQTlELFFBQUEsV0FBVyxlQUFtRDtBQUUzRSx5REFBeUQ7QUFDbEQsTUFBTSxnQkFBZ0IsR0FBRyxDQUM5QixTQUFtQixFQUNvQixFQUFFLENBQ3pDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRTtJQUNuQixJQUFJLEVBQUUsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNyQixNQUFNLEtBQUssR0FBRyxJQUFBLG1CQUFXLEVBQUMsRUFBRSxDQUFDLENBQUM7UUFDOUIsT0FBTyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDckQsQ0FBQztJQUNELE9BQU8sRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUUsQ0FBQztBQUNoQyxDQUFDLENBQUMsQ0FBQztBQVRRLFFBQUEsZ0JBQWdCLG9CQVN4QjtB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

package/VNet/IpAddressPrefix.d.ts

@@ -1,10 +1,8 @@
-import * as network from "@pulumi/azure-native/network";
-import { PublicIPAddress } from "@pulumi/azure-native/network";
-import { Input } from "@pulumi/pulumi";
-import { BasicResourceArgs } from "../types";
-type AddressNameType = Array<{
-    name: string;
-}>;
+import * as network from '@pulumi/azure-native/network';
+import { PublicIPAddress } from '@pulumi/azure-native/network';
+import { Input } from '@pulumi/pulumi';
+import { BasicResourceArgs, NamedType } from '../types';
+type AddressNameType = Array<NamedType>;
 export interface PublicIpAddressPrefixProps extends BasicResourceArgs {
     prefixLength?: 28 | 29 | 30 | 31;
     createPrefix?: boolean;

package/VNet/IpAddressPrefix.js

@@ -27,22 +27,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const network = __importStar(require("@pulumi/azure-native/network"));
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 const Locker_1 = __importDefault(require("../Core/Locker"));
 const IpAddress_1 = __importDefault(require("./IpAddress"));
 exports.default = ({ name, group, prefixLength = 30, createPrefix = true, ipAddresses, config = {
     version: network.IPVersion.IPv4,
     allocationMethod: network.IPAllocationMethod.Static,
 }, lock = true, }) => {
-    const n = (0, Naming_1.getIpAddressPrefixName)(name);
-    const sku = { name: "Standard", tier: "Regional" };
+    const n = (0, Common_1.getIpAddressPrefixName)(name);
+    const sku = { name: 'Standard', tier: 'Regional' };
     const addressPrefix = createPrefix
         ? new network.PublicIPPrefix(n, {
             publicIpPrefixName: n,
             ...group,
             prefixLength,
             sku,
-        }, { ignoreChanges: ["prefixLength"] })
+        }, { ignoreChanges: ['prefixLength'] })
         : undefined;
     if (lock && addressPrefix) {
         (0, Locker_1.default)({
@@ -65,4 +65,4 @@ exports.default = ({ name, group, prefixLength = 30, createPrefix = true, ipAddr
     }
     return { addressPrefix, addresses };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSXBBZGRyZXNzUHJlZml4LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSXBBZGRyZXNzUHJlZml4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFHeEQsNkNBQTBEO0FBQzFELDREQUFvQztBQUVwQyw0REFBb0M7QUF5QnBDLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFlBQVksR0FBRyxFQUFFLEVBQ2pCLFlBQVksR0FBRyxJQUFJLEVBQ25CLFdBQVcsRUFDWCxNQUFNLEdBQUc7SUFDUCxPQUFPLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJO0lBQy9CLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNO0NBQ3BELEVBQ0QsSUFBSSxHQUFHLElBQUksR0FDZ0IsRUFBK0IsRUFBRTtJQUM1RCxNQUFNLENBQUMsR0FBRyxJQUFBLCtCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sR0FBRyxHQUFHLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLENBQUM7SUFFbkQsTUFBTSxhQUFhLEdBQUcsWUFBWTtRQUNoQyxDQUFDLENBQUMsSUFBSSxPQUFPLENBQUMsY0FBYyxDQUN4QixDQUFDLEVBQ0Q7WUFDRSxrQkFBa0IsRUFBRSxDQUFDO1lBQ3JCLEdBQUcsS0FBSztZQUNSLFlBQVk7WUFDWixHQUFHO1NBQ0osRUFDRCxFQUFFLGFBQWEsRUFBRSxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQ3BDO1FBQ0gsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLElBQUksSUFBSSxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQzFCLElBQUEsZ0JBQU0sRUFBQztZQUNMLElBQUk7WUFDSixRQUFRLEVBQUUsYUFBYTtTQUN4QixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsTUFBTSxTQUFTLEdBQW9DLEVBQUUsQ0FBQztJQUV0RCxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2hCLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDNUIsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNwQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBQSxtQkFBUyxFQUFDO2dCQUN2QixHQUFHLE1BQU07Z0JBQ1QsSUFBSSxFQUFFLENBQUM7Z0JBQ1AsS0FBSztnQkFDTCxjQUFjLEVBQUUsYUFBYTtnQkFDN0IsSUFBSTthQUNMLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLENBQUM7QUFDdEMsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSXBBZGRyZXNzUHJlZml4LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSXBBZGRyZXNzUHJlZml4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFHeEQsc0NBQW1EO0FBQ25ELDREQUFvQztBQUVwQyw0REFBb0M7QUF1QnBDLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFlBQVksR0FBRyxFQUFFLEVBQ2pCLFlBQVksR0FBRyxJQUFJLEVBQ25CLFdBQVcsRUFDWCxNQUFNLEdBQUc7SUFDUCxPQUFPLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJO0lBQy9CLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxNQUFNO0NBQ3BELEVBQ0QsSUFBSSxHQUFHLElBQUksR0FDZ0IsRUFBK0IsRUFBRTtJQUM1RCxNQUFNLENBQUMsR0FBRyxJQUFBLCtCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sR0FBRyxHQUFHLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLENBQUM7SUFFbkQsTUFBTSxhQUFhLEdBQUcsWUFBWTtRQUNoQyxDQUFDLENBQUMsSUFBSSxPQUFPLENBQUMsY0FBYyxDQUN4QixDQUFDLEVBQ0Q7WUFDRSxrQkFBa0IsRUFBRSxDQUFDO1lBQ3JCLEdBQUcsS0FBSztZQUNSLFlBQVk7WUFDWixHQUFHO1NBQ0osRUFDRCxFQUFFLGFBQWEsRUFBRSxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQ3BDO1FBQ0gsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVkLElBQUksSUFBSSxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQzFCLElBQUEsZ0JBQU0sRUFBQztZQUNMLElBQUk7WUFDSixRQUFRLEVBQUUsYUFBYTtTQUN4QixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsTUFBTSxTQUFTLEdBQW9DLEVBQUUsQ0FBQztJQUV0RCxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2hCLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDNUIsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNwQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBQSxtQkFBUyxFQUFDO2dCQUN2QixHQUFHLE1BQU07Z0JBQ1QsSUFBSSxFQUFFLENBQUM7Z0JBQ1AsS0FBSztnQkFDTCxjQUFjLEVBQUUsYUFBYTtnQkFDN0IsSUFBSTthQUNMLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLENBQUM7QUFDdEMsQ0FBQyxDQUFDIn0=

package/VNet/PrivateEndpoint.d.ts

@@ -1,5 +1,5 @@
-import { BasicArgs, PrivateLinkPropsType, ResourceInfo } from '../types';
-export type PrivateEndpointProps = Omit<PrivateLinkPropsType, 'type'> & Pick<BasicArgs, 'dependsOn'> & {
+import { OptsArgs, PrivateLinkPropsType, ResourceInfo } from '../types';
+export type PrivateEndpointProps = Omit<PrivateLinkPropsType, 'type'> & Pick<OptsArgs, 'dependsOn'> & {
     resourceInfo: ResourceInfo;
     /** check the private link DNS Zone here https://learn.microsoft.com/en-us/azure/private-link/private-endpoint-dns */
     privateDnsZoneName: string;

package/VNet/PrivateEndpoint.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const network = __importStar(require("@pulumi/azure-native/network"));
 const pulumi_1 = require("@pulumi/pulumi");
-const AzureEnv_1 = require("../Common/AzureEnv");
 const Common_1 = require("../Common");
 const Builder_1 = require("../Builder");
 exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName, linkServiceGroupIds, dependsOn, }) => {
@@ -45,7 +44,7 @@ exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName,
     //Get IpAddress in
     const ipAddresses = (0, pulumi_1.output)(endpoints.map((e) => e.customDnsConfigs.apply((c) => c.flatMap((i) => i.ipAddresses)))).apply((a) => a.flatMap((i) => i));
     (0, pulumi_1.output)([resourceInfo.id, ipAddresses]).apply(([id, ip]) => {
-        const resourceInfo = (0, AzureEnv_1.parseResourceInfoFromId)(id);
+        const resourceInfo = (0, Common_1.parseResourceInfoFromId)(id);
         return (0, Builder_1.PrivateDnsZoneBuilder)({
             name: `${resourceInfo.name}.${privateDnsZoneName}`,
             group: resourceInfo.group,
@@ -57,4 +56,4 @@ exports.default = ({ resourceInfo, subnetIds, extraVnetIds, privateDnsZoneName,
     });
     return endpoints;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsMkNBQXdDO0FBRXhDLGlEQUE2RDtBQUM3RCxzQ0FBbUQ7QUFDbkQsd0NBQW1EO0FBVW5ELGtCQUFlLENBQUMsRUFDZCxZQUFZLEVBQ1osU0FBUyxFQUNULFlBQVksRUFDWixrQkFBa0IsRUFDbEIsbUJBQW1CLEVBQ25CLFNBQVMsR0FDWSxFQUFFLEVBQUU7SUFDekIsTUFBTSxJQUFJLEdBQUcsSUFBQSwrQkFBc0IsRUFBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdkQsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FDN0IsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FDWCxJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQ3pCLEdBQUcsSUFBSSxJQUFJLEtBQUssRUFBRSxFQUNsQjtRQUNFLG1CQUFtQixFQUFFLEdBQUcsSUFBSSxJQUFJLEtBQUssRUFBRTtRQUN2QyxHQUFHLFlBQVksQ0FBQyxLQUFLO1FBQ3JCLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUU7UUFDakIsNkJBQTZCLEVBQUU7WUFDN0I7Z0JBQ0UsUUFBUSxFQUFFLG1CQUFtQjtnQkFDN0IsSUFBSSxFQUFFLEdBQUcsSUFBSSxPQUFPO2dCQUNwQixvQkFBb0IsRUFBRSxZQUFZLENBQUMsRUFBRTthQUN0QztTQUNGO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQ0osQ0FBQztJQUVGLGtCQUFrQjtJQUNsQixNQUFNLFdBQVcsR0FBRyxJQUFBLGVBQU0sRUFDeEIsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ2xCLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFZLENBQUMsQ0FBQyxDQUNuRSxDQUNGLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFFLENBQUMsQ0FBQyxDQUFDO0lBRXJDLElBQUEsZUFBTSxFQUFDLENBQUMsWUFBWSxDQUFDLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDeEQsTUFBTSxZQUFZLEdBQUcsSUFBQSxrQ0FBdUIsRUFBQyxFQUFZLENBQUMsQ0FBQztRQUMzRCxPQUFPLElBQUEsK0JBQXFCLEVBQUM7WUFDM0IsSUFBSSxFQUFFLEdBQUcsWUFBYSxDQUFDLElBQUksSUFBSSxrQkFBa0IsRUFBRTtZQUNuRCxLQUFLLEVBQUUsWUFBYSxDQUFDLEtBQUs7WUFDMUIsU0FBUztTQUNWLENBQUM7YUFDQyxXQUFXLENBQUMsRUFBRSxXQUFXLEVBQUUsRUFBYyxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsQ0FBQzthQUM3RCxNQUFNLENBQUMsRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxLQUFLLEVBQUUsQ0FBQzthQUN4RSxLQUFLLEVBQUUsQ0FBQztJQUNiLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFDeEQsMkNBQXdDO0FBRXhDLHNDQUE0RTtBQUM1RSx3Q0FBbUQ7QUFVbkQsa0JBQWUsQ0FBQyxFQUNkLFlBQVksRUFDWixTQUFTLEVBQ1QsWUFBWSxFQUNaLGtCQUFrQixFQUNsQixtQkFBbUIsRUFDbkIsU0FBUyxHQUNZLEVBQUUsRUFBRTtJQUN6QixNQUFNLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV2RCxNQUFNLFNBQVMsR0FBRyxTQUFTLENBQUMsR0FBRyxDQUM3QixDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUNYLElBQUksT0FBTyxDQUFDLGVBQWUsQ0FDekIsR0FBRyxJQUFJLElBQUksS0FBSyxFQUFFLEVBQ2xCO1FBQ0UsbUJBQW1CLEVBQUUsR0FBRyxJQUFJLElBQUksS0FBSyxFQUFFO1FBQ3ZDLEdBQUcsWUFBWSxDQUFDLEtBQUs7UUFDckIsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRTtRQUNqQiw2QkFBNkIsRUFBRTtZQUM3QjtnQkFDRSxRQUFRLEVBQUUsbUJBQW1CO2dCQUM3QixJQUFJLEVBQUUsR0FBRyxJQUFJLE9BQU87Z0JBQ3BCLG9CQUFvQixFQUFFLFlBQVksQ0FBQyxFQUFFO2FBQ3RDO1NBQ0Y7S0FDRixFQUNELEVBQUUsU0FBUyxFQUFFLENBQ2QsQ0FDSixDQUFDO0lBRUYsa0JBQWtCO0lBQ2xCLE1BQU0sV0FBVyxHQUFHLElBQUEsZUFBTSxFQUN4QixTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDbEIsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFdBQVksQ0FBQyxDQUFDLENBQ25FLENBQ0YsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUUsQ0FBQyxDQUFDLENBQUM7SUFFckMsSUFBQSxlQUFNLEVBQUMsQ0FBQyxZQUFZLENBQUMsRUFBRSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN4RCxNQUFNLFlBQVksR0FBRyxJQUFBLGdDQUF1QixFQUFDLEVBQVksQ0FBQyxDQUFDO1FBQzNELE9BQU8sSUFBQSwrQkFBcUIsRUFBQztZQUMzQixJQUFJLEVBQUUsR0FBRyxZQUFhLENBQUMsSUFBSSxJQUFJLGtCQUFrQixFQUFFO1lBQ25ELEtBQUssRUFBRSxZQUFhLENBQUMsS0FBSztZQUMxQixTQUFTO1NBQ1YsQ0FBQzthQUNDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsRUFBRSxFQUFjLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxDQUFDO2FBQzdELE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLG1CQUFtQixFQUFFLEtBQUssRUFBRSxDQUFDO2FBQ3hFLEtBQUssRUFBRSxDQUFDO0lBQ2IsQ0FBQyxDQUFDLENBQUM7SUFFSCxPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDLENBQUMifQ==

package/VNet/RouteTable.d.ts

@@ -1,12 +1,12 @@
-import { BasicResourceArgs } from "../types";
-import { RouteArgs } from "./types";
-import { Input } from "@pulumi/pulumi";
+import { BasicResourceArgs } from '../types';
+import { RouteArgs } from './types';
+import { Input } from '@pulumi/pulumi';
 interface Props extends BasicResourceArgs {
     routes?: Input<RouteArgs>[];
 }
 declare const _default: ({ name, group, routes }: Props) => import("@pulumi/azure-native/network/routeTable").RouteTable;
 export default _default;
-interface RouteItemsProps extends BasicResourceArgs, Omit<RouteArgs, "name"> {
+interface RouteItemsProps extends BasicResourceArgs, Omit<RouteArgs, 'name'> {
     routeTableName: Input<string>;
 }
 export declare const updateRouteItems: ({ name, group, ...others }: RouteItemsProps) => import("@pulumi/azure-native/network/route").Route;

package/VNet/RouteTable.js

@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateRouteItems = void 0;
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 const network = __importStar(require("@pulumi/azure-native/network"));
 exports.default = ({ name, group, routes }) => {
-    const routeName = (0, Naming_1.getRouteName)(name);
+    const routeName = (0, Common_1.getRouteName)(name);
     return new network.RouteTable(routeName, {
         routeTableName: routeName,
         ...group,
@@ -35,7 +35,7 @@ exports.default = ({ name, group, routes }) => {
     });
 };
 const updateRouteItems = ({ name, group, ...others }) => {
-    const routeName = (0, Naming_1.getRouteItemName)(name);
+    const routeName = (0, Common_1.getRouteItemName)(name);
     return new network.Route(routeName, {
         name: routeName,
         ...group,
@@ -43,4 +43,4 @@ const updateRouteItems = ({ name, group, ...others }) => {
     });
 };
 exports.updateRouteItems = updateRouteItems;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGVUYWJsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1JvdXRlVGFibGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFQSw2Q0FBa0U7QUFDbEUsc0VBQXdEO0FBT3hELGtCQUFlLENBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBUyxFQUFFLEVBQUU7SUFDaEQsTUFBTSxTQUFTLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JDLE9BQU8sSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRTtRQUN2QyxjQUFjLEVBQUUsU0FBUztRQUN6QixHQUFHLEtBQUs7UUFDUixNQUFNO0tBQ1AsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBTUssTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEVBQy9CLElBQUksRUFDSixLQUFLLEVBQ0wsR0FBRyxNQUFNLEVBQ08sRUFBRSxFQUFFO0lBQ3BCLE1BQU0sU0FBUyxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDekMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFO1FBQ2xDLElBQUksRUFBRSxTQUFTO1FBQ2YsR0FBRyxLQUFLO1FBQ1IsR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBWFcsUUFBQSxnQkFBZ0Isb0JBVzNCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGVUYWJsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1JvdXRlVGFibGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFQSxzQ0FBMkQ7QUFDM0Qsc0VBQXdEO0FBT3hELGtCQUFlLENBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBUyxFQUFFLEVBQUU7SUFDaEQsTUFBTSxTQUFTLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JDLE9BQU8sSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRTtRQUN2QyxjQUFjLEVBQUUsU0FBUztRQUN6QixHQUFHLEtBQUs7UUFDUixNQUFNO0tBQ1AsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBTUssTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEVBQy9CLElBQUksRUFDSixLQUFLLEVBQ0wsR0FBRyxNQUFNLEVBQ08sRUFBRSxFQUFFO0lBQ3BCLE1BQU0sU0FBUyxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDekMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFO1FBQ2xDLElBQUksRUFBRSxTQUFTO1FBQ2YsR0FBRyxLQUFLO1FBQ1IsR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBWFcsUUFBQSxnQkFBZ0Isb0JBVzNCIn0=

package/VNet/Vnet.js

@@ -128,6 +128,10 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGatewa
         },
         ...group,
         enableVmProtection: true,
+        encryption: {
+            enabled: true,
+            enforcement: network.VirtualNetworkEncryptionEnforcement.AllowUnencrypted,
+        },
         dhcpOptions: dnsServers ? { dnsServers } : undefined,
         subnets: subnets.map((s) => (0, Subnet_1.default)({
             subnet: s,
@@ -157,4 +161,4 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGatewa
         bastionSubnet: findSubnet(Helper_1.azBastionSubnetName),
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm5ldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZuZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUt4RCxxQ0FNa0I7QUFDbEIsc0NBQXdDO0FBQ3hDLHNEQUFxRDtBQUNyRCxvRUFBNEM7QUFDNUMsOERBQXNDO0FBQ3RDLCtGQUF1RTtBQXdFdkUsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsTUFBTSxFQUNOLGFBQWEsRUFDYixPQUFPLEdBQUcsRUFBRSxFQUNaLFVBQVUsRUFDVixVQUFVLEVBQ1YsUUFBUSxHQUFHLEVBQUUsRUFDYixTQUFTLEdBQ0MsRUFBYyxFQUFFO0lBQzFCLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsYUFBYSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7SUFFMUQsWUFBWTtJQUNaLElBQUksUUFBUSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDOUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSw2QkFBb0I7WUFDMUIsYUFBYSxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhO1lBQ3RELHVCQUF1QixFQUFFLEtBQUs7WUFDOUIsbUJBQW1CLEVBQUUsS0FBSztZQUMxQixnQkFBZ0IsRUFBRSxLQUFLO1NBQ3hCLENBQUMsQ0FBQztRQUVILDRFQUE0RTtRQUM1RSxhQUFhLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBQSxnQ0FBc0IsRUFBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFFRCxnQkFBZ0I7SUFDaEIsSUFBSSxRQUFRLEVBQUUsYUFBYSxFQUFFLENBQUM7UUFDNUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSwwQkFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm5ldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZuZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUt4RCxxQ0FNa0I7QUFDbEIsc0NBQXdDO0FBQ3hDLHNEQUFxRDtBQUNyRCxvRUFBNEM7QUFDNUMsOERBQXNDO0FBQ3RDLCtGQUF1RTtBQXdFdkUsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsTUFBTSxFQUNOLGFBQWEsRUFDYixPQUFPLEdBQUcsRUFBRSxFQUNaLFVBQVUsRUFDVixVQUFVLEVBQ1YsUUFBUSxHQUFHLEVBQUUsRUFDYixTQUFTLEdBQ0MsRUFBYyxFQUFFO0lBQzFCLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsYUFBYSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7SUFFMUQsWUFBWTtJQUNaLElBQUksUUFBUSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDOUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSw2QkFBb0I7WUFDMUIsYUFBYSxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhO1lBQ3RELHVCQUF1QixFQUFFLEtBQUs7WUFDOUIsbUJBQW1CLEVBQUUsS0FBSztZQUMxQixnQkFBZ0IsRUFBRSxLQUFLO1NBQ3hCLENBQUMsQ0FBQztRQUVILDRFQUE0RTtRQUM1RSxhQUFhLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBQSxnQ0FBc0IsRUFBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFFRCxnQkFBZ0I7SUFDaEIsSUFBSSxRQUFRLEVBQUUsYUFBYSxFQUFFLENBQUM7UUFDNUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSwwQkFB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

package/VNet/index.d.ts

@@ -1,14 +1,12 @@
 import * as network from '@pulumi/azure-native/network';
 import { Input } from '@pulumi/pulumi';
 import * as pulumi from '@pulumi/pulumi';
-import { BasicMonitorArgs, ResourceGroupInfo } from '../types';
+import { BasicMonitorArgs, ResourceArgs } from '../types';
 import { CustomSecurityRuleArgs } from './types';
 import { FirewallSkus } from './Firewall';
 import { FirewallPolicyProps } from './types';
 import { SubnetProps } from './Subnet';
-interface Props {
-    name: string;
-    group: ResourceGroupInfo;
+interface Props extends ResourceArgs {
     ddosId?: Input<string>;
     addressSpace?: Input<string>[];
     subnets?: SubnetProps[];
@@ -52,7 +50,7 @@ declare const _default: ({ group, name, ddosId, addressSpace, publicIpAddress, s
     } | undefined;
     name: string;
     id: pulumi.Output<string>;
-    group: ResourceGroupInfo;
+    group: import("../types").ResourceGroupInfo;
     vnet: network.VirtualNetwork;
     appGatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
     gatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;

package/VNet/index.js

@@ -217,4 +217,4 @@ const createFirewall = ({ name, group, routeTableName, dependsOn = [], ...others
     // }
     return rs;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBT3hELDBEQUFtRTtBQUVuRSxzRUFBMkM7QUFFM0Msa0RBQTBCO0FBQzFCLHFDQUErQztBQStDL0Msa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osTUFBTSxFQUNOLFlBQVksRUFDWixlQUFlLEVBQ2YsT0FBTyxFQUNQLFFBQVEsR0FBRyxFQUFFLEVBQ2IsYUFBYSxFQUNiLEdBQUcsTUFBTSxFQUNILEVBQUUsRUFBRTtJQUNWLE1BQU0sVUFBVSxHQUFHLFFBQVEsQ0FBQyxhQUFhLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztJQUN2RCxNQUFNLE1BQU0sR0FBRyxJQUFJLEtBQUssRUFBbUMsQ0FBQztJQUU1RCxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBQ3BCLHNDQUFzQztRQUN0QyxJQUFJLFFBQVEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztZQUM1QixNQUFNLENBQUMsSUFBSSxDQUFDO2dCQUNWLElBQUksRUFBRSxzQkFBc0I7Z0JBQzVCLGFBQWEsRUFBRSxlQUFlLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztnQkFDaEUsV0FBVyxFQUFFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRO2FBQy9DLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxtREFBbUQ7YUFDaEQsSUFBSSxRQUFRLENBQUMsYUFBYSxFQUFFLDBCQUEwQjtZQUN6RCxVQUFVLENBQUMsSUFBSSxDQUFDO2dCQUNkLElBQUksRUFBRSx3Q0FBd0M7Z0JBQzlDLG1CQUFtQixFQUFFLEdBQUc7Z0JBQ3hCLGVBQWUsRUFBRSxHQUFHO2dCQUNwQix3QkFBd0IsRUFBRSxlQUFlLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBTXhELDBEQUFtRTtBQUVuRSxzRUFBMkM7QUFFM0Msa0RBQTBCO0FBQzFCLHFDQUErQztBQTZDL0Msa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osTUFBTSxFQUNOLFlBQVksRUFDWixlQUFlLEVBQ2YsT0FBTyxFQUNQLFFBQVEsR0FBRyxFQUFFLEVBQ2IsYUFBYSxFQUNiLEdBQUcsTUFBTSxFQUNILEVBQUUsRUFBRTtJQUNWLE1BQU0sVUFBVSxHQUFHLFFBQVEsQ0FBQyxhQUFhLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztJQUN2RCxNQUFNLE1BQU0sR0FBRyxJQUFJLEtBQUssRUFBbUMsQ0FBQztJQUU1RCxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBQ3BCLHNDQUFzQztRQUN0QyxJQUFJLFFBQVEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztZQUM1QixNQUFNLENBQUMsSUFBSSxDQUFDO2dCQUNWLElBQUksRUFBRSxzQkFBc0I7Z0JBQzVCLGFBQWEsRUFBRSxlQUFlLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztnQkFDaEUsV0FBVyxFQUFFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRO2FBQy9DLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxtREFBbUQ7YUFDaEQsSUFBSSxRQUFRLENBQUMsYUFBYSxFQUFFLDBCQUEwQjtZQUN6RCxVQUFVLENBQUMsSUFBSSxDQUFDO2dCQUNkLElBQUksRUFBRSx3Q0FBd0M7Z0JBQzlDLG1CQUFtQixFQUFFLEdBQUc7Z0JBQ3hCLGVBQWUsRUFBRSxHQUFHO2dCQUNwQix3QkFBd0IsRUFBRSxlQUFlLENBQUMs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