@drunk-pulumi/azure 0.0.37 → 0.0.39

package/Core/ResourceGroup.d.ts

@@ -1,13 +1,20 @@
-import { DefaultResourceArgs, ResourceGroupInfo, ResourceResultProps, BasicResourceArgs } from '../types';
-import { ResourceGroup } from '@pulumi/azure-native/resources';
-import { EnvRoleNamesType } from '../AzAd/EnvRoles';
-interface Props extends Omit<DefaultResourceArgs, 'monitoring'>, Omit<BasicResourceArgs, 'group'> {
+import { DefaultResourceArgs, ResourceGroupInfo, ResourceResultProps, BasicResourceArgs } from "../types";
+import { ResourceGroup } from "@pulumi/azure-native/resources";
+import { EnvRolesResults } from "../AzAd/EnvRoles";
+export type RGPermissionType = {
+    envRoles: EnvRolesResults;
+    enableRGRoles?: boolean;
+    enableAksRoles?: boolean;
+    enableIotRoles?: boolean;
+    enableVaultRoles?: boolean;
+};
+interface Props extends Omit<DefaultResourceArgs, "monitoring">, Omit<BasicResourceArgs, "group"> {
     formattedName?: boolean;
     location?: string;
     /** Grant permission of this group into Environment Roles groups*/
-    envRoleNames?: EnvRoleNamesType;
+    permissions?: RGPermissionType;
 }
-declare const _default: ({ name, formattedName, envRoleNames, ...others }: Props) => ResourceResultProps<ResourceGroup> & {
+declare const _default: ({ name, formattedName, permissions, ...others }: Props) => ResourceResultProps<ResourceGroup> & {
     toGroupInfo: () => ResourceGroupInfo;
 };
 export default _default;

package/Core/ResourceGroup.js

@@ -3,43 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const resources_1 = require("@pulumi/azure-native/resources");
 const ResourceCreator_1 = require("./ResourceCreator");
 const Naming_1 = require("../Common/Naming");
-const Group_1 = require("../AzAd/Group");
-// export const getResourceGroupInfo = (name: string, globalGroup?: boolean) => ({
-//   resourceGroupName: getResourceGroupName(name),
-// });
-exports.default = ({ name, formattedName, envRoleNames, ...others }) => {
+const AzureEnv_1 = require("../Common/AzureEnv");
+const EnvRoles_Consts_1 = require("../AzAd/EnvRoles.Consts");
+exports.default = ({ name, formattedName, permissions, ...others }) => {
     name = formattedName ? name : (0, Naming_1.getResourceGroupName)(name);
     const { resource, locker, diagnostic } = (0, ResourceCreator_1.default)(resources_1.ResourceGroup, {
         resourceGroupName: name,
         ...others,
     });
-    const g = resource;
-    if (envRoleNames) {
-        (0, Group_1.assignRolesToGroup)({
-            groupName: envRoleNames.readOnly,
-            roles: ['Reader'],
-            scope: g.id,
-        });
-        (0, Group_1.assignRolesToGroup)({
-            groupName: envRoleNames.contributor,
-            roles: ['Contributor'],
-            scope: g.id,
-        });
-        (0, Group_1.assignRolesToGroup)({
-            groupName: envRoleNames.admin,
-            roles: ['Owner'],
-            scope: g.id,
+    if (permissions) {
+        (0, EnvRoles_Consts_1.grantEnvRolesAccess)({
+            name,
+            ...permissions,
+            scope: resource.id,
+            dependsOn: resource,
         });
     }
     return {
         name,
-        resource: g,
+        resource: resource,
         locker,
         diagnostic,
         toGroupInfo: () => ({
             resourceGroupName: name,
-            location: g.location,
+            location: AzureEnv_1.currentRegionName,
         }),
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VHcm91cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL1Jlc291cmNlR3JvdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFNQSw4REFHd0M7QUFDeEMsdURBQWdEO0FBQ2hELDZDQUF3RDtBQUV4RCx5Q0FBbUQ7QUFXbkQsa0ZBQWtGO0FBQ2xGLG1EQUFtRDtBQUNuRCxNQUFNO0FBRU4sa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixhQUFhLEVBQ2IsWUFBWSxFQUNaLEdBQUcsTUFBTSxFQUNILEVBRU4sRUFBRTtJQUNGLElBQUksR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV6RCxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFBLHlCQUFlLEVBQUMseUJBQWEsRUFBRTtRQUN0RSxpQkFBaUIsRUFBRSxJQUFJO1FBQ3ZCLEdBQUcsTUFBTTtLQUNpQyxDQUFDLENBQUM7SUFFOUMsTUFBTSxDQUFDLEdBQUcsUUFBeUIsQ0FBQztJQUVwQyxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ2pCLElBQUEsMEJBQWtCLEVBQUM7WUFDakIsU0FBUyxFQUFFLFlBQVksQ0FBQyxRQUFRO1lBQ2hDLEtBQUssRUFBRSxDQUFDLFFBQVEsQ0FBQztZQUNqQixLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUU7U0FDWixDQUFDLENBQUM7UUFDSCxJQUFBLDBCQUFrQixFQUFDO1lBQ2pCLFNBQVMsRUFBRSxZQUFZLENBQUMsV0FBVztZQUNuQyxLQUFLLEVBQUUsQ0FBQyxhQUFhLENBQUM7WUFDdEIsS0FBSyxFQUFFLENBQUMsQ0FBQyxFQUFFO1NBQ1osQ0FBQyxDQUFDO1FBQ0gsSUFBQSwwQkFBa0IsRUFBQztZQUNqQixTQUFTLEVBQUUsWUFBWSxDQUFDLEtBQUs7WUFDN0IsS0FBSyxFQUFFLENBQUMsT0FBTyxDQUFDO1lBQ2hCLEtBQUssRUFBRSxDQUFDLENBQUMsRUFBRTtTQUNaLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPO1FBQ0wsSUFBSTtRQUNKLFFBQVEsRUFBRSxDQUFDO1FBQ1gsTUFBTTtRQUNOLFVBQVU7UUFDVixXQUFXLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUNsQixpQkFBaUIsRUFBRSxJQUFJO1lBQ3ZCLFFBQVEsRUFBRSxDQUFDLENBQUMsUUFBUTtTQUNyQixDQUFDO0tBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VHcm91cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL1Jlc291cmNlR3JvdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFNQSw4REFHd0M7QUFDeEMsdURBQWdEO0FBQ2hELDZDQUF3RDtBQUV4RCxpREFBdUQ7QUFDdkQsNkRBQThEO0FBbUI5RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLGFBQWEsRUFDYixXQUFXLEVBQ1gsR0FBRyxNQUFNLEVBQ0gsRUFFTixFQUFFO0lBQ0YsSUFBSSxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLDZCQUFvQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXpELE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUEseUJBQWUsRUFBQyx5QkFBYSxFQUFFO1FBQ3RFLGlCQUFpQixFQUFFLElBQUk7UUFDdkIsR0FBRyxNQUFNO0tBQ2lDLENBQUMsQ0FBQztJQUU5QyxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2hCLElBQUEscUNBQW1CLEVBQUM7WUFDbEIsSUFBSTtZQUNKLEdBQUcsV0FBVztZQUNkLEtBQUssRUFBRSxRQUFRLENBQUMsRUFBRTtZQUNsQixTQUFTLEVBQUUsUUFBUTtTQUNwQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixRQUFRLEVBQUUsUUFBeUI7UUFDbkMsTUFBTTtRQUNOLFVBQVU7UUFDVixXQUFXLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUNsQixpQkFBaUIsRUFBRSxJQUFJO1lBQ3ZCLFFBQVEsRUFBRSw0QkFBaUI7U0FDNUIsQ0FBQztLQUNILENBQUM7QUFDSixDQUFDLENBQUMifQ==

package/IOT/Hub/index.d.ts

@@ -1,15 +1,11 @@
-import { BasicResourceArgs, KeyVaultInfo } from '../../types';
-import * as devices from '@pulumi/azure-native/devices';
-import { Input } from '@pulumi/pulumi';
-import { EnvRoleNamesType } from '../../AzAd/EnvRoles';
+import { BasicResourceArgs, KeyVaultInfo } from "../../types";
+import * as devices from "@pulumi/azure-native/devices";
+import { Input } from "@pulumi/pulumi";
 interface Props extends BasicResourceArgs {
     sku: {
         name: devices.IotHubSku;
         capacity?: number;
     };
-    auth?: {
-        envRoleNames: EnvRoleNamesType;
-    };
     serviceBus?: {
         /** provide the queue connection string to enable message to be pushing to service bus queue */
         queueMessageConnectionString?: Input<string>;
@@ -28,5 +24,5 @@ interface Props extends BasicResourceArgs {
     vaultInfo?: KeyVaultInfo;
     lock?: boolean;
 }
-declare const _default: ({ name, group, auth, sku, storage, serviceBus, dependsOn, vaultInfo, lock, }: Props) => Promise<import("@pulumi/azure-native/devices/iotHubResource").IotHubResource>;
+declare const _default: ({ name, group, sku, storage, serviceBus, dependsOn, vaultInfo, lock, }: Props) => import("@pulumi/azure-native/devices/iotHubResource").IotHubResource;
 export default _default;

package/IOT/Hub/index.js

@@ -4,15 +4,13 @@ const Naming_1 = require("../../Common/Naming");
 const devices = require("@pulumi/azure-native/devices");
 const AzureEnv_1 = require("../../Common/AzureEnv");
 const Locker_1 = require("../../Core/Locker");
-const RoleAssignment_1 = require("../../AzAd/RoleAssignment");
-const Group_1 = require("../../AzAd/Group");
 const CustomHelper_1 = require("../../KeyVault/CustomHelper");
-exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 }, storage, serviceBus, dependsOn, vaultInfo, lock, }) => {
+exports.default = ({ name, group, sku = { name: "F1", capacity: 1 }, storage, serviceBus, dependsOn, vaultInfo, lock, }) => {
     const hubName = (0, Naming_1.getIotHubName)(name);
-    const busQueueEndpointName = 'busQueue';
-    const busTopicEndpointName = 'busTopic';
-    const storageMessageEndpointName = 'hubStorage';
-    const storageEventEndpointName = 'hubEventStorage';
+    const busQueueEndpointName = "busQueue";
+    const busTopicEndpointName = "busTopic";
+    const storageMessageEndpointName = "hubStorage";
+    const storageEventEndpointName = "hubEventStorage";
     const routeEndpoints = new Array();
     const storageEndpoints = new Array();
     if (storage?.connectionString && storage?.messageContainerName) {
@@ -23,9 +21,9 @@ exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 },
             subscriptionId: AzureEnv_1.subscriptionId,
             connectionString: storage.connectionString,
             containerName: storage.messageContainerName,
-            encoding: 'avro', // 'avroDeflate' and 'avro'
+            encoding: "avro", // 'avroDeflate' and 'avro'
             batchFrequencyInSeconds: 60, //60 to 720
-            fileNameFormat: '{iothub}/{partition}/{YYYY}/{MM}/{DD}/{HH}/{mm}', //Must have all these {iothub}/{partition}/{YYYY}/{MM}/{DD}/{HH}/{mm} but order and delimiter can be changed.
+            fileNameFormat: "{iothub}/{partition}/{YYYY}/{MM}/{DD}/{HH}/{mm}", //Must have all these {iothub}/{partition}/{YYYY}/{MM}/{DD}/{HH}/{mm} but order and delimiter can be changed.
             maxChunkSizeInBytes: 300 * 1024 * 1024, // 10485760(10MB) and 524288000(500MB). Default value is 314572800(300MB).
         });
     }
@@ -36,9 +34,9 @@ exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 },
             subscriptionId: AzureEnv_1.subscriptionId,
             connectionString: storage.connectionString,
             containerName: storage.eventContainerName,
-            encoding: 'avro', // 'avroDeflate' and 'avro'
+            encoding: "avro", // 'avroDeflate' and 'avro'
             batchFrequencyInSeconds: 60, //60 to 720
-            fileNameFormat: '{iothub}/{partition}/{YYYY}/{MM}/{DD}/{HH}/{mm}', //Must have all these {iothub}/{partition}/{YYYY}/{MM}/{DD}/{HH}/{mm} but order and delimiter can be changed.
+            fileNameFormat: "{iothub}/{partition}/{YYYY}/{MM}/{DD}/{HH}/{mm}", //Must have all these {iothub}/{partition}/{YYYY}/{MM}/{DD}/{HH}/{mm} but order and delimiter can be changed.
             maxChunkSizeInBytes: 300 * 1024 * 1024, // 10485760(10MB) and 524288000(500MB). Default value is 314572800(300MB).
         });
     }
@@ -51,7 +49,7 @@ exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 },
         source: devices.RoutingSource.DeviceMessages,
         endpointNames: [r],
         isEnabled: true,
-        condition: 'true',
+        condition: "true",
     }));
     if (storage?.eventContainerName) {
         routes.push({
@@ -59,7 +57,7 @@ exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 },
             source: devices.RoutingSource.DeviceLifecycleEvents,
             endpointNames: [storageEventEndpointName],
             isEnabled: true,
-            condition: 'true',
+            condition: "true",
         });
     }
     const hub = new devices.IotHubResource(hubName, {
@@ -76,7 +74,7 @@ exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 },
                     $default: {
                         connectionString: storage.connectionString,
                         containerName: storage.fileContainerName,
-                        sasTtlAsIso8601: 'PT1H',
+                        sasTtlAsIso8601: "PT1H",
                     },
                 }
                 : undefined,
