@drunk-pulumi/azure 1.0.7 → 1.0.9

package/AzAd/Group.js

@@ -65,10 +65,19 @@ const getAdGroup = (displayName) => {
     return (0, pulumi_1.output)(azuread.getGroup({ displayName }));
 };
 exports.getAdGroup = getAdGroup;
-const addMemberToGroup = ({ name, objectId, groupObjectId, }) => (0, pulumi_1.output)([objectId, groupObjectId]).apply(([oId, gId]) => new azuread.GroupMember(`${name}-${gId}-${oId}`, {
-    groupObjectId,
-    memberObjectId: objectId,
-}));
+const addMemberToGroup = ({ name, objectId, groupObjectId, }) => (0, pulumi_1.output)([objectId, groupObjectId]).apply(([oId, gId]) => {
+    if (!oId || !gId) {
+        // throw new Error(
+        //   `Both 'objectId' and 'groupObjectId' are compulsory for the GroupMember to be added.`,
+        // );
+        console.warn(`Either the 'objectId' or 'groupObjectId' empty. So the GroupMember will be ignored.`);
+        return undefined;
+    }
+    return new azuread.GroupMember(`${name}-${gId}-${oId}`, {
+        groupObjectId,
+        memberObjectId: objectId,
+    });
+});
 exports.addMemberToGroup = addMemberToGroup;
 const addGroupToGroup = (groupMemberName, groupObjectId) => {
     const group = (0, exports.getAdGroup)(groupMemberName);
@@ -89,4 +98,4 @@ const assignRolesToGroup = ({ roles, groupName, scope, }) => (0, pulumi_1.output
     })));
 });
 exports.assignRolesToGroup = assignRolesToGroup;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9Hcm91cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHlEQUEyQztBQUMzQywyQ0FBdUQ7QUFDdkQsc0NBQTRDO0FBRTVDLHFEQUFrRDtBQUNsRCxzQ0FBcUM7QUFpQnJDLGtCQUFlLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBZ0IsRUFBRSxFQUFFO0lBQzVFLE1BQU0sS0FBSyxHQUFHLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7UUFDcEMsV0FBVyxFQUFFLElBQUk7UUFDakIsc0JBQXNCLEVBQUUsS0FBSztRQUM3Qiw2QkFBNkI7UUFDN0IsK0JBQStCO1FBQy9CLFdBQVcsRUFBRSxLQUFLO1FBQ2xCLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLE1BQU07S0FDUCxDQUFDLENBQUM7SUFFSCxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FDVCxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNQLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxHQUFHLElBQUksV0FBVyxDQUFDLEVBQUUsRUFBRTtZQUM3QyxhQUFhLEVBQUUsS0FBSyxDQUFDLEVBQUU7WUFDdkIsY0FBYyxFQUFFLENBQUM7U0FDbEIsQ0FBQyxDQUNMLENBQUM7SUFDSixDQUFDO0lBRUQsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ2YsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ3BCLElBQUEsK0JBQWMsRUFBQztZQUNiLElBQUk7WUFDSixXQUFXLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDM0IsYUFBYSxFQUFFLE9BQU87WUFDdEIsUUFBUSxFQUFFLENBQUMsQ0FBQyxRQUFRO1lBQ3BCLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSyxJQUFJLHdCQUFlO1NBQ2xDLENBQUMsQ0FDSCxDQUNGLENBQUM7SUFDSixDQUFDO0lBRUQsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDLENBQUM7QUFFSyxNQUFNLFVBQVUsR0FBRyxDQUFDLFdBQW1CLEVBQUUsRUFBRTtJQUNoRCxJQUFJLGlCQUFRO1FBQ1YsT0FBTyxJQUFBLGVBQU0sRUFBQztZQUNaLFdBQVc7WUFDWCxRQUFRLEVBQUUsc0NBQXNDO1NBQy9CLENBQUMsQ0FBQztJQUN2QixPQUFPLElBQUEsZUFBTSxFQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDbkQsQ0FBQyxDQUFDO0FBUFcsUUFBQSxVQUFVLGNBT3JCO0FBRUssTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEVBQy9CLElBQUksRUFDSixRQUFRLEVBQ1IsYUFBYSxHQUlkLEVBQUUsRUFBRSxDQUNILElBQUEsZUFBTSxFQUFDLENBQUMsUUFBUSxFQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUNyQyxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLEVBQUUsQ0FDYixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxJQUFJLElBQUksR0FBRyxJQUFJLEdBQUcsRUFBRSxFQUFFO0lBQy9DLGFBQWE7SUFDYixjQUFjLEVBQUUsUUFBUTtDQUN6QixDQUFDLENBQ0wsQ0FBQztBQWRTLFFBQUEsZ0JBQWdCLG9CQWN6QjtBQUVHLE1BQU0sZUFBZSxHQUFHLENBQzdCLGVBQXVCLEVBQ3ZCLGFBQTZCLEVBQzdCLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyxJQUFBLGtCQUFVLEVBQUMsZUFBZSxDQUFDLENBQUM7SUFFMUMsT0FBTyxhQUFhLENBQUMsS0FBSyxDQUN4QixDQUFDLENBQUMsRUFBRSxFQUFFLENBQ0osSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLGVBQWUsRUFBRSxFQUFFO1FBQ2pELGFBQWEsRUFBRSxDQUFDO1FBQ2hCLGNBQWMsRUFBRSxLQUFLLENBQUMsUUFBUTtLQUMvQixDQUFDLENBQ0wsQ0FBQztBQUNKLENBQUMsQ0FBQztBQWJXLFFBQUEsZUFBZSxtQkFhMUI7QUFFSyxNQUFNLGtCQUFrQixHQUFHLENBQUMsRUFDakMsS0FBSyxFQUNMLFNBQVMsRUFDVCxLQUFLLEdBS04sRUFBRSxFQUFFLENBQ0gsSUFBQSxlQUFNLEVBQUMsS0FBSyxJQUFJLEVBQUU7SUFDaEIsTUFBTSxLQUFLLEdBQUcsSUFBQSxrQkFBVSxFQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3BDLE9BQU8sTUFBTSxPQUFPLENBQUMsR0FBRyxDQUN0QixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDZCxJQUFBLCtCQUFjLEVBQUM7UUFDYixJQUFJLEVBQUUsU0FBUztRQUNmLFdBQVcsRUFBRSxLQUFLLENBQUMsUUFBUTtRQUMzQixhQUFhLEVBQUUsT0FBTztRQUN0QixRQUFRLEVBQUUsQ0FBQztRQUNYLEtBQUssRUFBRSxLQUFLLElBQUksd0JBQWU7S0FDaEMsQ0FBQyxDQUNILENBQ0YsQ0FBQztBQUNKLENBQUMsQ0FBQyxDQUFDO0FBdEJRLFFBQUEsa0JBQWtCLHNCQXNCMUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9Hcm91cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHlEQUEyQztBQUMzQywyQ0FBdUQ7QUFDdkQsc0NBQTRDO0FBRTVDLHFEQUFrRDtBQUNsRCxzQ0FBcUM7QUFpQnJDLGtCQUFlLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBZ0IsRUFBRSxFQUFFO0lBQzVFLE1BQU0sS0FBSyxHQUFHLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7UUFDcEMsV0FBVyxFQUFFLElBQUk7UUFDakIsc0JBQXNCLEVBQUUsS0FBSztRQUM3Qiw2QkFBNkI7UUFDN0IsK0JBQStCO1FBQy9CLFdBQVcsRUFBRSxLQUFLO1FBQ2xCLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLE1BQU07S0FDUCxDQUFDLENBQUM7SUFFSCxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FDVCxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNQLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxHQUFHLElBQUksV0FBVyxDQUFDLEVBQUUsRUFBRTtZQUM3QyxhQUFhLEVBQUUsS0FBSyxDQUFDLEVBQUU7WUFDdkIsY0FBYyxFQUFFLENBQUM7U0FDbEIsQ0FBQyxDQUNMLENBQUM7SUFDSixDQUFDO0lBRUQsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ2YsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ3BCLElBQUEsK0JBQWMsRUFBQztZQUNiLElBQUk7WUFDSixXQUFXLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDM0IsYUFBYSxFQUFFLE9BQU87WUFDdEIsUUFBUSxFQUFFLENBQUMsQ0FBQyxR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

