@drunk-pulumi/azure 0.0.25 → 0.0.26

package/Common/ResourceEnv.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResourceName = exports.resourceConvention = void 0;
 const Helpers_1 = require("./Helpers");
 const StackEnv_1 = require("./StackEnv");
+const AzureEnv_1 = require("./AzureEnv");
 exports.resourceConvention = {
     prefix: StackEnv_1.stack,
+    includeRegion: true,
     suffix: undefined, //This may be specified by each resource name
 };
 /** ==================== Resources Variables ========================= */
@@ -12,12 +14,15 @@ const getName = (name, convention) => {
     if (!name)
         return name;
     name = (0, Helpers_1.replaceAll)(name, ' ', '-');
-    //Add prefix
-    if (convention.prefix && !name.startsWith(convention.prefix))
-        name = convention.prefix + '-' + name;
     //Organization
     if (convention.includeOrgName && !name.includes(StackEnv_1.organization))
         name = name + '-' + StackEnv_1.organization;
+    //Region
+    if (convention.includeRegion && AzureEnv_1.currentLocationCode && !name.includes(AzureEnv_1.currentLocationCode))
+        name = name + '-' + AzureEnv_1.currentLocationCode;
+    //Add prefix
+    if (convention.prefix && !name.startsWith(convention.prefix))
+        name = convention.prefix + '-' + name;
     //Add the suffix
     if (convention.suffix && !name.endsWith(convention.suffix))
         name = name + '-' + convention.suffix;
@@ -26,4 +31,4 @@ const getName = (name, convention) => {
 /** The method to get Resource Name. This is not applicable for Azure Storage Account and CosmosDb*/
 const getResourceName = (name, convention) => getName(name, { ...exports.resourceConvention, ...convention });
 exports.getResourceName = getResourceName;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VFbnYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL1Jlc291cmNlRW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVDQUF1QztBQUd2Qyx5Q0FBaUQ7QUFFcEMsUUFBQSxrQkFBa0IsR0FBRztJQUNoQyxNQUFNLEVBQUUsZ0JBQUs7SUFDYixNQUFNLEVBQUUsU0FBUyxFQUFFLDZDQUE2QztDQUNqRSxDQUFDO0FBRUYseUVBQXlFO0FBRXpFLE1BQU0sT0FBTyxHQUFHLENBQUMsSUFBWSxFQUFFLFVBQTJCLEVBQVUsRUFBRTtJQUNwRSxJQUFJLENBQUMsSUFBSTtRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQ3ZCLElBQUksR0FBRyxJQUFBLG9CQUFVLEVBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUVsQyxZQUFZO0lBQ1osSUFBSSxVQUFVLENBQUMsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDO1FBQzFELElBQUksR0FBRyxVQUFVLENBQUMsTUFBTSxHQUFHLEdBQUcsR0FBRyxJQUFJLENBQUM7SUFFeEMsY0FBYztJQUNkLElBQUksVUFBVSxDQUFDLGNBQWMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsdUJBQVksQ0FBQztRQUMzRCxJQUFJLEdBQUcsSUFBSSxHQUFHLEdBQUcsR0FBRyx1QkFBWSxDQUFDO0lBRW5DLGdCQUFnQjtJQUNoQixJQUFJLFVBQVUsQ0FBQyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUM7UUFDeEQsSUFBSSxHQUFHLElBQUksR0FBRyxHQUFHLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQztJQUV4QyxPQUFPLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztBQUM1QixDQUFDLENBQUM7QUFFRixvR0FBb0c7QUFDN0YsTUFBTSxlQUFlLEdBQUcsQ0FDN0IsSUFBWSxFQUNaLFVBQTRCLEVBQ3BCLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEVBQUUsR0FBRywwQkFBa0IsRUFBRSxHQUFHLFVBQVUsRUFBRSxDQUFDLENBQUM7QUFIeEQsUUFBQSxlQUFlLG1CQUd5QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VFbnYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL1Jlc291cmNlRW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVDQUF1QztBQUd2Qyx5Q0FBaUQ7QUFDakQseUNBQStDO0FBRWxDLFFBQUEsa0JBQWtCLEdBQW1CO0lBQ2hELE1BQU0sRUFBRSxnQkFBSztJQUNiLGFBQWEsRUFBRSxJQUFJO0lBQ25CLE1BQU0sRUFBRSxTQUFTLEVBQUUsNkNBQTZDO0NBQ2pFLENBQUM7QUFFRix5RUFBeUU7QUFFekUsTUFBTSxPQUFPLEdBQUcsQ0FBQyxJQUFZLEVBQUUsVUFBMkIsRUFBVSxFQUFFO0lBQ3BFLElBQUksQ0FBQyxJQUFJO1FBQUUsT0FBTyxJQUFJLENBQUM7SUFDdkIsSUFBSSxHQUFHLElBQUEsb0JBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRWxDLGNBQWM7SUFDZCxJQUFJLFVBQVUsQ0FBQyxjQUFjLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLHVCQUFZLENBQUM7UUFDM0QsSUFBSSxHQUFHLElBQUksR0FBRyxHQUFHLEdBQUcsdUJBQVksQ0FBQztJQUVuQyxRQUFRO0lBQ1IsSUFBSSxVQUFVLENBQUMsYUFBYSxJQUFJLDhCQUFtQixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyw4QkFBbUIsQ0FBQztRQUN4RixJQUFJLEdBQUcsSUFBSSxHQUFHLEdBQUcsR0FBRyw4QkFBbUIsQ0FBQztJQUUxQyxZQUFZO0lBQ1osSUFBSSxVQUFVLENBQUMsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDO1FBQzFELElBQUksR0FBRyxVQUFVLENBQUMsTUFBTSxHQUFHLEdBQUcsR0FBRyxJQUFJLENBQUM7SUFFeEMsZ0JBQWdCO0lBQ2hCLElBQUksVUFBVSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQztRQUN4RCxJQUFJLEdBQUcsSUFBSSxHQUFHLEdBQUcsR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO0lBRXhDLE9BQU8sSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO0FBQzVCLENBQUMsQ0FBQztBQUVGLG9HQUFvRztBQUM3RixNQUFNLGVBQWUsR0FBRyxDQUM3QixJQUFZLEVBQ1osVUFBNEIsRUFDcEIsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLDBCQUFrQixFQUFFLEdBQUcsVUFBVSxFQUFFLENBQUMsQ0FBQztBQUh4RCxRQUFBLGVBQWUsbUJBR3lDIn0=

package/KeyVault/Helper.d.ts

@@ -31,4 +31,8 @@ interface KeyResult {
 }
 /** Convert VaultId to VaultInfo */
 export declare const parseKeyUrl: (keyUrl: string) => KeyResult;
+export declare const getVaultRoleNames: (nameOrInfo: string | KeyVaultInfo) => Promise<{
+    readOnly: string;
+    admin: string;
+} | undefined>;
 export {};

package/KeyVault/Helper.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseKeyUrl = exports.getSecret = exports.getEncryptionKey = exports.getKey = exports.addKey = void 0;
+exports.getVaultRoleNames = exports.parseKeyUrl = exports.getSecret = exports.getEncryptionKey = exports.getKey = exports.addKey = void 0;
 const keyvault = require("@pulumi/azure-native/keyvault");
 const pulumi_1 = require("@pulumi/pulumi");
 const Naming_1 = require("../Common/Naming");
 const Helpers_1 = require("../Common/Helpers");
 const KeyVaultBase_1 = require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase");
+const VaultRole = require("../AzAd/KeyVaultRoles");
 const addKey = ({ name, vaultInfo, tags, dependsOn, }) => {
     const n = (0, Naming_1.getSecretName)(name);
     return new keyvault.Key((0, Helpers_1.replaceAll)(name, ".", "-"), {
@@ -61,4 +62,17 @@ const parseKeyUrl = (keyUrl) => {
     };
 };
 exports.parseKeyUrl = parseKeyUrl;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwwREFBMEQ7QUFDMUQsMkNBQXlEO0FBR3pELDZDQUFpRDtBQUNqRCwrQ0FBK0M7QUFFL0Msb0ZBQW9GO0FBd0I3RSxNQUFNLE1BQU0sR0FBRyxDQUFDLEVBQ3JCLElBQUksRUFDSixTQUFTLEVBQ1QsSUFBSSxFQUNKLFNBQVMsR0FDa0MsRUFBRSxFQUFFO0lBQy9DLE1BQU0sQ0FBQyxHQUFHLElBQUEsc0JBQWEsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU5QixPQUFPLElBQUksUUFBUSxDQUFDLEdBQUcsQ0FDckIsSUFBQSxvQkFBVSxFQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQzFCO1FBQ0UsT0FBTyxFQUFFLENBQUM7UUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7UUFDekIsR0FBRyxTQUFTLENBQUMsS0FBSztRQUNsQixzR0FBc0c7UUFDdEcsVUFBVSxFQUFFO1lBQ1YsT0FBTyxFQUFFLElBQUk7WUFDYixHQUFHLEVBQUUsS0FBSztZQUNWLE1BQU0sRUFBRTtnQkFDTixTQUFTO2dCQUNULFNBQVM7Z0JBQ1QsTUFBTTtnQkFDTixRQUFRO2dCQUNSLFNBQVM7Z0JBQ1QsV0FBVzthQUNaO1lBQ0Qsb0JBQW9CO1lBQ3BCLFVBQVUsRUFBRSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUU7U0FDOUI7UUFDRCxJQUFJO0tBQ0wsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7QUFDSixDQUFDLENBQUM7QUFqQ1csUUFBQSxNQUFNLFVBaUNqQjtBQUVGLGNBQWM7QUFDUCxNQUFNLE1BQU0sR0FBRyxLQUFLLEVBQUUsRUFDM0IsSUFBSSxFQUNKLE9BQU8sRUFDUCxTQUFTLEVBQ1QsYUFBYSxHQUNLLEVBQUUsRUFBRTtJQUN0QixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxzQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUEsOEJBQWUsRUFBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUNuQyxDQUFDLENBQUM7QUFUVyxRQUFBLE1BQU0sVUFTakI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQUMsSUFBWSxFQUFFLFNBQXVCLEVBQUUsRUFBRTtJQUN4RSxNQUFNLENBQUMsR0FBRyxHQUFHLElBQUksY0FBYyxDQUFDO0lBQ2hDLE9BQU8sSUFBQSxlQUFNLEVBQUMsSUFBQSw4QkFBZSxFQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNuRSxDQUFDLENBQUM7QUFIVyxRQUFBLGdCQUFnQixvQkFHM0I7QUFFRixpQkFBaUI7QUFDVixNQUFNLFNBQVMsR0FBRyxLQUFLLEVBQUUsRUFDOUIsSUFBSSxFQUNKLE9BQU8sRUFDUCxTQUFTLEVBQ1QsYUFBYSxHQUNLLEVBQUUsRUFBRTtJQUN0QixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxzQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUEsOEJBQWUsRUFBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsT0FBTyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUN0QyxDQUFDLENBQUM7QUFUVyxRQUFBLFNBQVMsYUFTcEI7QUFVRixtQ0FBbUM7QUFDNUIsTUFBTSxXQUFXLEdBQUcsQ0FBQyxNQUFjLEVBQWEsRUFBRTtJQUN2RCxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2pDLE9BQU87UUFDTCxjQUFjLEVBQUUsTUFBTTtRQUN0QixJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNmLE9BQU8sRUFBRSxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQzNDLFFBQVEsRUFBRSxXQUFXLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRTtLQUNqQyxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBUlcsUUFBQSxXQUFXLGVBUXRCIn0=
+const getVaultRoleNames = async (nameOrInfo) => {
+    if (typeof nameOrInfo === "string") {
+        return VaultRole.getVaultRoleNames(nameOrInfo);
+    }
+    const value = await (0, exports.getSecret)({
+        name: "VaultRoleNames",
+        vaultInfo: nameOrInfo,
+    });
+    return value
+        ? JSON.parse(value.value)
+        : undefined;
+};
+exports.getVaultRoleNames = getVaultRoleNames;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwwREFBMEQ7QUFDMUQsMkNBQXlEO0FBRXpELDZDQUFpRDtBQUNqRCwrQ0FBK0M7QUFDL0Msb0ZBQW9GO0FBQ3BGLG1EQUFtRDtBQXdCNUMsTUFBTSxNQUFNLEdBQUcsQ0FBQyxFQUNyQixJQUFJLEVBQ0osU0FBUyxFQUNULElBQUksRUFDSixTQUFTLEdBQ2tDLEVBQUUsRUFBRTtJQUMvQyxNQUFNLENBQUMsR0FBRyxJQUFBLHNCQUFhLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFOUIsT0FBTyxJQUFJLFFBQVEsQ0FBQyxHQUFHLENBQ3JCLElBQUEsb0JBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUMxQjtRQUNFLE9BQU8sRUFBRSxDQUFDO1FBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJO1FBQ3pCLEdBQUcsU0FBUyxDQUFDLEtBQUs7UUFDbEIsc0dBQXNHO1FBQ3RHLFVBQVUsRUFBRTtZQUNWLE9BQU8sRUFBRSxJQUFJO1lBQ2IsR0FBRyxFQUFFLEtBQUs7WUFDVixNQUFNLEVBQUU7Z0JBQ04sU0FBUztnQkFDVCxTQUFTO2dCQUNULE1BQU07Z0JBQ04sUUFBUTtnQkFDUixTQUFTO2dCQUNULFdBQVc7YUFDWjtZQUNELG9CQUFvQjtZQUNwQixVQUFVLEVBQUUsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFO1NBQzlCO1FBQ0QsSUFBSTtLQUNMLEVBQ0QsRUFBRSxTQUFTLEVBQUUsQ0FDZCxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBakNXLFFBQUEsTUFBTSxVQWlDakI7QUFFRixjQUFjO0FBQ1AsTUFBTSxNQUFNLEdBQUcsS0FBSyxFQUFFLEVBQzNCLElBQUksRUFDSixPQUFPLEVBQ1AsU0FBUyxFQUNULGFBQWEsR0FDSyxFQUFFLEVBQUU7SUFDdEIsTUFBTSxD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

package/KeyVault/VaultPermissions.d.ts

@@ -1,26 +1,27 @@
-import * as pulumi from '@pulumi/pulumi';
-import * as native from '@pulumi/azure-native';
+import * as pulumi from "@pulumi/pulumi";
+import * as native from "@pulumi/azure-native";
+import * as azuread from "@pulumi/azuread";
+import { KeyVaultInfo } from "../types";
 export interface PermissionProps {
     /** The object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault. The object ID must be unique for the list of access policies. */
     objectId: pulumi.Input<string>;
     /** Application ID of the client making request on behalf of a principal */
     applicationId?: pulumi.Input<string>;
-    permission: 'ReadOnly' | 'ReadWrite';
+    permission: "ReadOnly" | "ReadWrite";
     principalType?: native.authorization.PrincipalType;
 }
-export declare const grantVaultRbacPermission: ({ name, objectId, permission, scope, principalType, }: PermissionProps & {
+export declare const grantVaultAccessToIdentity: ({ name, identity, vaultInfo, }: {
     name: string;
-    scope: pulumi.Input<string>;
+    identity: pulumi.Output<{
+        principalId: string;
+    } | undefined>;
+    vaultInfo: KeyVaultInfo;
+}) => pulumi.OutputInstance<void>;
+export declare const grantVaultPermissionToRole: ({ name, vaultInfo, roles, }: {
+    name: string;
+    vaultInfo: KeyVaultInfo;
+    roles: {
+        adminGroup: pulumi.Output<azuread.Group>;
+        readOnlyGroup: pulumi.Output<azuread.Group>;
+    };
 }) => void;
-export declare const KeyVaultAdminPolicy: {
-    certificates: string[];
-    keys: string[];
-    secrets: string[];
-    storage: string[];
-};
-export declare const KeyVaultReadOnlyPolicy: {
-    certificates: string[];
-    keys: string[];
-    secrets: string[];
-    storage: string[];
-};

package/KeyVault/VaultPermissions.js

@@ -1,31 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyVaultReadOnlyPolicy = exports.KeyVaultAdminPolicy = exports.grantVaultRbacPermission = void 0;
+exports.grantVaultPermissionToRole = exports.grantVaultAccessToIdentity = void 0;
+const pulumi = require("@pulumi/pulumi");
 const RoleAssignment_1 = require("../AzAd/RoleAssignment");
-const grantVaultRbacPermission = ({ name, objectId, permission, scope, principalType = 'User', }) => {
+const CustomHelper_1 = require("./CustomHelper");
+const AzDevOps_1 = require("../AzAd/Identities/AzDevOps");
+const Helper_1 = require("./Helper");
+const Group_1 = require("../AzAd/Group");
+const grantVaultRbacPermission = ({ name, objectId, permission, scope, principalType = "User", }) => {
     const vn = `${name}-${permission}`.toLowerCase();
     const defaultProps = {
         principalId: objectId,
         scope,
     };
     //ReadOnly
-    if (permission === 'ReadOnly') {
+    if (permission === "ReadOnly") {
         (0, RoleAssignment_1.roleAssignment)({
             ...defaultProps,
             name: `${vn}-encrypt`,
-            roleName: 'Key Vault Crypto Service Encryption User',
+            roleName: "Key Vault Crypto Service Encryption User",
             principalType,
         });
         (0, RoleAssignment_1.roleAssignment)({
             ...defaultProps,
             name: `${vn}-crypto`,
-            roleName: 'Key Vault Crypto User',
+            roleName: "Key Vault Crypto User",
             principalType,
         });
         (0, RoleAssignment_1.roleAssignment)({
             ...defaultProps,
             name: `${vn}-secret`,
-            roleName: 'Key Vault Secrets User',
+            roleName: "Key Vault Secrets User",
             principalType,
         });
         //Read and Write
@@ -34,108 +39,160 @@ const grantVaultRbacPermission = ({ name, objectId, permission, scope, principal
         (0, RoleAssignment_1.roleAssignment)({
             ...defaultProps,
             name: `${vn}-contributor`,
-            roleName: 'Key Vault Administrator',
+            roleName: "Key Vault Administrator",
             principalType,
         });
         (0, RoleAssignment_1.roleAssignment)({
             ...defaultProps,
             name: `${vn}-cert`,
-            roleName: 'Key Vault Certificates Officer',
+            roleName: "Key Vault Certificates Officer",
             principalType,
         });
         (0, RoleAssignment_1.roleAssignment)({
             ...defaultProps,
             name: `${vn}-crypto`,
-            roleName: 'Key Vault Crypto Officer',
+            roleName: "Key Vault Crypto Officer",
             principalType,
         });
         (0, RoleAssignment_1.roleAssignment)({
             ...defaultProps,
             name: `${vn}-secret`,
-            roleName: 'Key Vault Secrets Officer',
+            roleName: "Key Vault Secrets Officer",
             principalType,
         });
     }
 };
-exports.grantVaultRbacPermission = grantVaultRbacPermission;
-exports.KeyVaultAdminPolicy = {
-    certificates: [
-        'Backup',
-        'Create',
-        'Delete',
-        'DeleteIssuers',
-        'Get',
-        'GetIssuers',
-        'Import',
-        'List',
-        'ManageContacts',
-        'ManageIssuers',
-        'Purge',
-        'Recover',
-        'Restore',
-        'SetIssuers',
-        'Update',
-    ],
-    keys: [
-        'Backup',
-        'Create',
-        'Decrypt',
-        'Delete',
-        'Encrypt',
-        'Get',
-        'Import',
-        'List',
-        'Purge',
-        'Recover',
-        'Restore',
-        'Sign',
-        'UnwrapKey',
-        'Update',
-        'Verify',
-        'WrapKey',
-    ],
-    secrets: [
-        'Backup',
-        'Delete',
-        'Get',
-        'List',
-        'Purge',
-        'Recover',
-        'Restore',
-        'Set',
-    ],
-    storage: [
-        'Backup',
-        'Delete',
-        'DeleteSAS',
-        'Get',
-        'GetSAS',
-        'List',
-        'ListSAS',
-        'Purge',
-        'Recover',
-        'RegenerateKey',
-        'Restore',
-        'Set',
-        'SetSAS',
-        'Update',
-    ],
-};
-exports.KeyVaultReadOnlyPolicy = {
-    certificates: ['Get', 'List'],
-    keys: [
-        'Get',
-        'List',
-        'Decrypt',
-        'Encrypt',
-        'Sign',
-        'UnwrapKey',
-        'Verify',
-        'WrapKey',
-    ],
-    secrets: ['Get', 'List'],
-    storage: ['Get', 'List'],
+const grantVaultAccessToIdentity = ({ name, identity, vaultInfo, }) => identity.apply(async (i) => {
+    if (!i)
+        return;
+    const vaultRole = await (0, Helper_1.getVaultRoleNames)(vaultInfo);
+    if (!vaultRole)
+        return;
+    (0, Group_1.addMemberToGroup)({
+        name: `${name}-identity-readAccess-${vaultInfo.name}`,
+        objectId: i.principalId,
+        groupObjectId: (0, Group_1.getAdGroup)(vaultRole.readOnly).objectId,
+    });
+});
+exports.grantVaultAccessToIdentity = grantVaultAccessToIdentity;
+const grantVaultPermissionToRole = ({ name, vaultInfo, roles, }) => {
+    //Grant RBAC permission to Group
+    grantVaultRbacPermission({
+        name: `${name}-ReadOnlyGroup`,
+        scope: vaultInfo.id,
+        objectId: roles.readOnlyGroup.objectId,
+        permission: "ReadOnly",
+        principalType: "Group",
+    });
+    grantVaultRbacPermission({
+        name: `${name}-AdminGroup`,
+        scope: vaultInfo.id,
+        objectId: roles.adminGroup.objectId,
+        permission: "ReadWrite",
+        principalType: "Group",
+    });
+    //Grant Admin RBAC permission current ADO Identity as the Group will be take time to be effective
+    const ado = (0, AzDevOps_1.getAdoIdentity)();
+    grantVaultRbacPermission({
+        name: `${name}-Admin-Ado`,
+        scope: vaultInfo.id,
+        objectId: ado.principal.objectId,
+        permission: "ReadWrite",
+        principalType: "ServicePrincipal",
+    });
+    //Add RoleNames to vault
+    (0, CustomHelper_1.addCustomSecret)({
+        name: "VaultRoleNames",
+        value: pulumi
+            .output({
+            admin: roles.adminGroup.displayName,
+            readOnly: roles.readOnlyGroup.displayName,
+        })
+            .apply((role) => JSON.stringify(role)),
+        vaultInfo,
+        contentType: "KeyVault Roles Names",
+    });
 };
+exports.grantVaultPermissionToRole = grantVaultPermissionToRole;
+// export const KeyVaultAdminPolicy = {
+//   certificates: [
+//     'Backup',
+//     'Create',
+//     'Delete',
+//     'DeleteIssuers',
+//     'Get',
+//     'GetIssuers',
+//     'Import',
+//     'List',
+//     'ManageContacts',
+//     'ManageIssuers',
+//     'Purge',
+//     'Recover',
+//     'Restore',
+//     'SetIssuers',
+//     'Update',
+//   ],
+//   keys: [
+//     'Backup',
+//     'Create',
+//     'Decrypt',
+//     'Delete',
+//     'Encrypt',
+//     'Get',
+//     'Import',
+//     'List',
+//     'Purge',
+//     'Recover',
+//     'Restore',
+//     'Sign',
+//     'UnwrapKey',
+//     'Update',
+//     'Verify',
+//     'WrapKey',
+//   ],
+//   secrets: [
+//     'Backup',
+//     'Delete',
+//     'Get',
+//     'List',
+//     'Purge',
+//     'Recover',
+//     'Restore',
+//     'Set',
+//   ],
+//   storage: [
+//     'Backup',
+//     'Delete',
+//     'DeleteSAS',
+//     'Get',
+//     'GetSAS',
+//     'List',
+//     'ListSAS',
+//     'Purge',
+//     'Recover',
+//     'RegenerateKey',
+//     'Restore',
+//     'Set',
+//     'SetSAS',
+//     'Update',
+//   ],
+// };
+//
+// export const KeyVaultReadOnlyPolicy = {
+//   certificates: ['Get', 'List'],
+//   keys: [
+//     'Get',
+//     'List',
+//     'Decrypt',
+//     'Encrypt',
+//     'Sign',
+//     'UnwrapKey',
+//     'Verify',
+//     'WrapKey',
+//   ],
+//   secrets: ['Get', 'List'],
+//   storage: ['Get', 'List'],
+// };
 // export const grantVaultAccessPolicy = ({
 //   name,
 //   objectId,
@@ -166,4 +223,4 @@ exports.KeyVaultReadOnlyPolicy = {
 //         ? KeyVaultReadOnlyPolicy.storage
 //         : KeyVaultAdminPolicy.storage,
 //   });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVmF1bHRQZXJtaXNzaW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9LZXlWYXVsdC9WYXVsdFBlcm1pc3Npb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJEQUF3RDtBQVlqRCxNQUFNLHdCQUF3QixHQUFHLENBQUMsRUFDdkMsSUFBSSxFQUNKLFFBQVEsRUFDUixVQUFVLEVBQ1YsS0FBSyxFQUNMLGFBQWEsR0FBRyxNQUFNLEdBSXZCLEVBQUUsRUFBRTtJQUNILE1BQU0sRUFBRSxHQUFHLEdBQUcsSUFBSSxJQUFJLFVBQVUsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBRWpELE1BQU0sWUFBWSxHQUFHO1FBQ25CLFdBQVcsRUFBRSxRQUFRO1FBQ3JCLEtBQUs7S0FDTixDQUFDO0lBRUYsVUFBVTtJQUNWLElBQUksVUFBVSxLQUFLLFVBQVUsRUFBRSxDQUFDO1FBQzlCLElBQUEsK0JBQWMsRUFBQztZQUNiLEdBQUcsWUFBWTtZQUNmLElBQUksRUFBRSxHQUFHLEVBQUUsVUFBVTtZQUNyQixRQUFRLEVBQUUsMENBQTBDO1lBQ3BELGFBQWE7U0FDZCxDQUFDLENBQUM7UUFDSCxJQUFBLCtCQUFjLEVBQUM7WUFDYixHQUFHLFlBQVk7WUFDZixJQUFJLEVBQUUsR0FBRyxFQUFFLFNBQVM7WUFDcEIsUUFBUSxFQUFFLHVCQUF1QjtZQUNqQyxhQUFhO1NBQ2QsQ0FBQyxDQUFDO1FBQ0gsSUFBQSwrQkFBYyxFQUFDO1lBQ2IsR0FBRyxZQUFZO1lBQ2YsSUFBSSxFQUFFLEdBQUcsRUFBRSxTQUFTO1lBQ3BCLFFBQVEsRUFBRSx3QkFBd0I7WUFDbEMsYUFBYTtTQUNkLENBQUMsQ0FBQztRQUNILGdCQUFnQjtJQUNsQixDQUFDO1NBQU0sQ0FBQztRQUNOLElBQUEsK0JBQWMsRUFBQztZQUNiLEdBQUcsWUFBWTtZQUNmLElBQUksRUFBRSxHQUFHLEVBQUUsY0FBYztZQUN6QixRQUFRLEVBQUUseUJBQXlCO1lBQ25D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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVmF1bHRQZXJtaXNzaW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9LZXlWYXVsdC9WYXVsdFBlcm1pc3Npb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUF5QztBQUN6QywyREFBd0Q7QUFHeEQsaURBQWlEO0FBRWpELDBEQUE2RDtBQUM3RCxxQ0FBNkM7QUFDN0MseUNBQTZEO0FBVzdELE1BQU0sd0JBQXdCLEdBQUcsQ0FBQyxFQUNoQyxJQUFJLEVBQ0osUUFBUSxFQUNSLFVBQVUsRUFDVixLQUFLLEVBQ0wsYUFBYSxHQUFHLE1BQU0sR0FJdkIsRUFBRSxFQUFFO0lBQ0gsTUFBTSxFQUFFLEdBQUcsR0FBRyxJQUFJLElBQUksVUFBVSxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7SUFFakQsTUFBTSxZQUFZLEdBQUc7UUFDbkIsV0FBVyxFQUFFLFFBQVE7UUFDckIsS0FBSztLQUNOLENBQUM7SUFFRixVQUFVO0lBQ1YsSUFBSSxVQUFVLEtBQUssVUFBVSxFQUFFLENBQUM7UUFDOUIsSUFBQSwrQkFBYyxFQUFDO1lBQ2IsR0FBRyxZQUFZO1lBQ2YsSUFBSSxFQUFFLEdBQUcsRUFBRSxVQUFVO1lBQ3JCLFFBQVEsRUFBRSwwQ0FBMEM7WUFDcEQsYUFBYTtTQUNkLENBQUMsQ0FBQztRQUNILElBQUEsK0JBQWMsRUFBQztZQUNiLEdBQUcsWUFBWTtZQUNmLElBQUksRUFBRSxHQUFHLEVBQUUsU0FBUztZQUNwQixRQUFRLEVBQUUsdUJBQXVCO1lBQ2pDLGFBQWE7U0FDZCxDQUFDLENBQUM7UUFDSCxJQUFBLCtCQUFjLEVBQUM7WUFDYixHQUFHLFlBQVk7WUFDZixJQUFJLEVBQUUsR0FBRyxFQUFFLFNBQVM7WUFDcEIsUUFBUSxFQUFFLHdCQUF3QjtZQUNsQyxhQUFhO1NBQ2QsQ0FBQyxDQUFDO1FBQ0gsZ0JBQWdCO0lBQ2xCLENBQUM7U0FBTSxDQUFDO1FBQ04sSUFBQSwrQkFBYyxFQUFDO1lBQ2IsR0FB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

package/KeyVault/index.d.ts

@@ -1,7 +1,6 @@
 import { Input } from "@pulumi/pulumi";
 import { BasicMonitorArgs, PrivateLinkProps } from "../types";
 import { BasicResourceArgs } from "../types";
-import { VaultAccessType } from "./VaultAccess";
 interface Props extends BasicResourceArgs {
     /**The default-encryption-key, tenant-id va subscription-id will be added to the secrets and keys*/
     createDefaultValues?: boolean;
@@ -9,14 +8,10 @@ interface Props extends BasicResourceArgs {
         ipAddresses?: Array<Input<string>>;
         subnetIds?: Array<Input<string>>;
     };
-    /** The permission and principals that allows to be access to this Key Vault */
-    auth?: VaultAccessType;
 }
-declare const _default: ({ name, group, auth, createDefaultValues, network, ...others }: Props) => {
+declare const _default: ({ name, group, createDefaultValues, network, ...others }: Props) => {
     name: string;
     vault: import("@pulumi/azure-native/keyvault/vault").Vault;
-    readOnlyGroup: import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("@pulumi/azuread").GetGroupResult>> | import("@pulumi/pulumi").Output<import("@pulumi/azuread/group").Group>;
-    adminGroup: import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("@pulumi/azuread").GetGroupResult>> | import("@pulumi/pulumi").Output<import("@pulumi/azuread/group").Group>;
     toVaultInfo: () => {
         name: string;
         group: import("../types").ResourceGroupInfo;

package/KeyVault/index.js

@@ -8,28 +8,13 @@ const Helpers_1 = require("../Logs/Helpers");
 const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
 const CustomHelper_1 = require("./CustomHelper");
 const VaultPermissions_1 = require("./VaultPermissions");
-const VaultAccess_1 = require("./VaultAccess");
+const KeyVaultRoles_1 = require("../AzAd/KeyVaultRoles");
 exports.default = ({ name, 
 //nameConvention,
-group, auth = {}, createDefaultValues, network, ...others }) => {
+group, createDefaultValues, network, ...others }) => {
     const vaultName = (0, Naming_1.getKeyVaultName)(name);
-    const { readOnlyGroup, adminGroup } = (0, VaultAccess_1.default)({ name, auth });
-    // const accessPolicies =
-    //   new Array<native.types.input.keyvault.AccessPolicyEntryArgs>();
-    //Grant Access permission
-    // if (!auth?.enableRbac) {
-    //   accessPolicies.push({
-    //     objectId: readOnlyGroup.objectId,
-    //     tenantId,
-    //     permissions: KeyVaultReadOnlyPolicy,
-    //   });
-    //   accessPolicies.push({
-    //     objectId: adminGroup.objectId,
-    //     tenantId,
-    //     permissions: KeyVaultAdminPolicy,
-    //   });
-    // }
-    const resource = new native.keyvault.Vault(vaultName, {
+    const roles = (0, KeyVaultRoles_1.createVaultRoles)(name);
+    const vault = new native.keyvault.Vault(vaultName, {
         vaultName,
         ...group,
         ...others,
@@ -61,64 +46,52 @@ group, auth = {}, createDefaultValues, network, ...others }) => {
                 },
         },
     });
-    //Grant RBAC permission
-    (0, VaultPermissions_1.grantVaultRbacPermission)({
-        name: `${name}-ReadOnlyGroup`,
-        scope: resource.id,
-        objectId: readOnlyGroup.objectId,
-        permission: "ReadOnly",
-        principalType: "Group",
-    });
-    (0, VaultPermissions_1.grantVaultRbacPermission)({
-        name: `${name}-AdminGroup`,
-        scope: resource.id,
-        objectId: adminGroup.objectId,
-        permission: "ReadWrite",
-        principalType: "Group",
-    });
     //To Vault Info
-    const toVaultInfo = () => ({ name: vaultName, group, id: resource.id });
-    //Add Diagnostic
-    const addDiagnostic = (logInfo) => (0, Helpers_1.createDiagnostic)({
-        name,
-        targetResourceId: resource.id,
-        ...logInfo,
-        logsCategories: ["AuditEvent"],
-    });
-    // Create Private Link
-    const createPrivateLink = (props) => (0, PrivateEndpoint_1.default)({
-        name: (0, Naming_1.getPrivateEndpointName)(name),
+    const toVaultInfo = () => ({
+        name: vaultName,
         group,
-        ...props,
-        resourceId: resource.id,
-        privateDnsZoneName: "privatelink.vaultcore.azure.net",
-        linkServiceGroupIds: ["keyVault"],
+        id: vault.id,
     });
+    const vaultInfo = toVaultInfo();
+    (0, VaultPermissions_1.grantVaultPermissionToRole)({ name, vaultInfo, roles });
     if (createDefaultValues) {
-        const vaultInfo = toVaultInfo();
         (0, CustomHelper_1.addCustomSecret)({
             name: "tenant-id",
             value: AzureEnv_1.tenantId,
             vaultInfo,
             contentType: "KeyVault Default Values",
-            dependsOn: resource,
+            dependsOn: vault,
         });
         (0, CustomHelper_1.addCustomSecret)({
             name: "subscription-id",
             value: AzureEnv_1.subscriptionId,
             vaultInfo,
             contentType: "KeyVault Default Values",
-            dependsOn: resource,
+            dependsOn: vault,
         });
     }
+    //Add Diagnostic
+    const addDiagnostic = (logInfo) => (0, Helpers_1.createDiagnostic)({
+        name,
+        targetResourceId: vault.id,
+        ...logInfo,
+        logsCategories: ["AuditEvent"],
+    });
+    // Create Private Link
+    const createPrivateLink = (props) => (0, PrivateEndpoint_1.default)({
+        name: (0, Naming_1.getPrivateEndpointName)(name),
+        group,
+        ...props,
+        resourceId: vault.id,
+        privateDnsZoneName: "privatelink.vaultcore.azure.net",
+        linkServiceGroupIds: ["keyVault"],
+    });
     return {
         name: vaultName,
-        vault: resource,
-        readOnlyGroup,
-        adminGroup,
+        vault,
         toVaultInfo,
         addDiagnostic,
         createPrivateLink,
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBK0M7QUFDL0Msc0RBQW1EO0FBRW5ELGlEQUc0QjtBQUM1Qiw2Q0FBMkU7QUFDM0UsNkNBQW1EO0FBRW5ELDZEQUFzRDtBQUV0RCxpREFBaUQ7QUFDakQseURBQThEO0FBQzlELCtDQUE2RDtBQWdCN0Qsa0JBQWUsQ0FBQyxFQUNkLElBQUk7QUFDSixpQkFBaUI7QUFDakIsS0FBSyxFQUNMLElBQUksR0FBQyxFQUFFLEVBQ1AsbUJBQW1CLEVBQ25CLE9BQU8sRUFDUCxHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixNQUFNLFNBQVMsR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFeEMsTUFBTSxFQUFFLGFBQWEsRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFBLHFCQUFXLEVBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUVsRSx5QkFBeUI7SUFDekIsb0VBQW9FO0lBRXBFLHlCQUF5QjtJQUN6QiwyQkFBMkI7SUFDM0IsMEJBQTBCO0lBQzFCLHdDQUF3QztJQUN4QyxnQkFBZ0I7SUFDaEIsMkNBQTJDO0lBQzNDLFFBQVE7SUFDUiwwQkFBMEI7SUFDMUIscUNBQXFDO0lBQ3JDLGdCQUFnQjtJQUNoQix3Q0FBd0M7SUFDeEMsUUFBUTtJQUNSLElBQUk7SUFFSixNQUFNLFFBQVEsR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtRQUNwRCxTQUFTO1FBQ1QsR0FBRyxLQUFLO1FBQ1IsR0FBRyxNQUFNO1FBRVQsVUFBVSxFQUFFO1lBQ1YsUUFBUSxFQUFSLG1CQUFRO1lBQ1IsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFO1lBQ3RDLFVBQVUsRUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBK0M7QUFDL0Msc0RBQW1EO0FBRW5ELGlEQUE4RDtBQUM5RCw2Q0FBMkU7QUFDM0UsNkNBQW1EO0FBRW5ELDZEQUFzRDtBQUV0RCxpREFBaUQ7QUFDakQseURBQWdFO0FBQ2hFLHlEQUF5RDtBQVd6RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSTtBQUNKLGlCQUFpQjtBQUNqQixLQUFLLEVBQ0wsbUJBQW1CLEVBQ25CLE9BQU8sRUFDUCxHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixNQUFNLFNBQVMsR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEMsTUFBTSxLQUFLLEdBQUcsSUFBQSxnQ0FBZ0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVyQyxNQUFNLEtBQUssR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtRQUNqRCxTQUFTO1FBQ1QsR0FBRyxLQUFLO1FBQ1IsR0FBRyxNQUFNO1FBRVQsVUFBVSxFQUFFO1lBQ1YsUUFBUSxFQUFSLG1CQUFRO1lBQ1IsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFO1lBQ3RDLFVBQVUsRUFBRSxTQUFTO1lBRXJCLHVCQUF1QixFQUFFLElBQUk7WUFDN0IsY0FBYyxFQUFFLFNBQVM7WUFFekIscUJBQXFCLEVBQUUsSUFBSTtZQUMzQixnQkFBZ0IsRUFBRSxJQUFJO1lBQ3RCLHlCQUF5QixFQUFFLENBQUMsRUFBRSwyRUFBMkU7WUFFekcsb0JBQW9CLEVBQUUsSUFBSTtZQUMxQix3QkFBd0IsRUFBRSxJQUFJO1lBRTlCLFdBQVcsRUFBRSxPQUFPO2dCQUNsQixDQUFDLENBQUM7b0JBQ0UsTUFBTSxFQUFFLGVBQWU7b0JBQ3ZCLGFBQWEsRUFBRSxhQUFLLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFDLElBQUk7b0JBRXBELE9BQU8sRUFBRSxPQUFPLENBQUMsV0FBVzt3QkFDMUIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7d0JBQ2hELENBQUMsQ0FBQyxFQUFFO29CQUVOLG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxTQUFTO3dCQUNwQyxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQzt3QkFDM0MsQ0FBQyxDQUFDLFNBQVM7aUJBQ2Q7Z0JBQ0gsQ0FBQyxDQUFDO29CQUNFLE1BQU0sRUFBRSxlQUFlO29CQUN2QixhQUFhLEVBQUUsYUFBSyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLO2lCQUN0RDtTQUNOO0tBQ0YsQ0FBQyxDQUFDO0lBRUgsZUFBZTtJQUNmLE1BQU0sV0FBVyxHQUFHLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDekIsSUFBSSxFQUFFLFNBQVM7UUFDZixLQUFLO1FBQ0wsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFO0tBQ2IsQ0FBQyxDQUFDO0lBQ0gsTUFBTSxTQUFTLEdBQUcsV0FBVyxFQUFFLENBQUM7SUFFaEMsSUFBQSw2Q0FBMEIsRUFBQyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUV2RCxJQUFJLG1CQUFtQixFQUFFLENBQUM7UUFDeEIsSUFBQSw4QkFBZSxFQUFDO1lBQ2QsSUFBSSxFQUFFLFdBQVc7WUFDakIsS0FBSyxFQUFFLG1CQUFRO1lBQ2YsU0FBUztZQUNULFdBQVcsRUFBRSx5QkFBeUI7WUFDdEMsU0FBUyxFQUFFLEtBQUs7U0FDakIsQ0FBQyxDQUFDO1FBRUgsSUFBQSw4QkFBZSxFQUFDO1lBQ2QsSUFBSSxFQUFFLGlCQUFpQjtZQUN2QixLQUFLLEVBQUUseUJBQWM7WUFDckIsU0FBUztZQUNULFdBQVcsRUFBRSx5QkFBeUI7WUFDdEMsU0FBUyxFQUFFLEtBQUs7U0FDakIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELGdCQUFnQjtJQUNoQixNQUFNLGFBQWEsR0FBRyxDQUFDLE9BQXlCLEVBQUUsRUFBRSxDQUNsRCxJQUFBLDBCQUFnQixFQUFDO1FBQ2YsSUFBSTtRQUNKLGdCQUFnQixFQUFFLEtBQUssQ0FBQyxFQUFFO1FBQzFCLEdBQUcsT0FBTztRQUNWLGNBQWMsRUFBRSxDQUFDLFlBQVksQ0FBQztLQUMvQixDQUFDLENBQUM7SUFFTCxzQkFBc0I7SUFDdEIsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLEtBQXVCLEVBQUUsRUFBRSxDQUNwRCxJQUFBLHlCQUFlLEVBQUM7UUFDZCxJQUFJLEVBQUUsSUFBQSwrQkFBc0IsRUFBQyxJQUFJLENBQUM7UUFDbEMsS0FBSztRQUNMLEdBQUcsS0FBSztRQUNSLFVBQVUsRUFBRSxLQUFLLENBQUMsRUFBRTtRQUNwQixrQkFBa0IsRUFBRSxpQ0FBaUM7UUFDckQsbUJBQW1CLEVBQUUsQ0FBQyxVQUFVLENBQUM7S0FDbEMsQ0FBQyxDQUFDO0lBRUwsT0FBTztRQUNMLElBQUksRUFBRSxTQUFTO1FBQ2YsS0FBSztRQUNMLFdBQVc7UUFDWCxhQUFhO1FBQ2IsaUJBQWlCO0tBQ2xCLENBQUM7QUFDSixDQUFDLENBQUMifQ==

package/MySql/index.d.ts

@@ -1,20 +1,31 @@
-import { BasicResourceArgs, KeyVaultInfo } from '../types';
-import * as pulumi from '@pulumi/pulumi';
-import * as azure from '@pulumi/azure-native';
-import * as inputs from '@pulumi/azure-native/types/input';
+import { BasicResourceArgs, KeyVaultInfo } from "../types";
+import * as pulumi from "@pulumi/pulumi";
+import * as dbformysql from "@pulumi/azure-native/dbformysql";
+import * as inputs from "@pulumi/azure-native/types/input";
+import { EnvRoleNamesType } from "../AzAd/EnvRoles";
 export interface MySqlProps extends BasicResourceArgs {
+    enableEncryption?: boolean;
+    vaultInfo: KeyVaultInfo;
+    auth: {
+        enableAdAdministrator?: boolean;
+        envRoleNames?: EnvRoleNamesType;
+        adminLogin?: pulumi.Input<string>;
+        password?: pulumi.Input<string>;
+    };
     sku?: pulumi.Input<inputs.dbformysql.SkuArgs>;
-    vaultInfo?: KeyVaultInfo;
-    version?: azure.dbformysql.ServerVersion;
+    version?: dbformysql.ServerVersion;
     storageSizeGB?: number;
     databases?: Array<string>;
     network?: {
         allowsPublicAccess?: boolean;
+        privateLink?: {
+            subnetId: pulumi.Input<string>;
+        };
         firewallRules?: Array<{
             startIpAddress: string;
             endIpAddress: string;
         }>;
     };
 }
-declare const _default: ({ name, group, version, storageSizeGB, sku, network, databases, vaultInfo, dependsOn, }: MySqlProps) => import("@pulumi/azure-native/dbformysql/server").Server;
+declare const _default: ({ name, group, auth, enableEncryption, version, storageSizeGB, sku, network, databases, vaultInfo, dependsOn, }: MySqlProps) => import("@pulumi/azure-native/dbformysql/server").Server;
 export default _default;