@drunk-pulumi/azure 0.0.36 → 0.0.38

package/VNet/Vnet.js

@@ -3,21 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const network = require("@pulumi/azure-native/network");
 const Helper_1 = require("./Helper");
 const Naming_1 = require("../Common/Naming");
-const Bastion_1 = require("./Bastion");
 const Subnet_1 = require("./Subnet");
-exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], dnsServers, features = {}, }) => {
+const SecurityGroup_1 = require("./SecurityGroup");
+const RouteTable_1 = require("./RouteTable");
+const AppGatewaySecurityRule_1 = require("./NSGRules/AppGatewaySecurityRule");
+exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGateway, dnsServers, features = {}, dependsOn, }) => {
     const vName = (0, Naming_1.getVnetName)(name);
-    const securityRules = features.securityGroup?.rules ||
-        new Array();
+    const securityRules = features.securityGroup?.rules || [];
     //AppGateway
     if (features.appGatewaySubnet) {
         subnets.push({
             name: Helper_1.appGatewaySubnetName,
             addressPrefix: features.appGatewaySubnet.addressPrefix,
             allowedServiceEndpoints: false,
+            enableSecurityGroup: false,
+            enableRouteTable: false,
+        });
+        //TODO: Move this to vnetBuilder instead. Add Security Rules for App Gateway
+        securityRules.push(...(0, AppGatewaySecurityRule_1.default)(features.appGatewaySubnet));
+    }
+    //Gateway Subnet
+    if (features?.gatewaySubnet) {
+        subnets.push({
+            name: Helper_1.gatewaySubnetName,
+            addressPrefix: features.gatewaySubnet.addressPrefix,
+            allowedServiceEndpoints: false,
+            enableSecurityGroup: false,
+            enableRouteTable: false,
         });
-        //Add Security Rules for App Gateway
-        securityRules.push(...getAppGatewayRules(features.appGatewaySubnet));
     }
     //Bastion Host
     if (features.bastion) {
@@ -25,17 +38,8 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], dnsServer
             name: Helper_1.azBastionSubnetName,
             addressPrefix: features.bastion.addressPrefix,
             allowedServiceEndpoints: false,
-        });
-        securityRules.push({
-            name: 'allow-internet-bastion',
-            sourceAddressPrefix: '*',
-            sourcePortRange: '*',
-            destinationAddressPrefix: features.bastion.addressPrefix,
-            destinationPortRange: '443',
-            protocol: 'TCP',
-            access: 'Allow',
-            direction: 'Inbound',
-            priority: 3000,
+            enableSecurityGroup: true,
+            enableRouteTable: false,
         });
     }
     //Firewall Subnet
@@ -44,43 +48,52 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], dnsServer
             name: Helper_1.azFirewallSubnet,
             addressPrefix: features.firewall.addressPrefix,
             allowedServiceEndpoints: false,
+            enableSecurityGroup: false,
+            enableRouteTable: true,
+            enableNatGateway: features.firewall.enableNatGateway,
         });
         if (features.firewall.managementAddressPrefix)
             subnets.push({
                 name: Helper_1.azFirewallManagementSubnet,
                 addressPrefix: features.firewall.managementAddressPrefix,
                 allowedServiceEndpoints: false,
+                enableSecurityGroup: false,
+                enableNatGateway: false,
+                enableRouteTable: false,
             });
     }
     //NetworkSecurityGroup
     let securityGroup = undefined;