package/AzAd/Helper.d.ts

@@ -1,6 +1,5 @@
-import { IdentityInfo, IdentityRoleAssignment, KeyVaultInfo, NamedType } from '../types';
-import { Input } from '@pulumi/pulumi';
-interface Props extends NamedType {
+import { IdentityInfo, KeyVaultInfo, WithNamedType } from '../types';
+interface Props extends WithNamedType {
     includePrincipal?: boolean;
     vaultInfo: KeyVaultInfo;
 }
@@ -21,9 +20,5 @@ export declare const getIdentitySecretNames: (name: string) => {
 };
 export declare const getIdentityInfo: ({ name, vaultInfo, includePrincipal, }: Props) => Promise<IdentityInfoResults>;
 export declare const getIdentityInfoOutput: (props: Props) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<IdentityInfoResults>>;
-export declare const grantIdentityPermissions: ({ name, principalId, vaultInfo, role, }: IdentityRoleAssignment & NamedType & {
-    principalId: Input<string>;
-}) => void;
-export declare const getUserAssignedIdentityInfo: (name: string, vaultInfo: KeyVaultInfo) => Promise<IdentityInfo>;
-export declare const getUserAssignedIdentityInfoOutput: (name: string, vaultInfo: KeyVaultInfo) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<IdentityInfo>>;
+export declare const getUserAssignedIdentityInfo: (name: string, vaultInfo: KeyVaultInfo) => IdentityInfo;
 export {};

package/AzAd/Helper.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserAssignedIdentityInfoOutput = exports.getUserAssignedIdentityInfo = exports.grantIdentityPermissions = exports.getIdentityInfoOutput = exports.getIdentityInfo = exports.getIdentitySecretNames = void 0;
+exports.getUserAssignedIdentityInfo = exports.getIdentityInfoOutput = exports.getIdentityInfo = exports.getIdentitySecretNames = void 0;
 const Common_1 = require("../Common");
 const Helper_1 = require("../KeyVault/Helper");
 const pulumi_1 = require("@pulumi/pulumi");
-const EnvRoles_1 = require("./EnvRoles");
-const RoleAssignment_1 = require("./RoleAssignment");
-const Group_1 = require("./Group");
 const getIdentitySecretNames = (name) => ({
     objectIdName: (0, Common_1.getSecretName)(`${name}-object-id`),
     clientIdKeyName: (0, Common_1.getSecretName)(`${name}-client-id`),
@@ -40,60 +37,79 @@ const getIdentityInfo = async ({ name, vaultInfo, includePrincipal, }) => {
 exports.getIdentityInfo = getIdentityInfo;
 const getIdentityInfoOutput = (props) => (0, pulumi_1.output)((0, exports.getIdentityInfo)(props));
 exports.getIdentityInfoOutput = getIdentityInfoOutput;
-const grantIdentityToResourceRoles = ({ name, roles, principalId, }) => roles.map((r) => (0, RoleAssignment_1.roleAssignment)({
-    name,
-    roleName: r.name,
-    principalId: principalId,
-    principalType: 'ServicePrincipal',
-    scope: r.scope,
-}));
-const grantIdentityEnvRolesGroup = ({ name, roleType, vaultInfo, principalId, }) => {
-    const role = (0, pulumi_1.output)((0, EnvRoles_1.getEnvRole)(roleType, vaultInfo));
-    return role.apply((r) => {
-        if (!role.objectId)
-            return;
-        return (0, Group_1.addMemberToGroup)({
-            name,
-            objectId: principalId,
-            groupObjectId: r.objectId,
-        });
-    });
-};
-const grantIdentityPermissions = ({ name, principalId, vaultInfo, role, }) => {
-    // if (roles) {
-    //   grantIdentityToResourceRoles({ name, roles, principalId });
-    // }
-    if (role && vaultInfo) {
-        grantIdentityEnvRolesGroup({
-            name,
-            roleType: role,
-            principalId,
-            vaultInfo,
-        });
-    }
-};
-exports.grantIdentityPermissions = grantIdentityPermissions;
-const getUserAssignedIdentityInfo = async (name, vaultInfo) => {
-    name = (0, Common_1.getManagedIdentityName)(name);
-    const id = await (0, Helper_1.getSecret)({
+// const grantIdentityToResourceRoles = ({
+//   name,
+//   roles,
+//   principalId,
+// }: WithNamedType & {
+//   roles: Array<{ name: string; scope: Input<string> }>;
+//   principalId: Input<string>;
+// }) =>
+//   roles.map((r) =>
+//     roleAssignment({
+//       name,
+//       roleName: r.name,
+//       principalId: principalId,
+//       principalType: 'ServicePrincipal',
+//       scope: r.scope,
+//     }),
+//   );
+// const grantIdentityEnvRolesGroup = ({
+//   name,
+//   roleType,
+//   vaultInfo,
+//   principalId,
+// }: Required<NamedWithVaultType> & {
+//   roleType: EnvRoleKeyTypes;
+//   principalId: Input<string>;
+// }) => {
+//   const role = output(getEnvRole(roleType, vaultInfo));
+//   return role.apply((r) => {
+//     if (!role.objectId) return;
+//     return addMemberToGroup({
+//       name,
+//       objectId: principalId,
+//       groupObjectId: r.objectId,
+//     });
+//   });
+// };
+// export const grantIdentityPermissions = ({
+//   name,
+//   principalId,
+//   vaultInfo,
+//   role,
+// }: IdentityRoleAssignment &
+//   WithNamedType & {
+//     principalId: Input<string>;
+//   }) => {
+//   // if (roles) {
+//   //   grantIdentityToResourceRoles({ name, roles, principalId });
+//   // }
+//   if (role && vaultInfo) {
+//     grantIdentityEnvRolesGroup({
+//       name,
+//       roleType: role,
+//       principalId,
+//       vaultInfo,
+//     });
+//   }
+// };
+const getUserAssignedIdentityInfo = (name, vaultInfo) => {
+    name = (0, Common_1.getUIDName)(name);
+    const id = (0, pulumi_1.output)((0, Helper_1.getSecret)({
         name: `${name}-id`,
         vaultInfo,
         nameFormatted: true,
-    });
-    const principalId = await (0, Helper_1.getSecret)({
+    }));
+    const principalId = (0, pulumi_1.output)((0, Helper_1.getSecret)({
         name: `${name}-principalId`,
         vaultInfo,
         nameFormatted: true,
-    });
-    const info = (0, Common_1.parseResourceInfoFromId)(id.value);
+    }));
     return {
-        name: info.name,
-        group: info.group,
-        id: info.id,
-        principalId: principalId.value,
+        id: id?.apply((i) => i?.value),
+        principalId: principalId?.apply((i) => i?.value),
     };
 };
 exports.getUserAssignedIdentityInfo = getUserAssignedIdentityInfo;
-const getUserAssignedIdentityInfoOutput = (name, vaultInfo) => (0, pulumi_1.output)((0, exports.getUserAssignedIdentityInfo)(name, vaultInfo));
-exports.getUserAssignedIdentityInfoOutput = getUserAssignedIdentityInfoOutput;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUttQjtBQUNuQiwrQ0FBK0M7QUFRL0MsMkNBQStDO0FBQy9DLHlDQUF5RDtBQUN6RCxxREFBa0Q7QUFDbEQsbUNBQTJDO0FBZ0JwQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZELFlBQVksRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUNoRCxlQUFlLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxZQUFZLENBQUM7SUFDbkQsbUJBQW1CLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQztJQUMzRCxrQkFBa0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLGVBQWUsQ0FBQztJQUN6RCxzQkFBc0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLG1CQUFtQixDQUFDO0NBQ2xFLENBQUMsQ0FBQztBQU5VLFFBQUEsc0JBQXNCLDBCQU1oQztBQUVJLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxFQUNwQyxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixHQUNWLEVBQWdDLEVBQUU7SUFDeEMsSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUM3QixNQUFNLFdBQVcsR0FBRyxJQUFBLDhCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpELE1BQU0sQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLFlBQVksQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUMzRCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLFlBQVksRUFBRSxTQUFTLEVBQUUsQ0FBQztRQUN4RCxJQUFBLGtCQUFTLEVB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUF1RTtBQUN2RSwrQ0FBK0M7QUFFL0MsMkNBQXdDO0FBZ0JqQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZELFlBQVksRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUNoRCxlQUFlLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxZQUFZLENBQUM7SUFDbkQsbUJBQW1CLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQztJQUMzRCxrQkFBa0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLGVBQWUsQ0FBQztJQUN6RCxzQkFBc0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLG1CQUFtQixDQUFDO0NBQ2xFLENBQUMsQ0FBQztBQU5VLFFBQUEsc0JBQXNCLDBCQU1oQztBQUVJLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxFQUNwQyxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixHQUNWLEVBQWdDLEVBQUU7SUFDeEMsSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUM3QixNQUFNLFdBQVcsR0FBRyxJQUFBLDhCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpELE1BQU0sQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLFlBQVksQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUMzRCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLFlBQVksRUFBRSxTQUFTLEVBQUUsQ0FBQztRQUN4RCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLGVBQWUsRUFBRSxT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

package/AzAd/Identities/AzDevOpsManagedIdentity.d.ts

@@ -1,6 +1,6 @@
-import { BasicResourceArgs } from '../../types';
-interface Props extends Omit<BasicResourceArgs, 'name'> {
+import { BasicResourceArgs, WithEnvRoles, WithVaultInfo } from '../../types';
+interface Props extends Omit<BasicResourceArgs, 'name'>, WithVaultInfo, WithEnvRoles {
     name?: string;
 }
-declare const _default: ({ name, ...others }: Props) => import("@pulumi/azure-native/managedidentity/userAssignedIdentity").UserAssignedIdentity;
+declare const _default: ({ name, envRoles, ...others }: Props) => void;
 export default _default;

package/AzAd/Identities/AzDevOpsManagedIdentity.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const UserAssignedIdentity_1 = __importDefault(require("../UserAssignedIdentity"));
 const AzDevOpsIdentity_1 = require("./AzDevOpsIdentity");
-exports.default = ({ name = AzDevOpsIdentity_1.defaultAzAdoName, ...others }) => {
-    return (0, UserAssignedIdentity_1.default)({
+exports.default = ({ name = AzDevOpsIdentity_1.defaultAzAdoName, envRoles, ...others }) => {
+    const identity = (0, UserAssignedIdentity_1.default)({
         name,
-        role: 'admin',
         ...others,
     });
+    envRoles?.addMember('admin', identity.principalId);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXpEZXZPcHNNYW5hZ2VkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQXpBZC9JZGVudGl0aWVzL0F6RGV2T3BzTWFuYWdlZElkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQ0EsbUZBQTJEO0FBQzNELHlEQUFzRDtBQU10RCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxHQUFHLG1DQUFnQixFQUFFLEdBQUcsTUFBTSxFQUFTLEVBQUUsRUFBRTtJQUMvRCxPQUFPLElBQUEsOEJBQW9CLEVBQUM7UUFDMUIsSUFBSTtRQUNKLElBQUksRUFBRSxPQUFPO1FBQ2IsR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXpEZXZPcHNNYW5hZ2VkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQXpBZC9JZGVudGl0aWVzL0F6RGV2T3BzTWFuYWdlZElkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBTUEsbUZBQTJEO0FBQzNELHlEQUFzRDtBQVN0RCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxHQUFHLG1DQUFnQixFQUFFLFFBQVEsRUFBRSxHQUFHLE1BQU0sRUFBUyxFQUFFLEVBQUU7SUFDekUsTUFBTSxRQUFRLEdBQUcsSUFBQSw4QkFBb0IsRUFBQztRQUNwQyxJQUFJO1FBQ0osR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0lBQ0gsUUFBUSxFQUFFLFNBQVMsQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQ3JELENBQUMsQ0FBQyJ9

package/AzAd/Identities/AzUserAdRevertSync.d.ts

@@ -1,5 +1,5 @@
-import { KeyVaultInfo, NamedType } from '../../types';
-interface Props extends NamedType {
+import { KeyVaultInfo, WithNamedType } from '../../types';
+interface Props extends WithNamedType {
     vaultInfo: KeyVaultInfo;
 }
 declare const _default: ({ name, ...others }: Props) => import("../Identity").IdentityResult;

package/AzAd/Identities/EnvUID.d.ts

@@ -0,0 +1,4 @@
+import { KeyVaultInfo, WithEnvRoles, WithVaultInfo } from '../../types';
+import { UserAssignedIdentityProps } from '../UserAssignedIdentity';
+export declare const create: ({ envRoles, ...others }: Omit<UserAssignedIdentityProps, "name" | "role"> & WithEnvRoles & WithVaultInfo) => import("../../types").IdentityInfoWithInstance<import("@pulumi/azure-native/managedidentity/userAssignedIdentity").UserAssignedIdentity>;
+export declare const get: (vaultInfo: KeyVaultInfo) => import("../../types").IdentityInfo;

package/AzAd/Identities/EnvUID.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get = exports.create = void 0;
+const Helper_1 = require("../Helper");
+const UserAssignedIdentity_1 = __importDefault(require("../UserAssignedIdentity"));
+const Common_1 = require("../../Common");
+const create = ({ envRoles, ...others }) => {
+    const identity = (0, UserAssignedIdentity_1.default)({
+        ...others,
+        name: Common_1.currentEnv,
+    });
+    envRoles?.addMember('admin', identity.principalId);
+    return identity;
+};
+exports.create = create;
+const get = (vaultInfo) => (0, Helper_1.getUserAssignedIdentityInfo)(Common_1.currentEnv, vaultInfo);
+exports.get = get;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52VUlELmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL0F6QWQvSWRlbnRpdGllcy9FbnZVSUQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0Esc0NBQXdEO0FBQ3hELG1GQUVpQztBQUNqQyx5Q0FBMEM7QUFFbkMsTUFBTSxNQUFNLEdBQUcsQ0FBQyxFQUNyQixRQUFRLEVBQ1IsR0FBRyxNQUFNLEVBR0ksRUFBRSxFQUFFO0lBQ2pCLE1BQU0sUUFBUSxHQUFHLElBQUEsOEJBQW9CLEVBQUM7UUFDcEMsR0FBRyxNQUFNO1FBQ1QsSUFBSSxFQUFFLG1CQUFVO0tBQ2pCLENBQUMsQ0FBQztJQUNILFFBQVEsRUFBRSxTQUFTLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUVuRCxPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDLENBQUM7QUFiVyxRQUFBLE1BQU0sVUFhakI7QUFFSyxNQUFNLEdBQUcsR0FBRyxDQUFDLFNBQXVCLEVBQUUsRUFBRSxDQUM3QyxJQUFBLG9DQUEyQixFQUFDLG1CQUFVLEVBQUUsU0FBUyxDQUFDLENBQUM7QUFEeEMsUUFBQSxHQUFHLE9BQ3FDIn0=

package/AzAd/Identities/index.d.ts

@@ -1,4 +1,4 @@
 export { default as AzDevOpsIdentity } from './AzDevOpsIdentity';
 export { default as AzDevOpsManagedIdentity } from './AzDevOpsManagedIdentity';
 export { default as AzUserAdRevertSync } from './AzUserAdRevertSync';
-export * as GlobalUserAssignedIdentity from './GlobalUserAssignedIdentity';
+export * as EnvUID from './EnvUID';

package/AzAd/Identities/index.js

@@ -26,12 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GlobalUserAssignedIdentity = exports.AzUserAdRevertSync = exports.AzDevOpsManagedIdentity = exports.AzDevOpsIdentity = void 0;
+exports.EnvUID = exports.AzUserAdRevertSync = exports.AzDevOpsManagedIdentity = exports.AzDevOpsIdentity = void 0;
 var AzDevOpsIdentity_1 = require("./AzDevOpsIdentity");
 Object.defineProperty(exports, "AzDevOpsIdentity", { enumerable: true, get: function () { return __importDefault(AzDevOpsIdentity_1).default; } });
 var AzDevOpsManagedIdentity_1 = require("./AzDevOpsManagedIdentity");
 Object.defineProperty(exports, "AzDevOpsManagedIdentity", { enumerable: true, get: function () { return __importDefault(AzDevOpsManagedIdentity_1).default; } });
 var AzUserAdRevertSync_1 = require("./AzUserAdRevertSync");
 Object.defineProperty(exports, "AzUserAdRevertSync", { enumerable: true, get: function () { return __importDefault(AzUserAdRevertSync_1).default; } });
-exports.GlobalUserAssignedIdentity = __importStar(require("./GlobalUserAssignedIdentity"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQXpBZC9JZGVudGl0aWVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQWlFO0FBQXhELHFJQUFBLE9BQU8sT0FBb0I7QUFDcEMscUVBQStFO0FBQXRFLG1KQUFBLE9BQU8sT0FBMkI7QUFDM0MsMkRBQXFFO0FBQTVELHlJQUFBLE9BQU8sT0FBc0I7QUFDdEMsMkZBQTJFIn0=
+exports.EnvUID = __importStar(require("./EnvUID"));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQXpBZC9JZGVudGl0aWVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQWlFO0FBQXhELHFJQUFBLE9BQU8sT0FBb0I7QUFDcEMscUVBQStFO0FBQXRFLG1KQUFBLE9BQU8sT0FBMkI7QUFDM0MsMkRBQXFFO0FBQTVELHlJQUFBLE9BQU8sT0FBc0I7QUFDdEMsbURBQW1DIn0=

package/AzAd/Identity.d.ts

@@ -2,7 +2,7 @@ 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 { NamedType, NamedWithVaultBasicArgs } from '../types';
+import { WithNamedType, NamedWithVaultBasicArgs } from '../types';
 type PreAuthApplicationProps = {
     appId: string;
     oauth2PermissionNames: string[];
@@ -24,7 +24,7 @@ interface IdentityProps extends NamedWithVaultBasicArgs {
     requiredResourceAccesses?: pulumi.Input<pulumi.Input<ApplicationRequiredResourceAccess>[]>;
     optionalClaims?: pulumi.Input<ApplicationOptionalClaims>;
 }
-export type IdentityResult = NamedType & {
+export type IdentityResult = WithNamedType & {
     objectId: Output<string>;
     clientId: Output<string>;
     clientSecret: Output<string> | undefined;

package/AzAd/Identity.js

@@ -95,6 +95,7 @@ exports.default = ({ name, owners, createClientSecret = false, createPrincipal =
                 value: clientSecret,
                 vaultInfo,
                 contentType: 'Identity',
+                dependsOn: app,
             });
         }
     }
@@ -112,17 +113,11 @@ exports.default = ({ name, owners, createClientSecret = false, createPrincipal =
             endDateRelative: '43800h',
             //value: randomPassword({ name: `${name}-principalSecret` }).result,
         }).value;
-        // grantIdentityPermissions({
-        //   name,
-        //   envRole,
-        //   roles,
-        //   vaultInfo,
-        //   principalId: principal.objectId,
-        // });
         if (vaultInfo) {
             (0, CustomHelper_1.addCustomSecrets)({
                 vaultInfo,
                 contentType: 'Identity',
+                dependsOn: principal,
                 items: [
                     { name: secretNames.principalIdKeyName, value: principal.objectId },
                     { name: secretNames.principalSecretKeyName, value: principalSecret },
@@ -140,4 +135,4 @@ exports.default = ({ name, owners, createClientSecret = false, createPrincipal =
         resource: app,
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9JZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEseURBQTJDO0FBRTNDLHVEQUF5QztBQUV6QyxzQ0FBNEM7QUFRNUMsMkRBQTZFO0FBQzdFLHFDQUE0RTtBQXNDNUUsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixNQUFNLEVBQ04sa0JBQWtCLEdBQUcsS0FBSyxFQUMxQixlQUFlLEdBQUcsS0FBSyxFQUN2QixTQUFTLEVBQ1QsT0FBTyxHQUFHLEtBQUssRUFDZixhQUFhLEdBQUcsS0FBSyxFQUNyQixRQUFRLEVBQ1IseUJBQXlCLEVBQ3pCLHdCQUF3QixHQUFHLEVBQUUsRUFDN0IsaUJBQWlCLEVBQ2pCLFlBQVksR0FBRyxLQUFLLEVBQ3BCLGNBQWMsRUFDZCxTQUFTLEVBQ1QsU0FBUyxHQUNLLEVBQWtCLEVBQUU7SUFDbEMsc0NBQXNDO0lBQ3RDLElBQUksR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0IsTUFBTSxXQUFXLEdBQUcsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVqRCxNQUFNLGNBQWMsR0FBRyxZQUFZO1FBQ2pDLENBQUMsQ0FBQyxTQUFTO1FBQ1gsQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRXBDLE1BQU0sR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FDakMsSUFBSSxFQUNKO1FBQ0UsV0FBVyxFQUFFLElBQUk7UUFDakIsV0FBVyxFQUFFLElBQUk7UUFFakIsTUFBTTtRQUNOLFFBQVE7UUFDUixjQUFjLEVBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsY0FBYztRQUN0RSxxQkFBcUIsRUFBRSxDQUFDLGVBQWUsQ0FBQztRQUN4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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9JZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEseURBQTJDO0FBRTNDLHVEQUF5QztBQUV6QyxzQ0FBNEM7QUFRNUMsMkRBQTZFO0FBQzdFLHFDQUFrRDtBQXNDbEQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixNQUFNLEVBQ04sa0JBQWtCLEdBQUcsS0FBSyxFQUMxQixlQUFlLEdBQUcsS0FBSyxFQUN2QixTQUFTLEVBQ1QsT0FBTyxHQUFHLEtBQUssRUFDZixhQUFhLEdBQUcsS0FBSyxFQUNyQixRQUFRLEVBQ1IseUJBQXlCLEVBQ3pCLHdCQUF3QixHQUFHLEVBQUUsRUFDN0IsaUJBQWlCLEVBQ2pCLFlBQVksR0FBRyxLQUFLLEVBQ3BCLGNBQWMsRUFDZCxTQUFTLEVBQ1QsU0FBUyxHQUNLLEVBQWtCLEVBQUU7SUFDbEMsc0NBQXNDO0lBQ3RDLElBQUksR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0IsTUFBTSxXQUFXLEdBQUcsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVqRCxNQUFNLGNBQWMsR0FBRyxZQUFZO1FBQ2pDLENBQUMsQ0FBQyxTQUFTO1FBQ1gsQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRXBDLE1BQU0sR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FDakMsSUFBSSxFQUNKO1FBQ0UsV0FBVyxFQUFFLElBQUk7UUFDakIsV0FBVyxFQUFFLElBQUk7UUFFakIsTUFBTTtRQUNOLFFBQVE7UUFDUixjQUFjLEVBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsY0FBYztRQUN0RSxxQkFBcUIsRUFBRSxDQUFDLGVBQWUsQ0FBQztRQUN4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

package/AzAd/RoleAssignment.d.ts

@@ -1,7 +1,7 @@
 import * as native from '@pulumi/azure-native';
 import * as pulumi from '@pulumi/pulumi';
 import { Input, Resource } from '@pulumi/pulumi';
-import { NamedType } from '../types';
+import { WithNamedType } from '../types';
 type GetRoleProps = {
     roleName: string;
 };
@@ -96,7 +96,7 @@ export declare const getRoleDefinitionByName: ({ roleName }: GetRoleProps) => {
     type: string;
     name: string;
 };
-export type RoleAssignmentProps = NamedType & {
+export type RoleAssignmentProps = WithNamedType & {
     roleName: string;
     scope?: pulumi.Input<string>;
     principalId: pulumi.Input<string>;

package/AzAd/UserAssignedIdentity.d.ts

@@ -1,5 +1,6 @@
-import { BasicResourceArgs, IdentityRoleAssignment } from '../types';
-export interface UserAssignedIdentityProps extends BasicResourceArgs, IdentityRoleAssignment {
+import { BasicResourceArgs, IdentityInfoWithInstance, WithVaultInfo } from '../types';
+import * as mid from '@pulumi/azure-native/managedidentity';
+export interface UserAssignedIdentityProps extends BasicResourceArgs, WithVaultInfo {
 }
-declare const _default: ({ name, group, vaultInfo, dependsOn, importUri, ignoreChanges, ...others }: UserAssignedIdentityProps) => import("@pulumi/azure-native/managedidentity/userAssignedIdentity").UserAssignedIdentity;
+declare const _default: ({ name, group, vaultInfo, dependsOn, importUri, ignoreChanges, }: UserAssignedIdentityProps) => IdentityInfoWithInstance<mid.UserAssignedIdentity>;
 export default _default;

package/AzAd/UserAssignedIdentity.js

@@ -24,21 +24,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
-const azure = __importStar(require("@pulumi/azure-native"));
+const mid = __importStar(require("@pulumi/azure-native/managedidentity"));
 const Common_1 = require("../Common");
-const Helper_1 = require("./Helper");
-exports.default = ({ name, group, vaultInfo, dependsOn, importUri, ignoreChanges, ...others }) => {
-    name = (0, Common_1.getManagedIdentityName)(name);
-    const managedIdentity = new azure.managedidentity.UserAssignedIdentity(name, {
+exports.default = ({ name, group, vaultInfo, dependsOn, importUri, ignoreChanges, }) => {
+    name = (0, Common_1.getUIDName)(name);
+    const managedIdentity = new mid.UserAssignedIdentity(name, {
         resourceName: name,
         ...group,
     }, { dependsOn, import: importUri, ignoreChanges });
-    (0, Helper_1.grantIdentityPermissions)({
-        ...others,
-        name,
-        vaultInfo,
-        principalId: managedIdentity.principalId,
-    });
     if (vaultInfo) {
         (0, CustomHelper_1.addCustomSecrets)({
             vaultInfo,
@@ -57,6 +50,10 @@ exports.default = ({ name, group, vaultInfo, dependsOn, importUri, ignoreChanges
             ],
         });
     }
-    return managedIdentity;
+    return {
+        id: managedIdentity.id,
+        principalId: managedIdentity.principalId,
+        instance: managedIdentity,
+    };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFzc2lnbmVkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9Vc2VyQXNzaWduZWRJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkRBQTREO0FBRTVELDREQUE4QztBQUM5QyxzQ0FBbUQ7QUFDbkQscUNBQW9EO0FBTXBELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLFNBQVMsRUFDVCxTQUFTLEVBQ1QsU0FBUyxFQUNULGFBQWEsRUFDYixHQUFHLE1BQU0sRUFDaUIsRUFBRSxFQUFFO0lBQzlCLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sZUFBZSxHQUFHLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxvQkFBb0IsQ0FDcEUsSUFBSSxFQUNKO1FBQ0UsWUFBWSxFQUFFLElBQUk7UUFDbEIsR0FBRyxLQUFLO0tBQ1QsRUFDRCxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxDQUNoRCxDQUFDO0lBRUYsSUFBQSxpQ0FBd0IsRUFBQztRQUN2QixHQUFHLE1BQU07UUFDVCxJQUFJO1FBQ0osU0FBUztRQUNULFdBQVcsRUFBRSxlQUFlLENBQUMsV0FBVztLQUN6QyxDQUFDLENBQUM7SUFFSCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsSUFBQSwrQkFBZ0IsRUFBQztZQUNmLFNBQVM7WUFDVCxTQUFTLEVBQUUsZUFBZTtZQUMxQixXQUFXLEVBQUUsc0JBQXNCO1lBQ25DLGFBQWEsRUFBRSxJQUFJO1lBQ25CLEtBQUssRUFBRTtnQkFDTDtvQkFDRSxJQUFJLEVBQUUsR0FBRyxJQUFJLEtBQUs7b0JBQ2xCLEtBQUssRUFBRSxlQUFlLENBQUMsRUFBRTtpQkFDMUI7Z0JBQ0Q7b0JBQ0UsSUFBSSxFQUFFLEdBQUcsSUFBSSxjQUFjO29CQUMzQixLQUFLLEVBQUUsZUFBZSxDQUFDLFdBQVc7aUJBQ25DO2FBQ0Y7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0lBQ0QsT0FBTyxlQUFlLENBQUM7QUFDekIsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFzc2lnbmVkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9Vc2VyQXNzaWduZWRJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkRBQTREO0FBTTVELDBFQUE0RDtBQUM1RCxzQ0FBdUM7QUFNdkMsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsU0FBUyxFQUNULFNBQVMsRUFDVCxTQUFTLEVBQ1QsYUFBYSxHQUNhLEVBQXNELEVBQUU7SUFDbEYsSUFBSSxHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4QixNQUFNLGVBQWUsR0FBRyxJQUFJLEdBQUcsQ0FBQyxvQkFBb0IsQ0FDbEQsSUFBSSxFQUNKO1FBQ0UsWUFBWSxFQUFFLElBQUk7UUFDbEIsR0FBRyxLQUFLO0tBQ1QsRUFDRCxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxDQUNoRCxDQUFDO0lBRUYsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLElBQUEsK0JBQWdCLEVBQUM7WUFDZixTQUFTO1lBQ1QsU0FBUyxFQUFFLGVBQWU7WUFDMUIsV0FBVyxFQUFFLHNCQUFzQjtZQUNuQyxhQUFhLEVBQUUsSUFBSTtZQUNuQixLQUFLLEVBQUU7Z0JBQ0w7b0JBQ0UsSUFBSSxFQUFFLEdBQUcsSUFBSSxLQUFLO29CQUNsQixLQUFLLEVBQUUsZUFBZSxDQUFDLEVBQUU7aUJBQzFCO2dCQUNEO29CQUNFLElBQUksRUFBRSxHQUFHLElBQUksY0FBYztvQkFDM0IsS0FBSyxFQUFFLGVBQWUsQ0FBQyxXQUFXO2lCQUNuQzthQUNGO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU87UUFDTCxFQUFFLEVBQUUsZUFBZSxDQUFDLEVBQUU7UUFDdEIsV0FBVyxFQUFFLGVBQWUsQ0FBQyxXQUFXO1FBQ3hDLFFBQVEsRUFBRSxlQUFlO0tBQzFCLENBQUM7QUFDSixDQUFDLENBQUMifQ==

package/Builder/AksBuilder.d.ts

@@ -1,3 +1,3 @@
-import { BuilderProps, ISshBuilder } from './types';
-declare const _default: (props: BuilderProps) => ISshBuilder;
+import { AksBuilderArgs, ISshBuilder } from './types';
+declare const _default: (props: AksBuilderArgs) => ISshBuilder;
 export default _default;

package/Builder/AksBuilder.js

@@ -11,6 +11,7 @@ const KeyGenerators_1 = require("../Core/KeyGenerators");
 const containerservice_1 = require("@pulumi/azure-native/containerservice");
 const Aks_1 = __importDefault(require("../Aks"));
 class AksBuilder extends types_1.BuilderAsync {
+    args;
     //Instances
     _sshInstance = undefined;
     _askInstance = undefined;
@@ -25,8 +26,10 @@ class AksBuilder extends types_1.BuilderAsync {
     _defaultNode = undefined;
     _importProps = undefined;
     _lock = false;
-    constructor(props) {
-        super(props);
+    _encryptionProps = undefined;
+    constructor(args) {
+        super(args);
+        this.args = args;
     }
     //Info collection methods
     withNewSsh(props) {
@@ -61,6 +64,10 @@ class AksBuilder extends types_1.BuilderAsync {
         this._defaultNode = props;
         return this;
     }
+    enableEncryption(props) {
+        this._encryptionProps = props;
+        return this;
+    }
     lock() {
         this._lock = true;
         return this;
@@ -91,6 +98,7 @@ class AksBuilder extends types_1.BuilderAsync {
                 adminUsername: this._sshInstance.userName,
                 sshKeys: [sshKey],
             },
+            diskEncryptionSetId: this._encryptionProps?.diskEncryptionSetId,
             defaultNodePool: this._defaultNode,
             nodePools: this._nodePoolsProps,
             features: this._featureProps,
@@ -100,14 +108,13 @@ class AksBuilder extends types_1.BuilderAsync {
             lock: this._lock,
         });
         //Grant read permission to AKS Node Group
-        if (this.commonProps.envRoles &&
-            this._askInstance.instance.nodeResourceGroup) {
+        if (this.args.envRoles && this._askInstance.instance.nodeResourceGroup) {
             (0, EnvRoles_Consts_1.grantEnvRolesAccess)({
                 name: `${this._askInstance.name}-node-group`,
                 dependsOn: this._askInstance.instance,
-                envRoles: this.commonProps.envRoles.info(),
+                envRoles: this.args.envRoles.info(),
                 enableRGRoles: { readOnly: true },
-                scope: (0, pulumi_1.interpolate) `/subscriptions/${Common_1.subscriptionId}/resourceGroups/${this._askInstance.instance.nodeResourceGroup}`,
+                scope: (0, pulumi_1.interpolate) `${Common_1.defaultSubScope}/resourceGroups/${this._askInstance.instance.nodeResourceGroup}`,
             });
         }
     }
@@ -118,4 +125,4 @@ class AksBuilder extends types_1.BuilderAsync {
     }
 }
 exports.default = (props) => new AksBuilder(props);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWtzQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9CdWlsZGVyL0Frc0J1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSwyQ0FBNkM7QUFDN0MsNkRBQThEO0FBQzlELHNDQUEyQztBQUMzQyxtQ0FVaUI7QUFDakIseURBQWdFO0FBQ2hFLDRFQUE4RTtBQUM5RSxpREFRZ0I7QUFFaEIsTUFBTSxVQUNKLFNBQVEsb0JBQXdCO0lBT2hDLFdBQVc7SUFDSCxZQUFZLEdBQTJCLFNBQVMsQ0FBQztJQUNqRCxZQUFZLEdBQTJCLFNBQVMsQ0FBQztJQUV6RCxPQUFPO0lBQ0MsU0FBUyxHQUFnQyxTQUFTLENBQUM7SUFDbkQsZUFBZSxHQUF1QixFQUFFLENBQUM7SUFDekMsV0FBVyxHQUE4QixTQUFTLENBQUM7SUFDbkQsYUFBYSxHQUFnQyxTQUFTLENBQUM7SUFDdkQsVUFBVSxHQUFpRCxFQUFFLENBQUM7SUFDOUQsS0FBSyxHQUEwQix3Q0FBcUIsQ0FBQyxJQUFJLENBQUM7SUFDMUQsYUFBYSxHQUFnQyxTQUFTLENBQUM7SUFDdkQsWUFBWSxHQUF3QyxTQUFTLENBQUM7SUFDOUQsWUFBWSxHQUErQixTQUFTLENBQUM7SUFDckQsS0FBSyxHQUFZLEtBQUssQ0FBQztJQUUvQixZQUFZLEtBQW1CO1FBQzdCLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNmLENBQUM7SUFFRCx5QkFBeUI7SUFDbEIsVUFBVSxDQUFDLEtBQXNCO1FBQ3RDLElBQUksQ0FBQyxTQUFTLEdBQUcsS0FBSyxDQUFDO1FBQ3ZCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVNLFlBQVksQ0FBQyxLQUF1QjtRQUN6QyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNqQyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDTSxTQUFTLENBQUMsS0FBb0I7UUFDbkMsSUFBSSxDQUFDLFdB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWtzQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9CdWlsZGVyL0Frc0J1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSwyQ0FBNkM7QUFDN0MsNkRBQThEO0FBQzlELHNDQUE0QztBQUM1QyxtQ0FZaUI7QUFDakIseURBQWdFO0FBQ2hFLDRFQUE4RTtBQUM5RSxpREFRZ0I7QUFHaEIsTUFBTSxVQUNKLFNBQVEsb0JBQXdCO0lBd0JaO0lBakJwQixXQUFXO0lBQ0gsWUFBWSxHQUEyQixTQUFTLENBQUM7SUFDakQsWUFBWSxHQUEyQixTQUFTLENBQUM7SUFFekQsT0FBTztJQUNDLFNBQVMsR0FBZ0MsU0FBUyxDQUFDO0lBQ25ELGVBQWUsR0FBb0IsRUFBRSxDQUFDO0lBQ3RDLFdBQVcsR0FBOEIsU0FBUyxDQUFDO0lBQ25ELGFBQWEsR0FBZ0MsU0FBUyxDQUFDO0lBQ3ZELFVBQVUsR0FBaUQsRUFBRSxDQUFDO0lBQzlELEtBQUssR0FBMEIsd0NBQXFCLENBQUMsSUFBSSxDQUFDO0lBQzFELGFBQWEsR0FBZ0MsU0FBUyxDQUFDO0lBQ3ZELFlBQVksR0FBd0MsU0FBUyxDQUFDO0lBQzlELFlBQVksR0FBK0IsU0FBUyxDQUFDO0lBQ3JELEtBQUssR0FBWSxLQUFLLENBQUM7SUFDdkIsZ0JBQWdCLEdBQWtDLFNBQVMsQ0FBQztJQUVwRSxZQUFvQixJQUFvQjtRQUN0QyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFETSxTQUFJLEdBQUosSUFBSSxDQUFnQjtJQUV4QyxDQUFDO0lBRUQseUJBQXlCO0lBQ2xCLFVBQVUsQ0FBQyxLQUFzQjtRQUN0QyxJQUFJLENBQUMsU0FBUyxHQUFHLEtBQUssQ0FBQztRQUN2QixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFTSxZQUFZLENBQUMsS0FBb0I7UUFDdEMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDakMs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