@drunk-pulumi/azure 0.0.25 → 0.0.27

package/Sql/index.js

@@ -13,6 +13,7 @@ const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
 const SqlDb_1 = require("./SqlDb");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 const Role_1 = require("../AzAd/Role");
+const VaultPermissions_1 = require("../KeyVault/VaultPermissions");
 const createElasticPool = ({ group, name, sqlName, 
 //Minimum is 50 GD
 maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? "Standard" : "Basic", capacity: 50 }, lock = true, }) => {
@@ -54,7 +55,7 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
     //     password: login.password,
     //   };
     // }
-    const adminGroup = auth?.enableAdAdministrator
+    const adminGroup = auth?.enableAdAdministrator || auth.azureAdOnlyAuthentication
         ? auth.envRoleNames
             ? (0, Group_1.getAdGroup)(auth.envRoleNames.admin)
             : (0, Role_1.default)({ env: AzureEnv_1.currentEnv, roleName: "ADMIN", appName: "SQL" })
@@ -69,10 +70,9 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
         minimalTlsVersion: "1.2",
         identity: { type: "SystemAssigned" },
         administratorLogin: auth?.adminLogin,
-        administratorLoginPassword: auth.azureAdOnlyAuthentication
-            ? undefined
-            : auth?.password,
-        administrators: auth?.enableAdAdministrator && adminGroup
+        administratorLoginPassword: auth?.password,
+        administrators: (auth?.enableAdAdministrator || auth.azureAdOnlyAuthentication) &&
+            adminGroup
             ? {
                 administratorType: sql.AdministratorType.ActiveDirectory,
                 azureADOnlyAuthentication: auth.azureAdOnlyAuthentication,
@@ -89,6 +89,8 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
         ignoreChanges,
         protect: lock,
     });
+    //Allows to Read Key Vault
+    (0, VaultPermissions_1.grantVaultAccessToIdentity)({ name, identity: sqlServer.identity, vaultInfo });
     if (lock) {
         (0, Locker_1.default)({ name: sqlName, resourceId: sqlServer.id, dependsOn: sqlServer });
     }
