@drunk-pulumi/azure-components 1.0.3 → 1.0.5

package/app/AppContainerEnv.d.ts

@@ -0,0 +1,68 @@
+import * as app from '@pulumi/azure-native/app';
+import * as pulumi from '@pulumi/pulumi';
+import * as types from '../types';
+import { AppContainerArgs } from './AppContainer';
+import { BaseResourceComponent, CommonBaseArgs } from '../base';
+import * as enums from '@pulumi/azure-native/types/enums';
+interface ScheduledEntryArgs {
+    /**
+     * Length of maintenance window range from 8 to 24 hours.
+     */
+    durationHours: pulumi.Input<number>;
+    /**
+     * Start hour after which managed environment maintenance can start from 0 to 23 hour.
+     */
+    startHourUtc: pulumi.Input<number>;
+    /**
+     * Day of the week when a managed environment can be patched.
+     */
+    weekDay: pulumi.Input<enums.app.WeekDay>;
+}
+/**
+ * Azure Container Apps Managed Environment component providing isolated hosting
+ * environment for container apps with networking, monitoring, and scaling features.
+ */
+export interface AppContainerEnvArgs extends CommonBaseArgs, types.WithUserAssignedIdentity, Partial<Pick<app.ManagedEnvironmentArgs, 'daprAIConnectionString' | 'daprAIInstrumentationKey' | 'customDomainConfiguration' | 'infrastructureResourceGroup' | 'peerAuthentication' | 'peerTrafficConfiguration' | 'workloadProfiles' | 'zoneRedundant' | 'appInsightsConfiguration' | 'appLogsConfiguration' | 'openTelemetryConfiguration' | 'publicNetworkAccess'>> {
+    /** VNet configuration for internal networking */
+    vnetConfiguration?: {
+        /** Subnet resource info for infrastructure components */
+        infrastructureSubnet: types.SubResourceInputs;
+        /** Enable internal-only ingress */
+        internal?: boolean;
+        /** Platform-reserved CIDR (e.g., '10.0.0.0/23') - must not overlap with infrastructure subnet */
+        platformReservedCidr?: pulumi.Input<string>;
+        /** Platform-reserved DNS IP (must be within platformReservedCidr) */
+        platformReservedDnsIP?: pulumi.Input<string>;
+    };
+    /** Log Analytics workspace for Container App logs and metrics */
+    logAnalyticsWorkspace?: types.ResourceInputs;
+    /** Dapr configuration */
+    dapr?: {
+        /** Application Insights connection string for Dapr telemetry */
+        connectionString?: pulumi.Input<string>;
+        /** Application Insights instrumentation key for Dapr telemetry */
+        instrumentationKey?: pulumi.Input<string>;
+    };
+    containerApps?: Record<string, Omit<AppContainerArgs, types.CommonProps | 'managedEnvironmentId'>>;
+    maintenanceSchedules?: pulumi.Input<ScheduledEntryArgs>[];
+}
+export declare class AppContainerEnv extends BaseResourceComponent<AppContainerEnvArgs> {
+    readonly id: pulumi.Output<string>;
+    readonly resourceName: pulumi.Output<string>;
+    readonly defaultDomain: pulumi.Output<string>;
+    readonly staticIp: pulumi.Output<string>;
+    constructor(name: string, args: AppContainerEnvArgs, opts?: pulumi.ComponentResourceOptions);
+    getOutputs(): {
+        resourceName: pulumi.Output<string>;
+        id: pulumi.Output<string>;
+        defaultDomain: pulumi.Output<string>;
+        staticIp: pulumi.Output<string>;
+        vaultSecrets: {
+            [key: string]: import("..").VaultSecretResult;
+        } | undefined;
+    };
+    private createManagedEnvironment;
+    private createMaintenance;
+    private createApps;
+}
+export {};

package/app/AppContainerEnv.js

@@ -0,0 +1,142 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppContainerEnv = void 0;
+const app = __importStar(require("@pulumi/azure-native/app"));
+const pulumi = __importStar(require("@pulumi/pulumi"));
+const AppContainer_1 = require("./AppContainer");
+const base_1 = require("../base");
+const helpers_1 = require("../helpers");
+class AppContainerEnv extends base_1.BaseResourceComponent {
+    id;
+    resourceName;
+    defaultDomain;
+    staticIp;
+    constructor(name, args, opts) {
+        super('AppContainerEnv', name, args, opts);
+        const managedEnv = this.createManagedEnvironment();
+        this.createMaintenance(managedEnv);
+        this.createApps(managedEnv);
+        this.id = managedEnv.id;
+        this.resourceName = managedEnv.name;
+        this.defaultDomain = managedEnv.defaultDomain;
+        this.staticIp = managedEnv.staticIp;
+        this.registerOutputs();
+    }
+    getOutputs() {
+        return {
+            resourceName: this.resourceName,
+            id: this.id,
+            defaultDomain: this.defaultDomain,
+            staticIp: this.staticIp,
+            vaultSecrets: this.vaultSecrets,
+        };
+    }
+    createManagedEnvironment() {
+        const { rsGroup, defaultUAssignedId, vnetConfiguration, logAnalyticsWorkspace, dapr, workloadProfiles, zoneRedundant, ...props } = this.args;
+        // Build Log Analytics configuration
+        const appLogsConfiguration = logAnalyticsWorkspace
+            ? {
+                appLogsConfiguration: {
+                    logAnalyticsConfiguration: {
+                        customerId: logAnalyticsWorkspace.id,
+                        sharedKey: pulumi.secret(logAnalyticsWorkspace.id), // In practice, retrieve actual shared key
+                    },
+                },
+            }
+            : undefined;
+        return new app.ManagedEnvironment(this.name, {
+            ...props,
+            ...rsGroup,
+            // Logging and monitoring
+            ...appLogsConfiguration,
+            workloadProfiles: workloadProfiles ?? [
+                {
+                    name: 'Consumption',
+                    workloadProfileType: 'Consumption',
+                },
+            ],
+            identity: {
+                type: defaultUAssignedId
+                    ? app.ManagedServiceIdentityType.SystemAssigned_UserAssigned
+                    : app.ManagedServiceIdentityType.SystemAssigned,
+                userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
+            },
+            // VNet integration
+            vnetConfiguration: vnetConfiguration
+                ? {
+                    infrastructureSubnetId: vnetConfiguration.infrastructureSubnet.id,
+                    internal: vnetConfiguration.internal ?? false,
+                    platformReservedCidr: vnetConfiguration.platformReservedCidr,
+                    platformReservedDnsIP: vnetConfiguration.platformReservedDnsIP,
+                }
+                : undefined,
+            // Dapr telemetry
+            daprAIConnectionString: dapr?.connectionString ?? this.args.daprAIConnectionString,
+            daprAIInstrumentationKey: dapr?.instrumentationKey ?? this.args.daprAIInstrumentationKey,
+            zoneRedundant: zoneRedundant ?? helpers_1.azureEnv.isPrd,
+        }, { ...this.opts, parent: this, deleteBeforeReplace: true });
+    }
+    createMaintenance(env) {
+        const { rsGroup, maintenanceSchedules } = this.args;
+        new app.MaintenanceConfiguration(`${this.name}-maintenance`, {
+            configName: 'default',
+            environmentName: env.name,
+            resourceGroupName: rsGroup.resourceGroupName,
+            scheduledEntries: maintenanceSchedules ?? [
+                {
+                    weekDay: 'Sunday',
+                    durationHours: 8,
+                    startHourUtc: 0,
+                },
+            ],
+        }, { dependsOn: env, deletedWith: env, parent: this, deleteBeforeReplace: true });
+    }
+    createApps(env) {
+        const { containerApps, rsGroup, vaultInfo, defaultUAssignedId, groupRoles } = this.args;
+        if (!containerApps)
+            return undefined;
+        return Object.entries(containerApps).forEach(([appName, appArgs]) => new AppContainer_1.AppContainer(appName, {
+            ...appArgs,
+            rsGroup,
+            vaultInfo,
+            defaultUAssignedId: appArgs.defaultUAssignedId ?? defaultUAssignedId,
+            groupRoles,
+            managedEnvironmentId: env.id,
+        }, { dependsOn: env, deletedWith: env, parent: this }));
+    }
+}
+exports.AppContainerEnv = AppContainerEnv;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29udGFpbmVyRW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9BcHBDb250YWluZXJFbnYudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQWdEO0FBQ2hELHVEQUF5QztBQUV6QyxpREFBZ0U7QUFDaEUsa0NBQWdFO0FBQ2hFLHdDQUFzQztBQXNFdEMsTUFBYSxlQUFnQixTQUFRLDRCQUEwQztJQUM3RCxFQUFFLENBQXdCO0lBQzFCLFlBQVksQ0FBd0I7SUFDcEMsYUFBYSxDQUF3QjtJQUNyQyxRQUFRLENBQXdCO0lBRWhELFlBQVksSUFBWSxFQUFFLElBQXlCLEVBQUUsSUFBc0M7UUFDekYsS0FBSyxDQUFDLGlCQUFpQixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFM0MsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLHdCQUF3QixFQUFFLENBQUM7UUFDbkQsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ25DLElBQUksQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7UUFFNUIsSUFBSSxDQUFDLEVBQUUsR0FBRyxVQUFVLENBQUMsRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUNwQyxJQUFJLENBQUMsYUFBYSxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUM7UUFDOUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDO1FBRXBDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QixDQUFDO0lBRU0sVUFBVTtRQUNmLE9BQU87WUFDTCxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVk7WUFDL0IsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ1gsYUFBYSxFQUFFLElBQUksQ0FBQyxhQUFhO1lBQ2pD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

