@drunk-pulumi/azure 0.0.43 → 0.0.44

package/Common/Naming/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNatGatewayName = exports.getAppGatewayName = exports.getIpAddressPrefixName = exports.getIpAddressName = exports.getNetworkSecurityGroupName = exports.getRouteItemName = exports.getRouteName = exports.getIotHubName = exports.getHubName = exports.getWanName = exports.getVnetName = exports.getVpnName = exports.getNICName = exports.getVMName = exports.getFirewallPolicyGroupName = exports.getFirewallPolicyName = exports.getFirewallName = exports.getMySqlName = exports.getPostgresqlName = exports.getSqlServerName = exports.getSqlDbName = exports.getElasticPoolName = exports.getSignalRName = exports.getPrivateEndpointName = exports.getServiceBusName = exports.getRedisCacheName = exports.getAlertName = exports.getWebTestName = exports.getFuncAppName = exports.getWebAppName = exports.getLogWpName = exports.getAppInsightName = exports.getK8sProviderName = exports.getAksName = exports.getManagedIdentityName = exports.getIdentityName = exports.getSshName = exports.getApimName = exports.getAppConfigName = exports.getCosmosDbName = exports.getB2cName = exports.getAutomationAccountName = exports.getPasswordName = exports.getKeyName = exports.getConnectionName = exports.getCertName = exports.getAppPlanName = exports.getSecretName = exports.getStorageName = exports.getResourceGroupName = void 0;
-exports.getCertOrderName = exports.getAcrName = exports.getCdnProfileName = exports.getCdnEndpointName = exports.getKeyVaultName = exports.getBastionName = void 0;
+exports.getAppGatewayName = exports.getIpAddressPrefixName = exports.getIpAddressName = exports.getNetworkSecurityGroupName = exports.getWorkflowName = exports.getRouteItemName = exports.getRouteName = exports.getIotHubName = exports.getHubName = exports.getWanName = exports.getVnetName = exports.getVpnName = exports.getNICName = exports.getVMName = exports.getFirewallPolicyGroupName = exports.getFirewallPolicyName = exports.getFirewallName = exports.getMySqlName = exports.getPostgresqlName = exports.getSqlServerName = exports.getSqlDbName = exports.getElasticPoolName = exports.getSignalRName = exports.getPrivateEndpointName = exports.getServiceBusName = exports.getRedisCacheName = exports.getAlertName = exports.getWebTestName = exports.getFuncAppName = exports.getWebAppName = exports.getLogWpName = exports.getAppInsightName = exports.getK8sProviderName = exports.getAksName = exports.getManagedIdentityName = exports.getIdentityName = exports.getSshName = exports.getApimName = exports.getAppConfigName = exports.getCosmosDbName = exports.getB2cName = exports.getAutomationAccountName = exports.getPasswordName = exports.getKeyName = exports.getConnectionName = exports.getCertName = exports.getAppPlanName = exports.getSecretName = exports.getStorageName = exports.getResourceGroupName = void 0;
+exports.getCertOrderName = exports.getAcrName = exports.getCdnProfileName = exports.getCdnEndpointName = exports.getKeyVaultName = exports.getBastionName = exports.getNatGatewayName = void 0;
 const Helpers_1 = require("../Helpers");
 const ResourceEnv_1 = require("../ResourceEnv");
 const StackEnv_1 = require("../StackEnv");
 /** The method to get Resource group Name*/
-const getResourceGroupName = (name) => (0, ResourceEnv_1.getResourceName)(name, {
+const getResourceGroupName = (name, convention = {}) => (0, ResourceEnv_1.getResourceName)(name, {
+    ...convention,
     suffix: StackEnv_1.organization ? `grp-${StackEnv_1.organization}` : "grp",
 });
 exports.getResourceGroupName = getResourceGroupName;
@@ -20,8 +21,8 @@ const getStorageName = (name) => {
 exports.getStorageName = getStorageName;
 /** Get Vault Secret Name. Remove the stack name and replace all _ with - then lower cases. */
 const getSecretName = (name) => {
-    name = name.replace(`${StackEnv_1.stack}-`, "");
-    name = name.replace(StackEnv_1.stack, "");
+    name = (0, Helpers_1.replaceAll)(name, `${StackEnv_1.stack}-`, "");
+    name = (0, Helpers_1.replaceAll)(name, StackEnv_1.stack, "");
     name = (0, Helpers_1.replaceAll)(name, " ", "-");
     name = (0, Helpers_1.replaceAll)(name, ".", "-");
     return (0, Helpers_1.replaceAll)(name, "_", "-").toLowerCase();
@@ -104,7 +105,7 @@ const getNICName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix:
 exports.getNICName = getNICName;
 const getVpnName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix: "vpn" });
 exports.getVpnName = getVpnName;
-const getVnetName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix: "vnt" });
+const getVnetName = (name, convention = {}) => (0, ResourceEnv_1.getResourceName)(name, { ...convention, suffix: "vnt" });
 exports.getVnetName = getVnetName;
 const getWanName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix: "wan" });
 exports.getWanName = getWanName;
@@ -116,6 +117,8 @@ const getRouteName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix
 exports.getRouteName = getRouteName;
 const getRouteItemName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix: "", includeOrgName: false });
 exports.getRouteItemName = getRouteItemName;
+const getWorkflowName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix: "wkp" });
+exports.getWorkflowName = getWorkflowName;
 const getNetworkSecurityGroupName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix: "nsg" });
 exports.getNetworkSecurityGroupName = getNetworkSecurityGroupName;
 const getIpAddressName = (name) => (0, ResourceEnv_1.getResourceName)(name, { suffix: "ip" });
@@ -147,4 +150,4 @@ exports.getAcrName = getAcrName;
 /**The App Cert Order is created to Global group so no prefix*/
 const getCertOrderName = (name) => (0, ResourceEnv_1.getResourceName)(name.replace(".", "-"), { prefix: "", suffix: "ca" });
 exports.getCertOrderName = getCertOrderName;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Common/Naming/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Common/Naming/index.ts"],"names":[],"mappings":"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"}

package/Common/ResourceEnv.d.ts

@@ -1,13 +1,3 @@
-import { ConventionProps, ResourceGroupInfo } from "../types";
-import { Input } from "@pulumi/pulumi";
-export declare const resourceConvention: ConventionProps;
+import { ConventionProps } from "../types";
 /** The method to get Resource Name. This is not applicable for Azure Storage Account and CosmosDb*/
 export declare const getResourceName: (name: string, convention?: ConventionProps) => string;