@@ -205,19 +207,22 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
     }
     if (encryptKey) {
         // Enable a server key in the SQL Server with reference to the Key Vault Key
-        new sql.ServerKey(`${sqlName}-serverKey`, {
+        const keyName = encryptKey.apply((c) => `${vaultInfo.name}_${c.name}_${c.properties.version}`);
+        const serverKey = new sql.ServerKey(`${sqlName}-serverKey`, {
             resourceGroupName: group.resourceGroupName,
             serverName: sqlName,
             serverKeyType: "AzureKeyVault",
-            keyName: encryptKey.apply((c) => c.name),
-            uri: encryptKey.apply((c) => `${c.properties.vaultUrl}/keys/${c.name}`),
-        });
+            keyName,
+            uri: encryptKey.apply((c) => `https://${vaultInfo.name}.vault.azure.net/keys/${c.name}/${c.properties.version}`),
+        }, { ignoreChanges: ["keyName", "uri"] });
         new sql.EncryptionProtector(`${sqlName}-encryptionProtector`, {
+            encryptionProtectorName: "current",
             resourceGroupName: group.resourceGroupName,
             serverName: sqlName,
             serverKeyType: "AzureKeyVault",
+            serverKeyName: keyName,
             autoRotationEnabled: true,
-        });
+        }, { dependsOn: serverKey });
     }
     const dbs = databases?.map((db) => {
         const d = (0, SqlDb_1.default)({
@@ -227,15 +232,15 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
             dependsOn: sqlServer,
             elasticPoolId: ep ? ep.resource.id : undefined,
         });
-        if (encryptKey) {
-            //Enable TransparentDataEncryption for each database
-            new sql.TransparentDataEncryption(`${sqlName}-${db.name}`, {
-                serverName: sqlName,
-                databaseName: db.name,
-                resourceGroupName: group.resourceGroupName,
-                state: "Enabled",
-            });
-        }
+        // if (encryptKey) {
+        //   //Enable TransparentDataEncryption for each database
+        //   new sql.TransparentDataEncryption(`${sqlName}-${db.name}`, {
+        //     serverName: sqlName,
+        //     databaseName: d.name,
+        //     resourceGroupName: group.resourceGroupName,
+        //     state: "Enabled",
+        //   });
+        // }
         if (vaultInfo) {
             const connectionString = auth?.adminLogin
                 ? (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net;Initial Catalog=${d.name};User Id=${auth.adminLogin};Password=${auth.password};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=120;`
@@ -258,4 +263,4 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
         adminGroup,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}

package/Storage/Helper.d.ts

@@ -15,7 +15,7 @@ export type StorageConnectionInfo = {
 };
 export declare const getStorageSecrets: ({ name, nameFormatted, vaultInfo, }: {
     name: string;
-    nameFormatted?: boolean | undefined;
+    nameFormatted?: boolean;
     vaultInfo: KeyVaultInfo;
 }) => Promise<StorageConnectionInfo>;
 export declare const getStorageSecretsById: ({ storageId, vaultInfo, }: {

package/Storage/ManagementRules.d.ts

@@ -64,7 +64,7 @@ export declare const createManagementRules: ({ name, storageAccount, group, rule
     name: string;
     group: ResourceGroupInfo;
     storageAccount: storage.StorageAccount;
-    containerNames?: pulumi.Input<string>[] | undefined;
+    containerNames?: pulumi.Input<string>[];
     rules: Array<ManagementRules | DefaultManagementRules>;
 }) => import("@pulumi/azure-native/storage/managementPolicy").ManagementPolicy;
 export {};

package/Storage/index.js

@@ -9,6 +9,7 @@ const Naming_1 = require("../Common/Naming");
 const CustomHelper_1 = require("../KeyVault/CustomHelper");
 const Locker_1 = require("../Core/Locker");
 const ManagementRules_1 = require("./ManagementRules");
+const VaultPermissions_1 = require("../KeyVault/VaultPermissions");
 /** Storage Creator */
 exports.default = ({ name, group, customDomain, allowsCors, vaultInfo, defaultManagementRules, containers = [], queues = [], fileShares = [], 
 //appInsight,
@@ -205,7 +206,8 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
     stg.id.apply(async (id) => {
         if (!id)
             return;
-        stg.identity.apply((i) => console.log("Add this ID into Key Vault ReadOnly Group to allows custom key encryption:", i.principalId));
+        //Allows to Read Key Vault
+        (0, VaultPermissions_1.grantVaultAccessToIdentity)({ name, identity: stg.identity, vaultInfo });
         const keys = (await storage.listStorageAccountKeys({
             accountName: name,
             resourceGroupName: group.resourceGroupName,
@@ -254,4 +256,4 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
             : undefined,
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}

package/VNet/PrivateEndpoint.js

@@ -5,7 +5,9 @@ const pulumi_1 = require("@pulumi/pulumi");
 const Helper_1 = require("./Helper");
 const PrivateDns_1 = require("./PrivateDns");
 const AzureEnv_1 = require("../Common/AzureEnv");
+const Naming_1 = require("../Common/Naming");
 exports.default = ({ name, group, resourceId, subnetId, privateDnsZoneName, useGlobalDnsZone, linkServiceGroupIds, }) => {
+    name = (0, Naming_1.getPrivateEndpointName)(name);
     const endpoint = new network.PrivateEndpoint(name, {
         privateEndpointName: name,
         ...group,
@@ -66,4 +68,4 @@ exports.default = ({ name, group, resourceId, subnetId, privateDnsZoneName, useG
     //TODO: Create private DNS Zone in the same resource group and link to VNet
     return endpoint;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsd0RBQXdEO0FBQ3hELDJDQUErQztBQUUvQyxxQ0FBaUQ7QUFDakQsNkNBQTZFO0FBQzdFLGlEQUEyRDtBQVEzRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxVQUFVLEVBQ1YsUUFBUSxFQUNSLGtCQUFrQixFQUNsQixnQkFBZ0IsRUFDaEIsbUJBQW1CLEdBQ2IsRUFBRSxFQUFFO0lBQ1YsTUFBTSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLElBQUksRUFBRTtRQUNqRCxtQkFBbUIsRUFBRSxJQUFJO1FBQ3pCLEdBQUcsS0FBSztRQUVSLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxRQUFRLEVBQUU7UUFDeEIsNkJBQTZCLEVBQUU7WUFDN0I7Z0JBQ0UsUUFBUSxFQUFFLG1CQUFtQjtnQkFDN0IsSUFBSSxFQUFFLEdBQUcsSUFBSSxPQUFPO2dCQUNwQixvQkFBb0IsRUFBRSxVQUFVO2FBQ2pDO1NBQ0Y7S0FDRixDQUFDLENBQUM7SUFFSCxrQkFBa0I7SUFDbEIsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQ3hELENBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFZLENBQUMsQ0FDbEMsQ0FBQztJQUVGLElBQUEsZUFBTSxFQUFDLFVBQVUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFO1FBQzlCLE1BQU0sWUFBWSxHQUFHLElBQUEsZ0NBQXFCLEVBQUMsRUFBRSxDQUFDLENBQUM7UUFFL0MsSUFBSSxnQkFBZ0IsRUFBRSxDQUFDO1lBQ3JCLGNBQWM7WUFDZCxJQUFBLHVCQUFVLEVBQUM7Z0JBQ1QsV0FBVztnQkFDWCxVQUFVLEVBQUUsWUFBWSxFQUFFLElBQUksSUFBSSxFQUFFO2dCQUNwQyxRQUFRLEVBQUUsa0JBQWtCO2FBQzdCLENBQUMsQ0FBQztZQUVILGNBQWM7WUFDZCxJQUFBLGVBQU0sRUFBQyxRQUFRLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDN0IsTUFBTSxNQUFNLEdBQUcsSUFBQSw4QkFBcUIsRUFBQyxHQUFHLENBQUMsQ0FBQztnQkFDMUMsSUFBQSxpQ0FBb0IsRUFBQztvQkFDbkIsUUFBUSxFQUFFLGtCQUFrQjtvQkFDNUIsTUFBTTtpQkFDUCxDQUFDLENBQUM7WUFDTCxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUM7YUFBTSxDQUFDO1lBQ04sYUFBYTtZQUNiLE1BQU0sSUFBSSxHQUFHLElBQUEsb0JBQVcsRUFBQztnQkFDdkIsSUFBSSxFQUFFLEdBQUcsWUFBWSxFQUFFLElBQUksSUFBSSxrQkFBa0IsRUFBRTtnQkFDbkQsS0FBSzthQUNOLENBQUMsQ0FBQztZQUVILGlCQUFpQjtZQUNqQixJQUFBLHVCQUFVLEVBQUM7Z0JBQ1QsV0FBVztnQkFDWCxVQUFVLEVBQUUsR0FBRztnQkFDZixRQUFRLEVBQUUsa0JBQWtCO2dCQUM1QixTQUFTLEVBQUUsSUFBSTthQUNoQixDQUFDLENBQUM7WUFDSCxjQUFjO1lBQ2QsSUFBQSxlQUFNLEVBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBQzdCLE1BQU0sTUFBTSxHQUFHLElBQUEsOEJBQXFCLEVBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQzFDLElBQUEsaUNBQW9CLEVBQUM7b0JBQ25CLFFBQVEsRUFBRSxrQkFBa0I7b0JBQzVCLE1BQU07b0JBQ04sS0FBSztvQkFDTCxTQUFTLEVBQUUsSUFBSTtpQkFDaEIsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDSCwyRUFBMkU7SUFDM0UsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsd0RBQXdEO0FBQ3hELDJDQUErQztBQUUvQyxxQ0FBaUQ7QUFDakQsNkNBQTZFO0FBQzdFLGlEQUEyRDtBQUMzRCw2Q0FBMEQ7QUFRMUQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsVUFBVSxFQUNWLFFBQVEsRUFDUixrQkFBa0IsRUFDbEIsZ0JBQWdCLEVBQ2hCLG1CQUFtQixHQUNiLEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXBDLE1BQU0sUUFBUSxHQUFHLElBQUksT0FBTyxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUU7UUFDakQsbUJBQW1CLEVBQUUsSUFBSTtRQUN6QixHQUFHLEtBQUs7UUFFUixNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQUUsUUFBUSxFQUFFO1FBQ3hCLDZCQUE2QixFQUFFO1lBQzdCO2dCQUNFLFFBQVEsRUFBRSxtQkFBbUI7Z0JBQzdCLElBQUksRUFBRSxHQUFHLElBQUksT0FBTztnQkFDcEIsb0JBQW9CLEVBQUUsVUFBVTthQUNqQztTQUNGO0tBQ0YsQ0FBQyxDQUFDO0lBRUgsa0JBQWtCO0lBQ2xCLE1BQU0sV0FBVyxHQUFHLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUN4RCxDQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBWSxDQUFDLENBQ2xDLENBQUM7SUFFRixJQUFBLGVBQU0sRUFBQyxVQUFVLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRTtRQUM5QixNQUFNLFlBQVksR0FBRyxJQUFBLGdDQUFxQixFQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRS9DLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztZQUNyQixjQUFjO1lBQ2QsSUFBQSx1QkFBVSxFQUFDO2dCQUNULFdBQVc7Z0JBQ1gsVUFBVSxFQUFFLFlBQVksRUFBRSxJQUFJLElBQUksRUFBRTtnQkFDcEMsUUFBUSxFQUFFLGtCQUFrQjthQUM3QixDQUFDLENBQUM7WUFFSCxjQUFjO1lBQ2QsSUFBQSxlQUFNLEVBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBQzdCLE1BQU0sTUFBTSxHQUFHLElBQUEsOEJBQXFCLEVBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQzFDLElBQUEsaUNBQW9CLEVBQUM7b0JBQ25CLFFBQVEsRUFBRSxrQkFBa0I7b0JBQzVCLE1BQU07aUJBQ1AsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sQ0FBQztZQUNOLGFBQWE7WUFDYixNQUFNLElBQUksR0FBRyxJQUFBLG9CQUFXLEVBQUM7Z0JBQ3ZCLElBQUksRUFBRSxHQUFHLFlBQVksRUFBRSxJQUFJLElBQUksa0JBQWtCLEVBQUU7Z0JBQ25ELEtBQUs7YUFDTixDQUFDLENBQUM7WUFFSCxpQkFBaUI7WUFDakIsSUFBQSx1QkFBVSxFQUFDO2dCQUNULFdBQVc7Z0JBQ1gsVUFBVSxFQUFFLEdBQUc7Z0JBQ2YsUUFBUSxFQUFFLGtCQUFrQjtnQkFDNUIsU0FBUyxFQUFFLElBQUk7YUFDaEIsQ0FBQyxDQUFDO1lBQ0gsY0FBYztZQUNkLElBQUEsZUFBTSxFQUFDLFFBQVEsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO2dCQUM3QixNQUFNLE1BQU0sR0FBRyxJQUFBLDhCQUFxQixFQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUMxQyxJQUFBLGlDQUFvQixFQUFDO29CQUNuQixRQUFRLEVBQUUsa0JBQWtCO29CQUM1QixNQUFNO29CQUNOLEtBQUs7b0JBQ0wsU0FBUyxFQUFFLElBQUk7aUJBQ2hCLENBQUMsQ0FBQztZQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0gsMkVBQTJFO0lBQzNFLE9BQU8sUUFBUSxDQUFDO0FBQ2xCLENBQUMsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drunk-pulumi/azure",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "author": "drunkcoding@outlook.com",
   "description": "The custom helpers pulumi-azure",
   "license": "MIT",
@@ -17,12 +17,12 @@
     "url": "https://github.com/baoduy/drunk-pulumi-azure.git"
   },
   "dependencies": {
-    "@drunk-pulumi/azure-providers": "^0.0.5",
-    "@pulumi/azure-native": "^2.32.0",
-    "@pulumi/azuread": "5.47.2",
-    "@pulumi/pulumi": "^3.111.1",
-    "@pulumi/random": "^4.16.0",
-    "@pulumi/tls": "^5.0.1",
+    "@drunk-pulumi/azure-providers": "^0.0.6",
+    "@pulumi/azure-native": "^2.37.0",
+    "@pulumi/azuread": "5.48.0",
+    "@pulumi/pulumi": "^3.113.0",
+    "@pulumi/random": "^4.16.1",
+    "@pulumi/tls": "^5.0.2",
     "axios": "^1.6.8",
     "netmask": "^2.0.2",
     "node-forge": "^1.3.1",

package/types.d.ts

@@ -11,6 +11,8 @@ export interface ResourceGroupInfo {
 export interface ConventionProps {
     prefix?: string;
     suffix?: string;
+    /**Whether include the Azure Region name at the end of the name or not*/
+    includeRegion?: boolean;
     /**Whether include the organization name at the end of the name or not*/
     includeOrgName?: boolean;
 }

package/KeyVault/VaultAccess.d.ts

@@ -1,14 +0,0 @@
-import { EnvRoleNamesType } from '../AzAd/EnvRoles';
-export type VaultAccessType = {
-    /** Grant permission of this group into Environment Roles groups*/
-    envRoleNames?: EnvRoleNamesType;
-};
-interface Props {
-    name: string;
-    auth: VaultAccessType;
-}
-declare const _default: ({ name, auth }: Props) => {
-    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>;
-};
-export default _default;

package/KeyVault/VaultAccess.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Role_1 = require("../AzAd/Role");
-const AzureEnv_1 = require("../Common/AzureEnv");
-const Group_1 = require("../AzAd/Group");
-exports.default = ({ name, auth }) => {
-    //Permission Groups
-    const readOnlyGroup = auth.envRoleNames
-        ? (0, Group_1.getAdGroup)(auth.envRoleNames.readOnly)
-        : (0, Role_1.default)({
-            env: AzureEnv_1.currentEnv,
-            appName: `${name}-vault`,
-            roleName: 'ReadOnly',
-        });
-    const adminGroup = auth.envRoleNames
-        ? (0, Group_1.getAdGroup)(auth.envRoleNames.contributor)
-        : (0, Role_1.default)({
-            env: AzureEnv_1.currentEnv,
-            appName: `${name}-vault`,
-            roleName: 'Admin',
-        });
-    return { readOnlyGroup, adminGroup };
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVmF1bHRBY2Nlc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvVmF1bHRBY2Nlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSx1Q0FBcUM7QUFDckMsaURBQWdEO0FBQ2hELHlDQUEyQztBQWEzQyxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBUyxFQUFFLEVBQUU7SUFDdkMsbUJBQW1CO0lBQ25CLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxZQUFZO1FBQ3JDLENBQUMsQ0FBQyxJQUFBLGtCQUFVLEVBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUM7UUFDeEMsQ0FBQyxDQUFDLElBQUEsY0FBUyxFQUFDO1lBQ1IsR0FBRyxFQUFFLHFCQUFVO1lBQ2YsT0FBTyxFQUFFLEdBQUcsSUFBSSxRQUFRO1lBQ3hCLFFBQVEsRUFBRSxVQUFVO1NBQ3JCLENBQUMsQ0FBQztJQUVQLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxZQUFZO1FBQ2xDLENBQUMsQ0FBQyxJQUFBLGtCQUFVLEVBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUM7UUFDM0MsQ0FBQyxDQUFDLElBQUEsY0FBUyxFQUFDO1lBQ1IsR0FBRyxFQUFFLHFCQUFVO1lBQ2YsT0FBTyxFQUFFLEdBQUcsSUFBSSxRQUFRO1lBQ3hCLFFBQVEsRUFBRSxPQUFPO1NBQ2xCLENBQUMsQ0FBQztJQUVQLE9BQU8sRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFDdkMsQ0FBQyxDQUFDIn0=