-    if (features.securityGroup) {
+    if (features.securityGroup?.enabled) {
         //Allow outbound internet
         if (!features.securityGroup.allowOutboundInternetAccess) {
             securityRules.push({
-                name: 'deny-internet',
-                sourceAddressPrefix: '*',
-                sourcePortRange: '*',
-                destinationAddressPrefix: 'Internet',
-                destinationPortRange: '*',
-                protocol: '*',
-                access: 'Deny',
-                direction: 'Outbound',
+                name: "DefaultDeniedInternetOutbound",
+                sourceAddressPrefix: "*",
+                sourcePortRange: "*",
+                destinationAddressPrefix: "Internet",
+                destinationPortRange: "*",
+                protocol: "*",
+                access: "Deny",
+                direction: "Outbound",
                 priority: 4096, //The last rule in the list;
             });
         }
-        securityGroup = new network.NetworkSecurityGroup(`${vName}-sg`, {
-            networkSecurityGroupName: `${vName}-sg`,
-            ...group,
+        securityGroup = (0, SecurityGroup_1.default)({
+            name: vName,
+            group,
             securityRules,
         });
     }
     //Route Table
-    const routeTable = new network.RouteTable(`${vName}-route`, {
-        routeTableName: `${vName}-route`,
-        ...group,
-        routes: features.routeTable?.rules || [],
-    });
+    const routeRules = features.routeTable?.rules || [];
+    const routeTable = features.routeTable?.enabled
+        ? (0, RouteTable_1.default)({
+            name: vName,
+            group,
+            routes: routeRules,
+        })
+        : undefined;
     //Create VNet
     const vnet = new network.VirtualNetwork(vName, {
         virtualNetworkName: vName,
@@ -94,101 +107,25 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], dnsServer
             subnet: s,
             vnetName: name,
             group,
-            securityGroup: s.enableSecurityGroup === false ||
-                [Helper_1.azFirewallSubnet, Helper_1.azBastionSubnetName, Helper_1.gatewaySubnetName].includes(s.name)
-                ? undefined
-                : securityGroup,
-            routeTable: [
-                Helper_1.azBastionSubnetName,
-                Helper_1.azFirewallSubnet,
-                Helper_1.gatewaySubnetName,
-            ].includes(s.name)
-                ? undefined
-                : routeTable,
+            natGateway: s.enableNatGateway ? natGateway : undefined,
+            securityGroup: s.enableSecurityGroup === false ? undefined : securityGroup,
+            routeTable: s.enableRouteTable === false ? undefined : routeTable,
         })),
         enableDdosProtection: ddosId !== undefined,
         ddosProtectionPlan: ddosId ? { id: ddosId } : undefined,
-    });
-    const subnetResults = {};
+    }, { dependsOn, ignoreChanges: ["virtualNetworkPeerings"] });
     const findSubnet = (name) => vnet.subnets.apply((ss) => ss.find((s) => s.name === name));
-    subnets?.forEach((s) => {
-        subnetResults[s.name] = findSubnet(s.name).apply((s) => s);
-    });
-    const bastionSubnet = subnetResults[Helper_1.azBastionSubnetName];
-    //Create Bastion
-    if (features.bastion && !features.bastion.disableBastionHostCreation) {
-        (0, Bastion_1.default)({
-            name,
-            group,
-            subnetId: bastionSubnet.apply((s) => s.id),
-            dependsOn: [vnet],
-        });
-    }
     //Return the results
     return {
         vnet,
-        firewallSubnet: subnetResults[Helper_1.azFirewallSubnet],
-        firewallManageSubnet: subnetResults[Helper_1.azFirewallManagementSubnet],
-        appGatewaySubnet: subnetResults[Helper_1.appGatewaySubnetName],
-        bastionSubnet,
-        subnets: subnetResults,
         securityGroup,
         routeTable,
+        findSubnet,
+        firewallSubnet: findSubnet(Helper_1.azFirewallSubnet),
+        firewallManageSubnet: findSubnet(Helper_1.azFirewallManagementSubnet),
+        appGatewaySubnet: findSubnet(Helper_1.appGatewaySubnetName),
+        gatewaySubnet: findSubnet(Helper_1.gatewaySubnetName),
+        bastionSubnet: findSubnet(Helper_1.azBastionSubnetName),
     };
 };