-export interface ResourceInfoArg {
-    /**If name and provider of the resource is not provided then the Id will be resource group Id*/
-    name?: Input<string>;
-    /**The provider name of the resource ex: "Microsoft.Network/virtualNetworks" or "Microsoft.Network/networkSecurityGroups"*/
-    provider?: string;
-    group: ResourceGroupInfo;
-    subscriptionId?: Input<string>;
-}

package/Common/ResourceEnv.js

@@ -1,35 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResourceName = exports.resourceConvention = void 0;
+exports.getResourceName = void 0;
+const AzureEnv_1 = require("./AzureEnv");
 const Helpers_1 = require("./Helpers");
 const StackEnv_1 = require("./StackEnv");
-const AzureEnv_1 = require("./AzureEnv");
-exports.resourceConvention = {
-    prefix: StackEnv_1.stack,
-    includeRegion: true,
-    suffix: undefined, //This may be specified by each resource name
-};
 /** ==================== Resources Variables ========================= */
 const getName = (name, convention) => {
+    if (convention.prefix === undefined)
+        convention.prefix = StackEnv_1.stack;
+    if (convention.region === undefined)
+        convention.region = AzureEnv_1.currentCountryCode;
+    //console.log(convention);
     if (!name)
         return name;
-    name = (0, Helpers_1.replaceAll)(name, " ", "-");
+    name = (0, Helpers_1.replaceAll)(name, " ", "-").toLowerCase();
+    const rs = [];
+    //Add prefix
+    if (convention.prefix && !name.startsWith(convention.prefix.toLowerCase())) {
+        rs.push(convention.prefix.toLowerCase());
+    }
+    rs.push(name);
     //Organization
-    if (convention.includeOrgName && !name.includes(StackEnv_1.organization.toLowerCase()))
-        name = name + "-" + StackEnv_1.organization;
+    if (convention.includeOrgName && !name.includes(StackEnv_1.organization.toLowerCase())) {
+        rs.push(StackEnv_1.organization.toLowerCase());
+    }
     //Region
-    if (convention.includeRegion &&
-        !name.includes(AzureEnv_1.currentCountryCode.toLowerCase()))
-        name = name + "-" + AzureEnv_1.currentCountryCode;
-    //Add prefix
-    if (convention.prefix && !name.startsWith(convention.prefix.toLowerCase()))
-        name = convention.prefix + "-" + name;
+    if (convention.region && !name.includes(convention.region.toLowerCase())) {
+        rs.push(convention.region.toLowerCase());
+    }
     //Add the suffix
     if (convention.suffix && !name.endsWith(convention.suffix.toLowerCase()))
-        name = name + "-" + convention.suffix;
-    return name.toLowerCase();
+        rs.push(convention.suffix.toLowerCase());
+    return rs.join("-");
 };
 /** The method to get Resource Name. This is not applicable for Azure Storage Account and CosmosDb*/
-const getResourceName = (name, convention) => getName(name, { ...exports.resourceConvention, ...convention });
+const getResourceName = (name, convention = {}) => getName(name, convention);
 exports.getResourceName = getResourceName;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VFbnYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL1Jlc291cmNlRW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVDQUF1QztBQUd2Qyx5Q0FBaUQ7QUFDakQseUNBQWdEO0FBRW5DLFFBQUEsa0JBQWtCLEdBQW9CO0lBQ2pELE1BQU0sRUFBRSxnQkFBSztJQUNiLGFBQWEsRUFBRSxJQUFJO0lBQ25CLE1BQU0sRUFBRSxTQUFTLEVBQUUsNkNBQTZDO0NBQ2pFLENBQUM7QUFFRix5RUFBeUU7QUFFekUsTUFBTSxPQUFPLEdBQUcsQ0FBQyxJQUFZLEVBQUUsVUFBMkIsRUFBVSxFQUFFO0lBQ3BFLElBQUksQ0FBQyxJQUFJO1FBQUUsT0FBTyxJQUFJLENBQUM7SUFDdkIsSUFBSSxHQUFHLElBQUEsb0JBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRWxDLGNBQWM7SUFDZCxJQUFJLFVBQVUsQ0FBQyxjQUFjLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLHVCQUFZLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDekUsSUFBSSxHQUFHLElBQUksR0FBRyxHQUFHLEdBQUcsdUJBQVksQ0FBQztJQUVuQyxRQUFRO0lBQ1IsSUFDRSxVQUFVLENBQUMsYUFBYTtRQUN4QixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsNkJBQWtCLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFaEQsSUFBSSxHQUFHLElBQUksR0FBRyxHQUFHLEdBQUcsNkJBQWtCLENBQUM7SUFFekMsWUFBWTtJQUNaLElBQUksVUFBVSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUN4RSxJQUFJLEdBQUcsVUFBVSxDQUFDLE1BQU0sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDO0lBRXhDLGdCQUFnQjtJQUNoQixJQUFJLFVBQVUsQ0FBQyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDdEUsSUFBSSxHQUFHLElBQUksR0FBRyxHQUFHLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQztJQUV4QyxPQUFPLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztBQUM1QixDQUFDLENBQUM7QUFFRixvR0FBb0c7QUFDN0YsTUFBTSxlQUFlLEdBQUcsQ0FDN0IsSUFBWSxFQUNaLFVBQTRCLEVBQ3BCLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEVBQUUsR0FBRywwQkFBa0IsRUFBRSxHQUFHLFVBQVUsRUFBRSxDQUFDLENBQUM7QUFIeEQsUUFBQSxlQUFlLG1CQUd5QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VFbnYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL1Jlc291cmNlRW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUFnRDtBQUNoRCx1Q0FBdUM7QUFFdkMseUNBQWlEO0FBRWpELHlFQUF5RTtBQUV6RSxNQUFNLE9BQU8sR0FBRyxDQUFDLElBQVksRUFBRSxVQUEyQixFQUFVLEVBQUU7SUFDcEUsSUFBSSxVQUFVLENBQUMsTUFBTSxLQUFLLFNBQVM7UUFBRSxVQUFVLENBQUMsTUFBTSxHQUFHLGdCQUFLLENBQUM7SUFDL0QsSUFBSSxVQUFVLENBQUMsTUFBTSxLQUFLLFNBQVM7UUFBRSxVQUFVLENBQUMsTUFBTSxHQUFHLDZCQUFrQixDQUFDO0lBQzVFLDBCQUEwQjtJQUUxQixJQUFJLENBQUMsSUFBSTtRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQ3ZCLElBQUksR0FBRyxJQUFBLG9CQUFVLEVBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUNoRCxNQUFNLEVBQUUsR0FBYSxFQUFFLENBQUM7SUFFeEIsWUFBWTtJQUNaLElBQUksVUFBVSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDM0UsRUFBRSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFZCxjQUFjO0lBQ2QsSUFBSSxVQUFVLENBQUMsY0FBYyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyx1QkFBWSxDQUFDLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUM1RSxFQUFFLENBQUMsSUFBSSxDQUFDLHVCQUFZLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUN0QyxDQUFDO0lBRUQsUUFBUTtJQUNSLElBQUksVUFBVSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDekUsRUFBRSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELGdCQUFnQjtJQUNoQixJQUFJLFVBQVUsQ0FBQyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDdEUsRUFBRSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7SUFFM0MsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ3RCLENBQUMsQ0FBQztBQUVGLG9HQUFvRztBQUM3RixNQUFNLGVBQWUsR0FBRyxDQUM3QixJQUFZLEVBQ1osYUFBOEIsRUFBRSxFQUN4QixFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsQ0FBQztBQUgxQixRQUFBLGVBQWUsbUJBR1cifQ==

