@drunk-pulumi/azure 0.0.49 → 0.0.51

package/VNet/Vnet.js

@@ -28,13 +28,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const network = __importStar(require("@pulumi/azure-native/network"));
 const Helper_1 = require("./Helper");
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 const Subnet_1 = __importDefault(require("./Subnet"));
 const SecurityGroup_1 = __importDefault(require("./SecurityGroup"));
 const RouteTable_1 = __importDefault(require("./RouteTable"));
 const AppGatewaySecurityRule_1 = __importDefault(require("./NSGRules/AppGatewaySecurityRule"));
 exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGateway, dnsServers, features = {}, dependsOn, }) => {
-    const vName = (0, Naming_1.getVnetName)(name);
+    const vName = (0, Common_1.getVnetName)(name);
     const securityRules = features.securityGroup?.rules || [];
     //AppGateway
     if (features.appGatewaySubnet) {
@@ -94,14 +94,14 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGatewa
         //Allow outbound internet
         if (!features.securityGroup.allowOutboundInternetAccess) {
             securityRules.push({
-                name: "DefaultDeniedInternetOutbound",
-                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;
             });
         }
@@ -139,11 +139,11 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGatewa
         })),
         enableDdosProtection: ddosId !== undefined,
         ddosProtectionPlan: ddosId ? { id: ddosId } : undefined,