@@ -102,12 +100,12 @@ exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 },
             //privateEndpointConnections: {},
             messagingEndpoints: {
                 fileNotifications: {
-                    lockDurationAsIso8601: 'PT1M',
+                    lockDurationAsIso8601: "PT1M",
                     maxDeliveryCount: 10,
-                    ttlAsIso8601: 'PT1H',
+                    ttlAsIso8601: "PT1H",
                 },
             },
-            minTlsVersion: '1.2',
+            minTlsVersion: "1.2",
             routing: {
                 endpoints: {
                     //eventHubs: [],
@@ -135,12 +133,12 @@ exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 },
                 },
                 fallbackRoute: {
                     name: `$fallback`,
-                    condition: 'true',
+                    condition: "true",
                     isEnabled: true,
                     source: devices.RoutingSource.DeviceMessages,
                     endpointNames: storage?.eventContainerName
                         ? [storageEventEndpointName]
-                        : ['events'],
+                        : ["events"],
                 },
                 routes: routes,
             },
@@ -164,44 +162,11 @@ exports.default = async ({ name, group, auth, sku = { name: 'F1', capacity: 1 },
                     name: `${hubName}-${k.keyName}`,
                     value: conn,
                     vaultInfo,
-                    contentType: 'IOT Hub',
+                    contentType: "IOT Hub",
                 });
             });
         });
     }