package/ContainerRegistry/index.d.ts

@@ -1,5 +1,5 @@
 import * as containerregistry from "@pulumi/azure-native/containerregistry";
-import { DefaultResourceArgs, KeyVaultInfo, NetworkRulesProps, ResourceGroupInfo } from "../types";
+import { DefaultResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceGroupInfo } from "../types";
 interface Props extends DefaultResourceArgs {
     name: string;
     group?: ResourceGroupInfo;
@@ -8,7 +8,7 @@ interface Props extends DefaultResourceArgs {
     vaultInfo?: KeyVaultInfo;
     sku?: containerregistry.SkuName;
     /**Only support Premium sku*/
-    network?: NetworkRulesProps;
+    network?: NetworkPropsType;
 }
 /** The Azure Container Registry will be created at the GLobal Group.
  * Follow ReadMe file to setup the cleaning tasks for this Registry

package/ContainerRegistry/index.js

@@ -59,15 +59,14 @@ exports.default = ({ name, group = global.groupInfo, sku = containerregistry.Sku
             : undefined,
         ...others,
     });
-    if (sku === "Premium" && network?.privateLink && network?.subnetId) {
+    if (sku === "Premium" && network?.privateLink) {
         (0, PrivateEndpoint_1.default)({
-            name: (0, Naming_1.getPrivateEndpointName)(name),
-            group,
+            resourceInfo: { resourceName: name, group, id: resource.id },
             privateDnsZoneName: "privatelink.azurecr.io",
-            subnetIds: [network.subnetId],
-            ...network.privateLink,
-            linkServiceGroupIds: ["azurecr"],
-            resourceId: resource.id,
+            subnetIds: network.privateLink.subnetIds,
+            linkServiceGroupIds: network.privateLink.type
+                ? [network.privateLink.type]
+                : ["azurecr"],
         });
     }
     if (vaultInfo && adminUserEnabled) {
@@ -124,4 +123,4 @@ exports.default = ({ name, group = global.groupInfo, sku = containerregistry.Sku
         diagnostic,
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29udGFpbmVyUmVnaXN0cnkvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDBGQUE0RTtBQU81RSw4RUFBOEM7QUFDOUMsNERBQThDO0FBQzlDLDZDQUkwQjtBQUMxQiw4RUFBc0Q7QUFDdEQsMkRBQTJEO0FBYTNEOztHQUVHO0FBQ0gsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFDeEIsR0FBRyxHQUFHLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQ3JDLGdCQUFnQixHQUFHLElBQUksRUFDdkIsU0FBUyxFQUNULE9BQU8sRUFDUCxHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXhCLE1BQU0sTUFBTSxHQUFHLEdBQUcsSUFBSSxNQUFNLENBQUM7SUFDN0IsTUFBTSxXQUFXLEdBQUcsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUN4QyxNQUFNLGtCQUFrQixHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDNUQsTUFBTSxvQkFBb0IsR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBRWhFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBQSx5QkFBTyxFQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRTtRQUNuRSxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFFUixnQkFBZ0I7UUFDaEIsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRTtRQUNsQixjQUFjLEVBQ1osR0FBRyxLQUFLLFNBQVMsSUFBSSxPQUFPO1lBQzFCLENBQUMsQ0FBQztnQkFDRSxh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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29udGFpbmVyUmVnaXN0cnkvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDBGQUE0RTtBQU81RSw4RUFBOEM7QUFDOUMsNERBQThDO0FBQzlDLDZDQUkwQjtBQUMxQiw4RUFBc0Q7QUFDdEQsMkRBQTJEO0FBYTNEOztHQUVHO0FBQ0gsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEdBQUcsTUFBTSxDQUFDLFNBQVMsRUFDeEIsR0FBRyxHQUFHLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQ3JDLGdCQUFnQixHQUFHLElBQUksRUFDdkIsU0FBUyxFQUNULE9BQU8sRUFDUCxHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXhCLE1BQU0sTUFBTSxHQUFHLEdBQUcsSUFBSSxNQUFNLENBQUM7SUFDN0IsTUFBTSxXQUFXLEdBQUcsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUN4QyxNQUFNLGtCQUFrQixHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDNUQsTUFBTSxvQkFBb0IsR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBRWhFLE1BQU0sRUFBRSxRQUFRLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBQSx5QkFBTyxFQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRTtRQUNuRSxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFFUixnQkFBZ0I7UUFDaEIsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRTtRQUNsQixjQUFjLEVBQ1osR0FBRyxLQUFLLFNBQVMsSUFBSSxPQUFPO1lBQzFCLENBQUMsQ0FBQztnQkFDRSxhQUFhLEVBQUUsaUJBQWlCLENBQUMsYUFBYSxDQUFDLEtBQUs7Z0JBRXBELE9BQU8sRUFBRSxPQUFPLENBQUMsV0FBVztvQkFDMUIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsZ0JBQWdCLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztvQkFDN0QsQ0FBQyxDQUFDLFNBQVM7Z0JBRWIsbUJBQW1CLEVBQUUsT0FBTyxDQUFDLFFBQVE7b0JBQ25DLENBQUMsQ0FBQyxDQUFDLEVBQUUsd0JBQXdCLEVBQUUsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO29CQUNsRCxDQUFDLENBQUMsU0FBUzthQUNkO1lBQ0gsQ0FBQyxDQUFDLFNBQVM7UUFDZixHQUFHLE1BQU07S0FDOEMsQ0FBQyxDQUFDO0lBRTNELElBQUksR0FBRyxLQUFLLFNBQVMsSUFBSSxPQUFPLEVBQUUsV0FBVyxFQUFFLENBQUM7UUFDOUMsSUFBQSx5QkFBZSxFQUFDO1lBQ2QsWUFBWSxFQUFFLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxFQUFFLEVBQUU7WUFDNUQsa0JBQWtCLEVBQUUsd0JBQXdCO1lBQzVDLFNBQVMsRUFBRSxPQUFPLENBQUMsV0FBVyxDQUFDLFNBQVM7WUFDeEMsbUJBQW1CLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQyxJQUFJO2dCQUMzQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztnQkFDNUIsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1NBQ2hCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFNBQVMsSUFBSSxnQkFBZ0IsRUFBRSxDQUFDO1FBQ2xDLFFBQVEsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRTtZQUM3QiwyQ0FBMkM7WUFDM0MsSUFBSSxDQUFDLEVBQUU7Z0JBQUUsT0FBTztZQUNoQiw0REFBNEQ7WUFDNUQsTUFBTSxJQUFJLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQyx1QkFBdUIsQ0FBQztnQkFDM0QsWUFBWSxFQUFFLElBQUk7Z0JBQ2xCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsaUJBQWlCO2FBQ3RELENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsTUFBTTtnQkFDWixLQUFLLEVBQUUsV0FBVyxJQUFJLGFBQWE7Z0JBQ25DLFNBQVM7Z0JBQ1QsV0FBVyxFQUFFLG9CQUFvQjtnQkFDakMsU0FBUyxFQUFFLFFBQVE7YUFDcEIsQ0FBQyxDQUFDO1lBRUgsSUFBQSw4QkFBZSxFQUFDO2dCQUNkLElBQUksRUFBRSxXQUFXO2dCQUNqQixLQUFLLEVBQUUsSUFBSSxDQUFDLFFBQVM7Z0JBQ3JCLFNBQVM7Z0JBQ1QsV0FBVyxFQUFFLG9CQUFvQjtnQkFDakMsU0FBUyxFQUFFLFFBQVE7YUFDcEIsQ0FBQyxDQUFDO1lBRUgsSUFBQSw4QkFBZSxFQUFDO2dCQUNkLElBQUksRUFBRSxrQkFBa0I7Z0JBQ3hCLGFBQWEsRUFBRSxJQUFJO2dCQUNuQixLQUFLLEVBQUUsSUFBSSxDQUFDLFNBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFNO2dCQUNoQyxTQUFTO2dCQUNULFdBQVcsRUFBRSxvQkFBb0I7Z0JBQ2pDLFNBQVMsRUFBRSxRQUFRO2FBQ3BCLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsb0JBQW9CO2dCQUMxQixhQUFhLEVBQUUsSUFBSTtnQkFDbkIsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBTTtnQkFDaEMsU0FBUztnQkFDVCxXQUFXLEVBQUUsb0JBQW9CO2dCQUNqQyxTQUFTLEVBQUUsUUFBUTthQUNwQixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPO1FBQ0wsSUFBSTtRQUNKLFFBQVEsRUFBRSxRQUFzQztRQUNoRCxhQUFhLEVBQUU7WUFDYixXQUFXO1lBQ1gsa0JBQWtCO1lBQ2xCLG9CQUFvQjtZQUNwQixNQUFNO1NBQ1A7UUFDRCxVQUFVO0tBQ1gsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9

package/KeyVault/index.d.ts

@@ -1,15 +1,11 @@
 import { Input } from "@pulumi/pulumi";
-import { BasicMonitorArgs, KeyVaultInfo, PrivateLinkProps, ResourceGroupInfo } from "../types";
+import { BasicMonitorArgs, KeyVaultInfo, NetworkPropsType, PrivateLinkPropsType } from "../types";
 import { BasicResourceArgs } from "../types";
 export interface KeyVaultProps extends BasicResourceArgs {
     softDeleteRetentionInDays?: Input<number>;
-    network?: {
-        ipAddresses?: Array<Input<string>>;
-        subnetIds?: Array<Input<string>>;
-    };
+    network?: NetworkPropsType;
 }
-export declare const createVaultPrivateLink: ({ name, vaultInfo, ...props }: PrivateLinkProps & {
-    name: string;
+export declare const createVaultPrivateLink: ({ vaultInfo, ...props }: PrivateLinkPropsType & {
     vaultInfo: KeyVaultInfo;
 }) => import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint[];
 export declare const createVaultDiagnostic: ({ vaultInfo, logInfo, }: {
@@ -21,10 +17,10 @@ declare const _default: ({ name, group, network, softDeleteRetentionInDays, igno
     vault: import("@pulumi/azure-native/keyvault/vault").Vault;
     info: () => {
         name: string;
-        group: ResourceGroupInfo;
+        group: import("../types").ResourceGroupInfo;
         id: import("@pulumi/pulumi").Output<string>;
     };
     addDiagnostic: (logInfo: BasicMonitorArgs) => import("@pulumi/azure-native/insights/diagnosticSetting").DiagnosticSetting | undefined;
-    createPrivateLink: (props: PrivateLinkProps) => import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint[];
+    createPrivateLink: (props: PrivateLinkPropsType) => import("@pulumi/azure-native/network/privateEndpoint").PrivateEndpoint[];
 };
 export default _default;

package/KeyVault/index.js

@@ -33,13 +33,11 @@ const AzureEnv_1 = require("../Common/AzureEnv");
 const Naming_1 = require("../Common/Naming");
 const Helpers_1 = require("../Logs/Helpers");
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
-const createVaultPrivateLink = ({ name, vaultInfo, ...props }) => (0, PrivateEndpoint_1.default)({
-    name: (0, Naming_1.getPrivateEndpointName)(name),
+const createVaultPrivateLink = ({ vaultInfo, ...props }) => (0, PrivateEndpoint_1.default)({
+    resourceInfo: { ...vaultInfo, resourceName: vaultInfo.name },
     ...props,
-    group: vaultInfo.group,
-    resourceId: vaultInfo.id,
     privateDnsZoneName: "privatelink.vaultcore.azure.net",
-    linkServiceGroupIds: ["keyVault"],
+    linkServiceGroupIds: props.type ? [props.type] : ["keyVault"],
 });
 exports.createVaultPrivateLink = createVaultPrivateLink;
 const createVaultDiagnostic = ({ vaultInfo, logInfo, }) => (0, Helpers_1.createDiagnostic)({
@@ -72,8 +70,8 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
                 ipRules: network?.ipAddresses
                     ? network.ipAddresses.map((i) => ({ value: i }))
                     : [],
-                virtualNetworkRules: network?.subnetIds
-                    ? network.subnetIds.map((s) => ({ id: s }))
+                virtualNetworkRules: network?.subnetId
+                    ? [{ id: network.subnetId }]
                     : undefined,
             },
         },
@@ -93,10 +91,14 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
         group,
         id: vault.id,
     });
+    // Create Private Link
+    const createPrivateLink = (props) => (0, exports.createVaultPrivateLink)({ vaultInfo: info(), ...props });
+    //Create Private Link
+    if (network?.privateLink) {
+        createPrivateLink(network.privateLink);
+    }
     //Add Diagnostic
     const addDiagnostic = (logInfo) => (0, exports.createVaultDiagnostic)({ vaultInfo: info(), logInfo });
-    // Create Private Link
-    const createPrivateLink = (props) => (0, exports.createVaultPrivateLink)({ name, vaultInfo: info(), ...props });
     return {
         name: vaultName,
         vault,
@@ -105,4 +107,4 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
         createPrivateLink,
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RUFBMEQ7QUFDMUQsc0RBQW1EO0FBRW5ELGlEQUFxRDtBQUNyRCw2Q0FBMkU7QUFDM0UsNkNBQW1EO0FBT25ELDhFQUFzRDtBQVkvQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsRUFDckMsSUFBSSxFQUNKLFNBQVMsRUFDVCxHQUFHLEtBQUssRUFJVCxFQUFFLEVBQUUsQ0FDSCxJQUFBLHlCQUFlLEVBQUM7SUFDZCxJQUFJLEVBQUUsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLENBQUM7SUFDbEMsR0FBRyxLQUFLO0lBQ1IsS0FBSyxFQUFFLFNBQVMsQ0FBQyxLQUFLO0lBQ3RCLFVBQVUsRUFBRSxTQUFTLENBQUMsRUFBRTtJQUN4QixrQkFBa0IsRUFBRSxpQ0FBaUM7SUFDckQsbUJBQW1CLEVBQUUsQ0FBQyxVQUFVLENBQUM7Q0FDbEMsQ0FBQyxDQUFDO0FBZlEsUUFBQSxzQkFBc0IsMEJBZTlCO0FBRUUsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLEVBQ3BDLFNBQVMsRUFDVCxPQUFPLEdBSVIsRUFBRSxFQUFFLENBQ0gsSUFBQSwwQkFBZ0IsRUFBQztJQUNmLElBQUksRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLFFBQVE7SUFDL0IsZ0JBQWdCLEVBQUUsU0FBUyxDQUFDLEVBQUU7SUFDOUIsR0FBRyxPQUFPO0lBQ1YsY0FBYyxFQUFFLENBQUMsWUFBWSxDQUFDO0NBQy9CLENBQUMsQ0FBQztBQVpRLFFBQUEscUJBQXFCLHlCQVk3QjtBQUVMLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLE9BQU8sRUFDUCx5QkFBeUIsR0FBRyxDQUFDLEVBQzdCLGFBQWEsR0FBRyxFQUFFLEVBQ2xCLFNBQVMsRUFDVCxTQUFTLEVBQ1QsR0FBRyxN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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RUFBMEQ7QUFDMUQsc0RBQW1EO0FBRW5ELGlEQUE4QztBQUM5Qyw2Q0FBbUQ7QUFDbkQsNkNBQW1EO0FBT25ELDhFQUFzRDtBQVEvQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsRUFDckMsU0FBUyxFQUNULEdBQUcsS0FBSyxFQUdULEVBQUUsRUFBRSxDQUNILElBQUEseUJBQWUsRUFBQztJQUNkLFlBQVksRUFBRSxFQUFFLEdBQUcsU0FBUyxFQUFFLFlBQVksRUFBRSxTQUFTLENBQUMsSUFBSSxFQUFFO0lBQzVELEdBQUcsS0FBSztJQUNSLGtCQUFrQixFQUFFLGlDQUFpQztJQUNyRCxtQkFBbUIsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUM7Q0FDOUQsQ0FBQyxDQUFDO0FBWFEsUUFBQSxzQkFBc0IsMEJBVzlCO0FBRUUsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLEVBQ3BDLFNBQVMsRUFDVCxPQUFPLEdBSVIsRUFBRSxFQUFFLENBQ0gsSUFBQSwwQkFBZ0IsRUFBQztJQUNmLElBQUksRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLFFBQVE7SUFDL0IsZ0JBQWdCLEVBQUUsU0FBUyxDQUFDLEVBQUU7SUFDOUIsR0FBRyxPQUFPO0lBQ1YsY0FBYyxFQUFFLENBQUMsWUFBWSxDQUFDO0NBQy9CLENBQUMsQ0FBQztBQVpRLFFBQUEscUJBQXFCLHlCQVk3QjtBQUVMLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLE9BQU8sRUFDUCx5QkFBeUIsR0FBRyxDQUFDLEVBQzdCLGFBQWEsR0FBRyxFQUFFLEVBQ2xCLFNBQVMs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

package/MySql/index.d.ts

@@ -1,4 +1,4 @@
-import { BasicResourceArgs, KeyVaultInfo } from "../types";
+import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from "../types";
 import * as pulumi from "@pulumi/pulumi";
 import * as dbformysql from "@pulumi/azure-native/dbformysql";
 import * as inputs from "@pulumi/azure-native/types/input";
@@ -15,15 +15,8 @@ export interface MySqlProps extends BasicResourceArgs {
     version?: dbformysql.ServerVersion;
     storageSizeGB?: number;
     databases?: Array<string>;
-    network?: {
+    network?: NetworkPropsType & {
         allowsPublicAccess?: boolean;
-        privateLink?: {
-            subnetId: pulumi.Input<string>;
-        };
-        firewallRules?: Array<{
-            startIpAddress: string;
-            endIpAddress: string;
-        }>;
     };
 }
 declare const _default: ({ name, group, auth, enableEncryption, version, storageSizeGB, sku, network, databases, vaultInfo, dependsOn, }: MySqlProps) => import("@pulumi/azure-native/dbformysql/server").Server;

package/MySql/index.js

@@ -26,7 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const azure = __importStar(require("@pulumi/azure-native"));
 const Naming_1 = require("../Common/Naming");
+const pulumi = __importStar(require("@pulumi/pulumi"));
 const dbformysql = __importStar(require("@pulumi/azure-native/dbformysql"));
 const Random_1 = require("../Core/Random");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
@@ -35,6 +37,7 @@ const Group_1 = require("../AzAd/Group");
 const Helper_1 = require("../KeyVault/Helper");
 const UserAssignedIdentity_1 = __importDefault(require("../AzAd/UserAssignedIdentity"));
 const random_1 = require("@pulumi/random");
+const Helper_2 = require("../VNet/Helper");
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 exports.default = ({ name, group, auth, enableEncryption, version = dbformysql.ServerVersion.ServerVersion_8_0_21, storageSizeGB = 20, 
 /**
@@ -130,13 +133,14 @@ sku = {
         });
     }
     if (network) {
-        if (network.firewallRules) {
-            network.firewallRules.map((f, i) => new dbformysql.FirewallRule(`${name}-firewall-${i}`, {
+        if (network.ipAddresses) {
+            pulumi.output(network.ipAddresses).apply((ips) => (0, Helper_2.convertToIpRange)(ips).map((f, i) => new azure.dbforpostgresql.FirewallRule(`${name}-firewall-${i}`, {
                 firewallRuleName: `${name}-firewall-${i}`,
                 serverName: mySql.name,
                 ...group,
-                ...f,
-            }));
+                startIpAddress: f.start,
+                endIpAddress: f.end,
+            })));
         }
         if (network.allowsPublicAccess)
             new dbformysql.FirewallRule(`${name}-firewall-allowpublic`, {
@@ -148,12 +152,12 @@ sku = {
             });
         if (network.privateLink) {
             (0, PrivateEndpoint_1.default)({
-                name,
-                group,
-                resourceId: mySql.id,
+                resourceInfo: { resourceName: name, group, id: mySql.id },
                 privateDnsZoneName: "mysql.database.azure.com",
-                linkServiceGroupIds: ["mysql"],
-                subnetIds: [network.privateLink.subnetId],
+                linkServiceGroupIds: network.privateLink.type
+                    ? [network.privateLink.type]
+                    : ["mysql"],
+                subnetIds: network.privateLink.subnetIds,
             });
         }
     }
@@ -180,4 +184,4 @@ sku = {
     }
     return mySql;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLDZDQUFnRDtBQUVoRCw0RUFBOEQ7QUFDOUQsMkNBQWdEO0FBRWhELDJEQUEyRDtBQUMzRCxpREFBcUQ7QUFDckQseUNBQWlEO0FBRWpELCtDQUE0RDtBQUM1RCx3RkFBZ0U7QUFDaEUsMkNBQThDO0FBQzlDLDhFQUFzRDtBQTJCdEQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLGdCQUFnQixFQUNoQixPQUFPLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQyxvQkFBb0IsRUFDdkQsYUFBYSxHQUFHLEVBQUU7QUFDbEI7O0dBRUc7QUFDSCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsZUFBZTtJQUNyQixJQUFJLEVBQUUsV0FBVztDQUNsQixFQUNELE9BQU8sRUFDUCxTQUFTLEVBQ1QsU0FBUyxFQUNULFNBQVMsR0FDRSxFQUFFLEVBQUU7SUFDZixJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxVQUFVO1FBQ2hCLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7WUFDckIsT0FBTyxFQUFFLEtBQUs7WUFDZCxNQUFNLEVBQUUsQ0FBQztZQUNULEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXRDLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxRQUFRO1FBQ2QsSUFBQSx1QkFBYyxFQUFDO1lBQ2IsSUFBSTtZQUNKLE1BQU0sRUFBRSxFQUFFO1lBQ1YsT0FBTyxFQUFF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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDREQUE4QztBQUU5Qyw2Q0FBZ0Q7QUFDaEQsdURBQXlDO0FBQ3pDLDRFQUE4RDtBQUM5RCwyQ0FBZ0Q7QUFFaEQsMkRBQTJEO0FBQzNELGlEQUFxRDtBQUNyRCx5Q0FBaUQ7QUFFakQsK0NBQTREO0FBQzVELHdGQUFnRTtBQUNoRSwyQ0FBOEM7QUFDOUMsMkNBQWtEO0FBQ2xELDhFQUFzRDtBQW9CdEQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLGdCQUFnQixFQUNoQixPQUFPLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQyxvQkFBb0IsRUFDdkQsYUFBYSxHQUFHLEVBQUU7QUFDbEI7O0dBRUc7QUFDSCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsZUFBZTtJQUNyQixJQUFJLEVBQUUsV0FBVztDQUNsQixFQUNELE9BQU8sRUFDUCxTQUFTLEVBQ1QsU0FBUyxFQUNULFNBQVMsR0FDRSxFQUFFLEVBQUU7SUFDZixJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxVQUFVO1FBQ2hCLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7WUFDckIsT0FBTyxFQUFFLEtBQUs7WUFDZCxNQUFNLEVBQUUsQ0FBQztZQUNULEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXRDLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxRQUFRO1FBQ2QsSUFBQSx1QkFBYyxFQUFDO1lBQ2Is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

package/Postgresql/index.d.ts

@@ -1,4 +1,4 @@
-import { BasicResourceArgs, KeyVaultInfo } from "../types";
+import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from "../types";
 import * as pulumi from "@pulumi/pulumi";
 import * as azure from "@pulumi/azure-native";
 import * as inputs from "@pulumi/azure-native/types/input";
@@ -8,15 +8,8 @@ export interface PostgresProps extends BasicResourceArgs {
     version?: azure.dbforpostgresql.ServerVersion;
     storageSizeGB?: number;
     databases?: Array<string>;
-    network?: {
+    network?: NetworkPropsType & {
         allowsPublicAccess?: boolean;
-        privateLink?: {
-            subnetId: pulumi.Input<string>;
-        };
-        firewallRules?: Array<{
-            startIpAddress: string;
-            endIpAddress: string;
-        }>;
     };
     lock?: true;
 }

package/Postgresql/index.js

@@ -27,11 +27,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Naming_1 = require("../Common/Naming");
+const pulumi = __importStar(require("@pulumi/pulumi"));
 const azure = __importStar(require("@pulumi/azure-native"));
 const AzureEnv_1 = require("../Common/AzureEnv");
 const Random_1 = require("../Core/Random");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 const random_1 = require("@pulumi/random");
+const Helper_1 = require("../VNet/Helper");
 const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 const Locker_1 = __importDefault(require("../Core/Locker"));
 exports.default = ({ name, group, 
@@ -93,13 +95,14 @@ sku = {
         (0, Locker_1.default)({ name, resource: postgres });
     }
     if (network) {
-        if (network.firewallRules) {
-            network.firewallRules.map((f, i) => new azure.dbforpostgresql.FirewallRule(`${name}-firewall-${i}`, {
+        if (network.ipAddresses) {
+            pulumi.output(network.ipAddresses).apply((ips) => (0, Helper_1.convertToIpRange)(ips).map((f, i) => new azure.dbforpostgresql.FirewallRule(`${name}-firewall-${i}`, {
                 firewallRuleName: `${name}-firewall-${i}`,
                 serverName: postgres.name,
                 ...group,
-                ...f,
-            }));
+                startIpAddress: f.start,
+                endIpAddress: f.end,
+            })));
         }
         if (network.allowsPublicAccess)
             new azure.dbforpostgresql.FirewallRule(`${name}-firewall-allowpublic`, {
@@ -111,12 +114,12 @@ sku = {
             });
         if (network.privateLink) {
             (0, PrivateEndpoint_1.default)({
-                name,
-                group,
-                resourceId: postgres.id,
+                resourceInfo: { resourceName: name, group, id: postgres.id },
                 privateDnsZoneName: "postgres.database.azure.com",
-                linkServiceGroupIds: ["postgresql"],
-                subnetIds: [network.privateLink.subnetId],
+                linkServiceGroupIds: network.privateLink.type
+                    ? [network.privateLink.type]
+                    : ["postgresql"],
+                subnetIds: network.privateLink.subnetIds,
             });
         }
     }
@@ -143,4 +146,4 @@ sku = {
     }
     return postgres;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUG9zdGdyZXNxbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNkNBQXFEO0FBRXJELDREQUE4QztBQUM5QyxpREFBcUQ7QUFDckQsMkNBQWdEO0FBRWhELDJEQUEyRDtBQUMzRCwyQ0FBOEM7QUFDOUMsOEVBQXNEO0FBQ3RELDREQUFvQztBQXlCcEMsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLO0FBQ0wsT0FBTztBQUNQLE9BQU8sR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQyxnQkFBZ0IsRUFDOUQsYUFBYSxHQUFHLEdBQUc7QUFDbkI7O0dBRUc7QUFDSCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsZUFBZTtJQUNyQixJQUFJLEVBQUUsV0FBVztDQUNsQixFQUNELE9BQU8sRUFDUCxTQUFTLEVBQ1QsU0FBUyxFQUNULFNBQVMsRUFDVCxJQUFJLEdBQUcsSUFBSSxHQUNHLEVBQUUsRUFBRTtJQUNsQixJQUFJLEdBQUcsSUFBQSwwQkFBaUIsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUUvQixNQUFNLFFBQVEsR0FBRyxJQUFJLHFCQUFZLENBQUMsSUFBSSxFQUFFO1FBQ3RDLE9BQU8sRUFBRSxLQUFLO1FBQ2QsTUFBTSxFQUFFLENBQUM7UUFDVCxLQUFLLEVBQUUsSUFBSTtRQUNYLEtBQUssRUFBRSxLQUFLO0tBQ2IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2QyxNQUFNLFFBQVEsR0FBRyxJQUFBLHVCQUFjLEVBQUM7UUFDOUIsSUFBSTtRQUNKLE1BQU0sRUFBRSxFQUFFO1FBQ1YsT0FBTyxFQUFFLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRTtLQUM1QixDQUFDLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUG9zdGdyZXNxbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNkNBQXFEO0FBQ3JELHVEQUF5QztBQUN6Qyw0REFBOEM7QUFDOUMsaURBQXFEO0FBQ3JELDJDQUFnRDtBQUVoRCwyREFBMkQ7QUFDM0QsMkNBQThDO0FBQzlDLDJDQUFrRDtBQUNsRCw4RUFBc0Q7QUFDdEQsNERBQW9DO0FBa0JwQyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUs7QUFDTCxPQUFPO0FBQ1AsT0FBTyxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLGdCQUFnQixFQUM5RCxhQUFhLEdBQUcsR0FBRztBQUNuQjs7R0FFRztBQUNILEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxlQUFlO0lBQ3JCLElBQUksRUFBRSxXQUFXO0NBQ2xCLEVBQ0QsT0FBTyxFQUNQLFNBQVMsRUFDVCxTQUFTLEVBQ1QsU0FBUyxFQUNULElBQUksR0FBRyxJQUFJLEdBQ0csRUFBRSxFQUFFO0lBQ2xCLElBQUksR0FBRyxJQUFBLDBCQUFpQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9CLE1BQU0sUUFBUSxHQUFHLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7UUFDdEMsT0FBTyxFQUFFLEtBQUs7UUFDZCxNQUFNLEVBQUUsQ0FBQztRQUNULEtBQUssRUFBRSxJQUFJO1FBQ1gsS0FBSyxFQUFFLEtBQUs7S0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sUUFBUSxHQUFHLElBQUEsdUJBQWMsRUFBQztRQUM5QixJQUFJO1FBQ0osTUFBTSxFQUFFLEVBQUU7UUFDVixPQUFPLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFO0tBQzVCLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFFVixNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUMvQyxJQUFJLEVBQ0o7UUFDRSxVQUFVLEVBQUUsSUFBSTtRQUNoQixHQUFHLEtBQUs7UUFDUixPQUFPO1FBQ1AsT0FBTyxFQUFFLEVBQUUsYUFBYSxFQUFFO1FBRTFCLFVBQVUsRUFBRTtZQUNWLFlBQVksRUFBRSxTQUFTO1lBQ3ZCLG1CQUFtQixFQUFFLFNBQVM7WUFDOUIsUUFBUSxFQUFSLG1CQUFRO1NBQ1Q7UUFDRCxrQkFBa0IsRUFBRSxRQUFRO1FBQzVCLDBCQUEwQixFQUFFLFFBQVE7UUFDcEMsY0FBYyxFQUFFLEVBQUUsSUFBSSxFQUFFLGVBQWUsRUFBRTtRQUN6QyxzQ0FBc0M7UUFDdEMsR0FBRztRQUNILGNBQWM7UUFDZCxNQUFNLEVBQUU7WUFDTixrQkFBa0IsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLFVBQVU7WUFDbEQsbUJBQW1CLEVBQUUsQ0FBQztTQUN2QjtRQUNELGdCQUFnQixFQUFFLEVBQUUsSUFBSSxFQUFFLGdCQUFLLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsVUFBVSxFQUFFO1FBQ2hFLGdCQUFnQixFQUFFLGdCQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRztLQUNwQyxFQUNEO1FBQ0UsU0FBUztRQUNULE9BQU8sRUFBRSxJQUFJO1FBQ2IsYUFBYSxFQUFFO1lBQ2IsWUFBWTtZQUNaLGtCQUFrQjtZQUNsQixrQkFBa0I7WUFDbEIsb0JBQW9CO1lBQ3BCLGdCQUFnQjtTQUNqQjtLQUNGLENBQ0YsQ0FBQztJQUVGLElBQUksSUFBSSxFQUFFLENBQUM7UUFDVCxJQUFBLGdCQUFNLEVBQUMsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDdkMsQ0FBQztJQUVELElBQUksT0FBTyxFQUFFLENBQUM7UUFDWixJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUMvQyxJQUFBLHlCQUFnQixFQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FDdkIsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FDUCxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLEdBQUcsSUFBSSxhQUFhLENBQUMsRUFBRSxFQUFFO2dCQUM5RCxnQkFBZ0IsRUFBRSxHQUFHLElBQUksYUFBYSxDQUFDLEVBQUU7Z0JBQ3pDLFVBQVUsRUFBRSxRQUFRLENBQUMsSUFBSTtnQkFDekIsR0FBRyxLQUFLO2dCQUNSLGNBQWMsRUFBRSxDQUFDLENBQUMsS0FBSztnQkFDdkIsWUFBWSxFQUFFLENBQUMsQ0FBQyxHQUFHO2FBQ3BCLENBQUMsQ0FDTCxDQUNGLENBQUM7UUFDSixDQUFDO1FBRUQsSUFBSSxPQUFPLENBQUMsa0JBQWtCO1lBQzVCLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsR0FBRyxJQUFJLHVCQUF1QixFQUFFO2dCQUNyRSxnQkFBZ0IsRUFBRSxHQUFHLElBQUksdUJBQXVCO2dCQUNoRCxVQUFVLEVBQUUsUUFBUSxDQUFDLElBQUk7Z0JBQ3pCLEdBQUcsS0FBSztnQkFDUixjQUFjLEVBQUUsU0FBUztnQkFDekIsWUFBWSxFQUFFLGlCQUFpQjthQUNoQyxDQUFDLENBQUM7UUFFTCxJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixJQUFBLHlCQUFlLEVBQUM7Z0JBQ2QsWUFBWSxFQUFFLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxFQUFFLEVBQUU7Z0JBQzVELGtCQUFrQixFQUFFLDZCQUE2QjtnQkFDakQsbUJBQW1CLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQyxJQUFJO29CQUMzQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQztvQkFDNUIsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDO2dCQUNsQixTQUFTLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQyxTQUFTO2FBQ3pDLENBQUMsQ0FBQztRQUNMLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLElBQUEsOEJBQWUsRUFBQztZQUNkLElBQUksRUFBRSxHQUFHLElBQUksUUFBUTtZQUNyQixLQUFLLEVBQUUsUUFBUTtZQUNmLFNBQVM7WUFDVCxXQUFXLEVBQUUsSUFBSTtTQUNsQixDQUFDLENBQUM7UUFDSCxJQUFBLDhCQUFlLEVBQUM7WUFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLE9BQU87WUFDcEIsS0FBSyxFQUFFLFFBQVE7WUFDZixTQUFTO1lBQ1QsV0FBVyxFQUFFLElBQUk7U0FDbEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxTQUFTLENBQUMsR0FBRyxDQUNYLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDSixJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsUUFBUSxDQUNoQyxHQUFHLElBQUksSUFBSSxDQUFDLEVBQUUsRUFDZDtZQUNFLFVBQVUsRUFBRSxRQUFRLENBQUMsSUFBSTtZQUN6QixZQUFZLEVBQUUsQ0FBQztZQUNmLEdBQUcsS0FBSztTQUNULEVBQ0QsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FDdkMsQ0FDSixDQUFDO0lBQ0osQ0FBQztJQUVELE9BQU8sUUFBUSxDQUFDO0FBQ2xCLENBQUMsQ0FBQyJ9

package/RedisCache/index.d.ts

@@ -1,9 +1,13 @@
-import * as native from '@pulumi/azure-native';
-import { BasicResourceArgs, KeyVaultInfo } from '../types';
+import * as cache from "@pulumi/azure-native/cache";
+import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from "../types";
 interface Props extends BasicResourceArgs {
     vaultInfo?: KeyVaultInfo;
-    allowsIpAddresses?: string[];
-    sku?: native.types.input.cache.SkuArgs;
+    network?: NetworkPropsType;
+    sku?: {
+        name: cache.SkuName | string;
+        family: cache.SkuFamily | string;
+        capacity: number;
+    };
 }
-declare const _default: ({ name, group, allowsIpAddresses, vaultInfo, sku, }: Props) => import("@pulumi/azure-native/cache/redis").Redis;
+declare const _default: ({ name, group, network, vaultInfo, sku, }: Props) => import("@pulumi/azure-native/cache/redis").Redis;
 export default _default;