-    }, { dependsOn, ignoreChanges: ["virtualNetworkPeerings"] });
+    }, { dependsOn, ignoreChanges: ['virtualNetworkPeerings'] });
     const findSubnet = (name) => vnet.subnets.apply((ss) => ss.find((s) => s.name === name));
     //Return the results
     return {
-        resourceName: vName,
+        name: vName,
         group,
         id: vnet.id,
         vnet,
@@ -157,4 +157,4 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGatewa
         bastionSubnet: findSubnet(Helper_1.azBastionSubnetName),
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm5ldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZuZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUt4RCxxQ0FNa0I7QUFDbEIsNkNBQStDO0FBQy9DLHNEQUFxRDtBQUNyRCxvRUFBNEM7QUFDNUMsOERBQXNDO0FBQ3RDLCtGQUF1RTtBQXdFdkUsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsTUFBTSxFQUNOLGFBQWEsRUFDYixPQUFPLEdBQUcsRUFBRSxFQUNaLFVBQVUsRUFDVixVQUFVLEVBQ1YsUUFBUSxHQUFHLEVBQUUsRUFDYixTQUFTLEdBQ0MsRUFBYyxFQUFFO0lBQzFCLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsYUFBYSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7SUFFMUQsWUFBWTtJQUNaLElBQUksUUFBUSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDOUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSw2QkFBb0I7WUFDMUIsYUFBYSxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhO1lBQ3RELHVCQUF1QixFQUFFLEtBQUs7WUFDOUIsbUJBQW1CLEVBQUUsS0FBSztZQUMxQixnQkFBZ0IsRUFBRSxLQUFLO1NBQ3hCLENBQUMsQ0FBQztRQUVILDRFQUE0RTtRQUM1RSxhQUFhLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBQSxnQ0FBc0IsRUFBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFFRCxnQkFBZ0I7SUFDaEIsSUFBSSxRQUFRLEVBQUUsYUFBYSxFQUFFLENBQUM7UUFDNUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSwwQkFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm5ldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZuZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNFQUF3RDtBQUt4RCxxQ0FNa0I7QUFDbEIsc0NBQXdDO0FBQ3hDLHNEQUFxRDtBQUNyRCxvRUFBNEM7QUFDNUMsOERBQXNDO0FBQ3RDLCtGQUF1RTtBQXdFdkUsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsTUFBTSxFQUNOLGFBQWEsRUFDYixPQUFPLEdBQUcsRUFBRSxFQUNaLFVBQVUsRUFDVixVQUFVLEVBQ1YsUUFBUSxHQUFHLEVBQUUsRUFDYixTQUFTLEdBQ0MsRUFBYyxFQUFFO0lBQzFCLE1BQU0sS0FBSyxHQUFHLElBQUEsb0JBQVcsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsYUFBYSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7SUFFMUQsWUFBWTtJQUNaLElBQUksUUFBUSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDOUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSw2QkFBb0I7WUFDMUIsYUFBYSxFQUFFLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhO1lBQ3RELHVCQUF1QixFQUFFLEtBQUs7WUFDOUIsbUJBQW1CLEVBQUUsS0FBSztZQUMxQixnQkFBZ0IsRUFBRSxLQUFLO1NBQ3hCLENBQUMsQ0FBQztRQUVILDRFQUE0RTtRQUM1RSxhQUFhLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBQSxnQ0FBc0IsRUFBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO0lBQzNFLENBQUM7SUFFRCxnQkFBZ0I7SUFDaEIsSUFBSSxRQUFRLEVBQUUsYUFBYSxFQUFFLENBQUM7UUFDNUIsT0FBTyxDQUFDLElBQUksQ0FBQztZQUNYLElBQUksRUFBRSwwQkFB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

package/VNet/index.d.ts

@@ -50,9 +50,9 @@ declare const _default: ({ group, name, ddosId, addressSpace, publicIpAddress, s
         firewall: network.AzureFirewall;
         policy: network.FirewallPolicy | undefined;
     } | undefined;
-    resourceName: string;
-    group: ResourceGroupInfo;
+    name: string;
     id: pulumi.Output<string>;
+    group: ResourceGroupInfo;
     vnet: network.VirtualNetwork;
     appGatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;
     gatewaySubnet: pulumi.OutputInstance<import("@pulumi/azure-native/types/output").network.SubnetResponse | undefined>;

package/Web/AppCertOrder.d.ts

@@ -1,16 +1,9 @@
-import * as certificateregistration from "@pulumi/azure-native/certificateregistration";
-import { DefaultResourceArgs, KeyVaultInfo } from "../types";
-interface Props extends DefaultResourceArgs {
+import * as cert from '@pulumi/azure-native/certificateregistration';
+import { BasicResourceArgs, KeyVaultInfo } from '../types';
+interface Props extends BasicResourceArgs {
     domain: string;
-    productType?: certificateregistration.CertificateProductType;
+    productType?: cert.CertificateProductType;
     vaultInfo?: KeyVaultInfo;
 }
-declare const _default: ({ domain, productType, vaultInfo, ...others }: Props) => {
-    resource: import("@pulumi/pulumi").CustomResource & {
-        id: import("@pulumi/pulumi").Output<string>;
-        urn: import("@pulumi/pulumi").Output<string>;
-    };
-    locker: import("@pulumi/azure-native/authorization/managementLockByScope").ManagementLockByScope | undefined;
-    diagnostic: import("@pulumi/azure-native/aadiam/diagnosticSetting").DiagnosticSetting | undefined;
-};
+declare const _default: ({ domain, productType, vaultInfo, ...others }: Props) => import("@pulumi/azure-native/certificateregistration/appServiceCertificateOrder").AppServiceCertificateOrder;
 export default _default;

package/Web/AppCertOrder.js

@@ -22,21 +22,15 @@ 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 certificateregistration = __importStar(require("@pulumi/azure-native/certificateregistration"));
-const ResourceCreator_1 = __importDefault(require("../Core/ResourceCreator"));
+const cert = __importStar(require("@pulumi/azure-native/certificateregistration"));
 const Common_1 = require("../Common");
-const Naming_1 = require("../Common/Naming");
-exports.default = ({ domain, productType = certificateregistration.CertificateProductType
-    .StandardDomainValidatedWildCardSsl, vaultInfo, ...others }) => {
-    const n = (0, Naming_1.getCertOrderName)(domain);
-    const order = (0, ResourceCreator_1.default)(certificateregistration.AppServiceCertificateOrder, {
+exports.default = ({ domain, productType = cert.CertificateProductType.StandardDomainValidatedWildCardSsl, vaultInfo, ...others }) => {
+    const n = (0, Common_1.getCertOrderName)(domain);
+    const order = new cert.AppServiceCertificateOrder(n, {
         certificateOrderName: n,
         ...Common_1.global.groupInfo,
-        location: "global",
+        location: 'global',
         productType,
         autoRenew: true,
         distinguishedName: `CN=*.${domain}`,
@@ -45,14 +39,14 @@ exports.default = ({ domain, productType = certificateregistration.CertificatePr
         ...others,
     });
     if (vaultInfo) {
-        new certificateregistration.AppServiceCertificateOrderCertificate(n, {
+        new cert.AppServiceCertificateOrderCertificate(n, {
             certificateOrderName: n,
             ...Common_1.global.groupInfo,
-            location: "global",
+            location: 'global',
             keyVaultSecretName: n,
             keyVaultId: vaultInfo.id,
-        }, { dependsOn: order.resource });
+        }, { dependsOn: order });
     }
     return order;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ2VydE9yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDZXJ0T3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNHQUF3RjtBQUV4Riw4RUFBOEM7QUFDOUMsc0NBQW1DO0FBQ25DLDZDQUFvRDtBQVFwRCxrQkFBZSxDQUFDLEVBQ2QsTUFBTSxFQUNOLFdBQVcsR0FBRyx1QkFBdUIsQ0FBQyxzQkFBc0I7S0FDekQsa0NBQWtDLEVBQ3JDLFNBQVMsRUFDVCxHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixNQUFNLENBQUMsR0FBRyxJQUFBLHlCQUFnQixFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRW5DLE1BQU0sS0FBSyxHQUFHLElBQUEseUJBQU8sRUFDbkIsdUJBQXVCLENBQUMsMEJBQTBCLEVBQ2xEO1FBQ0Usb0JBQW9CLEVBQUUsQ0FBQztRQUN2QixHQUFHLGVBQU0sQ0FBQyxTQUFTO1FBQ25CLFFBQVEsRUFBRSxRQUFRO1FBQ2xCLFdBQVc7UUFDWCxTQUFTLEVBQUUsSUFBSTtRQUNmLGlCQUFpQixFQUFFLFFBQVEsTUFBTSxFQUFFO1FBQ25DLE9BQU8sRUFBRSxJQUFJO1FBQ2IsZUFBZSxFQUFFLENBQUM7UUFDbEIsR0FBRyxNQUFNO0tBRVUsQ0FDdEIsQ0FBQztJQUVGLElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxJQUFJLHVCQUF1QixDQUFDLHFDQUFxQyxDQUMvRCxDQUFDLEVBQ0Q7WUFDRSxvQkFBb0IsRUFBRSxDQUFDO1lBQ3ZCLEdBQUcsZUFBTSxDQUFDLFNBQVM7WUFDbkIsUUFBUSxFQUFFLFFBQVE7WUFDbEIsa0JBQWtCLEVBQUUsQ0FBQztZQUNyQixVQUFVLEVBQUUsU0FBUyxDQUFDLEVBQUU7U0FDekIsRUFDRCxFQUFFLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxFQUFFLENBQzlCLENBQUM7SUFDSixDQUFDO0lBQ0QsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ2VydE9yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDZXJ0T3JkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1GQUFxRTtBQUVyRSxzQ0FBcUQ7QUFRckQsa0JBQWUsQ0FBQyxFQUNkLE1BQU0sRUFDTixXQUFXLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixDQUFDLGtDQUFrQyxFQUM1RSxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0gsRUFBRSxFQUFFO0lBQ1YsTUFBTSxDQUFDLEdBQUcsSUFBQSx5QkFBZ0IsRUFBQyxNQUFNLENBQUMsQ0FBQztJQUVuQyxNQUFNLEtBQUssR0FBRyxJQUFJLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxDQUFDLEVBQUU7UUFDbkQsb0JBQW9CLEVBQUUsQ0FBQztRQUN2QixHQUFHLGVBQU0sQ0FBQyxTQUFTO1FBQ25CLFFBQVEsRUFBRSxRQUFRO1FBQ2xCLFdBQVc7UUFDWCxTQUFTLEVBQUUsSUFBSTtRQUNmLGlCQUFpQixFQUFFLFFBQVEsTUFBTSxFQUFFO1FBQ25DLE9BQU8sRUFBRSxJQUFJO1FBQ2IsZUFBZSxFQUFFLENBQUM7UUFDbEIsR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0lBRUgsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLElBQUksSUFBSSxDQUFDLHFDQUFxQyxDQUM1QyxDQUFDLEVBQ0Q7WUFDRSxvQkFBb0IsRUFBRSxDQUFDO1lBQ3ZCLEdBQUcsZUFBTSxDQUFDLFNBQVM7WUFDbkIsUUFBUSxFQUFFLFFBQVE7WUFDbEIsa0JBQWtCLEVBQUUsQ0FBQztZQUNyQixVQUFVLEVBQUUsU0FBUyxDQUFDLEVBQUU7U0FDekIsRUFDRCxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FDckIsQ0FBQztJQUNKLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUMsQ0FBQyJ9

package/Web/AppConfig.d.ts

@@ -1,5 +1,5 @@
-import * as appConfig from "@pulumi/azure-native/appconfiguration";
-import { KeyVaultInfo, PrivateLinkPropsType, ResourceGroupInfo, ResourceInfo } from "../types";
+import * as appConfig from '@pulumi/azure-native/appconfiguration';
+import { KeyVaultInfo, PrivateLinkPropsType, ResourceGroupInfo, ResourceInfo } from '../types';
 export type AppConfigProps = {
     name: string;
     group: ResourceGroupInfo;

package/Web/AppConfig.js

@@ -38,14 +38,14 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
     const app = new appConfig.ConfigurationStore(name, {
         configStoreName: name,
         ...group,
-        identity: { type: "SystemAssigned" },
+        identity: { type: 'SystemAssigned' },
         enablePurgeProtection: AzureEnv_1.isPrd,
         softDeleteRetentionInDays: AzureEnv_1.isPrd ? 7 : 1,
         disableLocalAuth,
         publicNetworkAccess: privateLink
             ? appConfig.PublicNetworkAccess.Disabled
             : appConfig.PublicNetworkAccess.Enabled,
-        sku: { name: "Standard" },
+        sku: { name: 'Standard' },
     });
     //Access Keys
     if (vaultInfo && !disableLocalAuth) {
@@ -62,7 +62,7 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
                     //Only Read Connection String here
                     if (key.readOnly) {
                         (0, CustomHelper_1.addCustomSecret)({
-                            name: key.name.includes("Primary")
+                            name: key.name.includes('Primary')
                                 ? readPrimaryConnectionStringKey
                                 : readSecondaryConnectionStringKey,
                             value: key.connectionString,
@@ -77,17 +77,17 @@ exports.default = ({ group, name, vaultInfo, disableLocalAuth, privateLink, }) =
     //Private Link
     if (privateLink) {
         (0, PrivateEndpoint_1.default)({
-            resourceInfo: { resourceName: name, group, id: app.id },
-            privateDnsZoneName: "privatelink.azconfig.io",
-            linkServiceGroupIds: ["appConfig"],
+            resourceInfo: { name, group, id: app.id },
+            privateDnsZoneName: 'privatelink.azconfig.io',
+            linkServiceGroupIds: ['appConfig'],
             ...privateLink,
         });
     }
     return {
-        resourceName: name,
+        name,
         group,
         id: app.id,
         instance: app,
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxpREFBMkM7QUFDM0MsNkNBQTRFO0FBTzVFLDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixFQUNoQixXQUFXLEdBQ0ksRUFFZixFQUFFO0lBQ0YsSUFBSSxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLElBQUksaUNBQWlDLENBQUM7SUFDaEYsTUFBTSxnQ0FBZ0MsR0FBRyxHQUFHLElBQUksbUNBQW1DLENBQUM7SUFFcEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO1FBQ2pELGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUNwQyxxQkFBcUIsRUFBRSxnQkFBSztRQUM1Qix5QkFBeUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxZQUFZLEVBQUUsRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBRTtZQUN2RCxrQkFBa0IsRUFBRSx5QkFBeUI7WUFDN0MsbUJBQW1CLEVBQUUsQ0FBQyxXQUFXLENBQUM7WUFDbEMsR0FBRyxXQUFXO1NBQ2YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU87UUFDTCxZQUFZLEVBQUUsSUFBSTtRQUNsQixLQUFLO1FBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1FBQ1YsUUFBUSxFQUFFLEdBQUc7S0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1dlYi9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGlGQUFtRTtBQUNuRSxpREFBMkM7QUFDM0MsNkNBQW9EO0FBT3BELDhFQUFzRDtBQUN0RCwyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixFQUNoQixXQUFXLEdBQ0ksRUFFZixFQUFFO0lBQ0YsSUFBSSxHQUFHLElBQUEseUJBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsTUFBTSw4QkFBOEIsR0FBRyxHQUFHLElBQUksaUNBQWlDLENBQUM7SUFDaEYsTUFBTSxnQ0FBZ0MsR0FBRyxHQUFHLElBQUksbUNBQW1DLENBQUM7SUFFcEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxFQUFFO1FBQ2pELGVBQWUsRUFBRSxJQUFJO1FBQ3JCLEdBQUcsS0FBSztRQUNSLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUNwQyxxQkFBcUIsRUFBRSxnQkFBSztRQUM1Qix5QkFBeUIsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEMsZ0JBQWdCO1FBQ2hCLG1CQUFtQixFQUFFLFdBQVc7WUFDOUIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO1lBQ3hDLENBQUMsQ0FBQyxTQUFTLENBQUMsbUJBQW1CLENBQUMsT0FBTztRQUV6QyxHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFO0tBQzFCLENBQUMsQ0FBQztJQUVILGFBQWE7SUFDYixJQUFJLFNBQVMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDbkMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ3hCLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFDaEIsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxHQUFHLE1BQU0sU0FBUyxDQUFDLDBCQUEwQixDQUFDO2dCQUN0RCxlQUFlLEVBQUUsSUFBSTtnQkFDckIsR0FBRyxLQUFLO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtvQkFDckIsa0NBQWtDO29CQUNsQyxJQUFJLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQzt3QkFDakIsSUFBQSw4QkFBZSxFQUFDOzRCQUNkLElBQUksRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxTQUFTLENBQUM7Z0NBQ2hDLENBQUMsQ0FBQyw4QkFBOEI7Z0NBQ2hDLENBQUMsQ0FBQyxnQ0FBZ0M7NEJBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsZ0JBQWdCOzRCQUMzQixXQUFXLEVBQUUsYUFBYSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTs0QkFDNUMsU0FBUzt5QkFDVixDQUFDLENBQUM7b0JBQ0wsQ0FBQztnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFBLHlCQUFlLEVBQUM7WUFDZCxZQUFZLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFO1lBQ3pDLGtCQUFrQixFQUFFLHlCQUF5QjtZQUM3QyxtQkFBbUIsRUFBRSxDQUFDLFdBQVcsQ0FBQztZQUNsQyxHQUFHLFdBQVc7U0FDZixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixLQUFLO1FBQ0wsRUFBRSxFQUFFLEdBQUcsQ0FBQyxFQUFFO1FBQ1YsUUFBUSxFQUFFLEdBQUc7S0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/Web/AppGateway.d.ts

@@ -1,6 +1,6 @@
-import { DefaultResourceArgs, BasicResourceArgs } from '../types';
+import { BasicResourceArgs } from '../types';
 import { Input } from '@pulumi/pulumi';
-interface Props extends DefaultResourceArgs, BasicResourceArgs {
+interface Props extends BasicResourceArgs {
     publicIpAddressId: Input<string>;
     subnetId: Input<string>;
 }

package/Web/AppGateway.js

@@ -28,9 +28,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const network = __importStar(require("@pulumi/azure-native/network"));
 const ResourceCreator_1 = __importDefault(require("../Core/ResourceCreator"));
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 exports.default = ({ name, group, subnetId, publicIpAddressId }) => {
-    name = (0, Naming_1.getAppGatewayName)(name);
+    name = (0, Common_1.getAppGatewayName)(name);
     const rs = (0, ResourceCreator_1.default)(network.ApplicationGateway, {
         applicationGatewayName: name,
         ...group,
@@ -55,4 +55,4 @@ exports.default = ({ name, group, subnetId, publicIpAddressId }) => {
     });
     return rs;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwR2F0ZXdheS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9XZWIvQXBwR2F0ZXdheS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBRXhELDhFQUE4QztBQUU5Qyw2Q0FBcUQ7QUFPckQsa0JBQWUsQ0FBQyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLGlCQUFpQixFQUFTLEVBQUUsRUFBRTtJQUNyRSxJQUFJLEdBQUcsSUFBQSwwQkFBaUIsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUUvQixNQUFNLEVBQUUsR0FBRyxJQUFBLHlCQUFPLEVBQUMsT0FBTyxDQUFDLGtCQUFrQixFQUFFO1FBQzdDLHNCQUFzQixFQUFFLElBQUk7UUFDNUIsR0FBRyxLQUFLO1FBQ1IsV0FBVyxFQUFFLElBQUk7UUFDakIsdUNBQXVDO1FBRXZDLGFBQWEsRUFBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQzVDLHdCQUF3QixFQUFFO1lBQ3hCO2dCQUNFLGVBQWUsRUFBRSxFQUFFLEVBQUUsRUFBRSxpQkFBaUIsRUFBRTthQUMzQztTQUNGO1FBRUQsdUJBQXVCLEVBQUU7WUFDdkI7Z0JBQ0UsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRTthQUN6QjtTQUNGO1FBRUQsR0FBRyxFQUFFO1lBQ0gsUUFBUSxFQUFFLENBQUM7WUFDWCxJQUFJLEVBQUUsT0FBTyxDQUFDLHlCQUF5QixDQUFDLGNBQWM7WUFDdEQsSUFBSSxFQUFFLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRO1NBQzlDO0tBQ3NELENBQUMsQ0FBQztJQUUzRCxPQUFPLEVBQUUsQ0FBQztBQUNaLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwR2F0ZXdheS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9XZWIvQXBwR2F0ZXdheS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0VBQXdEO0FBRXhELDhFQUE4QztBQUU5QyxzQ0FBOEM7QUFPOUMsa0JBQWUsQ0FBQyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLGlCQUFpQixFQUFTLEVBQUUsRUFBRTtJQUNyRSxJQUFJLEdBQUcsSUFBQSwwQkFBaUIsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUUvQixNQUFNLEVBQUUsR0FBRyxJQUFBLHlCQUFPLEVBQUMsT0FBTyxDQUFDLGtCQUFrQixFQUFFO1FBQzdDLHNCQUFzQixFQUFFLElBQUk7UUFDNUIsR0FBRyxLQUFLO1FBQ1IsV0FBVyxFQUFFLElBQUk7UUFDakIsdUNBQXVDO1FBRXZDLGFBQWEsRUFBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQzVDLHdCQUF3QixFQUFFO1lBQ3hCO2dCQUNFLGVBQWUsRUFBRSxFQUFFLEVBQUUsRUFBRSxpQkFBaUIsRUFBRTthQUMzQztTQUNGO1FBRUQsdUJBQXVCLEVBQUU7WUFDdkI7Z0JBQ0UsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRTthQUN6QjtTQUNGO1FBRUQsR0FBRyxFQUFFO1lBQ0gsUUFBUSxFQUFFLENBQUM7WUFDWCxJQUFJLEVBQUUsT0FBTyxDQUFDLHlCQUF5QixDQUFDLGNBQWM7WUFDdEQsSUFBSSxFQUFFLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRO1NBQzlDO0tBQ29ELENBQUMsQ0FBQztJQUV6RCxPQUFPLEVBQUUsQ0FBQztBQUNaLENBQUMsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drunk-pulumi/azure",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "author": "drunkcoding@outlook.com",
   "description": "The custom helpers pulumi-azure",
   "license": "MIT",
@@ -18,15 +18,15 @@
   },
   "dependencies": {
     "@drunk-pulumi/azure-providers": "^0.0.24",
-    "@pulumi/azure-native": "^2.47.1",
-    "@pulumi/azuread": "5.52.0",
-    "@pulumi/pulumi": "^3.121.0",
-    "@pulumi/random": "^4.16.2",
-    "@pulumi/tls": "^5.0.3",
+    "@pulumi/azure-native": "^2.49.0",
+    "@pulumi/azuread": "5.53.1",
+    "@pulumi/pulumi": "^3.122.0",
+    "@pulumi/random": "^4.16.3",
+    "@pulumi/tls": "^5.0.4",
     "axios": "^1.7.2",
     "netmask": "^2.0.2",
     "node-forge": "^1.3.1",
     "to-words": "^4.0.1",
-    "xml-formatter": "^3.6.2"
+    "xml-formatter": "^3.6.3"
   }
 }

package/types.d.ts

@@ -1,6 +1,4 @@
 import { Input, Output, Resource } from '@pulumi/pulumi';
-import * as authorization from '@pulumi/azure-native/authorization';
-import { DiagnosticSetting } from '@pulumi/azure-native/aadiam/diagnosticSetting';
 import { EnvRoleKeyTypes } from './AzAd/EnvRoles';
 export declare namespace NodeJS {
     interface ProcessEnv {
@@ -9,57 +7,34 @@ export declare namespace NodeJS {
         DPA_NAMING_DISABLE_SUFFIX?: 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;
+export type NamedResourceType = {
+    name: string;
+};
+export type ResourceGroupInfo = {
+    resourceGroupName: string;
+    location?: Input<string>;
+};
+export type BasicResourceInfo = NamedResourceType & {
+    id: Output<string>;
+};
+export type ResourceInfo = BasicResourceInfo & {
     group: ResourceGroupInfo;
-    subscriptionId?: Input<string>;
-}
-export interface BasicArgs {
+};
+export type BasicArgs = {
     dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
     importUri?: string;
     ignoreChanges?: string[];
-}
-export interface ResourceGroupInfo {
-    resourceGroupName: string;
-    location?: Input<string>;
-}
-export interface ConventionProps {
-    prefix?: string;
-    suffix?: string;
-    /**Whether include the Azure Region name at the end of the name or not*/
-    region?: string;
-    /**Whether include the organization name at the end of the name or not*/
-    includeOrgName?: boolean;
-}
-export interface BasicMonitorArgs extends BasicArgs {
-    logWpId?: Input<string>;
-    logStorageId?: Input<string>;
-}
-export interface DiagnosticProps extends BasicMonitorArgs {
-    name: string;
-    targetResourceId: Input<string>;
-    metricsCategories?: string[];
-    logsCategories?: string[];
-}
-export type ResourceType = {
-    name: string;
-    groupName: string;
-    formattedName?: boolean;
 };
-export interface ResourceInfo {
-    resourceName: string;
-    group: ResourceGroupInfo;
-    id: Output<string>;
-}
 export interface BasicResourceArgs extends BasicArgs {
     name: string;
     group: ResourceGroupInfo;
 }
-export interface DefaultResourceArgs extends BasicArgs {
-    monitoring?: Omit<DiagnosticProps, 'name' | 'targetResourceId'>;
+export type KeyVaultInfo = ResourceInfo;
+export interface BasicResourceInfoWithInstance<InstanceType> extends BasicResourceInfo {
+    instance: InstanceType;
+}
+export interface ResourceInfoWithInstance<InstanceType> extends ResourceInfo {
+    instance: InstanceType;
 }
 export type PrivateLinkPropsType = {
     subnetIds: Input<string>[];
@@ -70,19 +45,6 @@ export type NetworkPropsType = {
     ipAddresses?: Input<string>[];
     privateLink?: PrivateLinkPropsType;
 };
-export interface BasicResourceResultProps<TClass> {
-    name: string;
-    resource: TClass;
-}
-export interface ResourceResultProps<TClass> extends BasicResourceResultProps<TClass> {
-    locker?: authorization.ManagementLockByScope;
-    diagnostic?: DiagnosticSetting;
-}
-export interface KeyVaultInfo {
-    name: string;
-    group: ResourceGroupInfo;
-    id: Output<string>;
-}
 export type IdentityRoleAssignment = {
     vaultInfo?: KeyVaultInfo;
     roles?: Array<{
@@ -91,3 +53,29 @@ export type IdentityRoleAssignment = {
     }>;
     envRole?: EnvRoleKeyTypes;
 };
+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>;
+}
+export type ConventionProps = {
+    prefix?: string;
+    suffix?: string;
+    /**Whether include the Azure Region name at the end of the name or not*/
+    region?: string;
+    /**Whether include the organization name at the end of the name or not*/
+    includeOrgName?: boolean;
+};
+export type BasicMonitorArgs = BasicArgs & {
+    logWpId?: Input<string>;
+    logStorageId?: Input<string>;
+};
+export interface DiagnosticProps extends BasicMonitorArgs {
+    name: string;
+    targetResourceId: Input<string>;
+    metricsCategories?: string[];
+    logsCategories?: string[];
+}