@drunk-pulumi/azure 1.0.4 → 1.0.6

package/AzAd/EnvRoles.Consts.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grantEnvRolesAccess = exports.getRoleNames = void 0;
 const RoleAssignment_1 = require("./RoleAssignment");
-const Common_1 = require("../Common");
 //Resource Group Role
 const RGRoleNames = {
     readOnly: ['Reader'],
@@ -78,9 +77,10 @@ const StorageRoleNames = {
 //Container Registry Roles
 const ContainerRegistry = {
     readOnly: [
-        'ACR Registry Catalog Lister',
+        //'ACR Registry Catalog Lister',
         'ACR Repository Reader',
         'AcrQuarantineReader',
+        //'AcrPull',
     ],
     contributor: [
         'AcrImageSigner',
@@ -92,6 +92,12 @@ const ContainerRegistry = {
     ],
     admin: ['AcrDelete'],
 };
+//AppConfig Roles
+const AppConfigRoleNames = {
+    readOnly: ['App Configuration Data Reader'],
+    contributor: ['App Configuration Data Owner'],
+    admin: [],
+};
 const getRoleFor = (roleType, roleCollection, results) => {
     if (!roleType)
         return results;
@@ -111,7 +117,7 @@ const getRoleFor = (roleType, roleCollection, results) => {
     }
     return results;
 };
-const getRoleNames = ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, }) => {
+const getRoleNames = ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, enableAppConfig, }) => {
     const rs = {
         readOnly: new Set(),
         admin: new Set(),
@@ -123,6 +129,7 @@ const getRoleNames = ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableA
     getRoleFor(enableAksRoles, AksRoleNames, rs);
     getRoleFor(enableStorageRoles, StorageRoleNames, rs);
     getRoleFor(enableACRRoles, ContainerRegistry, rs);
+    getRoleFor(enableAppConfig, AppConfigRoleNames, rs);
     return {
         readOnly: Array.from(rs.readOnly).sort(),
         admin: Array.from(rs.admin).sort(),
@@ -132,48 +139,23 @@ const getRoleNames = ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableA
 exports.getRoleNames = getRoleNames;
 const grantEnvRolesAccess = ({ name, envRoles, scope, dependsOn, ...others }) => {
     const roles = (0, exports.getRoleNames)(others);
-    if (envRoles.readOnly.objectId) {
-        //ReadOnly
-        roles.readOnly.forEach((r) => {
-            const n = `${name}-readonly-${(0, Common_1.replaceAll)(r, ' ', '')}`;
-            (0, RoleAssignment_1.roleAssignment)({
-                name: n,
-                principalId: envRoles.readOnly.objectId,
-                principalType: 'Group',
-                roleName: r,
-                scope,
-                dependsOn,
-            });
-        });
-    }
-    if (envRoles.contributor.objectId) {
-        //Contributors
-        roles.contributor.forEach((r) => {
-            const n = `${name}-contributor-${(0, Common_1.replaceAll)(r, ' ', '')}`;
-            (0, RoleAssignment_1.roleAssignment)({
-                name: n,
-                principalId: envRoles.contributor.objectId,
-                principalType: 'Group',
-                roleName: r,
-                scope,
-                dependsOn,
-            });
-        });
-    }
-    if (envRoles.admin.objectId) {
-        //Admin
-        roles.admin.forEach((r) => {
-            const n = `${name}-admin-${(0, Common_1.replaceAll)(r, ' ', '')}`;
-            (0, RoleAssignment_1.roleAssignment)({
-                name: n,
-                principalId: envRoles.admin.objectId,
-                principalType: 'Group',
-                roleName: r,
-                scope,
-                dependsOn,
-            });
-        });
-    }
+    Object.keys(envRoles).forEach((k) => {
+        const type = k;
+        const objectId = envRoles[type].objectId;
+        if (!objectId) {
+            console.warn(`The Env role '${type}' was ignored as the objectId was NULL.`);
+            return;
+        }
+        const n = `${name}-${type}`;
+        roles[type].forEach((r) => (0, RoleAssignment_1.roleAssignment)({
+            name: n,
+            roleName: r,
+            principalId: objectId,
+            principalType: 'Group',
+            scope,
+            dependsOn,
+        }));
+    });
 };
 exports.grantEnvRolesAccess = grantEnvRolesAccess;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuQ29uc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvRW52Um9sZXMuQ29uc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLHFEQUF1RTtBQUN2RSxzQ0FBdUM7QUFFdkMscUJBQXFCO0FBQ3JCLE1BQU0sV0FBVyxHQUFzQztJQUNyRCxRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUM7SUFDcEIsV0FBVyxFQUFFLENBQUMsYUFBYSxDQUFDO0lBQzVCLEtBQUssRUFBRSxDQUFDLE9BQU8sQ0FBQztDQUNqQixDQUFDO0FBRUYsV0FBVztBQUNYLE1BQU0sWUFBWSxHQUFzQztJQUN0RCxRQUFRLEVBQUU7UUFDUixzQ0FBc0M7UUFDdEMsNENBQTRDO0tBQzdDO0lBQ0QsV0FBVyxFQUFFO1FBQ1gsc0NBQXNDO1FBQ3RDLDRDQUE0QztLQUM3QztJQUNELEtBQUssRUFBRTtRQUNMLDZDQUE2QztRQUM3Qyw2Q0FBNkM7S0FDOUM7Q0FDRixDQUFDO0FBRUYsV0FBVztBQUNYLE1BQU0sZUFBZSxHQUFzQztJQUN6RCxRQUFRLEVBQUUsQ0FBQyxxQkFBcUIsQ0FBQztJQUNqQyxXQUFXLEVBQUUsQ0FBQywwQkFBMEIsQ0FBQztJQUN6QyxLQUFLLEVBQUUsQ0FBQyw4QkFBOEIsRUFBRSwwQkFBMEIsQ0FBQztDQUNwRSxDQUFDO0FBRUYsaUJBQWlCO0FBQ2pCLE1BQU0saUJBQWlCLEdBQXNDO0lBQzNELFFBQVEsRUFBRTtRQUNSLDBDQUEwQztRQUMxQyx1Q0FBdUM7UUFDdkMsd0JBQXdCO1FBQ3hCLHVCQUF1QjtRQUN2Qiw0QkFBNEI7UUFDNUIsa0JBQWtCO0tBQ25CO0lBQ0QsV0FBVyxFQUFFO1FBQ1gsZ0NBQWdDO1FBQ2hDLDBCQUEwQjtRQUMxQiwyQkFBMkI7UUFDM0IsdUJBQXVCO0tBQ3hCO0lBQ0QsS0FBSyxFQUFFLENBQUMseUJBQXlCLEVBQUUscUNBQXFDLENBQUM7Q0FDMUUsQ0FBQztBQUVGLGVBQWU7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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuQ29uc3RzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvRW52Um9sZXMuQ29uc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUF1RTtBQUV2RSxxQkFBcUI7QUFDckIsTUFBTSxXQUFXLEdBQXNDO0lBQ3JELFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQztJQUNwQixXQUFXLEVBQUUsQ0FBQyxhQUFhLENBQUM7SUFDNUIsS0FBSyxFQUFFLENBQUMsT0FBTyxDQUFDO0NBQ2pCLENBQUM7QUFFRixXQUFXO0FBQ1gsTUFBTSxZQUFZLEdBQXNDO0lBQ3RELFFBQVEsRUFBRTtRQUNSLHNDQUFzQztRQUN0Qyw0Q0FBNEM7S0FDN0M7SUFDRCxXQUFXLEVBQUU7UUFDWCxzQ0FBc0M7UUFDdEMsNENBQTRDO0tBQzdDO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsNkNBQTZDO1FBQzdDLDZDQUE2QztLQUM5QztDQUNGLENBQUM7QUFFRixXQUFXO0FBQ1gsTUFBTSxlQUFlLEdBQXNDO0lBQ3pELFFBQVEsRUFBRSxDQUFDLHFCQUFxQixDQUFDO0lBQ2pDLFdBQVcsRUFBRSxDQUFDLDBCQUEwQixDQUFDO0lBQ3pDLEtBQUssRUFBRSxDQUFDLDhCQUE4QixFQUFFLDBCQUEwQixDQUFDO0NBQ3BFLENBQUM7QUFFRixpQkFBaUI7QUFDakIsTUFBTSxpQkFBaUIsR0FBc0M7SUFDM0QsUUFBUSxFQUFFO1FBQ1IsMENBQTBDO1FBQzFDLHVDQUF1QztRQUN2Qyx3QkFBd0I7UUFDeEIsdUJBQXVCO1FBQ3ZCLDRCQUE0QjtRQUM1QixrQkFBa0I7S0FDbkI7SUFDRCxXQUFXLEVBQUU7UUFDWCxnQ0FBZ0M7UUFDaEMsMEJBQTBCO1FBQzFCLDJCQUEyQjtRQUMzQix1QkFBdUI7S0FDeEI7SUFDRCxLQUFLLEVBQUUsQ0FBQyx5QkFBeUIsRUFBRSxxQ0FBcUMsQ0FBQztDQUMxRSxDQUFDO0FBRUYsZUFBZTtBQUNmLE1BQU0sZ0JB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

package/AzAd/EnvRoles.d.ts

@@ -5,10 +5,11 @@ type EnvRoleInfoType = {
     objectId: string;
     displayName: string;
 };
-export type EnvRolesResults = Record<EnvRoleKeyTypes, Output<EnvRoleInfoType> | EnvRoleInfoType>;
-export type CreateEnvRolesType = Record<EnvRoleKeyTypes, Output<EnvRoleInfoType>> & {
-    addRolesToVault: (vaultInfo: KeyVaultInfo) => void;
+export type EnvRolesInfo = Record<EnvRoleKeyTypes, Output<EnvRoleInfoType> | EnvRoleInfoType>;
+export type CreateEnvRolesType = EnvRolesInfo & {
+    pushToVault: (vaultInfo: KeyVaultInfo) => void;
 };
+export declare const pushEnvRolesToVault: (envRoles: EnvRolesInfo, vaultInfo: KeyVaultInfo) => void;
 export declare const createEnvRoles: () => CreateEnvRolesType;
 /** Get Single Env Role Object */
 export declare const getEnvRole: (name: string, vaultInfo: KeyVaultInfo) => Promise<{
@@ -16,5 +17,5 @@ export declare const getEnvRole: (name: string, vaultInfo: KeyVaultInfo) => Prom
     objectId: string;
 }>;
 /** Get All Env Role Objects */
-export declare const getEnvRolesOutput: (vaultInfo: KeyVaultInfo) => EnvRolesResults;
+export declare const getEnvRolesOutput: (vaultInfo: KeyVaultInfo) => EnvRolesInfo;
 export {};

package/AzAd/EnvRoles.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnvRolesOutput = exports.getEnvRole = exports.createEnvRoles = void 0;
+exports.getEnvRolesOutput = exports.getEnvRole = exports.createEnvRoles = exports.pushEnvRolesToVault = void 0;
+const EnvRoles_Consts_1 = require("./EnvRoles.Consts");
 const Role_1 = __importDefault(require("./Role"));
 const pulumi_1 = require("@pulumi/pulumi");
 const Common_1 = require("../Common");
@@ -27,45 +28,51 @@ const getRoleSecretName = (name) => ({
     objectIdName: (0, Common_1.getSecretName)(`envRoles-${name}-object-id`),
     displayName: (0, Common_1.getSecretName)(`envRoles-${name}-display-name`),
 });
+const pushEnvRolesToVault = (envRoles, vaultInfo) => {
+    Object.keys(envRoleConfig).forEach((key) => {
+        const role = envRoles[key];
+        //Add to Key Vault
+        const secretNames = getRoleSecretName(key);
+        (0, CustomHelper_1.addCustomSecrets)({
+            vaultInfo,
+            contentType: 'Env Roles',
+            items: [
+                { name: secretNames.objectIdName, value: role.objectId },
+                { name: secretNames.displayName, value: role.displayName },
+            ],
+        });
+    });
+};
+exports.pushEnvRolesToVault = pushEnvRolesToVault;
 const createEnvRoles = () => {
     const groups = {};
     Object.keys(envRoleConfig).forEach((key) => {
-        const config = envRoleConfig[key];
+        const k = key;
+        const config = envRoleConfig[k];
         const g = (0, Role_1.default)(config);
-        groups[key] = (0, pulumi_1.output)([g.objectId, g.displayName]).apply(([i, d]) => ({
+        groups[k] = (0, pulumi_1.output)([g.objectId, g.displayName]).apply(([i, d]) => ({
             objectId: i,
             displayName: d,
         }));
     });
-    const addRolesToVault = (vaultInfo) => {
-        Object.keys(groups).forEach((key) => {
-            const role = groups[key];
-            //Add to Key Vault
-            const secretNames = getRoleSecretName(key);
-            (0, CustomHelper_1.addCustomSecret)({
-                name: secretNames.objectIdName,
-                value: role.objectId,
-                contentType: secretNames.objectIdName,
-                vaultInfo,
-            });
-            (0, CustomHelper_1.addCustomSecret)({
-                name: secretNames.displayName,
-                value: role.displayName,
-                contentType: secretNames.displayName,
-                vaultInfo,
-            });
-        });
-    };
+    const pushToVault = (vaultInfo) => (0, exports.pushEnvRolesToVault)(groups, vaultInfo);
+    //Allows Some Subscription level access
+    //1. Allows to AcrPull
+    (0, EnvRoles_Consts_1.grantEnvRolesAccess)({
+        envRoles: groups,
+        name: 'envRoles-SubScope-Access',
+        scope: Common_1.defaultSubScope,
+        enableACRRoles: { contributor: true },
+    });
     return {
         ...groups,
-        addRolesToVault,
+        pushToVault,
     };
 };
 exports.createEnvRoles = createEnvRoles;
 /** Get Single Env Role Object */
 const getEnvRole = async (name, vaultInfo) => {
     const secretNames = getRoleSecretName(name);
-    //console.log(`getEnvRole:`, secretNames);
     const [objectId, displayName] = await Promise.all([
         (0, Helper_1.getSecret)({ name: secretNames.objectIdName, vaultInfo }),
         (0, Helper_1.getSecret)({ name: secretNames.displayName, vaultInfo }),
@@ -85,4 +92,4 @@ const getEnvRolesOutput = (vaultInfo) => {
     return rs;
 };
 exports.getEnvRolesOutput = getEnvRolesOutput;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9FbnZSb2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxrREFBeUM7QUFFekMsMkNBQWdEO0FBQ2hELHNDQUEwQztBQUMxQywyREFBMkQ7QUFDM0QsK0NBQStDO0FBSS9DLE1BQU0sYUFBYSxHQUF1QztJQUN4RCxRQUFRLEVBQUU7UUFDUixRQUFRLEVBQUUsVUFBVTtRQUNwQixPQUFPLEVBQUUsT0FBTztLQUNqQjtJQUNELFdBQVcsRUFBRTtRQUNYLFFBQVEsRUFBRSxhQUFhO1FBQ3ZCLE9BQU8sRUFBRSxPQUFPO0tBQ2pCO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsUUFBUSxFQUFFLE9BQU87UUFDakIsT0FBTyxFQUFFLE9BQU87S0FDakI7Q0FDRixDQUFDO0FBUUYsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsQ0FBQztJQUMzQyxZQUFZLEVBQUUsSUFBQSxzQkFBYSxFQUFDLFlBQVksSUFBSSxZQUFZLENBQUM7SUFDekQsV0FBVyxFQUFFLElBQUEsc0JBQWEsRUFBQyxZQUFZLElBQUksZUFBZSxDQUFDO0NBQzVELENBQUMsQ0FBQztBQVNJLE1BQU0sY0FBYyxHQUFHLEdBQUcsRUFBRTtJQUNqQyxNQUFNLE1BQU0sR0FBNEMsRUFBRSxDQUFDO0lBRTNELE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDekMsTUFBTSxNQUFNLEdBQUcsYUFBYSxDQUFDLEdBQXNCLENBQUMsQ0FBQztRQUNyRCxNQUFNLENBQUMsR0FBRyxJQUFBLGNBQUksRUFBQyxNQUFNLENBQUMsQ0FBQztRQUV2QixNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBQSxlQUFNLEVBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9FbnZSb2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx1REFBd0Q7QUFDeEQsa0RBQXlDO0FBRXpDLDJDQUFnRDtBQUNoRCxzQ0FBMkQ7QUFDM0QsMkRBQTREO0FBQzVELCtDQUErQztBQUkvQyxNQUFNLGFBQWEsR0FBdUM7SUFDeEQsUUFBUSxFQUFFO1FBQ1IsUUFBUSxFQUFFLFVBQVU7UUFDcEIsT0FBTyxFQUFFLE9BQU87S0FDakI7SUFDRCxXQUFXLEVBQUU7UUFDWCxRQUFRLEVBQUUsYUFBYTtRQUN2QixPQUFPLEVBQUUsT0FBTztLQUNqQjtJQUNELEtBQUssRUFBRTtRQUNMLFFBQVEsRUFBRSxPQUFPO1FBQ2pCLE9BQU8sRUFBRSxPQUFPO0tBQ2pCO0NBQ0YsQ0FBQztBQVFGLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDM0MsWUFBWSxFQUFFLElBQUEsc0JBQWEsRUFBQyxZQUFZLElBQUksWUFBWSxDQUFDO0lBQ3pELFdBQVcsRUFBRSxJQUFBLHNCQUFhLEVBQUMsWUFBWSxJQUFJLGVBQWUsQ0FBQztDQUM1RCxDQUFDLENBQUM7QUFNSSxNQUFNLG1CQUFtQixHQUFHLENBQ2pDLFFBQXNCLEVBQ3RCLFNBQXVCLEVBQ3ZCLEVBQUU7SUFDRixNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1FBQ3pDLE1BQU0sSUFBSSxHQUFHLFFBQVEsQ0FBQyxHQUFzQixDQUFDLENBQUM7UUFDOUMsa0JBQWtCO1FBQ2xCLE1BQU0sV0FBVyxHQUFHLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzNDLElBQUEsK0JBQWdCLEVBQUM7WUFDZixTQUFTO1lBQ1QsV0FBVyxFQUFFLFdBQVc7WUFDeEIsS0FBSyxFQUFFO2dCQUNMLEVB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

package/AzAd/Group.d.ts

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

package/AzAd/Group.js

@@ -65,19 +65,10 @@ const getAdGroup = (displayName) => {
     return (0, pulumi_1.output)(azuread.getGroup({ displayName }));
 };
 exports.getAdGroup = getAdGroup;
-const addMemberToGroup = ({ name, userName, objectId, groupObjectId, }) => {
-    if (userName && !userName.includes('@'))
-        throw new Error('UserName must include suffix @domain.name');
-    else if (!objectId)
-        throw new Error('Either UserName or ObjectId must be defined.');
-    const user = userName
-        ? (0, pulumi_1.output)(azuread.getUser({ userPrincipalName: userName }))
-        : { objectId: objectId };
-    return new azuread.GroupMember(name, {
-        groupObjectId,
-        memberObjectId: user.objectId,
-    });
-};
+const addMemberToGroup = ({ name, objectId, groupObjectId, }) => (0, pulumi_1.output)([objectId, groupObjectId]).apply(([oId, gId]) => new azuread.GroupMember(`${name}-${gId}-${oId}`, {
+    groupObjectId,
+    memberObjectId: objectId,
+}));
 exports.addMemberToGroup = addMemberToGroup;
 const addGroupToGroup = (groupMemberName, groupObjectId) => {
     const group = (0, exports.getAdGroup)(groupMemberName);
@@ -98,4 +89,4 @@ const assignRolesToGroup = ({ roles, groupName, scope, }) => (0, pulumi_1.output
     })));
 });
 exports.assignRolesToGroup = assignRolesToGroup;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9Hcm91cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHlEQUEyQztBQUMzQywyQ0FBdUQ7QUFDdkQsc0NBQTRDO0FBQzVDLHFEQUFrRDtBQUNsRCxzQ0FBcUM7QUFrQnJDLGtCQUFlLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBZ0IsRUFBRSxFQUFFO0lBQzVFLE1BQU0sS0FBSyxHQUFHLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7UUFDcEMsV0FBVyxFQUFFLElBQUk7UUFDakIsc0JBQXNCLEVBQUUsS0FBSztRQUM3Qiw2QkFBNkI7UUFDN0IsK0JBQStCO1FBQy9CLFdBQVcsRUFBRSxLQUFLO1FBQ2xCLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLE1BQU07S0FDUCxDQUFDLENBQUM7SUFFSCxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FDVCxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNQLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxHQUFHLElBQUksV0FBVyxDQUFDLEVBQUUsRUFBRTtZQUM3QyxhQUFhLEVBQUUsS0FBSyxDQUFDLEVBQUU7WUFDdkIsY0FBYyxFQUFFLENBQUM7U0FDbEIsQ0FBQyxDQUNMLENBQUM7SUFDSixDQUFDO0lBRUQsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ2YsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ3BCLElBQUEsK0JBQWMsRUFBQztZQUNiLElBQUk7WUFDSixXQUFXLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDM0IsYUFBYSxFQUFFLE9BQU87WUFDdEIsUUFBUSxFQUFFLENBQUMsQ0FBQyxR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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9Hcm91cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHlEQUEyQztBQUMzQywyQ0FBdUQ7QUFDdkQsc0NBQTRDO0FBRTVDLHFEQUFrRDtBQUNsRCxzQ0FBcUM7QUFpQnJDLGtCQUFlLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBZ0IsRUFBRSxFQUFFO0lBQzVFLE1BQU0sS0FBSyxHQUFHLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUU7UUFDcEMsV0FBVyxFQUFFLElBQUk7UUFDakIsc0JBQXNCLEVBQUUsS0FBSztRQUM3Qiw2QkFBNkI7UUFDN0IsK0JBQStCO1FBQy9CLFdBQVcsRUFBRSxLQUFLO1FBQ2xCLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLE1BQU07S0FDUCxDQUFDLENBQUM7SUFFSCxJQUFJLE9BQU8sRUFBRSxDQUFDO1FBQ1osT0FBTyxDQUFDLEdBQUcsQ0FDVCxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNQLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxHQUFHLElBQUksV0FBVyxDQUFDLEVBQUUsRUFBRTtZQUM3QyxhQUFhLEVBQUUsS0FBSyxDQUFDLEVBQUU7WUFDdkIsY0FBYyxFQUFFLENBQUM7U0FDbEIsQ0FBQyxDQUNMLENBQUM7SUFDSixDQUFDO0lBRUQsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQ2YsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ3BCLElBQUEsK0JBQWMsRUFBQztZQUNiLElBQUk7WUFDSixXQUFXLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDM0IsYUFBYSxFQUFFLE9BQU87WUFDdEIsUUFBUSxFQUFFLENBQUMsQ0FBQyxRQUFRO1lBQ3BCLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSyxJQUFJLHdCQUFlO1NBQ2xDLENBQUMsQ0FDSCxDQUNGLENBQUM7SUFDSixDQUFDO0lBRUQsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDLENBQUM7QUFFSyxNQUFNLFVBQVUsR0FBRyxDQUFDLFdBQW1CLEVBQUUsRUFBRTtJQUNoRCxJQUFJLGlCQUFRO1FBQ1YsT0FBTyxJQUFBLGVBQU0sRUFBQztZQUNaLFdBQVc7WUFDWCxRQUFRLEVBQUUsc0NBQXNDO1NBQy9CLENBQUMsQ0FBQztJQUN2QixPQUFPLElBQUEsZUFBTSxFQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDbkQsQ0FBQyxDQUFDO0FBUFcsUUFBQSxVQUFVLGNBT3JCO0FBRUssTUFBTSxnQkFBZ0IsR0FBRyxDQUFDLEVBQy9CLElBQUksRUFDSixRQUFRLEVBQ1IsYUFBYSxHQUlkLEVBQUUsRUFBRSxDQUNILElBQUEsZUFBTSxFQUFDLENBQUMsUUFBUSxFQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUNyQyxDQUFDLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUFFLEVBQUUsQ0FDYixJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxJQUFJLElBQUksR0FBRyxJQUFJLEdBQUcsRUFBRSxFQUFFO0lBQy9DLGFBQWE7SUFDYixjQUFjLEVBQUUsUUFBUTtDQUN6QixDQUFDLENBQ0wsQ0FBQztBQWRTLFFBQUEsZ0JBQWdCLG9CQWN6QjtBQUVHLE1BQU0sZUFBZSxHQUFHLENBQzdCLGVBQXVCLEVBQ3ZCLGFBQTZCLEVBQzdCLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyxJQUFBLGtCQUFVLEVBQUMsZUFBZSxDQUFDLENBQUM7SUFFMUMsT0FBTyxhQUFhLENBQUMsS0FBSyxDQUN4QixDQUFDLENBQUMsRUFBRSxFQUFFLENBQ0osSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLGVBQWUsRUFBRSxFQUFFO1FBQ2pELGFBQWEsRUFBRSxDQUFDO1FBQ2hCLGNBQWMsRUFBRSxLQUFLLENBQUMsUUFBUTtLQUMvQixDQUFDLENBQ0wsQ0FBQztBQUNKLENBQUMsQ0FBQztBQWJXLFFBQUEsZUFBZSxtQkFhMUI7QUFFSyxNQUFNLGtCQUFrQixHQUFHLENBQUMsRUFDakMsS0FBSyxFQUNMLFNBQVMsRUFDVCxLQUFLLEdBS04sRUFBRSxFQUFFLENBQ0gsSUFBQSxlQUFNLEVBQUMsS0FBSyxJQUFJLEVBQUU7SUFDaEIsTUFBTSxLQUFLLEdBQUcsSUFBQSxrQkFBVSxFQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3BDLE9BQU8sTUFBTSxPQUFPLENBQUMsR0FBRyxDQUN0QixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDZCxJQUFBLCtCQUFjLEVBQUM7UUFDYixJQUFJLEVBQUUsU0FBUztRQUNmLFdBQVcsRUFBRSxLQUFLLENBQUMsUUFBUTtRQUMzQixhQUFhLEVBQUUsT0FBTztRQUN0QixRQUFRLEVBQUUsQ0FBQztRQUNYLEtBQUssRUFBRSxLQUFLLElBQUksd0JBQWU7S0FDaEMsQ0FBQyxDQUNILENBQ0YsQ0FBQztBQUNKLENBQUMsQ0FBQyxDQUFDO0FBdEJRLFFBQUEsa0JBQWtCLHNCQXNCMUIifQ==

package/AzAd/Helper.d.ts

@@ -1,7 +1,6 @@
-import { IdentityRoleAssignment, KeyVaultInfo } from "../types";
-import { Input } from "@pulumi/pulumi";
-interface Props {
-    name: string;
+import { IdentityInfo, IdentityRoleAssignment, KeyVaultInfo, NamedType } from '../types';
+import { Input } from '@pulumi/pulumi';
+interface Props extends NamedType {
     includePrincipal?: boolean;
     vaultInfo: KeyVaultInfo;
 }
@@ -22,8 +21,9 @@ 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, roles, envRole, }: IdentityRoleAssignment & {
-    name: string;
+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 {};

package/AzAd/Helper.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grantIdentityPermissions = exports.getIdentityInfoOutput = exports.getIdentityInfo = exports.getIdentitySecretNames = void 0;
-const Naming_1 = require("../Common/Naming");
+exports.getUserAssignedIdentityInfoOutput = exports.getUserAssignedIdentityInfo = exports.grantIdentityPermissions = 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, Naming_1.getSecretName)(`${name}-object-id`),
-    clientIdKeyName: (0, Naming_1.getSecretName)(`${name}-client-id`),
-    clientSecretKeyName: (0, Naming_1.getSecretName)(`${name}-client-secret`),
-    principalIdKeyName: (0, Naming_1.getSecretName)(`${name}-principal-id`),
-    principalSecretKeyName: (0, Naming_1.getSecretName)(`${name}-principal-secret`),
+    objectIdName: (0, Common_1.getSecretName)(`${name}-object-id`),
+    clientIdKeyName: (0, Common_1.getSecretName)(`${name}-client-id`),
+    clientSecretKeyName: (0, Common_1.getSecretName)(`${name}-client-secret`),
+    principalIdKeyName: (0, Common_1.getSecretName)(`${name}-principal-id`),
+    principalSecretKeyName: (0, Common_1.getSecretName)(`${name}-principal-secret`),
 });
 exports.getIdentitySecretNames = getIdentitySecretNames;
 const getIdentityInfo = async ({ name, vaultInfo, includePrincipal, }) => {
-    name = (0, Naming_1.getIdentityName)(name);
+    name = (0, Common_1.getIdentityName)(name);
     const secretNames = (0, exports.getIdentitySecretNames)(name);
     const [objectId, clientId, clientSecret] = await Promise.all([
         (0, Helper_1.getSecret)({ name: secretNames.objectIdName, vaultInfo }),
@@ -40,49 +40,11 @@ const getIdentityInfo = async ({ name, vaultInfo, includePrincipal, }) => {
 exports.getIdentityInfo = getIdentityInfo;
 const getIdentityInfoOutput = (props) => (0, pulumi_1.output)((0, exports.getIdentityInfo)(props));
 exports.getIdentityInfoOutput = getIdentityInfoOutput;
-// export const grantIdentityRolesAccess = ({
-//   name,
-//   principalId,
-//   scope,
-//   roleType,
-//   additionRoles,
-//   dependsOn,
-//   ...others
-// }: RoleEnableTypes & {
-//   name: string;
-//   principalId: Input<string>;
-//   scope: Input<string>;
-//   roleType: EnvRoleKeyTypes;
-//   additionRoles?: string[];
-//   dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
-// }) => {
-//   const roles = getRoleNames(others);
-//   const finalRoles = new Set(additionRoles);
-//
-//   if (roleType === "readOnly") roles.readOnly.forEach((r) => finalRoles.add(r));
-//   if (roleType === "contributor")
-//     roles.contributor.forEach((r) => finalRoles.add(r));
-//   if (roleType === "admin") roles.admin.forEach((r) => finalRoles.add(r));
-//
-//   Array.from(finalRoles)
-//     .sort()
-//     .forEach((r) => {
-//       const n = `${name}-${roleType}-${replaceAll(r, " ", "")}`;
-//       roleAssignment({
-//         name: n,
-//         principalId,
-//         principalType: "ServicePrincipal",
-//         roleName: r,
-//         scope,
-//         dependsOn,
-//       });
-//     });
-// };
 const grantIdentityToResourceRoles = ({ name, roles, principalId, }) => roles.map((r) => (0, RoleAssignment_1.roleAssignment)({
     name,
     roleName: r.name,
     principalId: principalId,
-    principalType: "ServicePrincipal",
+    principalType: 'ServicePrincipal',
     scope: r.scope,
 }));
 const grantIdentityEnvRolesGroup = ({ name, roleType, vaultInfo, principalId, }) => {
@@ -97,18 +59,41 @@ const grantIdentityEnvRolesGroup = ({ name, roleType, vaultInfo, principalId, })
         });
     });
 };
-const grantIdentityPermissions = ({ name, principalId, vaultInfo, roles, envRole, }) => {
-    if (roles) {
-        grantIdentityToResourceRoles({ name, roles, principalId });
-    }
-    if (envRole && vaultInfo) {
+const grantIdentityPermissions = ({ name, principalId, vaultInfo, role, }) => {
+    // if (roles) {
+    //   grantIdentityToResourceRoles({ name, roles, principalId });
+    // }
+    if (role && vaultInfo) {
         grantIdentityEnvRolesGroup({
             name,
-            roleType: envRole,
+            roleType: role,
             principalId,
             vaultInfo,
         });
     }
 };
 exports.grantIdentityPermissions = grantIdentityPermissions;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUFrRTtBQUNsRSwrQ0FBK0M7QUFFL0MsMkNBQXlEO0FBQ3pELHlDQUF5RDtBQUV6RCxxREFBa0Q7QUFFbEQsbUNBQTJDO0FBaUJwQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZELFlBQVksRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUNoRCxlQUFlLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxZQUFZLENBQUM7SUFDbkQsbUJBQW1CLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQztJQUMzRCxrQkFBa0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLGVBQWUsQ0FBQztJQUN6RCxzQkFBc0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLG1CQUFtQixDQUFDO0NBQ2xFLENBQUMsQ0FBQztBQU5VLFFBQUEsc0JBQXNCLDBCQU1oQztBQUVJLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxFQUNwQyxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixHQUNWLEVBQWdDLEVBQUU7SUFDeEMsSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUM3QixNQUFNLFdBQVcsR0FBRyxJQUFBLDhCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpELE1BQU0sQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLFlBQVksQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUMzRCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLFlBQVksRUFBRSxTQUFTLEVBQUUsQ0FBQztRQUN4RCxJQUFBLGtCQUFTLEVB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
+const getUserAssignedIdentityInfo = async (name, vaultInfo) => {
+    name = (0, Common_1.getManagedIdentityName)(name);
+    const id = await (0, Helper_1.getSecret)({
+        name: `${name}-id`,
+        vaultInfo,
+        nameFormatted: true,
+    });
+    const principalId = await (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,
+    };
+};
+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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

package/AzAd/Identities/AzDevOpsIdentity.d.ts

@@ -3,10 +3,10 @@ export declare const defaultAzAdoName = "azure-devops";
 interface Props {
     name?: string;
     vaultInfo: KeyVaultInfo;
-    additionRoles?: string[];
+    isSubOwner?: boolean;
 }
 /** Get Global  ADO Identity */
 export declare const getAdoIdentityInfo: (vaultInfo: KeyVaultInfo) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("../Helper").IdentityInfoResults>>;
 /** Create Global ADO Identity */
-declare const _default: ({ name, vaultInfo, additionRoles, ...others }: Props) => import("../Identity").IdentityResult;
+declare const _default: ({ name, vaultInfo, isSubOwner, ...others }: Props) => import("../Identity").IdentityResult;
 export default _default;

package/AzAd/Identities/AzDevOpsIdentity.js

@@ -4,10 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAdoIdentityInfo = exports.defaultAzAdoName = void 0;
+const Common_1 = require("../../Common");
 const Identity_1 = __importDefault(require("../Identity"));
 const GraphDefinition_1 = require("../GraphDefinition");
 const Helper_1 = require("../Helper");
-const AzureEnv_1 = require("../../Common/AzureEnv");
+const RoleAssignment_1 = require("../RoleAssignment");
 exports.defaultAzAdoName = 'azure-devops';
 /** Get Global  ADO Identity */
 const getAdoIdentityInfo = (vaultInfo) => (0, Helper_1.getIdentityInfoOutput)({
@@ -17,7 +18,8 @@ const getAdoIdentityInfo = (vaultInfo) => (0, Helper_1.getIdentityInfoOutput)({
 });
 exports.getAdoIdentityInfo = getAdoIdentityInfo;
 /** Create Global ADO Identity */
-exports.default = ({ name = exports.defaultAzAdoName, vaultInfo, additionRoles = ['Owner'], ...others }) => {
+exports.default = ({ name = exports.defaultAzAdoName, vaultInfo, isSubOwner, ...others }) => {
+    const roleName = isSubOwner ? 'Owner' : 'Contributor';
     const graphAccess = (0, GraphDefinition_1.getGraphPermissions)({ name: 'User.Read', type: 'Scope' });
     const ado = (0, Identity_1.default)({
         name,
@@ -25,14 +27,18 @@ exports.default = ({ name = exports.defaultAzAdoName, vaultInfo, additionRoles =
         createClientSecret: true,
         createPrincipal: true,
         requiredResourceAccesses: [graphAccess],
-        roles: additionRoles.map((role) => ({
-            name: role,
-            scope: AzureEnv_1.defaultSubScope,
-        })),
         vaultInfo,
         ...others,
     });
+    (0, RoleAssignment_1.roleAssignment)({
+        name,
+        scope: Common_1.defaultSubScope,
+        dependsOn: ado.resource,
+        principalId: ado.principalId,
+        principalType: 'ServicePrincipal',
+        roleName,
+    });
     console.log(`Add this principal ${name} to [User administrator, Application administrator, Cloud application administrator and Global Reader] of Azure AD to allow to Add/Update and Delete Groups, Users`);
     return ado;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXpEZXZPcHNJZGVudGl0eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9BekFkL0lkZW50aXRpZXMvQXpEZXZPcHNJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFDQSwyREFBbUM7QUFDbkMsd0RBQXlEO0FBQ3pELHNDQUFrRDtBQUNsRCxvREFBd0Q7QUFFM0MsUUFBQSxnQkFBZ0IsR0FBRyxjQUFjLENBQUM7QUFRL0MsK0JBQStCO0FBQ3hCLE1BQU0sa0JBQWtCLEdBQUcsQ0FBQyxTQUF1QixFQUFFLEVBQUUsQ0FDNUQsSUFBQSw4QkFBcUIsRUFBQztJQUNwQixJQUFJLEVBQUUsd0JBQWdCO0lBQ3RCLFNBQVM7SUFDVCxnQkFBZ0IsRUFBRSxJQUFJO0NBQ3ZCLENBQUMsQ0FBQztBQUxRLFFBQUEsa0JBQWtCLHNCQUsxQjtBQUVMLGlDQUFpQztBQUNqQyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxHQUFHLHdCQUFnQixFQUN2QixTQUFTLEVBQ1QsYUFBYSxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQ3pCLEdBQUcsTUFBTSxFQUNILEVBQUUsRUFBRTtJQUNWLE1BQU0sV0FBVyxHQUFHLElBQUEscUNBQW1CLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRTlFLE1BQU0sR0FBRyxHQUFHLElBQUEsa0JBQVEsRUFBQztRQUNuQixJQUFJO1FBQ0osT0FBTyxFQUFFLEtBQUs7UUFDZCxrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLHdCQUF3QixFQUFFLENBQUMsV0FBVyxDQUFDO1FBQ3ZDLEtBQUssRUFBRSxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ2xDLElBQUksRUFBRSxJQUFJO1lBQ1YsS0FBSyxFQUFFLDBCQUFlO1NBQ3ZCLENBQUMsQ0FBQztRQUNILFNBQVM7UUFDVCxHQUFHLE1BQU07S0FDVixDQUFDLENBQUM7SUFFSCxPQUFPLENBQUMsR0FBRyxDQUNULHNCQUFzQixJQUFJLG9LQUFvSyxDQUMvTCxDQUFDO0lBRUYsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXpEZXZPcHNJZGVudGl0eS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9BekFkL0lkZW50aXRpZXMvQXpEZXZPcHNJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx5Q0FBK0M7QUFFL0MsMkRBQW1DO0FBQ25DLHdEQUF5RDtBQUN6RCxzQ0FBa0Q7QUFDbEQsc0RBQW1EO0FBRXRDLFFBQUEsZ0JBQWdCLEdBQUcsY0FBYyxDQUFDO0FBUS9DLCtCQUErQjtBQUN4QixNQUFNLGtCQUFrQixHQUFHLENBQUMsU0FBdUIsRUFBRSxFQUFFLENBQzVELElBQUEsOEJBQXFCLEVBQUM7SUFDcEIsSUFBSSxFQUFFLHdCQUFnQjtJQUN0QixTQUFTO0lBQ1QsZ0JBQWdCLEVBQUUsSUFBSTtDQUN2QixDQUFDLENBQUM7QUFMUSxRQUFBLGtCQUFrQixzQkFLMUI7QUFFTCxpQ0FBaUM7QUFDakMsa0JBQWUsQ0FBQyxFQUNkLElBQUksR0FBRyx3QkFBZ0IsRUFDdkIsU0FBUyxFQUNULFVBQVUsRUFDVixHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixNQUFNLFFBQVEsR0FBRyxVQUFVLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDO0lBQ3RELE1BQU0sV0FBVyxHQUFHLElBQUEscUNBQW1CLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRTlFLE1BQU0sR0FBRyxHQUFHLElBQUEsa0JBQVEsRUFBQztRQUNuQixJQUFJO1FBQ0osT0FBTyxFQUFFLEtBQUs7UUFDZCxrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLGVBQWUsRUFBRSxJQUFJO1FBQ3JCLHdCQUF3QixFQUFFLENBQUMsV0FBVyxDQUFDO1FBQ3ZDLFNBQVM7UUFDVCxHQUFHLE1BQU07S0FDVixDQUFDLENBQUM7SUFFSCxJQUFBLCtCQUFjLEVBQUM7UUFDYixJQUFJO1FBQ0osS0FBSyxFQUFFLHdCQUFlO1FBQ3RCLFNBQVMsRUFBRSxHQUFHLENBQUMsUUFBUTtRQUN2QixXQUFXLEVBQUUsR0FBRyxDQUFDLFdBQVk7UUFDN0IsYUFBYSxFQUFFLGtCQUFrQjtRQUNqQyxRQUFRO0tBQ1QsQ0FBQyxDQUFDO0lBRUgsT0FBTyxDQUFDLEdBQUcsQ0FDVCxzQkFBc0IsSUFBSSxvS0FBb0ssQ0FDL0wsQ0FBQztJQUVGLE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQyxDQUFDIn0=

package/AzAd/Identities/AzDevOpsManagedIdentity.js

@@ -5,16 +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");
-const AzureEnv_1 = require("../../Common/AzureEnv");
 exports.default = ({ name = AzDevOpsIdentity_1.defaultAzAdoName, ...others }) => {
-    const additionRoles = ['Owner'];
     return (0, UserAssignedIdentity_1.default)({
         name,
-        roles: additionRoles.map((role) => ({
-            name: role,
-            scope: AzureEnv_1.defaultSubScope,
-        })),
+        role: 'admin',
         ...others,
     });
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXpEZXZPcHNNYW5hZ2VkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQXpBZC9JZGVudGl0aWVzL0F6RGV2T3BzTWFuYWdlZElkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQ0EsbUZBQTJEO0FBQzNELHlEQUFzRDtBQUN0RCxvREFBd0Q7QUFNeEQsa0JBQWUsQ0FBQyxFQUFFLElBQUksR0FBRyxtQ0FBZ0IsRUFBRSxHQUFHLE1BQU0sRUFBUyxFQUFFLEVBQUU7SUFDL0QsTUFBTSxhQUFhLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUVoQyxPQUFPLElBQUEsOEJBQW9CLEVBQUM7UUFDMUIsSUFBSTtRQUNKLEtBQUssRUFBRSxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ2xDLElBQUksRUFBRSxJQUFJO1lBQ1YsS0FBSyxFQUFFLDBCQUFlO1NBQ3ZCLENBQUMsQ0FBQztRQUNILEdBQUcsTUFBTTtLQUNWLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXpEZXZPcHNNYW5hZ2VkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQXpBZC9JZGVudGl0aWVzL0F6RGV2T3BzTWFuYWdlZElkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQ0EsbUZBQTJEO0FBQzNELHlEQUFzRDtBQU10RCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxHQUFHLG1DQUFnQixFQUFFLEdBQUcsTUFBTSxFQUFTLEVBQUUsRUFBRTtJQUMvRCxPQUFPLElBQUEsOEJBQW9CLEVBQUM7UUFDMUIsSUFBSTtRQUNKLElBQUksRUFBRSxPQUFPO1FBQ2IsR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDIn0=

package/AzAd/Identities/AzUserAdRevertSync.d.ts

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