@drunk-pulumi/azure 1.0.6 → 1.0.8

package/Aks/Helper.d.ts

@@ -1,13 +1,13 @@
-import { KeyVaultInfo, ResourceInfo, NamedType } from '../types';
+import { KeyVaultInfo, ResourceInfo, WithNamedType } from '../types';
 import { Output } from '@pulumi/pulumi';
 /** Get AKS Config from Managed Cluster*/
-export declare const getAksConfig: ({ name, groupName, formattedName, disableLocalAccounts, }: NamedType & {
+export declare const getAksConfig: ({ name, groupName, formattedName, disableLocalAccounts, }: WithNamedType & {
     groupName: string;
     formattedName?: boolean;
     disableLocalAccounts?: boolean;
 }) => Promise<string>;
 /** Get AKS Config from Key Vault*/
-export declare const getAksVaultConfig: ({ name, version, vaultInfo, formattedName, }: NamedType & {
+export declare const getAksVaultConfig: ({ name, version, vaultInfo, formattedName, }: WithNamedType & {
     version?: string;
     vaultInfo: KeyVaultInfo;
     formattedName?: boolean;

package/Aks/Helper.js

@@ -29,7 +29,6 @@ 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");
 /** Get AKS Config from Managed Cluster*/
 const getAksConfig = async ({ name, groupName, formattedName, disableLocalAccounts, }) => {
     const aksName = formattedName ? name : (0, Common_1.getAksName)(name);
@@ -71,9 +70,9 @@ const getAksPrivateDnz = (aksInfo) => {
         return {
             name: dnsName,
             group: { resourceGroupName: rsGroup, location: GlobalEnv_1.globalKeyName },
-            id: (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourceGroups/${rsGroup}/providers/Microsoft.Network/privateDnsZones/${dnsName}`,
+            id: (0, pulumi_1.interpolate) `${Common_1.defaultSubScope}/resourceGroups/${rsGroup}/providers/Microsoft.Network/privateDnsZones/${dnsName}`,
         };
     });
 };
 exports.getAksPrivateDnz = getAksPrivateDnz;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQTZEO0FBQzdELG1EQUFvRDtBQUVwRCwrQ0FBK0M7QUFDL0MsMkNBQXFEO0FBQ3JELGlEQUFvRDtBQUVwRCx5Q0FBeUM7QUFDbEMsTUFBTSxZQUFZLEdBQUcsS0FBSyxFQUFFLEVBQ2pDLElBQUksRUFDSixTQUFTLEVBQ1QsYUFBYSxFQUNiLG9CQUFvQixHQUtyQixFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsTUFBTSxLQUFLLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUEsNkJBQW9CLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFFMUUsTUFBTSxHQUFHLEdBQUcsb0JBQW9CO1FBQzlCLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxpQ0FBaUMsQ0FBQztZQUN6QyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUM7UUFDSixDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsa0NBQWtDLENBQUM7WUFDMUMsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDLENBQUM7SUFFUCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzFFLENBQUMsQ0FBQztBQXhCVyxRQUFBLFlBQVksZ0JBd0J2QjtBQUVGLG1DQUFtQztBQUM1QixNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxFQUN0QyxJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBS2QsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxrQkFBUyxFQUFDO1FBQ3pCLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUztRQUN6QixPQUFPO1FBQ1AsU0FBUztRQUNULGFBQWEsRUFBRSxLQUFLO0tBQ3JCLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBbEJXLFFBQUEsaUJBQWlCLHFCQWtCNUI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQzlCLE9BQXFCLEVBQ2EsRUFBRTtJQUNwQyxNQUFNLEdBQUcsR0FBRyxFQUFFLENBQUMsdUJBQXVCLENBQUM7UUFDckMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxJQUFJO1FBQzFCLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUJBQWlCO0tBQ25ELENBQUMsQ0FBQztJQUVILE9BQU8sR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ3JCLElBQUksQ0FBQyxDQUFDLENBQUMsV0FBVztZQUFFLE9BQU8sU0FBUyxDQUFDO1FBQ3JDLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDNUQsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLGlCQUFrQixDQUFDO1FBRXJDLE9BQU87WUFDTCxJQUFJLEVBQUUsT0FBTztZQUNiLEtBQUssRUFBRSxFQUFFLGlCQUFpQixFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUseUJBQWEsRUFBRTtZQUM5RCxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLGtCQUFrQix5QkFBYyxtQkFBbUIsT0FBTyxnREFBZ0QsT0FBTyxFQUFFO1NBQ25ILENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFuQlcsUUFBQSxnQkFBZ0Isb0JBbUIzQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQThFO0FBQzlFLG1EQUFvRDtBQUVwRCwrQ0FBK0M7QUFDL0MsMkNBQXFEO0FBR3JELHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBS3JCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLGlDQUFpQyxDQUFDO1lBQ3pDLFlBQVksRUFBRSxPQUFPO1lBQ3JCLGlCQUFpQixFQUFFLEtBQUs7U0FDekIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxrQ0FBa0MsQ0FBQztZQUMxQyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBeEJXLFFBQUEsWUFBWSxnQkF3QnZCO0FBRUYsbUNBQW1DO0FBQzVCLE1BQU0saUJBQWlCLEdBQUcsS0FBSyxFQUFFLEVBQ3RDLElBQUksRUFDSixPQUFPLEVBQ1AsU0FBUyxFQUNULGFBQWEsR0FLZCxFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLGtCQUFTLEVBQUM7UUFDekIsSUFBSSxFQUFFLEdBQUcsT0FBTyxTQUFTO1FBQ3pCLE9BQU87UUFDUCxTQUFTO1FBQ1QsYUFBYSxFQUFFLEtBQUs7S0FDckIsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxFQUFFLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztBQUN6QixDQUFDLENBQUM7QUFsQlcsUUFBQSxpQkFBaUIscUJBa0I1QjtBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsT0FBcUIsRUFDYSxFQUFFO0lBQ3BDLE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQztRQUNyQyxZQUFZLEVBQUUsT0FBTyxDQUFDLElBQUk7UUFDMUIsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQkFBaUI7S0FDbkQsQ0FBQyxDQUFDO0lBRUgsT0FBTyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDckIsSUFBSSxDQUFDLENBQUMsQ0FBQyxXQUFXO1lBQUUsT0FBTyxTQUFTLENBQUM7UUFDckMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM1RCxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsaUJBQWtCLENBQUM7UUFFckMsT0FBTztZQUNMLElBQUksRUFBRSxPQUFPO1lBQ2IsS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSx5QkFBYSxFQUFFO1lBQzlELEVBQUUsRUFBRSxJQUFBLG9CQUFXLEVBQUEsR0FBRyx3QkFBZSxtQkFBbUIsT0FBTyxnREFBZ0QsT0FBTyxFQUFFO1NBQ3JHLENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFuQlcsUUFBQSxnQkFBZ0Isb0JBbUIzQiJ9

package/Aks/Identity.js

@@ -3,34 +3,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 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 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
-    const graphAccess = (0, GraphDefinition_1.getGraphPermissions)({ name: 'User.Read', type: 'Scope' }, { name: 'Group.Read.All', type: 'Scope' }, 
-    //{ name: 'Directory.Read.All', type: 'Scope' },
-    { name: 'Directory.Read.All', type: 'Role' });
+    // const graphAccess = getGraphPermissions(
+    //   { name: 'User.Read', type: 'Scope' },
+    //   { name: 'Group.Read.All', type: 'Scope' },
+    //   //{ name: 'Directory.Read.All', type: 'Scope' },
+    //   { name: 'Directory.Read.All', type: 'Role' },
+    // );
     const serverIdentity = (0, Identity_1.default)({
         name,
-        createClientSecret: true,
+        createClientSecret: false,
         createPrincipal: true,
-        requiredResourceAccesses: [graphAccess],
+        //requiredResourceAccesses: [graphAccess],
         publicClient: false,
         appType: 'api',
         vaultInfo,
         dependsOn,
     });
-    (0, RoleAssignment_1.roleAssignment)({
-        name: `${name}-aks-identity-acr-pull`,
-        principalId: serverIdentity.principalId,
-        principalType: 'ServicePrincipal',
-        roleName: 'AcrPull',
-        scope: Common_1.defaultSubScope,
-        dependsOn: serverIdentity.resource,
-    });
+    // roleAssignment({
+    //   name: `${name}-aks-identity-acr-pull`,
+    //   principalId: serverIdentity.principalId!,
+    //   principalType: 'ServicePrincipal',
+    //   roleName: 'AcrPull',
+    //   scope: defaultSubScope,
+    //   dependsOn: serverIdentity.resource,
+    // });
     return serverIdentity;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQWtzL0lkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNkRBQThEO0FBQzlELGdFQUErQztBQUUvQywyREFBd0Q7QUFDeEQsc0NBQTRDO0FBSTVDLDJEQUEyRDtBQUMzRCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQVMsRUFBRSxFQUFFO0lBQ3ZELDhDQUE4QztJQUM5QyxNQUFNLFdBQVcsR0FBRyxJQUFBLHFDQUFtQixFQUNyQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNwQyxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFO0lBQ3pDLGdEQUFnRDtJQUNoRCxFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQzdDLENBQUM7SUFFRixNQUFNLGNBQWMsR0FBRyxJQUFBLGtCQUFlLEVBQUM7UUFDckMsSUFBSTtRQUNKLGtCQUFrQixFQUFFLElBQUk7UUFDeEIsZUFBZSxFQUFFLElBQUk7UUFDckIsd0JBQXdCLEVBQUUsQ0FBQyxXQUFXLENBQUM7UUFDdkMsWUFBWSxFQUFFLEtBQUs7UUFDbkIsT0FBTyxFQUFFLEtBQUs7UUFDZCxTQUFTO1FBQ1QsU0FBUztLQUNWLENBQUMsQ0FBQztJQUVILElBQUEsK0JBQWMsRUFBQztRQUNiLElBQUksRUFBRSxHQUFHLElBQUksd0JBQXdCO1FBQ3JDLFdBQVcsRUFBRSxjQUFjLENBQUMsV0FBWTtRQUN4QyxhQUFhLEVBQUUsa0JBQWtCO1FBQ2pDLFFBQVEsRUFBRSxTQUFTO1FBQ25CLEtBQUssRUFBRSx3QkFBZTtRQUN0QixTQUFTLEVBQUUsY0FBYyxDQUFDLFFBQVE7S0FDbkMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxjQUFjLENBQUM7QUFDeEIsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQWtzL0lkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQ0EsZ0VBQStDO0FBTy9DLDJEQUEyRDtBQUMzRCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQVMsRUFBRSxFQUFFO0lBQ3ZELDhDQUE4QztJQUM5QywyQ0FBMkM7SUFDM0MsMENBQTBDO0lBQzFDLCtDQUErQztJQUMvQyxxREFBcUQ7SUFDckQsa0RBQWtEO0lBQ2xELEtBQUs7SUFFTCxNQUFNLGNBQWMsR0FBRyxJQUFBLGtCQUFlLEVBQUM7UUFDckMsSUFBSTtRQUNKLGtCQUFrQixFQUFFLEtBQUs7UUFDekIsZUFBZSxFQUFFLElBQUk7UUFDckIsMENBQTBDO1FBQzFDLFlBQVksRUFBRSxLQUFLO1FBQ25CLE9BQU8sRUFBRSxLQUFLO1FBQ2QsU0FBUztRQUNULFNBQVM7S0FDVixDQUFDLENBQUM7SUFFSCxtQkFBbUI7SUFDbkIsMkNBQTJDO0lBQzNDLDhDQUE4QztJQUM5Qyx1Q0FBdUM7SUFDdkMseUJBQXlCO0lBQ3pCLDRCQUE0QjtJQUM1Qix3Q0FBd0M7SUFDeEMsTUFBTTtJQUVOLE9BQU8sY0FBYyxDQUFDO0FBQ3hCLENBQUMsQ0FBQyJ9

package/Aks/index.d.ts

@@ -1,8 +1,7 @@
 import * as ccs from '@pulumi/azure-native/containerservice';
 import * as pulumi from '@pulumi/pulumi';
-import { containerservice } from '@pulumi/azure-native/types/input';
 import { Input, Output } from '@pulumi/pulumi';
-import { BasicEncryptResourceArgs, LockableType, ResourceInfoWithInstance } from '../types';
+import { BasicEncryptResourceArgs, LockableType, LogInfo, ResourceInfoWithInstance, WithDiskEncryption } from '../types';
 import { IdentityResult } from '../AzAd/Identity';
 export declare enum VmSizes {
     /** 32G RAM - 4CPU - $221.92 */
@@ -26,12 +25,14 @@ export declare enum VmSizes {
     /** 32G RAM - 4CPU - $205.13 */
     Standard_A4m_v2 = "Standard_A4m_v2"
 }
-export interface NodePoolProps extends containerservice.ManagedClusterAgentPoolProfileArgs {
+export type NodePoolProps = {
+    name: pulumi.Input<string>;
     mode: ccs.AgentPoolMode;
     vmSize: VmSizes | string;
     osDiskSizeGB: number;
-    maxPods: number;
-}
+    osDiskType?: ccs.OSDiskType | string;
+    maxPods?: number;
+};
 export type AskAddonProps = {
     enableAzureKeyVault?: boolean;
     enableVirtualHost?: boolean;
@@ -60,9 +61,8 @@ export type AksNetworkProps = {
         ipAddressPrefixId?: pulumi.Input<string>;
     };
 };
-export type AksNodePoolProps = Omit<NodePoolProps, 'subnetId' | 'aksId'>;
-export type DefaultAksNodePoolProps = Omit<AksNodePoolProps, 'name' | 'mode'>;
-export interface AksProps extends BasicEncryptResourceArgs, LockableType {
+export type DefaultAksNodePoolProps = Omit<NodePoolProps, 'name' | 'mode'>;
+export interface AksProps extends BasicEncryptResourceArgs, LockableType, WithDiskEncryption {
     tier?: ccs.ManagedClusterSKUTier;
     addon?: AskAddonProps;
     features?: AskFeatureProps;
@@ -81,23 +81,21 @@ export interface AksProps extends BasicEncryptResourceArgs, LockableType {
             enabled: boolean;
         };
     };
-    acr?: {
-        enable: boolean;
-        id: Input<string>;
-    };
     defaultNodePool: DefaultAksNodePoolProps;
     network: AksNetworkProps;
     linux: {
         adminUsername: Input<string>;
         sshKeys: Array<pulumi.Input<string>>;
     };
-    nodePools?: Array<AksNodePoolProps>;
-    logWpId?: Input<string>;
+    nodePools?: Array<NodePoolProps>;
+    logInfo?: Partial<LogInfo> & {
+        defenderEnabled?: boolean;
+    };
 }
 export type AksResults = ResourceInfoWithInstance<ccs.ManagedCluster> & {
     serviceIdentity: IdentityResult;
     disableLocalAccounts?: boolean;
     getKubeConfig: () => Output<string> | undefined;
 };
-declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, enableEncryption, envRoles, features, storageProfile, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
+declare const _default: ({ group, name, aksAccess, envRoles, envUIDInfo, vaultInfo, diskEncryptionSetId, linux, defaultNodePool, nodePools, network, logInfo, features, storageProfile, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
 export default _default;

package/Aks/index.js

@@ -31,14 +31,10 @@ 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 Helper_1 = require("../Core/Helper");
-const VmSetMonitor_1 = __importDefault(require("./VmSetMonitor"));
 const Common_1 = require("../Common");
-const Locker_1 = __importDefault(require("../Core/Locker"));
+const Locker_1 = require("../Core/Locker");
 const Identity_1 = __importDefault(require("./Identity"));
-const Helpers_1 = require("../Logs/Helpers");
-const RoleAssignment_1 = require("../AzAd/RoleAssignment");
-const Helper_2 = require("./Helper");
+const Helper_1 = require("./Helper");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 const KeyVaultBase_1 = __importDefault(require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase"));
 const autoScaleFor = ({ enableAutoScaling, nodeType, env, }) => {
@@ -71,10 +67,10 @@ const defaultNodePoolProps = {
     maxPods: 50,
     enableFIPS: false,
     enableNodePublicIP: false,
-    //enableEncryptionAtHost: false,
+    enableEncryptionAtHost: true,
     enableUltraSSD: Common_1.isPrd,
-    osDiskSizeGB: 128,
-    osDiskType: ccs.OSDiskType.Managed,
+    osDiskSizeGB: 256,
+    osDiskType: ccs.OSDiskType.Ephemeral,
     nodeLabels: {
         environment: Common_1.currentEnv,
         stack: Common_1.stack,
@@ -104,12 +100,14 @@ 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, enableEncryption, envRoles, features = { enableMaintenance: true }, storageProfile, addon = {
+exports.default = async ({ group, name, aksAccess, envRoles, envUIDInfo, vaultInfo, diskEncryptionSetId, linux, defaultNodePool, nodePools, network, logInfo, 
+//acr,
+features = { enableMaintenance: true }, storageProfile, addon = {
     enableAzureKeyVault: false,
 }, tier = ccs.ManagedClusterSKUTier.Free, lock = true, dependsOn = [], importUri, ignoreChanges = [], }) => {
-    const aksName = (0, Common_1.getAksName)(name);
+    const aksName = Common_1.naming.getAksName(name);
     const secretName = `${aksName}-config`;
-    const nodeResourceGroup = (0, Common_1.getResourceGroupName)(`${aksName}-nodes`);
+    const nodeResourceGroup = Common_1.naming.getResourceGroupName(`${aksName}-nodes`);
     //Auto detect and disable Local Account
     if (aksAccess.disableLocalAccounts === undefined && vaultInfo) {
         aksAccess.disableLocalAccounts = await (0, KeyVaultBase_1.default)(vaultInfo.name)
@@ -123,8 +121,6 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
         vaultInfo,
         dependsOn,
     });
-    //TODO: Implement Disk Encryption
-    // const diskEncryptionSet =enableEncryption? compute.
     //Create AKS Cluster
     const aks = new ccs.ManagedCluster(aksName, {
         resourceName: aksName,
@@ -169,10 +165,10 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                     : undefined,
             },
             omsAgent: {
-                enabled: Boolean(logWpId),
-                config: logWpId
+                enabled: Boolean(logInfo?.logWp?.workspaceId),
+                config: logInfo?.logWp?.workspaceId
                     ? {
-                        logAnalyticsWorkspaceResourceID: logWpId,
+                        logAnalyticsWorkspaceResourceID: logInfo.logWp.workspaceId,
                     }
                     : undefined,
             },
@@ -191,7 +187,6 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                     nodeType: 'System',
                     enableAutoScaling: features?.enableAutoScale,
                 }),
-                enableEncryptionAtHost: true,
                 name: 'defaultnodes',
                 mode: 'System',
                 count: 1,
@@ -239,16 +234,16 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
         //azureMonitorProfile: { metrics: { enabled } },
         //Refer here for details https://learn.microsoft.com/en-us/azure/aks/use-managed-identity
         //enablePodSecurityPolicy: true,
-        diskEncryptionSetID: '',
+        diskEncryptionSetID: diskEncryptionSetId,
         servicePrincipalProfile: {
             clientId: serviceIdentity.clientId,
             secret: serviceIdentity.clientSecret,
         },
         oidcIssuerProfile: { enabled: Boolean(features?.enableWorkloadIdentity) },
         securityProfile: {
-            defender: logWpId && Common_1.isPrd
+            defender: logInfo?.logWp && logInfo?.defenderEnabled
                 ? {
-                    logAnalyticsWorkspaceResourceId: logWpId,
+                    logAnalyticsWorkspaceResourceId: logInfo?.logWp.workspaceId,
                     securityMonitoring: { enabled: true },
                 }
                 : undefined,
@@ -316,7 +311,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
     });
     //Lock from delete
     if (lock) {
-        (0, Locker_1.default)({ name: aksName, resource: aks });
+        (0, Locker_1.Locker)({ name: aksName, resource: aks });
     }
     if (features?.enableMaintenance) {
         //Default
@@ -344,7 +339,8 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                 nodeType: p.mode,
                 enableAutoScaling: features.enableAutoScale,
             }),
-            enableEncryptionAtHost: true,
+            //This already added into defaultNodePoolProps
+            //enableEncryptionAtHost: true,
             count: p.mode === 'System' ? 1 : 0,
             vnetSubnetID: network.subnetId,
             kubeletDiskType: 'OS',
@@ -360,7 +356,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
         pulumi
             .all([aks.identity, aks.identityProfile, network.subnetId])
             .apply(([identity, identityProfile, sId]) => {
-            const acrScope = acr?.id ?? Common_1.defaultSubScope;
+            //const acrScope = acr?.id ?? defaultSubScope;
             if (identityProfile && identityProfile['kubeletidentity']) {
                 // roleAssignment({
                 //   name: `${name}-aks-identity-profile-pull`,
@@ -369,24 +365,26 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                 //   roleName: 'AcrPull',
                 //   scope: acrScope,
                 // });
-                //Add into EnvRoles
+                //Add into EnvRoles for Database accessing
                 envRoles?.addMember('contributor', identityProfile['kubeletidentity'].objectId);
             }
             //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, Helper_1.getRGId)((0, Common_1.parseResourceInfoFromId)(sId).group),
-                });
-                //Add into EnvRoles
-                envRoles?.addMember('contributor', identity.principalId);
-            }
+            //This only need for public ask with direct public IP associated
+            // if (network.subnetId && identity) {
+            //   roleAssignment({
+            //     name: `${name}-system-net`,
+            //     principalId: identity.principalId,
+            //     roleName: 'Contributor',
+            //     principalType: 'ServicePrincipal',
+            //     scope: rsInfo.getRGId(rsInfo.getResourceInfoFromId(sId)!.group),
+            //   });
+            //
+            //   //Add into EnvRoles for Database accessing
+            //   //envRoles?.addMember('contributor', identity.principalId);
+            // }
             //Link Private Dns to extra Vnet
             if (features?.enablePrivateCluster && network.extraVnetIds) {
-                const dns = (0, Helper_2.getAksPrivateDnz)({
+                const dns = (0, Helper_1.getAksPrivateDnz)({
                     name: aksName,
                     group,
                     id: aks.id,
@@ -398,7 +396,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             }
         });
         //Update Vault
-        const config = await (0, Helper_2.getAksConfig)({
+        const config = await (0, Helper_1.getAksConfig)({
             name: aksName,
             groupName: group.resourceGroupName,
             formattedName: true,
@@ -417,31 +415,32 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             });
         }
         //Diagnostic
-        if (logWpId) {
-            (0, Helpers_1.createDiagnostic)({
-                name,
-                targetResourceId: id,
-                logWpId,
-                logsCategories: [
-                    'guard',
-                    'kube-controller-manager',
-                    'kube-audit-admin',
-                    'kube-audit',
-                    'kube-scheduler',
-                    'cluster-autoscaler',
-                ],
-                dependsOn: aks,
-            });
-            if (vaultInfo) {
-                //Apply monitoring for VMScale Sets
-                (0, VmSetMonitor_1.default)({
-                    group: { resourceGroupName: nodeResourceGroup },
-                    logWpId,
-                    vaultInfo,
-                    dependsOn: aks,
-                });
-            }
-        }
+        // if (logInfo) {
+        //   createDiagnostic({
+        //     name,
+        //     targetResourceId: id,
+        //     logInfo,
+        //     logsCategories: [
+        //       'guard',
+        //       'kube-controller-manager',
+        //       'kube-audit-admin',
+        //       'kube-audit',
+        //       'kube-scheduler',
+        //       'cluster-autoscaler',
+        //     ],
+        //     dependsOn: aks,
+        //   });
+        //
+        //   // if (vaultInfo) {
+        //   //   //Apply monitoring for VMScale Sets
+        //   //   vmsDiagnostic({
+        //   //     group: { resourceGroupName: nodeResourceGroup },
+        //   //     logWpId,
+        //   //     vaultInfo,
+        //   //     dependsOn: aks,
+        //   //   });
+        //   // }
+        // }
     });
     return {
         name: aksName,
@@ -456,4 +455,4 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             : 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,6 +1,6 @@
-import { BasicResourceWithVaultArgs } from '../types';
-interface Props extends BasicResourceWithVaultArgs {
-    enableEncryption?: boolean;
+import { BasicEncryptResourceArgs, ResourceInfoWithInstance } from '../types';
+import * as automation from '@pulumi/azure-native/automation';
+interface Props extends BasicEncryptResourceArgs {
 }
-declare const _default: ({ name, group, enableEncryption, vaultInfo, dependsOn, ignoreChanges, }: Props) => import("@pulumi/azure-native/automation/automationAccount").AutomationAccount;
+declare const _default: ({ name, group, enableEncryption, envRoles, vaultInfo, dependsOn, ignoreChanges, }: Props) => ResourceInfoWithInstance<automation.AutomationAccount>;
 export default _default;

package/Automation/index.js

@@ -30,18 +30,17 @@ 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"));
-exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignoreChanges, }) => {
+exports.default = ({ name, group, enableEncryption, envRoles, vaultInfo, dependsOn, ignoreChanges, }) => {
     name = (0, Common_1.getAutomationAccountName)(name);
-    const encryption = enableEncryption && vaultInfo
-        ? (0, Helper_1.addEncryptKey)({ name, vaultInfo })
-        : undefined;
     const identity = (0, UserAssignedIdentity_1.default)({
         name,
         group,
-        role: 'contributor',
         dependsOn,
     });
-    //TODO: Add this identity into a vault reader role.
+    envRoles?.addMember('readOnly', identity.principalId);
+    const encryption = enableEncryption && vaultInfo
+        ? (0, Helper_1.addEncryptKey)({ name, vaultInfo })
+        : undefined;
     const auto = new automation.AutomationAccount(name, {
         automationAccountName: name,
         ...group,
@@ -67,7 +66,12 @@ exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignore
         sku: {
             name: 'Basic',
         },
-    }, { dependsOn: identity, ignoreChanges });
-    return auto;
+    }, { dependsOn: identity.instance, ignoreChanges });
+    return {
+        name,
+        group,
+        id: auto.id,
+        instance: auto,
+    };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXV0b21hdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNEVBQThEO0FBQzlELHNDQUFxRDtBQUNyRCwrQ0FBbUQ7QUFDbkQsd0ZBQWdFO0FBTWhFLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLGdCQUFnQixFQUNoQixTQUFTLEVBQ1QsU0FBUyxFQUNULGFBQWEsR0FDUCxFQUFFLEVBQUU7SUFDVixJQUFJLEdBQUcsSUFBQSxpQ0FBd0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV0QyxNQUFNLFVBQVUsR0FDZCxnQkFBZ0IsSUFBSSxTQUFTO1FBQzNCLENBQUMsQ0FBQyxJQUFBLHNCQUFhLEVBQUMsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUM7UUFDcEMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVoQixNQUFNLFFBQVEsR0FBRyxJQUFBLDhCQUFvQixFQUFDO1FBQ3BDLElBQUk7UUFDSixLQUFLO1FBQ0wsSUFBSSxFQUFFLGFBQWE7UUFDbkIsU0FBUztLQUNWLENBQUMsQ0FBQztJQUNILG1EQUFtRDtJQUVuRCxNQUFNLElBQUksR0FBRyxJQUFJLFVBQVUsQ0FBQyxpQkFBaUIsQ0FDM0MsSUFBSSxFQUNKO1FBQ0UscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixHQUFHLEtBQUs7UUFFUixtQkFBbUIsRUFBRSxLQUFLO1FBQzFCLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxVQUFVLENBQUMsb0JBQW9CLENBQUMsMkJBQTJCO1lBQ2pFLHNCQUFzQixFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztTQUN0QztRQUNELGdCQUFnQixFQUFFLElBQUk7UUFFdEIsVUFBVSxFQUFFO1lBQ1YsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLHNCQUFzQjtZQUNyRSxRQUFRLEVBQUUsVUFBVTtnQkFDbEIsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLEVBQUU7Z0JBQ3pDLENBQUMsQ0FBQyxTQUFTO1lBQ2Isa0JBQWtCLEVBQUUsVUFBVTtnQkFDNUIsQ0FBQyxDQUFDO29CQUNFLE9BQU8sRUFBRSxVQUFVLENBQUMsT0FBTztvQkFDM0IsV0FBVyxFQUFFLFVBQVUsQ0FBQyxXQUFXO29CQUNuQyxVQUFVLEVBQUUsVUFBVSxDQUFDLFVBQVU7aUJBQ2xDO2dCQUNILENBQUMsQ0FBQyxTQUFTO1NBQ2Q7UUFDRCxHQUFHLEVBQUU7WUFDSCxJQUFJLEVBQUUsT0FBTztTQUNkO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLENBQ3ZDLENBQUM7SUFFRixPQUFPLElBQUksQ0FBQztBQUNkLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXV0b21hdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBS0EsNEVBQThEO0FBQzlELHNDQUFxRDtBQUNyRCwrQ0FBbUQ7QUFDbkQsd0ZBQWdFO0FBSWhFLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLGdCQUFnQixFQUNoQixRQUFRLEVBQ1IsU0FBUyxFQUNULFNBQVMsRUFDVCxhQUFhLEdBQ1AsRUFBMEQsRUFBRTtJQUNsRSxJQUFJLEdBQUcsSUFBQSxpQ0FBd0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV0QyxNQUFNLFFBQVEsR0FBRyxJQUFBLDhCQUFvQixFQUFDO1FBQ3BDLElBQUk7UUFDSixLQUFLO1FBQ0wsU0FBUztLQUNWLENBQUMsQ0FBQztJQUNILFFBQVEsRUFBRSxTQUFTLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUV0RCxNQUFNLFVBQVUsR0FDZCxnQkFBZ0IsSUFBSSxTQUFTO1FBQzNCLENBQUMsQ0FBQyxJQUFBLHNCQUFhLEVBQUMsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUM7UUFDcEMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVoQixNQUFNLElBQUksR0FBRyxJQUFJLFVBQVUsQ0FBQyxpQkFBaUIsQ0FDM0MsSUFBSSxFQUNKO1FBQ0UscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixHQUFHLEtBQUs7UUFFUixtQkFBbUIsRUFBRSxLQUFLO1FBQzFCLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxVQUFVLENBQUMsb0JBQW9CLENBQUMsMkJBQTJCO1lBQ2pFLHNCQUFzQixFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztTQUN0QztRQUNELGdCQUFnQixFQUFFLElBQUk7UUFFdEIsVUFBVSxFQUFFO1lBQ1YsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLHNCQUFzQjtZQUNyRSxRQUFRLEVBQUUsVUFBVTtnQkFDbEIsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLEVBQUU7Z0JBQ3pDLENBQUMsQ0FBQyxTQUFTO1lBQ2Isa0JBQWtCLEVBQUUsVUFBVTtnQkFDNUIsQ0FBQyxDQUFDO29CQUNFLE9BQU8sRUFBRSxVQUFVLENBQUMsT0FBTztvQkFDM0IsV0FBVyxFQUFFLFVBQVUsQ0FBQyxXQUFXO29CQUNuQyxVQUFVLEVBQUUsVUFBVSxDQUFDLFVBQVU7aUJBQ2xDO2dCQUNILENBQUMsQ0FBQyxTQUFTO1NBQ2Q7UUFDRCxHQUFHLEVBQUU7WUFDSCxJQUFJLEVBQUUsT0FBTztTQUNkO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxRQUFRLENBQUMsUUFBUSxFQUFFLGFBQWEsRUFBRSxDQUNoRCxDQUFDO0lBRUYsT0FBTztRQUNMLElBQUk7UUFDSixLQUFLO1FBQ0wsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1FBQ1gsUUFBUSxFQUFFLElBQUk7S0FDZixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/AzAd/EnvRoles.d.ts

@@ -11,11 +11,6 @@ export type CreateEnvRolesType = EnvRolesInfo & {
 };
 export declare const pushEnvRolesToVault: (envRoles: EnvRolesInfo, vaultInfo: KeyVaultInfo) => void;
 export declare const createEnvRoles: () => CreateEnvRolesType;
-/** Get Single Env Role Object */
-export declare const getEnvRole: (name: string, vaultInfo: KeyVaultInfo) => Promise<{
-    displayName: string;
-    objectId: string;
-}>;
 /** Get All Env Role Objects */
 export declare const getEnvRolesOutput: (vaultInfo: KeyVaultInfo) => EnvRolesInfo;
 export {};

package/AzAd/EnvRoles.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnvRolesOutput = exports.getEnvRole = exports.createEnvRoles = exports.pushEnvRolesToVault = void 0;
+exports.getEnvRolesOutput = exports.createEnvRoles = exports.pushEnvRolesToVault = void 0;
 const EnvRoles_Consts_1 = require("./EnvRoles.Consts");
 const Role_1 = __importDefault(require("./Role"));
 const pulumi_1 = require("@pulumi/pulumi");
@@ -82,14 +82,13 @@ const getEnvRole = async (name, vaultInfo) => {
         objectId: objectId?.value,
     };
 };
-exports.getEnvRole = getEnvRole;
 /** Get All Env Role Objects */
 const getEnvRolesOutput = (vaultInfo) => {
     const rs = {};
     Object.keys(envRoleConfig).forEach((key) => {
-        rs[key] = (0, pulumi_1.output)((0, exports.getEnvRole)(key, vaultInfo));
+        rs[key] = (0, pulumi_1.output)(getEnvRole(key, vaultInfo));
     });
     return rs;
 };
 exports.getEnvRolesOutput = getEnvRolesOutput;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9FbnZSb2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx1REFBd0Q7QUFDeEQsa0RBQXlDO0FBRXpDLDJDQUFnRDtBQUNoRCxzQ0FBMkQ7QUFDM0QsMkRBQTREO0FBQzVELCtDQUErQztBQUkvQyxNQUFNLGFBQWEsR0FBdUM7SUFDeEQsUUFBUSxFQUFFO1FBQ1IsUUFBUSxFQUFFLFVBQVU7UUFDcEIsT0FBTyxFQUFFLE9BQU87S0FDakI7SUFDRCxXQUFXLEVBQUU7UUFDWCxRQUFRLEVBQUUsYUFBYTtRQUN2QixPQUFPLEVBQUUsT0FBTztLQUNqQjtJQUNELEtBQUssRUFBRTtRQUNMLFFBQVEsRUFBRSxPQUFPO1FBQ2pCLE9BQU8sRUFBRSxPQUFPO0tBQ2pCO0NBQ0YsQ0FBQztBQVFGLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDM0MsWUFBWSxFQUFFLElBQUEsc0JBQWEsRUFBQyxZQUFZLElBQUksWUFBWSxDQUFDO0lBQ3pELFdBQVcsRUFBRSxJQUFBLHNCQUFhLEVBQUMsWUFBWSxJQUFJLGVBQWUsQ0FBQztDQUM1RCxDQUFDLENBQUM7QUFNSSxNQUFNLG1CQUFtQixHQUFHLENBQ2pDLFFBQXNCLEVBQ3RCLFNBQXVCLEVBQ3ZCLEVBQUU7SUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1FBQ3pDLE1BQU0sSUFBSSxHQUFHLFFBQVEsQ0FBQyxHQUFzQixDQUFDLENBQUM7UUFDOUMsa0JBQWtCO1FBQ2xCLE1BQU0sV0FBVyxHQUFHLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzNDLElBQUEsK0JBQWdCLEVBQUM7WUFDZixTQUFTO1lBQ1QsV0FBVyxFQUFFLFdBQVc7WUFDeEIsS0FBSyxFQUFFO2dCQUNMLEVB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9FbnZSb2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx1REFBd0Q7QUFDeEQsa0RBQXlDO0FBRXpDLDJDQUFnRDtBQUNoRCxzQ0FBMkQ7QUFDM0QsMkRBQTREO0FBQzVELCtDQUErQztBQUkvQyxNQUFNLGFBQWEsR0FBdUM7SUFDeEQsUUFBUSxFQUFFO1FBQ1IsUUFBUSxFQUFFLFVBQVU7UUFDcEIsT0FBTyxFQUFFLE9BQU87S0FDakI7SUFDRCxXQUFXLEVBQUU7UUFDWCxRQUFRLEVBQUUsYUFBYTtRQUN2QixPQUFPLEVBQUUsT0FBTztLQUNqQjtJQUNELEtBQUssRUFBRTtRQUNMLFFBQVEsRUFBRSxPQUFPO1FBQ2pCLE9BQU8sRUFBRSxPQUFPO0tBQ2pCO0NBQ0YsQ0FBQztBQVFGLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDM0MsWUFBWSxFQUFFLElBQUEsc0JBQWEsRUFBQyxZQUFZLElBQUksWUFBWSxDQUFDO0lBQ3pELFdBQVcsRUFBRSxJQUFBLHNCQUFhLEVBQUMsWUFBWSxJQUFJLGVBQWUsQ0FBQztDQUM1RCxDQUFDLENBQUM7QUFNSSxNQUFNLG1CQUFtQixHQUFHLENBQ2pDLFFBQXNCLEVBQ3RCLFNBQXVCLEVBQ3ZCLEVBQUU7SUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1FBQ3pDLE1BQU0sSUFBSSxHQUFHLFFBQVEsQ0FBQyxHQUFzQixDQUFDLENBQUM7UUFDOUMsa0JBQWtCO1FBQ2xCLE1BQU0sV0FBVyxHQUFHLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzNDLElBQUEsK0JBQWdCLEVBQUM7WUFDZixTQUFTO1lBQ1QsV0FBVyxFQUFFLFdBQVc7WUFDeEIsS0FBSyxFQUFFO2dCQUNMLEVB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

package/AzAd/Group.d.ts

@@ -1,13 +1,13 @@
 import * as azuread from '@pulumi/azuread';
 import { Input, Output } from '@pulumi/pulumi';
-import { NamedType } from '../types';
+import { WithNamedType } from '../types';
 export interface GroupPermissionProps {
     /** The name of the roles would like to assign to this group*/
     roleName: string;
     /**The scopes pf role if not provided the scope will be subscription level*/
     scope?: Input<string>;
 }
-interface AdGroupProps extends NamedType {
+interface AdGroupProps extends WithNamedType {
     members?: Input<string>[];
     owners?: Input<Input<string>[]>;
     permissions?: Array<GroupPermissionProps>;
@@ -15,10 +15,10 @@ interface AdGroupProps extends NamedType {
 declare const _default: ({ name, permissions, members, owners }: AdGroupProps) => Promise<import("@pulumi/azuread/group").Group>;
 export default _default;
 export declare const getAdGroup: (displayName: string) => Output<import("@pulumi/pulumi").UnwrappedObject<azuread.GetGroupResult>>;
-export declare const addMemberToGroup: ({ name, objectId, groupObjectId, }: NamedType & {
+export declare const addMemberToGroup: ({ name, objectId, groupObjectId, }: WithNamedType & {
     objectId: Input<string>;
     groupObjectId: Input<string>;
-}) => Output<import("@pulumi/azuread/groupMember").GroupMember>;
+}) => Output<import("@pulumi/azuread/groupMember").GroupMember | undefined>;
 export declare const addGroupToGroup: (groupMemberName: string, groupObjectId: Output<string>) => Output<import("@pulumi/azuread/groupMember").GroupMember>;
 export declare const assignRolesToGroup: ({ roles, groupName, scope, }: {
     groupName: string;