-    //Roles
-    if (auth?.envRoleNames) {
-        const readOnlyGroup = await (0, Group_1.getAdGroup)(auth.envRoleNames.readOnly);
-        const contributorGroup = await (0, Group_1.getAdGroup)(auth.envRoleNames.contributor);
-        await (0, RoleAssignment_1.roleAssignment)({
-            name: `${name}-iot-readonly`,
-            principalId: readOnlyGroup.objectId,
-            principalType: 'Group',
-            roleName: 'IoT Hub Data Reader',
-            scope: hub.id,
-        });
-        await (0, RoleAssignment_1.roleAssignment)({
-            name: `${name}-iot-contributor`,
-            principalId: contributorGroup.objectId,
-            principalType: 'Group',
-            roleName: 'IoT Hub Data Contributor',
-            scope: hub.id,
-        });
-        await (0, RoleAssignment_1.roleAssignment)({
-            name: `${name}-iot-registry-admin`,
-            principalId: contributorGroup.objectId,
-            principalType: 'Group',
-            roleName: 'IoT Hub Registry Contributor',
-            scope: hub.id,
-        });
-        await (0, RoleAssignment_1.roleAssignment)({
-            name: `${name}-iot-twin-admin`,
-            principalId: contributorGroup.objectId,
-            principalType: 'Group',
-            roleName: 'IoT Hub Twin Contributor',
-            scope: hub.id,
-        });
-    }
     return hub;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvSU9UL0h1Yi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLGdEQUFvRDtBQUNwRCx3REFBd0Q7QUFDeEQsb0RBQXVEO0FBRXZELDhDQUF1QztBQUV2Qyw4REFBMkQ7QUFDM0QsNENBQThDO0FBQzlDLDhEQUE4RDtBQXVDOUQsa0JBQWUsS0FBSyxFQUFFLEVBQ3BCLElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLEdBQUcsR0FBRyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLENBQUMsRUFBRSxFQUNqQyxPQUFPLEVBQ1AsVUFBVSxFQUNWLFNBQVMsRUFDVCxTQUFTLEVBQ1QsSUFBSSxHQUNFLEVBQUUsRUFBRTtJQUNWLE1BQU0sT0FBTyxHQUFHLElBQUEsc0JBQWEsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNwQyxNQUFNLG9CQUFvQixHQUFHLFVBQVUsQ0FBQztJQUN4QyxNQUFNLG9CQUFvQixHQUFHLFVBQVUsQ0FBQztJQUN4QyxNQUFNLDBCQUEwQixHQUFHLFlBQVksQ0FBQztJQUNoRCxNQUFNLHdCQUF3QixHQUFHLGlCQUFpQixDQUFDO0lBRW5ELE1BQU0sY0FBYyxHQUFHLElBQUksS0FBSyxFQUFVLENBQUM7SUFDM0MsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLEtBQUssRUFBaUMsQ0FBQztJQUVwRSxJQUFJLE9BQU8sRUFBRSxnQkFBZ0IsSUFBSSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQztRQUMvRCxjQUFjLENBQUMsSUFBSSxDQUFDLDBCQUEwQixDQUFDLENBQUM7UUFDaEQsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO1lBQ3BCLElBQUksRUFBRSwwQkFBMEI7WUFDaEMsYUFBYSxFQUFFLEtBQUssQ0FBQyxpQkFBaUI7WUFDdEMsY0FBYyxFQUFkLHlCQUFjO1lBQ2QsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLGdCQUFnQjtZQUMxQyxhQUFhLEVBQUUsT0FBTyxDQUFDLG9CQUFvQjtZQUMzQyxRQUFRLEVBQUUsTUFBTSxFQUFFLDJCQUEyQjtZQUM3Qyx1QkFBdUIsRUFBRSxFQUFFLEVBQUUsV0FBVztZQUN4QyxjQUFjLEVBQUUsaURBQWlELEVBQUUsNkdBQTZHO1lBQ2hMLG1CQUFtQixFQUFFLEdBQUcsR0FBRyxJQUFJLEdBQUcsSUFBSSxFQUFFLDBFQUEwRTtTQUNuSCxDQUFDLENBQUM7SUFDTCxDQUFDO0lBQ0QsSUFBSSxPQUFPLEVBQUUsZ0JBQWdCLElBQUksT0FBTyxFQUFFLGtCQUFrQixFQUFFLENBQUM7UUFDN0QsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO1lBQ3BCLElBQUksRUFBRSx3QkFBd0I7WUFDOUIsYUFBYSxFQUFFLEtBQUssQ0FBQyxpQkFBaUI7WUFDdEMsY0FBYyxFQUFkLHlCQUFjO1lBQ2QsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLGdCQUFnQjtZQUMxQyxhQUFhLEVBQUUsT0FBTyxDQUFDLGtCQUFrQjtZQUN6QyxRQUFRLEVBQUUsTUFBTSxFQUFFLDJCQUEyQjtZQUM3Qyx1QkFBdUIsRUFBRSxFQUFFLEVBQUUsV0FBVztZQUN4QyxjQUFjLEVBQUUsaURBQWlELEVBQUUsNkdBQTZHO1lBQ2hMLG1CQUFtQixFQUFFLEdBQUcsR0FBRyxJQUFJLEdBQUcsSUFBSSxFQUFFLDBFQUEwRTtTQUNuSCxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsSUFBSSxVQUFVLEVBQUUsNEJBQTRCO1FBQzFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUM1QyxJQUFJLFVBQVUsRUFBRSw0QkFBNEI7UUFDMUMsY0FBYyxDQUFDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBRTVDLE1BQU0sTUFBTSxHQUFlLGNBQWMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDcEQsSUFBSSxFQUFFLGlCQUFpQixDQUFDLEVBQUU7UUFDMUIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsY0FBYztRQUM1QyxhQUFhLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDbEIsU0FBUyxFQUFFLElBQUk7UUFDZixTQUFTLEVBQUUsTUFBTTtLQUNsQixDQUFDLENBQUMsQ0FBQztJQUVKLElBQUksT0FBTyxFQUFFLGtCQUFrQixFQUFFLENBQUM7UUFDaEMsTUFBTSxDQUFDLElBQUksQ0FBQztZQUNWLElBQUksRUFBRSxpQkFBaUIsd0JBQXdCLEVBQUU7WUFDakQsTUFBTSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMscUJBQXFCO1lBQ25ELGFBQWEsRUFBRSxDQUFDLHdCQUF3QixDQUFDO1lBQ3pDLFNBQVMsRUFBRSxJQUFJO1lBQ2YsU0FBUyxFQUFFLE1BQU07U0FDbEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE1BQU0sR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDLGNBQWMsQ0FDcEMsT0FBTyxFQUNQO1FBQ0UsWUFBWSxFQUFFLE9BQU87UUFDckIsR0FBRyxLQUFLO1FBRVIsR0FBRztRQUVILFVBQVUsRUFBRTtZQUNWLDhCQUE4QjtZQUM5QixrQkFBa0I7WUFDbEIsVUFBVTtZQUNWLDZCQUE2QixFQUFFLE9BQU8sQ0FBQyxPQUFPLEVBQUUsaUJBQWlCLENBQUM7WUFDbEUsZ0JBQWdCLEVBQUUsT0FBTyxFQUFFLGlCQUFpQjtnQkFDMUMsQ0FBQyxDQUFDO29CQUNFLFFBQVEsRUFBRTt3QkFDUixnQkFBZ0IsRUFBRSxPQUFPLENBQUMsZ0JBQWdCO3dCQUMxQyxhQUFhLEVBQUUsT0FBTyxDQUFDLGlCQUFpQjt3QkFDeEMsZUFBZSxFQUFFLE1BQU07cUJBQ3hCO2lCQUNGO2dCQUNILENBQUMsQ0FBQyxTQUFTO1lBRWIsd0JBQXdCO1lBQ3hCLFFBQVEsRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDLElBQUk7WUFDbkMsb0JBQW9CO1lBQ3BCLHFCQUFxQjtZQUNyQiwwQ0FBMEM7WUFDMUMsMkJBQTJCO1lBQzNCLGVBQWU7WUFDZixRQUFRO1lBQ1IseUJBQXlCO1lBQ3pCLDZCQUE2QjtZQUM3QixrQ0FBa0M7WUFDbEMsU0FBUztZQUNULFFBQVE7WUFDUix5QkFBeUI7WUFDekIsNkJBQTZCO1lBQzdCLG9DQUFvQztZQUNwQyxTQUFTO1lBQ1QsT0FBTztZQUNQLEtBQUs7WUFDTCxpQ0FBaUM7WUFDakMsa0JBQWtCLEVBQUU7Z0JBQ2xCLGlCQUFpQixFQUFFO29CQUNqQixxQkFBcUIsRUFBRSxNQUFNO29CQUM3QixnQkFBZ0IsRUFBRSxFQUFFO29CQUNwQixZQUFZLEVBQUUsTUFBTTtpQkFDckI7YUFDRjtZQUNELGFBQWEsRUFBRSxLQUFLO1lBRXBCLE9BQU8sRUFBRTtnQkFDUCxTQUFTLEVBQUU7b0JBQ1QsZ0JBQWdCO29CQUNoQixnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsNEJBQTRCO3dCQUN4RCxDQUFDLENBQUM7NEJBQ0U7Z0NBQ0UsSUFBSSxFQUFFLG9CQUFvQjtnQ0FDMUIsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLDRCQUE0QjtnQ0FDekQsYUFBYSxFQUFFLEtBQUssQ0FBQyxpQkFBaUI7Z0NBQ3RDLGNBQWMsRUFBZCx5QkFBYzs2QkFDZjt5QkFDRjt3QkFDSCxDQUFDLENBQUMsU0FBUztvQkFFYixnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsNEJBQTRCO3dCQUN4RCxDQUFDLENBQUM7NEJBQ0U7Z0NBQ0UsSUFBSSxFQUFFLG9CQUFvQjtnQ0FDMUIsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLDRCQUE0QjtnQ0FDekQsYUFBYSxFQUFFLEtBQUssQ0FBQyxpQkFBaUI7Z0NBQ3RDLGNBQWMsRUFBZCx5QkFBYzs2QkFDZjt5QkFDRjt3QkFDSCxDQUFDLENBQUMsU0FBUztvQkFFYixpQkFBaUIsRUFBRSxnQkFBZ0I7aUJBQ3BDO2dCQUNELGFBQWEsRUFBRTtvQkFDYixJQUFJLEVBQUUsV0FBVztvQkFDakIsU0FBUyxFQUFFLE1BQU07b0JBQ2pCLFNBQVMsRUFBRSxJQUFJO29CQUNmLE1BQU0sRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLGNBQWM7b0JBRTVDLGFBQWEsRUFBRSxPQUFPLEVBQUUsa0JBQWtCO3dCQUN4QyxDQUFDLENBQUMsQ0FBQyx3QkFBd0IsQ0FBQzt3QkFDNUIsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDO2lCQUNmO2dCQUVELE1BQU0sRUFBRSxNQUFNO2FBQ2Y7U0FDRjtLQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsQ0FDZCxDQUFDO0lBRUYsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUNULElBQUEsZ0JBQU0sRUFBQyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUNsQyxDQUFDO0lBQ0Qsb0JBQW9CO0lBQ3BCLElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxHQUFHLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUU7WUFDeEIsSUFBSSxDQUFDLEVBQUU7Z0JBQUUsT0FBTztZQUVoQixNQUFNLElBQUksR0FBRyxNQUFNLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQztnQkFDaEQsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjtnQkFDMUMsWUFBWSxFQUFFLE9BQU87YUFDdEIsQ0FBQyxDQUFDO1lBRUgsT0FBTyxJQUFJLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUMvQixNQUFNLElBQUksR0FBRyxZQUFZLE9BQU8sMENBQzlCLENBQUMsQ0FBQyxPQUNKLG9CQUFvQixDQUFDLENBQUMsVUFBVyxFQUFFLENBQUM7Z0JBRXBDLE9BQU8sSUFBQSw4QkFBZSxFQUFDO29CQUNyQixJQUFJLEVBQUUsR0FBRyxPQUFPLElBQUksQ0FBQyxDQUFDLE9BQU8sRUFBRTtvQkFDL0IsS0FBSyxFQUFFLElBQUk7b0JBQ1gsU0FBUztvQkFDVCxXQUFXLEVBQUUsU0FBUztpQkFDdkIsQ0FBQyxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPO0lBQ1AsSUFBSSxJQUFJLEVBQUUsWUFBWSxFQUFFLENBQUM7UUFDdkIsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFBLGtCQUFVLEVBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNuRSxNQUFNLGdCQUFnQixHQUFHLE1BQU0sSUFBQSxrQkFBVSxFQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFekUsTUFBTSxJQUFBLCtCQUFjLEVBQUM7WUFDbkIsSUFBSSxFQUFFLEdBQUcsSUFBSSxlQUFlO1lBQzVCLFdBQVcsRUFBRSxhQUFhLENBQUMsUUFBUTtZQUNuQyxhQUFhLEVBQUUsT0FBTztZQUN0QixRQUFRLEVBQUUscUJBQXFCO1lBQy9CLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRTtTQUNkLENBQUMsQ0FBQztRQUVILE1BQU0sSUFBQSwrQkFBYyxFQUFDO1lBQ25CLElBQUksRUFBRSxHQUFHLElBQUksa0JBQWtCO1lBQy9CLFdBQVcsRUFBRSxnQkFBZ0IsQ0FBQyxRQUFRO1lBQ3RDLGFBQWEsRUFBRSxPQUFPO1lBQ3RCLFFBQVEsRUFBRSwwQkFBMEI7WUFDcEMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFO1NBQ2QsQ0FBQyxDQUFDO1FBRUgsTUFBTSxJQUFBLCtCQUFjLEVBQUM7WUFDbkIsSUFBSSxFQUFFLEdBQUcsSUFBSSxxQkFBcUI7WUFDbEMsV0FBVyxFQUFFLGdCQUFnQixDQUFDLFFBQVE7WUFDdEMsYUFBYSxFQUFFLE9BQU87WUFDdEIsUUFBUSxFQUFFLDhCQUE4QjtZQUN4QyxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUU7U0FDZCxDQUFDLENBQUM7UUFFSCxNQUFNLElBQUEsK0JBQWMsRUFBQztZQUNuQixJQUFJLEVBQUUsR0FBRyxJQUFJLGlCQUFpQjtZQUM5QixXQUFXLEVBQUUsZ0JBQWdCLENBQUMsUUFBUTtZQUN0QyxhQUFhLEVBQUUsT0FBTztZQUN0QixRQUFRLEVBQUUsMEJBQTBCO1lBQ3BDLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRTtTQUNkLENBQUMsQ0FBQztJQUNMLENBQUM7SUFDRCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvSU9UL0h1Yi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLGdEQUFvRDtBQUNwRCx3REFBd0Q7QUFDeEQsb0RBQXVEO0FBRXZELDhDQUF1QztBQUN2Qyw4REFBOEQ7QUFzQzlELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLEdBQUcsR0FBRyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLENBQUMsRUFBRSxFQUNqQyxPQUFPLEVBQ1AsVUFBVSxFQUNWLFNBQVMsRUFDVCxTQUFTLEVBQ1QsSUFBSSxHQUNFLEVBQUUsRUFBRTtJQUNWLE1BQU0sT0FBTyxHQUFHLElBQUEsc0JBQWEsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNwQyxNQUFNLG9CQUFvQixHQUFHLFVBQVUsQ0FBQztJQUN4QyxNQUFNLG9CQUFvQixHQUFHLFVBQVUsQ0FBQztJQUN4QyxNQUFNLDBCQUEwQixHQUFHLFlBQVksQ0FBQztJQUNoRCxNQUFNLHdCQUF3QixHQUFHLGlCQUFpQixDQUFDO0lBRW5ELE1BQU0sY0FBYyxHQUFHLElBQUksS0FBSyxFQUFVLENBQUM7SUFDM0MsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLEtBQUssRUFBaUMsQ0FBQztJQUVwRSxJQUFJLE9BQU8sRUFBRSxnQkFBZ0IsSUFBSSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQztRQUMvRCxjQUFjLENBQUMsSUFBSSxDQUFDLDBCQUEwQixDQUFDLENBQUM7UUFDaEQsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO1lBQ3BCLElBQUksRUFBRSwwQkFBMEI7WUFDaEMsYUFBYSxFQUFFLEtBQUssQ0FBQyxpQkFBaUI7WUFDdEMsY0FBYyxFQUFkLHlCQUFjO1lBQ2QsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLGdCQUFnQjtZQUMxQyxhQUFhLEVBQUUsT0FBTyxDQUFDLG9CQUFvQjtZQUMzQyxRQUFR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

