@drunk-pulumi/azure 0.0.37 → 0.0.39

package/Aks/Helper.d.ts

@@ -1,4 +1,5 @@
-import { KeyVaultInfo } from '../types';
+import { KeyVaultInfo, ResourceInfo, ResourceType } from "../types";
+import { Output } from "@pulumi/pulumi";
 /** Get AKS Config from Managed Cluster*/
 export declare const getAksConfig: ({ name, groupName, formattedName, localAccountDisabled, }: {
     name: string;
@@ -13,13 +14,7 @@ export declare const getAksVaultConfig: ({ name, version, vaultInfo, formattedNa
     vaultInfo: KeyVaultInfo;
     formattedName?: boolean;
 }) => Promise<string>;
-export declare const getAksIdentitySecrets: ({ name, vaultInfo, }: {
-    name: string;
-    vaultInfo: KeyVaultInfo;
-}) => Promise<{
-    clientId: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-    clientSecret: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-    principalId: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-    principalSecret: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-}>;
-/** Get AKS Provider from Key Vault*/
+export declare const getAksPrivateDnz: ({ name, groupName, formattedName, }: ResourceType) => Output<ResourceInfo | undefined>;
+export declare const linkAksPrivateDnzVnet: ({ vnetId, name, groupName, formattedName, }: ResourceType & {
+    vnetId: Output<string>;
+}) => Output<import("@pulumi/azure-native/network/virtualNetworkLink").VirtualNetworkLink | undefined>;

package/Aks/Helper.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAksIdentitySecrets = exports.getAksVaultConfig = exports.getAksConfig = void 0;
+exports.linkAksPrivateDnzVnet = exports.getAksPrivateDnz = exports.getAksVaultConfig = exports.getAksConfig = void 0;
 const containerservice = require("@pulumi/azure-native/containerservice");
 const Naming_1 = require("../Common/Naming");
 const Helper_1 = require("../KeyVault/Helper");
-const Helper_2 = require("../AzAd/Helper");
+const pulumi_1 = require("@pulumi/pulumi");
+const AzureEnv_1 = require("../Common/AzureEnv");
+const PrivateDns_1 = require("../VNet/PrivateDns");
 /** Get AKS Config from Managed Cluster*/
 const getAksConfig = async ({ name, groupName, formattedName, localAccountDisabled, }) => {
     const aksName = formattedName ? name : (0, Naming_1.getAksName)(name);
@@ -18,7 +20,7 @@ const getAksConfig = async ({ name, groupName, formattedName, localAccountDisabl
             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*/
@@ -30,68 +32,41 @@ const getAksVaultConfig = async ({ name, version, vaultInfo, formattedName, }) =
         vaultInfo,
         nameFormatted: false,
     });
-    return rs?.value || '';
+    return rs?.value || "";
 };
 exports.getAksVaultConfig = getAksVaultConfig;
-const getAksIdentitySecrets = ({ name, vaultInfo, }) => {
-    name = (0, Naming_1.getAksName)(name);
-    return (0, Helper_2.getIdentitySecrets)({ name, vaultInfo });
+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,
+    });
+    return aks.apply((a) => {
+        if (!a.privateFQDN)
+            return undefined;
+        const dnsName = a.privateFQDN.split(":").slice(1).join(".");
+        const rsGroup = a.nodeResourceGroup;
+        return {
+            resourceName: 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;
+const linkAksPrivateDnzVnet = ({ vnetId, name, groupName, formattedName, }) => {
+    const dns = (0, exports.getAksPrivateDnz)({ name, groupName, formattedName });
+    return dns.apply((d) => {
+        if (!d)
+            return;
+        return (0, PrivateDns_1.linkVnetToPrivateDns)({
+            name,
+            group: d.group,
+            zoneName: d.resourceName,
+            vnetId,
+        });
+    });
 };
-exports.getAksIdentitySecrets = getAksIdentitySecrets;
-// interface AksProps {
-//   aksName: string;
-//   formatedName?: boolean;
-//   namespace?: string;
-//   groupName: string;
-//   localAccountDisabled?: boolean;
-// }
-// /** Get AKS Provider from Managed Cluster*/
-// export const createAksProvider = async ({
-//   aksName,
-//   namespace,
-//   groupName,
-//   formatedName,
-//   localAccountDisabled,
-// }: AksProps) => {
-//   return createProvider({
-//     name: aksName,
-//     namespace,
-//     kubeconfig: await getAksConfig({
-//       name: aksName,
-//       groupName,
-//       formattedName: formatedName,
-//       localAccountDisabled,
-//     }),
-//   });
-// };
-/** Get AKS Provider from Key Vault*/
-// export const createAksVaultProvider = async ({
-//   aksName,
-//   version,
-//   secretName,
-//   namespace,
-//   base64Encoded,
-//   vaultInfo,
-// }: {
-//   aksName: string;
-//   secretName?: string;
-//   version?: string;
-//   vaultInfo: KeyVaultInfo;
-//   base64Encoded?: boolean;
-//   namespace?: string;
-// }) => {
-//   const value = await getAksVaultConfig({
-//     name: secretName ?? aksName,
-//     version,
-//     formattedName: Boolean(secretName),
-//     vaultInfo,
-//   });
-//
-//   return createProvider({
-//     name: aksName,
-//     namespace,
-//     ignoreChanges: true,
-//     kubeconfig: base64Encoded ? Buffer.from(value, 'base64').toString() : value,
-//   });
-// };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMEVBQTBFO0FBQzFFLDZDQUFvRTtBQUVwRSwrQ0FBK0M7QUFDL0MsMkNBQW9EO0FBRXBELHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBTXJCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsaUNBQWlDLENBQUM7WUFDdkQsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDO1FBQ0osQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsa0NBQWtDLENBQUM7WUFDeEQsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDLENBQUM7SUFFUCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzFFLENBQUMsQ0FBQztBQXpCVyxRQUFBLFlBQVksZ0JBeUJ2QjtBQUVGLG1DQUFtQztBQUM1QixNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxFQUN0QyxJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBTWQsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxrQkFBUyxFQUFDO1FBQ3pCLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUztRQUN6QixPQUFPO1FBQ1AsU0FBUztRQUNULGFBQWEsRUFBRSxLQUFLO0tBQ3JCLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBbkJXLFFBQUEsaUJBQWlCLHFCQW1CNUI7QUFFSyxNQUFNLHFCQUFxQixHQUFHLENBQUMsRUFDcEMsSUFBSSxFQUNKLFNBQVMsR0FJVixFQUFFLEVBQUU7SUFDSCxJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hCLE9BQU8sSUFBQSwyQkFBa0IsRUFBQyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0FBQ2pELENBQUMsQ0FBQztBQVRXLFFBQUEscUJBQXFCLHlCQVNoQztBQUVGLHVCQUF1QjtBQUN2QixxQkFBcUI7QUFDckIsNEJBQTRCO0FBQzVCLHdCQUF3QjtBQUN4Qix1QkFBdUI7QUFDdkIsb0NBQW9DO0FBQ3BDLElBQUk7QUFFSiw4Q0FBOEM7QUFDOUMsNENBQTRDO0FBQzVDLGFBQWE7QUFDYixlQUFlO0FBQ2YsZUFBZTtBQUNmLGtCQUFrQjtBQUNsQiwwQkFBMEI7QUFDMUIsb0JBQW9CO0FBQ3BCLDRCQUE0QjtBQUM1QixxQkFBcUI7QUFDckIsaUJBQWlCO0FBQ2pCLHVDQUF1QztBQUN2Qyx1QkFBdUI7QUFDdkIsbUJBQW1CO0FBQ25CLHFDQUFxQztBQUNyQyw4QkFBOEI7QUFDOUIsVUFBVTtBQUNWLFFBQVE7QUFDUixLQUFLO0FBRUwscUNBQXFDO0FBQ3JDLGlEQUFpRDtBQUNqRCxhQUFhO0FBQ2IsYUFBYTtBQUNiLGdCQUFnQjtBQUNoQixlQUFlO0FBQ2YsbUJBQW1CO0FBQ25CLGVBQWU7QUFDZixPQUFPO0FBQ1AscUJBQXFCO0FBQ3JCLHlCQUF5QjtBQUN6QixzQkFBc0I7QUFDdEIsNkJBQTZCO0FBQzdCLDZCQUE2QjtBQUM3Qix3QkFBd0I7QUFDeEIsVUFBVTtBQUNWLDRDQUE0QztBQUM1QyxtQ0FBbUM7QUFDbkMsZUFBZTtBQUNmLDBDQUEwQztBQUMxQyxpQkFBaUI7QUFDakIsUUFBUTtBQUNSLEVBQUU7QUFDRiw0QkFBNEI7QUFDNUIscUJBQXFCO0FBQ3JCLGlCQUFpQjtBQUNqQiwyQkFBMkI7QUFDM0IsbUZBQW1GO0FBQ25GLFFBQVE7QUFDUixLQUFLIn0=
+exports.linkAksPrivateDnzVnet = linkAksPrivateDnzVnet;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMEVBQTBFO0FBQzFFLDZDQUFvRTtBQUVwRSwrQ0FBK0M7QUFDL0MsMkNBQXFEO0FBQ3JELGlEQUF1RTtBQUN2RSxtREFBMEQ7QUFFMUQseUNBQXlDO0FBQ2xDLE1BQU0sWUFBWSxHQUFHLEtBQUssRUFBRSxFQUNqQyxJQUFJLEVBQ0osU0FBUyxFQUNULGFBQWEsRUFDYixvQkFBb0IsR0FNckIsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hELE1BQU0sS0FBSyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxJQUFBLDZCQUFvQixFQUFDLFNBQVMsQ0FBQyxDQUFDO0lBRTFFLE1BQU0sR0FBRyxHQUFHLG9CQUFvQjtRQUM5QixDQUFDLENBQUMsTUFBTSxnQkFBZ0IsQ0FBQyxpQ0FBaUMsQ0FBQztZQUN2RCxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUM7UUFDSixDQUFDLENBQUMsTUFBTSxnQkFBZ0IsQ0FBQyxrQ0FBa0MsQ0FBQztZQUN4RCxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBekJXLFFBQUEsWUFBWSxnQkF5QnZCO0FBRUYsbUNBQW1DO0FBQzVCLE1BQU0saUJBQWlCLEdBQUcs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

package/Aks/Identity.d.ts

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

package/Aks/Identity.js

@@ -5,28 +5,29 @@ const Identity_1 = require("../AzAd/Identity");
 const RoleAssignment_1 = require("../AzAd/RoleAssignment");
 const AzureEnv_1 = require("../Common/AzureEnv");
 //** The AzAD app Identity for Azure Kubernetes for RBAC */
-exports.default = ({ name, vaultInfo }) => {
+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,
     });
-    serverIdentity.clientId.apply((i) => console.log(i));
     return serverIdentity;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQWtzL0lkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkRBQThEO0FBQzlELCtDQUErQztBQUUvQywyREFBd0Q7QUFDeEQsaURBQWtEO0FBT2xELDJEQUEyRDtBQUMzRCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBUyxFQUFFLEVBQUU7SUFDNUMsOENBQThDO0lBQzlDLE1BQU0sV0FBVyxHQUFHLElBQUEscUNBQW1CLEVBQ3JDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQ3BDLEVBQUUsSUFBSSxFQUFFLGdCQUFnQixFQUFFLElBQUksRUFBRSxPQUFPLEVBQUU7SUFDekMsZ0RBQWdEO0lBQ2hELEVBQUUsSUFBSSxFQUFFLG9CQUFvQixFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FDN0MsQ0FBQztJQUVGLE1BQU0sY0FBYyxHQUFHLElBQUEsa0JBQWUsRUFBQztRQUNyQyxJQUFJO1FBQ0osa0JBQWtCLEVBQUUsSUFBSTtRQUN4QixlQUFlLEVBQUUsSUFBSTtRQUNyQix3QkFBd0IsRUFBRSxDQUFDLFdBQVcsQ0FBQztRQUN2QyxZQUFZLEVBQUUsS0FBSztRQUNuQixPQUFPLEVBQUUsS0FBSztRQUNkLFNBQVM7S0FDVixDQUFDLENBQUM7SUFFSCxJQUFBLCtCQUFjLEVBQUM7UUFDYixJQUFJLEVBQUUsR0FBRyxJQUFJLHdCQUF3QjtRQUNyQyxXQUFXLEVBQUUsY0FBYyxDQUFDLFdBQVk7UUFDeEMsYUFBYSxFQUFFLGtCQUFrQjtRQUNqQyxRQUFRLEVBQUUsU0FBUztRQUNuQixLQUFLLEVBQUUsdUJBQVk7S0FDcEIsQ0FBQyxDQUFDO0lBRUgsY0FBYyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNyRCxPQUFPLGNBQWMsQ0FBQztBQUN4QixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQWtzL0lkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNkRBQThEO0FBQzlELCtDQUErQztBQUUvQywyREFBd0Q7QUFDeEQsaURBQWtEO0FBT2xELDJEQUEyRDtBQUMzRCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQVMsRUFBRSxFQUFFO0lBQ3ZELDhDQUE4QztJQUM5QyxNQUFNLFdBQVcsR0FBRyxJQUFBLHFDQUFtQixFQUNyQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNwQyxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFO0lBQ3pDLGdEQUFnRDtJQUNoRCxFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQzdDLENBQUM7SUFFRixNQUFNLGNBQWMsR0FBRyxJQUFBLGtCQUFlLEVBQUM7UUFDckMsSUFBSTtRQUNKLGtCQUFrQixFQUFFLElBQUk7UUFDeEIsZUFBZSxFQUFFLElBQUk7UUFDckIsd0JBQXdCLEVBQUUsQ0FBQyxXQUFXLENBQUM7UUFDdkMsWUFBWSxFQUFFLEtBQUs7UUFDbkIsT0FBTyxFQUFFLEtBQUs7UUFDZCxTQUFTO1FBQ1QsU0FBUztLQUNWLENBQUMsQ0FBQztJQUVILElBQUEsK0JBQWMsRUFBQztRQUNiLElBQUksRUFBRSxHQUFHLElBQUksd0JBQXdCO1FBQ3JDLFdBQVcsRUFBRSxjQUFjLENBQUMsV0FBWTtRQUN4QyxhQUFhLEVBQUUsa0JBQWtCO1FBQ2pDLFFBQVEsRUFBRSxTQUFTO1FBQ25CLEtBQUssRUFBRSx1QkFBWTtRQUNuQixTQUFTLEVBQUUsY0FBYyxDQUFDLFFBQVE7S0FDbkMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxjQUFjLENBQUM7QUFDeEIsQ0FBQyxDQUFDIn0=

package/Aks/index.d.ts

@@ -1,100 +1,96 @@
-import * as native from '@pulumi/azure-native';
-import * as pulumi from '@pulumi/pulumi';
-import { Input } from '@pulumi/pulumi';
-import { BasicMonitorArgs, BasicResourceArgs, KeyVaultInfo } from '../types';
-import { EnvRoleNamesType } from '../AzAd/EnvRoles';
-import * as inputs from '@pulumi/azure-native/types/input';
+import * as native from "@pulumi/azure-native";
+import * as pulumi from "@pulumi/pulumi";
+import { Input, Output } from "@pulumi/pulumi";
+import { BasicResourceArgs, KeyVaultInfo } from "../types";
+import { EnvRolesResults } from "../AzAd/EnvRoles";
+import * as inputs from "@pulumi/azure-native/types/input";
+import { IdentityResult } from "../AzAd/Identity";
+import { ManagedCluster } from "@pulumi/azure-native/containerservice";
 export declare enum VmSizes {
     /** 32G RAM - 4CPU - $221.92 */
-    Standard_E4as_v4_221 = "Standard_E4as_v4",
+    Standard_E4as_v4 = "Standard_E4as_v4",
     /** 8G RAM - 2CPU - $77.38 */
-    Standard_B2ms_77 = "Standard_B2ms",
+    Standard_B2ms = "Standard_B2ms",
     /** 16G RAM - 4CPU - $154.03 */
-    Standard_B4ms_154 = "Standard_B4ms",
+    Standard_B4ms = "Standard_B4ms",
     /** 8G RAM - 2CPU - 87.60 */
-    Standard_D2as_v4_87 = "Standard_D2as_v4",
+    Standard_D2as_v4 = "Standard_D2as_v4",
     /** 8G RAM - 2CPU - 87.60 */
-    Standard_D2s_v3_87 = "Standard_D2s_v3",
+    Standard_D2s_v3 = "Standard_D2s_v3",
+    /** 8G RAM - 4CPU - 182.5 */
+    Standard_D4s_v3 = "Standard_D4s_v3",
     /** 16G RAM - 4CPU - $175.20 */
-    Standard_D4as_v4_175 = "Standard_D4as_v4",
+    Standard_D4as_v4 = "Standard_D4as_v4",
     /** 4G RAM - 2CPU - $69.35 */
-    Standard_A2_v2_69 = "Standard_A2_v2",
+    Standard_A2_v2 = "Standard_A2_v2",
     /** 8G RAM - 4CPU - $144.54 */
-    Standard_A4_v2_144 = "Standard_A4_v2",
+    Standard_A4_v2 = "Standard_A4_v2",
     /** 32G RAM - 4CPU - $205.13 */
-    Standard_A4m_v2_205 = "Standard_A4m_v2"
+    Standard_A4m_v2 = "Standard_A4m_v2"
 }
-interface NodePoolProps extends Partial<inputs.containerservice.ManagedClusterAgentPoolProfileArgs> {
+export interface NodePoolProps extends Partial<inputs.containerservice.ManagedClusterAgentPoolProfileArgs> {
     name: string;
     mode: native.containerservice.AgentPoolMode;
-    vmSize: VmSizes;
+    vmSize: VmSizes | string;
     osDiskSizeGB: number;
     maxPods: number;
     enableEncryptionAtHost?: boolean;
 }
-interface AksProps extends BasicResourceArgs {
-    nodeResourceGroup?: string;
-    tier?: native.containerservice.ManagedClusterSKUTier;
-    addon?: {
-        enableAzureKeyVault?: boolean;
-        enableAzurePolicy?: boolean;
-        enableKubeDashboard?: boolean;
-        enableVirtualHost?: boolean;
-        applicationGateway?: {
-            gatewaySubnetId: pulumi.Input<string>;
-        };
-    };
-    linux?: {
-        adminUsername: Input<string>;
-        sshKeys: Array<pulumi.Input<string>>;
+export type AskAddonProps = {
+    enableAzureKeyVault?: boolean;
+    enableAzurePolicy?: boolean;
+    enableKubeDashboard?: boolean;
+    enableVirtualHost?: boolean;
+    applicationGateway?: {
+        gatewaySubnetId: pulumi.Input<string>;
     };
-    defaultNodePool: Omit<NodePoolProps, 'subnetId' | 'aksId'>;
-    nodePools?: Array<Omit<NodePoolProps, 'subnetId' | 'aksId'>>;
+};
+export type AskFeatureProps = {
+    enablePrivateCluster?: boolean;
     enableAutoScale?: boolean;
-    featureFlags?: {
-        createServicePrincipal?: boolean;
-        enablePodIdentity?: boolean;
-        enableDiagnosticSetting?: boolean;
+    enablePodIdentity?: boolean;
+    enableDiagnosticSetting?: boolean;
+};
+export type AksAccessProps = {
+    envRoles: EnvRolesResults;
+    authorizedIPRanges?: Input<string>[];
+};
+export type AksNetworkProps = {
+    subnetId: pulumi.Input<string>;
+    virtualHostSubnetName?: pulumi.Input<string>;
+    outboundIpAddress?: {
+        ipAddressId?: pulumi.Input<string>;
+        ipAddressPrefixId?: pulumi.Input<string>;
     };
+};
+export type AksNodePoolProps = Omit<NodePoolProps, "subnetId" | "aksId">;
+export type DefaultAksNodePoolProps = Omit<AksNodePoolProps, "name" | "mode">;
+export interface AksProps extends BasicResourceArgs {
+    tier?: native.containerservice.ManagedClusterSKUTier;
+    addon?: AskAddonProps;
+    features?: AskFeatureProps;
+    aksAccess?: AksAccessProps;
     acr?: {
         enable: boolean;
-        id?: Input<string>;
-    };
-    aksAccess?: {
-        envRoleNames: EnvRoleNamesType;
-        adminMembers?: Array<{
-            objectId: Input<string>;
-        }>;
-        enablePrivateCluster?: boolean;
-        authorizedIPRanges?: Input<string>[];
+        id: Input<string>;
     };
-    network: {
-        subnetId?: pulumi.Input<string>;
-        virtualHostSubnetName?: pulumi.Input<string>;
-        enableFirewall?: boolean;
-        outboundIpAddress?: {
-            ipAddressId: pulumi.Input<string>;
-            ipAddressPrefixId?: pulumi.Input<string>;
-        };
+    defaultNodePool: DefaultAksNodePoolProps;
+    network: AksNetworkProps;
+    linux: {
+        adminUsername: Input<string>;
+        sshKeys: Array<pulumi.Input<string>>;
     };
+    nodePools?: Array<AksNodePoolProps>;
     vaultInfo: KeyVaultInfo;
-    log?: Pick<BasicMonitorArgs, 'logWpId'>;
+    logWpId?: Input<string>;
     /**Lock resource from delete*/
     lock?: boolean;
-    dependsOn?: pulumi.Input<pulumi.Resource>[];
-    importFrom?: string;
 }
-declare const _default: ({ group, nodeResourceGroup, name, linux, defaultNodePool, nodePools, enableAutoScale, network, log, acr, aksAccess, vaultInfo, featureFlags, addon, tier, lock, dependsOn, importFrom, }: AksProps) => Promise<{
-    aks: import("@pulumi/azure-native/containerservice/managedCluster").ManagedCluster;
-    serviceIdentity: (import("../AzAd/Identity").IdentityResult & {
-        vaultNames: {
-            clientIdKeyName: string;
-            clientSecretKeyName: string;
-            principalIdKeyName: string; /** 16G RAM - 4CPU - $154.03 */
-            principalSecretKeyName: string;
-        };
-    }) | undefined;
-    adminGroup: pulumi.Output<pulumi.UnwrappedObject<import("@pulumi/azuread").GetGroupResult>> | undefined;
-    privateZone: import("@pulumi/azure-native/network/privateZone").PrivateZone | undefined;
-} | undefined>;
+export type AksResults = {
+    serviceIdentity: IdentityResult;
+    aks: ManagedCluster;
+    disableLocalAccounts?: boolean;
+    getKubeConfig: () => Output<string>;
+};
+declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
 export default _default;