@drunk-pulumi/azure 0.0.43 → 0.0.45

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;

package/RedisCache/index.js

@@ -22,52 +22,63 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const native = __importStar(require("@pulumi/azure-native"));
+const cache = __importStar(require("@pulumi/azure-native/cache"));
 const pulumi = __importStar(require("@pulumi/pulumi"));
 const to_words_1 = require("to-words");
 const Helper_1 = require("../VNet/Helper");
 const Naming_1 = require("../Common/Naming");
 const AzureEnv_1 = require("../Common/AzureEnv");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
+const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
 const toWord = new to_words_1.ToWords();
-exports.default = ({ name, group, allowsIpAddresses, vaultInfo, sku = { name: 'Basic', family: 'C', capacity: 0 }, }) => {
+exports.default = ({ name, group, network, vaultInfo, sku = { name: "Basic", family: "C", capacity: 0 }, }) => {
     name = (0, Naming_1.getRedisCacheName)(name);
-    const redis = new native.cache.Redis(name, {
+    const redis = new cache.Redis(name, {
         name,
         ...group,
-        minimumTlsVersion: '1.2',
+        minimumTlsVersion: "1.2",
+        enableNonSslPort: false,
+        identity: { type: cache.ManagedServiceIdentityType.SystemAssigned },
         sku,
-        zones: AzureEnv_1.isPrd && sku.name === 'Premium' ? ['1', '2', '3'] : undefined,
+        zones: AzureEnv_1.isPrd && sku.name === "Premium" ? ["1", "2", "3"] : undefined,
+        subnetId: network?.subnetId,
+        publicNetworkAccess: network?.privateLink ? "Disabled" : "Enabled",
     });
-    // new native.cache.PatchSchedule(
-    //   name,
-    //   {
-    //     name: 'default',
-    //     ...group,
-    //     scheduleEntries: [
-    //       { dayOfWeek: 'Everyday', startHourUtc: 0, maintenanceWindow: 'PT5H' },
-    //     ],
-    //   },
-    //   { dependsOn: redis }
-    // );
-    if (allowsIpAddresses) {
-        (0, Helper_1.convertToIpRange)(allowsIpAddresses).map((range, i) => {
-            const n = `allow_Ip_${toWord.convert(i)}`.toLowerCase();
-            return new native.cache.FirewallRule(n, {
-                ruleName: n,
-                cacheName: redis.name,
-                ...group,
-                startIP: range.start,
-                endIP: range.end,
+    //Whitelist IpAddress
+    if (network?.ipAddresses) {
+        pulumi.output(network.ipAddresses).apply((ips) => {
+            (0, Helper_1.convertToIpRange)(ips).map((range, i) => {
+                const n = `allow_Ip_${toWord.convert(i)}`.toLowerCase();
+                return new cache.FirewallRule(n, {
+                    ruleName: n,
+                    cacheName: redis.name,
+                    ...group,
+                    startIP: range.start,
+                    endIP: range.end,
+                });
             });
         });
     }
+    //Private Link
+    if (network?.privateLink) {
+        (0, PrivateEndpoint_1.default)({
+            resourceInfo: { resourceName: name, group, id: redis.id },
+            privateDnsZoneName: "privatelink.redis.cache.windows.net",
+            subnetIds: network.privateLink.subnetIds,
+            linkServiceGroupIds: network.privateLink.type
+                ? [network.privateLink.type]
+                : ["redisCache"],
+        });
+    }
     if (vaultInfo) {
         pulumi.all([redis.name, redis.hostName]).apply(async ([n, h]) => {
             if (!h)
                 return;
-            const keys = await native.cache.listRedisKeys({
+            const keys = await cache.listRedisKeys({
                 name: n,
                 resourceGroupName: group.resourceGroupName,
             });
@@ -75,28 +86,28 @@ exports.default = ({ name, group, allowsIpAddresses, vaultInfo, sku = { name: 'B
                 name: `${name}-primary-key`,
                 value: keys.primaryKey,
                 vaultInfo,
-                contentType: 'Redis Cache',
+                contentType: "Redis Cache",
             });
             (0, CustomHelper_1.addCustomSecret)({
                 name: `${name}-secondary-key`,
                 value: keys.secondaryKey,
                 vaultInfo,
-                contentType: 'Redis Cache',
+                contentType: "Redis Cache",
             });
             (0, CustomHelper_1.addCustomSecret)({
                 name: `${name}-primary-connection`,
                 value: `${name}.redis.cache.windows.net:6380,password=${keys.primaryKey},ssl=True,abortConnect=False`,
                 vaultInfo,
-                contentType: 'Redis Cache',
+                contentType: "Redis Cache",
             });
             (0, CustomHelper_1.addCustomSecret)({
                 name: `${name}-secondary-connection`,
                 value: `${name}.redis.cache.windows.net:6380,password=${keys.secondaryKey},ssl=True,abortConnect=False`,
                 vaultInfo,
-                contentType: 'Redis Cache',
+                contentType: "Redis Cache",
             });
         });
     }
     return redis;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVkaXNDYWNoZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkRBQStDO0FBQy9DLHVEQUF5QztBQUl6Qyx1Q0FBbUM7QUFDbkMsMkNBQWtEO0FBQ2xELDZDQUFxRDtBQUNyRCxpREFBMkM7QUFDM0MsMkRBQTJEO0FBRTNELE1BQU0sTUFBTSxHQUFHLElBQUksa0JBQU8sRUFBRSxDQUFDO0FBUTdCLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLGlCQUFpQixFQUNqQixTQUFTLEVBQ1QsR0FBRyxHQUFHLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxDQUFDLEVBQUUsR0FDM0MsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsTUFBTSxLQUFLLEdBQUcsSUFBSSxNQUFNLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7UUFDekMsSUFBSTtRQUNKLEdBQUcsS0FBSztRQUNSLGlCQUFpQixFQUFFLEtBQUs7UUFDeEIsR0FBRztRQUNILEtBQUssRUFBRSxnQkFBSyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7S0FDckUsQ0FBQyxDQUFDO0lBRUgsa0NBQWtDO0lBQ2xDLFVBQVU7SUFDVixNQUFNO0lBQ04sdUJBQXVCO0lBQ3ZCLGdCQUFnQjtJQUNoQix5QkFBeUI7SUFDekIsK0VBQStFO0lBQy9FLFNBQVM7SUFDVCxPQUFPO0lBQ1AseUJBQXlCO0lBQ3pCLEtBQUs7SUFFTCxJQUFJLGlCQUFpQixFQUFFLENBQUM7UUFDdEIsSUFBQSx5QkFBZ0IsRUFBQyxpQkFBaUIsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUNuRCxNQUFNLENBQUMsR0FBRyxZQUFZLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4RCxPQUFPLElBQUksTUFBTSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQyxFQUFFO2dCQUN0QyxRQUFRLEVBQUUsQ0FBQztnQkFDWCxTQUFTLEVBQUUsS0FBSyxDQUFDLElBQUk7Z0JBQ3JCLEdBQUcsS0FBSztnQkFDUixPQUFPLEVBQUUsS0FBSyxDQUFDLEtBQUs7Z0JBQ3BCLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBRzthQUNqQixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQzlELElBQUksQ0FBQyxDQUFDO2dCQUFFLE9BQU87WUFFZixNQUFNLElBQUksR0FBRyxNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDO2dCQUM1QyxJQUFJLEVBQUUsQ0FBQztnQkFDUCxpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO2FBQzNDLENBQUMsQ0FBQztZQUVILElBQUEsOEJBQWUsRUFBQztnQkFDZCxJQUFJLEVBQUUsR0FBRyxJQUFJLGNBQWM7Z0JBQzNCLEtBQUssRUFBRSxJQUFJLENBQUMsVUFBVTtnQkFDdEIsU0FBUztnQkFDVCxXQUFXLEVBQUUsYUFBYTthQUMzQixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxnQkFBZ0I7Z0JBQzdCLEtBQUssRUFBRSxJQUFJLENBQUMsWUFBWTtnQkFDeEIsU0FBUztnQkFDVCxXQUFXLEVBQUUsYUFBYTthQUMzQixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxxQkFBcUI7Z0JBQ2xDLEtBQUssRUFBRSxHQUFHLElBQUksMENBQTBDLElBQUksQ0FBQyxVQUFVLDhCQUE4QjtnQkFDckcsU0FBUztnQkFDVCxXQUFXLEVBQUUsYUFBYTthQUMzQixDQUFDLENBQUM7WUFFSCxJQUFBLDhCQUFlLEVBQUM7Z0JBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSx1QkFBdUI7Z0JBQ3BDLEtBQUssRUFBRSxHQUFHLElBQUksMENBQTBDLElBQUksQ0FBQyxZQUFZLDhCQUE4QjtnQkFDdkcsU0FBUztnQkFDVCxXQUFXLEVBQUUsYUFBYTthQUMzQixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVkaXNDYWNoZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBQ3BELHVEQUF5QztBQUl6Qyx1Q0FBbUM7QUFDbkMsMkNBQWtEO0FBQ2xELDZDQUFxRDtBQUNyRCxpREFBMkM7QUFDM0MsMkRBQTJEO0FBQzNELDhFQUE2RDtBQUU3RCxNQUFNLE1BQU0sR0FBRyxJQUFJLGtCQUFPLEVBQUUsQ0FBQztBQVk3QixrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEVBQ1AsU0FBUyxFQUNULEdBQUcsR0FBRyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLEdBQzNDLEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLDBCQUFpQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQy9CLE1BQU0sS0FBSyxHQUFHLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7UUFDbEMsSUFBSTtRQUNKLEdBQUcsS0FBSztRQUNSLGlCQUFpQixFQUFFLEtBQUs7UUFDeEIsZ0JBQWdCLEVBQUUsS0FBSztRQUN2QixRQUFRLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLDBCQUEwQixDQUFDLGNBQWMsRUFBRTtRQUNuRSxHQUFHO1FBQ0gsS0FBSyxFQUFFLGdCQUFLLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUztRQUNwRSxRQUFRLEVBQUUsT0FBTyxFQUFFLFFBQVE7UUFDM0IsbUJBQW1CLEVBQUUsT0FBTyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENB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

package/ServiceBus/index.d.ts

@@ -1,6 +1,6 @@
 import * as bus from "@pulumi/azure-native/servicebus";
 import * as pulumi from "@pulumi/pulumi";
-import { BasicArgs, BasicMonitorArgs, BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, ResourceGroupInfo } from "../types";
+import { BasicArgs, BasicMonitorArgs, BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, NetworkPropsType, ResourceGroupInfo } from "../types";
 import { BusConnectionTypes } from "./ServiceBusHelper";
 type TransportTypes = "AmqpWebSockets" | "Amqp" | null;
 type OptionsType = {
@@ -61,11 +61,7 @@ interface Props extends BasicResourceArgs, Pick<ConnCreatorProps, "removeEntityP
         alternateName: pulumi.Input<string>;
         partnerNamespace: pulumi.Input<string>;
     };
-    network?: {
-        whitelistIps?: Array<pulumi.Input<string>>;
-        enablePrivateLink?: boolean;
-        subnetId?: pulumi.Input<string>;
-    };
+    network?: NetworkPropsType;
     monitoring?: BasicMonitorArgs;
     sku?: bus.SkuName;
     vaultInfo?: KeyVaultInfo;

package/ServiceBus/index.js

@@ -360,14 +360,13 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
         }));
     }
     if (network && sku === bus.SkuName.Premium) {
-        if (!network.enablePrivateLink &&
-            (network.subnetId || network.whitelistIps)) {
+        if (network.subnetId || network.ipAddresses) {
             new bus.NamespaceNetworkRuleSet(name, {
                 namespaceName: namespace.name,
                 ...group,
                 defaultAction: "Deny",
-                ipRules: network.whitelistIps
-                    ? network.whitelistIps.map((i) => ({
+                ipRules: network.ipAddresses
+                    ? network.ipAddresses.map((i) => ({
                         ipMask: i,
                         action: bus.NetworkRuleIPAction.Allow,
                     }))
@@ -382,14 +381,13 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
                     : undefined,
             });
         }
-        else if (network.enablePrivateLink && network.subnetId) {
+        if (network.privateLink) {
             (0, PrivateEndpoint_1.default)({
-                name: (0, Naming_1.getPrivateEndpointName)(name),
-                group,
-                subnetIds: [network.subnetId],
-                //useGlobalDnsZone: network.useGlobalDnsZone,
-                resourceId: namespace.id,
-                linkServiceGroupIds: ["namespace"],
+                resourceInfo: { resourceName: name, group, id: namespace.id },
+                subnetIds: network.privateLink.subnetIds,
+                linkServiceGroupIds: network.privateLink.type
+                    ? [network.privateLink.type]
+                    : ["namespace"],
                 privateDnsZoneName: "privatelink.servicebus.windows.net",
             });
         }
@@ -406,4 +404,4 @@ exports.default = ({ name, group, topics, queues, drConfig, network = {}, vaultI
         diagnostic,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ServiceBus/index.ts"],"names":[],"mappings":"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"}

package/SignalR/index.d.ts

@@ -1,6 +1,6 @@
 import * as native from "@pulumi/azure-native";
 import * as pulumi from "@pulumi/pulumi";
-import { BasicResourceArgs, KeyVaultInfo, PrivateLinkProps } from "../types";
+import { BasicResourceArgs, KeyVaultInfo, PrivateLinkPropsType } from "../types";
 interface ResourceSkuArgs {
     capacity?: 1 | 2 | 5 | 10 | 20 | 50 | 100;
     name: "Standard_S1" | "Free_F1";
@@ -9,7 +9,7 @@ interface ResourceSkuArgs {
 interface Props extends BasicResourceArgs {
     vaultInfo?: KeyVaultInfo;
     allowedOrigins?: pulumi.Input<pulumi.Input<string>[]>;
-    privateLink?: PrivateLinkProps;
+    privateLink?: PrivateLinkPropsType;
     kind?: native.signalrservice.ServiceKind;
     sku?: pulumi.Input<ResourceSkuArgs>;
 }