-const getAppGatewayRules = ({ addressPrefix, version, }) => {
-    let start = 100;
-    return [
-        //Add inbound rule for app gateway subnet
-        {
-            name: 'allow_internet_in_gateway_health',
-            description: 'Allow Health check access from internet to Gateway',
-            priority: 200 + start++,
-            protocol: 'Tcp',
-            access: 'Allow',
-            direction: 'Inbound',
-            sourceAddressPrefix: 'Internet',
-            sourcePortRange: '*',
-            destinationAddressPrefix: addressPrefix,
-            destinationPortRanges: version === 'v1' ? ['65503-65534'] : ['65200-65535'],
-        },
-        {
-            name: 'allow_https_internet_in_gateway',
-            description: 'Allow HTTPS access from internet to Gateway',
-            priority: 200 + start++,
-            protocol: 'Tcp',
-            access: 'Allow',
-            direction: 'Inbound',
-            sourceAddressPrefix: 'Internet',
-            sourcePortRange: '*',
-            destinationAddressPrefix: addressPrefix,
-            destinationPortRange: '443',
-        },
-        {
-            name: 'allow_loadbalancer_in_gateway',
-            description: 'Allow Load balancer to Gateway',
-            priority: 200 + start++,
-            protocol: 'Tcp',
-            access: 'Allow',
-            direction: 'Inbound',
-            sourceAddressPrefix: 'AzureLoadBalancer',
-            sourcePortRange: '*',
-            destinationAddressPrefix: addressPrefix,
-            destinationPortRange: '*',
-        },
-        //Denied others
-        // {
-        //   name: 'denied_others_in_gateway',
-        //   description: 'Denied others to Gateway',
-        //   priority: 3000 + start++,
-        //   protocol: 'Tcp',
-        //   access: 'Deny',
-        //   direction: 'Inbound',
-        //   sourceAddressPrefix: '*',
-        //   sourcePortRange: '*',
-        //   destinationAddressPrefix: addressPrefix,
-        //   destinationPortRange: '*',
-        // },
-    ];
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm5ldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZuZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3REFBd0Q7QUFLeEQscUNBTWtCO0FBQ2xCLDZDQUErQztBQUMvQyx1Q0FBZ0M7QUFDaEMscUNBQXFEO0FBZ0RyRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxNQUFNLEVBQ04sYUFBYSxFQUNiLE9BQU8sR0FBRyxFQUFFLEVBQ1osVUFBVSxFQUNWLFFBQVEsR0FBRyxFQUFFLEdBQ0gsRUFBRSxFQUFFO0lBQ2QsTUFBTSxLQUFLLEdBQUcsSUFBQSxvQkFBVyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hDLE1BQU0sYUFBYSxHQUNqQixRQUFRLENBQUMsYUFBYSxFQUFFLEtBQUs7UUFDN0IsSUFBSSxLQUFLLEVBQWlELENBQUM7SUFFN0QsWUFBWTtJQUNaLElBQUksUUFBUSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDOUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSw2QkFBb0I7WUFDMUIsYUFBYSxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhO1lBQ3RELHVCQUF1QixFQUFFLEtBQUs7U0FDL0IsQ0FBQyxDQUFDO1FBQ0gsb0NBQW9DO1FBQ3BDLGFBQWEsQ0FBQyxJQUFJLENBQUMsR0FBRyxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7SUFDRCxjQUFjO0lBQ2QsSUFBSSxRQUFRLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDckIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSw0QkFBbUI7WUFDekIsYUFBYSxFQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUMsYUFBYTtZQUM3Qyx1QkFBdUIsRUFBRSxLQUFLO1NBQy9CLENBQUMsQ0FBQztRQUVILGFBQWEsQ0FBQyxJQUFJLENBQUM7WUFDakIs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm5ldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZuZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3REFBd0Q7QUFLeEQscUNBTWtCO0FBQ2xCLDZDQUErQztBQUMvQyxxQ0FBcUQ7QUFDckQsbURBQTRDO0FBQzVDLDZDQUFzQztBQUN0Qyw4RUFBdUU7QUF3RXZFLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLE1BQU0sRUFDTixhQUFhLEVBQ2IsT0FBTyxHQUFHLEVBQUUsRUFDWixVQUFVLEVBQ1YsVUFBVSxFQUNWLFFBQVEsR0FBRyxFQUFFLEVBQ2IsU0FBUyxHQUNDLEVBQWMsRUFBRTtJQUMxQixNQUFNLEtBQUssR0FBRyxJQUFBLG9CQUFXLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDaEMsTUFBTSxhQUFhLEdBQUcsUUFBUSxDQUFDLGFBQWEsRUFBRSxLQUFLLElBQUksRUFBRSxDQUFDO0lBRTFELFlBQVk7SUFDWixJQUFJLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQzlCLE9BQU8sQ0FBQyxJQUFJLENBQUM7WUFDWCxJQUFJLEVBQUUsNkJBQW9CO1lBQzFCLGFBQWEsRUFBRSxRQUFRLENBQUMsZ0JBQWdCLENBQUMsYUFBYTtZQUN0RCx1QkFBdUIsRUFBRSxLQUFLO1lBQzlCLG1CQUFtQixFQUFFLEtBQUs7WUFDMUIsZ0JBQWdCLEVBQUUsS0FBSztTQUN4QixDQUFDLENBQUM7UUFFSCw0RUFBNEU7UUFDNUUsYUFBYSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUEsZ0NBQXNCLEVBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztJQUMzRSxDQUFDO0lBRUQsZ0JBQWdCO0lBQ2hCLElBQUksUUFBUSxFQUFFLGFBQWEsRUFBRSxDQUFDO1FBQzVCLE9BQU8sQ0FBQyxJQUFJLENBQUM7WUFDWCxJQUFJLEVBQUUsMEJBQWlCO1lBQ3ZCLGFBQWEsRUFBRSxRQUFRLENB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

package/VNet/index.d.ts

@@ -1,11 +1,11 @@
-import * as network from '@pulumi/azure-native/network';
-import { input as inputs } from '@pulumi/azure-native/types';
-import { Input } from '@pulumi/pulumi';
-import * as pulumi from '@pulumi/pulumi';
-import { BasicMonitorArgs, ResourceGroupInfo } from '../types';
-import { FirewallSkus } from './Firewall';
-import { FirewallPolicyProps } from './FirewallRules/types';
-import { SubnetProps } from './Subnet';
+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 { CustomSecurityRuleArgs } from "./types";
+import { FirewallSkus } from "./Firewall";
+import { FirewallPolicyProps } from "./types";
+import { SubnetProps } from "./Subnet";
 interface Props {
     name: string;
     group: ResourceGroupInfo;
@@ -17,7 +17,6 @@ interface Props {
     features?: {
         enableBastion?: {
             subnetPrefix: string;
-            disableBastionHostCreation?: boolean;
         };
         enableAppGateway?: {
             subnetPrefix: string;
@@ -27,8 +26,7 @@ interface Props {
             /** Only required if Firewall is Basic tier */
             managementSubnetPrefix?: string;
             sku?: FirewallSkus;
-            publicManageIpAddress?: network.PublicIPAddress;
-            policy: Omit<FirewallPolicyProps, 'enabled'>;
+            policy: Omit<FirewallPolicyProps, "enabled">;
             /** set this is TRUE if want to create firewall subnet but not create firewall component */
             disabledFirewallCreation?: boolean;
         };
@@ -42,7 +40,7 @@ interface Props {
             allowInboundInternetAccess?: boolean;
             /**Add Security rule to block/allow internet if it is TRUE*/
             allowOutboundInternetAccess?: boolean;
-            rules?: Input<inputs.network.SecurityRuleArgs>[];
+            rules?: Input<CustomSecurityRuleArgs>[];
         };
     };
     monitorConfig?: BasicMonitorArgs;
@@ -53,13 +51,14 @@ declare const _default: ({ group, name, ddosId, addressSpace, publicIpAddress, s
         policy: network.FirewallPolicy | undefined;
     } | undefined;
     vnet: import("@pulumi/azure-native/network/virtualNetwork").VirtualNetwork;
-    firewallSubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse> & pulumi.LiftedObject<import("@pulumi/azure-native/types/output").network.SubnetResponse, "type" | "id" | "name" | "etag" | "provisioningState" | "addressPrefix" | "ipConfigurations" | "addressPrefixes" | "purpose" | "serviceEndpoints" | "networkSecurityGroup" | "natGateway" | "applicationGatewayIPConfigurations" | "delegations" | "ipAllocations" | "ipConfigurationProfiles" | "privateEndpointNetworkPolicies" | "privateEndpoints" | "privateLinkServiceNetworkPolicies" | "resourceNavigationLinks" | "routeTable" | "serviceAssociationLinks" | "serviceEndpointPolicies" | "interfaceEndpoints" | undefined>;
-    firewallManageSubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse> & pulumi.LiftedObject<import("@pulumi/azure-native/types/output").network.SubnetResponse, "type" | "id" | "name" | "etag" | "provisioningState" | "addressPrefix" | "ipConfigurations" | "addressPrefixes" | "purpose" | "serviceEndpoints" | "networkSecurityGroup" | "natGateway" | "applicationGatewayIPConfigurations" | "delegations" | "ipAllocations" | "ipConfigurationProfiles" | "privateEndpointNetworkPolicies" | "privateEndpoints" | "privateLinkServiceNetworkPolicies" | "resourceNavigationLinks" | "routeTable" | "serviceAssociationLinks" | "serviceEndpointPolicies" | "interfaceEndpoints" | undefined>;
-    appGatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse> & pulumi.LiftedObject<import("@pulumi/azure-native/types/output").network.SubnetResponse, "type" | "id" | "name" | "etag" | "provisioningState" | "addressPrefix" | "ipConfigurations" | "addressPrefixes" | "purpose" | "serviceEndpoints" | "networkSecurityGroup" | "natGateway" | "applicationGatewayIPConfigurations" | "delegations" | "ipAllocations" | "ipConfigurationProfiles" | "privateEndpointNetworkPolicies" | "privateEndpoints" | "privateLinkServiceNetworkPolicies" | "resourceNavigationLinks" | "routeTable" | "serviceAssociationLinks" | "serviceEndpointPolicies" | "interfaceEndpoints" | undefined>;
-    bastionSubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse> & pulumi.LiftedObject<import("@pulumi/azure-native/types/output").network.SubnetResponse, "type" | "id" | "name" | "etag" | "provisioningState" | "addressPrefix" | "ipConfigurations" | "addressPrefixes" | "purpose" | "serviceEndpoints" | "networkSecurityGroup" | "natGateway" | "applicationGatewayIPConfigurations" | "delegations" | "ipAllocations" | "ipConfigurationProfiles" | "privateEndpointNetworkPolicies" | "privateEndpoints" | "privateLinkServiceNetworkPolicies" | "resourceNavigationLinks" | "routeTable" | "serviceAssociationLinks" | "serviceEndpointPolicies" | "interfaceEndpoints" | undefined>;
-    subnets: Record<string, pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse> & pulumi.LiftedObject<import("@pulumi/azure-native/types/output").network.SubnetResponse, "type" | "id" | "name" | "etag" | "provisioningState" | "addressPrefix" | "ipConfigurations" | "addressPrefixes" | "purpose" | "serviceEndpoints" | "networkSecurityGroup" | "natGateway" | "applicationGatewayIPConfigurations" | "delegations" | "ipAllocations" | "ipConfigurationProfiles" | "privateEndpointNetworkPolicies" | "privateEndpoints" | "privateLinkServiceNetworkPolicies" | "resourceNavigationLinks" | "routeTable" | "serviceAssociationLinks" | "serviceEndpointPolicies" | "interfaceEndpoints" | undefined>>;
+    appGatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
+    gatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
+    firewallManageSubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
+    routeTable?: import("@pulumi/azure-native/network/routeTable").RouteTable | undefined;
+    firewallSubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
+    bastionSubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
+    findSubnet: (name: string) => pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
     securityGroup: import("@pulumi/azure-native/network/networkSecurityGroup").NetworkSecurityGroup | undefined;
-    routeTable: import("@pulumi/azure-native/network/routeTable").RouteTable;
     publicIpAddress: import("@pulumi/azure-native/network/publicIPAddress").PublicIPAddress | undefined;
 };
 export default _default;

package/VNet/index.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const network = require("@pulumi/azure-native/network");
-const pulumi_1 = require("@pulumi/pulumi");
-const AzureEnv_1 = require("../Common/AzureEnv");
 const NetworkRuote_1 = require("@drunk-pulumi/azure-providers/NetworkRuote");
 const Firewall_1 = require("./Firewall");
 const NetworkPeering_1 = require("./NetworkPeering");
 const Vnet_1 = require("./Vnet");
+const Helper_1 = require("./Helper");
 exports.default = ({ group, name, ddosId, addressSpace, publicIpAddress, subnets, features = {}, monitorConfig, ...others }) => {
-    const securities = features.securityGroup?.rules ||
-        new Array();
+    const securities = features.securityGroup?.rules || [];
     const routes = new Array();
     if (publicIpAddress) {
         //Add route from IpAddress to internet
@@ -22,14 +20,14 @@ exports.default = ({ group, name, ddosId, addressSpace, publicIpAddress, subnets
         } //Allow Internet to public IpAddress security group
         else if (features.securityGroup?.allowInboundInternetAccess)
             securities.push({
-                name: 'allow-inbound-internet-publicIpAddress',
-                sourceAddressPrefix: '*',
-                sourcePortRange: '*',
+                name: "allow-inbound-internet-publicIpAddress",
+                sourceAddressPrefix: "*",
+                sourcePortRange: "*",
                 destinationAddressPrefix: publicIpAddress.ipAddress.apply((i) => `${i}/32`),
-                destinationPortRanges: ['443', '80'],
-                protocol: 'TCP',
-                access: 'Allow',
-                direction: 'Inbound',
+                destinationPortRanges: ["443", "80"],
+                protocol: "TCP",
+                access: "Allow",
+                direction: "Inbound",
                 priority: 200 + securities.length + 1,
             });
     }
@@ -41,32 +39,32 @@ exports.default = ({ group, name, ddosId, addressSpace, publicIpAddress, subnets
                 //Update route to firewall IpAddress
                 routes.push({
                     name: `vnet-to-firewall`,
-                    addressPrefix: '0.0.0.0/0',
+                    addressPrefix: "0.0.0.0/0",
                     nextHopType: network.RouteNextHopType.VirtualAppliance,
                     nextHopIpAddress: pp.firewallPrivateIpAddress,
                 });
                 //Allow Vnet to Firewall
                 securities.push({
                     name: `allow-vnet-to-firewall`,
-                    sourceAddressPrefix: '*',
-                    sourcePortRange: '*',
+                    sourceAddressPrefix: "*",
+                    sourcePortRange: "*",
                     destinationAddressPrefix: pp.firewallPrivateIpAddress,
-                    destinationPortRange: '*',
-                    protocol: '*',
-                    access: 'Allow',
-                    direction: 'Outbound',
+                    destinationPortRange: "*",
+                    protocol: "*",
+                    access: "Allow",
+                    direction: "Outbound",
                     priority: 100,
                 });
             }
             securities.push({
                 name: `allow-vnet-to-vnet-${index}`,
-                sourceAddressPrefix: 'VirtualNetwork',
-                sourcePortRange: '*',
-                destinationAddressPrefix: 'VirtualNetwork',
-                destinationPortRange: '*',
-                protocol: '*',
-                access: 'Allow',
-                direction: 'Outbound',
+                sourceAddressPrefix: "VirtualNetwork",
+                sourcePortRange: "*",
+                destinationAddressPrefix: "VirtualNetwork",
+                destinationPortRange: "*",
+                protocol: "*",
+                access: "Allow",
+                direction: "Outbound",
                 priority: 101,
             });
         });
@@ -89,7 +87,7 @@ exports.default = ({ group, name, ddosId, addressSpace, publicIpAddress, subnets
             appGatewaySubnet: features.enableAppGateway
                 ? {
                     addressPrefix: features.enableAppGateway.subnetPrefix,
-                    version: 'v1',
+                    version: "v1",
                 }
                 : undefined,
             firewall: features.enableFirewall
@@ -101,7 +99,6 @@ exports.default = ({ group, name, ddosId, addressSpace, publicIpAddress, subnets
             bastion: features.enableBastion
                 ? {
                     addressPrefix: features.enableBastion.subnetPrefix,
-                    disableBastionHostCreation: features.enableBastion.disableBastionHostCreation,
                 }
                 : undefined,
         },
@@ -115,53 +112,43 @@ exports.default = ({ group, name, ddosId, addressSpace, publicIpAddress, subnets
             name,
             group,
             policy: {
-                enabled: true,
                 ...features.enableFirewall.policy,
             },
             outbound: [
                 {
-                    name: `${name}-outbound`,
                     publicIpAddress: publicIpAddress,
                     subnetId: vnet.firewallSubnet.apply((c) => c.id),
                 },
             ],
-            management: features.enableFirewall.publicManageIpAddress
+            management: features?.enableFirewall.managementSubnetPrefix
                 ? {
-                    name: `${name}-management`,
-                    publicIpAddress: features.enableFirewall.publicManageIpAddress,
                     subnetId: vnet.firewallManageSubnet.apply((c) => c.id),
                 }
                 : undefined,
             sku: features.enableFirewall.sku,
-            routeTableName: vnet.routeTable.name,
+            routeTableName: vnet.routeTable?.name,
             monitorConfig,
-            dependsOn: [vnet.routeTable, vnet.vnet],
+            dependsOn: [vnet.vnet],
         });
     }
     //Vnet Peering
     if (features.vnetPeering) {
         features.vnetPeering.map((pp) => {
-            //get info
-            (0, pulumi_1.output)(pp.vnetId).apply((id) => {
-                const info = (0, AzureEnv_1.getResourceInfoFromId)(id);
-                if (info) {
-                    //peering
-                    (0, NetworkPeering_1.default)({
-                        name,
-                        firstVNetName: vnet.vnet.name,
-                        firstVNetResourceGroupName: group.resourceGroupName,
-                        secondVNetName: info.name,
-                        secondVNetResourceGroupName: info.group.resourceGroupName,
-                    });
-                }
+            const info = (0, Helper_1.parseVnetInfoFromId)(pp.vnetId);
+            (0, NetworkPeering_1.default)({
+                firstVnet: {
+                    vnetName: vnet.vnet.name,
+                    resourceGroupName: group.resourceGroupName,
+                },
+                secondVnet: info,
             });
             //Update route to firewall IpAddress
-            if (pp.firewallPrivateIpAddress) {
+            if (pp.firewallPrivateIpAddress && vnet.routeTable) {
                 new NetworkRuote_1.NetworkRouteResource(`${name}-vnet-to-firewall`, {
-                    routeName: 'vnet-to-firewall',
+                    routeName: "vnet-to-firewall",
                     ...group,
                     routeTableName: vnet.routeTable.name,
-                    addressPrefix: '0.0.0.0/0',
+                    addressPrefix: "0.0.0.0/0",
                     nextHopType: network.RouteNextHopType.VirtualAppliance,
                     nextHopIpAddress: pp.firewallPrivateIpAddress,
                 }, {
@@ -186,13 +173,13 @@ const createFirewall = ({ name, group, routeTableName, dependsOn = [], ...others
             routeName: `vnet-to-firewall`,
             ...group,
             routeTableName: routeTableName,
-            addressPrefix: '0.0.0.0/0',
+            addressPrefix: "0.0.0.0/0",
             nextHopType: network.RouteNextHopType.VirtualAppliance,
-            nextHopIpAddress: rs.firewall.ipConfigurations.apply((c) => c ? c[0].privateIPAddress : ''),
+            nextHopIpAddress: rs.firewall.ipConfigurations.apply((c) => c ? c[0].privateIPAddress : ""),
         }, {
-            dependsOn: [...dependsOn, rs.firewall],
+            dependsOn: [rs.firewall],
         });
     }
     return rs;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHdEQUF3RDtBQUV4RCwyQ0FBeUQ7QUFHekQsaURBQTJEO0FBQzNELDZFQUFrRjtBQU9sRix5Q0FBc0U7QUFFdEUscURBQTJDO0FBRTNDLGlDQUEwQjtBQWtEMUIsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osTUFBTSxFQUNOLFlBQVksRUFDWixlQUFlLEVBQ2YsT0FBTyxFQUNQLFFBQVEsR0FBRyxFQUFFLEVBQ2IsYUFBYSxFQUNiLEdBQUcsTUFBTSxFQUNILEVBQUUsRUFBRTtJQUNWLE1BQU0sVUFBVSxHQUNkLFFBQVEsQ0FBQyxhQUFhLEVBQUUsS0FBSztRQUM3QixJQUFJLEtBQUssRUFBMEMsQ0FBQztJQUN0RCxNQUFNLE1BQU0sR0FBRyxJQUFJLEtBQUssRUFBbUMsQ0FBQztJQUU1RCxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBQ3BCLHNDQUFzQztRQUN0QyxJQUFJLFFBQVEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztZQUM1QixNQUFNLENBQUMsSUFBSSxDQUFDO2dCQUNWLElBQUksRUFBRSxzQkFBc0I7Z0JBQzVCLGFBQWEsRUFBRSxlQUFlLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztnQkFDaEUsV0FBVyxFQUFFLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRO2FBQy9DLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxtREFBbUQ7YUFDaEQsSUFBSSxRQUFRLENBQUMsYUFBYSxFQUFFLDBCQUEwQjtZQUN6RCxVQUFVLENBQUMsSUFBSSxDQUFDO2dCQUNkLElBQUksRUFBRSx3Q0FBd0M7Z0JBQzlDLG1CQUFtQixFQUFFLEdBQUc7Z0JBQ3hCLGVBQWUsRUFBRSxHQUFHO2dCQUNwQix3QkFBd0IsRUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvVk5ldC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHdEQUF3RDtBQUl4RCw2RUFBa0Y7QUFHbEYseUNBQW1FO0FBRW5FLHFEQUEyQztBQUUzQyxpQ0FBMEI7QUFDMUIscUNBQStDO0FBK0MvQyxrQkFBZSxDQUFDLEVBQ2QsS0FBSyxFQUNMLElBQUksRUFDSixNQUFNLEVBQ04sWUFBWSxFQUNaLGVBQWUsRUFDZixPQUFPLEVBQ1AsUUFBUSxHQUFHLEVBQUUsRUFDYixhQUFhLEVBQ2IsR0FBRyxNQUFNLEVBQ0gsRUFBRSxFQUFFO0lBQ1YsTUFBTSxVQUFVLEdBQUcsUUFBUSxDQUFDLGFBQWEsRUFBRSxLQUFLLElBQUksRUFBRSxDQUFDO0lBQ3ZELE1BQU0sTUFBTSxHQUFHLElBQUksS0FBSyxFQUFtQyxDQUFDO0lBRTVELElBQUksZUFBZSxFQUFFLENBQUM7UUFDcEIsc0NBQXNDO1FBQ3RDLElBQUksUUFBUSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQzVCLE1BQU0sQ0FBQyxJQUFJLENBQUM7Z0JBQ1YsSUFBSSxFQUFFLHNCQUFzQjtnQkFDNUIsYUFBYSxFQUFFLGVBQWUsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDO2dCQUNoRSxXQUFXLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixDQUFDLFFBQVE7YUFDL0MsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLG1EQUFtRDthQUNoRCxJQUFJLFFBQVEsQ0FBQyxhQUFhLEVBQUUsMEJBQTBCO1lBQ3pELFVBQVUsQ0FBQyxJQUFJLENBQUM7Z0JBQ2QsSUFBSSxFQUFFLHdDQUF3QztnQkFDOUMsbUJBQW1CLEVBQUUsR0FBRztnQkFDeEIsZUFBZSxFQUFFLEdBQUc7Z0JBQ3BCLHdCQUF3QixFQUFFLGVBQWUsQ0FBQyxTQUFTLENBQUMsS0FB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