@drunk-pulumi/azure-components 1.1.5 → 1.1.7
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 +123 -0
- package/AppResources.js +146 -0
- package/aks/AzKubernetes.d.ts +2 -1
- package/aks/AzKubernetes.js +46 -11
- package/aks/ContainerRegistry.js +14 -12
- package/aks/helpers.d.ts +7 -3
- package/aks/helpers.js +19 -6
- package/apim/Apim.d.ts +1 -1
- package/apim/Apim.js +12 -10
- package/app/AppConfig.d.ts +1 -1
- package/app/AppConfig.js +12 -10
- package/app/AppContainer.d.ts +1 -2
- package/app/AppContainer.js +10 -8
- package/app/AppContainerEnv.d.ts +1 -1
- package/app/AppContainerEnv.js +10 -8
- package/app/IoTHub.d.ts +1 -2
- package/app/IoTHub.js +10 -8
- package/app/LogicApp.d.ts +1 -2
- package/app/LogicApp.js +10 -8
- package/app/SignalR.d.ts +1 -1
- package/app/SignalR.js +3 -3
- package/azAd/AppRegistration.d.ts +8 -0
- package/azAd/AppRegistration.js +19 -2
- package/azAd/UserAssignedIdentity.d.ts +4 -6
- package/azAd/UserAssignedIdentity.js +7 -1
- package/base/BaseResourceComponent.d.ts +12 -12
- package/base/BaseResourceComponent.js +19 -19
- package/database/AzSql.d.ts +2 -2
- package/database/AzSql.js +10 -8
- package/database/MySql.d.ts +2 -2
- package/database/MySql.js +14 -12
- package/database/Postgres.d.ts +2 -2
- package/database/Postgres.js +12 -10
- package/database/Redis.d.ts +3 -4
- package/database/Redis.js +10 -8
- package/index.d.ts +3 -2
- package/index.js +6 -5
- package/package.json +2 -2
- package/services/Automation.js +8 -6
- package/services/AzSearch.d.ts +1 -1
- package/services/AzSearch.js +9 -7
- package/services/ServiceBus.d.ts +1 -1
- package/services/ServiceBus.js +11 -9
- package/storage/StorageAccount.d.ts +1 -1
- package/storage/StorageAccount.js +10 -8
- package/types.d.ts +5 -0
- package/vault/KeyVault.d.ts +2 -2
- package/vault/KeyVault.js +1 -1
- package/vm/DiskEncryptionSet.d.ts +1 -2
- package/vm/DiskEncryptionSet.js +10 -8
- package/vm/VirtualMachine.d.ts +1 -1
- package/vm/VirtualMachine.js +10 -8
- package/vnet/AzCdn.d.ts +1 -1
- package/vnet/AzCdn.js +7 -6
- package/vnet/Basion.d.ts +1 -1
- package/vnet/Basion.js +3 -3
- package/vnet/DnsZone.d.ts +3 -3
- package/vnet/DnsZone.js +26 -26
- package/vnet/PrivateEndpoint.d.ts +1 -1
- package/vnet/PrivateEndpoint.js +3 -3
- package/vnet/RouteTable.d.ts +2 -2
- package/vnet/RouteTable.js +3 -3
- package/vnet/VpnGateway.d.ts +1 -1
- package/vnet/VpnGateway.js +3 -3
package/azAd/AppRegistration.js
CHANGED
|
@@ -55,6 +55,7 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
55
55
|
clientSecret;
|
|
56
56
|
servicePrincipalId;
|
|
57
57
|
servicePrincipalPassword;
|
|
58
|
+
applicationId;
|
|
58
59
|
vaultSecrets = {};
|
|
59
60
|
constructor(name, args = { appType: 'native' }, opts) {
|
|
60
61
|
super((0, helpers_1.getComponentResourceType)('AppRegistration'), name, args, opts);
|
|
@@ -66,6 +67,7 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
66
67
|
this.clientId = app.clientId;
|
|
67
68
|
this.clientSecret = clientSecret;
|
|
68
69
|
this.tenantId = helpers_2.azureEnv.tenantId;
|
|
70
|
+
this.applicationId = app.id;
|
|
69
71
|
this.addSecrets({
|
|
70
72
|
clientId: app.clientId,
|
|
71
73
|
clientSecret: clientSecret,
|
|
@@ -80,10 +82,11 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
80
82
|
clientId: this.clientId,
|
|
81
83
|
servicePrincipalId: this.servicePrincipalId,
|
|
82
84
|
vaultSecrets: this.vaultSecrets,
|
|
85
|
+
applicationId: this.applicationId,
|
|
83
86
|
};
|
|
84
87
|
}
|
|
85
88
|
createAppRegistration() {
|
|
86
|
-
const { info } = this.args;
|
|
89
|
+
const { info, federatedCredentials } = this.args;
|
|
87
90
|
const app = new azAd.Application(`${helpers_2.stackInfo.stack}-${this.name}`, {
|
|
88
91
|
...this.args,
|
|
89
92
|
...info,
|
|
@@ -106,6 +109,20 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
106
109
|
displayName: this.name,
|
|
107
110
|
applicationId: app.id,
|
|
108
111
|
}, { dependsOn: app, parent: this });
|
|
112
|
+
if (federatedCredentials) {
|
|
113
|
+
federatedCredentials.map((f) => new azAd.ApplicationFederatedIdentityCredential(`${this.name}-federated-${f.name}`, {
|
|
114
|
+
applicationId: app.id,
|
|
115
|
+
displayName: f.name,
|
|
116
|
+
description: f.name,
|
|
117
|
+
issuer: f.issuer,
|
|
118
|
+
subject: f.subject,
|
|
119
|
+
audiences: f.audiences ?? ['api://AzureADTokenExchange'],
|
|
120
|
+
}, {
|
|
121
|
+
dependsOn: app,
|
|
122
|
+
retainOnDelete: true,
|
|
123
|
+
parent: this,
|
|
124
|
+
}));
|
|
125
|
+
}
|
|
109
126
|
return { app, clientSecret: clientSecret.value };
|
|
110
127
|
}
|
|
111
128
|
createServicePrincipal(app) {
|
|
@@ -172,4 +189,4 @@ class AppRegistration extends base_1.BaseComponent {
|
|
|
172
189
|
}
|
|
173
190
|
}
|
|
174
191
|
exports.AppRegistration = AppRegistration;
|
|
175
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AppRegistration.js","sourceRoot":"","sources":["../../src/azAd/AppRegistration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwC;AACxC,uDAAyC;AAEzC,qDAAsE;AAGtE,kCAAwC;AACxC,oCAAwC;AACxC,6CAA2D;AAC3D,wCAAiD;AAEjD,IAAY,0BAMX;AAND,WAAY,0BAA0B;IACpC,2CAAa,CAAA;IACb,6DAA+B,CAAA;IAC/B,6DAA+B,CAAA;IAC/B,mEAAqC,CAAA;IACrC,yCAAW,CAAA;AACb,CAAC,EANW,0BAA0B,0CAA1B,0BAA0B,QAMrC;AAuDD,MAAa,eAAgB,SAAQ,oBAAkC;IACrD,QAAQ,CAAwB;IAChC,QAAQ,CAAwB;IAChC,YAAY,CAAwB;IACpC,kBAAkB,CAAwB;IAC1C,wBAAwB,CAAwB;IAChD,aAAa,CAAwB;IAC7C,YAAY,GAA2C,EAAE,CAAC;IAElE,YAAY,IAAY,EAAE,OAA4B,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,IAAsC;QACjH,KAAK,CAAC,IAAA,kCAAwB,EAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAErE,aAAa;QACb,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3D,MAAM,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;QAE5C,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAAC;QAChD,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC,wBAAwB,CAAC;QAC5D,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,kBAAQ,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,EAAE,CAAC;QAE5B,IAAI,CAAC,UAAU,CAAC;YACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,YAAY,EAAE,YAAY;YAC1B,kBAAkB,EAAE,EAAE,CAAC,kBAAkB;YACzC,oBAAoB,EAAE,EAAE,CAAC,wBAAwB;SAClD,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEM,UAAU;QACf,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;IACJ,CAAC;IAEO,qBAAqB;QAC3B,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAEjD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,WAAW,CAC9B,GAAG,mBAAS,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE,EACjC;YACE,GAAG,IAAI,CAAC,IAAI;YACZ,GAAG,IAAI;YACP,WAAW,EAAE,IAAI,EAAE,WAAW,IAAI,GAAG,mBAAS,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE;YACnE,WAAW,EAAE,IAAI,EAAE,WAAW,IAAI,GAAG,mBAAS,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,EAAE;YACnE,qBAAqB,EAAE,IAAI;YAC3B,cAAc,EAAE,cAAc;YAE9B,cAAc;YACd,GAAG,EACD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK;gBACxB,CAAC,CAAC;oBACE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;oBACpC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;oBAC9B,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa;oBACtC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;iBACnC;gBACH,CAAC,CAAC,SAAS;YACf,qBAAqB,EACnB,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,uBAAuB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS;SACtG,EACD,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,MAAM,CAAC,EAAE,CACxD,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,mBAAmB,CAC/C,GAAG,IAAI,CAAC,IAAI,gBAAgB,EAC5B;YACE,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,aAAa,EAAE,GAAG,CAAC,EAAE;SACtB,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CACjC,CAAC;QAEF,IAAI,oBAAoB,EAAE,CAAC;YACzB,oBAAoB,CAAC,GAAG,CACtB,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,IAAI,CAAC,sCAAsC,CAC7C,GAAG,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC,IAAI,EAAE,EAClC;gBACE,aAAa,EAAE,GAAG,CAAC,EAAE;gBACrB,WAAW,EAAE,CAAC,CAAC,IAAI;gBACnB,WAAW,EAAE,CAAC,CAAC,IAAI;gBACnB,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,4BAA4B,CAAC;aACzD,EACD;gBACE,SAAS,EAAE,GAAG;gBACd,cAAc,EAAE,IAAI;gBACpB,MAAM,EAAE,IAAI;aACb,CACF,CACJ,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC;IACnD,CAAC;IAEO,sBAAsB,CAAC,GAAqB;QAClD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACvC,mBAAmB;QACnB,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAClC,GAAG,IAAI,CAAC,IAAI,KAAK,EACjB;YACE,GAAG,gBAAgB;YACnB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SACzB,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CACnD,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,wBAAwB,CAC9C,GAAG,IAAI,CAAC,IAAI,UAAU,EACtB;YACE,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,kBAAkB,EAAE,MAAM,CAAC,WAAW,CAAA,sBAAsB,EAAE,CAAC,QAAQ,EAAE;SAC1E,EACD,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC;QAEF,IAAI,gBAAgB,EAAE,gBAAgB,EAAE,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC9D,GAAG,CAAC,GAAG,CACL,CAAC,EAAE,EAAE,EAAE,CACL,IAAI,IAAI,CAAC,iBAAiB,CACxB,GAAG,IAAI,CAAC,IAAI,eAAe,EAAE,EAAE,EAC/B;gBACE,SAAS,EAAE,sCAAsC;gBACjD,gBAAgB,EAAE,EAAE,CAAC,QAAQ;gBAC7B,iBAAiB,EAAE,EAAE;aACtB,EACD,EAAE,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CACtD,CACJ,CACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAErB,OAAO;YACL,kBAAkB,EAAE,EAAE,CAAC,EAAE;YACzB,wBAAwB,EAAE,MAAM,CAAC,KAAK;SACvC,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,EAAyB;QAClD,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,eAAe;YAAE,OAAO;QAE7B,OAAO,eAAe,CAAC,GAAG,CACxB,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,+BAAc,CAChB,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,EAC/B,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,kBAAkB,EAAE,EACxE,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CACjD,CACJ,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,EAAyB;QAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAChC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CACxB,CAAC,EAAE,EAAE,EAAE,CACL,IAAI,IAAI,CAAC,WAAW,CAClB,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,QAAQ,EAAE,EAC7B;YACE,aAAa,EAAE,EAAE,CAAC,QAAQ;YAC1B,cAAc,EAAE,EAAE,CAAC,QAAQ;SAC5B,EACD,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CACjD,CACJ,CACF,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,EACjB,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,oBAAoB,GAMrB;QACC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,OAAO;QACjC,MAAM,MAAM,GAAG,IAAI,oBAAY,CAC7B,IAAI,CAAC,IAAI,EACT;YACE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC9B,OAAO,EAAE;gBACP,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,IAAI,CAAC,IAAI,GAAG,EAAE;gBAChF,CAAC,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,mBAAmB,IAAI,CAAC,IAAI,GAAG,EAAE;gBACxF,CAAC,cAAc,CAAC,EAAE;oBAChB,KAAK,EAAE,kBAAkB;oBACzB,WAAW,EAAE,mBAAmB,IAAI,CAAC,IAAI,GAAG;iBAC7C;gBACD,CAAC,kBAAkB,CAAC,EAAE;oBACpB,KAAK,EAAE,oBAAoB;oBAC3B,WAAW,EAAE,mBAAmB,IAAI,CAAC,IAAI,GAAG;iBAC7C;aACF;SACF,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA3ND,0CA2NC"}
|
|
@@ -1,20 +1,18 @@
|
|
|
1
1
|
import * as mid from '@pulumi/azure-native/managedidentity';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import { BaseArgs, BaseResourceComponent } from '../base';
|
|
4
|
-
import { WithMemberOfArgs, WithResourceGroupInputs } from '../types';
|
|
4
|
+
import { UserAssignedIdentityOutputs, WithMemberOfArgs, WithResourceGroupInputs } from '../types';
|
|
5
5
|
export interface UserAssignedIdentityArgs extends Omit<BaseArgs, 'groupRoles'>, WithMemberOfArgs, WithResourceGroupInputs {
|
|
6
6
|
federations?: Record<string, Partial<Pick<mid.FederatedIdentityCredentialArgs, 'issuer'>> & Pick<mid.FederatedIdentityCredentialArgs, 'subject'>>;
|
|
7
7
|
}
|
|
8
8
|
export declare class UserAssignedIdentity extends BaseResourceComponent<UserAssignedIdentityArgs> {
|
|
9
|
+
readonly resourceName: pulumi.Output<string>;
|
|
10
|
+
readonly resourceGroupName: pulumi.Output<string>;
|
|
9
11
|
readonly id: pulumi.Output<string>;
|
|
10
12
|
readonly clientId: pulumi.Output<string>;
|
|
11
13
|
readonly principalId: pulumi.Output<string>;
|
|
12
14
|
constructor(name: string, args: UserAssignedIdentityArgs, opts?: pulumi.ComponentResourceOptions);
|
|
13
|
-
getOutputs():
|
|
14
|
-
id: pulumi.Output<string>;
|
|
15
|
-
clientId: pulumi.Output<string>;
|
|
16
|
-
principalId: pulumi.Output<string>;
|
|
17
|
-
};
|
|
15
|
+
getOutputs(): UserAssignedIdentityOutputs;
|
|
18
16
|
private createFederations;
|
|
19
17
|
private addMemberOf;
|
|
20
18
|
}
|
|
@@ -40,6 +40,8 @@ const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
|
40
40
|
const base_1 = require("../base");
|
|
41
41
|
const helpers_1 = require("../helpers");
|
|
42
42
|
class UserAssignedIdentity extends base_1.BaseResourceComponent {
|
|
43
|
+
resourceName;
|
|
44
|
+
resourceGroupName;
|
|
43
45
|
id;
|
|
44
46
|
clientId;
|
|
45
47
|
principalId;
|
|
@@ -54,6 +56,8 @@ class UserAssignedIdentity extends base_1.BaseResourceComponent {
|
|
|
54
56
|
['uid-principalId']: managedIdentity.principalId,
|
|
55
57
|
});
|
|
56
58
|
this.id = managedIdentity.id;
|
|
59
|
+
this.resourceName = managedIdentity.name;
|
|
60
|
+
this.resourceGroupName = pulumi.output(args.rsGroup.resourceGroupName);
|
|
57
61
|
this.clientId = managedIdentity.clientId;
|
|
58
62
|
this.principalId = managedIdentity.principalId;
|
|
59
63
|
this.addMemberOf(managedIdentity);
|
|
@@ -62,6 +66,8 @@ class UserAssignedIdentity extends base_1.BaseResourceComponent {
|
|
|
62
66
|
getOutputs() {
|
|
63
67
|
return {
|
|
64
68
|
id: this.id,
|
|
69
|
+
resourceName: this.resourceName,
|
|
70
|
+
resourceGroupName: this.resourceGroupName,
|
|
65
71
|
clientId: this.clientId,
|
|
66
72
|
principalId: this.principalId,
|
|
67
73
|
};
|
|
@@ -89,4 +95,4 @@ class UserAssignedIdentity extends base_1.BaseResourceComponent {
|
|
|
89
95
|
}
|
|
90
96
|
}
|
|
91
97
|
exports.UserAssignedIdentity = UserAssignedIdentity;
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFzc2lnbmVkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXpBZC9Vc2VyQXNzaWduZWRJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzREFBd0M7QUFDeEMsMEVBQTREO0FBQzVELHVEQUF5QztBQUV6QyxrQ0FBMEQ7QUFFMUQsd0NBQWlEO0FBVWpELE1BQWEsb0JBQXFCLFNBQVEsNEJBQStDO0lBQ3ZFLFlBQVksQ0FBd0I7SUFDcEMsaUJBQWlCLENBQXdCO0lBQ3pDLEVBQUUsQ0FBd0I7SUFDMUIsUUFBUSxDQUF3QjtJQUNoQyxXQUFXLENBQXdCO0lBRW5ELFlBQVksSUFBWSxFQUFFLElBQThCLEVBQUUsSUFBc0M7UUFDOUYsS0FBSyxDQUFDLHNCQUFzQixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDaEQsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQztRQUV6QixNQUFNLGVBQWUsR0FBRyxJQUFJLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsRUFBRSxHQUFHLE9BQU8sRUFBRSxFQUFFLEVBQUUsR0FBRyxJQUFJLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFdEcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBRXhDLElBQUksQ0FBQyxVQUFVLENBQUM7WUFDZCxDQUFDLFFBQVEsQ0FBQyxFQUFFLGVBQWUsQ0FBQyxFQUFFO1lBQzlCLENBQUMsY0FBYyxDQUFDLEVBQUUsZUFBZSxDQUFDLFFBQVE7WUFDMUMsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLGVBQWUsQ0FBQyxXQUFXO1NBQ2pELENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxFQUFFLEdBQUcsZUFBZSxDQUFDLEVBQUUsQ0FBQztRQUM3QixJQUFJLENBQUMs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
|
|
@@ -22,7 +22,7 @@ export interface BaseArgs extends types.WithVaultInfo, types.WithGroupRolesArgs
|
|
|
22
22
|
* Extended interface that includes resource group input parameters
|
|
23
23
|
* alongside base vault and role requirements
|
|
24
24
|
*/
|
|
25
|
-
export interface CommonBaseArgs extends BaseArgs, types.WithResourceGroupInputs {
|
|
25
|
+
export interface CommonBaseArgs extends BaseArgs, types.WithResourceGroupInputs, types.WithResourceIdentityFlag, types.WithUserAssignedIdentity {
|
|
26
26
|
}
|
|
27
27
|
/**
|
|
28
28
|
* BaseResourceComponent serves as a foundational abstract class for Azure resource management
|
|
@@ -69,6 +69,17 @@ export declare abstract class BaseResourceComponent<TArgs extends BaseArgs> exte
|
|
|
69
69
|
principalId: pulumi.Input<string>;
|
|
70
70
|
} | undefined>): pulumi.OutputInstance<import("@pulumi/azuread/groupMember").GroupMember | undefined> | undefined;
|
|
71
71
|
getOutputs(): pulumi.Inputs | pulumi.Output<pulumi.Inputs>;
|
|
72
|
+
/** Assigns a role to a principal at the scope of this resource.
|
|
73
|
+
* @param roleName The name of the role to assign (e.g., "Contributor", "Reader").
|
|
74
|
+
* @param principalType The type of the principal (e.g., "User", "Group", "ServicePrincipal").
|
|
75
|
+
* @param principalId The ID of the principal to whom the role is assigned.
|
|
76
|
+
* @returns A RoleAssignment resource representing the role assignment.
|
|
77
|
+
* */
|
|
78
|
+
roleAssignment({ roleName, principalType, principalId, }: {
|
|
79
|
+
roleName: pulumi.Input<string>;
|
|
80
|
+
principalId: pulumi.Input<string>;
|
|
81
|
+
principalType: enums.authorization.PrincipalType;
|
|
82
|
+
}): pulumi.Output<RoleAssignment>;
|
|
72
83
|
protected grantPermissionsToIdentity({ identity, resource, roleNames }: types.GrantIdentityRoles): pulumi.Output<pulumi.Output<pulumi.Output<RoleAssignment>[]> | undefined>;
|
|
73
84
|
/**
|
|
74
85
|
* Adds a single secret to the component
|
|
@@ -113,15 +124,4 @@ export declare abstract class BaseResourceComponent<TArgs extends BaseArgs> exte
|
|
|
113
124
|
* Creates vault secrets if any secrets were added during component creation
|
|
114
125
|
*/
|
|
115
126
|
private postCreated;
|
|
116
|
-
/** Assigns a role to a principal at the scope of this resource.
|
|
117
|
-
* @param roleName The name of the role to assign (e.g., "Contributor", "Reader").
|
|
118
|
-
* @param principalType The type of the principal (e.g., "User", "Group", "ServicePrincipal").
|
|
119
|
-
* @param principalId The ID of the principal to whom the role is assigned.
|
|
120
|
-
* @returns A RoleAssignment resource representing the role assignment.
|
|
121
|
-
* */
|
|
122
|
-
roleAssignment({ roleName, principalType, principalId }: {
|
|
123
|
-
roleName: pulumi.Input<string>;
|
|
124
|
-
principalId: pulumi.Input<string>;
|
|
125
|
-
principalType: enums.authorization.PrincipalType;
|
|
126
|
-
}): pulumi.Output<RoleAssignment>;
|
|
127
127
|
}
|
|
@@ -105,6 +105,24 @@ class BaseResourceComponent extends BaseComponent_1.BaseComponent {
|
|
|
105
105
|
getOutputs() {
|
|
106
106
|
return { vaultSecrets: this.vaultSecrets };
|
|
107
107
|
}
|
|
108
|
+
/** Assigns a role to a principal at the scope of this resource.
|
|
109
|
+
* @param roleName The name of the role to assign (e.g., "Contributor", "Reader").
|
|
110
|
+
* @param principalType The type of the principal (e.g., "User", "Group", "ServicePrincipal").
|
|
111
|
+
* @param principalId The ID of the principal to whom the role is assigned.
|
|
112
|
+
* @returns A RoleAssignment resource representing the role assignment.
|
|
113
|
+
* */
|
|
114
|
+
roleAssignment({ roleName, principalType, principalId, }) {
|
|
115
|
+
const resourceId = this.getOutputs()?.id;
|
|
116
|
+
if (!resourceId) {
|
|
117
|
+
throw new Error(`Resource ID is not available for role assignment in component "${this.type}:${this.name}"`);
|
|
118
|
+
}
|
|
119
|
+
return pulumi.output([roleName, principalId]).apply(([role, id]) => new RoleAssignment_1.RoleAssignment(`${this.name}-${role}-${id}`, {
|
|
120
|
+
principalId: id,
|
|
121
|
+
principalType,
|
|
122
|
+
roleName: role,
|
|
123
|
+
scope: resourceId,
|
|
124
|
+
}, { parent: this, deletedWith: this }));
|
|
125
|
+
}
|
|
108
126
|
grantPermissionsToIdentity({ identity, resource, roleNames }) {
|
|
109
127
|
return pulumi.output(identity).apply((id) => {
|
|
110
128
|
if (!id?.principalId)
|
|
@@ -191,24 +209,6 @@ class BaseResourceComponent extends BaseComponent_1.BaseComponent {
|
|
|
191
209
|
}, { dependsOn: this.opts?.dependsOn, parent: this });
|
|
192
210
|
this.vaultSecrets = rs.results;
|
|
193
211
|
}
|
|
194
|
-
/** Assigns a role to a principal at the scope of this resource.
|
|
195
|
-
* @param roleName The name of the role to assign (e.g., "Contributor", "Reader").
|
|
196
|
-
* @param principalType The type of the principal (e.g., "User", "Group", "ServicePrincipal").
|
|
197
|
-
* @param principalId The ID of the principal to whom the role is assigned.
|
|
198
|
-
* @returns A RoleAssignment resource representing the role assignment.
|
|
199
|
-
* */
|
|
200
|
-
roleAssignment({ roleName, principalType, principalId }) {
|
|
201
|
-
const resourceId = this.getOutputs()?.id;
|
|
202
|
-
if (!resourceId) {
|
|
203
|
-
throw new Error(`Resource ID is not available for role assignment in component "${this.type}:${this.name}"`);
|
|
204
|
-
}
|
|
205
|
-
return pulumi.output([roleName, principalId]).apply(([role, id]) => new RoleAssignment_1.RoleAssignment(`${this.name}-${role}-${id}`, {
|
|
206
|
-
principalId: id,
|
|
207
|
-
principalType,
|
|
208
|
-
roleName: role,
|
|
209
|
-
scope: resourceId,
|
|
210
|
-
}, { parent: this, deletedWith: this }));
|
|
211
|
-
}
|
|
212
212
|
}
|
|
213
213
|
exports.BaseResourceComponent = BaseResourceComponent;
|
|
214
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
214
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZVJlc291cmNlQ29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jhc2UvQmFzZVJlc291cmNlQ29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUN4Qyx1REFBeUM7QUFHekMsNkRBQThFO0FBQzlFLHlEQUF3RTtBQUN4RSx3REFBd0U7QUFFeEUsbURBQWdEO0FBQ2hELDBEQUF1RDtBQUN2RCw2REFBMEQ7QUFDMUQsMkRBQXdEO0FBRXhELHVDQUFxRDtBQW9CckQ7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxNQUFzQixxQkFBOEMsU0FBUSw2QkFBb0I7SUFhM0U7SUFDRDtJQUNHO0lBQ0E7SUFmZCxZQUFZLENBQXdDO0lBQ25ELFFBQVEsR0FBNEMsRUFBRSxDQUFDO0lBQ3ZELG9CQUFvQixHQUFZLEtBQUssQ0FBQztJQUU5Qzs7Ozs7O09BTUc7SUFDSCxZQUNtQixJQUFZLEVBQ2IsSUFBWSxFQUNULElBQVcsRUFDWCxJQUFzQztRQUV6RCxLQUFLLENBQUMsSUFBQSxrQ0FBd0IsRUFBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBTHZDLFNBQUksR0FBSixJQUFJLENBQVE7UUFDYixTQUFJLEdBQUosSUFBSSxDQUFRO1FBQ1QsU0FBSSxHQUFKLElBQUksQ0FBTztRQUNYLFNBQUksR0FBSixJQUFJLENBQWtDO0lBRzNELENBQUM7SUFFRDs7Ozs7T0FLRztJQUNJLGlCQUFpQixDQUN0QixJQUEwQixFQUMxQixRQUF5RTtRQUV6RSxNQUFNLEVBQUUsVUFBVSxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUNqQyxJQUFJLENBQUMsVUFBVTtZQUFFLE9BQU87UUFFeEIsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEtBQUssQ0FB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
|
package/database/AzSql.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as pulumi from '@pulumi/pulumi';
|
|
2
2
|
import * as sql from '@pulumi/azure-native/sql';
|
|
3
3
|
import * as types from '../types';
|
|
4
|
-
import {
|
|
4
|
+
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
5
5
|
export type AzSqlSkuType = {
|
|
6
6
|
/**
|
|
7
7
|
* Capacity of the particular SKU.
|
|
@@ -28,7 +28,7 @@ export type AzSqlDbType = Omit<sql.DatabaseArgs, 'resourceGroupName' | 'serverNa
|
|
|
28
28
|
/** sample: sku: { name: 'Basic', tier: 'Basic', capacity: 0 } */
|
|
29
29
|
sku?: AzSqlSkuType;
|
|
30
30
|
};
|
|
31
|
-
export interface AzSqlArgs extends
|
|
31
|
+
export interface AzSqlArgs extends CommonBaseArgs, types.WithEncryptionEnabler, Partial<Pick<sql.ServerArgs, 'administratorLogin' | 'federatedClientId' | 'isIPv6Enabled' | 'restrictOutboundNetworkAccess' | 'version'>> {
|
|
32
32
|
administrators?: {
|
|
33
33
|
azureAdOnlyAuthentication?: boolean;
|
|
34
34
|
useDefaultUAssignedIdForConnection?: boolean;
|
package/database/AzSql.js
CHANGED
|
@@ -37,12 +37,12 @@ exports.AzSql = void 0;
|
|
|
37
37
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
38
|
const sql = __importStar(require("@pulumi/azure-native/sql"));
|
|
39
39
|
const vnet = __importStar(require("../vnet"));
|
|
40
|
-
const
|
|
40
|
+
const base_1 = require("../base");
|
|
41
41
|
const helpers_1 = require("../helpers");
|
|
42
42
|
const helpers_2 = require("./helpers");
|
|
43
43
|
const helpers_3 = require("../storage/helpers");
|
|
44
44
|
const storage_1 = require("../storage");
|
|
45
|
-
class AzSql extends
|
|
45
|
+
class AzSql extends base_1.BaseResourceComponent {
|
|
46
46
|
id;
|
|
47
47
|
resourceName;
|
|
48
48
|
constructor(name, args, opts) {
|
|
@@ -65,7 +65,7 @@ class AzSql extends BaseResourceComponent_1.BaseResourceComponent {
|
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
createSql() {
|
|
68
|
-
const { rsGroup, enableEncryption, defaultUAssignedId, administrators, network, lock, administratorLogin, ...props } = this.args;
|
|
68
|
+
const { rsGroup, enableResourceIdentity, enableEncryption, defaultUAssignedId, administrators, network, lock, administratorLogin, ...props } = this.args;
|
|
69
69
|
const adminLogin = administratorLogin ?? pulumi.interpolate `${this.name}-admin-${this.createRandomString().value}`;
|
|
70
70
|
const password = this.createPassword();
|
|
71
71
|
const encryptionKey = enableEncryption
|
|
@@ -76,10 +76,12 @@ class AzSql extends BaseResourceComponent_1.BaseResourceComponent {
|
|
|
76
76
|
...rsGroup,
|
|
77
77
|
version: this.args.version ?? '12.0',
|
|
78
78
|
minimalTlsVersion: '1.2',
|
|
79
|
-
identity:
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
identity: enableResourceIdentity
|
|
80
|
+
? {
|
|
81
|
+
type: defaultUAssignedId ? sql.IdentityType.SystemAssigned_UserAssigned : sql.IdentityType.SystemAssigned,
|
|
82
|
+
userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
|
|
83
|
+
}
|
|
84
|
+
: undefined,
|
|
83
85
|
primaryUserAssignedIdentityId: defaultUAssignedId?.id,
|
|
84
86
|
administratorLogin: adminLogin,
|
|
85
87
|
administratorLoginPassword: password.value,
|
|
@@ -294,4 +296,4 @@ class AzSql extends BaseResourceComponent_1.BaseResourceComponent {
|
|
|
294
296
|
}
|
|
295
297
|
}
|
|
296
298
|
exports.AzSql = AzSql;
|
|
297
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzSql.js","sourceRoot":"","sources":["../../src/database/AzSql.ts"],"names":[],"mappings":"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"}
|
|
299
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzSql.js","sourceRoot":"","sources":["../../src/database/AzSql.ts"],"names":[],"mappings":"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"}
|
package/database/MySql.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as mysql from '@pulumi/azure-native/dbformysql';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
|
-
import {
|
|
3
|
+
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
4
4
|
import * as types from '../types';
|
|
5
|
-
export interface MySqlArgs extends
|
|
5
|
+
export interface MySqlArgs extends CommonBaseArgs, types.WithEncryptionEnabler, types.WithNetworkArgs, Pick<mysql.ServerArgs, 'administratorLogin'>, Partial<Pick<mysql.ServerArgs, 'version' | 'storage' | 'maintenanceWindow' | 'backup' | 'highAvailability' | 'availabilityZone'>> {
|
|
6
6
|
sku: {
|
|
7
7
|
/**
|
|
8
8
|
* The name of the sku, e.g. Standard_D32s_v3.
|
package/database/MySql.js
CHANGED
|
@@ -64,7 +64,7 @@ class MySql extends base_1.BaseResourceComponent {
|
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
createMySql(uid) {
|
|
67
|
-
const { rsGroup, enableEncryption, administratorLogin, lock } = this.args;
|
|
67
|
+
const { rsGroup, enableResourceIdentity, enableEncryption, administratorLogin, lock } = this.args;
|
|
68
68
|
const adminLogin = administratorLogin ?? pulumi.interpolate `${this.name}-admin-${this.createRandomString().value}`;
|
|
69
69
|
const password = this.createPassword();
|
|
70
70
|
const encryptionKey = enableEncryption ? this.getEncryptionKey() : undefined;
|
|
@@ -76,10 +76,12 @@ class MySql extends base_1.BaseResourceComponent {
|
|
|
76
76
|
administratorLoginPassword: password.value,
|
|
77
77
|
version: this.args.version ?? mysql.ServerVersion.ServerVersion_8_0_21,
|
|
78
78
|
storage: this.args.storage ?? { storageSizeGB: 30 },
|
|
79
|
-
identity:
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
79
|
+
identity: enableResourceIdentity
|
|
80
|
+
? {
|
|
81
|
+
type: mysql.ManagedServiceIdentityType.UserAssigned,
|
|
82
|
+
userAssignedIdentities: [uid.id],
|
|
83
|
+
}
|
|
84
|
+
: undefined,
|
|
83
85
|
dataEncryption: encryptionKey
|
|
84
86
|
? {
|
|
85
87
|
type: mysql.DataEncryptionType.AzureKeyVault,
|
|
@@ -88,26 +90,26 @@ class MySql extends base_1.BaseResourceComponent {
|
|
|
88
90
|
}
|
|
89
91
|
: { type: 'SystemManaged' },
|
|
90
92
|
maintenanceWindow: this.args.sku.tier !== 'Burstable'
|
|
91
|
-
? this.args.maintenanceWindow ?? {
|
|
93
|
+
? (this.args.maintenanceWindow ?? {
|
|
92
94
|
customWindow: 'Enabled',
|
|
93
95
|
dayOfWeek: 0, //0 is Sunday
|
|
94
96
|
startHour: 0,
|
|
95
97
|
startMinute: 0,
|
|
96
|
-
}
|
|
98
|
+
})
|
|
97
99
|
: undefined,
|
|
98
100
|
backup: this.args.backup ?? {
|
|
99
101
|
geoRedundantBackup: helpers_1.azureEnv.isPrd ? 'Enabled' : 'Disabled',
|
|
100
102
|
backupRetentionDays: helpers_1.azureEnv.isPrd ? 30 : 7,
|
|
101
103
|
},
|
|
102
104
|
highAvailability: this.args.sku.tier !== 'Burstable'
|
|
103
|
-
? this.args.highAvailability ?? {
|
|
105
|
+
? (this.args.highAvailability ?? {
|
|
104
106
|
mode: helpers_1.azureEnv.isPrd ? 'ZoneRedundant' : 'SameZone',
|
|
105
107
|
standbyAvailabilityZone: helpers_1.azureEnv.isPrd ? '3' : '1',
|
|
106
|
-
}
|
|
108
|
+
})
|
|
107
109
|
: undefined,
|
|
108
|
-
availabilityZone: this.args.availabilityZone ?? helpers_1.azureEnv.isPrd ? '3' : '1',
|
|
110
|
+
availabilityZone: (this.args.availabilityZone ?? helpers_1.azureEnv.isPrd) ? '3' : '1',
|
|
109
111
|
network: {
|
|
110
|
-
publicNetworkAccess: this.args.network?.publicNetworkAccess ?? this.args.network?.privateLink ? 'Disabled' : 'Enabled',
|
|
112
|
+
publicNetworkAccess: (this.args.network?.publicNetworkAccess ?? this.args.network?.privateLink) ? 'Disabled' : 'Enabled',
|
|
111
113
|
},
|
|
112
114
|
}, {
|
|
113
115
|
...this.opts,
|
|
@@ -195,4 +197,4 @@ class MySql extends base_1.BaseResourceComponent {
|
|
|
195
197
|
}
|
|
196
198
|
}
|
|
197
199
|
exports.MySql = MySql;
|
|
198
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"MySql.js","sourceRoot":"","sources":["../../src/database/MySql.ts"],"names":[],"mappings":"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"}
|
package/database/Postgres.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as postgresql from '@pulumi/azure-native/dbforpostgresql';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
|
-
import {
|
|
3
|
+
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
4
4
|
import * as types from '../types';
|
|
5
|
-
export interface PostgresArgs extends
|
|
5
|
+
export interface PostgresArgs extends CommonBaseArgs, types.WithEncryptionEnabler, types.WithNetworkArgs, Pick<postgresql.ServerArgs, 'administratorLogin'>, Partial<Pick<postgresql.ServerArgs, 'version' | 'storage' | 'maintenanceWindow' | 'backup' | 'highAvailability' | 'availabilityZone'>> {
|
|
6
6
|
sku: {
|
|
7
7
|
/** The name of postgres: Standard_B2ms, */
|
|
8
8
|
name: pulumi.Input<string>;
|
package/database/Postgres.js
CHANGED
|
@@ -62,7 +62,7 @@ class Postgres extends base_1.BaseResourceComponent {
|
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
64
|
createPostgres() {
|
|
65
|
-
const { rsGroup, enableEncryption, administratorLogin, enableAzureADAdmin, enablePasswordAuth, lock } = this.args;
|
|
65
|
+
const { rsGroup, enableResourceIdentity, enableEncryption, administratorLogin, enableAzureADAdmin, enablePasswordAuth, lock, } = this.args;
|
|
66
66
|
const adminLogin = administratorLogin ?? pulumi.interpolate `${this.name}-admin-${this.createRandomString().value}`;
|
|
67
67
|
const password = this.createPassword();
|
|
68
68
|
const encryptionKey = enableEncryption ? this.getEncryptionKey() : undefined;
|
|
@@ -74,10 +74,12 @@ class Postgres extends base_1.BaseResourceComponent {
|
|
|
74
74
|
administratorLogin: adminLogin,
|
|
75
75
|
administratorLoginPassword: password.value,
|
|
76
76
|
storage: this.args.storage ?? { storageSizeGB: 32 },
|
|
77
|
-
identity:
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
77
|
+
identity: enableResourceIdentity
|
|
78
|
+
? {
|
|
79
|
+
type: postgresql.IdentityType.UserAssigned,
|
|
80
|
+
userAssignedIdentities: pulumi.output(uAssignedId.id).apply((id) => ({ [id]: {} })),
|
|
81
|
+
}
|
|
82
|
+
: undefined,
|
|
81
83
|
dataEncryption: encryptionKey?.id
|
|
82
84
|
? {
|
|
83
85
|
type: postgresql.DataEncryptionType.AzureKeyVault,
|
|
@@ -101,14 +103,14 @@ class Postgres extends base_1.BaseResourceComponent {
|
|
|
101
103
|
backupRetentionDays: helpers_1.azureEnv.isPrd ? 30 : 7,
|
|
102
104
|
},
|
|
103
105
|
highAvailability: this.args.sku?.tier !== 'Burstable'
|
|
104
|
-
? this.args.highAvailability ?? {
|
|
106
|
+
? (this.args.highAvailability ?? {
|
|
105
107
|
mode: helpers_1.azureEnv.isPrd ? 'ZoneRedundant' : 'SameZone',
|
|
106
108
|
standbyAvailabilityZone: helpers_1.azureEnv.isPrd ? '3' : '1',
|
|
107
|
-
}
|
|
109
|
+
})
|
|
108
110
|
: undefined,
|
|
109
|
-
availabilityZone: this.args.availabilityZone ?? helpers_1.azureEnv.isPrd ? '3' : '1',
|
|
111
|
+
availabilityZone: (this.args.availabilityZone ?? helpers_1.azureEnv.isPrd) ? '3' : '1',
|
|
110
112
|
network: {
|
|
111
|
-
publicNetworkAccess: this.args.network?.publicNetworkAccess ?? this.args.network?.privateLink ? 'Disabled' : 'Enabled',
|
|
113
|
+
publicNetworkAccess: (this.args.network?.publicNetworkAccess ?? this.args.network?.privateLink) ? 'Disabled' : 'Enabled',
|
|
112
114
|
},
|
|
113
115
|
}, {
|
|
114
116
|
...this.opts,
|
|
@@ -180,4 +182,4 @@ class Postgres extends base_1.BaseResourceComponent {
|
|
|
180
182
|
}
|
|
181
183
|
}
|
|
182
184
|
exports.Postgres = Postgres;
|
|
183
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Postgres.js","sourceRoot":"","sources":["../../src/database/Postgres.ts"],"names":[],"mappings":"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"}
|