@drunk-pulumi/azure-components 1.1.9 → 1.1.11
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/AppResources.d.ts +5 -5
- package/AppResources.js +2 -2
- package/aks/AzKubernetes.d.ts +1 -1
- package/aks/AzKubernetes.js +3 -1
- package/aks/helpers.js +2 -2
- package/apim/Apim.d.ts +1 -1
- package/apim/Apim.js +3 -2
- package/azAd/AppRegistration.d.ts +6 -4
- package/azAd/AppRegistration.js +29 -29
- package/azAd/CloudflareAzIdentity.js +2 -1
- package/azAd/UserAssignedIdentity.js +2 -2
- package/database/AzSql.d.ts +1 -1
- package/database/MySql.d.ts +1 -1
- package/database/Postgres.d.ts +1 -1
- package/database/Redis.d.ts +16 -2
- package/database/Redis.js +4 -3
- package/helpers/azureEnv.d.ts +1 -0
- package/helpers/azureEnv.js +3 -2
- package/package.json +1 -1
- package/services/ServiceBus.d.ts +1 -1
- package/vault/VaultSecrets.d.ts +1 -1
- package/vault/VaultSecrets.js +3 -3
- package/vnet/PrivateDnsZone.js +3 -3
- package/vnet/helpers.d.ts +1 -0
- package/vnet/helpers.js +9 -2
package/AppResources.d.ts
CHANGED
|
@@ -10,10 +10,10 @@ import { KeyVaultArgs } from './vault';
|
|
|
10
10
|
export interface AppResourcesArgs extends CommonBaseArgs, types.WithNetworkArgs, types.WithEncryptionEnabler, types.WithDiskEncryptSet {
|
|
11
11
|
vaultCreate?: types.WithName & Partial<KeyVaultArgs>;
|
|
12
12
|
storageAccount?: types.WithName & Partial<StorageAccountArgs>;
|
|
13
|
-
serviceBus?: types.WithName & Partial<ServiceBusArgs> & Pick<ServiceBusArgs, 'sku'>;
|
|
13
|
+
serviceBus?: types.WithName & Partial<ServiceBusArgs> & Pick<ServiceBusArgs, 'sku' | 'disableLocalAuth'>;
|
|
14
14
|
automation?: types.WithName & Partial<AutomationArgs>;
|
|
15
15
|
azSearch?: types.WithName & Partial<AzSearchArgs> & Pick<AzSearchArgs, 'sku'>;
|
|
16
|
-
apim?: types.WithName & Partial<ApimArgs> & Pick<ApimArgs, 'sku'>;
|
|
16
|
+
apim?: types.WithName & Partial<ApimArgs> & Pick<ApimArgs, 'sku' | 'disableSignIn'>;
|
|
17
17
|
appCert?: types.WithName & Partial<AppCertArgs> & Pick<AppCertArgs, 'domain' | 'productType'>;
|
|
18
18
|
appConfig?: types.WithName & Partial<AppConfigArgs>;
|
|
19
19
|
appContainerEnv?: types.WithName & Partial<AppContainerEnvArgs>;
|
|
@@ -21,9 +21,9 @@ export interface AppResourcesArgs extends CommonBaseArgs, types.WithNetworkArgs,
|
|
|
21
21
|
logicApp?: types.WithName & Partial<LogicAppArgs> & Pick<LogicAppArgs, 'integrationAccount' | 'workflow'>;
|
|
22
22
|
signalR?: types.WithName & Partial<SignalRArgs> & Pick<SignalRArgs, 'sku'>;
|
|
23
23
|
azSql?: types.WithName & Partial<AzSqlArgs>;
|
|
24
|
-
mySql?: types.WithName & Partial<MySqlArgs> & Pick<MySqlArgs, 'sku' | 'administratorLogin'>;
|
|
25
|
-
postgres?: types.WithName & Partial<PostgresArgs> & Pick<PostgresArgs, 'sku' | 'administratorLogin'>;
|
|
26
|
-
redis?: types.WithName & Partial<RedisArgs>;
|
|
24
|
+
mySql?: types.WithName & Partial<MySqlArgs> & Pick<MySqlArgs, 'sku' | 'administratorLogin' | 'enableAzureADAdmin'>;
|
|
25
|
+
postgres?: types.WithName & Partial<PostgresArgs> & Pick<PostgresArgs, 'sku' | 'administratorLogin' | 'enableAzureADAdmin'>;
|
|
26
|
+
redis?: types.WithName & Partial<RedisArgs> & Pick<RedisArgs, 'sku' | 'disableAccessKeyAuthentication'>;
|
|
27
27
|
}
|
|
28
28
|
export declare class AppResources extends BaseComponent<AppResourcesArgs> {
|
|
29
29
|
readonly storage?: StorageAccount;
|
package/AppResources.js
CHANGED
|
@@ -136,11 +136,11 @@ class AppResources extends base_1.BaseComponent {
|
|
|
136
136
|
return { resourceName: pulumi.output(vaultInfo.resourceName), id: pulumi.output(vaultInfo.id) };
|
|
137
137
|
if (!vaultCreate)
|
|
138
138
|
return undefined;
|
|
139
|
-
return new vault_1.KeyVault(vaultCreate.name ?? this.name, { ...vaultCreate, rsGroup: rsGroup, groupRoles: groupRoles
|
|
139
|
+
return new vault_1.KeyVault(vaultCreate.name ?? this.name, { network, ...vaultCreate, rsGroup: rsGroup, groupRoles: groupRoles }, {
|
|
140
140
|
...this.opts,
|
|
141
141
|
parent: this,
|
|
142
142
|
}).getOutputs();
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
exports.AppResources = AppResources;
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwUmVzb3VyY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0FwcFJlc291cmNlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx1REFBeUM7QUFFekMsaUNBQXVEO0FBQ3ZELDRDQUEwRDtBQUMxRCx1Q0FBK0Q7QUFDL0QseUNBQTRHO0FBQzVHLGlDQUF3QztBQUN4QywrQkFhZTtBQUNmLHlDQUEwRztBQUMxRyxtQ0FBaUQ7QUF3QmpELE1BQWEsWUFBYSxTQUFRLG9CQUErQjtJQUMvQyxPQUFPLENBQWtCO0lBQ3pCLFVBQVUsQ0FBYztJQUN4QixRQUFRLENBQVk7SUFDcEIsT0FBTyxDQUFXO0lBQ2xCLFNBQVMsQ0FBYTtJQUN0QixlQUFlLENBQW1CO0lBQ2xDLE1BQU0sQ0FBVTtJQUNoQixRQUFRLENBQVk7SUFDcEIsT0FBTyxDQUFXO0lBQ2xCLEtBQUssQ0FBUztJQUNkLEtBQUssQ0FBUztJQUNkLFFBQVEsQ0FBWTtJQUNwQixLQUFLLENBQVM7SUFDdkIsVUFBVSxDQUFjO0lBQ3hCLElBQUksQ0FBUTtJQUNaLFNBQVMsQ0FBeUI7SUFFekMsWUFBWSxJQUFZLEVBQUUsSUFBc0IsRUFBRSxJQUFzQztRQUN0RixLQUFLLENBQUMsSUFBQSxrQ0FBd0IsRUFBQyxjQUFjLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2xFLE1BQU0sRUFDSixJQUFJLEVBQ0osY0FBYyxFQUNkLFVBQVUsRUFDVixVQUFVLEVBQ1YsUUFBUSxFQUNSLE9BQU8sRUFDUCxTQUFTLEVBQ1QsZUFBZSxFQUNmLE1BQU0sRUFDTixRQUFRLEVBQ1IsT0FBTyxFQUNQLEtBQUssRUFDTCxLQUFLLEVBQ0wsUUFBUSxFQUNSLEtBQUssRUFDTCxHQUFHLE1BQU0sRUFDVixHQUFHLElBQUksQ0FBQztRQUVULElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFD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
|
package/aks/AzKubernetes.d.ts
CHANGED
|
@@ -82,7 +82,7 @@ export declare class AzKubernetes extends BaseResourceComponent<AzKubernetesArgs
|
|
|
82
82
|
azAppIdentity: {
|
|
83
83
|
tenantId: pulumi.Output<string>;
|
|
84
84
|
clientId: pulumi.Output<string>;
|
|
85
|
-
servicePrincipalId: pulumi.Output<string
|
|
85
|
+
servicePrincipalId: pulumi.Output<string> | undefined;
|
|
86
86
|
vaultSecrets: {
|
|
87
87
|
[key: string]: import("..").VaultSecretResult;
|
|
88
88
|
};
|
package/aks/AzKubernetes.js
CHANGED
|
@@ -134,7 +134,9 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
134
134
|
appType: 'web',
|
|
135
135
|
vaultInfo,
|
|
136
136
|
//memberof: groupRoles ? [groupRoles.readOnly] : undefined,
|
|
137
|
+
enableClientSecret: true,
|
|
137
138
|
servicePrincipal: {
|
|
139
|
+
enable: true,
|
|
138
140
|
appRoleAssignmentRequired: true,
|
|
139
141
|
assignedGroupIds: groupRoles ? [groupRoles.readOnly.objectId] : undefined,
|
|
140
142
|
},
|
|
@@ -494,4 +496,4 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
494
496
|
}
|
|
495
497
|
}
|
|
496
498
|
exports.AzKubernetes = AzKubernetes;
|
|
497
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":"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"}
|
|
499
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":"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"}
|
package/aks/helpers.js
CHANGED
|
@@ -73,7 +73,7 @@ exports.getAksClusterOutput = getAksClusterOutput;
|
|
|
73
73
|
const createArgoCDExtension = (name, { allowInsecureAccess, argoCdDomain, defaultUAssignedId, aks, identity, permission, rsGroup, releaseTrain, allowedNameSpaces, configs, }, opts) => {
|
|
74
74
|
const oidcConfig = pulumi.interpolate `
|
|
75
75
|
name: Azure
|
|
76
|
-
issuer:
|
|
76
|
+
issuer: ${helpers_1.azureEnv.entraIdAuthorityUrl}
|
|
77
77
|
clientID: ${identity.clientId}
|
|
78
78
|
azure:
|
|
79
79
|
useWorkloadIdentity: true
|
|
@@ -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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
|
package/apim/Apim.d.ts
CHANGED
|
@@ -28,7 +28,7 @@ export interface ApimArgs extends CommonBaseArgs, types.WithNetworkArgs, types.W
|
|
|
28
28
|
capacity: pulumi.Input<number>;
|
|
29
29
|
name: apim.SkuType;
|
|
30
30
|
};
|
|
31
|
-
disableSignIn
|
|
31
|
+
disableSignIn: boolean;
|
|
32
32
|
permissions?: Array<Omit<types.GrantIdentityRoles, 'identity'>>;
|
|
33
33
|
products?: Array<Omit<ApimProductArgs, 'rsGroup' | 'serviceName' | 'vaultInfo' | 'groupRoles' | 'enableDiagnostic'> & {
|
|
34
34
|
name: string;
|
package/apim/Apim.js
CHANGED
|
@@ -158,13 +158,14 @@ class Apim extends base_1.BaseResourceComponent {
|
|
|
158
158
|
return;
|
|
159
159
|
const identity = new azAd_1.AppRegistration(`${this.name}-apim`, {
|
|
160
160
|
vaultInfo,
|
|
161
|
+
enableClientSecret: true,
|
|
161
162
|
}, { dependsOn: service, deletedWith: service, parent: this });
|
|
162
163
|
return new apim.IdentityProvider(this.name, {
|
|
163
164
|
...rsGroup,
|
|
164
165
|
serviceName: service.name,
|
|
165
166
|
clientId: identity.clientId,
|
|
166
167
|
clientSecret: identity.clientSecret,
|
|
167
|
-
authority:
|
|
168
|
+
authority: helpers_1.azureEnv.entraIdAuthorityUrl,
|
|
168
169
|
type: 'aad',
|
|
169
170
|
identityProviderName: 'aad',
|
|
170
171
|
allowedTenants: [helpers_1.azureEnv.tenantId],
|
|
@@ -249,4 +250,4 @@ class Apim extends base_1.BaseResourceComponent {
|
|
|
249
250
|
}
|
|
250
251
|
}
|
|
251
252
|
exports.Apim = Apim;
|
|
252
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
253
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Apim.js","sourceRoot":"","sources":["../../src/apim/Apim.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAA2D;AAC3D,oEAAsD;AAEtD,uDAAyC;AAGzC,+CAA6D;AAC7D,kCAAgE;AAChE,wCAA6D;AAE7D,kCAA0C;AAC1C,kCAA0C;AAC1C,oCAAwC;AAmDxC,MAAa,IAAK,SAAQ,4BAA+B;IACvC,EAAE,CAAwB;IAC1B,YAAY,CAAwB;IAEpD,YAAY,IAAY,EAAE,IAAc,EAAE,IAAsC;QAC9E,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEhC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAE3B,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEM,UAAU;QACf,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC;IACJ,CAAC;IAEO,QAAQ;QACd,MAAM,EAAE,SAAS,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACnD,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO;YAClC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC7B,MAAM,GAAG,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;gBACrD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC;YACzE,CAAC,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS;YACtC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC/B,MAAM,GAAG,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;gBACrD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YACzD,CAAC,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;IACtC,CAAC;IAEO,UAAU;QAChB,MAAM,EACJ,kBAAkB,EAClB,sBAAsB,EACtB,SAAS,EACT,UAAU,EACV,OAAO,EACP,GAAG,EACH,aAAa,EACb,cAAc,EACd,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,sBAAsB,GAAG,EAAE,EAC3B,gBAAgB,GAAG,EAAE,EACrB,KAAK,EACL,OAAO,EACP,GAAG,MAAM,EACV,GAAG,IAAI,CAAC,IAAI,CAAC;QAEd,OAAO,IAAI,IAAI,CAAC,oBAAoB,CAClC,IAAI,CAAC,IAAI,EACT;YACE,GAAG,OAAO;YACV,GAAG,MAAM;YACT,aAAa,EAAE,aAAa,IAAI,mBAAS,CAAC,YAAY;YACtD,cAAc,EAAE,cAAc,IAAI,uCAAuC;YACzE,uBAAuB,EAAE,uBAAuB,IAAI,uCAAuC;YAE3F,QAAQ,EAAE,sBAAsB;gBAC9B,CAAC,CAAC;oBACE,IAAI,EAAE,kBAAkB;wBACtB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,2BAA2B;wBACnD,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc;oBAExC,sBAAsB,EAAE,kBAAkB;wBACxC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;wBAClE,CAAC,CAAC,SAAS;iBACd;gBACH,CAAC,CAAC,SAAS;YAEb,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,EAAE;YAEhD,oBAAoB,EAAE,oBAAoB,IAAI;gBAC5C,aAAa,EAAE,YAAY;aAC5B;YACD,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE;YAE7B,sBAAsB,EAAE,sBAAsB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC5D,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,CAAC;gBAClC,OAAO;oBACL,GAAG,KAAK;oBACR,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ;oBAClD,gBAAgB,EAAE,kBAAkB,EAAE,QAAQ;oBAC9C,UAAU,EAAE,oBAAY,CAAC,UAAU,CAAC;wBAClC,IAAI,EAAE,IAAI,CAAC,aAAa;wBACxB,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,SAAS,EAAE,SAAU;wBACrB,IAAI,EAAE,SAAS;qBAChB,CAAC;oBACF,IAAI,EAAE,OAAO;iBACd,CAAC;YACJ,CAAC,CAAC;YAEF,gDAAgD;YAChD,sGAAsG;YACtG,0EAA0E;YAC1E,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;YAC7G,YAAY;YACZ,kBAAkB,EAAE,MAAM;YAC1B,2BAA2B,EAAE,OAAO,EAAE,SAAS;gBAC7C,CAAC,CAAC;oBACE,gBAAgB,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ;iBACjD;gBACH,CAAC,CAAC,SAAS;YAEb,KAAK,EAAE,GAAG,CAAC,IAAI,IAAI,OAAO,IAAI,GAAG,CAAC,IAAI,IAAI,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAU,CAAC,eAAe,CAAC,KAAK,CAAC;YACvG,4BAA4B;YAC5B,mBAAmB,EACjB,GAAG,CAAC,IAAI,KAAK,SAAS;gBACpB,CAAC,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC/B,GAAG,CAAC;oBACJ,GAAG;oBACH,KAAK,EAAE,oBAAU,CAAC,eAAe,CAAC,KAAK,CAAC;iBACzC,CAAC,CAAC;gBACL,CAAC,CAAC,SAAS;YAEf,gBAAgB,EAAE;gBAChB,qEAAqE,EAAE,MAAM;gBAC7E,+EAA+E,EAAE,OAAO;gBACxF,+EAA+E,EAAE,OAAO;gBACxF,+EAA+E,EAAE,OAAO;gBACxF,GAAG,gBAAgB;aACpB;SACF,EACD;YACE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS;YAC/B,mBAAmB,EAAE,IAAI;YACzB,MAAM,EAAE,IAAI;SACb,CACF,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,OAAkC;QACrD,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACxD,IAAI,aAAa;YAAE,OAAO;QAE1B,MAAM,QAAQ,GAAG,IAAI,sBAAe,CAClC,GAAG,IAAI,CAAC,IAAI,OAAO,EACnB;YACE,SAAS;YACT,kBAAkB,EAAE,IAAI;SACzB,EACD,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAC3D,CAAC;QAEF,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAC9B,IAAI,CAAC,IAAI,EACT;YACE,GAAG,OAAO;YACV,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,YAAY,EAAE,QAAQ,CAAC,YAAa;YACpC,SAAS,EAAE,kBAAQ,CAAC,mBAAmB;YACvC,IAAI,EAAE,KAAK;YACX,oBAAoB,EAAE,KAAK;YAC3B,cAAc,EAAE,CAAC,kBAAQ,CAAC,QAAQ,CAAC;YACnC,YAAY,EAAE,kBAAQ,CAAC,QAAQ;SAChC,EACD,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAC7D,CAAC;IACJ,CAAC;IAEO,iBAAiB,CAAC,OAAkC;QAC1D,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC7C,IAAI,CAAC,aAAa;YAAE,OAAO;QAE3B,yBAAyB;QACzB,yCAAyC;QACzC,eAAe;QACf,MAAM;QACN,kBAAkB;QAClB,iCAAiC;QACjC,sBAAsB;QACtB,sBAAsB;QACtB,wBAAwB;QACxB,gCAAgC;QAChC,wBAAwB;QACxB,+CAA+C;QAC/C,SAAS;QACT,OAAO;QACP,gEAAgE;QAChE,KAAK;IACP,CAAC;IAEO,gBAAgB,CAAC,OAAkC;QACzD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACvC,IAAI,CAAC,OAAO,EAAE,WAAW;YAAE,OAAO;QAElC,OAAO,IAAI,sBAAe,CACxB,IAAI,CAAC,IAAI,EACT;YACE,GAAG,OAAO,CAAC,WAAW;YACtB,OAAO;YACP,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,OAAO;SACtB,EACD,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAC3D,CAAC;IACJ,CAAC;IAEO,SAAS,CAAC,OAAkC;QAClD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,UAAU;YAAE,OAAO;QAE9B,kBAAkB;QAClB,OAAO,IAAI,IAAI,CAAC,MAAM,CACpB,GAAG,IAAI,CAAC,IAAI,UAAU,EACtB;YACE,GAAG,OAAO;YACV,WAAW,EAAE,OAAO,CAAC,IAAI;YAEzB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;YAC/C,WAAW,EAAE,oBAAoB;YACjC,QAAQ,EAAE,GAAG,IAAI,CAAC,IAAI,aAAa;YACnC,UAAU,EAAE,IAAK,CAAC,UAAU,CAAC,EAAE;YAC/B,WAAW,EAAE;gBACX,2DAA2D;gBAC3D,kBAAkB,EAAE,IAAK,CAAC,UAAU,CAAC,kBAAmB;aACzD;SACF,EACD,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAC3D,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,OAAkC;QACtD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACrE,IAAI,CAAC,QAAQ,EAAE,MAAM;YAAE,OAAO;QAE9B,OAAO,QAAQ,CAAC,GAAG,CACjB,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,yBAAW,CACb,CAAC,CAAC,IAAI,EACN;YACE,GAAG,CAAC;YACJ,OAAO;YACP,SAAS;YACT,UAAU;YACV,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC;SAC5C,EACD;YACE,SAAS,EAAE,OAAO;YAClB,WAAW,EAAE,OAAO;YACpB,MAAM,EAAE,IAAI;SACb,CACF,CACJ,CAAC;IACJ,CAAC;IAEO,eAAe,CAAC,OAAkC;QACxD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAClC,IAAI,CAAC,WAAW,EAAE,MAAM;YAAE,OAAO;QAEjC,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3B,IAAI,CAAC,0BAA0B,CAAC;YAC9B,GAAG,CAAC;YACJ,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AAtRD,oBAsRC"}
|
|
@@ -20,7 +20,9 @@ export interface AppRegistrationArgs extends WithVaultInfo, WithMemberOfArgs, Pa
|
|
|
20
20
|
subject: pulumi.Input<string>;
|
|
21
21
|
audiences?: pulumi.Input<pulumi.Input<string>[]>;
|
|
22
22
|
}>;
|
|
23
|
+
enableClientSecret?: boolean;
|
|
23
24
|
servicePrincipal?: Pick<azAd.ServicePrincipalArgs, 'notificationEmailAddresses' | 'preferredSingleSignOnMode' | 'samlSingleSignOn'> & {
|
|
25
|
+
enable: boolean;
|
|
24
26
|
appRoleAssignmentRequired?: pulumi.Input<boolean>;
|
|
25
27
|
assignedGroupIds?: pulumi.Input<string>[];
|
|
26
28
|
};
|
|
@@ -42,16 +44,16 @@ export interface AppRegistrationArgs extends WithVaultInfo, WithMemberOfArgs, Pa
|
|
|
42
44
|
export declare class AppRegistration extends BaseComponent<AppRegistrationArgs> {
|
|
43
45
|
readonly tenantId: pulumi.Output<string>;
|
|
44
46
|
readonly clientId: pulumi.Output<string>;
|
|
45
|
-
readonly clientSecret
|
|
46
|
-
readonly servicePrincipalId
|
|
47
|
-
readonly servicePrincipalPassword
|
|
47
|
+
readonly clientSecret?: pulumi.Output<string>;
|
|
48
|
+
readonly servicePrincipalId?: pulumi.Output<string>;
|
|
49
|
+
readonly servicePrincipalPassword?: pulumi.Output<string>;
|
|
48
50
|
readonly applicationId: pulumi.Output<string>;
|
|
49
51
|
private vaultSecrets;
|
|
50
52
|
constructor(name: string, args?: AppRegistrationArgs, opts?: pulumi.ComponentResourceOptions);
|
|
51
53
|
getOutputs(): {
|
|
52
54
|
tenantId: pulumi.Output<string>;
|
|
53
55
|
clientId: pulumi.Output<string>;
|
|
54
|
-
servicePrincipalId: pulumi.Output<string
|
|
56
|
+
servicePrincipalId: pulumi.Output<string> | undefined;
|
|
55
57
|
vaultSecrets: {
|
|
56
58
|
[key: string]: import("../vault").VaultSecretResult;
|
|
57
59
|
};
|
package/azAd/AppRegistration.js
CHANGED
|
@@ -62,18 +62,25 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
62
62
|
//Application
|
|
63
63
|
const { app, clientSecret } = this.createAppRegistration();
|
|
64
64
|
const sp = this.createServicePrincipal(app);
|
|
65
|
-
this.servicePrincipalId = sp
|
|
66
|
-
this.servicePrincipalPassword = sp
|
|
65
|
+
this.servicePrincipalId = sp?.servicePrincipalId;
|
|
66
|
+
this.servicePrincipalPassword = sp?.servicePrincipalPassword;
|
|
67
67
|
this.clientId = app.clientId;
|
|
68
68
|
this.clientSecret = clientSecret;
|
|
69
69
|
this.tenantId = helpers_2.azureEnv.tenantId;
|
|
70
70
|
this.applicationId = app.id;
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}
|
|
71
|
+
const ss = {
|
|
72
|
+
'client-id': { value: app.clientId, contentType: `AppRegistration:${this.name}` },
|
|
73
|
+
};
|
|
74
|
+
if (clientSecret) {
|
|
75
|
+
ss['client-secret'] = { value: clientSecret, contentType: `AppRegistration:${this.name}` };
|
|
76
|
+
}
|
|
77
|
+
if (sp?.servicePrincipalId) {
|
|
78
|
+
ss['principal-id'] = { value: sp.servicePrincipalId, contentType: `AppRegistration:${this.name}` };
|
|
79
|
+
}
|
|
80
|
+
if (sp?.servicePrincipalPassword) {
|
|
81
|
+
ss['principal-secret'] = { value: sp.servicePrincipalPassword, contentType: `AppRegistration:${this.name}` };
|
|
82
|
+
}
|
|
83
|
+
this.addSecrets(ss);
|
|
77
84
|
this.registerOutputs();
|
|
78
85
|
}
|
|
79
86
|
getOutputs() {
|
|
@@ -86,7 +93,7 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
86
93
|
};
|
|
87
94
|
}
|
|
88
95
|
createAppRegistration() {
|
|
89
|
-
const { info, federatedCredentials } = this.args;
|
|
96
|
+
const { info, enableClientSecret, federatedCredentials } = this.args;
|
|
90
97
|
const app = new azAd.Application(`${helpers_2.stackInfo.stack}-${this.name}`, {
|
|
91
98
|
...this.args,
|
|
92
99
|
...info,
|
|
@@ -104,11 +111,13 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
104
111
|
}
|
|
105
112
|
: undefined,
|
|
106
113
|
singlePageApplication: this.args.appType == 'singlePageApplication' ? { redirectUris: this.args.redirectUris } : undefined,
|
|
107
|
-
}, { ...this.opts, parent: this, ignoreChanges: ['tags'] });
|
|
108
|
-
const clientSecret =
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
114
|
+
}, { ...this.opts, parent: this, ignoreChanges: ['tags', 'identifierUris'] });
|
|
115
|
+
const clientSecret = enableClientSecret
|
|
116
|
+
? new azAd.ApplicationPassword(`${this.name}-client-secret`, {
|
|
117
|
+
displayName: this.name,
|
|
118
|
+
applicationId: app.id,
|
|
119
|
+
}, { dependsOn: app, parent: this })
|
|
120
|
+
: undefined;
|
|
112
121
|
if (federatedCredentials) {
|
|
113
122
|
federatedCredentials.map((f) => new azAd.ApplicationFederatedIdentityCredential(`${this.name}-federated-${f.name}`, {
|
|
114
123
|
applicationId: app.id,
|
|
@@ -123,10 +132,12 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
123
132
|
parent: this,
|
|
124
133
|
}));
|
|
125
134
|
}
|
|
126
|
-
return { app, clientSecret: clientSecret
|
|
135
|
+
return { app, clientSecret: clientSecret?.value };
|
|
127
136
|
}
|
|
128
137
|
createServicePrincipal(app) {
|
|
129
138
|
const { servicePrincipal } = this.args;
|
|
139
|
+
if (!servicePrincipal?.enable)
|
|
140
|
+
return undefined;
|
|
130
141
|
//Service Principal
|
|
131
142
|
const sp = new azAd.ServicePrincipal(`${this.name}-sp`, {
|
|
132
143
|
...servicePrincipal,
|
|
@@ -166,27 +177,16 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
166
177
|
memberObjectId: sv.objectId,
|
|
167
178
|
}, { dependsOn: sv, deletedWith: sv, parent: this })));
|
|
168
179
|
}
|
|
169
|
-
addSecrets(
|
|
180
|
+
addSecrets(secrets) {
|
|
170
181
|
if (!this.args.vaultInfo)
|
|
171
182
|
return;
|
|
172
183
|
const secret = new vault_1.VaultSecrets(this.name, {
|
|
173
184
|
vaultInfo: this.args.vaultInfo,
|
|
174
|
-
secrets
|
|
175
|
-
['client-id']: { value: clientId, contentType: `AppRegistration:${this.name} ` },
|
|
176
|
-
['client-secret']: { value: clientSecret, contentType: `AppRegistration:${this.name} ` },
|
|
177
|
-
['principal-id']: {
|
|
178
|
-
value: servicePrincipalId,
|
|
179
|
-
contentType: `AppRegistration:${this.name} `,
|
|
180
|
-
},
|
|
181
|
-
['principal-secret']: {
|
|
182
|
-
value: servicePrincipalPass,
|
|
183
|
-
contentType: `AppRegistration:${this.name} `,
|
|
184
|
-
},
|
|
185
|
-
},
|
|
185
|
+
secrets,
|
|
186
186
|
}, { dependsOn: this.opts?.dependsOn, parent: this });
|
|
187
187
|
this.vaultSecrets = secret.getOutputs();
|
|
188
188
|
return secret;
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
191
|
exports.AppRegistration = AppRegistration;
|
|
192
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AppRegistration.js","sourceRoot":"","sources":["../../src/azAd/AppRegistration.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const AppRegistration_1 = require("./AppRegistration");
|
|
|
11
11
|
function createCloudflareAzIdentity(name, props, opts = {}) {
|
|
12
12
|
return new AppRegistration_1.AppRegistration(`${name}-cloudflare-idp`, {
|
|
13
13
|
...props,
|
|
14
|
+
enableClientSecret: true,
|
|
14
15
|
appType: 'web',
|
|
15
16
|
redirectUris: [`https://${name}.cloudflareaccess.com/cdn-cgi/access/callback`],
|
|
16
17
|
implicitGrant: {
|
|
@@ -58,4 +59,4 @@ function createCloudflareAzIdentity(name, props, opts = {}) {
|
|
|
58
59
|
],
|
|
59
60
|
}, opts);
|
|
60
61
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xvdWRmbGFyZUF6SWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9DbG91ZGZsYXJlQXpJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVdBLGdFQTBEQztBQXJFRCx1REFBb0Q7QUFJcEQ7Ozs7O0dBS0c7QUFFSCxTQUFnQiwwQkFBMEIsQ0FDeEMsSUFBWSxFQUNaLEtBQTBCLEVBQzFCLE9BQXdDLEVBQUU7SUFFMUMsT0FBTyxJQUFJLGlDQUFlLENBQ3hCLEdBQUcsSUFBSSxpQkFBaUIsRUFDeEI7UUFDRSxHQUFHLEtBQUs7UUFDUixrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLE9BQU8sRUFBRSxLQUFLO1FBQ2QsWUFBWSxFQUFFLENBQUMsV0FBVyxJQUFJLCtDQUErQyxDQUFDO1FBQzlFLGFBQWEsRUFBRTtZQUNiLDBCQUEwQixFQUFFLElBQUk7WUFDaEMsc0JBQXNCLEVBQUUsSUFBSTtTQUM3QjtRQUNELHdCQUF3QixFQUFFO1lBQ3hCO2dCQUNFLGFBQWEsRUFBRSxzQ0FBc0M7Z0JBQ3JELGdCQUFnQixFQUFFO29CQUNoQjt3QkFDRSxFQUFFLEVBQUUsc0NBQXNDO3dCQUMxQyxJQUFJLEVBQUUsT0FBTztxQkFDZDtvQkFDRDt3QkFDRSxFQUFFLEVBQUUsc0NBQXNDO3dCQUMxQyxJQUFJLEVBQUUsT0FBTztxQkFDZDtvQkFDRDt3QkFDRSxFQUFFLEVBQUUsc0NBQXNDO3dCQUMxQyxJQUFJLEVBQUUsT0FBTztxQkFDZDtvQkFDRDt3QkFDRSxFQUFFLEVBQUUsc0NBQXNDO3dCQUMxQyxJQUFJLEVBQUUsT0FBTztxQkFDZDtvQkFDRDt3QkFDRSxFQUFFLEVBQUUsc0NBQXNDO3dCQUMxQyxJQUFJLEVBQUUsT0FBTztxQkFDZDtvQkFDRDt3QkFDRSxFQUFFLEVBQUUsc0NBQXNDO3dCQUMxQyxJQUFJLEVBQUUsT0FBTztxQkFDZDtvQkFDRDt3QkFDRSxFQUFFLEVBQUUsc0NBQXNDO3dCQUMxQyxJQUFJLEVBQUUsT0FBTztxQkFDZDtvQkFDRDt3QkFDRSxFQUFFLEVBQUUsc0NBQXNDO3dCQUMxQyxJQUFJLEVBQUUsTUFBTTtxQkFDYjtpQkFDRjthQUNGO1NBQ0Y7S0FDRixFQUNELElBQUksQ0FDTCxDQUFDO0FBQ0osQ0FBQyJ9
|
|
@@ -80,7 +80,7 @@ class UserAssignedIdentity extends base_1.BaseResourceComponent {
|
|
|
80
80
|
...rsGroup,
|
|
81
81
|
federatedIdentityCredentialResourceName: name,
|
|
82
82
|
audiences: ['api://AzureADTokenExchange'],
|
|
83
|
-
issuer: props.issuer ??
|
|
83
|
+
issuer: props.issuer ?? helpers_1.azureEnv.entraIdAuthorityUrl,
|
|
84
84
|
subject: props.subject,
|
|
85
85
|
resourceName: managedIdentity.name,
|
|
86
86
|
}, { dependsOn: managedIdentity, parent: this, deletedWith: managedIdentity }));
|
|
@@ -95,4 +95,4 @@ class UserAssignedIdentity extends base_1.BaseResourceComponent {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
exports.UserAssignedIdentity = UserAssignedIdentity;
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFzc2lnbmVkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9Vc2VyQXNzaWduZWRJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzREFBd0M7QUFDeEMsMEVBQTREO0FBQzVELHVEQUF5QztBQUV6QyxrQ0FBMEQ7QUFFMUQsd0NBQWlEO0FBVWpELE1BQWEsb0JBQXFCLFNBQVEsNEJBQStDO0lBQ3ZFLFlBQVksQ0FBd0I7SUFDcEMsaUJBQWlCLENBQXdCO0lBQ3pDLEVBQUUsQ0FBd0I7SUFDMUIsUUFBUSxDQUF3QjtJQUNoQyxXQUFXLENBQXdCO0lBRW5ELFlBQVksSUFBWSxFQUFFLElBQThCLEVBQUUsSUFBc0M7UUFDOUYsS0FBSyxDQUFDLHNCQUFzQixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDaEQsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQztRQUV6QixNQUFNLGVBQWUsR0FBRyxJQUFJLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLE9BQU8sRUFBRSxFQUFFLEVBQUUsR0FBRyxJQUFJLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFdEcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBRXhDLElBQUksQ0FBQyxVQUFVLENBQUM7WUFDZCxDQUFDLFFBQVEsQ0FBQyxFQUFFLGVBQWUsQ0FBQyxFQUFFO1lBQzlCLENBQUMsY0FBYyxDQUFDLEVBQUUsZUFBZSxDQUFDLFFBQVE7WUFDMUMsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLGVBQWUsQ0FBQyxXQUFXO1NBQ2pELENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxFQUFFLEdBQUcsZUFBZSxDQUFDLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUMs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
|
package/database/AzSql.d.ts
CHANGED
|
@@ -30,7 +30,7 @@ export type AzSqlDbType = Omit<sql.DatabaseArgs, 'resourceGroupName' | 'serverNa
|
|
|
30
30
|
};
|
|
31
31
|
export interface AzSqlArgs extends CommonBaseArgs, types.WithEncryptionEnabler, Partial<Pick<sql.ServerArgs, 'administratorLogin' | 'federatedClientId' | 'isIPv6Enabled' | 'restrictOutboundNetworkAccess' | 'version'>> {
|
|
32
32
|
administrators?: {
|
|
33
|
-
azureAdOnlyAuthentication
|
|
33
|
+
azureAdOnlyAuthentication: boolean;
|
|
34
34
|
useDefaultUAssignedIdForConnection?: boolean;
|
|
35
35
|
additionalUAssigneds?: Record<string, pulumi.Input<string>>;
|
|
36
36
|
adminGroup: {
|
package/database/MySql.d.ts
CHANGED
package/database/Postgres.d.ts
CHANGED
package/database/Redis.d.ts
CHANGED
|
@@ -3,8 +3,22 @@ import * as redis from '@pulumi/azure-native/redis';
|
|
|
3
3
|
import * as vnet from '../vnet';
|
|
4
4
|
import { PrivateEndpointType } from '../vnet';
|
|
5
5
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
6
|
-
export interface RedisArgs extends CommonBaseArgs, Partial<Pick<redis.RedisArgs, '
|
|
7
|
-
|
|
6
|
+
export interface RedisArgs extends CommonBaseArgs, Partial<Pick<redis.RedisArgs, 'zones' | 'redisVersion' | 'replicasPerMaster' | 'replicasPerPrimary' | 'tenantSettings' | 'redisConfiguration'>>, Partial<Pick<redis.PatchScheduleArgs, 'scheduleEntries'>> {
|
|
7
|
+
sku: {
|
|
8
|
+
/**
|
|
9
|
+
* The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4).
|
|
10
|
+
*/
|
|
11
|
+
capacity: pulumi.Input<number>;
|
|
12
|
+
/**
|
|
13
|
+
* The SKU family to use. Valid values: (C, P). (C = Basic/Standard, P = Premium).
|
|
14
|
+
*/
|
|
15
|
+
family: 'C' | 'P';
|
|
16
|
+
/**
|
|
17
|
+
* The type of Redis cache to deploy. Valid values: (Basic, Standard, Premium)
|
|
18
|
+
*/
|
|
19
|
+
name: 'Basic' | 'Standard' | 'Premium';
|
|
20
|
+
};
|
|
21
|
+
disableAccessKeyAuthentication: boolean;
|
|
8
22
|
additionalUserAssignedIds?: Array<{
|
|
9
23
|
name: string;
|
|
10
24
|
accessPolicy: 'Data Owner' | 'Data Contributor' | 'Data Reader';
|
package/database/Redis.js
CHANGED
|
@@ -67,10 +67,11 @@ class Redis extends base_1.BaseResourceComponent {
|
|
|
67
67
|
}
|
|
68
68
|
createRedis() {
|
|
69
69
|
const { rsGroup, enableResourceIdentity, network, lock, defaultUAssignedId, ...props } = this.args;
|
|
70
|
+
const sku = props.sku ?? { name: 'Basic', family: 'C', capacity: 0 };
|
|
70
71
|
return new redis.Redis(this.name, {
|
|
71
72
|
...props,
|
|
72
73
|
...rsGroup,
|
|
73
|
-
sku
|
|
74
|
+
sku,
|
|
74
75
|
redisVersion: props.redisVersion ?? '6.0',
|
|
75
76
|
minimumTlsVersion: '1.2',
|
|
76
77
|
enableNonSslPort: false,
|
|
@@ -78,7 +79,7 @@ class Redis extends base_1.BaseResourceComponent {
|
|
|
78
79
|
staticIP: network?.staticIP,
|
|
79
80
|
publicNetworkAccess: network?.privateLink ? 'Disabled' : 'Enabled',
|
|
80
81
|
updateChannel: redis.UpdateChannel.Stable,
|
|
81
|
-
zones: helpers_2.zoneHelper.getDefaultZones(props.zones),
|
|
82
|
+
zones: sku.name === 'Premium' ? helpers_2.zoneHelper.getDefaultZones(props.zones) : undefined,
|
|
82
83
|
identity: enableResourceIdentity
|
|
83
84
|
? {
|
|
84
85
|
type: defaultUAssignedId
|
|
@@ -195,4 +196,4 @@ class Redis extends base_1.BaseResourceComponent {
|
|
|
195
196
|
}
|
|
196
197
|
}
|
|
197
198
|
exports.Redis = Redis;
|
|
198
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
199
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Redis.js","sourceRoot":"","sources":["../../src/database/Redis.ts"],"names":[],"mappings":"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"}
|
package/helpers/azureEnv.d.ts
CHANGED
|
@@ -80,6 +80,7 @@ export declare const isGlobal: boolean;
|
|
|
80
80
|
* @description Current environment value
|
|
81
81
|
*/
|
|
82
82
|
export declare const currentEnv: Environments;
|
|
83
|
+
export declare const entraIdAuthorityUrl: pulumi.Output<string>;
|
|
83
84
|
/**
|
|
84
85
|
* @constant {string[]} defaultAzurePorts
|
|
85
86
|
* @description List of default Azure ports commonly used in network security rules
|
package/helpers/azureEnv.js
CHANGED
|
@@ -37,7 +37,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
37
37
|
};
|
|
38
38
|
})();
|
|
39
39
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
40
|
-
exports.defaultAzurePorts = exports.currentEnv = exports.isGlobal = exports.isPrd = exports.isSandbox = exports.isDev = exports.isEnv = exports.defaultSubScope = exports.currentCountryCode = exports.currentRegionCode = exports.currentRegionName = exports.currentPrincipal = exports.subscriptionId = exports.tenantId = exports.Environments = void 0;
|
|
40
|
+
exports.defaultAzurePorts = exports.entraIdAuthorityUrl = exports.currentEnv = exports.isGlobal = exports.isPrd = exports.isSandbox = exports.isDev = exports.isEnv = exports.defaultSubScope = exports.currentCountryCode = exports.currentRegionCode = exports.currentRegionName = exports.currentPrincipal = exports.subscriptionId = exports.tenantId = exports.Environments = void 0;
|
|
41
41
|
const azure_native_1 = require("@pulumi/azure-native");
|
|
42
42
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
43
43
|
const Location_1 = require("./Location");
|
|
@@ -157,6 +157,7 @@ pulumi.all([exports.subscriptionId, exports.tenantId, exports.currentPrincipal])
|
|
|
157
157
|
currentEnv: exports.currentEnv,
|
|
158
158
|
});
|
|
159
159
|
});
|
|
160
|
+
exports.entraIdAuthorityUrl = pulumi.interpolate `https://login.microsoftonline.com/${exports.tenantId}/v2.0`;
|
|
160
161
|
/**
|
|
161
162
|
* @constant {string[]} defaultAzurePorts
|
|
162
163
|
* @description List of default Azure ports commonly used in network security rules
|
|
@@ -193,4 +194,4 @@ exports.defaultAzurePorts = [
|
|
|
193
194
|
'9000',
|
|
194
195
|
'10255',
|
|
195
196
|
];
|
|
196
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
197
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp1cmVFbnYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGVscGVycy9henVyZUVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7OztHQUdHOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFSCx1REFBcUQ7QUFDckQsdURBQXlDO0FBQ3pDLHlDQUEyRDtBQUMzRCx5Q0FBbUM7QUFFbkM7OztHQUdHO0FBQ0gsSUFBWSxZQUtYO0FBTEQsV0FBWSxZQUFZO0lBQ3RCLGlDQUFpQixDQUFBO0lBQ2pCLDJCQUFXLENBQUE7SUFDWCxtQ0FBbUIsQ0FBQTtJQUNuQiwyQkFBVyxDQUFBO0FBQ2IsQ0FBQyxFQUxXLFlBQVksNEJBQVosWUFBWSxRQUt2QjtBQUVEOzs7R0FHRztBQUNILE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLElBQUksSUFBSSxDQUFDLENBQUM7QUFFNUQ7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLEdBQUcsNEJBQWEsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO0FBRXJEOzs7R0FHRztBQUNVLFFBQUEsUUFBUSxHQUFHLEtBQUssQ0FBQyw4QkFBOEIsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUM7QUFFakY7OztHQUdHO0FBQ1UsUUFBQSxjQUFjLEdBQUcsS0FBSyxDQUFDLG9DQUFvQyxDQUFDLElBQUksTUFBTSxDQUFDLGNBQWMsQ0FBQztBQUVuRzs7O0dBR0c7QUFDVSxRQUFBLGdCQUFnQixHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUM7QUFFaEQ7OztHQUdHO0FBQ1UsUUFBQSxpQkFBaUIsR0FBRyxDQUFDLEtBQUssQ0FBQyw4QkFBOEIsQ0FBQyxJQUFJLGVBQWUsQ0FBVyxDQUFDO0FBRXRHOzs7R0FHRztBQUNVLFFBQUEsaUJBQWlCLEdBQUcsSUFBQSx3QkFBYSxFQUFDLHlCQUFpQixDQUFDLENBQUM7QUFFbEU7OztHQUdHO0FBQ1UsUUFBQSxrQkFBa0IsR0FBRyxJQUFBLHlCQUFjLEVBQUMseUJBQWlCLENBQUMsQ0FBQztBQUVwRTs7O0dBR0c7QUFDVSxRQUFBLGVBQWUsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFBLGtCQUFrQixzQkFBYyxFQUFFLENBQUM7QUFFcEY7Ozs7O0dBS0c7QUFDSSxNQUFNLEtBQUssR0FBRyxDQUFDLEdBQWlCLEVBQUUsRUFBRSxDQUFDLGdCQUFLLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQW5ELFFBQUEsS0FBSyxTQUE4QztBQUVoRTs7O0dBR0c7QUFDVSxRQUFBLEtBQUssR0FBRyxJQUFBLGFBQUssRUFBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUM7QUFFN0M7OztHQUdHO0FBQ1UsUUFBQSxTQUFTLEdBQUcsSUFBQSxhQUFLLEVBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRXJEOzs7R0FHRztBQUNVLFFBQUEsS0FBSyxHQUFHLElBQUEsYUFBSyxFQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUU3Qzs7O0dBR0c7QUFDVSxRQUFBLFFBQVEsR0FBRyxJQUFBLGFBQUssRUFBQyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUM7QUFFbkQ7Ozs7R0FJRztBQUNILFNBQVMsYUFBYTtJQUNwQixJQUFJLGdCQUFRO1FBQUUsT0FBTyxZQUFZLENBQUMsTUFBTSxDQUFDO0lBQ3pDLElBQUksYUFBSztRQUFFLE9BQU8sWUFBWSxDQUFDLEdBQUcsQ0FBQztJQUNuQyxJQUFJLGlCQUFTO1FBQUUsT0FBTyxZQUFZLENBQUMsT0FBTyxDQUFDO0lBQzNDLE9BQU8sWUFBWSxDQUFDLEdBQUcsQ0FBQztBQUMxQixDQUFDO0FBRUQ7OztHQUdHO0FBQ1UsUUFBQSxVQUFVLEdBQUcsYUFBYSxFQUFFLENBQUM7QUFFMUMsaUJBQWlCO0FBQ2pCLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxzQkFBYyxFQUFFLGdCQUFRLEVBQUUsd0JBQWdCLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO0lBQzNFLE9BQU8sQ0FBQyxHQUFHLENBQUMsb0JBQW9CLEVBQUU7UUFDaEMsUUFBUSxFQUFFLENBQUM7UUFDWCxjQUFjLEVBQUUsQ0FBQztRQUNqQixXQUFXLEVBQUUsQ0FBQztRQUNkLGlCQUFpQixFQUFqQix5QkFBaUI7UUFDakIsaUJBQWlCLEVBQWpCLHlCQUFpQjtRQUNqQixrQkFBa0IsRUFBbEIsMEJBQWtCO1FBQ2xCLFVBQVUsRUFBVixrQkFBVTtLQUNYLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyxDQUFDO0FBRVUsUUFBQSxtQkFBbUIsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFBLHFDQUFxQyxnQkFBUSxPQUFPLENBQUM7QUFFMUc7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtCRztBQUNVLFFBQUEsaUJBQWlCLEdBQUc7SUFDL0IsSUFBSTtJQUNKLEtBQUs7SUFDTCxLQUFLO0lBQ0wsTUFBTTtJQUNOLE1BQU07SUFDTixNQUFNO0lBQ04sTUFBTTtJQUNOLE1BQU07SUFDTixNQUFNO0lBQ04sTUFBTTtJQUNOLE1BQU07SUFDTixNQUFNO0lBQ04sTUFBTTtJQUNOLE1BQU07SUFDTixPQUFPO0NBQ1IsQ0FBQyJ9
|
package/package.json
CHANGED
package/services/ServiceBus.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import * as types from '../types';
|
|
|
4
4
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
5
5
|
type SubscriptionsType = Record<string, Omit<bus.SubscriptionArgs, 'namespaceName' | 'topicName' | 'subscriptionName' | 'resourceGroupName' | 'status'>>;
|
|
6
6
|
export interface ServiceBusArgs extends CommonBaseArgs, types.WithEncryptionEnabler, types.WithNetworkArgs, Partial<Pick<bus.NamespaceArgs, 'sku' | 'zoneRedundant' | 'alternateName' | 'premiumMessagingPartitions'>> {
|
|
7
|
-
disableLocalAuth
|
|
7
|
+
disableLocalAuth: boolean;
|
|
8
8
|
sku: {
|
|
9
9
|
/**
|
|
10
10
|
* Messaging units for your service bus premium namespace. Valid capacities are {1, 2, 4, 8, 16} multiples of your properties.premiumMessagingPartitions setting. For example, If properties.premiumMessagingPartitions is 1 then possible capacity values are 1, 2, 4, 8, and 16. If properties.premiumMessagingPartitions is 4 then possible capacity values are 4, 8, 16, 32 and 64
|
package/vault/VaultSecrets.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as pulumi from '@pulumi/pulumi';
|
|
2
2
|
import { SecretItemArgs } from './VaultSecret';
|
|
3
|
-
import { BaseComponent } from '../base
|
|
3
|
+
import { BaseComponent } from '../base';
|
|
4
4
|
import { WithVaultInfo } from '../types';
|
|
5
5
|
export type VaultSecretResult = {
|
|
6
6
|
id: pulumi.Output<string>;
|
package/vault/VaultSecrets.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.VaultSecrets = void 0;
|
|
4
4
|
const VaultSecret_1 = require("./VaultSecret");
|
|
5
|
-
const
|
|
5
|
+
const base_1 = require("../base");
|
|
6
6
|
const helpers_1 = require("../base/helpers");
|
|
7
|
-
class VaultSecrets extends
|
|
7
|
+
class VaultSecrets extends base_1.BaseComponent {
|
|
8
8
|
results = {};
|
|
9
9
|
constructor(name, args, opts) {
|
|
10
10
|
super((0, helpers_1.getComponentResourceType)('VaultSecrets'), name, args, opts);
|
|
@@ -26,4 +26,4 @@ class VaultSecrets extends BaseComponent_1.BaseComponent {
|
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
exports.VaultSecrets = VaultSecrets;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVmF1bHRTZWNyZXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ZhdWx0L1ZhdWx0U2VjcmV0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSwrQ0FBNEQ7QUFFNUQsa0NBQXdDO0FBRXhDLDZDQUEyRDtBQVkzRCxNQUFhLFlBQWEsU0FBUSxvQkFBK0I7SUFDL0MsT0FBTyxHQUVuQixFQUFFLENBQUM7SUFFUCxZQUFZLElBQVksRUFBRSxJQUFzQixFQUFFLElBQXNDO1FBQ3RGLEtBQUssQ0FBQyxJQUFBLGtDQUF3QixFQUFDLGNBQWMsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFbEUsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDeEMsTUFBTSxNQUFNLEdBQUcsSUFBSSx5QkFBVyxDQUM1QixHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxJQUFJLEdBQUcsRUFBRSxFQUMzQztnQkFDRSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDO2dCQUNwQixTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVM7YUFDMUIsRUFDRCxJQUFJLENBQ0wsQ0FBQztZQUVGLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUc7Z0JBQ2xCLEVBQUUsRUFBRSxNQUFNLENBQUMsRUFBRTtnQkFDYixRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVE7Z0JBQ3pCLE9BQU8sRUFBRSxNQUFNLENBQUMsT0FBTzthQUN4QixDQUFDO1FBQ0osQ0FBQyxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztDQUNGO0FBL0JELG9DQStCQyJ9
|
package/vnet/PrivateDnsZone.js
CHANGED
|
@@ -98,14 +98,14 @@ 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(`${this._rsName}-${vnetName}
|
|
101
|
+
return new privateDns.VirtualNetworkLink(helpers.ensureLength(`${this._rsName}-${vnetName}`), {
|
|
102
102
|
...group,
|
|
103
103
|
privateZoneName: zone.name,
|
|
104
104
|
registrationEnabled: false,
|
|
105
105
|
virtualNetwork: { id: v.vnetId },
|
|
106
|
-
}, { dependsOn: zone, deletedWith: zone, parent: this });
|
|
106
|
+
}, { dependsOn: zone, deletedWith: zone, deleteBeforeReplace: true, parent: this });
|
|
107
107
|
}));
|
|
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,3 +16,4 @@ 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,11 +33,12 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.getPrivateRecordSetOutput = exports.defaultRouteRules = exports.defaultServicesEndpoints = exports.AzureSubnetNames = void 0;
|
|
36
|
+
exports.ensureLength = 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"));
|
|
41
42
|
function getVnetIdFromSubnetId(subnetId) {
|
|
42
43
|
//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
|
|
43
44
|
return subnetId.split('/subnets')[0];
|
|
@@ -82,4 +83,10 @@ const getPrivateRecordSetOutput = (args) => {
|
|
|
82
83
|
return privateDns.getPrivateRecordSetOutput(args);
|
|
83
84
|
};
|
|
84
85
|
exports.getPrivateRecordSetOutput = getPrivateRecordSetOutput;
|
|
85
|
-
|
|
86
|
+
const ensureLength = (input, length = 55) => {
|
|
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=
|