@drunk-pulumi/azure-components 1.1.15 → 1.1.17
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 +4 -2
- package/ResourceBuilder.js +14 -5
- package/aks/AzKubernetes.js +33 -13
- package/aks/helpers.d.ts +1 -0
- package/aks/helpers.js +2 -2
- package/base/BaseResourceComponent.d.ts +3 -1
- package/base/BaseResourceComponent.js +7 -5
- package/database/AzSql.d.ts +1 -1
- package/database/AzSql.js +5 -6
- package/package.json +1 -1
- package/vnet/PrivateEndpoint.js +3 -1
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, RoleAssignment,
|
|
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,9 @@ 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;
|
|
86
88
|
/** Assigns a role to a principal at the scope of this resource.
|
|
87
89
|
* @param roleName The name of the role to assign (e.g., "Contributor", "Reader").
|
|
88
90
|
* @param principalType The type of the principal (e.g., "User", "Group", "ServicePrincipal").
|
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,18 @@ 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
|
+
});
|
|
84
93
|
}
|
|
85
94
|
/** Assigns a role to a principal at the scope of this resource.
|
|
86
95
|
* @param roleName The name of the role to assign (e.g., "Contributor", "Reader").
|
|
@@ -185,4 +194,4 @@ class ResourceBuilder extends base_1.BaseComponent {
|
|
|
185
194
|
}
|
|
186
195
|
}
|
|
187
196
|
exports.ResourceBuilder = ResourceBuilder;
|
|
188
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
197
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VCdWlsZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1Jlc291cmNlQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx1REFBeUM7QUFHekMsaUNBUWdCO0FBQ2hCLDZCQUFnRTtBQUNoRSxtQ0FBaUQ7QUFDakQsaUNBQXdDO0FBQ3hDLHFDQUFnRDtBQUNoRCxpQ0FBd0M7QUFFeEMsaUNBQXVDO0FBQ3ZDLDRDQUEwRDtBQUMxRCxzREFBd0M7QUE2RXhDLE1BQWEsZUFBZ0IsU0FBUSxvQkFBa0M7SUFDckQsT0FBTyxDQUFVO0lBQ2pCLFNBQVMsQ0FBeUI7SUFDbEMsVUFBVSxDQUE4QjtJQUN4QyxrQkFBa0IsQ0FBd0I7SUFDMUMsa0JBQWtCLENBQW1CO0lBQ3JDLElBQUksQ0FBUTtJQUNaLGlCQUFpQixDQUFxQjtJQUN0QyxJQUFJLENBQW1CO0lBRXZDLFlBQVksSUFBWSxFQUFFLElBQXlCLEVBQUUsSUFBc0M7UUFDekYsS0FBSyxDQUFDLElBQUEsa0NBQXdCLEVBQUMsaUJBQWlCLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3JFLE1BQU0sRUFDSixnQkFBZ0IsRUFDaEIsVUFBVSxFQUNWLFdBQVcsRUFDWCx3QkFBd0IsRUFDeEIsVUFBVSxFQUNWLG9CQUFvQixFQUNwQixHQUFHLEtBQUssRUFDVCxHQUFHLElBQUksQ0FBQztRQUVULElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFFMUMsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLGdCQUFPLENBQ3hCLElBQUksRUFDSixFQUFFLEdBQUcsS0FBSyxFQUFFLFVBQVUsRUFBRSxJQUFJLENBQUMsVUFBVSxFQUFFLEVBQ3pDLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLElB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
|
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;
|
|
@@ -445,16 +445,36 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
445
445
|
}));
|
|
446
446
|
}
|
|
447
447
|
assignPermission(aks) {
|
|
448
|
-
const { attachToAcr } = this.args;
|
|
449
|
-
if (this.
|
|
450
|
-
this.addIdentityToRole('readOnly', { principalId: this.
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
448
|
+
const { attachToAcr, features, enableResourceIdentity, rsGroup } = this.args;
|
|
449
|
+
if (enableResourceIdentity && this.systemIdentityId) {
|
|
450
|
+
this.addIdentityToRole('readOnly', { principalId: this.systemIdentityId });
|
|
451
|
+
//Allows AKS to have contributor role in the resource group to create resources like load balancer, public IP, etc
|
|
452
|
+
this.roleAssignment({
|
|
453
|
+
principalId: this.systemIdentityId,
|
|
454
|
+
principalType: 'ServicePrincipal',
|
|
455
|
+
roleName: 'Contributor',
|
|
456
|
+
scope: helpers_1.rsHelpers.getRsGroupIdFrom(rsGroup),
|
|
457
|
+
});
|
|
458
|
+
//allows to have contributor role in the node resource group to create managed identity resources
|
|
459
|
+
this.roleAssignment({
|
|
460
|
+
principalId: this.systemIdentityId,
|
|
461
|
+
principalType: 'ServicePrincipal',
|
|
462
|
+
roleName: 'Contributor',
|
|
463
|
+
scope: helpers_1.rsHelpers.getRsGroupIdFrom({ resourceGroupName: aks.nodeResourceGroup.apply((g) => g) }),
|
|
464
|
+
});
|
|
465
|
+
}
|
|
466
|
+
//Allows AKS key vault provider to read secrets from Key Vault
|
|
467
|
+
if (features.enableAzureKeyVault && this.keyVaultSecretProviderIdentity) {
|
|
468
|
+
this.addIdentityToRole('readOnly', { principalId: this.keyVaultSecretProviderIdentity.objectId });
|
|
469
|
+
}
|
|
470
|
+
//Allows kubernetes to pull images from ACR
|
|
471
|
+
if (this.kubeletIdentity && attachToAcr) {
|
|
472
|
+
pulumi.output(this.kubeletIdentity).apply((p) => new azAd_1.RoleAssignment(`${this.name}-aks-acr-read`, {
|
|
473
|
+
principalId: p.objectId,
|
|
474
|
+
principalType: 'ServicePrincipal',
|
|
475
|
+
roleName: 'Container Registry Repository Reader',
|
|
476
|
+
scope: attachToAcr.id,
|
|
477
|
+
}, { dependsOn: aks, deletedWith: aks, parent: this }));
|
|
458
478
|
}
|
|
459
479
|
}
|
|
460
480
|
getPrivateDNSZone(aks) {
|
|
@@ -498,4 +518,4 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
498
518
|
}
|
|
499
519
|
}
|
|
500
520
|
exports.AzKubernetes = AzKubernetes;
|
|
501
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":"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"}
|
|
521
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2EAA6D;AAE7D,uDAAyC;AAEzC,0EAA4D;AAE5D,kCAA0D;AAC1D,kCAAgE;AAChE,wCAA6D;AAE7D,8BAA0C;AAC1C,sCAAyC;AACzC,uCAA4F;AAC5F,6CAA4D;AAC5D,sDAAwC;AAmBxC,MAAM,uBAAuB,GAAG,CAAC,WAAwC,EAAwC,EAAE;IACjH,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IAC/B,OAAO,YAAY,IAAI,WAAW,IAAI,gBAAgB,IAAI,WAAW,CAAC;AACxE,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,WAAwC,EAAqC,EAAE;IAChH,IAAI,CAAC,WAAW;QAAE,OAAO,SAAS,CAAC;IACnC,IAAI,uBAAuB,CAAC,WAAW,CAAC;QAAE,OAAO,WAAW,CAAC;IAC7D,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,WAAwC,EAAuC,EAAE;IAC7G,IAAI,CAAC,WAAW,IAAI,uBAAuB,CAAC,WAAW,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3E,OAAO,WAAW,CAAC,WAAW,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,WAAwC,EAAuC,EAAE;IACxG,IAAI,CAAC,WAAW,IAAI,uBAAuB,CAAC,WAAW,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3E,OAAO,WAAW,CAAC,MAAM,CAAC;AAC5B,CAAC,CAAC;AA2DF,MAAa,YAAa,SAAQ,4BAAuC;IACvD,EAAE,CAAwB;IAC1B,YAAY,CAAwB;IACpC,UAAU,CAAwC;IAClD,cAAc,CAAyB;IACvC,gBAAgB,CAAqC;IACrD,aAAa,CAA4C;IACzD,8BAA8B,CAAyB;IACvD,eAAe,CAAyB;IACxC,gBAAgB,CAAyB;IACzC,aAAa,CAAyB;IAEtD,YAAY,IAAY,EAAE,IAAsB,EAAE,IAAsC;QACtF,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAExC,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAEpC,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,mBAAS,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACtD,EAAE,EAAE,EAAE,CAAC,EAAE;YACT,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC;SACvC,CAAC,CAAC,CAAC;QAEJ,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,UAAU,EAAE,WAAW,CAAC;QAC9C,IAAI,CAAC,gBAAgB,GAAG,UAAU,EAAE,gBAAgB,CAAC;QAErD,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;QACtC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;QAEjC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAG,CAAC,WAAW,CAAC,CAAC;QACxE,IAAI,CAAC,8BAA8B,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB;YACrE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACnC,EAAE,EAAE,EAAG,CAAC,4BAA4B,CAAC,QAAQ,CAAC,UAAW;gBACzD,QAAQ,EAAE,EAAG,CAAC,4BAA4B,CAAC,QAAQ,CAAC,QAAS;gBAC7D,QAAQ,EAAE,EAAG,CAAC,4BAA4B,CAAC,QAAQ,CAAC,QAAS;aAC9D,CAAC,CAAC;YACL,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,sBAAsB;YACxD,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAU,CAAC;YACvD,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEM,UAAU;QACf,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,8BAA8B,EAAE,IAAI,CAAC,8BAA8B;YACnE,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;IACJ,CAAC;IAEO,cAAc;QACpB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAEjE,OAAO,IAAI,sBAAe,CACxB,GAAG,IAAI,CAAC,IAAI,WAAW,EACvB;YACE,YAAY,EAAE,UAAU,EAAE,MAAM;gBAC9B,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAA,WAAW,UAAU,EAAE,MAAM,CAAC,YAAY,gBAAgB,CAAC;gBAChF,CAAC,CAAC,SAAS;YACb,OAAO,EAAE,KAAK;YACd,SAAS;YACT,2DAA2D;YAC3D,kBAAkB,EAAE,IAAI;YACxB,gBAAgB,EAAE;gBAChB,MAAM,EAAE,IAAI;gBACZ,yBAAyB,EAAE,IAAI;gBAC/B,gBAAgB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;aAC1E;YACD,eAAe,EAAE;gBACf;oBACE,KAAK,EAAE,mBAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC;oBAC1C,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,mDAAmD;iBACjE;aACF;YACD,cAAc,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS;SACvE,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC;IACJ,CAAC;IAEO,wBAAwB;QAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACnG,GAAG,IAAI,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAC3C,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;QAE3D,MAAM,GAAG,GAAG,IAAI,qBAAY,CAC1B,GAAG,IAAI,CAAC,IAAI,MAAM,EAClB;YACE,SAAS;YACT,QAAQ;SACT,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;IACnD,CAAC;IAEO,uBAAuB;QAC7B,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,GACzG,IAAI,CAAC,IAAI,CAAC;QACZ,IAAI,CAAC,gBAAgB,IAAI,QAAQ,CAAC,0BAA0B;YAAE,OAAO,SAAS,CAAC;QAC/E,IAAI,iBAAiB;YAAE,OAAO,iBAAiB,CAAC;QAEhD,OAAO,IAAI,sBAAiB,CAC1B,GAAG,IAAI,CAAC,IAAI,sBAAsB,EAClC;YACE,OAAO;YACP,SAAS;YACT,kBAAkB;YAClB,UAAU;YACV,sBAAsB,EAAE,IAAI;YAC5B,cAAc,EAAE,6CAA6C;SAC9D,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC,UAAU,EAAE,CAAC;IACjB,CAAC;IAEO,aAAa,CAAC,KAAsB;QAC1C,MAAM,EACJ,OAAO,EACP,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,GAAG,EACH,iBAAiB,EACjB,sBAAsB,EACtB,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,UAAU,EACV,GAAG,KAAK,EACT,GAAG,IAAI,CAAC,IAAI,CAAC;QACd,MAAM,MAAM,GAAG,iBAAiB,IAAI,MAAM,CAAC,WAAW,CAAA,GAAG,OAAO,CAAC,iBAAiB,QAAQ,CAAC;QAC3F,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAEzD,uDAAuD;QACvD,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACtD,GAAG,IAAI;YACP,iBAAiB,EAAE,oBAAU,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,CAAC;SACtE,CAAC,CAAC,CAAC;QAEJ,OAAO,IAAI,GAAG,CAAC,cAAc,CAC3B,IAAI,CAAC,IAAI,EACT;YACE,GAAG,KAAK;YACR,GAAG,OAAO;YACV,UAAU,EAAE,UAAU;gBACpB,CAAC,CAAC;oBACE,eAAe,EAAE,IAAI;oBACrB,OAAO,EAAE,IAAI;oBACb,mBAAmB,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC;oBAChD,QAAQ,EAAE,kBAAQ,CAAC,QAAQ;iBAC5B;gBACH,CAAC,CAAC,SAAS;YAEb,aAAa,EAAE;gBACb,4BAA4B,EAAE;oBAC5B,MAAM,EAAE,QAAQ,EAAE,mBAAmB;wBACnC,CAAC,CAAC;4BACE,oBAAoB,EAAE,MAAM;yBAC7B;wBACH,CAAC,CAAC,SAAS;oBACb,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,mBAAmB,CAAC;iBAChD;gBAED,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,IAAI,KAAK,EAAE;gBAC9D,aAAa,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;gBACjC,sBAAsB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;gBAC1C,iBAAiB,EAAE;oBACjB,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC;oBAChD,MAAM,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,SAAS;iBACnG;gBACD,+BAA+B;gBAC/B,gDAAgD;gBAChD,qCAAqC;gBACrC,UAAU;gBACV,0CAA0C;gBAC1C,8DAA8D;gBAC9D,UAAU;gBACV,mBAAmB;gBACnB,KAAK;gBACL,QAAQ,EAAE;oBACR,OAAO,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;oBAClC,MAAM,EAAE,YAAY,EAAE,EAAE;wBACtB,CAAC,CAAC;4BACE,+BAA+B,EAAE,YAAY,CAAC,EAAE;yBACjD;wBACH,CAAC,CAAC,SAAS;iBACd;aACF;YAED,sBAAsB,EAAE;gBACtB,kBAAkB,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,kBAAkB,IAAI,EAAE,CAAC;gBACpG,iBAAiB,EAAE,IAAI;gBACvB,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB;gBACpD,2FAA2F;gBAC3F,8BAA8B,EAAE,QAAQ,EAAE,8BAA8B,IAAI,IAAI;gBAChF,cAAc,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;gBACrE,qCAAqC;aACtC;YAED,uBAAuB,EAAE,QAAQ,EAAE,0BAA0B;gBAC3D,CAAC,CAAC;oBACE,gBAAgB,EAAE,MAAM;oBACxB,IAAI,EAAE,MAAM;iBACb;gBACH,CAAC,CAAC,SAAS;YAEb,iBAAiB,EAAE,iBAAiB,IAAI;gBACtC,wBAAwB,EAAE,OAAO;gBACjC,QAAQ,EAAE,QAAQ;gBAClB,kBAAkB,EAAE,IAAI;gBACxB,yBAAyB,EAAE,KAAK;gBAChC,oBAAoB,EAAE,KAAK;gBAC3B,yBAAyB,EAAE,IAAI;gBAC/B,kBAAkB,EAAE,IAAI;gBACxB,mBAAmB,EAAE,GAAG;gBACxB,sBAAsB,EAAE,KAAK;gBAC7B,yBAAyB,EAAE,KAAK;gBAChC,0BAA0B,EAAE,IAAI;gBAChC,qBAAqB,EAAE,KAAK;gBAC5B,oBAAoB,EAAE,KAAK;gBAC3B,6BAA6B,EAAE,KAAK;gBACpC,YAAY,EAAE,KAAK;gBACnB,yBAAyB,EAAE,OAAO;gBAClC,uBAAuB,EAAE,MAAM;aAChC;YACD,iBAAiB,EAAE,cAAc;YAEjC,kBAAkB,EAAE;gBAClB,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,CAAC,SAAS;gBACxD,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC,MAAM;aAC1C;YAED,oBAAoB,EAAE,IAAI;YAC1B,mBAAmB,EAAE,iBAAiB,EAAE,EAAE;YAC1C,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,GAAG,kBAAQ,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE;YACnE,UAAU,EAAE,IAAI;YAEhB,QAAQ,EAAE,sBAAsB;gBAC9B,CAAC,CAAC;oBACE,IAAI,EAAE,GAAG,CAAC,oBAAoB,CAAC,cAAc;oBAC7C,6GAA6G;oBAC7G,mFAAmF;iBACpF;gBACH,CAAC,CAAC,SAAS;YAEb,sCAAsC;YACtC,4EAA4E;YAC5E,iBAAiB;YAEjB,YAAY,EAAE;gBACZ,aAAa,EAAE,KAAK,CAAC,QAAQ;gBAC7B,GAAG,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,EAAE;aACvD;YAED,cAAc,EAAE;gBACd,GAAG,OAAO;gBACV,2CAA2C;gBAC3C,aAAa,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK;gBACtC,aAAa,EAAE,OAAO,EAAE,aAAa,IAAI,GAAG,CAAC,aAAa,CAAC,MAAM;gBACjE,gBAAgB,EAAE,OAAO,EAAE,aAAa,IAAI,GAAG,CAAC,gBAAgB,CAAC,MAAM;gBACvE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,CAAC,OAAO;gBAEhD,eAAe,EAAE,UAAU;gBAC3B,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,kBAAkB;aAC3E;YAED,iBAAiB,EAAE,MAAM;YACzB,iBAAiB,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,sBAAsB,CAAC,EAAE;YACzE,kBAAkB,EAAE,QAAQ,EAAE,iBAAiB;gBAC7C,CAAC,CAAC;oBACE,OAAO,EAAE,QAAQ,CAAC,iBAAiB;oBACnC,qCAAqC;oBACrC,yBAAyB,EAAE,KAAK;iBACjC;gBACH,CAAC,CAAC,SAAS;YAEb,eAAe,EAAE;gBACf,QAAQ,EAAE,YAAY,EAAE,eAAe;oBACrC,CAAC,CAAC;wBACE,+BAA+B,EAAE,YAAY,CAAC,EAAE;wBAChD,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;qBACtC;oBACH,CAAC,CAAC,SAAS;gBACb,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE;gBAClD,gBAAgB,EAAE;oBAChB,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,sBAAsB,CAAC;iBACnD;aACF;YAED,uBAAuB,EAAE;gBACvB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,MAAM,EAAE,KAAK,CAAC,YAAY;aAC3B;YAED,GAAG,EAAE;gBACH,IAAI,EAAE,GAAG,CAAC,qBAAqB,CAAC,IAAI;gBACpC,IAAI,EAAE,GAAG;aACV;YAED,cAAc,EAAE,SAAS;YACzB,yBAAyB,EAAE;gBACzB,qBAAqB,EAAE;oBACrB,OAAO,EAAE,QAAQ,EAAE,2BAA2B,IAAI,KAAK;iBACxD;gBACD,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,IAAI,KAAK,EAAE;aACjD;YAED,gDAAgD;YAChD,yFAAyF;YACzF,gCAAgC;SACjC,EACD;YACE,GAAG,IAAI,CAAC,IAAI;YACZ,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,IAAI;SACb,CACF,CAAC;IACJ,CAAC;IAEO,4BAA4B,CAAC,GAAuB;QAC1D,MAAM,EAAE,OAAO,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACtD,IAAI,CAAC,sBAAsB,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE3E,OAAO,sBAAsB,CAAC,GAAG,CAC/B,CAAC,OAAO,EAAE,EAAE,CACV,IAAI,GAAG,CAAC,SAAS,CACf,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,EAC9B;YACE,GAAG,OAAO;YACV,GAAG,OAAO;YACV,iBAAiB,EAAE,oBAAU,CAAC,eAAe,CAAC,OAAO,CAAC,iBAAiB,CAAC;YACxE,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,aAAa,EAAE,OAAO,CAAC,IAAI;SAC5B,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CACnD,CACJ,CAAC;IACJ,CAAC;IAEO,gBAAgB,CAAC,GAAuB;QAC9C,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1C,IAAI,CAAC,UAAU;YAAE,OAAO,EAAmC,CAAC;QAE5D,OAAO,mBAAS,CAAC,UAAU,CACzB,UAAU,EACV,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CACX,IAAI,GAAG,CAAC,SAAS,CACf,GAAG,IAAI,CAAC,IAAI,OAAO,CAAC,EAAE,EACtB;YACE,GAAG,OAAO;YACV,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,aAAa,EAAE,CAAC;YAChB,UAAU,EAAE,KAAK;SAClB,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CACvD,CACJ,CAAC;IACJ,CAAC;IAEO,iBAAiB,CAAC,GAAuB;QAC/C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3C,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAClG,MAAM,YAAY,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAExF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,wBAAwB,CACzD,GAAG,IAAI,CAAC,IAAI,2BAA2B,EACvC;YACE,GAAG,OAAO;YACV,UAAU,EAAE,SAAS;YACrB,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,UAAU,EAAE,sBAAsB,EAAE,UAAU,IAAI;gBAChD;oBACE,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;oBACvB,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;iBACnB;aACF;YACD,cAAc,EAAE,sBAAsB,EAAE,cAAc;SACvD,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAC9E,CAAC;QAEF,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,wBAAwB,CAC7D,GAAG,IAAI,CAAC,IAAI,sBAAsB,EAClC;YACE,GAAG,OAAO;YACV,UAAU,EAAE,iBAAiB,CAAC,UAAU,IAAI,+BAA+B;YAC3E,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,iBAAiB,EAAE,iBAAiB;SACrC,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAC9E,CAAC;QAEF,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,wBAAwB,CACxD,GAAG,IAAI,CAAC,IAAI,wBAAwB,EACpC;YACE,GAAG,OAAO;YACV,UAAU,EAAE,YAAY,CAAC,UAAU,IAAI,iCAAiC;YACxE,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,iBAAiB,EAAE,YAAY;SAChC,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAC9E,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IACzG,CAAC;IAEO,gBAAgB,CAAC,GAAuB,EAAE,QAAyB;QACzE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACtD,IAAI,UAAU,EAAE,MAAM,IAAI,UAAU,EAAE,CAAC;YACrC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;YAC9B,MAAM,GAAG,GAAG,IAAA,+BAAqB,EAC/B,GAAG,IAAI,CAAC,IAAI,SAAS,EACrB;gBACE,GAAG,MAAM;gBACT,GAAG;gBACH,OAAO;gBACP,QAAQ;aACT,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CACvC,CAAC;YAEF,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAU,CAAC,CAAC;YACjE,kGAAkG;YAClG,CAAC,eAAe,CAAC,CAAC,GAAG,CACnB,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,IAAI,CAAC,sCAAsC,CAC7C,GAAG,IAAI,CAAC,IAAI,cAAc,CAAC,EAAE,EAC7B;gBACE,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,CAAC;gBACd,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,gCAAgC,CAAC,EAAE;gBAC5C,SAAS,EAAE,CAAC,4BAA4B,CAAC;aAC1C,EACD;gBACE,SAAS,EAAE,GAAG;gBACd,WAAW,EAAE,GAAG;gBAChB,MAAM,EAAE,IAAI;aACb,CACF,CACJ,CAAC;YACF,8GAA8G;YAC9G,CAAC,oBAAoB,EAAE,+BAA+B,CAAC,CAAC,GAAG,CACzD,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,GAAG,CAAC,2BAA2B,CACjC,GAAG,IAAI,CAAC,IAAI,cAAc,CAAC,EAAE,EAC7B;gBACE,YAAY,EAAE,MAAM,EAAE,kBAAkB,CAAC,YAAa;gBACtD,iBAAiB,EAAE,MAAM,EAAE,kBAAkB,CAAC,iBAAkB;gBAChE,uCAAuC,EAAE,CAAC;gBAC1C,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,gCAAgC,CAAC,EAAE;gBAC5C,SAAS,EAAE,CAAC,4BAA4B,CAAC;aAC1C,EACD;gBACE,SAAS,EAAE,GAAG;gBACd,WAAW,EAAE,GAAG;gBAChB,MAAM,EAAE,IAAI;aACb,CACF,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,GAAuB;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,6BAAmB,EAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE,YAAY,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9G,OAAO,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACtD,EAAE,EAAE,CAAE,CAAC,eAAe,CAAC,UAAW;YAClC,QAAQ,EAAE,CAAE,CAAC,eAAe,CAAC,QAAS;YACtC,QAAQ,EAAE,CAAE,CAAC,eAAe,CAAC,QAAS;SACvC,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,gBAAgB,CAAC,GAAuB;QAC9C,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAE7E,IAAI,sBAAsB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpD,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAE3E,kHAAkH;YAClH,IAAI,CAAC,cAAc,CAAC;gBAClB,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,aAAa,EAAE,kBAAkB;gBACjC,QAAQ,EAAE,aAAa;gBACvB,KAAK,EAAE,mBAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC;aAC3C,CAAC,CAAC;YACH,iGAAiG;YACjG,IAAI,CAAC,cAAc,CAAC;gBAClB,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,aAAa,EAAE,kBAAkB;gBACjC,QAAQ,EAAE,aAAa;gBACvB,KAAK,EAAE,mBAAS,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC,EAAE,CAAC;aACjG,CAAC,CAAC;QACL,CAAC;QAED,8DAA8D;QAC9D,IAAI,QAAQ,CAAC,mBAAmB,IAAI,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACxE,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,8BAA+B,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrG,CAAC;QAED,2CAA2C;QAC3C,IAAI,IAAI,CAAC,eAAe,IAAI,WAAW,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAgB,CAAC,CAAC,KAAK,CACxC,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,qBAAc,CAChB,GAAG,IAAI,CAAC,IAAI,eAAe,EAC3B;gBACE,WAAW,EAAE,CAAE,CAAC,QAAS;gBACzB,aAAa,EAAE,kBAAkB;gBACjC,QAAQ,EAAE,sCAAsC;gBAChD,KAAK,EAAE,WAAW,CAAC,EAAE;aACtB,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CACnD,CACJ,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,GAAuB;QAC/C,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,oBAAoB;YAAE,OAAO,SAAS,CAAC;QAErD,MAAM,OAAO,GAAG,GAAG,CAAC,iBAAiB,CAAC;QACtC,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1B,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7E,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAA,kBAAkB,kBAAQ,CAAC,cAAc,mBAAmB,OAAO,gDAAgD,SAAS,CAAC,eAAe,EAAE,CAAC;QAC5K,6CAA6C;QAC7C,MAAM,EAAE,GAAG,IAAA,mCAAyB,EAAC;YACnC,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,iBAAiB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC;YAC3C,qBAAqB,EAAE,SAAS,CAAC,kBAAkB;YACnD,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;QAEH,OAAO;YACL,WAAW,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,CAAC,eAAe,EAAE;YAC5D,gBAAgB,EAAE,EAAG,CAAC,QAAS,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;SACzG,CAAC;IACJ,CAAC;IAEO,2BAA2B;QACjC,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;QAC5B,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO;YACL,QAAQ,EAAE;gBACR,MAAM,EAAE;oBACN,SAAS,EAAE,QAAQ;oBACnB,aAAa,EAAE,CAAC;iBACjB;aACF;YACD,aAAa,EAAE,CAAC;YAChB,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,OAAO;YAClB,SAAS;SACV,CAAC;IACJ,CAAC;CACF;AAhlBD,oCAglBC"}
|
package/aks/helpers.d.ts
CHANGED
|
@@ -24,6 +24,7 @@ export type ArgoCDExtensionArgs = types.WithResourceGroupInputs & Required<types
|
|
|
24
24
|
[key: string]: pulumi.Input<string>;
|
|
25
25
|
};
|
|
26
26
|
permission: {
|
|
27
|
+
defaultRole?: 'readonly' | 'app-sync' | 'org-admin';
|
|
27
28
|
syncGroupObjectId?: pulumi.Input<string>;
|
|
28
29
|
readonlyGroupObjectId?: pulumi.Input<string>;
|
|
29
30
|
adminGroupObjectId?: pulumi.Input<string>;
|
package/aks/helpers.js
CHANGED
|
@@ -85,7 +85,7 @@ requestedScopes:
|
|
|
85
85
|
- profile
|
|
86
86
|
- email
|
|
87
87
|
`;
|
|
88
|
-
const defaultPolicy = '
|
|
88
|
+
const defaultPolicy = `role:${permission.defaultRole ?? 'readonly'}`;
|
|
89
89
|
const policy = pulumi.interpolate `
|
|
90
90
|
# Admin role
|
|
91
91
|
p, role:org-admin, applications, *, */*, allow
|
|
@@ -136,4 +136,4 @@ g, ${permission.readonlyGroupObjectId ?? '00000000-0000-0000-0000-000000000000'}
|
|
|
136
136
|
}, { ...opts, dependsOn: [aks, identity] });
|
|
137
137
|
};
|
|
138
138
|
exports.createArgoCDExtension = createArgoCDExtension;
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ha3MvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0REFBOEM7QUFDOUMsd0NBQXNDO0FBQ3RDLHVEQUF5QztBQUs1QixRQUFBLHdCQUF3QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztBQUU1RSxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsWUFBWSxFQUNaLGlCQUFpQixFQUNqQixvQkFBb0IsR0FLckIsRUFBbUIsRUFBRTtJQUNwQixNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLGlDQUFpQyxDQUFDO1lBQzdELFlBQVk7WUFDWixpQkFBaUI7U0FDbEIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxrQ0FBa0MsQ0FBQztZQUM5RCxZQUFZO1lBQ1osaUJBQWlCO1NBQ2xCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBcEJXLFFBQUEsWUFBWSxnQkFvQnZCO0FBRUssTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEVBQ2xDLFlBQVksRUFDWixpQkFBaUIsR0FJbEIsRUFBZ0MsRUFBRTtJQUNqQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFBLDhDQUE4QyxrQkFBUSxDQUFDLGNBQWMsbUJBQW1CLGlCQUFpQix5REFBeUQsWUFBWSx5QkFBeUIsQ0FBQztJQUN0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
|
|
@@ -74,10 +74,12 @@ export declare abstract class BaseResourceComponent<TArgs extends BaseArgs> exte
|
|
|
74
74
|
* @param principalId The ID of the principal to whom the role is assigned.
|
|
75
75
|
* @returns A RoleAssignment resource representing the role assignment.
|
|
76
76
|
* */
|
|
77
|
-
roleAssignment({ roleName, principalType, principalId, }: {
|
|
77
|
+
roleAssignment({ roleName, principalType, principalId, scope, }: {
|
|
78
78
|
roleName: pulumi.Input<string>;
|
|
79
79
|
principalId: pulumi.Input<string>;
|
|
80
80
|
principalType: types.PrincipalTypes;
|
|
81
|
+
/**if this scope is not provided then it will grant the permission to this resources*/
|
|
82
|
+
scope?: pulumi.Input<string>;
|
|
81
83
|
}): pulumi.Output<RoleAssignment>;
|
|
82
84
|
grantPermissionsToIdentity({ identity, resource, roleNames }: types.GrantIdentityRoles): pulumi.Output<pulumi.Output<pulumi.Output<RoleAssignment>[]> | undefined>;
|
|
83
85
|
/**
|
|
@@ -111,16 +111,18 @@ class BaseResourceComponent extends BaseComponent_1.BaseComponent {
|
|
|
111
111
|
* @param principalId The ID of the principal to whom the role is assigned.
|
|
112
112
|
* @returns A RoleAssignment resource representing the role assignment.
|
|
113
113
|
* */
|
|
114
|
-
roleAssignment({ roleName, principalType, principalId, }) {
|
|
115
|
-
|
|
116
|
-
|
|
114
|
+
roleAssignment({ roleName, principalType, principalId, scope, }) {
|
|
115
|
+
if (!scope) {
|
|
116
|
+
const scope = this.getOutputs()?.id;
|
|
117
|
+
}
|
|
118
|
+
if (!scope) {
|
|
117
119
|
throw new Error(`Resource ID is not available for role assignment in component "${this.type}:${this.name}"`);
|
|
118
120
|
}
|
|
119
121
|
return pulumi.output([roleName, principalId]).apply(([role, id]) => new RoleAssignment_1.RoleAssignment(`${this.name}-${role}-${id}`, {
|
|
120
122
|
principalId: id,
|
|
121
123
|
principalType,
|
|
122
124
|
roleName: role,
|
|
123
|
-
scope:
|
|
125
|
+
scope: scope,
|
|
124
126
|
}, { parent: this, deletedWith: this }));
|
|
125
127
|
}
|
|
126
128
|
grantPermissionsToIdentity({ identity, resource, roleNames }) {
|
|
@@ -211,4 +213,4 @@ class BaseResourceComponent extends BaseComponent_1.BaseComponent {
|
|
|
211
213
|
}
|
|
212
214
|
}
|
|
213
215
|
exports.BaseResourceComponent = BaseResourceComponent;
|
|
214
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
216
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZVJlc291cmNlQ29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jhc2UvQmFzZVJlc291cmNlQ29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUN4Qyx1REFBeUM7QUFHekMsNkRBQThFO0FBQzlFLHlEQUF3RTtBQUN4RSx3REFBd0U7QUFFeEUsbURBQWdEO0FBQ2hELDBEQUF1RDtBQUN2RCw2REFBMEQ7QUFDMUQsMkRBQXdEO0FBRXhELHVDQUFxRDtBQW1CckQ7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxNQUFzQixxQkFBOEMsU0FBUSw2QkFBb0I7SUFhM0U7SUFDRDtJQUNHO0lBQ0E7SUFmZCxZQUFZLENBQXdDO0lBQ25ELFFBQVEsR0FBNEMsRUFBRSxDQUFDO0lBQ3ZELG9CQUFvQixHQUFZLEtBQUssQ0FBQztJQUU5Qzs7Ozs7O09BTUc7SUFDSCxZQUNtQixJQUFZLEVBQ2IsSUFBWSxFQUNULElBQVcsRUFDWCxJQUFzQztRQUV6RCxLQUFLLENBQUMsSUFBQSxrQ0FBd0IsRUFBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBTHZDLFNBQUksR0FBSixJQUFJLENBQVE7UUFDYixTQUFJLEdBQUosSUFBSSxDQUFRO1FBQ1QsU0FBSSxHQUFKLElBQUksQ0FBTztRQUNYLFNBQUksR0FBSixJQUFJLENBQWtDO0lBRzNELENBQUM7SUFFRDs7Ozs7T0FLRztJQUNJLGlCQUFpQixDQUN0QixJQUEwQixFQUMxQixRQUF5RTtRQUV6RSxNQUFNLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUNqQyxJQUFJLENBQUMsVUFBVTtZQUFFLE9BQU87UUFFeEIsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEtBQUssQ0FB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
|
package/database/AzSql.d.ts
CHANGED
|
@@ -34,7 +34,7 @@ export interface AzSqlArgs extends CommonBaseArgs, types.WithEncryptionEnabler,
|
|
|
34
34
|
useDefaultUAssignedIdForConnection?: boolean;
|
|
35
35
|
/**additionalUAssignedClientIds exable: {'abc':identity.clientId}*/
|
|
36
36
|
additionalUAssignedClientIds?: Record<string, pulumi.Input<string>>;
|
|
37
|
-
adminGroup
|
|
37
|
+
adminGroup?: {
|
|
38
38
|
displayName: pulumi.Input<string>;
|
|
39
39
|
objectId: pulumi.Input<string>;
|
|
40
40
|
};
|
package/database/AzSql.js
CHANGED
|
@@ -65,7 +65,8 @@ class AzSql extends base_1.BaseResourceComponent {
|
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
createSql() {
|
|
68
|
-
const { rsGroup, enableResourceIdentity, enableEncryption, defaultUAssignedId, administrators, network, lock, administratorLogin, ...props } = this.args;
|
|
68
|
+
const { rsGroup, groupRoles, enableResourceIdentity, enableEncryption, defaultUAssignedId, administrators, network, lock, administratorLogin, ...props } = this.args;
|
|
69
|
+
const adminGroup = administrators?.adminGroup ?? groupRoles?.contributor;
|
|
69
70
|
const adminLogin = administratorLogin ?? pulumi.interpolate `${this.name}-admin-${this.createRandomString().value}`;
|
|
70
71
|
const password = this.createPassword();
|
|
71
72
|
const encryptionKey = enableEncryption
|
|
@@ -96,8 +97,8 @@ class AzSql extends base_1.BaseResourceComponent {
|
|
|
96
97
|
: false,
|
|
97
98
|
principalType: sql.PrincipalType.Group,
|
|
98
99
|
tenantId: helpers_1.azureEnv.tenantId,
|
|
99
|
-
sid:
|
|
100
|
-
login:
|
|
100
|
+
sid: adminGroup?.objectId,
|
|
101
|
+
login: adminGroup?.displayName,
|
|
101
102
|
}
|
|
102
103
|
: undefined,
|
|
103
104
|
publicNetworkAccess: network?.privateLink
|
|
@@ -106,8 +107,6 @@ class AzSql extends base_1.BaseResourceComponent {
|
|
|
106
107
|
}, {
|
|
107
108
|
...this.opts,
|
|
108
109
|
protect: lock ?? this.opts?.protect,
|
|
109
|
-
dependsOn: this.opts?.dependsOn ? this.opts.dependsOn : password,
|
|
110
|
-
ignoreChanges: ['administrators.azureAdOnlyAuthentication'],
|
|
111
110
|
parent: this,
|
|
112
111
|
});
|
|
113
112
|
this.createEncryptionProtector(server, encryptionKey);
|
|
@@ -298,4 +297,4 @@ class AzSql extends base_1.BaseResourceComponent {
|
|
|
298
297
|
}
|
|
299
298
|
}
|
|
300
299
|
exports.AzSql = AzSql;
|
|
301
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzSql.js","sourceRoot":"","sources":["../../src/database/AzSql.ts"],"names":[],"mappings":"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"}
|
|
300
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzSql.js","sourceRoot":"","sources":["../../src/database/AzSql.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/vnet/PrivateEndpoint.js
CHANGED
|
@@ -77,6 +77,8 @@ class PrivateEndpoint extends base_1.BaseComponent {
|
|
|
77
77
|
}, {
|
|
78
78
|
...opts,
|
|
79
79
|
parent: this,
|
|
80
|
+
deleteBeforeReplace: true,
|
|
81
|
+
replaceOnChanges: ['privateLinkServiceConnections'],
|
|
80
82
|
});
|
|
81
83
|
const privateIpAddresses = privateEndpoint.customDnsConfigs.apply((c) => c.flatMap((i) => i.ipAddresses));
|
|
82
84
|
const zone = pulumi.output(args.resourceInfo.id).apply((rsId) => {
|
|
@@ -187,4 +189,4 @@ class PrivateEndpoint extends base_1.BaseComponent {
|
|
|
187
189
|
}
|
|
188
190
|
}
|
|
189
191
|
exports.PrivateEndpoint = PrivateEndpoint;
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUVuZHBvaW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ZuZXQvUHJpdmF0ZUVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1EQUFxQztBQUNyQyxzRUFBd0Q7QUFDeEQsdURBQXlDO0FBR3pDLGtDQUF3QztBQUN4QyxxREFBa0Q7QUFDbEQsNkNBQTJEO0FBQzNELHdDQUF1QztBQW1DdkMsTUFBYSxlQUFnQixTQUFRLG9CQUFrQztJQUNyRCxlQUFlLENBRzVCO0lBQ2EsY0FBYyxDQUF3QjtJQUV0RCxZQUFZLElBQVksRUFBRSxJQUF5QixFQUFFLElBQXNDO1FBQ3pGLEtBQUssQ0FBQyxJQUFBLGtDQUF3QixFQUFDLGlCQUFpQixDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUVyRSxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsdUJBQXVCLEVBQUUsQ0FBQztRQUVoRCxNQUFNLGVBQWUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxlQUFlLENBQ2pELElBQUksRUFDSjtZQUNFLEdBQUcsSUFBSSxDQUFDLE9BQU87WUFDZixNQUFNLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUU7WUFDeEMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxlQUFlO2dCQUMvQyxDQUFDLENBQUM7b0JBQ0U7d0JBQ0UsV0FBVyxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUM7cUJBQy9DO2lCQUNGO2dCQUNILENBQUMsQ0FBQyxTQUFTO1lBQ2IsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxlQUFlO2dCQUMvQyxDQUFDLENBQUM7b0JBQ0U7d0JBQ0UsSUFBSSxFQUFFLEdBQUcsSUFBSSxXQUFXO3dCQUN4QixPQUFPLEVBQUUsUUFBUSxD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
|