package/KeyVault/Helper.d.ts

@@ -1,4 +1,4 @@
-import { Input, Resource } from "@pulumi/pulumi";
+import { Input, Output, Resource } from "@pulumi/pulumi";
 import { KeyVaultInfo } from "../types";
 type SecretProps = {
     name: string;
@@ -19,7 +19,13 @@ type GetVaultItemProps = {
 export declare const addKey: ({ name, vaultInfo, tags, dependsOn, }: Omit<SecretProps, "value" | "contentType">) => import("@pulumi/azure-native/keyvault/key").Key;
 /** Get Key */
 export declare const getKey: ({ name, version, vaultInfo, nameFormatted, }: GetVaultItemProps) => Promise<import("@azure/keyvault-keys").KeyVaultKey | undefined>;
-export declare const getEncryptionKey: (name: string, vaultInfo: KeyVaultInfo) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("@azure/keyvault-keys").KeyVaultKey> | undefined>;
+interface KeyVaultPropertiesResults {
+    keyName: string;
+    url: string;
+    keyVaultUri: string;
+    keyVersion?: string;
+}
+export declare const getEncryptionKeyOutput: (name: string, vaultInfo: KeyVaultInfo) => Output<KeyVaultPropertiesResults>;
 /** Get Secret */
 export declare const getSecret: ({ name, version, vaultInfo, nameFormatted, }: GetVaultItemProps) => Promise<import("@azure/keyvault-secrets").KeyVaultSecret | undefined>;
 interface KeyResult {
@@ -31,8 +37,4 @@ 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,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVaultRoleNames = exports.parseKeyUrl = exports.getSecret = exports.getEncryptionKey = exports.getKey = exports.addKey = void 0;
+exports.parseKeyUrl = exports.getSecret = exports.getEncryptionKeyOutput = 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, ".", "-"), {
@@ -39,11 +38,19 @@ const getKey = async ({ name, version, vaultInfo, nameFormatted, }) => {
     return client.getKey(n, version);
 };
 exports.getKey = getKey;
-const getEncryptionKey = (name, vaultInfo) => {
+/** Get or create encryption Key */
+const getEncryptionKey = async (name, vaultInfo) => {
     const n = `${name}-encrypt-key`;
-    return (0, pulumi_1.output)((0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name).getOrCreateKey(n));
+    const key = await (0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name).getOrCreateKey(n);
+    return {
+        keyName: key.properties.name,
+        keyVaultUri: key.properties.vaultUrl,
+        keyVersion: key.properties.version,
+        url: `${key.properties.vaultUrl}/keys/${key.properties.name}/${key.properties.version}`,
+    };
 };
-exports.getEncryptionKey = getEncryptionKey;
+const getEncryptionKeyOutput = (name, vaultInfo) => (0, pulumi_1.output)(getEncryptionKey(name, vaultInfo));
+exports.getEncryptionKeyOutput = getEncryptionKeyOutput;
 /** Get Secret */
 const getSecret = async ({ name, version, vaultInfo, nameFormatted, }) => {
     const n = nameFormatted ? name : (0, Naming_1.getSecretName)(name);
@@ -62,17 +69,4 @@ const parseKeyUrl = (keyUrl) => {
     };
 };
 exports.parseKeyUrl = parseKeyUrl;
-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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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwwREFBMEQ7QUFDMUQsMkNBQWlFO0FBRWpFLDZDQUFpRDtBQUNqRCwrQ0FBK0M7QUFDL0Msb0ZBQW9GO0FBd0I3RSxNQUFNLE1BQU0sR0FBRyxDQUFDLEVBQ3JCLElBQUksRUFDSixTQUFTLEVBQ1QsSUFBSSxFQUNKLFNBQVMsR0FDa0MsRUFBRSxFQUFFO0lBQy9DLE1BQU0sQ0FBQyxHQUFHLElBQUEsc0JBQWEsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU5QixPQUFPLElBQUksUUFBUSxDQUFDLEdBQUcsQ0FDckIsSUFBQSxvQkFBVSxFQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQzFCO1FBQ0UsT0FBTyxFQUFFLENBQUM7UUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7UUFDekIsR0FBRyxTQUFTLENBQUMsS0FBSztRQUNsQixzR0FBc0c7UUFDdEcsVUFBVSxFQUFFO1lBQ1YsT0FBTyxFQUFFLElBQUk7WUFDYixHQUFHLEVBQUUsS0FBSztZQUNWLE1BQU0sRUFBRTtnQkFDTixTQUFTO2dCQUNULFNBQVM7Z0JBQ1QsTUFBTTtnQkFDTixRQUFRO2dCQUNSLFNBQVM7Z0JBQ1QsV0FBVzthQUNaO1lBQ0Qsb0JBQW9CO1lBQ3BCLFVBQVUsRUFBRSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUU7U0FDOUI7UUFDRCxJQUFJO0tBQ0wsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7QUFDSixDQUFDLENBQUM7QUFqQ1csUUFBQSxNQUFNLFVBaUNqQjtBQUVGLGNBQWM7QUFDUCxNQUFNLE1BQU0sR0FBRyxLQUFLLEVBQUUsRUFDM0IsSUFBSSxFQUNKLE9BQU8sRUFDUCxTQUFTLEVBQ1QsYUFBYSxHQUNLLEVBQUUsRUFBRTtJQUN0QixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxzQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUEsOEJBQWUsRUFBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUNuQyxDQUFDLENBQUM7QUFUVyxRQUFBLE1BQU0sVUFTakI7QUFjRixtQ0FBbUM7QUFDbkMsTUFBTSxnQkFBZ0IsR0FBRyxLQUFLLEVBQzVCLElBQVksRUFDWixTQUF1QixFQUNhLEVBQUU7SUFDdEMsTUFBTSxDQUFDLEdBQUcsR0FBRyxJQUFJLGNBQWMsQ0FBQztJQUNoQyxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUEsOEJBQWUsRUFBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BFLE9BQU87UUFDTCxPQUFPLEVBQUUsR0FBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJO1FBQzdCLFdBQVcsRUFBRSxHQUFJLENBQUMsVUFBVSxDQUFDLFFBQVE7UUFDckMsVUFBVSxFQUFFLEdBQUksQ0FBQyxVQUFVLENBQUMsT0FBTztRQUNuQyxHQUFHLEVBQUUsR0FBRyxHQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsU0FBUyxHQUFJLENBQUMsVUFBVSxDQUFDLElBQUksSUFBSSxHQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRTtLQUMzRixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBRUssTUFBTSxzQkFBc0IsR0FBRyxDQUNwQyxJQUFZLEVBQ1osU0FBdUIsRUFDWSxFQUFFLENBQ3JDLElBQUEsZUFBTSxFQUFDLGdCQUFnQixDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDO0FBSi9CLFFBQUEsc0JBQXNCLDBCQUlTO0FBRTVDLGlCQUFpQjtBQUNWLE1BQU0sU0FBUyxHQUFHLEtBQUssRUFBRSxFQUM5QixJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBQ0ssRUFBRSxFQUFFO0lBQ3RCLE1BQU0sQ0FBQyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLHNCQUFhLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDckQsTUFBTSxNQUFNLEdBQUcsSUFBQSw4QkFBZSxFQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQyxPQUFPLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ3RDLENBQUMsQ0FBQztBQVRXLFFBQUEsU0FBUyxhQVNwQjtBQVVGLG1DQUFtQztBQUM1QixNQUFNLFdBQVcsR0FBRyxDQUFDLE1BQWMsRUFBYSxFQUFFO0lBQ3ZELE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDakMsT0FBTztRQUNMLGNBQWMsRUFBRSxNQUFNO1FBQ3RCLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ2YsT0FBTyxFQUFFLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDM0MsUUFBUSxFQUFFLFdBQVcsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFO0tBQ2pDLENBQUM7QUFDSixDQUFDLENBQUM7QUFSVyxRQUFBLFdBQVcsZUFRdEIifQ==

package/KeyVault/index.d.ts

@@ -2,14 +2,12 @@ import { Input } from "@pulumi/pulumi";
 import { BasicMonitorArgs, PrivateLinkProps } from "../types";
 import { BasicResourceArgs } from "../types";
 interface Props extends BasicResourceArgs {
-    /**The default-encryption-key, tenant-id va subscription-id will be added to the secrets and keys*/
-    createDefaultValues?: boolean;
     network?: {
         ipAddresses?: Array<Input<string>>;
         subnetIds?: Array<Input<string>>;
     };
 }
-declare const _default: ({ name, group, createDefaultValues, network, ...others }: Props) => {
+declare const _default: ({ name, group, network, ...others }: Props) => {
     name: string;
     vault: import("@pulumi/azure-native/keyvault/vault").Vault;
     toVaultInfo: () => {

package/KeyVault/index.js

@@ -6,14 +6,8 @@ const AzureEnv_1 = require("../Common/AzureEnv");
 const Naming_1 = require("../Common/Naming");
 const Helpers_1 = require("../Logs/Helpers");
 const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
-const CustomHelper_1 = require("./CustomHelper");
-const VaultPermissions_1 = require("./VaultPermissions");
-const KeyVaultRoles_1 = require("../AzAd/KeyVaultRoles");
-exports.default = ({ name, 
-//nameConvention,
-group, createDefaultValues, network, ...others }) => {
+exports.default = ({ name, group, network, ...others }) => {
     const vaultName = (0, Naming_1.getKeyVaultName)(name);
-    const roles = (0, KeyVaultRoles_1.createVaultRoles)(name);
     const vault = new native.keyvault.Vault(vaultName, {
         vaultName,
         ...group,
@@ -52,24 +46,6 @@ group, createDefaultValues, network, ...others }) => {
         group,
         id: vault.id,
     });
-    const vaultInfo = toVaultInfo();
-    (0, VaultPermissions_1.grantVaultPermissionToRole)({ name, vaultInfo, roles });
-    if (createDefaultValues) {
-        (0, CustomHelper_1.addCustomSecret)({
-            name: "tenant-id",
-            value: AzureEnv_1.tenantId,
-            vaultInfo,
-            contentType: "KeyVault Default Values",
-            dependsOn: vault,
-        });
-        (0, CustomHelper_1.addCustomSecret)({
-            name: "subscription-id",
-            value: AzureEnv_1.subscriptionId,
-            vaultInfo,
-            contentType: "KeyVault Default Values",
-            dependsOn: vault,
-        });
-    }
     //Add Diagnostic
     const addDiagnostic = (logInfo) => (0, Helpers_1.createDiagnostic)({
         name,
@@ -94,4 +70,4 @@ group, createDefaultValues, network, ...others }) => {
         createPrivateLink,
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBK0M7QUFDL0Msc0RBQW1EO0FBRW5ELGlEQUE4RDtBQUM5RCw2Q0FBMkU7QUFDM0UsNkNBQW1EO0FBRW5ELDZEQUFzRDtBQUV0RCxpREFBaUQ7QUFDakQseURBQWdFO0FBQ2hFLHlEQUF5RDtBQVd6RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSTtBQUNKLGlCQUFpQjtBQUNqQixLQUFLLEVBQ0wsbUJBQW1CLEVBQ25CLE9BQU8sRUFDUCxHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixNQUFNLFNBQVMsR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEMsTUFBTSxLQUFLLEdBQUcsSUFBQSxnQ0FBZ0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVyQyxNQUFNLEtBQUssR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtRQUNqRCxTQUFTO1FBQ1QsR0FBRyxLQUFLO1FBQ1IsR0FBRyxNQUFNO1FBRVQsVUFBVSxFQUFFO1lBQ1YsUUFBUSxFQUFSLG1CQUFRO1lBQ1IsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFO1lBQ3RDLFVBQVUsRUFBRSxTQUFTO1lBRXJCLHVCQUF1QixFQUFFLElBQUk7WUFDN0IsY0FBYyxFQUFFLFNBQVM7WUFFekIscUJBQXFCLEVBQUUsSUFBSTtZQUMzQixnQkFBZ0IsRUFBRSxJQUFJO1lBQ3RCLHlCQUF5QixFQUFFLENBQUMsRUFBRSwyRUFBMkU7WUFFekcsb0JBQW9CLEVBQUUsSUFBSTtZQUMxQix3QkFBd0IsRUFBRSxJQUFJO1lBRTlCLFdBQVcsRUFBRSxPQUFPO2dCQUNsQixDQUFDLENBQUM7b0JBQ0UsTUFBTSxFQUFFLGVBQWU7b0JBQ3ZCLGFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBK0M7QUFDL0Msc0RBQW1EO0FBRW5ELGlEQUE4QztBQUM5Qyw2Q0FBMkU7QUFDM0UsNkNBQW1EO0FBRW5ELDZEQUFzRDtBQVV0RCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsR0FBRyxNQUFNLEVBQVMsRUFBRSxFQUFFO0lBQzVELE1BQU0sU0FBUyxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV4QyxNQUFNLEtBQUssR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtRQUNqRCxTQUFTO1FBQ1QsR0FBRyxLQUFLO1FBQ1IsR0FBRyxNQUFNO1FBRVQsVUFBVSxFQUFFO1lBQ1YsUUFBUSxFQUFSLG1CQUFRO1lBQ1IsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFO1lBQ3RDLFVBQVUsRUFBRSxTQUFTO1lBRXJCLHVCQUF1QixFQUFFLElBQUk7WUFDN0IsY0FBYyxFQUFFLFNBQVM7WUFFekIscUJBQXFCLEVBQUUsSUFBSTtZQUMzQixnQkFBZ0IsRUFBRSxJQUFJO1lBQ3RCLHlCQUF5QixFQUFFLENBQUMsRUFBRSwyRUFBMkU7WUFFekcsb0JBQW9CLEVBQUUsSUFBSTtZQUMxQix3QkFBd0IsRUFBRSxJQUFJO1lBRTlCLFdBQVcsRUFBRSxPQUFPO2dCQUNsQixDQUFDLENBQUM7b0JBQ0UsTUFBTSxFQUFFLGVBQWU7b0JBQ3ZCLGFBQWEsRUFBRSxhQUFLLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFDLElBQUk7b0JBRXBELE9BQU8sRUFBRSxPQUFPLENBQUMsV0FBVzt3QkFDMUIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7d0JBQ2hELENBQUMsQ0FBQyxFQUFFO29CQUVOLG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxTQUFTO3dCQUNwQyxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQzt3QkFDM0MsQ0FBQyxDQUFDLFNBQVM7aUJBQ2Q7Z0JBQ0gsQ0FBQyxDQUFDO29CQUNFLE1BQU0sRUFBRSxlQUFlO29CQUN2QixhQUFhLEVBQUUsYUFBSyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLO2lCQUN0RDtTQUNOO0tBQ0YsQ0FBQyxDQUFDO0lBRUgsZUFBZTtJQUNmLE1BQU0sV0FBVyxHQUFHLEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDekIsSUFBSSxFQUFFLFNBQVM7UUFDZixLQUFLO1FBQ0wsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFO0tBQ2IsQ0FBQyxDQUFDO0lBRUgsZ0JBQWdCO0lBQ2hCLE1BQU0sYUFBYSxHQUFHLENBQUMsT0FBeUIsRUFBRSxFQUFFLENBQ2xELElBQUEsMEJBQWdCLEVBQUM7UUFDZixJQUFJO1FBQ0osZ0JBQWdCLEVBQUUsS0FBSyxDQUFDLEVBQUU7UUFDMUIsR0FBRyxPQUFPO1FBQ1YsY0FBYyxFQUFFLENBQUMsWUFBWSxDQUFDO0tBQy9CLENBQUMsQ0FBQztJQUVMLHNCQUFzQjtJQUN0QixNQUFNLGlCQUFpQixHQUFHLENBQUMsS0FBdUIsRUFBRSxFQUFFLENBQ3BELElBQUEseUJBQWUsRUFBQztRQUNkLElBQUksRUFBRSxJQUFBLCtCQUFzQixFQUFDLElBQUksQ0FBQztRQUNsQyxLQUFLO1FBQ0wsR0FBRyxLQUFLO1FBQ1IsVUFBVSxFQUFFLEtBQUssQ0FBQyxFQUFFO1FBQ3BCLGtCQUFrQixFQUFFLGlDQUFpQztRQUNyRCxtQkFBbUIsRUFBRSxDQUFDLFVBQVUsQ0FBQztLQUNsQyxDQUFDLENBQUM7SUFFTCxPQUFPO1FBQ0wsSUFBSSxFQUFFLFNBQVM7UUFDZixLQUFLO1FBQ0wsV0FBVztRQUNYLGFBQWE7UUFDYixpQkFBaUI7S0FDbEIsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9

package/Logs/Helpers.d.ts

@@ -1,5 +1,6 @@
-import { Input } from '@pulumi/pulumi';
-import { DiagnosticProps, KeyVaultInfo } from '../types';
+import { Input, Output } from "@pulumi/pulumi";
+import { StorageConnectionInfo } from "../Storage/Helper";
+import { DiagnosticProps, KeyVaultInfo, ResourceGroupInfo } from "../types";
 export declare const createDiagnostic: ({ name, targetResourceId, logWpId, logStorageId, metricsCategories, logsCategories, dependsOn, }: DiagnosticProps) => import("@pulumi/azure-native/insights/diagnosticSetting").DiagnosticSetting | undefined;
 interface ThreatProtectionProps {
     name: string;
@@ -10,9 +11,9 @@ export declare const getLogWpSecrets: ({ fullName, vaultInfo, }: {
     fullName: string;
     vaultInfo: KeyVaultInfo;
 }) => Promise<{
-    wpId: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-    primaryKey: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-    secondaryKey: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
+    wpId: string | undefined;
+    primaryKey: string | undefined;
+    secondaryKey: string | undefined;
 }>;
 export declare const getLogWpSecretsById: ({ logWpId, vaultInfo, }: {
     logWpId: string;
@@ -20,31 +21,40 @@ export declare const getLogWpSecretsById: ({ logWpId, vaultInfo, }: {
 }) => Promise<{
     info: import("../Common/AzureEnv").ResourceInfo | undefined;
     secrets: {
-        wpId: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-        primaryKey: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-        secondaryKey: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
+        wpId: string | undefined;
+        primaryKey: string | undefined;
+        secondaryKey: string | undefined;
     };
 } | undefined>;
-export declare const getLogWpInfo: ({ logWpName, vaultInfo, }: {
+export type LogWpInfo = {
+    name: string;
+    id: Output<string>;
+    group: ResourceGroupInfo;
+    secrets?: Output<{
+        wpId: string | undefined;
+        secondaryKey: string | undefined;
+        primaryKey: string | undefined;
+    }>;
+};
+export declare const getLogWpInfo: ({ logWpName, vaultInfo, group, }: {
     logWpName: string;
+    group: ResourceGroupInfo;
     vaultInfo?: KeyVaultInfo;
-}) => Promise<{
+}) => LogWpInfo;
+export type LogStorageInfo = {
     name: string;
-    group: import("../types").ResourceGroupInfo;
-    id: import("@pulumi/pulumi").Output<string>;
-    secrets: {
-        wpId: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-        primaryKey: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-        secondaryKey: import("@azure/keyvault-secrets").KeyVaultSecret | undefined;
-    } | undefined;
-}>;
-export declare const getLogStorageInfo: ({ storageName, vaultInfo, }: {
+    id: Output<string>;
+    group: ResourceGroupInfo;
+    secrets?: Output<StorageConnectionInfo>;
+};
+export declare const getLogStorageInfo: ({ storageName, group, vaultInfo, }: {
     storageName: string;
+    group: ResourceGroupInfo;
     vaultInfo?: KeyVaultInfo;
-}) => Promise<{
-    name: string;
-    group: import("../types").ResourceGroupInfo;
-    id: import("@pulumi/pulumi").Output<string>;
-    secrets: import("../Storage/Helper").StorageConnectionInfo | undefined;
-}>;
+}) => LogStorageInfo;
+export type LogInfoResults = {
+    logWp: LogWpInfo;
+    logStorage: LogStorageInfo;
+};
+export declare const getLogInfo: (groupName: string, vaultInfo?: KeyVaultInfo | undefined) => LogInfoResults;
 export {};