@drunk-pulumi/azure 1.0.3 → 1.0.5

package/Aks/Helper.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAksPrivateDnz = exports.getAksVaultConfig = exports.getAksConfig = void 0;
 const cs = __importStar(require("@pulumi/azure-native/containerservice"));
 const Common_1 = require("../Common");
+const GlobalEnv_1 = require("../Common/GlobalEnv");
 const Helper_1 = require("../KeyVault/Helper");
 const pulumi_1 = require("@pulumi/pulumi");
 const AzureEnv_1 = require("../Common/AzureEnv");
@@ -65,14 +66,14 @@ const getAksPrivateDnz = (aksInfo) => {
     return aks.apply((a) => {
         if (!a.privateFQDN)
             return undefined;
-        const dnsName = a.privateFQDN.split(':').slice(1).join('.');
+        const dnsName = a.privateFQDN.split('.').slice(1).join('.');
         const rsGroup = a.nodeResourceGroup;
         return {
             name: dnsName,
-            group: { resourceGroupName: rsGroup, location: AzureEnv_1.currentRegionName },
+            group: { resourceGroupName: rsGroup, location: GlobalEnv_1.globalKeyName },
             id: (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourceGroups/${rsGroup}/providers/Microsoft.Network/privateDnsZones/${dnsName}`,
         };
     });
 };
 exports.getAksPrivateDnz = getAksPrivateDnz;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQTZEO0FBRTdELCtDQUErQztBQUMvQywyQ0FBcUQ7QUFDckQsaURBQXVFO0FBRXZFLHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBTXJCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLGlDQUFpQyxDQUFDO1lBQ3pDLFlBQVksRUFBRSxPQUFPO1lBQ3JCLGlCQUFpQixFQUFFLEtBQUs7U0FDekIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxrQ0FBa0MsQ0FBQztZQUMxQyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBekJXLFFBQUEsWUFBWSxnQkF5QnZCO0FBRUYsbUNBQW1DO0FBQzVCLE1BQU0saUJBQWlCLEdBQUcsS0FBSyxFQUFFLEVBQ3RDLElBQUksRUFDSixPQUFPLEVBQ1AsU0FBUyxFQUNULGFBQWEsR0FNZCxFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLGtCQUFTLEVBQUM7UUFDekIsSUFBSSxFQUFFLEdBQUcsT0FBTyxTQUFTO1FBQ3pCLE9BQU87UUFDUCxTQUFTO1FBQ1QsYUFBYSxFQUFFLEtBQUs7S0FDckIsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxFQUFFLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztBQUN6QixDQUFDLENBQUM7QUFuQlcsUUFBQSxpQkFBaUIscUJBbUI1QjtBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsT0FBcUIsRUFDYSxFQUFFO0lBQ3BDLE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQztRQUNyQyxZQUFZLEVBQUUsT0FBTyxDQUFDLElBQUk7UUFDMUIsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQkFBaUI7S0FDbkQsQ0FBQyxDQUFDO0lBRUgsT0FBTyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDckIsSUFBSSxDQUFDLENBQUMsQ0FBQyxXQUFXO1lBQUUsT0FBTyxTQUFTLENBQUM7UUFDckMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM1RCxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsaUJBQWtCLENBQUM7UUFFckMsT0FBTztZQUNMLElBQUksRUFBRSxPQUFPO1lBQ2IsS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSw0QkFBaUIsRUFBRTtZQUNsRSxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLGtCQUFrQix5QkFBYyxtQkFBbUIsT0FBTyxnREFBZ0QsT0FBTyxFQUFFO1NBQ25ILENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFuQlcsUUFBQSxnQkFBZ0Isb0JBbUIzQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQTZEO0FBQzdELG1EQUFvRDtBQUVwRCwrQ0FBK0M7QUFDL0MsMkNBQXFEO0FBQ3JELGlEQUFvRDtBQUVwRCx5Q0FBeUM7QUFDbEMsTUFBTSxZQUFZLEdBQUcsS0FBSyxFQUFFLEVBQ2pDLElBQUksRUFDSixTQUFTLEVBQ1QsYUFBYSxFQUNiLG9CQUFvQixHQU1yQixFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsTUFBTSxLQUFLLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUEsNkJBQW9CLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFFMUUsTUFBTSxHQUFHLEdBQUcsb0JBQW9CO1FBQzlCLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxpQ0FBaUMsQ0FBQztZQUN6QyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUM7UUFDSixDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsa0NBQWtDLENBQUM7WUFDMUMsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDLENBQUM7SUFFUCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzFFLENBQUMsQ0FBQztBQXpCVyxRQUFBLFlBQVksZ0JBeUJ2QjtBQUVGLG1DQUFtQztBQUM1QixNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxFQUN0QyxJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBTWQsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxrQkFBUyxFQUFDO1FBQ3pCLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUztRQUN6QixPQUFPO1FBQ1AsU0FBUztRQUNULGFBQWEsRUFBRSxLQUFLO0tBQ3JCLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBbkJXLFFBQUEsaUJBQWlCLHFCQW1CNUI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQzlCLE9BQXFCLEVBQ2EsRUFBRTtJQUNwQyxNQUFNLEdBQUcsR0FBRyxFQUFFLENBQUMsdUJBQXVCLENBQUM7UUFDckMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxJQUFJO1FBQzFCLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUJBQWlCO0tBQ25ELENBQUMsQ0FBQztJQUVILE9BQU8sR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ3JCLElBQUksQ0FBQyxDQUFDLENBQUMsV0FBVztZQUFFLE9BQU8sU0FBUyxDQUFDO1FBQ3JDLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDNUQsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLGlCQUFrQixDQUFDO1FBRXJDLE9BQU87WUFDTCxJQUFJLEVBQUUsT0FBTztZQUNiLEtBQUssRUFBRSxFQUFFLGlCQUFpQixFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUseUJBQWEsRUFBRTtZQUM5RCxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLGtCQUFrQix5QkFBYyxtQkFBbUIsT0FBTyxnREFBZ0QsT0FBTyxFQUFFO1NBQ25ILENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFuQlcsUUFBQSxnQkFBZ0Isb0JBbUIzQiJ9

package/Aks/Identity.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const GraphDefinition_1 = require("../AzAd/GraphDefinition");
 const Identity_1 = __importDefault(require("../AzAd/Identity"));
 const RoleAssignment_1 = require("../AzAd/RoleAssignment");
-const AzureEnv_1 = require("../Common/AzureEnv");
+const Common_1 = require("../Common");
 //** The AzAD app Identity for Azure Kubernetes for RBAC */
 exports.default = ({ name, vaultInfo, dependsOn }) => {
     //AKS need this permission for AAD integration
@@ -28,9 +28,9 @@ exports.default = ({ name, vaultInfo, dependsOn }) => {
         principalId: serverIdentity.principalId,
         principalType: 'ServicePrincipal',
         roleName: 'AcrPull',
-        scope: AzureEnv_1.defaultScope,
+        scope: Common_1.defaultSubScope,
         dependsOn: serverIdentity.resource,
     });
     return serverIdentity;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQWtzL0lkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNkRBQThEO0FBQzlELGdFQUErQztBQUUvQywyREFBd0Q7QUFDeEQsaURBQWtEO0FBT2xELDJEQUEyRDtBQUMzRCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQVMsRUFBRSxFQUFFO0lBQ3ZELDhDQUE4QztJQUM5QyxNQUFNLFdBQVcsR0FBRyxJQUFBLHFDQUFtQixFQUNyQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNwQyxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFO0lBQ3pDLGdEQUFnRDtJQUNoRCxFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQzdDLENBQUM7SUFFRixNQUFNLGNBQWMsR0FBRyxJQUFBLGtCQUFlLEVBQUM7UUFDckMsSUFBSTtRQUNKLGtCQUFrQixFQUFFLElBQUk7UUFDeEIsZUFBZSxFQUFFLElBQUk7UUFDckIsd0JBQXdCLEVBQUUsQ0FBQyxXQUFXLENBQUM7UUFDdkMsWUFBWSxFQUFFLEtBQUs7UUFDbkIsT0FBTyxFQUFFLEtBQUs7UUFDZCxTQUFTO1FBQ1QsU0FBUztLQUNWLENBQUMsQ0FBQztJQUVILElBQUEsK0JBQWMsRUFBQztRQUNiLElBQUksRUFBRSxHQUFHLElBQUksd0JBQXdCO1FBQ3JDLFdBQVcsRUFBRSxjQUFjLENBQUMsV0FBWTtRQUN4QyxhQUFhLEVBQUUsa0JBQWtCO1FBQ2pDLFFBQVEsRUFBRSxTQUFTO1FBQ25CLEtBQUssRUFBRSx1QkFBWTtRQUNuQixTQUFTLEVBQUUsY0FBYyxDQUFDLFFBQVE7S0FDbkMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxjQUFjLENBQUM7QUFDeEIsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQWtzL0lkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNkRBQThEO0FBQzlELGdFQUErQztBQUUvQywyREFBd0Q7QUFDeEQsc0NBQTRDO0FBTzVDLDJEQUEyRDtBQUMzRCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQVMsRUFBRSxFQUFFO0lBQ3ZELDhDQUE4QztJQUM5QyxNQUFNLFdBQVcsR0FBRyxJQUFBLHFDQUFtQixFQUNyQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNwQyxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFO0lBQ3pDLGdEQUFnRDtJQUNoRCxFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQzdDLENBQUM7SUFFRixNQUFNLGNBQWMsR0FBRyxJQUFBLGtCQUFlLEVBQUM7UUFDckMsSUFBSTtRQUNKLGtCQUFrQixFQUFFLElBQUk7UUFDeEIsZUFBZSxFQUFFLElBQUk7UUFDckIsd0JBQXdCLEVBQUUsQ0FBQyxXQUFXLENBQUM7UUFDdkMsWUFBWSxFQUFFLEtBQUs7UUFDbkIsT0FBTyxFQUFFLEtBQUs7UUFDZCxTQUFTO1FBQ1QsU0FBUztLQUNWLENBQUMsQ0FBQztJQUVILElBQUEsK0JBQWMsRUFBQztRQUNiLElBQUksRUFBRSxHQUFHLElBQUksd0JBQXdCO1FBQ3JDLFdBQVcsRUFBRSxjQUFjLENBQUMsV0FBWTtRQUN4QyxhQUFhLEVBQUUsa0JBQWtCO1FBQ2pDLFFBQVEsRUFBRSxTQUFTO1FBQ25CLEtBQUssRUFBRSx3QkFBZTtRQUN0QixTQUFTLEVBQUUsY0FBYyxDQUFDLFFBQVE7S0FDbkMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxjQUFjLENBQUM7QUFDeEIsQ0FBQyxDQUFDIn0=

package/Aks/index.d.ts

@@ -1,7 +1,7 @@
-import * as native from '@pulumi/azure-native';
+import * as ccs from '@pulumi/azure-native/containerservice';
 import * as pulumi from '@pulumi/pulumi';
 import { Input, Output } from '@pulumi/pulumi';
-import { BasicResourceArgs, KeyVaultInfo, ResourceInfo } from '../types';
+import { BasicResourceArgs, KeyVaultInfo, ResourceInfoWithInstance } from '../types';
 import { EnvRolesResults } from '../AzAd/EnvRoles';
 import * as inputs from '@pulumi/azure-native/types/input';
 import { IdentityResult } from '../AzAd/Identity';
@@ -30,7 +30,7 @@ export declare enum VmSizes {
 }
 export interface NodePoolProps extends Partial<inputs.containerservice.ManagedClusterAgentPoolProfileArgs> {
     name: string;
-    mode: native.containerservice.AgentPoolMode;
+    mode: ccs.AgentPoolMode;
     vmSize: VmSizes | string;
     osDiskSizeGB: number;
     maxPods: number;
@@ -48,7 +48,7 @@ export type AskFeatureProps = {
     enableAutoScale?: boolean;
     enablePodIdentity?: boolean;
     enableWorkloadIdentity?: boolean;
-    enableDiagnosticSetting?: boolean;
+    enableMaintenance?: boolean;
 };
 export type AksAccessProps = {
     envRoles?: EnvRolesResults;
@@ -58,6 +58,8 @@ export type AksAccessProps = {
 export type AksNetworkProps = {
     subnetId: pulumi.Input<string>;
     virtualHostSubnetName?: pulumi.Input<string>;
+    /** This is using for Private DNZ linking only*/
+    extraVnetIds?: pulumi.Input<string>[];
     outboundIpAddress?: {
         ipAddressId?: pulumi.Input<string>;
         ipAddressPrefixId?: pulumi.Input<string>;
@@ -66,7 +68,7 @@ export type AksNetworkProps = {
 export type AksNodePoolProps = Omit<NodePoolProps, 'subnetId' | 'aksId'>;
 export type DefaultAksNodePoolProps = Omit<AksNodePoolProps, 'name' | 'mode'>;
 export interface AksProps extends BasicResourceArgs {
-    tier?: native.containerservice.ManagedClusterSKUTier;
+    tier?: ccs.ManagedClusterSKUTier;
     addon?: AskAddonProps;
     features?: AskFeatureProps;
     aksAccess: AksAccessProps;
@@ -100,9 +102,8 @@ export interface AksProps extends BasicResourceArgs {
     /**Lock resource from delete*/
     lock?: boolean;
 }
-export type AksResults = ResourceInfo & {
+export type AksResults = ResourceInfoWithInstance<ManagedCluster> & {
     serviceIdentity: IdentityResult;
-    aks: ManagedCluster;
     disableLocalAccounts?: boolean;
     getKubeConfig: () => Output<string> | undefined;
 };

package/Aks/index.js

@@ -27,25 +27,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VmSizes = void 0;
-const native = __importStar(require("@pulumi/azure-native"));
+const ccs = __importStar(require("@pulumi/azure-native/containerservice"));
 const pulumi = __importStar(require("@pulumi/pulumi"));
 const pulumi_1 = require("@pulumi/pulumi");
+const dnsBuilder = __importStar(require("../Builder/PrivateDnsZoneBuilder"));
 const VmSetMonitor_1 = __importDefault(require("./VmSetMonitor"));
-const AzureEnv_1 = require("../Common/AzureEnv");
+const Common_1 = require("../Common");
 const Locker_1 = __importDefault(require("../Core/Locker"));
 const Identity_1 = __importDefault(require("./Identity"));
-const StackEnv_1 = require("../Common/StackEnv");
 const Helpers_1 = require("../Logs/Helpers");
-const Common_1 = require("../Common");
 const RoleAssignment_1 = require("../AzAd/RoleAssignment");
 const Helper_1 = require("./Helper");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
-const KeyVaultBase_1 = require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase");
+const KeyVaultBase_1 = __importDefault(require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase"));
 const autoScaleFor = ({ enableAutoScaling, nodeType, env, }) => {
     const nodeCount = 1;
     const minCount = 1;
     let maxCount = 3;
-    if (env === AzureEnv_1.Environments.Prd) {
+    if (env === Common_1.Environments.Prd) {
         switch (nodeType) {
             case 'User':
                 maxCount = 5;
@@ -65,19 +64,19 @@ const autoScaleFor = ({ enableAutoScaling, nodeType, env, }) => {
     };
 };
 const defaultNodePoolProps = {
-    availabilityZones: AzureEnv_1.isPrd ? ['1', '2', '3'] : undefined,
-    type: native.containerservice.AgentPoolType.VirtualMachineScaleSets,
+    availabilityZones: Common_1.isPrd ? ['1', '2', '3'] : undefined,
+    type: ccs.AgentPoolType.VirtualMachineScaleSets,
     vmSize: 'Standard_B2s',
     maxPods: 50,
     enableFIPS: false,
     enableNodePublicIP: false,
     //enableEncryptionAtHost: false,
-    enableUltraSSD: AzureEnv_1.isPrd,
+    enableUltraSSD: Common_1.isPrd,
     osDiskSizeGB: 128,
-    osDiskType: native.containerservice.OSDiskType.Managed,
+    osDiskType: ccs.OSDiskType.Managed,
     nodeLabels: {
-        environment: AzureEnv_1.currentEnv,
-        stack: StackEnv_1.stack,
+        environment: Common_1.currentEnv,
+        stack: Common_1.stack,
     },
 };
 var VmSizes;
@@ -104,16 +103,15 @@ var VmSizes;
     VmSizes["Standard_A4m_v2"] = "Standard_A4m_v2";
 })(VmSizes || (exports.VmSizes = VmSizes = {}));
 //Using this to enable the preview feature https://azurecloudai.blog/2019/10/16/aks-enabling-and-using-preview-features-such-as-nodepools-using-cli/
-exports.default = async ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features = { enableDiagnosticSetting: true }, storageProfile, addon = {
+exports.default = async ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features = { enableMaintenance: true }, storageProfile, addon = {
     enableAzureKeyVault: false,
-}, tier = native.containerservice.ManagedClusterSKUTier.Free, lock = true, dependsOn = [], importUri, ignoreChanges = [], }) => {
+}, tier = ccs.ManagedClusterSKUTier.Free, lock = true, dependsOn = [], importUri, ignoreChanges = [], }) => {
     const aksName = (0, Common_1.getAksName)(name);
     const secretName = `${aksName}-config`;
-    const acrScope = acr?.enable ? acr.id ?? AzureEnv_1.defaultScope : undefined;
     const nodeResourceGroup = (0, Common_1.getResourceGroupName)(`${aksName}-nodes`);
     //Auto detect and disable Local Account
     if (aksAccess.disableLocalAccounts === undefined && vaultInfo) {
-        aksAccess.disableLocalAccounts = await (0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
+        aksAccess.disableLocalAccounts = await (0, KeyVaultBase_1.default)(vaultInfo.name)
             .checkSecretExist(secretName)
             .catch(() => false);
     }
@@ -124,8 +122,14 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
         vaultInfo,
         dependsOn,
     });
+    // const privateDnsZone = features?.enablePrivateCluster
+    //   ? PrivateDnsZoneBuilder({
+    //       name: `${aksName}.privatelink.${currentRegionCode}.azmk8s.io`,
+    //       group,
+    //     }).build()
+    //   : undefined;
     //Create AKS Cluster
-    const aks = new native.containerservice.ManagedCluster(aksName, {
+    const aks = new ccs.ManagedCluster(aksName, {
         resourceName: aksName,
         ...group,
         nodeResourceGroup,
@@ -136,8 +140,9 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                 : aksAccess.authorizedIPRanges || [],
             disableRunCommand: true,
             enablePrivateCluster: features?.enablePrivateCluster,
-            enablePrivateClusterPublicFQDN: true,
+            enablePrivateClusterPublicFQDN: false,
             privateDNSZone: features?.enablePrivateCluster ? 'system' : undefined,
+            //privateDNSZone: privateDnsZone?.id,
         },
         addonProfiles: {
             azureKeyvaultSecretsProvider: {
@@ -176,16 +181,16 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             },
         },
         sku: {
-            name: native.containerservice.ManagedClusterSKUName.Base,
+            name: ccs.ManagedClusterSKUName.Base,
             tier,
         },
-        supportPlan: native.containerservice.KubernetesSupportPlan.KubernetesOfficial,
+        supportPlan: ccs.KubernetesSupportPlan.KubernetesOfficial,
         agentPoolProfiles: [
             {
                 ...defaultNodePoolProps,
                 ...defaultNodePool,
                 ...autoScaleFor({
-                    env: AzureEnv_1.currentEnv,
+                    env: Common_1.currentEnv,
                     nodeType: 'System',
                     enableAutoScaling: features?.enableAutoScale,
                 }),
@@ -242,7 +247,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
         },
         oidcIssuerProfile: { enabled: Boolean(features?.enableWorkloadIdentity) },
         securityProfile: {
-            defender: logWpId && AzureEnv_1.isPrd
+            defender: logWpId && Common_1.isPrd
                 ? {
                     logAnalyticsWorkspaceResourceId: logWpId,
                     securityMonitoring: { enabled: true },
@@ -261,10 +266,10 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             }
             : undefined,
         identity: {
-            type: native.containerservice.ResourceIdentityType.SystemAssigned,
+            type: ccs.ResourceIdentityType.SystemAssigned,
         },
         autoUpgradeProfile: {
-            upgradeChannel: native.containerservice.UpgradeChannel.Patch,
+            upgradeChannel: ccs.UpgradeChannel.Patch,
             //nodeOSUpgradeChannel: "NodeImage",
         },
         disableLocalAccounts: Boolean(aksAccess.disableLocalAccounts),
@@ -274,20 +279,20 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                 enableAzureRBAC: true,
                 managed: true,
                 adminGroupObjectIDs: [aksAccess.envRoles.admin.objectId],
-                tenantID: AzureEnv_1.tenantId,
+                tenantID: Common_1.tenantId,
             }
             : undefined,
         storageProfile,
         networkProfile: {
-            networkMode: native.containerservice.NetworkMode.Transparent,
-            networkPolicy: native.containerservice.NetworkPolicy.Azure,
-            networkPlugin: native.containerservice.NetworkPlugin.Azure,
+            networkMode: ccs.NetworkMode.Transparent,
+            networkPolicy: ccs.NetworkPolicy.Azure,
+            networkPlugin: ccs.NetworkPlugin.Azure,
             //dnsServiceIP: '10.0.0.10',
             //dockerBridgeCidr: '172.17.0.1/16',
             //serviceCidr: '10.0.0.0/16',
             outboundType: features?.enablePrivateCluster || !network.outboundIpAddress
-                ? native.containerservice.OutboundType.UserDefinedRouting
-                : native.containerservice.OutboundType.LoadBalancer,
+                ? ccs.OutboundType.UserDefinedRouting
+                : ccs.OutboundType.LoadBalancer,
             loadBalancerSku: 'Standard',
             loadBalancerProfile: network.outboundIpAddress
                 ? {
@@ -315,32 +320,29 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
     if (lock) {
         (0, Locker_1.default)({ name: aksName, resource: aks });
     }
-    new native.containerservice.MaintenanceConfiguration(`${aksName}-MaintenanceConfiguration`, {
-        configName: 'default',
-        // notAllowedTime: [
-        //   {
-        //     end: "2020-11-30T12:00:00Z",
-        //     start: "2020-11-26T03:00:00Z",
-        //   },
-        // ],
-        ...group,
-        resourceName: aks.name,
-        timeInWeek: [
-            {
-                day: native.containerservice.WeekDay.Sunday,
-                hourSlots: [0, 23],
-            },
-        ],
-    }, { dependsOn: aks });
+    if (features?.enableMaintenance) {
+        //Default
+        new ccs.MaintenanceConfiguration(`${aksName}-MaintenanceConfiguration`, {
+            configName: 'default',
+            ...group,
+            resourceName: aks.name,
+            timeInWeek: [
+                {
+                    day: ccs.WeekDay.Sunday,
+                    hourSlots: [0, 23],
+                },
+            ],
+        }, { dependsOn: aks, deleteBeforeReplace: true });
+    }
     if (nodePools) {
-        nodePools.map((p) => new native.containerservice.AgentPool(`${name}-${p.name}`, {
+        nodePools.map((p) => new ccs.AgentPool(`${name}-${p.name}`, {
             //agentPoolName:p.name,
             resourceName: aks.name,
             ...group,
             ...defaultNodePoolProps,
             ...p,
             ...autoScaleFor({
-                env: AzureEnv_1.currentEnv,
+                env: Common_1.currentEnv,
                 nodeType: p.mode,
                 enableAutoScaling: features.enableAutoScale,
             }),
@@ -360,7 +362,8 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
         pulumi
             .all([aks.identity, aks.identityProfile, network.subnetId])
             .apply(([identity, identityProfile, sId]) => {
-            if (acrScope && identityProfile && identityProfile['kubeletidentity']) {
+            const acrScope = acr?.id ?? Common_1.defaultSubScope;
+            if (identityProfile && identityProfile['kubeletidentity']) {
                 (0, RoleAssignment_1.roleAssignment)({
                     name: `${name}-aks-identity-profile-pull`,
                     principalId: identityProfile['kubeletidentity'].objectId,
@@ -378,17 +381,30 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                     });
                 }
             }
+            //Link service principal to Vnet Resources group
             if (network.subnetId && identity) {
                 (0, RoleAssignment_1.roleAssignment)({
                     name: `${name}-system-net`,
                     principalId: identity.principalId,
                     roleName: 'Contributor',
                     principalType: 'ServicePrincipal',
-                    scope: (0, AzureEnv_1.getResourceIdFromInfo)({
-                        group: (0, AzureEnv_1.parseResourceInfoFromId)(sId).group,
+                    scope: (0, Common_1.getResourceIdFromInfo)({
+                        group: (0, Common_1.parseResourceInfoFromId)(sId).group,
                     }),
                 });
             }
+            //Link Private Dns to extra Vnet
+            if (features?.enablePrivateCluster && network.extraVnetIds) {
+                const dns = (0, Helper_1.getAksPrivateDnz)({
+                    name: aksName,
+                    group,
+                    id: aks.id,
+                });
+                dns.apply((s) => dnsBuilder
+                    .from(s)
+                    .linkTo({ vnetIds: network.extraVnetIds })
+                    .build());
+            }
         });
         //Update Vault
         const config = await (0, Helper_1.getAksConfig)({
@@ -410,7 +426,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             });
         }
         //Diagnostic
-        if (features.enableDiagnosticSetting && logWpId) {
+        if (logWpId) {
             (0, Helpers_1.createDiagnostic)({
                 name,
                 targetResourceId: id,
@@ -437,16 +453,16 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
         }
     });
     return {
-        name,
+        name: aksName,
         group,
         id: aks.id,
-        aks,
+        instance: aks,
         serviceIdentity,
         getKubeConfig: () => vaultInfo
-            ? (0, pulumi_1.output)((0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
+            ? (0, pulumi_1.output)((0, KeyVaultBase_1.default)(vaultInfo.name)
                 .getSecret(secretName)
                 .then((s) => s.value))
             : undefined,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}

package/Automation/index.d.ts

@@ -1,4 +1,4 @@
-import { BasicResourceArgs, KeyVaultInfo } from "../types";
+import { BasicResourceArgs, KeyVaultInfo } from '../types';
 interface Props extends BasicResourceArgs {
     enableEncryption?: boolean;
     vaultInfo?: KeyVaultInfo;

package/Automation/index.js

@@ -30,14 +30,14 @@ const automation = __importStar(require("@pulumi/azure-native/automation"));
 const Common_1 = require("../Common");
 const Helper_1 = require("../KeyVault/Helper");
 const UserAssignedIdentity_1 = __importDefault(require("../AzAd/UserAssignedIdentity"));
-const AzureEnv_1 = require("../Common/AzureEnv");
+const Common_2 = require("../Common");
 const Helper_2 = require("../AzAd/Helper");
 exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignoreChanges, }) => {
     name = (0, Common_1.getAutomationAccountName)(name);
     const encryption = enableEncryption && vaultInfo
         ? (0, Helper_1.getEncryptionKeyOutput)(name, vaultInfo)
         : undefined;
-    const roles = [{ name: "Contributor", scope: AzureEnv_1.defaultScope }];
+    const roles = [{ name: 'Contributor', scope: Common_2.defaultSubScope }];
     const identity = (0, UserAssignedIdentity_1.default)({
         name,
         group,
@@ -55,7 +55,7 @@ exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignore
         },
         disableLocalAuth: true,
         encryption: {
-            keySource: encryption ? "Microsoft.Keyvault" : "Microsoft.Automation",
+            keySource: encryption ? 'Microsoft.Keyvault' : 'Microsoft.Automation',
             identity: encryption
                 ? { userAssignedIdentity: [identity.id] }
                 : undefined,
@@ -68,7 +68,7 @@ exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignore
                 : undefined,
         },
         sku: {
-            name: "Basic",
+            name: 'Basic',
         },
     }, { dependsOn: identity, ignoreChanges });
     auto.identity.apply((i) => (0, Helper_2.grantIdentityPermissions)({
@@ -78,4 +78,4 @@ exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignore
     }));
     return auto;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXV0b21hdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNEVBQThEO0FBQzlELHNDQUFxRDtBQUNyRCwrQ0FBNEQ7QUFDNUQsd0ZBQWdFO0FBQ2hFLGlEQUFrRDtBQUNsRCwyQ0FBMEQ7QUFPMUQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsZ0JBQWdCLEVBQ2hCLFNBQVMsRUFDVCxTQUFTLEVBQ1QsYUFBYSxHQUNQLEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLGlDQUF3QixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXRDLE1BQU0sVUFBVSxHQUNkLGdCQUFnQixJQUFJLFNBQVM7UUFDM0IsQ0FBQyxDQUFDLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUN6QyxDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWhCLE1BQU0sS0FBSyxHQUFHLENBQUMsRUFBRSxJQUFJLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSx1QkFBWSxFQUFFLENBQUMsQ0FBQztJQUM3RCxNQUFNLFFBQVEsR0FBRyxJQUFBLDhCQUFvQixFQUFDO1FBQ3BDLElBQUk7UUFDSixLQUFLO1FBQ0wsS0FBSztRQUNMLFNBQVM7S0FDVixDQUFDLENBQUM7SUFDSCxtREFBbUQ7SUFFbkQsTUFBTSxJQUFJLEdBQUcsSUFBSSxVQUFVLENBQUMsaUJBQWlCLENBQzNDLElBQUksRUFDSjtRQUNFLHFCQUFxQixFQUFFLElBQUk7UUFDM0IsR0FBRyxLQUFLO1FBRVIsbUJBQW1CLEVBQUUsS0FBSztRQUMxQixRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsVUFBVSxDQUFDLG9CQUFvQixDQUFDLDJCQUEyQjtZQUNqRSxzQkFBc0IsRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7U0FDdEM7UUFDRCxnQkFBZ0IsRUFBRSxJQUFJO1FBRXRCLFVBQVUsRUFBRTtZQUNWLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQyxzQkFBc0I7WUFDckUsUUFBUSxFQUFFLFVBQVU7Z0JBQ2xCLENBQUMsQ0FBQyxFQUFFLG9CQUFvQixFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxFQUFFO2dCQUN6QyxDQUFDLENBQUMsU0FBUztZQUNiLGtCQUFrQixFQUFFLFVBQVU7Z0JBQzVCLENBQUMsQ0FBQztvQkFDRSxPQUFPLEVBQUUsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQztvQkFDM0MsV0FBVyxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUM7b0JBQ25ELFVBQVUsRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsVUFBVyxDQUFDO2lCQUNuRDtnQkFDSCxDQUFDLENBQUMsU0FBUztTQUNkO1FBQ0QsR0FBRyxFQUFFO1lBQ0gsSUFBSSxFQUFFLE9BQU87U0FDZDtLQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLGFBQWEsRUFBRSxDQUN2QyxDQUFDO0lBRUYsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUN4QixJQUFBLGlDQUF3QixFQUFDO1FBQ3ZCLElBQUk7UUFDSixLQUFLO1FBQ0wsV0FBVyxFQUFFLENBQUUsQ0FBQyxXQUFXO0tBQzVCLENBQUMsQ0FDSCxDQUFDO0lBRUYsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXV0b21hdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNEVBQThEO0FBQzlELHNDQUFxRDtBQUNyRCwrQ0FBNEQ7QUFDNUQsd0ZBQWdFO0FBQ2hFLHNDQUE0QztBQUM1QywyQ0FBMEQ7QUFPMUQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsZ0JBQWdCLEVBQ2hCLFNBQVMsRUFDVCxTQUFTLEVBQ1QsYUFBYSxHQUNQLEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLGlDQUF3QixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXRDLE1BQU0sVUFBVSxHQUNkLGdCQUFnQixJQUFJLFNBQVM7UUFDM0IsQ0FBQyxDQUFDLElBQUEsK0JBQXNCLEVBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQztRQUN6QyxDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWhCLE1BQU0sS0FBSyxHQUFHLENBQUMsRUFBRSxJQUFJLEVBQUUsYUFBYSxFQUFFLEtBQUssRUFBRSx3QkFBZSxFQUFFLENBQUMsQ0FBQztJQUNoRSxNQUFNLFFBQVEsR0FBRyxJQUFBLDhCQUFvQixFQUFDO1FBQ3BDLElBQUk7UUFDSixLQUFLO1FBQ0wsS0FBSztRQUNMLFNBQVM7S0FDVixDQUFDLENBQUM7SUFDSCxtREFBbUQ7SUFFbkQsTUFBTSxJQUFJLEdBQUcsSUFBSSxVQUFVLENBQUMsaUJBQWlCLENBQzNDLElBQUksRUFDSjtRQUNFLHFCQUFxQixFQUFFLElBQUk7UUFDM0IsR0FBRyxLQUFLO1FBRVIsbUJBQW1CLEVBQUUsS0FBSztRQUMxQixRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsVUFBVSxDQUFDLG9CQUFvQixDQUFDLDJCQUEyQjtZQUNqRSxzQkFBc0IsRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7U0FDdEM7UUFDRCxnQkFBZ0IsRUFBRSxJQUFJO1FBRXRCLFVBQVUsRUFBRTtZQUNWLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQyxzQkFBc0I7WUFDckUsUUFBUSxFQUFFLFVBQVU7Z0JBQ2xCLENBQUMsQ0FBQyxFQUFFLG9CQUFvQixFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxFQUFFO2dCQUN6QyxDQUFDLENBQUMsU0FBUztZQUNiLGtCQUFrQixFQUFFLFVBQVU7Z0JBQzVCLENBQUMsQ0FBQztvQkFDRSxPQUFPLEVBQUUsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQztvQkFDM0MsV0FBVyxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUM7b0JBQ25ELFVBQVUsRUFBRSxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsVUFBVyxDQUFDO2lCQUNuRDtnQkFDSCxDQUFDLENBQUMsU0FBUztTQUNkO1FBQ0QsR0FBRyxFQUFFO1lBQ0gsSUFBSSxFQUFFLE9BQU87U0FDZDtLQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLGFBQWEsRUFBRSxDQUN2QyxDQUFDO0lBRUYsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUN4QixJQUFBLGlDQUF3QixFQUFDO1FBQ3ZCLElBQUk7UUFDSixLQUFLO1FBQ0wsV0FBVyxFQUFFLENBQUUsQ0FBQyxXQUFXO0tBQzVCLENBQUMsQ0FDSCxDQUFDO0lBRUYsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDLENBQUMifQ==

package/AzAd/EnvRoles.Consts.d.ts

@@ -1,15 +1,20 @@
 import { EnvRoleKeyTypes, EnvRolesResults } from './EnvRoles';
 import { RoleAssignmentProps } from './RoleAssignment';
+export type RoleEnableItem = boolean | {
+    [k in EnvRoleKeyTypes]?: boolean;
+};
 export type RoleEnableTypes = {
-    enableRGRoles?: boolean;
-    enableAksRoles?: boolean;
-    enableStorageRoles?: boolean;
-    enableIotRoles?: boolean;
-    enableVaultRoles?: boolean;
+    enableRGRoles?: RoleEnableItem;
+    enableAksRoles?: RoleEnableItem;
+    enableStorageRoles?: RoleEnableItem;
+    enableIotRoles?: RoleEnableItem;
+    enableVaultRoles?: RoleEnableItem;
     /** Container Registry Roles */
-    enableACRRoles?: boolean;
+    enableACRRoles?: RoleEnableItem;
+    enableAppConfig?: RoleEnableItem;
 };
-export declare const getRoleNames: ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, }: RoleEnableTypes) => Record<EnvRoleKeyTypes, string[]>;
-export declare const grantEnvRolesAccess: ({ name, envRoles, ...others }: RoleEnableTypes & Omit<RoleAssignmentProps, "roleName" | "principalType" | "principalId"> & {
+export type ListRoleType = Record<EnvRoleKeyTypes, Set<string>>;
+export declare const getRoleNames: ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, enableAppConfig, }: RoleEnableTypes) => Record<EnvRoleKeyTypes, string[]>;
+export declare const grantEnvRolesAccess: ({ name, envRoles, scope, dependsOn, ...others }: RoleEnableTypes & Omit<RoleAssignmentProps, "roleName" | "principalType" | "principalId"> & {
     envRoles: EnvRolesResults;
 }) => void;