@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/aks/helpers.js
CHANGED
|
@@ -70,7 +70,7 @@ const getAksClusterOutput = ({ resourceName, resourceGroupName, }) => {
|
|
|
70
70
|
});
|
|
71
71
|
};
|
|
72
72
|
exports.getAksClusterOutput = getAksClusterOutput;
|
|
73
|
-
const createArgoCDExtension = (name, { allowInsecureAccess, argoCdDomain,
|
|
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
76
|
issuer: https://login.microsoftonline.com/${helpers_1.azureEnv.tenantId}/v2.0
|
|
@@ -87,14 +87,26 @@ requestedScopes:
|
|
|
87
87
|
`;
|
|
88
88
|
const defaultPolicy = 'role:readonly';
|
|
89
89
|
const policy = pulumi.interpolate `
|
|
90
|
+
# Admin role
|
|
90
91
|
p, role:org-admin, applications, *, */*, allow
|
|
91
92
|
p, role:org-admin, clusters, get, *, allow
|
|
92
93
|
p, role:org-admin, repositories, get, *, allow
|
|
93
94
|
p, role:org-admin, repositories, create, *, allow
|
|
94
95
|
p, role:org-admin, repositories, update, *, allow
|
|
95
96
|
p, role:org-admin, repositories, delete, *, allow
|
|
96
|
-
|
|
97
|
-
|
|
97
|
+
|
|
98
|
+
# Read-all + manual application sync custom role
|
|
99
|
+
p, role:app-sync, applications, get, */*, allow
|
|
100
|
+
p, role:app-sync, applications, sync, */*, allow
|
|
101
|
+
p, role:app-sync, projects, get, *, allow
|
|
102
|
+
p, role:app-sync, clusters, get, *, allow
|
|
103
|
+
p, role:app-sync, repositories, get, *, allow
|
|
104
|
+
p, role:app-sync, logs, get, *, allow
|
|
105
|
+
|
|
106
|
+
# Group role mappings
|
|
107
|
+
g, ${permission.adminGroupObjectId ?? '00000000-0000-0000-0000-000000000000'}, role:org-admin
|
|
108
|
+
g, ${permission.syncGroupObjectId ?? '00000000-0000-0000-0000-000000000000'}, role:app-sync
|
|
109
|
+
g, ${permission.readonlyGroupObjectId ?? '00000000-0000-0000-0000-000000000000'}, role:readonly
|
|
98
110
|
`;
|
|
99
111
|
return new azure.kubernetesconfiguration.Extension(name, {
|
|
100
112
|
autoUpgradeMinorVersion: true,
|
|
@@ -108,13 +120,14 @@ g, ${groupRoles.readOnly.objectId}, role:readonly
|
|
|
108
120
|
deployWithHighAvailability: 'false',
|
|
109
121
|
namespaceInstall: 'true',
|
|
110
122
|
'workloadIdentity.enable': 'true',
|
|
111
|
-
'workloadIdentity.clientId':
|
|
123
|
+
'workloadIdentity.clientId': defaultUAssignedId.clientId,
|
|
112
124
|
'workloadIdentity.entraSSOClientId': identity.clientId,
|
|
113
|
-
'config-maps.argocd-
|
|
125
|
+
'config-maps.argocd-cm.data.admin.\\enabled': 'false',
|
|
114
126
|
'config-maps.argocd-cm.data.oidc\\.config': oidcConfig,
|
|
115
127
|
'config-maps.argocd-cm.data.url': pulumi.interpolate `https://${argoCdDomain}/`,
|
|
116
128
|
'config-maps.argocd-rbac-cm.data.policy\\.default': defaultPolicy,
|
|
117
129
|
'config-maps.argocd-rbac-cm.data.policy\\.csv': policy,
|
|
130
|
+
'config-maps.argocd-cmd-params-cm.data.server\\.insecure': allowInsecureAccess ? 'true' : 'false',
|
|
118
131
|
'config-maps.argocd-cmd-params-cm.data.application\\.namespaces': allowedNameSpaces
|
|
119
132
|
? pulumi.output(allowedNameSpaces).apply((ns) => ns.join(','))
|
|
120
133
|
: 'argocd',
|
|
@@ -123,4 +136,4 @@ g, ${groupRoles.readOnly.objectId}, role:readonly
|
|
|
123
136
|
}, { ...opts, dependsOn: [aks, identity] });
|
|
124
137
|
};
|
|
125
138
|
exports.createArgoCDExtension = createArgoCDExtension;
|
|
126
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ha3MvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0REFBOEM7QUFDOUMsd0NBQXNDO0FBQ3RDLHVEQUF5QztBQUs1QixRQUFBLHdCQUF3QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztBQUU1RSxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsWUFBWSxFQUNaLGlCQUFpQixFQUNqQixvQkFBb0IsR0FLckIsRUFBbUIsRUFBRTtJQUNwQixNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLGlDQUFpQyxDQUFDO1lBQzdELFlBQVk7WUFDWixpQkFBaUI7U0FDbEIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxrQ0FBa0MsQ0FBQztZQUM5RCxZQUFZO1lBQ1osaUJBQWlCO1NBQ2xCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBcEJXLFFBQUEsWUFBWSxnQkFvQnZCO0FBRUssTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEVBQ2xDLFlBQVksRUFDWixpQkFBaUIsR0FJbEIsRUFBZ0MsRUFBRTtJQUNqQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFBLDhDQUE4QyxrQkFBUSxDQUFDLGNBQWMsbUJBQW1CLGlCQUFpQix5REFBeUQsWUFBWSx5QkFBeUIsQ0FBQztJQUN0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
|
package/apim/Apim.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ import * as types from '../types';
|
|
|
6
6
|
import { ApimProductArgs } from './ApimProduct';
|
|
7
7
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
8
8
|
type ApimCertType = certHelpers.CertType | certHelpers.VaultCertType | certHelpers.CertFile;
|
|
9
|
-
export interface ApimArgs extends CommonBaseArgs, types.
|
|
9
|
+
export interface ApimArgs extends CommonBaseArgs, types.WithNetworkArgs, types.WithLogs, Omit<apim.ApiManagementServiceArgs, types.CommonProps | 'serviceName' | 'sku' | 'additionalLocations' | 'certificates' | 'hostnameConfigurations' | 'publicNetworkAccess' | 'virtualNetworkType' | 'virtualNetworkConfiguration' | 'publisherName' | 'publisherEmail' | 'customProperties'> {
|
|
10
10
|
publisherEmail?: pulumi.Input<string>;
|
|
11
11
|
publisherName?: pulumi.Input<string>;
|
|
12
12
|
customProperties?: string[];
|
package/apim/Apim.js
CHANGED
|
@@ -82,21 +82,23 @@ class Apim extends base_1.BaseResourceComponent {
|
|
|
82
82
|
return { ...caCerts, ...rootCerts };
|
|
83
83
|
}
|
|
84
84
|
createApim() {
|
|
85
|
-
const { defaultUAssignedId, vaultInfo, groupRoles, rsGroup, sku, publisherName, publisherEmail, notificationSenderEmail, apiVersionConstraint, additionalLocations, hostnameConfigurations = [], customProperties = {}, zones, network, ...others } = this.args;
|
|
85
|
+
const { defaultUAssignedId, enableResourceIdentity, vaultInfo, groupRoles, rsGroup, sku, publisherName, publisherEmail, notificationSenderEmail, apiVersionConstraint, additionalLocations, hostnameConfigurations = [], customProperties = {}, zones, network, ...others } = this.args;
|
|
86
86
|
return new apim.ApiManagementService(this.name, {
|
|
87
87
|
...rsGroup,
|
|
88
88
|
...others,
|
|
89
89
|
publisherName: publisherName ?? helpers_1.stackInfo.organization,
|
|
90
90
|
publisherEmail: publisherEmail ?? 'apimgmt-noreply@mail.windowsazure.com',
|
|
91
91
|
notificationSenderEmail: notificationSenderEmail ?? 'apimgmt-noreply@mail.windowsazure.com',
|
|
92
|
-
identity:
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
92
|
+
identity: enableResourceIdentity
|
|
93
|
+
? {
|
|
94
|
+
type: defaultUAssignedId
|
|
95
|
+
? apim.ApimIdentityType.SystemAssigned_UserAssigned
|
|
96
|
+
: apim.ApimIdentityType.SystemAssigned,
|
|
97
|
+
userAssignedIdentities: defaultUAssignedId
|
|
98
|
+
? pulumi.output(defaultUAssignedId).apply((d) => ({ [d.id]: {} }))
|
|
99
|
+
: undefined,
|
|
100
|
+
}
|
|
101
|
+
: undefined,
|
|
100
102
|
sku: sku ?? { name: 'Consumption', capacity: 0 },
|
|
101
103
|
apiVersionConstraint: apiVersionConstraint ?? {
|
|
102
104
|
minApiVersion: '2019-12-01',
|
|
@@ -247,4 +249,4 @@ class Apim extends base_1.BaseResourceComponent {
|
|
|
247
249
|
}
|
|
248
250
|
}
|
|
249
251
|
exports.Apim = Apim;
|
|
250
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
252
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Apim.js","sourceRoot":"","sources":["../../src/apim/Apim.ts"],"names":[],"mappings":"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"}
|
package/app/AppConfig.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import * as appConfig from '@pulumi/azure-native/appconfiguration';
|
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
4
4
|
import * as types from '../types';
|
|
5
|
-
export interface AppConfigArgs extends CommonBaseArgs, types.WithEncryptionEnabler,
|
|
5
|
+
export interface AppConfigArgs extends CommonBaseArgs, types.WithEncryptionEnabler, Pick<appConfig.ConfigurationStoreArgs, 'dataPlaneProxy' | 'disableLocalAuth' | 'enablePurgeProtection' | 'softDeleteRetentionInDays'> {
|
|
6
6
|
network?: Pick<types.NetworkArgs, 'publicNetworkAccess' | 'privateLink'>;
|
|
7
7
|
}
|
|
8
8
|
export declare class AppConfig extends BaseResourceComponent<AppConfigArgs> {
|
package/app/AppConfig.js
CHANGED
|
@@ -37,13 +37,13 @@ exports.AppConfig = void 0;
|
|
|
37
37
|
const appConfig = __importStar(require("@pulumi/azure-native/appconfiguration"));
|
|
38
38
|
const base_1 = require("../base");
|
|
39
39
|
const vault = __importStar(require("../vault"));
|
|
40
|
-
const
|
|
40
|
+
const vnet_1 = require("../vnet");
|
|
41
41
|
class AppConfig extends base_1.BaseResourceComponent {
|
|
42
42
|
id;
|
|
43
43
|
resourceName;
|
|
44
44
|
constructor(name, args, opts) {
|
|
45
45
|
super('AppConfig', name, args, opts);
|
|
46
|
-
const { rsGroup, groupRoles, defaultUAssignedId, enableEncryption, vaultInfo, network, ...props } = args;
|
|
46
|
+
const { rsGroup, groupRoles, defaultUAssignedId, enableResourceIdentity, enableEncryption, vaultInfo, network, ...props } = args;
|
|
47
47
|
const encryptionKey = args.enableEncryption ? this.getEncryptionKey() : undefined;
|
|
48
48
|
const azConfig = new appConfig.ConfigurationStore(name, {
|
|
49
49
|
...args.rsGroup,
|
|
@@ -54,12 +54,14 @@ class AppConfig extends base_1.BaseResourceComponent {
|
|
|
54
54
|
: network.privateLink
|
|
55
55
|
? appConfig.PublicNetworkAccess.Disabled
|
|
56
56
|
: appConfig.PublicNetworkAccess.Enabled,
|
|
57
|
-
identity:
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
57
|
+
identity: enableResourceIdentity
|
|
58
|
+
? {
|
|
59
|
+
type: defaultUAssignedId
|
|
60
|
+
? appConfig.IdentityType.SystemAssigned_UserAssigned
|
|
61
|
+
: appConfig.IdentityType.SystemAssigned,
|
|
62
|
+
userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
|
|
63
|
+
}
|
|
64
|
+
: undefined,
|
|
63
65
|
encryption: encryptionKey && defaultUAssignedId
|
|
64
66
|
? {
|
|
65
67
|
keyVaultProperties: {
|
|
@@ -88,7 +90,7 @@ class AppConfig extends base_1.BaseResourceComponent {
|
|
|
88
90
|
const { rsGroup, network } = this.args;
|
|
89
91
|
if (!network?.privateLink)
|
|
90
92
|
return;
|
|
91
|
-
return new
|
|
93
|
+
return new vnet_1.PrivateEndpoint(this.name, { ...network.privateLink, resourceInfo: azConfig, rsGroup, type: 'azConfig' }, { dependsOn: azConfig, parent: this });
|
|
92
94
|
}
|
|
93
95
|
createSecrets(azConfig) {
|
|
94
96
|
const { rsGroup, vaultInfo, disableLocalAuth } = this.args;
|
|
@@ -121,4 +123,4 @@ class AppConfig extends base_1.BaseResourceComponent {
|
|
|
121
123
|
}
|
|
122
124
|
}
|
|
123
125
|
exports.AppConfig = AppConfig;
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
126
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9BcHBDb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsaUZBQW1FO0FBRW5FLGtDQUFnRTtBQUVoRSxnREFBa0M7QUFDbEMsa0NBQTBDO0FBYTFDLE1BQWEsU0FBVSxTQUFRLDRCQUFvQztJQUNqRCxFQUFFLENBQXdCO0lBQzFCLFlBQVksQ0FBd0I7SUFFcEQsWUFBWSxJQUFZLEVBQUUsSUFBbUIsRUFBRSxJQUFzQztRQUNuRixLQUFLLENBQUMsV0FBVyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFckMsTUFBTSxFQUNKLE9BQU8sRUFDUCxVQUFVLEVBQ1Ysa0JBQWtCLEVBQ2xCLHNCQUFzQixFQUN0QixnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULE9BQU8sRUFDUCxHQUFHLEtBQUssRUFDVCxHQUFHLElBQUksQ0FBQztRQUNULE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUNsRixNQUFNLFFBQVEsR0FBRyxJQUFJLFNBQVMsQ0FBQyxrQkFBa0IsQ0FDL0MsSUFBSSxFQUNKO1lBQ0UsR0FBRyxJQUFJLENBQUMsT0FBTztZQUNmLEdBQUcsS0FBSztZQUNSLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUU7WUFFekIsbUJBQW1CLEVBQUUsQ0FBQyxPQUFPLEVBQUUsbUJBQW1CO2dCQUNoRCxDQUFDLENBQUMsU0FBUyxDQUFDLG1CQUFtQixDQUFDLE9BQU87Z0JBQ3ZDLENBQUMsQ0FBQyxPQUFPLENBQUMsV0FBVztvQkFDbkIsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRO29CQUN4QyxDQUFDLENBQUMsU0FBUyxDQUFDLG1CQUFtQixDQUFDLE9BQU87WUFFM0MsUUFBUSxFQUFFLHNCQUFzQjtnQkFDOUIsQ0FBQyxDQUFDO29CQUNFLElBQUksRUFBRSxrQkFBa0I7d0JBQ3RCLENBQUMsQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDLDJCQUEyQjt3QkFDcEQsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsY0FBYztvQkFDekMsc0JBQXNCLEVBQUUsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7aUJBQ2pGO2dCQUNILENBQUMsQ0FBQyxTQUFTO1lBRWIsVUFBVSxFQUNSLGFBQWEsSUFBSSxrQkFBa0I7Z0JBQ2pDLENBQUMsQ0FBQztvQkFDRSxrQkFBa0IsRUFBRTt3QkFDbEIsZ0JBQWdCLEVBQUUsa0JBQWtCLENBQUMsUUFBUTt3QkFDN0MsYUFBYSxFQUFFLGFBQWEsQ0FBQyxpQkFBaUI7cUJBQy9DO2lCQUNGO2dCQUNILENBQUMsQ0FBQyxTQUFTO1NBQ2hCLEVBQ0Q7WUFDRSxHQUFHLElBQUk7WUFDUCxNQUFNLEVBQUUsSUFBSTtTQUNiLENBQ0YsQ0FBQztRQUVGLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNqQyxJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRTdCLElBQUksQ0FBQyxFQUFFLEdBQUcsUUFBUSxDQUFDLEVBQUUsQ0FBQztRQUN0QixJQUFJLENBQUMsWUFBWSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUM7UUFFbEMsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFTSxVQUFVO1FBQ2YsT0FBTztZQUNMLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLFlBQVksRUFBRSxJQUFJLENBQUMsWUFBWTtTQUNoQyxDQUFDO0lBQ0osQ0FBQztJQUVPLGlCQUFpQixDQUFDLFFBQXNDO1FBQzlELE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUN2QyxJQUFJLENBQUMsT0FBTyxFQUFFLFdBQVc7WUFBRSxPQUFPO1FBRWxDLE9BQU8sSUFBSSxzQkFBZSxDQUN4QixJQUFJLENBQUMsSUFBSSxFQUNULEVBQUUsR0FBRyxPQUFPLENBQUMsV0FBVyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsRUFDN0UsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDdEMsQ0FBQztJQUNKLENBQUM7SUFFTyxhQUFhLENBQUMsUUFBc0M7UUFDMUQsTUFBTSxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQzNELElBQUksQ0FBQyxTQUFTLElBQUksZ0JBQWdCO1lBQUUsT0FBTztRQUUzQyxRQUFRLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUU7WUFDN0IsSUFBSSxDQUFDLEVBQUU7Z0JBQUUsT0FBTztZQUNoQiwyQkFBMkI7WUFDM0IsTUFBTSxJQUFJLEdBQUcsTUFBTSxTQUFTLENBQUMsZ0NBQWdDLENBQUM7Z0JBQzVELGVBQWUsRUFBRSxRQUFRLENBQUMsSUFBSTtnQkFDOUIsR0FBRyxPQUFPO2FBQ1gsQ0FBQyxDQUFDO1lBRUgsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2YsT0FBTyxJQUFJLEtBQUssQ0FBQyxZQUFZLENBQzNCLElBQUksQ0FBQyxJQUFJLEVBQ1Q7b0JBQ0UsU0FBUztvQkFDVCxPQUFPLEVBQUU7d0JBQ1AsQ0FBQyxHQUFHLElBQUksQ0FBQyxJQUFJLGVBQWUsQ0FBQyxFQUFFOzRCQUM3QixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQU0sQ0FBQyxDQUFDLENBQUUsQ0FBQyxLQUFLLENBQUM7NEJBQzVDLFdBQVcsRUFBRSxvQ0FBb0M7eUJBQ2xEO3dCQUNELENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxpQkFBaUIsQ0FBQyxFQUFFOzRCQUMvQixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQU0sQ0FBQyxDQUFDLENBQUUsQ0FBQyxLQUFLLENBQUM7NEJBQzVDLFdBQVcsRUFBRSxzQ0FBc0M7eUJBQ3BEO3FCQUNGO2lCQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDdEMsQ0FBQztZQUNKLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQXBIRCw4QkFvSEMifQ==
|
package/app/AppContainer.d.ts
CHANGED
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import * as app from '@pulumi/azure-native/app';
|
|
2
2
|
import * as inputs from '@pulumi/azure-native/types/input';
|
|
3
3
|
import * as pulumi from '@pulumi/pulumi';
|
|
4
|
-
import * as types from '../types';
|
|
5
4
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
6
5
|
/**
|
|
7
6
|
* Azure Container App component providing secure, serverless container execution
|
|
8
7
|
* with auto-scaling, ingress, and managed environment integration.
|
|
9
8
|
*/
|
|
10
|
-
export interface AppContainerArgs extends CommonBaseArgs,
|
|
9
|
+
export interface AppContainerArgs extends CommonBaseArgs, Partial<Pick<app.ContainerAppArgs, 'workloadProfileName' | 'extendedLocation'>> {
|
|
11
10
|
/** Resource ID of the Container Apps Managed Environment */
|
|
12
11
|
managedEnvironmentId: pulumi.Input<string>;
|
|
13
12
|
/** Container configuration */
|
package/app/AppContainer.js
CHANGED
|
@@ -63,17 +63,19 @@ class AppContainer extends base_1.BaseResourceComponent {
|
|
|
63
63
|
};
|
|
64
64
|
}
|
|
65
65
|
createContainerApp() {
|
|
66
|
-
const { rsGroup, defaultUAssignedId, managedEnvironmentId, template, configuration, ...props } = this.args;
|
|
66
|
+
const { rsGroup, enableResourceIdentity, defaultUAssignedId, managedEnvironmentId, template, configuration, ...props } = this.args;
|
|
67
67
|
return new app.ContainerApp(this.name, {
|
|
68
68
|
...props,
|
|
69
69
|
...rsGroup,
|
|
70
70
|
managedEnvironmentId,
|
|
71
|
-
identity:
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
71
|
+
identity: enableResourceIdentity
|
|
72
|
+
? {
|
|
73
|
+
type: defaultUAssignedId
|
|
74
|
+
? app.ManagedServiceIdentityType.SystemAssigned_UserAssigned
|
|
75
|
+
: app.ManagedServiceIdentityType.SystemAssigned,
|
|
76
|
+
userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
|
|
77
|
+
}
|
|
78
|
+
: undefined,
|
|
77
79
|
configuration: configuration
|
|
78
80
|
? {
|
|
79
81
|
activeRevisionsMode: configuration.activeRevisionsMode ?? app.ActiveRevisionsMode.Single,
|
|
@@ -138,4 +140,4 @@ class AppContainer extends base_1.BaseResourceComponent {
|
|
|
138
140
|
}
|
|
139
141
|
}
|
|
140
142
|
exports.AppContainer = AppContainer;
|
|
141
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
143
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29udGFpbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9BcHBDb250YWluZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQWdEO0FBSWhELGtDQUFnRTtBQStHaEUsTUFBYSxZQUFhLFNBQVEsNEJBQXVDO0lBQ3ZELEVBQUUsQ0FBd0I7SUFDMUIsWUFBWSxDQUF3QjtJQUNwQyxJQUFJLENBQW9DO0lBQ3hDLGtCQUFrQixDQUF3QjtJQUMxQyxtQkFBbUIsQ0FBMEI7SUFFN0QsWUFBWSxJQUFZLEVBQUUsSUFBc0IsRUFBRSxJQUFzQztRQUN0RixLQUFLLENBQUMsY0FBYyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFeEMsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFFL0MsSUFBSSxDQUFDLEVBQUUsR0FBRyxZQUFZLENBQUMsRUFBRSxDQUFDO1FBQzFCLElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDLElBQUksQ0FBQztRQUN0QyxJQUFJLENBQUMsSUFBSSxHQUFHLFlBQVksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3RFLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxZQUFZLENBQUMsa0JBQWtCLENBQUM7UUFDMUQsSUFBSSxDQUFDLG1CQUFtQixHQUFHLFlBQVksQ0FBQyxtQkFBbUIsQ0FBQztRQUU1RCxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDekIsQ0FBQztJQUVNLFVBQVU7UUFDZixPQUFPO1lBQ0wsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLElBQUksRUFBRSxJQUFJLENB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
|
package/app/AppContainerEnv.d.ts
CHANGED
|
@@ -22,7 +22,7 @@ interface ScheduledEntryArgs {
|
|
|
22
22
|
* Azure Container Apps Managed Environment component providing isolated hosting
|
|
23
23
|
* environment for container apps with networking, monitoring, and scaling features.
|
|
24
24
|
*/
|
|
25
|
-
export interface AppContainerEnvArgs extends CommonBaseArgs,
|
|
25
|
+
export interface AppContainerEnvArgs extends CommonBaseArgs, Partial<Pick<app.ManagedEnvironmentArgs, 'daprAIConnectionString' | 'daprAIInstrumentationKey' | 'customDomainConfiguration' | 'infrastructureResourceGroup' | 'peerAuthentication' | 'peerTrafficConfiguration' | 'workloadProfiles' | 'zoneRedundant' | 'appInsightsConfiguration' | 'appLogsConfiguration' | 'openTelemetryConfiguration' | 'publicNetworkAccess'>> {
|
|
26
26
|
/** VNet configuration for internal networking */
|
|
27
27
|
vnetConfiguration?: {
|
|
28
28
|
/** Subnet resource info for infrastructure components */
|
package/app/AppContainerEnv.js
CHANGED
|
@@ -65,7 +65,7 @@ class AppContainerEnv extends base_1.BaseResourceComponent {
|
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
createManagedEnvironment() {
|
|
68
|
-
const { rsGroup, defaultUAssignedId, vnetConfiguration, logAnalyticsWorkspace, dapr, workloadProfiles, zoneRedundant, ...props } = this.args;
|
|
68
|
+
const { rsGroup, enableResourceIdentity, defaultUAssignedId, vnetConfiguration, logAnalyticsWorkspace, dapr, workloadProfiles, zoneRedundant, ...props } = this.args;
|
|
69
69
|
// Build Log Analytics configuration
|
|
70
70
|
const appLogsConfiguration = logAnalyticsWorkspace
|
|
71
71
|
? {
|
|
@@ -88,12 +88,14 @@ class AppContainerEnv extends base_1.BaseResourceComponent {
|
|
|
88
88
|
workloadProfileType: 'Consumption',
|
|
89
89
|
},
|
|
90
90
|
],
|
|
91
|
-
identity:
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
91
|
+
identity: enableResourceIdentity
|
|
92
|
+
? {
|
|
93
|
+
type: defaultUAssignedId
|
|
94
|
+
? app.ManagedServiceIdentityType.SystemAssigned_UserAssigned
|
|
95
|
+
: app.ManagedServiceIdentityType.SystemAssigned,
|
|
96
|
+
userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
|
|
97
|
+
}
|
|
98
|
+
: undefined,
|
|
97
99
|
// VNet integration
|
|
98
100
|
vnetConfiguration: vnetConfiguration
|
|
99
101
|
? {
|
|
@@ -139,4 +141,4 @@ class AppContainerEnv extends base_1.BaseResourceComponent {
|
|
|
139
141
|
}
|
|
140
142
|
}
|
|
141
143
|
exports.AppContainerEnv = AppContainerEnv;
|
|
142
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
144
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29udGFpbmVyRW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9BcHBDb250YWluZXJFbnYudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQWdEO0FBQ2hELHVEQUF5QztBQUV6QyxpREFBZ0U7QUFDaEUsa0NBQWdFO0FBQ2hFLHdDQUFzQztBQXFFdEMsTUFBYSxlQUFnQixTQUFRLDRCQUEwQztJQUM3RCxFQUFFLENBQXdCO0lBQzFCLFlBQVksQ0FBd0I7SUFDcEMsYUFBYSxDQUF3QjtJQUNyQyxRQUFRLENBQXdCO0lBRWhELFlBQVksSUFBWSxFQUFFLElBQXlCLEVBQUUsSUFBc0M7UUFDekYsS0FBSyxDQUFDLGlCQUFpQixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFM0MsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLHdCQUF3QixFQUFFLENBQUM7UUFDbkQsSUFBSSxDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ25DLElBQUksQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7UUFFNUIsSUFBSSxDQUFDLEVBQUUsR0FBRyxVQUFVLENBQUMsRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUNwQyxJQUFJLENBQUMsYUFBYSxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUM7UUFDOUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDO1FBRXBDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QixDQUFDO0lBRU0sVUFBVTtRQUNmLE9BQU87WUFDTCxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVk7WUFDL0IsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ1gsYUFBYSxFQUFFLElBQUksQ0FBQyxhQUFhO1lBQ2pDLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUTtZQUN2QixZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVk7U0FDaEMsQ0FBQztJQUNKLENBQUM7SUFFTyx3QkFBd0I7UUFDOUIsTUFBTSxFQUNKLE9BQU8sRUFDUCxzQkFBc0IsRUFDdEIsa0JBQWtCLEVBQ2xCLGlCQUFpQixFQUNqQixxQkFBcUIsRUFDckIsSUFBSSxFQUNKLGdCQUFnQixFQUNoQixhQUFhLEVBQ2IsR0FBRyxLQUFLLEVBQ1QsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBRWQsb0NBQW9DO1FBQ3BDLE1BQU0sb0JBQW9CLEdBQUcscUJBQXFCO1lBQ2hELENBQUMsQ0FBQztnQkFDRSxvQkFBb0IsRUFBRTtvQkFDcEIseUJBQXlCLEVBQUU7d0JBQ3pCLFVBQVUsRUFBRSxxQkFBcUIsQ0FBQyxFQUFFO3dCQUNwQyxTQUFTLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxFQUFFLENBQUMsRUFBRSwwQ0FBMEM7cUJBQy9GO2lCQUNGO2FBQ0Y7WUFDSCxDQUFDLENBQUMsU0FBUyxDQUFDO1FBRWQsT0FBTyxJQUFJLEdBQUcsQ0FBQyxrQkFBa0IsQ0FDL0IsSUFBSSxDQUFDLElBQUksRUFDVDtZQUNFLEdBQUcsS0FBSztZQUNSLEdBQUcsT0FBTztZQUNWLHlCQUF5QjtZQUN6QixHQUFHLG9CQUFvQjtZQUN2QixnQkFBZ0IsRUFBRSxnQkFBZ0IsSUFBSTtnQkFDcEM7b0JBQ0UsSUFBSSxFQUFFLGFBQWE7b0JBQ25CLG1CQUFtQixFQUFFLGFBQWE7aUJBQ25DO2FBQ0Y7WUFFRCxRQUFRLEVBQUUsc0JBQXNCO2dCQUM5QixDQUFDLENBQUM7b0JBQ0UsSUFBSSxFQUFFLGtCQUFrQjt3QkFDdEIsQ0FBQyxDQUFDLEdBQUcsQ0FBQywwQkFBMEIsQ0FBQywyQkFBMkI7d0JBQzVELENBQUMsQ0FBQyxHQUFHLENBQUMsMEJBQTBCLENBQUMsY0FBYztvQkFDakQsc0JBQXNCLEVBQUUsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7aUJBQ2pGO2dCQUNILENBQUMsQ0FBQyxTQUFTO1lBRWIsbUJBQW1CO1lBQ25CLGlCQUFpQixFQUFFLGlCQUFpQjtnQkFDbEMsQ0FBQyxDQUFDO29CQUNFLHNCQUFzQixFQUFFLGlCQUFpQixDQUFDLG9CQUFvQixDQUFDLEVBQUU7b0JBQ2pFLFFBQVEsRUFBRSxpQkFBaUIsQ0FBQyxRQUFRLElBQUksS0FBSztvQkFDN0Msb0JBQW9CLEVBQUUsaUJBQWlCLENBQUMsb0JBQW9CO29CQUM1RCxxQkFBcUIsRUFBRSxpQkFBaUIsQ0FBQyxxQkFBcUI7aUJBQy9EO2dCQUNILENBQUMsQ0FBQyxTQUFTO1lBRWIsaUJBQWlCO1lBQ2pCLHNCQUFzQixFQUFFLElBQUksRUFBRSxnQkFBZ0IsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLHNCQUFzQjtZQUNsRix3QkFBd0IsRUFBRSxJQUFJLEVBQUUsa0JBQWtCLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyx3QkFBd0I7WUFDeEYsYUFBYSxFQUFFLGFBQWEsSUFBSSxrQkFBUSxDQUFDLEtBQUs7U0FDL0MsRUFDRCxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRSxDQUMxRCxDQUFDO0lBQ0osQ0FBQztJQUVPLGlCQUFpQixDQUFDLEdBQTJCO1FBQ25ELE1BQU0sRUFBRSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBRXBELElBQUksR0FBRyxDQUFDLHdCQUF3QixDQUM5QixHQUFHLElBQUksQ0FBQyxJQUFJLGNBQWMsRUFDMUI7WUFDRSxVQUFVLEVBQUUsU0FBUztZQUNyQixlQUFlLEVBQUUsR0FBRyxDQUFDLElBQUk7WUFDekIsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLGlCQUFpQjtZQUM1QyxnQkFBZ0IsRUFBRSxvQkFBb0IsSUFBSTtnQkFDeEM7b0JBQ0UsT0FBTyxFQUFFLFFBQVE7b0JBQ2pCLGFBQWEsRUFBRSxDQUFDO29CQUNoQixZQUFZLEVBQUUsQ0FBQztpQkFDaEI7YUFDRjtTQUNGLEVBQ0QsRUFBRSxTQUFTLEVBQUUsR0FBRyxFQUFFLFdBQVcsRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUUsQ0FDOUUsQ0FBQztJQUNKLENBQUM7SUFFTyxVQUFVLENBQUMsR0FBMkI7UUFDNUMsTUFBTSxFQUFFLGFBQWEsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLGtCQUFrQixFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7UUFDeEYsSUFBSSxDQUFDLGFBQWE7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUVyQyxPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsT0FBTyxDQUMxQyxDQUFDLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FDckIsSUFBSSwyQkFBWSxDQUNkLE9BQU8sRUFDUDtZQUNFLEdBQUcsT0FBTztZQUNWLE9BQU87WUFDUCxTQUFTO1lBQ1Qsa0JBQWtCLEVBQUUsT0FBTyxDQUFDLGtCQUFrQixJQUFJLGtCQUFrQjtZQUNwRSxVQUFVO1lBQ1Ysb0JBQW9CLEVBQUUsR0FBRyxDQUFDLEVBQUU7U0FDN0IsRUFDRCxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsV0FBVyxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQ25ELENBQ0osQ0FBQztJQUNKLENBQUM7Q0FDRjtBQTNJRCwwQ0EySUMifQ==
|
package/app/IoTHub.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import * as devices from '@pulumi/azure-native/iothub';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
4
|
-
|
|
5
|
-
export interface IoTHubArgs extends CommonBaseArgs, types.WithUserAssignedIdentity, Pick<devices.IotHubResourceArgs, 'properties' | 'sku'> {
|
|
4
|
+
export interface IoTHubArgs extends CommonBaseArgs, Pick<devices.IotHubResourceArgs, 'properties' | 'sku'> {
|
|
6
5
|
}
|
|
7
6
|
export declare class IoTHub extends BaseResourceComponent<IoTHubArgs> {
|
|
8
7
|
readonly id: pulumi.Output<string>;
|
package/app/IoTHub.js
CHANGED
|
@@ -41,16 +41,18 @@ class IoTHub extends base_1.BaseResourceComponent {
|
|
|
41
41
|
resourceName;
|
|
42
42
|
constructor(name, args, opts) {
|
|
43
43
|
super('IoTHub', name, args, opts);
|
|
44
|
-
const { rsGroup, defaultUAssignedId, ...props } = args;
|
|
44
|
+
const { rsGroup, enableResourceIdentity, defaultUAssignedId, ...props } = args;
|
|
45
45
|
const iot = new devices.IotHubResource(name, {
|
|
46
46
|
...props,
|
|
47
47
|
...rsGroup,
|
|
48
|
-
identity:
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
48
|
+
identity: enableResourceIdentity
|
|
49
|
+
? {
|
|
50
|
+
type: defaultUAssignedId
|
|
51
|
+
? devices.ResourceIdentityType.SystemAssigned_UserAssigned
|
|
52
|
+
: devices.ResourceIdentityType.SystemAssigned,
|
|
53
|
+
userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
|
|
54
|
+
}
|
|
55
|
+
: undefined,
|
|
54
56
|
properties: {
|
|
55
57
|
enableFileUploadNotifications: false,
|
|
56
58
|
features: devices.Capabilities.None,
|
|
@@ -77,4 +79,4 @@ class IoTHub extends base_1.BaseResourceComponent {
|
|
|
77
79
|
}
|
|
78
80
|
}
|
|
79
81
|
exports.IoTHub = IoTHub;
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW9USHViLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9Jb1RIdWIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscUVBQXVEO0FBRXZELGtDQUFnRTtBQUloRSxNQUFhLE1BQU8sU0FBUSw0QkFBaUM7SUFDM0MsRUFBRSxDQUF3QjtJQUMxQixZQUFZLENBQXdCO0lBRXBELFlBQVksSUFBWSxFQUFFLElBQWdCLEVBQUUsSUFBc0M7UUFDaEYsS0FBSyxDQUFDLFFBQVEsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRWxDLE1BQU0sRUFBRSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUM7UUFFL0UsTUFBTSxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUMsY0FBYyxDQUNwQyxJQUFJLEVBQ0o7WUFDRSxHQUFHLEtBQUs7WUFDUixHQUFHLE9BQU87WUFFVixRQUFRLEVBQUUsc0JBQXNCO2dCQUM5QixDQUFDLENBQUM7b0JBQ0UsSUFBSSxFQUFFLGtCQUFrQjt3QkFDdEIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQywyQkFBMkI7d0JBQzFELENBQUMsQ0FBQyxPQUFPLENBQUMsb0JBQW9CLENBQUMsY0FBYztvQkFDL0Msc0JBQXNCLEVBQUUsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7aUJBQ2pGO2dCQUNILENBQUMsQ0FBQyxTQUFTO1lBRWIsVUFBVSxFQUFFO2dCQUNWLDZCQUE2QixFQUFFLEtBQUs7Z0JBQ3BDLFFBQVEsRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDLElBQUk7Z0JBQ25DLGtCQUFrQixFQUFFO29CQUNsQixpQkFBaUIsRUFBRTt3QkFDakIscUJBQXFCLEVBQUUsTUFBTTt3QkFDN0IsZ0JBQWdCLEVBQUUsRUFBRTt3QkFDcEIsWUFBWSxFQUFFLE1BQU07cUJBQ3JCO2lCQUNGO2dCQUNELGFBQWEsRUFBRSxLQUFLO2dCQUNwQixHQUFHLEtBQUssRUFBRSxVQUFVO2FBQ3JCO1NBQ0YsRUFDRCxFQUFFLEdBQUcsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDMUIsQ0FBQztRQUVGLElBQUksQ0FBQyxFQUFFLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNqQixJQUFJLENBQUMsWUFBWSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFFN0IsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFTSxVQUFVO1FBQ2YsT0FBTztZQUNMLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLFlBQVksRUFBRSxJQUFJLENBQUMsWUFBWTtTQUNoQyxDQUFDO0lBQ0osQ0FBQztDQUNGO0FBckRELHdCQXFEQyJ9
|
package/app/LogicApp.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import * as logic from '@pulumi/azure-native/logic';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
4
|
-
|
|
5
|
-
export interface LogicAppArgs extends CommonBaseArgs, types.WithUserAssignedIdentity {
|
|
4
|
+
export interface LogicAppArgs extends CommonBaseArgs {
|
|
6
5
|
integrationAccount: Pick<logic.IntegrationAccountArgs, 'integrationServiceEnvironment'> & {
|
|
7
6
|
sku: logic.IntegrationAccountSkuName;
|
|
8
7
|
};
|
package/app/LogicApp.js
CHANGED
|
@@ -41,7 +41,7 @@ class LogicApp extends base_1.BaseResourceComponent {
|
|
|
41
41
|
resourceName;
|
|
42
42
|
constructor(name, args, opts) {
|
|
43
43
|
super('LogicApp', name, args, opts);
|
|
44
|
-
const { rsGroup, defaultUAssignedId, integrationAccount, workflow } = args;
|
|
44
|
+
const { rsGroup, enableResourceIdentity, defaultUAssignedId, integrationAccount, workflow } = args;
|
|
45
45
|
const account = new logic.IntegrationAccount(name, {
|
|
46
46
|
...integrationAccount,
|
|
47
47
|
...rsGroup,
|
|
@@ -50,12 +50,14 @@ class LogicApp extends base_1.BaseResourceComponent {
|
|
|
50
50
|
const wf = new logic.Workflow(name, {
|
|
51
51
|
...rsGroup,
|
|
52
52
|
...workflow,
|
|
53
|
-
identity:
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
53
|
+
identity: enableResourceIdentity
|
|
54
|
+
? {
|
|
55
|
+
type: defaultUAssignedId?.id
|
|
56
|
+
? logic.ManagedServiceIdentityType.UserAssigned
|
|
57
|
+
: logic.ManagedServiceIdentityType.SystemAssigned,
|
|
58
|
+
userAssignedIdentities: defaultUAssignedId?.id ? [defaultUAssignedId.id] : undefined,
|
|
59
|
+
}
|
|
60
|
+
: undefined,
|
|
59
61
|
integrationAccount: { id: account.id },
|
|
60
62
|
}, {
|
|
61
63
|
...opts,
|
|
@@ -74,4 +76,4 @@ class LogicApp extends base_1.BaseResourceComponent {
|
|
|
74
76
|
}
|
|
75
77
|
}
|
|
76
78
|
exports.LogicApp = LogicApp;
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naWNBcHAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXBwL0xvZ2ljQXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGtFQUFvRDtBQUVwRCxrQ0FBZ0U7QUFhaEUsTUFBYSxRQUFTLFNBQVEsNEJBQW1DO0lBQy9DLEVBQUUsQ0FBd0I7SUFDMUIsWUFBWSxDQUF3QjtJQUVwRCxZQUFZLElBQVksRUFBRSxJQUFrQixFQUFFLElBQXNDO1FBQ2xGLEtBQUssQ0FBQyxVQUFVLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUVwQyxNQUFNLEVBQUUsT0FBTyxFQUFFLHNCQUFzQixFQUFFLGtCQUFrQixFQUFFLGtCQUFrQixFQUFFLFFBQVEsRUFBRSxHQUFHLElBQUksQ0FBQztRQUNuRyxNQUFNLE9BQU8sR0FBRyxJQUFJLEtBQUssQ0FBQyxrQkFBa0IsQ0FDMUMsSUFBSSxFQUNKO1lBQ0UsR0FBRyxrQkFBa0I7WUFDckIsR0FBRyxPQUFPO1lBQ1YsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLGtCQUFrQixDQUFDLEdBQUcsRUFBRTtTQUN0QyxFQUNELEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUM3QyxDQUFDO1FBRUYsTUFBTSxFQUFFLEdBQUcsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUMzQixJQUFJLEVBQ0o7WUFDRSxHQUFHLE9BQU87WUFDVixHQUFHLFFBQVE7WUFDWCxRQUFRLEVBQUUsc0JBQXNCO2dCQUM5QixDQUFDLENBQUM7b0JBQ0UsSUFBSSxFQUFFLGtCQUFrQixFQUFFLEVBQUU7d0JBQzFCLENBQUMsQ0FBQyxLQUFLLENBQUMsMEJBQTBCLENBQUMsWUFBWTt3QkFDL0MsQ0FBQyxDQUFDLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxjQUFjO29CQUVuRCxzQkFBc0IsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7aUJBQ3JGO2dCQUNILENBQUMsQ0FBQyxTQUFTO1lBRWIsa0JBQWtCLEVBQUUsRUFBRSxFQUFFLEVBQUUsT0FBTyxDQUFDLEVBQUUsRUFBRTtTQUN2QyxFQUNEO1lBQ0UsR0FBRyxJQUFJO1lBQ1AsU0FBUyxFQUFFLE9BQU87WUFDbEIsTUFBTSxFQUFFLElBQUk7U0FDYixDQUNGLENBQUM7UUFFRixJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDaEIsSUFBSSxDQUFDLFlBQVksR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDO1FBRTVCLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QixDQUFDO0lBRU0sVUFBVTtRQUNmLE9BQU87WUFDTCxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUU7WUFDWCxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVk7U0FDaEMsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQXRERCw0QkFzREMifQ==
|
package/app/SignalR.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import * as pulumi from '@pulumi/pulumi';
|
|
|
2
2
|
import * as ss from '@pulumi/azure-native/signalrservice';
|
|
3
3
|
import * as types from '../types';
|
|
4
4
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
5
|
-
export interface SignalRArgs extends CommonBaseArgs,
|
|
5
|
+
export interface SignalRArgs extends CommonBaseArgs, Partial<Pick<ss.SignalRArgs, 'kind' | 'cors' | 'features' | 'tls' | 'identity'>> {
|
|
6
6
|
sku: {
|
|
7
7
|
/**
|
|
8
8
|
* Optional, integer. The unit count of the resource.
|
package/app/SignalR.js
CHANGED
|
@@ -37,7 +37,7 @@ exports.SignalR = void 0;
|
|
|
37
37
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
38
|
const ss = __importStar(require("@pulumi/azure-native/signalrservice"));
|
|
39
39
|
const base_1 = require("../base");
|
|
40
|
-
const
|
|
40
|
+
const vault_1 = require("../vault");
|
|
41
41
|
const vnet_1 = require("../vnet");
|
|
42
42
|
class SignalR extends base_1.BaseResourceComponent {
|
|
43
43
|
id;
|
|
@@ -129,7 +129,7 @@ class SignalR extends base_1.BaseResourceComponent {
|
|
|
129
129
|
// secrets[`${this.name}-default-app-id`] =
|
|
130
130
|
// pulumi.interpolate`Endpoint=https://${service.name}.service.signalr.net;AuthType=azure.app;ClientId=${defaultAppIdentity.clientId};ClientSecret=789;TenantId=${azureEnv.tenantId};Version=1.0;`;
|
|
131
131
|
// }
|
|
132
|
-
return new
|
|
132
|
+
return new vault_1.VaultSecrets(`${this.name}-signalR`, {
|
|
133
133
|
vaultInfo,
|
|
134
134
|
secrets,
|
|
135
135
|
}, { dependsOn: service, deletedWith: service, parent: this });
|
|
@@ -137,4 +137,4 @@ class SignalR extends base_1.BaseResourceComponent {
|
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
exports.SignalR = SignalR;
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2lnbmFsUi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcHAvU2lnbmFsUi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx1REFBeUM7QUFDekMsd0VBQTBEO0FBRzFELGtDQUFnRTtBQUNoRSxvQ0FBd0M7QUFFeEMsa0NBQTBDO0FBb0MxQyxNQUFhLE9BQVEsU0FBUSw0QkFBa0M7SUFDN0MsRUFBRSxDQUF3QjtJQUMxQixZQUFZLENBQXdCO0lBRXBELFlBQVksSUFBWSxFQUFFLElBQWlCLEVBQUUsSUFBc0M7UUFDakYsS0FBSyxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRW5DLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxHQUFHLEtBQUssRUFBRSxHQUFHLElBQUksQ0FBQztRQUNqRCxNQUFNLFVBQVUsR0FBRyxHQUFHLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQztRQUUxQyxNQUFNLE9BQU8sR0FBRyxJQUFJLEVBQUUsQ0FBQyxPQUFPLENBQzVCLElBQUksRUFDSjtZQUNFLEdBQUcsS0FBSztZQUNSLEdBQUcsT0FBTztZQUNWLEdBQUc7WUFDSCxtQkFBbUIsRUFBRSxPQUFPLEVBQUUsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxTQUFTO1lBQzdHLFdBQVcsRUFBRSxVQUFVO2dCQUNyQixDQUFDLENBQUMsU0FBUztnQkFDWCxDQUFDLENBQUMsT0FBTyxFQUFFLFdBQVc7b0JBQ3BCLENBQUMsQ0FBQzt3QkFDRSxhQUFhLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxLQUFLO3dCQUNqQyxhQUFhLEVBQUU7NEJBQ2IsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFD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
|
|
@@ -14,6 +14,12 @@ export interface AppRegistrationArgs extends WithVaultInfo, WithMemberOfArgs, Pa
|
|
|
14
14
|
info?: Pick<azAd.ApplicationArgs, 'description' | 'displayName' | 'logoImage' | 'marketingUrl' | 'notes' | 'privacyStatementUrl'>;
|
|
15
15
|
groupMembershipClaims?: pulumi.Input<GroupMembershipClaimsTypes[]>;
|
|
16
16
|
identifierUris?: pulumi.Input<pulumi.Input<string>[]>;
|
|
17
|
+
federatedCredentials?: Array<{
|
|
18
|
+
name: string;
|
|
19
|
+
issuer: pulumi.Input<string>;
|
|
20
|
+
subject: pulumi.Input<string>;
|
|
21
|
+
audiences?: pulumi.Input<pulumi.Input<string>[]>;
|
|
22
|
+
}>;
|
|
17
23
|
servicePrincipal?: Pick<azAd.ServicePrincipalArgs, 'notificationEmailAddresses' | 'preferredSingleSignOnMode' | 'samlSingleSignOn'> & {
|
|
18
24
|
appRoleAssignmentRequired?: pulumi.Input<boolean>;
|
|
19
25
|
assignedGroupIds?: pulumi.Input<string>[];
|
|
@@ -39,6 +45,7 @@ export declare class AppRegistration extends BaseComponent<AppRegistrationArgs>
|
|
|
39
45
|
readonly clientSecret: pulumi.Output<string>;
|
|
40
46
|
readonly servicePrincipalId: pulumi.Output<string>;
|
|
41
47
|
readonly servicePrincipalPassword: pulumi.Output<string>;
|
|
48
|
+
readonly applicationId: pulumi.Output<string>;
|
|
42
49
|
private vaultSecrets;
|
|
43
50
|
constructor(name: string, args?: AppRegistrationArgs, opts?: pulumi.ComponentResourceOptions);
|
|
44
51
|
getOutputs(): {
|
|
@@ -48,6 +55,7 @@ export declare class AppRegistration extends BaseComponent<AppRegistrationArgs>
|
|
|
48
55
|
vaultSecrets: {
|
|
49
56
|
[key: string]: import("../vault").VaultSecretResult;
|
|
50
57
|
};
|
|
58
|
+
applicationId: pulumi.Output<string>;
|
|
51
59
|
};
|
|
52
60
|
private createAppRegistration;
|
|
53
61
|
private createServicePrincipal;
|