package/app/index.d.ts

@@ -1,5 +1,7 @@
 export * from './AppCert';
 export * from './AppConfig';
+export * from './AppContainer';
+export * from './AppContainerEnv';
 export * from './AppService';
 export * from './IoTHub';
 export * from './LogicApp';

package/app/index.js

@@ -16,8 +16,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AppCert"), exports);
 __exportStar(require("./AppConfig"), exports);
+__exportStar(require("./AppContainer"), exports);
+__exportStar(require("./AppContainerEnv"), exports);
 __exportStar(require("./AppService"), exports);
 __exportStar(require("./IoTHub"), exports);
 __exportStar(require("./LogicApp"), exports);
 __exportStar(require("./SignalR"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXBwL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0Q0FBMEI7QUFDMUIsOENBQTRCO0FBQzVCLCtDQUE2QjtBQUM3QiwyQ0FBeUI7QUFDekIsNkNBQTJCO0FBQzNCLDRDQUEwQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXBwL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0Q0FBMEI7QUFDMUIsOENBQTRCO0FBQzVCLGlEQUErQjtBQUMvQixvREFBa0M7QUFDbEMsK0NBQTZCO0FBQzdCLDJDQUF5QjtBQUN6Qiw2Q0FBMkI7QUFDM0IsNENBQTBCIn0=

package/azAd/AppRegistration.d.ts

@@ -2,8 +2,7 @@ import * as azAd from '@pulumi/azuread';
 import * as pulumi from '@pulumi/pulumi';
 import { RoleAssignmentArgs } from './RoleAssignment';
 import { WithMemberOfArgs, WithVaultInfo } from '../types';
-import { BaseComponent } from '../base/BaseComponent';
-import { VaultSecrets } from '../vault';
+import { BaseComponent } from '../base';
 export declare enum GroupMembershipClaimsTypes {
     None = "None",
     SecurityGroup = "SecurityGroup",
@@ -31,21 +30,19 @@ export interface AppRegistrationArgs extends WithVaultInfo, WithMemberOfArgs, Pa
     roleAssignments?: Array<Omit<RoleAssignmentArgs, 'roleAssignmentName' | 'principalId' | 'principalType'>>;
 }
 export declare class AppRegistration extends BaseComponent<AppRegistrationArgs> {
+    readonly tenantId: pulumi.Output<string>;
     readonly clientId: pulumi.Output<string>;
-    readonly clientSecret?: pulumi.Output<string>;
-    readonly servicePrincipalId?: pulumi.Output<string>;
-    readonly servicePrincipalPassword?: pulumi.Output<string>;
-    readonly vaultSecrets: {
-        [key: string]: ReturnType<VaultSecrets['getOutputs']>;
-    };
+    readonly clientSecret: pulumi.Output<string>;
+    readonly servicePrincipalId: pulumi.Output<string>;
+    readonly servicePrincipalPassword: pulumi.Output<string>;
+    private vaultSecrets;
     constructor(name: string, args?: AppRegistrationArgs, opts?: pulumi.ComponentResourceOptions);
     getOutputs(): {
+        tenantId: pulumi.Output<string>;
         clientId: pulumi.Output<string>;
-        servicePrincipalId: pulumi.Output<string> | undefined;
+        servicePrincipalId: pulumi.Output<string>;
         vaultSecrets: {
-            [key: string]: {
-                [key: string]: import("../vault").VaultSecretResult;
-            };
+            [key: string]: import("../vault").VaultSecretResult;
         };
     };
     private createAppRegistration;

package/azAd/AppRegistration.js

@@ -37,7 +37,7 @@ exports.AppRegistration = exports.GroupMembershipClaimsTypes = void 0;
 const azAd = __importStar(require("@pulumi/azuread"));
 const pulumi = __importStar(require("@pulumi/pulumi"));
 const RoleAssignment_1 = require("./RoleAssignment");
-const BaseComponent_1 = require("../base/BaseComponent");
+const base_1 = require("../base");
 const vault_1 = require("../vault");
 const helpers_1 = require("../base/helpers");
 const helpers_2 = require("../helpers");
@@ -49,7 +49,8 @@ var GroupMembershipClaimsTypes;
     GroupMembershipClaimsTypes["ApplicationGroup"] = "ApplicationGroup";
     GroupMembershipClaimsTypes["All"] = "All";
 })(GroupMembershipClaimsTypes || (exports.GroupMembershipClaimsTypes = GroupMembershipClaimsTypes = {}));
-class AppRegistration extends BaseComponent_1.BaseComponent {
+class AppRegistration extends base_1.BaseComponent {
+    tenantId;
     clientId;
     clientSecret;
     servicePrincipalId;
@@ -63,6 +64,8 @@ class AppRegistration extends BaseComponent_1.BaseComponent {
         this.servicePrincipalId = sp.servicePrincipalId;
         this.servicePrincipalPassword = sp.servicePrincipalPassword;
         this.clientId = app.clientId;
+        this.clientSecret = clientSecret;
+        this.tenantId = helpers_2.azureEnv.tenantId;
         this.addSecrets({
             clientId: app.clientId,
             clientSecret: clientSecret,
@@ -73,6 +76,7 @@ class AppRegistration extends BaseComponent_1.BaseComponent {
     }
     getOutputs() {
         return {
+            tenantId: this.tenantId,
             clientId: this.clientId,
             servicePrincipalId: this.servicePrincipalId,
             vaultSecrets: this.vaultSecrets,
@@ -97,7 +101,7 @@ class AppRegistration extends BaseComponent_1.BaseComponent {
                 }
                 : undefined,
             singlePageApplication: this.args.appType == 'singlePageApplication' ? { redirectUris: this.args.redirectUris } : undefined,
-        }, { ...this.opts, parent: this });
+        }, { ...this.opts, parent: this, ignoreChanges: ['tags'] });
         const clientSecret = new azAd.ApplicationPassword(`${this.name}-client-secret`, {
             displayName: this.name,
             applicationId: app.id,
@@ -112,7 +116,7 @@ class AppRegistration extends BaseComponent_1.BaseComponent {
             clientId: app.clientId,
             owners: this.args.owners,
         }, { dependsOn: app, deletedWith: app, parent: this });
-        var spPass = new azAd.ServicePrincipalPassword(`${this.name}-sp-pass`, {
+        const spPass = new azAd.ServicePrincipalPassword(`${this.name}-sp-pass`, {
             displayName: this.name,
             servicePrincipalId: pulumi.interpolate `/servicePrincipals/${sp.objectId}`,
         }, { dependsOn: sp, deletedWith: app, parent: this });
@@ -140,25 +144,24 @@ class AppRegistration extends BaseComponent_1.BaseComponent {
     addSecrets({ clientId, clientSecret, servicePrincipalId, servicePrincipalPass, }) {
         if (!this.args.vaultInfo)
             return;
-        const n = `${this.name}-secrets`;
-        const secret = new vault_1.VaultSecrets(n, {
+        const secret = new vault_1.VaultSecrets(this.name, {
             vaultInfo: this.args.vaultInfo,
             secrets: {
-                [`${this.name}-app-client-id`]: { value: clientId, contentType: `AppRegistration:${this.name} ` },
-                [`${this.name}-app-client-secret`]: { value: clientSecret, contentType: `AppRegistration:${this.name} ` },
-                [`${this.name}-service-principal-id`]: {
+                ['client-id']: { value: clientId, contentType: `AppRegistration:${this.name} ` },
+                ['client-secret']: { value: clientSecret, contentType: `AppRegistration:${this.name} ` },
+                ['principal-id']: {
                     value: servicePrincipalId,
                     contentType: `AppRegistration:${this.name} `,
                 },
-                [`${this.name}-service-principal-pass`]: {
+                ['principal-secret']: {
                     value: servicePrincipalPass,
                     contentType: `AppRegistration:${this.name} `,
                 },
             },
         }, { dependsOn: this.opts?.dependsOn, parent: this });
-        this.vaultSecrets[n] = secret.getOutputs();
+        this.vaultSecrets = secret.getOutputs();
         return secret;
     }
 }
 exports.AppRegistration = AppRegistration;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwUmVnaXN0cmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6QWQvQXBwUmVnaXN0cmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUN4Qyx1REFBeUM7QUFFekMscURBQXNFO0FBR3RFLHlEQUFzRDtBQUN0RCxvQ0FBd0M7QUFDeEMsNkNBQTJEO0FBQzNELHdDQUF1QztBQUV2QyxJQUFZLDBCQU1YO0FBTkQsV0FBWSwwQkFBMEI7SUFDcEMsMkNBQWEsQ0FBQTtJQUNiLDZEQUErQixDQUFBO0lBQy9CLDZEQUErQixDQUFBO0lBQy9CLG1FQUFxQyxDQUFBO0lBQ3JDLHlDQUFXLENBQUE7QUFDYixDQUFDLEVBTlcsMEJBQTBCLDBDQUExQiwwQkFBMEIsUUFNckM7QUEyQ0QsTUFBYSxlQUFnQixTQUFRLDZCQUFrQztJQUNyRCxRQUFRLENBQXdCO0lBQ2hDLFlBQVksQ0FBeUI7SUFDckMsa0JBQWtCLENBQXlCO0lBQzNDLHdCQUF3QixDQUF5QjtJQUNqRCxZQUFZLEdBQThELEVBQUUsQ0FBQztJQUU3RixZQUFZLElBQVksRUFBRSxPQUE0QixFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsRUFBRSxJQUFzQztRQUNqSCxLQUFLLENBQUMsSUFBQSxrQ0FBd0IsRUFBQyxpQkFBaUIsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFckUsYUFBYTtRQUNiLE1BQU0sRUFBRSxHQUFHLEVBQUUsWUFBWSxFQUFFLEdBQUcsSUFBSSxDQUFDLHFCQUFxQixFQUFFLENBQUM7UUFDM0QsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzVDLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxFQUFFLENBQUMsa0JBQWtCLENBQUM7UUFDaEQsSUFBSSxDQUFDLHdCQUF3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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwUmVnaXN0cmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6QWQvQXBwUmVnaXN0cmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUN4Qyx1REFBeUM7QUFFekMscURBQXNFO0FBR3RFLGtDQUF3QztBQUN4QyxvQ0FBd0M7QUFDeEMsNkNBQTJEO0FBQzNELHdDQUFpRDtBQUVqRCxJQUFZLDBCQU1YO0FBTkQsV0FBWSwwQkFBMEI7SUFDcEMsMkNBQWEsQ0FBQTtJQUNiLDZEQUErQixDQUFBO0lBQy9CLDZEQUErQixDQUFBO0lBQy9CLG1FQUFxQyxDQUFBO0lBQ3JDLHlDQUFXLENBQUE7QUFDYixDQUFDLEVBTlcsMEJBQTBCLDBDQUExQiwwQkFBMEIsUUFNckM7QUE0Q0QsTUFBYSxlQUFnQixTQUFRLG9CQUFrQztJQUNyRCxRQUFRLENBQXdCO0lBQ2hDLFFBQVEsQ0FBd0I7SUFDaEMsWUFBWSxDQUF3QjtJQUNwQyxrQkFBa0IsQ0FBd0I7SUFDMUMsd0JBQXdCLENBQXdCO0lBQ3hELFlBQVksR0FBMkMsRUFBRSxDQUFDO0lBRWxFLFlBQVksSUFBWSxFQUFFLE9BQTRCLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxFQUFFLElBQXNDO1FBQ2pILEtBQUssQ0FBQyxJQUFBLGtDQUF3QixFQUFDLGlCQUFpQixDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUVyRSxhQUFhO1FBQ2IsTUFBTSxFQUFFLEdBQUcsRUFBRSxZQUFZLEVBQUUsR0FBRyxJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztRQUMzRCxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsc0JBQXNCLENBQUMsR0FBRyxDQUFDLENBQUM7UUFFNUMsSUFBSSxDQUFDLGtCQUFrQixHQUFHLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQztRQUNo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

package/azAd/CloudflareAzIdentity.d.ts

@@ -0,0 +1,10 @@
+import { AppRegistration } from './AppRegistration';
+import * as types from '../types';
+import * as pulumi from '@pulumi/pulumi';
+/**
+ * Creates an Azure App Registration for Cloudflare Access integration.
+ * @param name - The Zero Trust Team Name of the Cloudflare.
+ * @param props - Additional properties including vault information.
+ * @param opts - Optional Pulumi component resource options.
+ */
+export declare function createCloudflareAzIdentity(name: string, props: types.WithVaultInfo, opts?: pulumi.ComponentResourceOptions): AppRegistration;

package/azAd/CloudflareAzIdentity.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCloudflareAzIdentity = createCloudflareAzIdentity;
+const AppRegistration_1 = require("./AppRegistration");
+/**
+ * Creates an Azure App Registration for Cloudflare Access integration.
+ * @param name - The Zero Trust Team Name of the Cloudflare.
+ * @param props - Additional properties including vault information.
+ * @param opts - Optional Pulumi component resource options.
+ */
+function createCloudflareAzIdentity(name, props, opts = {}) {
+    return new AppRegistration_1.AppRegistration(`${name}-cloudflare-idp`, {
+        ...props,
+        appType: 'web',
+        redirectUris: [`https://${name}.cloudflareaccess.com/cdn-cgi/access/callback`],
+        implicitGrant: {
+            accessTokenIssuanceEnabled: true,
+            idTokenIssuanceEnabled: true,
+        },
+        requiredResourceAccesses: [
+            {
+                resourceAppId: '00000003-0000-0000-c000-000000000000',
+                resourceAccesses: [
+                    {
+                        id: '0e263e50-5827-48a4-b97c-d940288653c7',
+                        type: 'Scope',
+                    },
+                    {
+                        id: '64a6cdd6-aab1-4aaf-94b8-3cc8405e90d0',
+                        type: 'Scope',
+                    },
+                    {
+                        id: '5f8c59db-677d-491f-a6b8-5f174b11ec1d',
+                        type: 'Scope',
+                    },
+                    {
+                        id: '7427e0e9-2fba-42fe-b0c0-848c9e6a8182',
+                        type: 'Scope',
+                    },
+                    {
+                        id: '37f7f235-527c-4136-accd-4a02d197296e',
+                        type: 'Scope',
+                    },
+                    {
+                        id: '14dad69e-099b-42c9-810b-d002981feec1',
+                        type: 'Scope',
+                    },
+                    {
+                        id: 'e1fe6dd8-ba31-4d61-89e7-88639da4683d',
+                        type: 'Scope',
+                    },
+                    {
+                        id: '2f51be20-0bb4-4fed-bf7b-db946066c75e',
+                        type: 'Role',
+                    },
+                ],
+            },
+        ],
+    }, opts);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xvdWRmbGFyZUF6SWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9DbG91ZGZsYXJlQXpJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVdBLGdFQXlEQztBQXBFRCx1REFBb0Q7QUFJcEQ7Ozs7O0dBS0c7QUFFSCxTQUFnQiwwQkFBMEIsQ0FDeEMsSUFBWSxFQUNaLEtBQTBCLEVBQzFCLE9BQXdDLEVBQUU7SUFFMUMsT0FBTyxJQUFJLGlDQUFlLENBQ3hCLEdBQUcsSUFBSSxpQkFBaUIsRUFDeEI7UUFDRSxHQUFHLEtBQUs7UUFDUixPQUFPLEVBQUUsS0FBSztRQUNkLFlBQVksRUFBRSxDQUFDLFdBQVcsSUFBSSwrQ0FBK0MsQ0FBQztRQUM5RSxhQUFhLEVBQUU7WUFDYiwwQkFBMEIsRUFBRSxJQUFJO1lBQ2hDLHNCQUFzQixFQUFFLElBQUk7U0FDN0I7UUFDRCx3QkFBd0IsRUFBRTtZQUN4QjtnQkFDRSxhQUFhLEVBQUUsc0NBQXNDO2dCQUNyRCxnQkFBZ0IsRUFBRTtvQkFDaEI7d0JBQ0UsRUFBRSxFQUFFLHNDQUFzQzt3QkFDMUMsSUFBSSxFQUFFLE9BQU87cUJBQ2Q7b0JBQ0Q7d0JBQ0UsRUFBRSxFQUFFLHNDQUFzQzt3QkFDMUMsSUFBSSxFQUFFLE9BQU87cUJBQ2Q7b0JBQ0Q7d0JBQ0UsRUFBRSxFQUFFLHNDQUFzQzt3QkFDMUMsSUFBSSxFQUFFLE9BQU87cUJBQ2Q7b0JBQ0Q7d0JBQ0UsRUFBRSxFQUFFLHNDQUFzQzt3QkFDMUMsSUFBSSxFQUFFLE9BQU87cUJBQ2Q7b0JBQ0Q7d0JBQ0UsRUFBRSxFQUFFLHNDQUFzQzt3QkFDMUMsSUFBSSxFQUFFLE9BQU87cUJBQ2Q7b0JBQ0Q7d0JBQ0UsRUFBRSxFQUFFLHNDQUFzQzt3QkFDMUMsSUFBSSxFQUFFLE9BQU87cUJBQ2Q7b0JBQ0Q7d0JBQ0UsRUFBRSxFQUFFLHNDQUFzQzt3QkFDMUMsSUFBSSxFQUFFLE9BQU87cUJBQ2Q7b0JBQ0Q7d0JBQ0UsRUFBRSxFQUFFLHNDQUFzQzt3QkFDMUMsSUFBSSxFQUFFLE1BQU07cUJBQ2I7aUJBQ0Y7YUFDRjtTQUNGO0tBQ0YsRUFDRCxJQUFJLENBQ0wsQ0FBQztBQUNKLENBQUMifQ==

package/azAd/GroupRole.d.ts

@@ -2,7 +2,7 @@ import * as pulumi from '@pulumi/pulumi';
 import { BaseComponent } from '../base';
 import * as types from '../types';
 import { AzRoleArgs } from './AzRole';
-export interface GroupRoleArgs extends Pick<AzRoleArgs, 'owners' | 'preventDuplicateNames'>, Partial<Record<types.GroupRoleTypes, Pick<AzRoleArgs, 'members'>>> {
+export interface GroupRoleArgs extends Partial<Pick<AzRoleArgs, 'owners' | 'preventDuplicateNames'>>, Partial<Record<types.GroupRoleTypes, Pick<AzRoleArgs, 'members'>>> {
     preventDuplicateNames?: pulumi.Input<boolean>;
 }
 export declare class GroupRole extends BaseComponent<GroupRoleArgs> {

package/azAd/GroupRole.js

@@ -53,7 +53,7 @@ class GroupRole extends base_1.BaseComponent {
                 owners: args.owners,
                 members: args[role]?.members,
                 preventDuplicateNames: args.preventDuplicateNames,
-            }, { parent: this }),
+            }, { ...this.opts, parent: this, deletedWith: this }),
         ]));
         this.admin = pulumi.output({
             objectId: roleInstances.admin.objectId,
@@ -78,20 +78,19 @@ class GroupRole extends base_1.BaseComponent {
         };
     }
     configHierarchyRoles(roles) {
-        const deps = Object.values(roles);
         if (this.admin && this.contributor) {
             new azAd.GroupMember(`${this.name}-admin2contributor`, {
                 groupObjectId: this.contributor.objectId,
                 memberObjectId: this.admin.objectId,
-            }, { dependsOn: deps, parent: this, retainOnDelete: true });
+            }, { dependsOn: roles['admin'], parent: this, retainOnDelete: true });
         }
         if (this.contributor && this.readOnly) {
             new azAd.GroupMember(`${this.name}-contributor2readOnly`, {
                 groupObjectId: this.readOnly.objectId,
                 memberObjectId: this.contributor.objectId,
-            }, { dependsOn: deps, parent: this, retainOnDelete: true });
+            }, { dependsOn: roles['contributor'], parent: this, retainOnDelete: true });
         }
     }
 }
 exports.GroupRole = GroupRole;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXBSb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6QWQvR3JvdXBSb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUN4Qyx1REFBeUM7QUFDekMsa0NBQXdDO0FBQ3hDLDZDQUEyRDtBQUMzRCx3Q0FBdUM7QUFFdkMscUNBQThDO0FBUTlDLE1BQWEsU0FBVSxTQUFRLG9CQUE0QjtJQUN6QyxLQUFLLENBQXVDO0lBQzVDLFdBQVcsQ0FBdUM7SUFDbEQsUUFBUSxDQUF1QztJQUUvRCxZQUFZLE9BQWUsbUJBQVMsQ0FBQyxLQUFLLEVBQUUsT0FBc0IsRUFBRSxFQUFFLElBQXNDO1FBQzFHLEtBQUssQ0FBQyxJQUFBLGtDQUF3QixFQUFDLFdBQVcsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFL0QsTUFBTSxLQUFLLEdBQUcsQ0FBQyxPQUFPLEVBQUUsYUFBYSxFQUFFLFVBQVUsQ0FBVSxDQUFDO1FBRTVELE1BQU0sYUFBYSxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQ3RDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDO1lBQ2xCLElBQUk7WUFDSixJQUFJLGVBQU0sQ0FDUixHQUFHLElBQUksSUFBSSxJQUFJLEVBQUUsRUFDakI7Z0JBQ0UsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO2dCQUNuQixPQUFPLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU87Z0JBQzVCLHFCQUFxQixFQUFFLElBQUksQ0FBQyxxQkFBcUI7YUFDbEQsRUFDRCxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDakI7U0FDRixDQUFDLENBQ0gsQ0FBQztRQUVGLElBQUksQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztZQUN6QixRQUFRLEVBQUUsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRO1lBQ3RDLFdBQVcsRUFBRSxhQUFhLENBQUMsS0FBSyxDQUFDLFdBQVc7U0FDN0MsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFdBQVcsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO1lBQy9CLFFBQVEsRUFBRSxhQUFhLENBQUMsV0FBVyxDQUFDLFFBQVE7WUFDNUMsV0FBVyxFQUFFLGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVztTQUNuRCxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsUUFBUSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7WUFDNUIsUUFBUSxFQUFFLGFBQWEsQ0FBQyxRQUFRLENBQUMsUUFBUTtZQUN6QyxXQUFXLEVBQUUsYUFBYSxDQUFDLFFBQVEsQ0FBQyxXQUFXO1NBQ2hELENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUV6QyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPO1lBQ0wsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO1lBQ2pCLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVztZQUM3QixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVE7U0FDeEIsQ0FBQztJQUNKLENBQUM7SUFFTyxvQkFBb0IsQ0FBQyxLQUE4QjtRQUN6RCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2xDLElBQUksSUFBSSxDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDbkMsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUNsQixHQUFHLElBQUksQ0FBQyxJQUFJLG9CQUFvQixFQUNoQztnQkFDRSxhQUFhLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRO2dCQUN4QyxjQUFjLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRO2FBQ3BDLEVBQ0QsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxDQUN4RCxDQUFDO1FBQ0osQ0FBQztRQUVELElBQUksSUFBSSxDQUFDLFdBQVcsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDdEMsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUNsQixHQUFHLElBQUksQ0FBQyxJQUFJLHVCQUF1QixFQUNuQztnQkFDRSxhQUFhLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRO2dCQUNyQyxjQUFjLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRO2FBQzFDLEVBQ0QsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxDQUN4RCxDQUFDO1FBQ0osQ0FBQztJQUNILENBQUM7Q0FDRjtBQTdFRCw4QkE2RUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXBSb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6QWQvR3JvdXBSb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUN4Qyx1REFBeUM7QUFDekMsa0NBQXdDO0FBQ3hDLDZDQUEyRDtBQUMzRCx3Q0FBdUM7QUFFdkMscUNBQThDO0FBUzlDLE1BQWEsU0FBVSxTQUFRLG9CQUE0QjtJQUN6QyxLQUFLLENBQXVDO0lBQzVDLFdBQVcsQ0FBdUM7SUFDbEQsUUFBUSxDQUF1QztJQUUvRCxZQUFZLE9BQWUsbUJBQVMsQ0FBQyxLQUFLLEVBQUUsT0FBc0IsRUFBRSxFQUFFLElBQXNDO1FBQzFHLEtBQUssQ0FBQyxJQUFBLGtDQUF3QixFQUFDLFdBQVcsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFL0QsTUFBTSxLQUFLLEdBQUcsQ0FBQyxPQUFPLEVBQUUsYUFBYSxFQUFFLFVBQVUsQ0FBVSxDQUFDO1FBRTVELE1BQU0sYUFBYSxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQ3RDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDO1lBQ2xCLElBQUk7WUFDSixJQUFJLGVBQU0sQ0FDUixHQUFHLElBQUksSUFBSSxJQUFJLEVBQUUsRUFDakI7Z0JBQ0UsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO2dCQUNuQixPQUFPLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU87Z0JBQzVCLHFCQUFxQixFQUFFLElBQUksQ0FBQyxxQkFBcUI7YUFDbEQsRUFDRCxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsQ0FDbEQ7U0FDRixDQUFDLENBQ0gsQ0FBQztRQUVGLElBQUksQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztZQUN6QixRQUFRLEVBQUUsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRO1lBQ3RDLFdBQVcsRUFBRSxhQUFhLENBQUMsS0FBSyxDQUFDLFdBQVc7U0FDN0MsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFdBQVcsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO1lBQy9CLFFBQVEsRUFBRSxhQUFhLENBQUMsV0FBVyxDQUFDLFFBQVE7WUFDNUMsV0FBVyxFQUFFLGFBQWEsQ0FBQyxXQUFXLENBQUMsV0FBVztTQUNuRCxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsUUFBUSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7WUFDNUIsUUFBUSxFQUFFLGFBQWEsQ0FBQyxRQUFRLENBQUMsUUFBUTtZQUN6QyxXQUFXLEVBQUUsYUFBYSxDQUFDLFFBQVEsQ0FBQyxXQUFXO1NBQ2hELENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUV6QyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPO1lBQ0wsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLO1lBQ2pCLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVztZQUM3QixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVE7U0FDeEIsQ0FBQztJQUNKLENBQUM7SUFFTyxvQkFBb0IsQ0FBQyxLQUE4QjtRQUN6RCxJQUFJLElBQUksQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ25DLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FDbEIsR0FBRyxJQUFJLENBQUMsSUFBSSxvQkFBb0IsRUFDaEM7Z0JBQ0UsYUFBYSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUTtnQkFDeEMsY0FBYyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUTthQUNwQyxFQUNELEVBQUUsU0FBUyxFQUFFLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FDbEUsQ0FBQztRQUNKLENBQUM7UUFFRCxJQUFJLElBQUksQ0FBQyxXQUFXLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ3RDLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FDbEIsR0FBRyxJQUFJLENBQUMsSUFBSSx1QkFBdUIsRUFDbkM7Z0JBQ0UsYUFBYSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUTtnQkFDckMsY0FBYyxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUTthQUMxQyxFQUNELEVBQUUsU0FBUyxFQUFFLEtBQUssQ0FBQyxhQUFhLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FDeEUsQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUE1RUQsOEJBNEVDIn0=

package/azAd/UserAssignedIdentity.js

@@ -56,7 +56,7 @@ class UserAssignedIdentity extends base_1.BaseResourceComponent {
         this.id = managedIdentity.id;
         this.clientId = managedIdentity.clientId;
         this.principalId = managedIdentity.principalId;
-        this.addMemberOf();
+        this.addMemberOf(managedIdentity);
         this.registerOutputs();
     }
     getOutputs() {
@@ -79,14 +79,14 @@ class UserAssignedIdentity extends base_1.BaseResourceComponent {
             resourceName: managedIdentity.name,
         }, { dependsOn: managedIdentity, parent: this, deletedWith: managedIdentity }));
     }
-    addMemberOf() {
+    addMemberOf(uid) {
         if (!this.args.memberof)
             return;
-        this.args.memberof.map((group) => pulumi.output(group).apply((id) => new azAd.GroupMember(`${this.name}-${id.objectId}`, {
+        return this.args.memberof.map((group) => pulumi.output(group).apply((id) => new azAd.GroupMember(`${this.name}-${id.objectId}`, {
             groupObjectId: id.objectId,
-            memberObjectId: this.principalId,
-        }, { parent: this, deletedWith: this })));
+            memberObjectId: uid.principalId,
+        }, { dependsOn: uid, parent: this, retainOnDelete: true })));
     }
 }
 exports.UserAssignedIdentity = UserAssignedIdentity;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFzc2lnbmVkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9Vc2VyQXNzaWduZWRJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzREFBd0M7QUFDeEMsMEVBQTREO0FBQzVELHVEQUF5QztBQUV6QyxrQ0FBMEQ7QUFFMUQsd0NBQWlEO0FBWWpELE1BQWEsb0JBQXFCLFNBQVEsNEJBQStDO0lBQ3ZFLEVBQUUsQ0FBd0I7SUFDMUIsUUFBUSxDQUF3QjtJQUNoQyxXQUFXLENBQXdCO0lBRW5ELFlBQVksSUFBWSxFQUFFLElBQThCLEVBQUUsSUFBc0M7UUFDOUYsS0FBSyxDQUFDLHNCQUFzQixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDaEQsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQztRQUV6QixNQUFNLGVBQWUsR0FBRyxJQUFJLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLE9BQU8sRUFBRSxFQUFFLEVBQUUsR0FBRyxJQUFJLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFdEcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBRXhDLElBQUksQ0FBQyxVQUFVLENBQUM7WUFDZCxDQUFDLFFBQVEsQ0FBQyxFQUFFLGVBQWUsQ0FBQyxFQUFFO1lBQzlCLENBQUMsY0FBYyxDQUFDLEVBQUUsZUFBZSxDQUFDLFFBQVE7WUFDMUMsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLGVBQWUsQ0FBQyxXQUFXO1NBQ2pELENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxFQUFFLEdBQUcsZUFBZSxDQUFDLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUMsUUFBUSxHQUFHLGVBQWUsQ0FBQyxRQUFRLENBQUM7UUFDekMsSUFBSSxDQUFDLFdBQVcsR0FBRyxlQUFlLENBQUMsV0FBVyxDQUFDO1FBRS9DLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNuQixJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPO1lBQ0wsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ1gsUUFBUSxFQUFFLElBQUksQ0FBQyxRQUFRO1lBQ3ZCLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVztTQUM5QixDQUFDO0lBQ0osQ0FBQztJQUVPLGlCQUFpQixDQUFDLGVBQXlDO1FBQ2pFLE1BQU0sRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUMzQyxJQUFJLENBQUMsV0FBVztZQUFFLE9BQU8sU0FBUyxDQUFDO1FBQ25DLE9BQU8sbUJBQVMsQ0FBQyxVQUFVLENBQ3pCLFdBQVcsRUFDWCxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUNkLElBQUksR0FBRyxDQUFDLDJCQUEyQixDQUNqQyxHQUFHLElBQUksQ0FBQyxJQUFJLElBQUksSUFBSSxFQUFFLEVBQ3RCO1lBQ0UsR0FBRyxPQUFPO1lBQ1YsdUNBQXVDLEVBQUUsSUFBSTtZQUM3QyxTQUFTLEVBQUUsQ0FBQyw0QkFBNEIsQ0FBQztZQUN6QyxNQUFNLEVBQUUsS0FBSyxDQUFDLE1BQU0sSUFBSSxNQUFNLENBQUMsV0FBVyxDQUFBLHFDQUFxQyxrQkFBUSxDQUFDLFFBQVEsT0FBTztZQUN2RyxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU87WUFDdEIsWUFBWSxFQUFFLGVBQWUsQ0FBQyxJQUFJO1NBQ25DLEVBQ0QsRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLGVBQWUsRUFBRSxDQUMzRSxDQUNKLENBQUM7SUFDSixDQUFDO0lBRU8sV0FBVztRQUNqQixJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRO1lBQUUsT0FBTztRQUNoQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUMvQixNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FDeEIsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUNMLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FDbEIsR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFDN0I7WUFDRSxhQUFhLEVBQUUsRUFBRSxDQUFDLFFBQVE7WUFDMUIsY0FBYyxFQUFFLElBQUksQ0FBQyxXQUFXO1NBQ2pDLEVBQ0QsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsQ0FDcEMsQ0FDSixDQUNGLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUF4RUQsb0RBd0VDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFzc2lnbmVkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9Vc2VyQXNzaWduZWRJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzREFBd0M7QUFDeEMsMEVBQTREO0FBQzVELHVEQUF5QztBQUV6QyxrQ0FBMEQ7QUFFMUQsd0NBQWlEO0FBVWpELE1BQWEsb0JBQXFCLFNBQVEsNEJBQStDO0lBQ3ZFLEVBQUUsQ0FBd0I7SUFDMUIsUUFBUSxDQUF3QjtJQUNoQyxXQUFXLENBQXdCO0lBRW5ELFlBQVksSUFBWSxFQUFFLElBQThCLEVBQUUsSUFBc0M7UUFDOUYsS0FBSyxDQUFDLHNCQUFzQixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDaEQsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQztRQUV6QixNQUFNLGVBQWUsR0FBRyxJQUFJLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLE9BQU8sRUFBRSxFQUFFLEVBQUUsR0FBRyxJQUFJLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFdEcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBRXhDLElBQUksQ0FBQyxVQUFVLENBQUM7WUFDZCxDQUFDLFFBQVEsQ0FBQyxFQUFFLGVBQWUsQ0FBQyxFQUFFO1lBQzlCLENBQUMsY0FBYyxDQUFDLEVBQUUsZUFBZSxDQUFDLFFBQVE7WUFDMUMsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLGVBQWUsQ0FBQyxXQUFXO1NBQ2pELENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxFQUFFLEdBQUcsZUFBZSxDQUFDLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUMsUUFBUSxHQUFHLGVBQWUsQ0FBQyxRQUFRLENBQUM7UUFDekMsSUFBSSxDQUFDLFdBQVcsR0FBRyxlQUFlLENBQUMsV0FBVyxDQUFDO1FBRS9DLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFTSxVQUFVO1FBQ2YsT0FBTztZQUNMLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUTtZQUN2QixXQUFXLEVBQUUsSUFBSSxDQUFDLFdBQVc7U0FDOUIsQ0FBQztJQUNKLENBQUM7SUFFTyxpQkFBaUIsQ0FBQyxlQUF5QztRQUNqRSxNQUFNLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7UUFDM0MsSUFBSSxDQUFDLFdBQVc7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUNuQyxPQUFPLG1CQUFTLENBQUMsVUFBVSxDQUN6QixXQUFXLEVBQ1gsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FDZCxJQUFJLEdBQUcsQ0FBQywyQkFBMkIsQ0FDakMsR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksRUFBRSxFQUN0QjtZQUNFLEdBQUcsT0FBTztZQUNWLHVDQUF1QyxFQUFFLElBQUk7WUFDN0MsU0FBUyxFQUFFLENBQUMsNEJBQTRCLENBQUM7WUFDekMsTUFBTSxFQUFFLEtBQUssQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDLFdBQVcsQ0FBQSxxQ0FBcUMsa0JBQVEsQ0FBQyxRQUFRLE9BQU87WUFDdkcsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPO1lBQ3RCLFlBQVksRUFBRSxlQUFlLENBQUMsSUFBSTtTQUNuQyxFQUNELEVBQUUsU0FBUyxFQUFFLGVBQWUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxlQUFlLEVBQUUsQ0FDM0UsQ0FDSixDQUFDO0lBQ0osQ0FBQztJQUVPLFdBQVcsQ0FBQyxHQUE2QjtRQUMvQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRO1lBQUUsT0FBTztRQUNoQyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQ3RDLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUN4QixDQUFDLEVBQUUsRUFBRSxFQUFFLENBQ0wsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUNsQixHQUFHLElBQUksQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDLFFBQVEsRUFBRSxFQUM3QjtZQUNFLGFBQWEsRUFBRSxFQUFFLENBQUMsUUFBUTtZQUMxQixjQUFjLEVBQUUsR0FBRyxDQUFDLFdBQVc7U0FDaEMsRUFDRCxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLENBQ3ZELENBQ0osQ0FDRixDQUFDO0lBQ0osQ0FBQztDQUNGO0FBeEVELG9EQXdFQyJ9

package/azAd/helpers/rsRoleDefinition.js

@@ -14,8 +14,8 @@ const rsRoles = {
             'Azure Kubernetes Service Cluster User Role',
             'Azure Kubernetes Service RBAC Reader',
         ],
-        contributor: ['Azure Arc Kubernetes Writer'],
-        admin: ['Azure Arc Kubernetes Admin'],
+        contributor: ['Azure Arc Kubernetes Writer', 'Azure Kubernetes Service RBAC Writer'],
+        admin: ['Azure Arc Kubernetes Admin', 'Azure Kubernetes Service RBAC Admin'],
     },
     iotHub: {
         readOnly: ['IoT Hub Data Reader'],
@@ -31,12 +31,7 @@ const rsRoles = {
             'Key Vault Certificate User',
             'Key Vault Reader',
         ],
-        contributor: [
-            'Key Vault Certificates Officer',
-            'Key Vault Crypto Officer',
-            'Key Vault Secrets Officer',
-            'Key Vault Contributor',
-        ],
+        contributor: ['Key Vault Certificates Officer', 'Key Vault Crypto Officer', 'Key Vault Secrets Officer'],
         admin: ['Key Vault Administrator', 'Key Vault Data Access Administrator'],
     },
     storage: {
@@ -133,4 +128,4 @@ function getRsRoleDefinitions() {
     }));
 }
 exports.rsRoleDefinitions = getRsRoleDefinitions();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnNSb2xlRGVmaW5pdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hekFkL2hlbHBlcnMvcnNSb2xlRGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSx1REFBcUQ7QUFJckQsTUFBTSxPQUFPLEdBQUc7SUFDZCxPQUFPLEVBQUU7UUFDUCxLQUFLLEVBQUUsRUFBRTtRQUNULFdBQVcsRUFBRSxDQUFDLGFBQWEsQ0FBQztRQUM1QixRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUM7S0FDckI7SUFDRCxHQUFHLEVBQUU7UUFDSCxRQUFRLEVBQUU7WUFDUiw2QkFBNkI7WUFDN0IsNENBQTRDO1lBQzVDLHNDQUFzQztTQUN2QztRQUNELFdBQVcsRUFBRSxDQUFDLDZCQUE2QixDQUFDO1FBQzVDLEtBQUssRUFBRSxDQUFDLDRCQUE0QixDQUFDO0tBQ3RDO0lBQ0QsTUFBTSxFQUFFO1FBQ04sUUFBUSxFQUFFLENBQUMscUJBQXFCLENBQUM7UUFDakMsV0FBVyxFQUFFLENBQUMsMEJBQTBCLENBQUM7UUFDekMsS0FBSyxFQUFFLENBQUMsOEJBQThCLEVBQUUsMEJBQTBCLENBQUM7S0FDcEU7SUFDRCxRQUFRLEVBQUU7UUFDUixRQUFRLEVBQUU7WUFDUiwwQ0FBMEM7WUFDMUMsdUNBQXVDO1lBQ3ZDLHdCQUF3QjtZQUN4Qix1QkFBdUI7WUFDdkIsNEJBQTRCO1lBQzVCLGtCQUFrQjtTQUNuQjtRQUNELFdBQVcsRUFBRTtZQUNYLGdDQUFnQztZQUNoQywwQkFBMEI7WUFDMUIsMkJBQTJCO1lBQzNCLHVCQUF1QjtTQUN4QjtRQUNELEtBQUssRUFBRSxDQUFDLHlCQUF5QixFQUFFLHFDQUFxQyxDQUFDO0tBQzFFO0lBQ0QsT0FBTyxFQUFFO1FBQ1AsUUFBUSxFQUFFO1lBQ1IsMEJBQTBCO1lBQzFCLG9DQUFvQztZQUNwQywyQkFBMkI7WUFDM0IsMkJBQTJCO1NBQzVCO1FBQ0QsV0FBVyxFQUFFO1lBQ1gsb0NB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnNSb2xlRGVmaW5pdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hekFkL2hlbHBlcnMvcnNSb2xlRGVmaW5pdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSx1REFBcUQ7QUFJckQsTUFBTSxPQUFPLEdBQUc7SUFDZCxPQUFPLEVBQUU7UUFDUCxLQUFLLEVBQUUsRUFBRTtRQUNULFdBQVcsRUFBRSxDQUFDLGFBQWEsQ0FBQztRQUM1QixRQUFRLEVBQUUsQ0FBQyxRQUFRLENBQUM7S0FDckI7SUFDRCxHQUFHLEVBQUU7UUFDSCxRQUFRLEVBQUU7WUFDUiw2QkFBNkI7WUFDN0IsNENBQTRDO1lBQzVDLHNDQUFzQztTQUN2QztRQUNELFdBQVcsRUFBRSxDQUFDLDZCQUE2QixFQUFFLHNDQUFzQyxDQUFDO1FBQ3BGLEtBQUssRUFBRSxDQUFDLDRCQUE0QixFQUFFLHFDQUFxQyxDQUFDO0tBQzdFO0lBQ0QsTUFBTSxFQUFFO1FBQ04sUUFBUSxFQUFFLENBQUMscUJBQXFCLENBQUM7UUFDakMsV0FBVyxFQUFFLENBQUMsMEJBQTBCLENBQUM7UUFDekMsS0FBSyxFQUFFLENBQUMsOEJBQThCLEVBQUUsMEJBQTBCLENBQUM7S0FDcEU7SUFDRCxRQUFRLEVBQUU7UUFDUixRQUFRLEVBQUU7WUFDUiwwQ0FBMEM7WUFDMUMsdUNBQXVDO1lBQ3ZDLHdCQUF3QjtZQUN4Qix1QkFBdUI7WUFDdkIsNEJBQTRCO1lBQzVCLGtCQUFrQjtTQUNuQjtRQUNELFdBQVcsRUFBRSxDQUFDLGdDQUFnQyxFQUFFLDBCQUEwQixFQUFFLDJCQUEyQixDQUFDO1FBQ3hHLEtBQUssRUFBRSxDQUFDLHlCQUF5QixFQUFFLHFDQUFxQyxDQUFDO0tBQzFFO0lBQ0QsT0FBTyxFQUFFO1FBQ1AsUUFBUSxFQUFFO1lBQ1IsMEJBQTBCO1lBQzFCLG9DQUFvQztZQUNwQywyQkFBMkI7WUFDM0IsMkJBQTJCO1NBQzVCO1FBQ0QsV0FBVyxFQUFF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

