@drunk-pulumi/azure-components 1.1.14 → 1.1.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ResourceBuilder.d.ts +15 -2
- package/ResourceBuilder.js +29 -5
- package/aks/AzKubernetes.d.ts +1 -0
- package/aks/AzKubernetes.js +25 -14
- package/azAd/GroupRoleMember.d.ts +33 -0
- package/azAd/GroupRoleMember.js +74 -0
- package/azAd/index.d.ts +1 -0
- package/azAd/index.js +2 -1
- package/base/BaseComponent.d.ts +7 -6
- package/base/BaseComponent.js +10 -1
- package/base/BaseResourceComponent.d.ts +1 -2
- package/base/BaseResourceComponent.js +1 -1
- package/package.json +1 -1
- package/types.d.ts +1 -0
- package/vnet/PrivateDnsZone.js +2 -2
- package/vnet/helpers.d.ts +0 -1
- package/vnet/helpers.js +2 -9
package/ResourceBuilder.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as pulumi from '@pulumi/pulumi';
|
|
2
2
|
import * as types from './types';
|
|
3
|
-
import { AppRegistration, AppRegistrationArgs, GroupRole, GroupRoleArgs,
|
|
3
|
+
import { AppRegistration, AppRegistrationArgs, GroupRole, GroupRoleArgs, RoleAssignment, UserAssignedIdentity, UserAssignedIdentityArgs } from './azAd';
|
|
4
4
|
import { DiskEncryptionSet, DiskEncryptionSetArgs } from './vm';
|
|
5
5
|
import { KeyVault, KeyVaultArgs } from './vault';
|
|
6
6
|
import { Logs, LogsArgs } from './logs';
|
|
@@ -82,7 +82,20 @@ export declare class ResourceBuilder extends BaseComponent<ResourceBuilderArgs>
|
|
|
82
82
|
readonly vnet: Vnet | undefined;
|
|
83
83
|
constructor(name: string, args: ResourceBuilderArgs, opts?: pulumi.ComponentResourceOptions);
|
|
84
84
|
getOutputs(): ResourceBuilderOutputs;
|
|
85
|
-
|
|
85
|
+
addIdentityToRole(type: types.GroupRoleTypes, identity: pulumi.Input<{
|
|
86
|
+
principalId: pulumi.Input<string>;
|
|
87
|
+
} | undefined>): pulumi.OutputInstance<import("@pulumi/azuread/groupMember").GroupMember | undefined> | undefined;
|
|
88
|
+
/** Assigns a role to a principal at the scope of this resource.
|
|
89
|
+
* @param roleName The name of the role to assign (e.g., "Contributor", "Reader").
|
|
90
|
+
* @param principalType The type of the principal (e.g., "User", "Group", "ServicePrincipal").
|
|
91
|
+
* @param principalId The ID of the principal to whom the role is assigned.
|
|
92
|
+
* @returns A RoleAssignment resource representing the role assignment.
|
|
93
|
+
* */
|
|
94
|
+
roleAssignment({ roleName, principalType, principalId, }: {
|
|
95
|
+
roleName: pulumi.Input<string>;
|
|
96
|
+
principalId: pulumi.Input<string>;
|
|
97
|
+
principalType: types.PrincipalTypes;
|
|
98
|
+
}): pulumi.Output<RoleAssignment>;
|
|
86
99
|
private createGroupRoles;
|
|
87
100
|
private createVault;
|
|
88
101
|
private createUserIdentity;
|
package/ResourceBuilder.js
CHANGED
|
@@ -43,7 +43,7 @@ const common_1 = require("./common");
|
|
|
43
43
|
const vnet_1 = require("./vnet");
|
|
44
44
|
const base_1 = require("./base");
|
|
45
45
|
const helpers_1 = require("./base/helpers");
|
|
46
|
-
const
|
|
46
|
+
const azAd = __importStar(require("@pulumi/azuread"));
|
|
47
47
|
class ResourceBuilder extends base_1.BaseComponent {
|
|
48
48
|
rsGroup;
|
|
49
49
|
vaultInfo;
|
|
@@ -78,9 +78,33 @@ class ResourceBuilder extends base_1.BaseComponent {
|
|
|
78
78
|
vnet: this.vnet?.getOutputs(),
|
|
79
79
|
};
|
|
80
80
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
81
|
+
addIdentityToRole(type, identity) {
|
|
82
|
+
const groupRoles = this.getOutputs().groupRoles;
|
|
83
|
+
if (!groupRoles)
|
|
84
|
+
return;
|
|
85
|
+
return pulumi.output(identity).apply((i) => {
|
|
86
|
+
if (!i?.principalId)
|
|
87
|
+
return;
|
|
88
|
+
return new azAd.GroupMember(`${this.name}-${type}-${i.principalId}`, {
|
|
89
|
+
groupObjectId: groupRoles[type].objectId,
|
|
90
|
+
memberObjectId: i.principalId,
|
|
91
|
+
}, { parent: this, retainOnDelete: true });
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
/** Assigns a role to a principal at the scope of this resource.
|
|
95
|
+
* @param roleName The name of the role to assign (e.g., "Contributor", "Reader").
|
|
96
|
+
* @param principalType The type of the principal (e.g., "User", "Group", "ServicePrincipal").
|
|
97
|
+
* @param principalId The ID of the principal to whom the role is assigned.
|
|
98
|
+
* @returns A RoleAssignment resource representing the role assignment.
|
|
99
|
+
* */
|
|
100
|
+
roleAssignment({ roleName, principalType, principalId, }) {
|
|
101
|
+
const resourceId = this.rsGroup.id;
|
|
102
|
+
return pulumi.output([roleName, principalId]).apply(([role, id]) => new azAd_1.RoleAssignment(`${this.name}-${role}-${id}`, {
|
|
103
|
+
principalId: id,
|
|
104
|
+
principalType,
|
|
105
|
+
roleName: role,
|
|
106
|
+
scope: resourceId,
|
|
107
|
+
}, { parent: this, deletedWith: this }));
|
|
84
108
|
}
|
|
85
109
|
createGroupRoles() {
|
|
86
110
|
const { groupRoles, groupRolesCreate } = this.args;
|
|
@@ -170,4 +194,4 @@ class ResourceBuilder extends base_1.BaseComponent {
|
|
|
170
194
|
}
|
|
171
195
|
}
|
|
172
196
|
exports.ResourceBuilder = ResourceBuilder;
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
197
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VCdWlsZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1Jlc291cmNlQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx1REFBeUM7QUFHekMsaUNBUWdCO0FBQ2hCLDZCQUFnRTtBQUNoRSxtQ0FBaUQ7QUFDakQsaUNBQXdDO0FBQ3hDLHFDQUFnRDtBQUNoRCxpQ0FBd0M7QUFFeEMsaUNBQXVDO0FBQ3ZDLDRDQUEwRDtBQUMxRCxzREFBd0M7QUE2RXhDLE1BQWEsZUFBZ0IsU0FBUSxvQkFBa0M7SUFDckQsT0FBTyxDQUFVO0lBQ2pCLFNBQVMsQ0FBeUI7SUFDbEMsVUFBVSxDQUE4QjtJQUN4QyxrQkFBa0IsQ0FBd0I7SUFDMUMsa0JBQWtCLENBQW1CO0lBQ3JDLElBQUksQ0FBUTtJQUNaLGlCQUFpQixDQUFxQjtJQUN0QyxJQUFJLENBQW1CO0lBRXZDLFlBQVksSUFBWSxFQUFFLElBQXlCLEVBQUUsSUFBc0M7UUFDekYsS0FBSyxDQUFDLElBQUEsa0NBQXdCLEVBQUMsaUJBQWlCLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3JFLE1BQU0sRUFDSixnQkFBZ0IsRUFDaEIsVUFBVSxFQUNWLFdBQVcsRUFDWCx3QkFBd0IsRUFDeEIsVUFBVSxFQUNWLG9CQUFvQixFQUNwQixHQUFHLEtBQUssRUFDVCxHQUFHLElBQUksQ0FBQztRQUVULElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFFMUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLGdCQUFPLENBQ3hCLElBQUksRUFDSixFQUFFLEdBQUcsS0FBSyxFQUFFLFVBQVUsRUFBRSxJQUFJLENBQUMsVUFBVSxFQUFFLEVBQ3pDLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLElB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
|
package/aks/AzKubernetes.d.ts
CHANGED
|
@@ -44,6 +44,7 @@ export interface AzKubernetesArgs extends CommonBaseArgs, types.WithEncryptionEn
|
|
|
44
44
|
enablePodIdentity?: boolean;
|
|
45
45
|
enableAzurePolicy?: boolean;
|
|
46
46
|
enableAzureKeyVault?: boolean;
|
|
47
|
+
enableNodeAutoProvisioning?: boolean;
|
|
47
48
|
};
|
|
48
49
|
network?: Omit<inputs.containerservice.ContainerServiceNetworkProfileArgs, 'networkMode' | 'networkPolicy' | 'networkPlugin' | 'loadBalancerSku' | 'loadBalancerProfile'> & {
|
|
49
50
|
networkPolicy?: ccs.NetworkPolicy;
|
package/aks/AzKubernetes.js
CHANGED
|
@@ -161,8 +161,8 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
161
161
|
return { userName, sshPublicKey: ssh.publicKey };
|
|
162
162
|
}
|
|
163
163
|
createDiskEncryptionSet() {
|
|
164
|
-
const { rsGroup, enableEncryption, diskEncryptionSet, groupRoles, defaultUAssignedId, vaultInfo } = this.args;
|
|
165
|
-
if (!enableEncryption)
|
|
164
|
+
const { rsGroup, enableEncryption, features, diskEncryptionSet, groupRoles, defaultUAssignedId, vaultInfo } = this.args;
|
|
165
|
+
if (!enableEncryption || features.enableNodeAutoProvisioning)
|
|
166
166
|
return undefined;
|
|
167
167
|
if (diskEncryptionSet)
|
|
168
168
|
return diskEncryptionSet;
|
|
@@ -188,7 +188,6 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
188
188
|
return new ccs.ManagedCluster(this.name, {
|
|
189
189
|
...props,
|
|
190
190
|
...rsGroup,
|
|
191
|
-
agentPoolProfiles: poolsWithZones,
|
|
192
191
|
aadProfile: groupRoles
|
|
193
192
|
? {
|
|
194
193
|
enableAzureRBAC: true,
|
|
@@ -240,6 +239,12 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
240
239
|
privateDNSZone: features?.enablePrivateCluster ? 'system' : undefined,
|
|
241
240
|
//privateDNSZone: privateDnsZone?.id,
|
|
242
241
|
},
|
|
242
|
+
nodeProvisioningProfile: features?.enableNodeAutoProvisioning
|
|
243
|
+
? {
|
|
244
|
+
defaultNodePools: 'Auto',
|
|
245
|
+
mode: 'Auto',
|
|
246
|
+
}
|
|
247
|
+
: undefined,
|
|
243
248
|
autoScalerProfile: autoScalerProfile ?? {
|
|
244
249
|
balanceSimilarNodeGroups: 'false',
|
|
245
250
|
expander: 'random',
|
|
@@ -259,6 +264,7 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
259
264
|
skipNodesWithLocalStorage: 'false',
|
|
260
265
|
skipNodesWithSystemPods: 'true',
|
|
261
266
|
},
|
|
267
|
+
agentPoolProfiles: poolsWithZones,
|
|
262
268
|
autoUpgradeProfile: {
|
|
263
269
|
nodeOSUpgradeChannel: ccs.NodeOSUpgradeChannel.NodeImage,
|
|
264
270
|
upgradeChannel: ccs.UpgradeChannel.Stable,
|
|
@@ -439,16 +445,21 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
439
445
|
}));
|
|
440
446
|
}
|
|
441
447
|
assignPermission(aks) {
|
|
442
|
-
const { attachToAcr } = this.args;
|
|
443
|
-
if (this.
|
|
444
|
-
this.addIdentityToRole('readOnly', { principalId: this.
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
448
|
+
const { attachToAcr, enableResourceIdentity } = this.args;
|
|
449
|
+
if (enableResourceIdentity && this.systemIdentityId)
|
|
450
|
+
this.addIdentityToRole('readOnly', { principalId: this.systemIdentityId });
|
|
451
|
+
//Allows AKS key vault provider to read secrets from Key Vault
|
|
452
|
+
if (this.keyVaultSecretProviderIdentity) {
|
|
453
|
+
this.addIdentityToRole('readOnly', { principalId: this.keyVaultSecretProviderIdentity.objectId });
|
|
454
|
+
}
|
|
455
|
+
//Allows kubernetes to pull images from ACR
|
|
456
|
+
if (this.kubeletIdentity && attachToAcr) {
|
|
457
|
+
pulumi.output(this.kubeletIdentity).apply((p) => new azAd_1.RoleAssignment(`${this.name}-aks-acr-read`, {
|
|
458
|
+
principalId: p.objectId,
|
|
459
|
+
principalType: 'ServicePrincipal',
|
|
460
|
+
roleName: 'Container Registry Repository Reader',
|
|
461
|
+
scope: attachToAcr.id,
|
|
462
|
+
}, { dependsOn: aks, deletedWith: aks, parent: this }));
|
|
452
463
|
}
|
|
453
464
|
}
|
|
454
465
|
getPrivateDNSZone(aks) {
|
|
@@ -492,4 +503,4 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
492
503
|
}
|
|
493
504
|
}
|
|
494
505
|
exports.AzKubernetes = AzKubernetes;
|
|
495
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":"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"}
|
|
506
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import * as pulumi from '@pulumi/pulumi';
|
|
2
|
+
import { BaseComponent } from '../base';
|
|
3
|
+
import * as azAd from '@pulumi/azuread';
|
|
4
|
+
import { GroupRoleOutput } from '../types';
|
|
5
|
+
/**
|
|
6
|
+
* Arguments for GroupRoleMember component.
|
|
7
|
+
*/
|
|
8
|
+
export interface GroupRoleMemberArgs {
|
|
9
|
+
/**
|
|
10
|
+
* The group role output to assign the member to.
|
|
11
|
+
*/
|
|
12
|
+
role: pulumi.Input<GroupRoleOutput>;
|
|
13
|
+
/**
|
|
14
|
+
* The identity object containing a principalId, or undefined.
|
|
15
|
+
*/
|
|
16
|
+
identity: pulumi.Input<{
|
|
17
|
+
principalId: pulumi.Input<string>;
|
|
18
|
+
} | undefined>;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Adds a member to an Azure AD group role. Creates a GroupMember if identity and role are valid.
|
|
22
|
+
*/
|
|
23
|
+
export declare class GroupRoleMember extends BaseComponent<GroupRoleMemberArgs> {
|
|
24
|
+
/** The created GroupMember resource, if any. */
|
|
25
|
+
readonly groupMember: pulumi.Output<azAd.GroupMember | undefined>;
|
|
26
|
+
constructor(name: string | undefined, args: GroupRoleMemberArgs, opts?: pulumi.ComponentResourceOptions);
|
|
27
|
+
/**
|
|
28
|
+
* Returns the outputs of the GroupRoleMember component.
|
|
29
|
+
*/
|
|
30
|
+
getOutputs(): {
|
|
31
|
+
groupMember: pulumi.Output<import("@pulumi/azuread/groupMember").GroupMember | undefined>;
|
|
32
|
+
};
|
|
33
|
+
}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.GroupRoleMember = void 0;
|
|
37
|
+
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
|
+
const base_1 = require("../base");
|
|
39
|
+
const azAd = __importStar(require("@pulumi/azuread"));
|
|
40
|
+
const helpers_1 = require("../base/helpers");
|
|
41
|
+
const helpers_2 = require("../helpers");
|
|
42
|
+
/**
|
|
43
|
+
* Adds a member to an Azure AD group role. Creates a GroupMember if identity and role are valid.
|
|
44
|
+
*/
|
|
45
|
+
class GroupRoleMember extends base_1.BaseComponent {
|
|
46
|
+
/** The created GroupMember resource, if any. */
|
|
47
|
+
groupMember;
|
|
48
|
+
constructor(name = helpers_2.stackInfo.stack, args, opts) {
|
|
49
|
+
super((0, helpers_1.getComponentResourceType)('GroupRoleMember'), name, args, opts);
|
|
50
|
+
const { role, identity } = args;
|
|
51
|
+
// Unwrap inputs and validate before creating the resource
|
|
52
|
+
this.groupMember = pulumi.all([identity, role]).apply(([i, r]) => {
|
|
53
|
+
if (!i || !i.principalId || !r || !r.objectId)
|
|
54
|
+
return undefined;
|
|
55
|
+
const groupObjectId = r.objectId;
|
|
56
|
+
const memberObjectId = i.principalId;
|
|
57
|
+
// Deterministic, kebab-case resource name
|
|
58
|
+
const resourceName = this.getNameOrHash(`${this.name}-${groupObjectId}-${memberObjectId}`.replace(/[^a-zA-Z0-9-]/g, '-').toLowerCase());
|
|
59
|
+
return new azAd.GroupMember(resourceName, {
|
|
60
|
+
groupObjectId,
|
|
61
|
+
memberObjectId,
|
|
62
|
+
}, { parent: this, retainOnDelete: true });
|
|
63
|
+
});
|
|
64
|
+
this.registerOutputs();
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Returns the outputs of the GroupRoleMember component.
|
|
68
|
+
*/
|
|
69
|
+
getOutputs() {
|
|
70
|
+
return { groupMember: this.groupMember };
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
exports.GroupRoleMember = GroupRoleMember;
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXBSb2xlTWVtYmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6QWQvR3JvdXBSb2xlTWVtYmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHVEQUF5QztBQUN6QyxrQ0FBd0M7QUFDeEMsc0RBQXdDO0FBQ3hDLDZDQUEyRDtBQUMzRCx3Q0FBdUM7QUFpQnZDOztHQUVHO0FBQ0gsTUFBYSxlQUFnQixTQUFRLG9CQUFrQztJQUNyRSxnREFBZ0Q7SUFDaEMsV0FBVyxDQUE4QztJQUV6RSxZQUFZLE9BQWUsbUJBQVMsQ0FBQyxLQUFLLEVBQUUsSUFBeUIsRUFBRSxJQUFzQztRQUMzRyxLQUFLLENBQUMsSUFBQSxrQ0FBd0IsRUFBQyxpQkFBaUIsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDckUsTUFBTSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFFaEMsMERBQTBEO1FBQzFELElBQUksQ0FBQyxXQUFXLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDL0QsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxXQUFXLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsUUFBUTtnQkFBRSxPQUFPLFNBQVMsQ0FBQztZQUNoRSxNQUFNLGFBQWEsR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDO1lBQ2pDLE1BQU0sY0FBYyxHQUFHLENBQUMsQ0FBQyxXQUFXLENBQUM7WUFDckMsMENBQTBDO1lBQzFDLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQ3JDLEdBQUcsSUFBSSxDQUFDLElBQUksSUFBSSxhQUFhLElBQUksY0FBYyxFQUFFLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUMvRixDQUFDO1lBQ0YsT0FBTyxJQUFJLElBQUksQ0FBQyxXQUFXLENBQ3pCLFlBQVksRUFDWjtnQkFDRSxhQUFhO2dCQUNiLGNBQWM7YUFDZixFQUNELEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLENBQ3ZDLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QixDQUFDO0lBRUQ7O09BRUc7SUFDSSxVQUFVO1FBQ2YsT0FBTyxFQUFFLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDM0MsQ0FBQztDQUNGO0FBcENELDBDQW9DQyJ9
|
package/azAd/index.d.ts
CHANGED
package/azAd/index.js
CHANGED
|
@@ -20,6 +20,7 @@ __exportStar(require("./AzRole"), exports);
|
|
|
20
20
|
__exportStar(require("./CloudflareAzIdentity"), exports);
|
|
21
21
|
__exportStar(require("./CustomRoles"), exports);
|
|
22
22
|
__exportStar(require("./GroupRole"), exports);
|
|
23
|
+
__exportStar(require("./GroupRoleMember"), exports);
|
|
23
24
|
__exportStar(require("./RoleAssignment"), exports);
|
|
24
25
|
__exportStar(require("./UserAssignedIdentity"), exports);
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNENBQTBCO0FBQzFCLG9EQUFrQztBQUNsQywyQ0FBeUI7QUFDekIseURBQXVDO0FBQ3ZDLGdEQUE4QjtBQUM5Qiw4Q0FBNEI7QUFDNUIsb0RBQWtDO0FBQ2xDLG1EQUFpQztBQUNqQyx5REFBdUMifQ==
|
package/base/BaseComponent.d.ts
CHANGED
|
@@ -24,16 +24,17 @@ export declare abstract class BaseComponent<TArgs extends pulumi.Inputs> extends
|
|
|
24
24
|
* @param opts - Optional Pulumi resource options to control component behavior
|
|
25
25
|
*/
|
|
26
26
|
protected constructor(type: string, name: string, args: TArgs, opts?: pulumi.ComponentResourceOptions | undefined);
|
|
27
|
-
/**
|
|
28
|
-
* Registers component outputs with the Pulumi engine.
|
|
29
|
-
* This method should be overridden by derived classes to ensure proper output registration.
|
|
30
|
-
* @param outputs - The outputs to register for this component
|
|
31
|
-
*/
|
|
32
|
-
protected registerOutputs(): void;
|
|
33
27
|
/**
|
|
34
28
|
* Abstract method that must be implemented by derived classes to expose component outputs.
|
|
35
29
|
* This method should return all relevant outputs that consumers of the component might need.
|
|
36
30
|
* @returns An object containing the component's outputs, either as direct values or Pulumi outputs
|
|
37
31
|
*/
|
|
38
32
|
abstract getOutputs(): pulumi.Inputs | pulumi.Output<pulumi.Inputs>;
|
|
33
|
+
protected getNameOrHash(name: string, length?: number): string;
|
|
34
|
+
/**
|
|
35
|
+
* Registers component outputs with the Pulumi engine.
|
|
36
|
+
* This method should be overridden by derived classes to ensure proper output registration.
|
|
37
|
+
* @param outputs - The outputs to register for this component
|
|
38
|
+
*/
|
|
39
|
+
protected registerOutputs(): void;
|
|
39
40
|
}
|
package/base/BaseComponent.js
CHANGED
|
@@ -32,10 +32,14 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
35
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
39
|
exports.BaseComponent = void 0;
|
|
37
40
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
41
|
const helpers_1 = require("./helpers");
|
|
42
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
39
43
|
/**
|
|
40
44
|
* BaseComponent serves as an abstract foundation class for Pulumi resource components.
|
|
41
45
|
* It provides core functionality and structure for creating custom infrastructure components.
|
|
@@ -66,6 +70,11 @@ class BaseComponent extends pulumi.ComponentResource {
|
|
|
66
70
|
this.args = args;
|
|
67
71
|
this.opts = opts;
|
|
68
72
|
}
|
|
73
|
+
getNameOrHash(name, length = 55) {
|
|
74
|
+
if (name.length <= 55)
|
|
75
|
+
return name;
|
|
76
|
+
return crypto_1.default.createHash('sha256').update(name).digest('hex').slice(-55);
|
|
77
|
+
}
|
|
69
78
|
/**
|
|
70
79
|
* Registers component outputs with the Pulumi engine.
|
|
71
80
|
* This method should be overridden by derived classes to ensure proper output registration.
|
|
@@ -76,4 +85,4 @@ class BaseComponent extends pulumi.ComponentResource {
|
|
|
76
85
|
}
|
|
77
86
|
}
|
|
78
87
|
exports.BaseComponent = BaseComponent;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZUNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iYXNlL0Jhc2VDb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQXlDO0FBQ3pDLHVDQUFxRDtBQUNyRCxvREFBNEI7QUFFNUI7Ozs7OztHQU1HO0FBQ0g7Ozs7O0dBS0c7QUFDSCxNQUFzQixhQUEyQyxTQUFRLE1BQU0sQ0FBQyxpQkFBd0I7SUFVcEY7SUFDRztJQUNBO0lBWHJCOzs7Ozs7T0FNRztJQUNILFlBQ0UsSUFBWSxFQUNJLElBQVksRUFDVCxJQUFXLEVBQ1gsSUFBc0M7UUFFekQsS0FBSyxDQUFDLElBQUEsa0NBQXdCLEVBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUp4QyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBQ1QsU0FBSSxHQUFKLElBQUksQ0FBTztRQUNYLFNBQUksR0FBSixJQUFJLENBQWtDO0lBRzNELENBQUM7SUFTUyxhQUFhLENBQUMsSUFBWSxFQUFFLFNBQWlCLEVBQUU7UUFDdkQsSUFBSSxJQUFJLENBQUMsTUFBTSxJQUFJLEVBQUU7WUFBRSxPQUFPLElBQUksQ0FBQztRQUNuQyxPQUFPLGdCQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDM0UsQ0FBQztJQUVEOzs7O09BSUc7SUFDTyxlQUFlO1FBQ3ZCLEtBQUssQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUM7SUFDM0MsQ0FBQztDQUNGO0FBckNELHNDQXFDQyJ9
|
|
@@ -7,7 +7,6 @@ import { BaseComponent } from './BaseComponent';
|
|
|
7
7
|
import { EncryptionKey } from '../vault/EncryptionKey';
|
|
8
8
|
import { ResourceLocker } from '../common/ResourceLocker';
|
|
9
9
|
import { RoleAssignment } from '../azAd/RoleAssignment';
|
|
10
|
-
import * as enums from '@pulumi/azure-native/types/enums';
|
|
11
10
|
/**
|
|
12
11
|
* Base interface for resource component arguments that combines vault information
|
|
13
12
|
* and Azure AD group role requirements.
|
|
@@ -78,7 +77,7 @@ export declare abstract class BaseResourceComponent<TArgs extends BaseArgs> exte
|
|
|
78
77
|
roleAssignment({ roleName, principalType, principalId, }: {
|
|
79
78
|
roleName: pulumi.Input<string>;
|
|
80
79
|
principalId: pulumi.Input<string>;
|
|
81
|
-
principalType:
|
|
80
|
+
principalType: types.PrincipalTypes;
|
|
82
81
|
}): pulumi.Output<RoleAssignment>;
|
|
83
82
|
grantPermissionsToIdentity({ identity, resource, roleNames }: types.GrantIdentityRoles): pulumi.Output<pulumi.Output<pulumi.Output<RoleAssignment>[]> | undefined>;
|
|
84
83
|
/**
|
|
@@ -211,4 +211,4 @@ class BaseResourceComponent extends BaseComponent_1.BaseComponent {
|
|
|
211
211
|
}
|
|
212
212
|
}
|
|
213
213
|
exports.BaseResourceComponent = BaseResourceComponent;
|
|
214
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
214
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZVJlc291cmNlQ29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jhc2UvQmFzZVJlc291cmNlQ29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUN4Qyx1REFBeUM7QUFHekMsNkRBQThFO0FBQzlFLHlEQUF3RTtBQUN4RSx3REFBd0U7QUFFeEUsbURBQWdEO0FBQ2hELDBEQUF1RDtBQUN2RCw2REFBMEQ7QUFDMUQsMkRBQXdEO0FBRXhELHVDQUFxRDtBQW1CckQ7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxNQUFzQixxQkFBOEMsU0FBUSw2QkFBb0I7SUFhM0U7SUFDRDtJQUNHO0lBQ0E7SUFmZCxZQUFZLENBQXdDO0lBQ25ELFFBQVEsR0FBNEMsRUFBRSxDQUFDO0lBQ3ZELG9CQUFvQixHQUFZLEtBQUssQ0FBQztJQUU5Qzs7Ozs7O09BTUc7SUFDSCxZQUNtQixJQUFZLEVBQ2IsSUFBWSxFQUNULElBQVcsRUFDWCxJQUFzQztRQUV6RCxLQUFLLENBQUMsSUFBQSxrQ0FBd0IsRUFBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBTHZDLFNBQUksR0FBSixJQUFJLENBQVE7UUFDYixTQUFJLEdBQUosSUFBSSxDQUFRO1FBQ1QsU0FBSSxHQUFKLElBQUksQ0FBTztRQUNYLFNBQUksR0FBSixJQUFJLENBQWtDO0lBRzNELENBQUM7SUFFRDs7Ozs7T0FLRztJQUNJLGlCQUFpQixDQUN0QixJQUEwQixFQUMxQixRQUF5RTtRQUV6RSxNQUFNLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUNqQyxJQUFJLENBQUMsVUFBVTtZQUFFLE9BQU87UUFFeEIsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEtBQUssQ0FB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
|
package/package.json
CHANGED
package/types.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { PrivateEndpointType } from './vnet';
|
|
|
3
3
|
export type DnsRecordTypes = 'A' | 'AAAA' | 'CNAME' | 'MX' | 'NS' | 'PTR' | 'SOA' | 'SRV' | 'TXT' | 'CAA';
|
|
4
4
|
export type GroupRoleTypes = 'admin' | 'contributor' | 'readOnly';
|
|
5
5
|
export type CommonProps = 'rsGroup' | 'groupRoles' | 'vaultInfo' | 'resourceGroupName' | 'location' | 'resourceName' | 'tags';
|
|
6
|
+
export type PrincipalTypes = 'User' | 'Group' | 'ServicePrincipal' | 'ForeignGroup' | 'Device';
|
|
6
7
|
export type AsInput<T> = {
|
|
7
8
|
[K in keyof T]: T[K] extends object ? T[K] extends Array<any> ? pulumi.Input<NonNullable<T[K]>> : AsInput<NonNullable<T[K]>> : pulumi.Input<NonNullable<T[K]>>;
|
|
8
9
|
};
|
package/vnet/PrivateDnsZone.js
CHANGED
|
@@ -98,7 +98,7 @@ class PrivateDnsZone extends base_1.BaseComponent {
|
|
|
98
98
|
const group = this.getRsGroupInfo();
|
|
99
99
|
pulumi.output(this.args.vnetLinks).apply((vids) => vids.map((v) => {
|
|
100
100
|
const vnetName = helpers_2.rsHelpers.getRsNameFromId(v.vnetId);
|
|
101
|
-
return new privateDns.VirtualNetworkLink(
|
|
101
|
+
return new privateDns.VirtualNetworkLink(this.getNameOrHash(`${this._rsName}-${vnetName}`), {
|
|
102
102
|
...group,
|
|
103
103
|
privateZoneName: zone.name,
|
|
104
104
|
registrationEnabled: false,
|
|
@@ -108,4 +108,4 @@ class PrivateDnsZone extends base_1.BaseComponent {
|
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
110
|
exports.PrivateDnsZone = PrivateDnsZone;
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZURuc1pvbmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdm5ldC9Qcml2YXRlRG5zWm9uZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0RUFBOEQ7QUFDOUQsdURBQXlDO0FBQ3pDLGtDQUF3QztBQUN4Qyw2Q0FBMkQ7QUFDM0Qsd0NBQXVDO0FBRXZDLG1EQUFxQztBQWdCckMsTUFBYSxjQUFlLFNBQVEsb0JBQWlDO0lBQ25ELEVBQUUsQ0FBd0I7SUFDMUIsWUFBWSxDQUF3QjtJQUNuQyxPQUFPLENBQVM7SUFFakMsWUFBWSxJQUFZLEVBQUUsSUFBd0IsRUFBRSxJQUFzQztRQUN4RixLQUFLLENBQUMsSUFBQSxrQ0FBd0IsRUFBQyxnQkFBZ0IsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDcEUsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztRQUN4QyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFFcEMsTUFBTSxJQUFJLEdBQUcsSUFBSSxVQUFVLENBQUMsV0FBVyxDQUNyQyxJQUFJLENBQUMsT0FBTyxFQUNaO1lBQ0UsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjtZQUMxQyxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7WUFDeEIsZUFBZSxFQUFFLElBQUk7U0FDdEIsRUFDRCxFQUFFLEdBQUcsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDMUIsQ0FBQztRQUVGLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFM0IsSUFBSSxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ2xCLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLElBQUks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
|
package/vnet/helpers.d.ts
CHANGED
|
@@ -16,4 +16,3 @@ export declare const defaultRouteRules: {
|
|
|
16
16
|
defaultGatewayRoute: RouteArgs;
|
|
17
17
|
};
|
|
18
18
|
export declare const getPrivateRecordSetOutput: (args: privateDns.GetPrivateRecordSetOutputArgs) => import("@pulumi/pulumi").Output<privateDns.GetPrivateRecordSetResult>;
|
|
19
|
-
export declare const ensureLength: (input: string, length?: number) => string;
|
package/vnet/helpers.js
CHANGED
|
@@ -33,12 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.
|
|
36
|
+
exports.getPrivateRecordSetOutput = exports.defaultRouteRules = exports.defaultServicesEndpoints = exports.AzureSubnetNames = void 0;
|
|
37
37
|
exports.getVnetIdFromSubnetId = getVnetIdFromSubnetId;
|
|
38
38
|
exports.getSubnetNameFromId = getSubnetNameFromId;
|
|
39
39
|
exports.getDnsRecordName = getDnsRecordName;
|
|
40
40
|
const privateDns = __importStar(require("@pulumi/azure-native/privatedns"));
|
|
41
|
-
const crypto = __importStar(require("crypto"));
|
|
42
41
|
function getVnetIdFromSubnetId(subnetId) {
|
|
43
42
|
//The sample SubnetId is /subscriptions/63a31b41-eb5d-4160-9fc9-d30fc00286c9/resourceGroups/sg-dev-aks-vnet/providers/Microsoft.Network/virtualNetworks/sg-vnet-trans/subnets/aks-main-nodes
|
|
44
43
|
return subnetId.split('/subnets')[0];
|
|
@@ -83,10 +82,4 @@ const getPrivateRecordSetOutput = (args) => {
|
|
|
83
82
|
return privateDns.getPrivateRecordSetOutput(args);
|
|
84
83
|
};
|
|
85
84
|
exports.getPrivateRecordSetOutput = getPrivateRecordSetOutput;
|
|
86
|
-
|
|
87
|
-
if (input.length <= 55)
|
|
88
|
-
return input;
|
|
89
|
-
return crypto.createHash('sha256').update(input).digest('hex').slice(-55);
|
|
90
|
-
};
|
|
91
|
-
exports.ensureLength = ensureLength;
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92bmV0L2hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBSUEsc0RBR0M7QUFFRCxrREFHQztBQUVELDRDQUVDO0FBaEJELDRFQUE4RDtBQUU5RCwrQ0FBaUM7QUFFakMsU0FBZ0IscUJBQXFCLENBQUMsUUFBZ0I7SUFDcEQsNExBQTRMO0lBQzVMLE9BQU8sUUFBUSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN2QyxDQUFDO0FBRUQsU0FBZ0IsbUJBQW1CLENBQUMsUUFBZ0I7SUFDbEQsNExBQTRMO0lBQzVMLE9BQU8sUUFBUSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN2QyxDQUFDO0FBRUQsU0FBZ0IsZ0JBQWdCLENBQUMsVUFBa0I7SUFDakQsT0FBTyxVQUFVLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLFVBQVUsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsR0FBRyxVQUFVLFVBQVUsQ0FBQztBQUM1RyxDQUFDO0FBRUQsSUFBWSxnQkFNWDtBQU5ELFdBQVksZ0JBQWdCO0lBQzFCLHdEQUFvQyxDQUFBO0lBQ3BDLHVEQUFtQyxDQUFBO0lBQ25DLDREQUF3QyxDQUFBO0lBQ3hDLGdGQUE0RCxDQUFBO0lBQzVELDhEQUEwQyxDQUFBO0FBQzVDLENBQUMsRUFOVyxnQkFBZ0IsZ0NBQWhCLGdCQUFnQixRQU0zQjtBQUVZLFFBQUEsd0JBQXdCLEdBQUc7SUFDdEMsZ0NBQWdDO0lBQ2hDLHlCQUF5QjtJQUN6Qiw2QkFBNkI7SUFDN0Isb0JBQW9CO0lBQ3BCLG9CQUFvQjtJQUNwQixzQkFBc0I7SUFDdEIsZUFBZTtJQUNmLG1CQUFtQjtJQUNuQixlQUFlO0NBQ2hCLENBQUM7QUFFVyxRQUFBLGlCQUFpQixHQUFHO0lBQy9CLG9CQUFvQixFQUFFO1FBQ3BCLGFBQWEsRUFBRSxXQUFXO1FBQzFCLFdBQVcsRUFBRSxVQUFVO0tBQ1g7SUFDZCxtQkFBbUIsRUFBRTtRQUNuQixhQUFhLEVBQUUsV0FBVztRQUMxQixXQUFXLEVBQUUsdUJBQXVCO0tBQ3hCO0NBQ2YsQ0FBQztBQUVLLE1BQU0seUJBQXlCLEdBQUcsQ0FBQyxJQUE4QyxFQUFFLEVBQUU7SUFDMUYsT0FBTyxVQUFVLENBQUMseUJBQXlCLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDcEQsQ0FBQyxDQUFDO0FBRlcsUUFBQSx5QkFBeUIsNkJBRXBDO0FBRUssTUFBTSxZQUFZLEdBQUcsQ0FBQyxLQUFhLEVBQUUsU0FBaUIsRUFBRSxFQUFFLEVBQUU7SUFDakUsSUFBSSxLQUFLLENBQUMsTUFBTSxJQUFJLEVBQUU7UUFBRSxPQUFPLEtBQUssQ0FBQztJQUNyQyxPQUFPLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUM1RSxDQUFDLENBQUM7QUFIVyxRQUFBLFlBQVksZ0JBR3ZCIn0=
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92bmV0L2hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBR0Esc0RBR0M7QUFFRCxrREFHQztBQUVELDRDQUVDO0FBZkQsNEVBQThEO0FBRzlELFNBQWdCLHFCQUFxQixDQUFDLFFBQWdCO0lBQ3BELDRMQUE0TDtJQUM1TCxPQUFPLFFBQVEsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDdkMsQ0FBQztBQUVELFNBQWdCLG1CQUFtQixDQUFDLFFBQWdCO0lBQ2xELDRMQUE0TDtJQUM1TCxPQUFPLFFBQVEsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDdkMsQ0FBQztBQUVELFNBQWdCLGdCQUFnQixDQUFDLFVBQWtCO0lBQ2pELE9BQU8sVUFBVSxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxVQUFVLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLEdBQUcsVUFBVSxVQUFVLENBQUM7QUFDNUcsQ0FBQztBQUVELElBQVksZ0JBTVg7QUFORCxXQUFZLGdCQUFnQjtJQUMxQix3REFBb0MsQ0FBQTtJQUNwQyx1REFBbUMsQ0FBQTtJQUNuQyw0REFBd0MsQ0FBQTtJQUN4QyxnRkFBNEQsQ0FBQTtJQUM1RCw4REFBMEMsQ0FBQTtBQUM1QyxDQUFDLEVBTlcsZ0JBQWdCLGdDQUFoQixnQkFBZ0IsUUFNM0I7QUFFWSxRQUFBLHdCQUF3QixHQUFHO0lBQ3RDLGdDQUFnQztJQUNoQyx5QkFBeUI7SUFDekIsNkJBQTZCO0lBQzdCLG9CQUFvQjtJQUNwQixvQkFBb0I7SUFDcEIsc0JBQXNCO0lBQ3RCLGVBQWU7SUFDZixtQkFBbUI7SUFDbkIsZUFBZTtDQUNoQixDQUFDO0FBRVcsUUFBQSxpQkFBaUIsR0FBRztJQUMvQixvQkFBb0IsRUFBRTtRQUNwQixhQUFhLEVBQUUsV0FBVztRQUMxQixXQUFXLEVBQUUsVUFBVTtLQUNYO0lBQ2QsbUJBQW1CLEVBQUU7UUFDbkIsYUFBYSxFQUFFLFdBQVc7UUFDMUIsV0FBVyxFQUFFLHVCQUF1QjtLQUN4QjtDQUNmLENBQUM7QUFFSyxNQUFNLHlCQUF5QixHQUFHLENBQUMsSUFBOEMsRUFBRSxFQUFFO0lBQzFGLE9BQU8sVUFBVSxDQUFDLHlCQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO0FBQ3BELENBQUMsQ0FBQztBQUZXLFFBQUEseUJBQXlCLDZCQUVwQyJ9
|