@drunk-pulumi/azure 0.0.49 → 0.0.51

package/Aks/Helper.d.ts

@@ -1,5 +1,5 @@
-import { KeyVaultInfo, ResourceInfo, ResourceType } from "../types";
-import { Output } from "@pulumi/pulumi";
+import { KeyVaultInfo, ResourceInfo } from '../types';
+import { Output } from '@pulumi/pulumi';
 /** Get AKS Config from Managed Cluster*/
 export declare const getAksConfig: ({ name, groupName, formattedName, disableLocalAccounts, }: {
     name: string;
@@ -14,4 +14,4 @@ export declare const getAksVaultConfig: ({ name, version, vaultInfo, formattedNa
     vaultInfo: KeyVaultInfo;
     formattedName?: boolean;
 }) => Promise<string>;
-export declare const getAksPrivateDnz: ({ name, groupName, formattedName, }: ResourceType) => Output<ResourceInfo | undefined>;
+export declare const getAksPrivateDnz: (aksInfo: ResourceInfo) => Output<ResourceInfo | undefined>;

package/Aks/Helper.js

@@ -24,74 +24,55 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAksPrivateDnz = exports.getAksVaultConfig = exports.getAksConfig = void 0;
-const containerservice = __importStar(require("@pulumi/azure-native/containerservice"));
-const Naming_1 = require("../Common/Naming");
+const cs = __importStar(require("@pulumi/azure-native/containerservice"));
+const Common_1 = require("../Common");
 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, Naming_1.getAksName)(name);
-    const group = formattedName ? groupName : (0, Naming_1.getResourceGroupName)(groupName);
+    const aksName = formattedName ? name : (0, Common_1.getAksName)(name);
+    const group = formattedName ? groupName : (0, Common_1.getResourceGroupName)(groupName);
     const aks = disableLocalAccounts
-        ? await containerservice.listManagedClusterUserCredentials({
+        ? await cs.listManagedClusterUserCredentials({
             resourceName: aksName,
             resourceGroupName: group,
         })
-        : await containerservice.listManagedClusterAdminCredentials({
+        : await cs.listManagedClusterAdminCredentials({
             resourceName: aksName,
             resourceGroupName: group,
         });
-    return Buffer.from(aks.kubeconfigs[0].value, "base64").toString("utf8");
+    return Buffer.from(aks.kubeconfigs[0].value, 'base64').toString('utf8');
 };
 exports.getAksConfig = getAksConfig;
 /** Get AKS Config from Key Vault*/
 const getAksVaultConfig = async ({ name, version, vaultInfo, formattedName, }) => {
-    const aksName = formattedName ? name : (0, Naming_1.getAksName)(name);
+    const aksName = formattedName ? name : (0, Common_1.getAksName)(name);
     const rs = await (0, Helper_1.getSecret)({
         name: `${aksName}-config`,
         version,
         vaultInfo,
         nameFormatted: false,
     });
-    return rs?.value || "";
+    return rs?.value || '';
 };
 exports.getAksVaultConfig = getAksVaultConfig;
-const getAksPrivateDnz = ({ name, groupName, formattedName, }) => {
-    name = formattedName ? name : (0, Naming_1.getAksName)(name);
-    groupName = formattedName ? groupName : (0, Naming_1.getResourceGroupName)(groupName);
-    const aks = containerservice.getManagedClusterOutput({
-        resourceName: name,
-        resourceGroupName: groupName,
+const getAksPrivateDnz = (aksInfo) => {
+    const aks = cs.getManagedClusterOutput({
+        resourceName: aksInfo.name,
+        resourceGroupName: aksInfo.group.resourceGroupName,
     });
     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 {
-            resourceName: dnsName,
+            name: dnsName,
             group: { resourceGroupName: rsGroup, location: AzureEnv_1.currentRegionName },
             id: (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourceGroups/${rsGroup}/providers/Microsoft.Network/privateDnsZones/${dnsName}`,
         };
     });
 };
 exports.getAksPrivateDnz = getAksPrivateDnz;
-// export const linkAksPrivateDnzVnet = ({
-//   vnetId,
-//   name,
-//   groupName,
-//   formattedName,
-// }: ResourceType & { vnetId: Output<string> }) => {
-//   const dns = getAksPrivateDnz({ name, groupName, formattedName });
-//   return dns.apply((d) => {
-//     if (!d) return;
-//     return linkVnetToPrivateDns({
-//       name,
-//       group: d.group,
-//       zoneName: d.resourceName,
-//       vnetId,
-//     });
-//   });
-// };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RkFBMEU7QUFDMUUsNkNBQW9FO0FBRXBFLCtDQUErQztBQUMvQywyQ0FBcUQ7QUFDckQsaURBQXVFO0FBRXZFLHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBTXJCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsaUNBQWlDLENBQUM7WUFDdkQsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDO1FBQ0osQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsa0NBQWtDLENBQUM7WUFDeEQsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDLENBQUM7SUFFUCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzFFLENBQUMsQ0FBQztBQXpCVyxRQUFBLFlBQVksZ0JBeUJ2QjtBQUVGLG1DQUFtQztBQUM1QixNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxFQUN0QyxJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBTWQsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxrQkFBUyxFQUFDO1FBQ3pCLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUztRQUN6QixPQUFPO1FBQ1AsU0FBUztRQUNULGFBQWEsRUFBRSxLQUFLO0tBQ3JCLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBbkJXLFFBQUEsaUJBQWlCLHFCQW1CNUI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQUMsRUFDL0IsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEdBQ0EsRUFBb0MsRUFBRTtJQUNuRCxJQUFJLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMvQyxTQUFTLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUEsNkJBQW9CLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFFeEUsTUFBTSxHQUFHLEdBQUcsZ0JBQWdCLENBQUMsdUJBQXVCLENBQUM7UUFDbkQsWUFBWSxFQUFFLElBQUk7UUFDbEIsaUJBQWlCLEVBQUUsU0FBUztLQUM3QixDQUFDLENBQUM7SUFFSCxPQUFPLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNyQixJQUFJLENBQUMsQ0FBQyxDQUFDLFdBQVc7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUNyQyxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzVELE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQztRQUVyQyxPQUFPO1lBQ0wsWUFBWSxFQUFFLE9BQU87WUFDckIsS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSw0QkFBaUIsRUFBRTtZQUNsRSxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLGtCQUFrQix5QkFBYyxtQkFBbUIsT0FBTyxnREFBZ0QsT0FBTyxFQUFFO1NBQ25ILENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUF4QlcsUUFBQSxnQkFBZ0Isb0JBd0IzQjtBQUVGLDBDQUEwQztBQUMxQyxZQUFZO0FBQ1osVUFBVTtBQUNWLGVBQWU7QUFDZixtQkFBbUI7QUFDbkIscURBQXFEO0FBQ3JELHNFQUFzRTtBQUN0RSw4QkFBOEI7QUFDOUIsc0JBQXNCO0FBQ3RCLG9DQUFvQztBQUNwQyxjQUFjO0FBQ2Qsd0JBQXdCO0FBQ3hCLGtDQUFrQztBQUNsQyxnQkFBZ0I7QUFDaEIsVUFBVTtBQUNWLFFBQVE7QUFDUixLQUFLIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQTZEO0FBRTdELCtDQUErQztBQUMvQywyQ0FBcUQ7QUFDckQsaURBQXVFO0FBRXZFLHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBTXJCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLGlDQUFpQyxDQUFDO1lBQ3pDLFlBQVksRUFBRSxPQUFPO1lBQ3JCLGlCQUFpQixFQUFFLEtBQUs7U0FDekIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxrQ0FBa0MsQ0FBQztZQUMxQyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBekJXLFFBQUEsWUFBWSxnQkF5QnZCO0FBRUYsbUNBQW1DO0FBQzVCLE1BQU0saUJBQWlCLEdBQUcsS0FBSyxFQUFFLEVBQ3RDLElBQUksRUFDSixPQUFPLEVBQ1AsU0FBUyxFQUNULGFBQWEsR0FNZCxFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLGtCQUFTLEVBQUM7UUFDekIsSUFBSSxFQUFFLEdBQUcsT0FBTyxTQUFTO1FBQ3pCLE9BQU87UUFDUCxTQUFTO1FBQ1QsYUFBYSxFQUFFLEtBQUs7S0FDckIsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxFQUFFLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztBQUN6QixDQUFDLENBQUM7QUFuQlcsUUFBQSxpQkFBaUIscUJBbUI1QjtBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsT0FBcUIsRUFDYSxFQUFFO0lBQ3BDLE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQztRQUNyQyxZQUFZLEVBQUUsT0FBTyxDQUFDLElBQUk7UUFDMUIsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQkFBaUI7S0FDbkQsQ0FBQyxDQUFDO0lBRUgsT0FBTyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDckIsSUFBSSxDQUFDLENBQUMsQ0FBQyxXQUFXO1lBQUUsT0FBTyxTQUFTLENBQUM7UUFDckMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM1RCxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsaUJBQWtCLENBQUM7UUFFckMsT0FBTztZQUNMLElBQUksRUFBRSxPQUFPO1lBQ2IsS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSw0QkFBaUIsRUFBRTtZQUNsRSxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLGtCQUFrQix5QkFBYyxtQkFBbUIsT0FBTyxnREFBZ0QsT0FBTyxFQUFFO1NBQ25ILENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFuQlcsUUFBQSxnQkFBZ0Isb0JBbUIzQiJ9

package/Aks/Identity.d.ts

@@ -1,7 +1,7 @@
-import { BasicArgs, KeyVaultInfo } from "../types";
+import { BasicArgs, KeyVaultInfo } from '../types';
 interface Props extends BasicArgs {
     name: string;
-    vaultInfo: KeyVaultInfo;
+    vaultInfo?: KeyVaultInfo;
 }
 declare const _default: ({ name, vaultInfo, dependsOn }: Props) => import("../AzAd/Identity").IdentityResult;
 export default _default;

package/Aks/Identity.js

@@ -10,24 +10,24 @@ const AzureEnv_1 = require("../Common/AzureEnv");
 //** 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" }, 
+    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" });
+    { name: 'Directory.Read.All', type: 'Role' });
     const serverIdentity = (0, Identity_1.default)({
         name,
         createClientSecret: true,
         createPrincipal: true,
         requiredResourceAccesses: [graphAccess],
         publicClient: false,
-        appType: "api",
+        appType: 'api',
         vaultInfo,
         dependsOn,
     });
     (0, RoleAssignment_1.roleAssignment)({
         name: `${name}-aks-identity-acr-pull`,
         principalId: serverIdentity.principalId,
-        principalType: "ServicePrincipal",
-        roleName: "AcrPull",
+        principalType: 'ServicePrincipal',
+        roleName: 'AcrPull',
         scope: AzureEnv_1.defaultScope,
         dependsOn: serverIdentity.resource,
     });

package/Aks/index.d.ts

@@ -38,8 +38,6 @@ export interface NodePoolProps extends Partial<inputs.containerservice.ManagedCl
 }
 export type AskAddonProps = {
     enableAzureKeyVault?: boolean;
-    enableAzurePolicy?: boolean;
-    enableKubeDashboard?: boolean;
     enableVirtualHost?: boolean;
     applicationGateway?: {
         gatewaySubnetId: pulumi.Input<string>;
@@ -49,10 +47,11 @@ export type AskFeatureProps = {
     enablePrivateCluster?: boolean;
     enableAutoScale?: boolean;
     enablePodIdentity?: boolean;
+    enableWorkloadIdentity?: boolean;
     enableDiagnosticSetting?: boolean;
 };
 export type AksAccessProps = {
-    envRoles: EnvRolesResults;
+    envRoles?: EnvRolesResults;
     authorizedIPRanges?: Input<string>[];
     disableLocalAccounts?: boolean;
 };
@@ -71,6 +70,20 @@ export interface AksProps extends BasicResourceArgs {
     addon?: AskAddonProps;
     features?: AskFeatureProps;
     aksAccess: AksAccessProps;
+    storageProfile?: {
+        blobCSIDriver: {
+            enabled: boolean;
+        };
+        diskCSIDriver: {
+            enabled: boolean;
+        };
+        fileCSIDriver: {
+            enabled: boolean;
+        };
+        snapshotController: {
+            enabled: boolean;
+        };
+    };
     acr?: {
         enable: boolean;
         id: Input<string>;
@@ -82,7 +95,7 @@ export interface AksProps extends BasicResourceArgs {
         sshKeys: Array<pulumi.Input<string>>;
     };
     nodePools?: Array<AksNodePoolProps>;
-    vaultInfo: KeyVaultInfo;
+    vaultInfo?: KeyVaultInfo;
     logWpId?: Input<string>;
     /**Lock resource from delete*/
     lock?: boolean;
@@ -91,7 +104,7 @@ export type AksResults = ResourceInfo & {
     serviceIdentity: IdentityResult;
     aks: ManagedCluster;
     disableLocalAccounts?: boolean;
-    getKubeConfig: () => Output<string>;
+    getKubeConfig: () => Output<string> | undefined;
 };
-declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
+declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features, storageProfile, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
 export default _default;

package/Aks/index.js

@@ -104,42 +104,32 @@ 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 }, addon = {
-    enableAzurePolicy: true,
+exports.default = async ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features = { enableDiagnosticSetting: true }, storageProfile, addon = {
     enableAzureKeyVault: false,
-    enableKubeDashboard: false,
 }, tier = native.containerservice.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) {
+    if (aksAccess.disableLocalAccounts === undefined && vaultInfo) {
         aksAccess.disableLocalAccounts = await (0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
             .checkSecretExist(secretName)
             .catch(() => false);
     }
-    if (ignoreChanges.length <= 0) {
-        ignoreChanges.push('privateLinkResources', 'networkProfile', 'linuxProfile', 'windowsProfile');
-    }
+    //Add Default Ignoring properties
+    ignoreChanges.push('privateLinkResources', 'networkProfile', 'nodeResourceGroup', 'linuxProfile', 'windowsProfile');
     const serviceIdentity = (0, Identity_1.default)({
         name: aksName,
         vaultInfo,
         dependsOn,
     });
-    //=================Validate ===================================/
-    // if (!linux?.sshKeys || !linux.sshKeys[0]) {
-    //   console.error("Aks sshKeys is required:", name);
-    //   return undefined;
-    // }
     //Create AKS Cluster
     const aks = new native.containerservice.ManagedCluster(aksName, {
         resourceName: aksName,
         ...group,
         nodeResourceGroup,
         dnsPrefix: aksName,
-        //fqdnSubdomain: '',
-        //kubernetesVersion,
         apiServerAccessProfile: {
             authorizedIPRanges: features?.enablePrivateCluster
                 ? undefined
@@ -147,7 +137,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             disableRunCommand: true,
             enablePrivateCluster: features?.enablePrivateCluster,
             enablePrivateClusterPublicFQDN: true,
-            privateDNSZone: 'system',
+            privateDNSZone: features?.enablePrivateCluster ? 'system' : undefined,
         },
         addonProfiles: {
             azureKeyvaultSecretsProvider: {
@@ -158,8 +148,8 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                     : undefined,
                 enabled: Boolean(addon.enableAzureKeyVault),
             },
-            azurePolicy: { enabled: Boolean(addon.enableAzurePolicy) },
-            kubeDashboard: { enabled: Boolean(addon.enableKubeDashboard) },
+            azurePolicy: { enabled: true },
+            kubeDashboard: { enabled: false },
             httpApplicationRouting: { enabled: false },
             aciConnectorLinux: {
                 enabled: Boolean(network.virtualHostSubnetName),
@@ -198,12 +188,6 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                     env: AzureEnv_1.currentEnv,
                     nodeType: 'System',
                     enableAutoScaling: features?.enableAutoScale,
-                    // powerState: {
-                    //   code: "Running",
-                    // },
-                    // upgradeSettings: {
-                    //   maxSurge: "10%",
-                    // },
                 }),
                 name: 'defaultnodes',
                 mode: 'System',
@@ -255,6 +239,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             clientId: serviceIdentity.clientId,
             secret: serviceIdentity.clientSecret,
         },
+        oidcIssuerProfile: { enabled: Boolean(features?.enableWorkloadIdentity) },
         securityProfile: {
             defender: logWpId && AzureEnv_1.isPrd
                 ? {
@@ -263,7 +248,9 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                 }
                 : undefined,
             imageCleaner: { enabled: true, intervalHours: 24 },
-            workloadIdentity: { enabled: false },
+            workloadIdentity: {
+                enabled: Boolean(features?.enableWorkloadIdentity),
+            },
         },
         podIdentityProfile: features.enablePodIdentity
             ? {
@@ -281,23 +268,15 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
         },
         disableLocalAccounts: Boolean(aksAccess.disableLocalAccounts),
         enableRBAC: true,
-        aadProfile: {
-            enableAzureRBAC: true,
-            managed: true,
-            adminGroupObjectIDs: [aksAccess.envRoles.admin.objectId],
-            tenantID: AzureEnv_1.tenantId,
-        },
-        oidcIssuerProfile: { enabled: false },
-        storageProfile: {
-            blobCSIDriver: {
-                enabled: true,
-            },
-            diskCSIDriver: {
-                enabled: true,
-            },
-            fileCSIDriver: { enabled: true },
-            snapshotController: { enabled: true },
-        },
+        aadProfile: aksAccess.envRoles
+            ? {
+                enableAzureRBAC: true,
+                managed: true,
+                adminGroupObjectIDs: [aksAccess.envRoles.admin.objectId],
+                tenantID: AzureEnv_1.tenantId,
+            }
+            : undefined,
+        storageProfile,
         networkProfile: {
             networkMode: native.containerservice.NetworkMode.Transparent,
             networkPolicy: native.containerservice.NetworkPolicy.Azure,
@@ -389,13 +368,15 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                     roleName: 'AcrPull',
                     scope: acrScope,
                 });
-                (0, CustomHelper_1.addCustomSecret)({
-                    name: `${name}-identity-clientId`,
-                    value: identityProfile['kubeletidentity'].clientId,
-                    dependsOn: aks,
-                    contentType: name,
-                    vaultInfo,
-                });
+                if (vaultInfo) {
+                    (0, CustomHelper_1.addCustomSecret)({
+                        name: `${name}-identity-clientId`,
+                        value: identityProfile['kubeletidentity'].clientId,
+                        dependsOn: aks,
+                        contentType: name,
+                        vaultInfo,
+                    });
+                }
             }
             if (network.subnetId && identity) {
                 (0, RoleAssignment_1.roleAssignment)({
@@ -416,16 +397,18 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
             formattedName: true,
             disableLocalAccounts: aksAccess.disableLocalAccounts,
         });
-        (0, CustomHelper_1.addCustomSecret)({
-            name: secretName,
-            value: config,
-            formattedName: true,
-            dependsOn: aks,
-            contentType: aksAccess.disableLocalAccounts
-                ? `${name}-UserCredentials`
-                : `${name}-AdminCredentials`,
-            vaultInfo,
-        });
+        if (vaultInfo) {
+            (0, CustomHelper_1.addCustomSecret)({
+                name: secretName,
+                value: config,
+                formattedName: true,
+                dependsOn: aks,
+                contentType: aksAccess.disableLocalAccounts
+                    ? `${name}-UserCredentials`
+                    : `${name}-AdminCredentials`,
+                vaultInfo,
+            });
+        }
         //Diagnostic
         if (features.enableDiagnosticSetting && logWpId) {
             (0, Helpers_1.createDiagnostic)({
@@ -442,24 +425,28 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
                 ],
                 dependsOn: aks,
             });
-            //Apply monitoring for VMScale Sets
-            (0, VmSetMonitor_1.default)({
-                group: { resourceGroupName: nodeResourceGroup },
-                logWpId,
-                vaultInfo,
-                dependsOn: aks,
-            });
+            if (vaultInfo) {
+                //Apply monitoring for VMScale Sets
+                (0, VmSetMonitor_1.default)({
+                    group: { resourceGroupName: nodeResourceGroup },
+                    logWpId,
+                    vaultInfo,
+                    dependsOn: aks,
+                });
+            }
         }
     });
     return {
-        resourceName: name,
+        name,
         group,
         id: aks.id,
         aks,
         serviceIdentity,
-        getKubeConfig: () => (0, pulumi_1.output)((0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
-            .getSecret(secretName)
-            .then((s) => s.value)),
+        getKubeConfig: () => vaultInfo
+            ? (0, pulumi_1.output)((0, KeyVaultBase_1.getKeyVaultBase)(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/Apim/Helpers.d.ts

@@ -1,2 +1,2 @@
-import { ResourceInfo } from "../types";
+import { ResourceInfo } from '../types';
 export declare const getApimInfo: (nameAndGroup: string) => ResourceInfo;

package/Apim/Helpers.js

@@ -9,10 +9,10 @@ const getApimInfo = (nameAndGroup) => {
     const rgName = (0, Naming_1.getResourceGroupName)(nameAndGroup);
     const id = (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourceGroups/${rgName}/providers/Microsoft.ApiManagement/service/${name}`;
     return {
-        resourceName: name,
+        name,
         group: { resourceGroupName: rgName, location: AzureEnv_1.currentRegionName },
         id,
     };
 };
 exports.getApimInfo = getApimInfo;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9BcGltL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkNBQXFFO0FBQ3JFLDJDQUE2QztBQUM3QyxpREFBdUU7QUFFaEUsTUFBTSxXQUFXLEdBQUcsQ0FBQyxZQUFvQixFQUFnQixFQUFFO0lBQ2hFLE1BQU0sSUFBSSxHQUFHLElBQUEsb0JBQVcsRUFBQyxZQUFZLENBQUMsQ0FBQztJQUN2QyxNQUFNLE1BQU0sR0FBRyxJQUFBLDZCQUFvQixFQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2xELE1BQU0sRUFBRSxHQUFHLElBQUEsb0JBQVcsRUFBQSxrQkFBa0IseUJBQWMsbUJBQW1CLE1BQU0sOENBQThDLElBQUksRUFBRSxDQUFDO0lBRXBJLE9BQU87UUFDTCxZQUFZLEVBQUUsSUFBSTtRQUNsQixLQUFLLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLDRCQUFpQixFQUFFO1FBQ2pFLEVBQUU7S0FDSCxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBVlcsUUFBQSxXQUFXLGVBVXRCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9BcGltL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkNBQXFFO0FBQ3JFLDJDQUE2QztBQUM3QyxpREFBdUU7QUFFaEUsTUFBTSxXQUFXLEdBQUcsQ0FBQyxZQUFvQixFQUFnQixFQUFFO0lBQ2hFLE1BQU0sSUFBSSxHQUFHLElBQUEsb0JBQVcsRUFBQyxZQUFZLENBQUMsQ0FBQztJQUN2QyxNQUFNLE1BQU0sR0FBRyxJQUFBLDZCQUFvQixFQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2xELE1BQU0sRUFBRSxHQUFHLElBQUEsb0JBQVcsRUFBQSxrQkFBa0IseUJBQWMsbUJBQW1CLE1BQU0sOENBQThDLElBQUksRUFBRSxDQUFDO0lBRXBJLE9BQU87UUFDTCxJQUFJO1FBQ0osS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSw0QkFBaUIsRUFBRTtRQUNqRSxFQUFFO0tBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQztBQVZXLFFBQUEsV0FBVyxlQVV0QiJ9

package/Apps/LogicApp.d.ts

@@ -1,5 +1,5 @@
-import * as logic from "@pulumi/azure-native/logic";
-import { BasicResourceArgs, DefaultResourceArgs } from "../types";
-export type WorkflowProps = BasicResourceArgs & DefaultResourceArgs & Pick<logic.WorkflowArgs, "accessControl">;
+import * as logic from '@pulumi/azure-native/logic';
+import { BasicResourceArgs } from '../types';
+export type WorkflowProps = BasicResourceArgs & Pick<logic.WorkflowArgs, 'accessControl'>;
 declare const _default: ({ name, group, dependsOn, ignoreChanges, importUri, ...others }: WorkflowProps) => import("@pulumi/azure-native/logic/workflow").Workflow;
 export default _default;

package/Apps/LogicApp.js

@@ -24,16 +24,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const logic = __importStar(require("@pulumi/azure-native/logic"));
-const Naming_1 = require("../Common/Naming");
+const Common_1 = require("../Common");
 exports.default = ({ name, group, dependsOn, ignoreChanges, importUri, ...others }) => {
-    const n = (0, Naming_1.getWorkflowName)(name);
-    const workFlow = new logic.Workflow(name, {
+    const n = (0, Common_1.getWorkflowName)(name);
+    return new logic.Workflow(name, {
         workflowName: n,
         ...group,
         ...others,
         identity: { type: logic.ManagedServiceIdentityType.SystemAssigned },
         accessControl: { actions: {} },
     }, { dependsOn, ignoreChanges, import: importUri });
-    return workFlow;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naWNBcHAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXBwcy9Mb2dpY0FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBRXBELDZDQUFtRDtBQU1uRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsYUFBYSxFQUNiLFNBQVMsRUFDVCxHQUFHLE1BQU0sRUFDSyxFQUFFLEVBQUU7SUFDbEIsTUFBTSxDQUFDLEdBQUcsSUFBQSx3QkFBZSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWhDLE1BQU0sUUFBUSxHQUFHLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FDakMsSUFBSSxFQUNKO1FBQ0UsWUFBWSxFQUFFLENBQUM7UUFDZixHQUFHLEtBQUs7UUFDUixHQUFHLE1BQU07UUFDVCxRQUFRLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLDBCQUEwQixDQUFDLGNBQWMsRUFBRTtRQUNuRSxhQUFhLEVBQUUsRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFO0tBQy9CLEVBQ0QsRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsQ0FDaEQsQ0FBQztJQUVGLE9BQU8sUUFBUSxDQUFDO0FBQ2xCLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naWNBcHAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXBwcy9Mb2dpY0FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBRXBELHNDQUE0QztBQUs1QyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsYUFBYSxFQUNiLFNBQVMsRUFDVCxHQUFHLE1BQU0sRUFDSyxFQUFFLEVBQUU7SUFDbEIsTUFBTSxDQUFDLEdBQUcsSUFBQSx3QkFBZSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWhDLE9BQU8sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUN2QixJQUFJLEVBQ0o7UUFDRSxZQUFZLEVBQUUsQ0FBQztRQUNmLEdBQUcsS0FBSztRQUNSLEdBQUcsTUFBTTtRQUNULFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsMEJBQTBCLENBQUMsY0FBYyxFQUFFO1FBQ25FLGFBQWEsRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUU7S0FDL0IsRUFDRCxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxDQUNoRCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/AzAd/Identity.d.ts

@@ -1,8 +1,8 @@
-import * as azureAD from "@pulumi/azuread";
-import * as pulumi from "@pulumi/pulumi";
-import { Output } from "@pulumi/pulumi";
-import { ApplicationApiOauth2PermissionScope, ApplicationAppRole, ApplicationRequiredResourceAccess, ApplicationOptionalClaims } from "@pulumi/azuread/types/input";
-import { BasicArgs, IdentityRoleAssignment, KeyVaultInfo } from "../types";
+import * as azureAD from '@pulumi/azuread';
+import * as pulumi from '@pulumi/pulumi';
+import { Output } from '@pulumi/pulumi';
+import { ApplicationApiOauth2PermissionScope, ApplicationAppRole, ApplicationOptionalClaims, ApplicationRequiredResourceAccess } from '@pulumi/azuread/types/input';
+import { BasicArgs, IdentityRoleAssignment, KeyVaultInfo } from '../types';
 type PreAuthApplicationProps = {
     appId: string;
     oauth2PermissionNames: string[];
@@ -16,7 +16,7 @@ interface IdentityProps extends BasicArgs, IdentityRoleAssignment {
     publicClient?: boolean;
     createPrincipal?: boolean;
     replyUrls?: pulumi.Input<pulumi.Input<string>[]>;
-    appType?: "spa" | "web" | "api";
+    appType?: 'spa' | 'web' | 'api';
     allowMultiOrg?: boolean;
     appRoles?: pulumi.Input<pulumi.Input<ApplicationAppRole>[]>;
     oauth2Permissions?: pulumi.Input<pulumi.Input<ApplicationApiOauth2PermissionScope>[]>;
@@ -24,7 +24,7 @@ interface IdentityProps extends BasicArgs, IdentityRoleAssignment {
     preAuthApplications?: PreAuthApplicationProps[];
     requiredResourceAccesses?: pulumi.Input<pulumi.Input<ApplicationRequiredResourceAccess>[]>;
     optionalClaims?: pulumi.Input<ApplicationOptionalClaims>;
-    vaultInfo: KeyVaultInfo;
+    vaultInfo?: KeyVaultInfo;
 }
 export type IdentityResult = {
     name: string;