package/azAd/index.d.ts

@@ -1,6 +1,7 @@
 export * from './helpers';
 export * from './AppRegistration';
 export * from './AzRole';
+export * from './CloudflareAzIdentity';
 export * from './CustomRoles';
 export * from './GroupRole';
 export * from './RoleAssignment';

package/azAd/index.js

@@ -17,8 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./helpers"), exports);
 __exportStar(require("./AppRegistration"), exports);
 __exportStar(require("./AzRole"), exports);
+__exportStar(require("./CloudflareAzIdentity"), exports);
 __exportStar(require("./CustomRoles"), exports);
 __exportStar(require("./GroupRole"), exports);
 __exportStar(require("./RoleAssignment"), exports);
 __exportStar(require("./UserAssignedIdentity"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNENBQTBCO0FBQzFCLG9EQUFrQztBQUNsQywyQ0FBeUI7QUFDekIsZ0RBQThCO0FBQzlCLDhDQUE0QjtBQUM1QixtREFBaUM7QUFDakMseURBQXVDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNENBQTBCO0FBQzFCLG9EQUFrQztBQUNsQywyQ0FBeUI7QUFDekIseURBQXVDO0FBQ3ZDLGdEQUE4QjtBQUM5Qiw4Q0FBNEI7QUFDNUIsbURBQWlDO0FBQ2pDLHlEQUF1QyJ9