@drunk-pulumi/azure-components 1.1.26 → 1.1.28
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/aks/AzKubernetes.d.ts +4 -1
- package/aks/AzKubernetes.js +3 -8
- package/app/AppContainer.d.ts +12 -15
- package/app/AppContainer.js +12 -16
- package/app/AppContainerEnv.d.ts +9 -7
- package/app/AppContainerEnv.js +18 -15
- package/app/AppJob.d.ts +3 -3
- package/app/AppJob.js +11 -4
- package/app/appContainerHelper.d.ts +29 -0
- package/app/appContainerHelper.js +138 -0
- package/app/index.d.ts +1 -0
- package/app/index.js +25 -1
- package/azAd/AzRole.d.ts +5 -3
- package/azAd/AzRole.js +34 -22
- package/azAd/GroupRole.d.ts +6 -6
- package/azAd/GroupRole.js +4 -14
- package/package.json +1 -1
- package/types.d.ts +7 -9
- package/vnet/FirewallPolicies/commonPolicies.d.ts +2 -1
- package/vnet/FirewallPolicies/commonPolicies.js +25 -6
- package/vnet/VirtualNetwork.js +14 -9
package/aks/AzKubernetes.d.ts
CHANGED
|
@@ -23,7 +23,10 @@ type MaintenanceArgs = LegacyMaintenanceArgs | {
|
|
|
23
23
|
nodeOS?: AutoUpgradeScheduleArgs;
|
|
24
24
|
};
|
|
25
25
|
export interface AzKubernetesArgs extends CommonBaseArgs, types.WithEncryptionEnabler, types.WithGroupRolesArgs, types.WithUserAssignedIdentity, types.WithDiskEncryptSet, Partial<Pick<ccs.ManagedClusterArgs, 'dnsPrefix' | 'supportPlan' | 'autoScalerProfile' | 'autoUpgradeProfile' | 'storageProfile'>> {
|
|
26
|
-
sku:
|
|
26
|
+
sku: {
|
|
27
|
+
name: ccs.ManagedClusterSKUName;
|
|
28
|
+
tier?: ccs.ManagedClusterSKUTier;
|
|
29
|
+
};
|
|
27
30
|
nodeResourceGroup?: pulumi.Input<string>;
|
|
28
31
|
namespaces?: Record<string, ccs.NamespaceArgs['properties']>;
|
|
29
32
|
/** This only allows when cluster creating. For additional agent pool after cluster created please use extraAgentPools */
|
package/aks/AzKubernetes.js
CHANGED
|
@@ -190,6 +190,7 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
190
190
|
return new ccs.ManagedCluster(this.name, {
|
|
191
191
|
...props,
|
|
192
192
|
...rsGroup,
|
|
193
|
+
sku,
|
|
193
194
|
aadProfile: groupRoles
|
|
194
195
|
? {
|
|
195
196
|
enableAzureRBAC: true,
|
|
@@ -282,9 +283,7 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
282
283
|
//userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
|
|
283
284
|
}
|
|
284
285
|
: undefined,
|
|
285
|
-
//
|
|
286
|
-
// ? pulumi.output(defaultUAssignedId).apply((uID) => ({ [uID.id]: uID }))
|
|
287
|
-
// : undefined,
|
|
286
|
+
//identityProfile: {},
|
|
288
287
|
linuxProfile: {
|
|
289
288
|
adminUsername: login.userName,
|
|
290
289
|
ssh: { publicKeys: [{ keyData: login.sshPublicKey }] },
|
|
@@ -324,10 +323,6 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
324
323
|
clientId: appID.clientId,
|
|
325
324
|
secret: appID.clientSecret,
|
|
326
325
|
},
|
|
327
|
-
sku: {
|
|
328
|
-
name: ccs.ManagedClusterSKUName.Base,
|
|
329
|
-
tier: sku,
|
|
330
|
-
},
|
|
331
326
|
windowsProfile: undefined,
|
|
332
327
|
workloadAutoScalerProfile: {
|
|
333
328
|
verticalPodAutoscaler: {
|
|
@@ -524,4 +519,4 @@ class AzKubernetes extends base_1.BaseResourceComponent {
|
|
|
524
519
|
}
|
|
525
520
|
}
|
|
526
521
|
exports.AzKubernetes = AzKubernetes;
|
|
527
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":"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"}
|
|
522
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":"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"}
|
package/app/AppContainer.d.ts
CHANGED
|
@@ -3,6 +3,13 @@ import * as inputs from '@pulumi/azure-native/types/input';
|
|
|
3
3
|
import * as pulumi from '@pulumi/pulumi';
|
|
4
4
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
5
5
|
import * as types from '../types';
|
|
6
|
+
export type AppSecretArgs = {
|
|
7
|
+
name: string;
|
|
8
|
+
/** Plain value OR keyVaultUrl (prefer Key Vault) */
|
|
9
|
+
value?: pulumi.Input<string>;
|
|
10
|
+
keyVaultUrl?: pulumi.Input<string>;
|
|
11
|
+
identity?: pulumi.Input<string>;
|
|
12
|
+
};
|
|
6
13
|
/**
|
|
7
14
|
* Azure Container App component providing secure, serverless container execution
|
|
8
15
|
* with auto-scaling, ingress, and managed environment integration.
|
|
@@ -13,23 +20,19 @@ export interface AppContainerArgs extends CommonBaseArgs, Partial<Pick<app.Conta
|
|
|
13
20
|
/** Container configuration */
|
|
14
21
|
template: {
|
|
15
22
|
/** Container definitions (at least one required) */
|
|
16
|
-
containers: Array<Partial<Pick<inputs.app.ContainerArgs, 'args' | 'command' | 'env' | 'probes' | 'volumeMounts' | 'resources'
|
|
23
|
+
containers: Array<Partial<Pick<inputs.app.ContainerArgs, 'args' | 'command' | 'env' | 'probes' | 'volumeMounts' | 'resources'>> & {
|
|
17
24
|
/** Container name */
|
|
18
|
-
name
|
|
25
|
+
name?: string;
|
|
19
26
|
/** Container image (e.g., 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest') */
|
|
20
27
|
image: pulumi.Input<string>;
|
|
21
28
|
}>;
|
|
22
29
|
/** Init containers */
|
|
23
30
|
initContainers?: Array<Partial<Pick<inputs.app.InitContainerArgs, 'args' | 'command' | 'env' | 'volumeMounts' | 'resources'>> & {
|
|
24
|
-
name
|
|
31
|
+
name?: string;
|
|
25
32
|
image: pulumi.Input<string>;
|
|
26
33
|
}>;
|
|
27
34
|
/** Scaling configuration */
|
|
28
|
-
scale?:
|
|
29
|
-
minReplicas?: number;
|
|
30
|
-
maxReplicas?: number;
|
|
31
|
-
rules?: pulumi.Input<pulumi.Input<inputs.app.ScaleRuleArgs>[]>;
|
|
32
|
-
}>;
|
|
35
|
+
scale?: inputs.app.ScaleArgs;
|
|
33
36
|
/** Volume definitions */
|
|
34
37
|
volumes?: pulumi.Input<pulumi.Input<inputs.app.VolumeArgs>[]>;
|
|
35
38
|
/** Revision suffix */
|
|
@@ -59,13 +62,7 @@ export interface AppContainerArgs extends CommonBaseArgs, Partial<Pick<app.Conta
|
|
|
59
62
|
/** Registry credentials */
|
|
60
63
|
registries?: pulumi.Input<pulumi.Input<inputs.app.RegistryCredentialsArgs>[]>;
|
|
61
64
|
/** Secrets for environment variables or registry auth */
|
|
62
|
-
secrets?: Array<
|
|
63
|
-
name: string;
|
|
64
|
-
/** Plain value OR keyVaultUrl (prefer Key Vault) */
|
|
65
|
-
value?: pulumi.Input<string>;
|
|
66
|
-
keyVaultUrl?: pulumi.Input<string>;
|
|
67
|
-
identity?: pulumi.Input<string>;
|
|
68
|
-
}>;
|
|
65
|
+
secrets?: Array<AppSecretArgs>;
|
|
69
66
|
/** Max inactive revisions */
|
|
70
67
|
maxInactiveRevisions?: pulumi.Input<number>;
|
|
71
68
|
};
|
package/app/AppContainer.js
CHANGED
|
@@ -100,7 +100,7 @@ class AppContainer extends base_1.BaseResourceComponent {
|
|
|
100
100
|
name: s.name,
|
|
101
101
|
value: s.value,
|
|
102
102
|
keyVaultUrl: s.keyVaultUrl,
|
|
103
|
-
identity: s.identity,
|
|
103
|
+
identity: s.identity ?? defaultUAssignedId?.id,
|
|
104
104
|
})),
|
|
105
105
|
maxInactiveRevisions: configuration.maxInactiveRevisions,
|
|
106
106
|
}
|
|
@@ -108,30 +108,26 @@ class AppContainer extends base_1.BaseResourceComponent {
|
|
|
108
108
|
template: {
|
|
109
109
|
containers: template.containers.map((c) => ({
|
|
110
110
|
...c,
|
|
111
|
-
name: c.name,
|
|
111
|
+
name: c.name ?? this.name,
|
|
112
112
|
image: c.image,
|
|
113
|
+
imageType: 'ContainerImage',
|
|
113
114
|
resources: c.resources ?? {
|
|
114
115
|
cpu: 0.25,
|
|
115
116
|
memory: '0.5Gi',
|
|
116
117
|
},
|
|
118
|
+
env: c.env ??
|
|
119
|
+
configuration?.secrets?.map((s) => ({
|
|
120
|
+
name: s.name,
|
|
121
|
+
secretRef: s.name,
|
|
122
|
+
})),
|
|
117
123
|
})),
|
|
118
124
|
initContainers: template.initContainers?.map((ic) => ({
|
|
119
125
|
...ic,
|
|
120
|
-
name: ic.name
|
|
126
|
+
name: ic.name ?? `${this.name}-init`,
|
|
121
127
|
image: ic.image,
|
|
128
|
+
imageType: 'ContainerImage',
|
|
122
129
|
})),
|
|
123
|
-
scale: template.scale
|
|
124
|
-
? {
|
|
125
|
-
cooldownPeriod: template.scale.cooldownPeriod,
|
|
126
|
-
maxReplicas: template.scale.maxReplicas ?? 10,
|
|
127
|
-
minReplicas: template.scale.minReplicas ?? 0,
|
|
128
|
-
pollingInterval: template.scale.pollingInterval,
|
|
129
|
-
rules: template.scale.rules,
|
|
130
|
-
}
|
|
131
|
-
: {
|
|
132
|
-
minReplicas: 0,
|
|
133
|
-
maxReplicas: 10,
|
|
134
|
-
},
|
|
130
|
+
scale: template.scale,
|
|
135
131
|
volumes: template.volumes,
|
|
136
132
|
revisionSuffix: template.revisionSuffix,
|
|
137
133
|
serviceBinds: template.serviceBinds,
|
|
@@ -141,4 +137,4 @@ class AppContainer extends base_1.BaseResourceComponent {
|
|
|
141
137
|
}
|
|
142
138
|
}
|
|
143
139
|
exports.AppContainer = AppContainer;
|
|
144
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29udGFpbmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9BcHBDb250YWluZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQWdEO0FBRWhELHVEQUF5QztBQUV6QyxrQ0FBZ0U7QUFzR2hFLE1BQWEsWUFBYSxTQUFRLDRCQUF1QztJQUN2RCxFQUFFLENBQXdCO0lBQzFCLFlBQVksQ0FBd0I7SUFDcEMsSUFBSSxDQUFvQztJQUN4QyxrQkFBa0IsQ0FBd0I7SUFDMUMsbUJBQW1CLENBQTBCO0lBRTdELFlBQVksSUFBWSxFQUFFLElBQXNCLEVBQUUsSUFBc0M7UUFDdEYsS0FBSyxDQUFDLGNBQWMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRXhDLE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBRS9DLElBQUksQ0FBQyxFQUFFLEdBQUcsWUFBWSxDQUFDLEVBQUUsQ0FBQztRQUMxQixJQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQyxJQUFJLENBQUM7UUFDdEMsSUFBSSxDQUFDLElBQUksR0FBRyxZQUFZLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUN0RSxJQUFJLENBQUMsa0JBQWtCLEdBQUcsWUFBWSxDQUFDLGtCQUFrQixDQUFDO1FBQzFELElBQUksQ0FBQyxtQkFBbUIsR0FBRyxZQUFZLENBQUMsbUJBQW1CLENBQUM7UUFFNUQsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFTSxVQUFVO1FBS2YsT0FBTztZQUNMLFlBQVksRUFBRSxJQUFJLENBQUMsWUFBWTtZQUMvQixpQkFBaUIsRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLGlCQUFpQixDQUFDO1lBQ3JFLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtZQUNmLGtCQUFrQixFQUFFLElBQUksQ0FBQyxrQkFBa0I7WUFDM0MsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLG1CQUFtQjtTQUM5QyxDQUFDO0lBQ0osQ0FBQztJQUVPLGtCQUFrQjtRQUN4QixNQUFNLEVBQ0osT0FBTyxFQUNQLHNCQUFzQixFQUN0QixrQkFBa0IsRUFDbEIsb0JBQW9CLEVBQ3BCLFFBQVEsRUFDUixhQUFhLEVBQ2IsR0FBRyxLQUFLLEVBQ1QsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBRWQsT0FBTyxJQUFJLEdBQUcsQ0FBQyxZQUFZLENBQ3pCLElBQUksQ0FBQyxJQUFJLEVBQ1Q7WUFDRSxHQUFHLEtBQUs7WUFDUixHQUFHLE9BQU87WUFDVixvQkFBb0I7WUFDcEIsUUFBUSxFQUFFLHNCQUFzQjtnQkFDOUIsQ0FBQyxDQUFDO29CQUNFLElBQUksRUFBRSxrQkFBa0I7d0JBQ3RCLENBQUMsQ0FBQyxHQUFHLENBQUMsMEJBQTBCLENBQUMsMkJBQTJCO3dCQUM1RCxDQUFDLENBQUMsR0FBRyxDQUFDLDBCQUEwQixDQUFDLGNBQWM7b0JBQ2pELHNCQUFzQixFQUFFLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTO2lCQUNqRjtnQkFDSCxDQUFDLENBQUMsU0FBUztZQUViLGFBQWEsRUFBRSxhQUFhO2dCQUMxQixDQUFDLENBQUM7b0JBQ0UsbUJBQW1CLEVBQUUsYUFBYSxDQUFDLG1CQUFtQixJQUFJLEdBQUcsQ0FBQyxtQkFBbUIsQ0FBQyxNQUFNO29CQUN4RixPQUFPLEVBQUUsYUFBYSxDQUFDLE9BQU87d0JBQzVCLENBQUMsQ0FBQzs0QkFDRSxHQUFHLGFBQWEsQ0FBQyxPQUFPOzRCQUN4QixRQUFRLEVBQUUsYUFBYSxDQUFDLE9BQU8sQ0FBQyxRQUFRLElBQUksS0FBSzs0QkFDakQsVUFBVSxFQUFFLGFBQWEsQ0FBQyxPQUFPLENBQUMsVUFBVSxJQUFJLEVBQUU7NEJBQ2xELGFBQWEsRUFBRSxhQUFhLENBQUMsT0FBTyxDQUFDLGFBQWEsSUFBSSxLQUFLOzRCQUMzRCxPQUFPLEVBQUUsYUFBYSxDQUFDLE9BQU8sQ0FBQyxPQUFPO3lCQUN2Qzt3QkFDSCxDQUFDLENBQUMsU0FBUztvQkFDYixJQUFJLEVBQUUsYUFBYSxDQUFDLElBQUksRUFBRSxPQUFPO3dCQUMvQixDQUFDLENBQUM7NEJBQ0UsR0FBRyxhQUFhLENBQUMsSUFBSTs0QkFDckIsT0FBTyxFQUFFLElBQUk7eUJBQ2Q7d0JBQ0gsQ0FBQyxDQUFDLFNBQVM7b0JBQ2IsVUFBVSxFQUFFLGFBQWEsQ0FBQyxVQUFVO29CQUNwQyxPQUFPLEVBQUUsYUFBYSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7d0JBQzFDLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSTt3QkFDWixLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUs7d0JBQ2QsV0FBVyxFQUFFLENBQUMsQ0FBQyxXQUFXO3dCQUMxQixRQUFRLEVBQUUsQ0FBQyxDQUFDLFFBQVEsSUFBSSxrQkFBa0IsRUFBRSxFQUFFO3FCQUMvQyxDQUFDLENBQUM7b0JBQ0gsb0JBQW9CLEVBQUUsYUFBYSxDQUFDLG9CQUFvQjtpQkFDekQ7Z0JBQ0gsQ0FBQyxDQUFDLFNBQVM7WUFFYixRQUFRLEVBQUU7Z0JBQ1IsVUFBVSxFQUFFLFFBQVEsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO29CQUMxQyxHQUFHLENBQUM7b0JBQ0osSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLElBQUksSUFBSSxDQUFDLElBQUk7b0JBQ3pCLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSztvQkFDZCxTQUFTLEVBQUUsZ0JBQWdCO29CQUMzQixTQUFTLEVBQUUsQ0FBQyxDQUFDLFNBQVMsSUFBSTt3QkFDeEIsR0FBRyxFQUFFLElBQUk7d0JBQ1QsTUFBTSxFQUFFLE9BQU87cUJBQ2hCO29CQUNELEdBQUcsRUFDRCxDQUFDLENBQUMsR0FBRzt3QkFDTCxhQUFhLEVBQUUsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQzs0QkFDbEMsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJOzRCQUNaLFNBQVMsRUFBRSxDQUFDLENBQUMsSUFBSTt5QkFDbEIsQ0FBQyxDQUFDO2lCQUNOLENBQUMsQ0FBQztnQkFFSCxjQUFjLEVBQUUsUUFBUSxDQUFDLGNBQWMsRUFBRSxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7b0JBQ3BELEdBQUcsRUFBRTtvQkFDTCxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLE9BQU87b0JBQ3BDLEtBQUssRUFBRSxFQUFFLENBQUMsS0FBSztvQkFDZixTQUFTLEVBQUUsZ0JBQWdCO2lCQUM1QixDQUFDLENBQUM7Z0JBRUgsS0FBSyxFQUFFLFFBQVEsQ0FBQyxLQUFLO2dCQUNyQixPQUFPLEVBQUUsUUFBUSxDQUFDLE9BQU87Z0JBQ3pCLGNBQWMsRUFBRSxRQUFRLENBQUMsY0FBYztnQkFDdkMsWUFBWSxFQUFFLFFBQVEsQ0FBQyxZQUFZO2dCQUNuQyw2QkFBNkIsRUFBRSxRQUFRLENBQUMsNkJBQTZCLElBQUksRUFBRTthQUM1RTtTQUNGLEVBQ0QsRUFBRSxHQUFHLElBQUksQ0FBQyxJQUFJLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLENBQ2xELENBQUM7SUFDSixDQUFDO0NBQ0Y7QUE5SEQsb0NBOEhDIn0=
|
package/app/AppContainerEnv.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { AppContainerArgs } from './AppContainer';
|
|
|
5
5
|
import { BaseResourceComponent, CommonBaseArgs } from '../base';
|
|
6
6
|
import * as enums from '@pulumi/azure-native/types/enums';
|
|
7
7
|
import { AppJobArgs } from './AppJob';
|
|
8
|
-
interface ScheduledEntryArgs {
|
|
8
|
+
export interface ScheduledEntryArgs {
|
|
9
9
|
/**
|
|
10
10
|
* Length of maintenance window range from 8 to 24 hours.
|
|
11
11
|
*/
|
|
@@ -19,11 +19,16 @@ interface ScheduledEntryArgs {
|
|
|
19
19
|
*/
|
|
20
20
|
weekDay: pulumi.Input<enums.app.WeekDay>;
|
|
21
21
|
}
|
|
22
|
+
export type ContainerAppsArgs = Omit<AppContainerArgs, types.CommonProps | 'managedEnvironmentId'>;
|
|
23
|
+
export type ContainerJobsArgs = Omit<AppJobArgs, types.CommonProps | 'managedEnvironmentId'>;
|
|
22
24
|
/**
|
|
23
25
|
* Azure Container Apps Managed Environment component providing isolated hosting
|
|
24
26
|
* environment for container apps with networking, monitoring, and scaling features.
|
|
25
27
|
*/
|
|
26
|
-
export interface AppContainerEnvArgs extends CommonBaseArgs, Partial<Pick<app.ManagedEnvironmentArgs, 'daprAIConnectionString' | 'daprAIInstrumentationKey' | 'customDomainConfiguration' | 'infrastructureResourceGroup' | 'peerAuthentication' | 'peerTrafficConfiguration' | 'workloadProfiles' | 'zoneRedundant' | '
|
|
28
|
+
export interface AppContainerEnvArgs extends CommonBaseArgs, Partial<Pick<app.ManagedEnvironmentArgs, 'daprAIConnectionString' | 'daprAIInstrumentationKey' | 'customDomainConfiguration' | 'infrastructureResourceGroup' | 'peerAuthentication' | 'peerTrafficConfiguration' | 'workloadProfiles' | 'zoneRedundant' | 'publicNetworkAccess'>> {
|
|
29
|
+
logs?: Omit<types.LogsInputs, 'storage'> & {
|
|
30
|
+
enableOpenTelemetry?: boolean;
|
|
31
|
+
};
|
|
27
32
|
/** VNet configuration for internal networking */
|
|
28
33
|
vnetConfiguration?: {
|
|
29
34
|
/** Subnet resource info for infrastructure components */
|
|
@@ -35,8 +40,6 @@ export interface AppContainerEnvArgs extends CommonBaseArgs, Partial<Pick<app.Ma
|
|
|
35
40
|
/** Platform-reserved DNS IP (must be within platformReservedCidr) */
|
|
36
41
|
platformReservedDnsIP?: pulumi.Input<string>;
|
|
37
42
|
};
|
|
38
|
-
/** Log Analytics workspace for Container App logs and metrics */
|
|
39
|
-
logAnalyticsWorkspace?: types.ResourceInputs;
|
|
40
43
|
/** Dapr configuration */
|
|
41
44
|
dapr?: {
|
|
42
45
|
/** Application Insights connection string for Dapr telemetry */
|
|
@@ -44,8 +47,8 @@ export interface AppContainerEnvArgs extends CommonBaseArgs, Partial<Pick<app.Ma
|
|
|
44
47
|
/** Application Insights instrumentation key for Dapr telemetry */
|
|
45
48
|
instrumentationKey?: pulumi.Input<string>;
|
|
46
49
|
};
|
|
47
|
-
containerApps?: Record<string,
|
|
48
|
-
containerJobs?: Record<string,
|
|
50
|
+
containerApps?: Record<string, ContainerAppsArgs>;
|
|
51
|
+
containerJobs?: Record<string, ContainerJobsArgs>;
|
|
49
52
|
maintenanceSchedules?: pulumi.Input<ScheduledEntryArgs>[];
|
|
50
53
|
}
|
|
51
54
|
export declare class AppContainerEnv extends BaseResourceComponent<AppContainerEnvArgs> {
|
|
@@ -63,4 +66,3 @@ export declare class AppContainerEnv extends BaseResourceComponent<AppContainerE
|
|
|
63
66
|
private createApps;
|
|
64
67
|
private createJobs;
|
|
65
68
|
}
|
|
66
|
-
export {};
|
package/app/AppContainerEnv.js
CHANGED
|
@@ -67,23 +67,10 @@ class AppContainerEnv extends base_1.BaseResourceComponent {
|
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
69
|
createManagedEnvironment() {
|
|
70
|
-
const { rsGroup, enableResourceIdentity, defaultUAssignedId, vnetConfiguration,
|
|
71
|
-
// Build Log Analytics configuration
|
|
72
|
-
const appLogsConfiguration = logAnalyticsWorkspace
|
|
73
|
-
? {
|
|
74
|
-
appLogsConfiguration: {
|
|
75
|
-
logAnalyticsConfiguration: {
|
|
76
|
-
customerId: logAnalyticsWorkspace.id,
|
|
77
|
-
sharedKey: pulumi.secret(logAnalyticsWorkspace.id), // In practice, retrieve actual shared key
|
|
78
|
-
},
|
|
79
|
-
},
|
|
80
|
-
}
|
|
81
|
-
: undefined;
|
|
70
|
+
const { rsGroup, enableResourceIdentity, defaultUAssignedId, vnetConfiguration, dapr, logs, workloadProfiles, zoneRedundant, ...props } = this.args;
|
|
82
71
|
return new app.ManagedEnvironment(this.name, {
|
|
83
72
|
...props,
|
|
84
73
|
...rsGroup,
|
|
85
|
-
// Logging and monitoring
|
|
86
|
-
...appLogsConfiguration,
|
|
87
74
|
workloadProfiles: workloadProfiles ?? [
|
|
88
75
|
{
|
|
89
76
|
name: 'Consumption',
|
|
@@ -111,6 +98,22 @@ class AppContainerEnv extends base_1.BaseResourceComponent {
|
|
|
111
98
|
daprAIConnectionString: dapr?.connectionString ?? this.args.daprAIConnectionString,
|
|
112
99
|
daprAIInstrumentationKey: dapr?.instrumentationKey ?? this.args.daprAIInstrumentationKey,
|
|
113
100
|
zoneRedundant: zoneRedundant ?? helpers_1.azureEnv.isPrd,
|
|
101
|
+
appLogsConfiguration: logs?.workspace
|
|
102
|
+
? {
|
|
103
|
+
destination: 'log-analytics',
|
|
104
|
+
logAnalyticsConfiguration: {
|
|
105
|
+
customerId: logs.workspace.customerId,
|
|
106
|
+
},
|
|
107
|
+
}
|
|
108
|
+
: { destination: 'azure-monitor' },
|
|
109
|
+
openTelemetryConfiguration: logs?.enableOpenTelemetry
|
|
110
|
+
? {
|
|
111
|
+
logsConfiguration: {
|
|
112
|
+
destinations: ['appInsights'],
|
|
113
|
+
},
|
|
114
|
+
}
|
|
115
|
+
: undefined,
|
|
116
|
+
appInsightsConfiguration: logs?.appInsight ? { connectionString: logs.appInsight.connectionString } : undefined,
|
|
114
117
|
}, { ...this.opts, parent: this, deleteBeforeReplace: true });
|
|
115
118
|
}
|
|
116
119
|
createMaintenance(env) {
|
|
@@ -158,4 +161,4 @@ class AppContainerEnv extends base_1.BaseResourceComponent {
|
|
|
158
161
|
}
|
|
159
162
|
}
|
|
160
163
|
exports.AppContainerEnv = AppContainerEnv;
|
|
161
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwQ29udGFpbmVyRW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9BcHBDb250YWluZXJFbnYudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQWdEO0FBQ2hELHVEQUF5QztBQUV6QyxpREFBZ0U7QUFDaEUsa0NBQWdFO0FBQ2hFLHdDQUFzQztBQUV0QyxxQ0FBOEM7QUFvRTlDLE1BQWEsZUFBZ0IsU0FBUSw0QkFBMEM7SUFDN0QsRUFBRSxDQUF3QjtJQUMxQixZQUFZLENBQXdCO0lBQ3BDLGFBQWEsQ0FBd0I7SUFDckMsUUFBUSxDQUF3QjtJQUVoRCxZQUFZLElBQVksRUFBRSxJQUF5QixFQUFFLElBQXNDO1FBQ3pGLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRTNDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyx3QkFBd0IsRUFBRSxDQUFDO1FBQ25ELElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNuQyxJQUFJLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQzVCLElBQUksQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUM7UUFFNUIsSUFBSSxDQUFDLEVBQUUsR0FBRyxVQUFVLENBQUMsRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUNwQyxJQUFJLENBQUMsYUFBYSxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUM7UUFDOUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDO1FBRXBDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QixDQUFDO0lBRU0sVUFBVTtRQUlmLE9BQU87WUFDTCxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVk7WUFDL0IsaUJBQWlC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
|
package/app/AppJob.d.ts
CHANGED
|
@@ -13,15 +13,15 @@ export interface AppJobArgs extends CommonBaseArgs, Partial<Pick<app.JobArgs, 'w
|
|
|
13
13
|
/** Container configuration template */
|
|
14
14
|
template: {
|
|
15
15
|
/** Container definitions (at least one required) */
|
|
16
|
-
containers: Array<Partial<Pick<inputs.app.ContainerArgs, 'args' | 'command' | 'env' | 'probes' | 'volumeMounts' | 'resources'
|
|
16
|
+
containers: Array<Partial<Pick<inputs.app.ContainerArgs, 'args' | 'command' | 'env' | 'probes' | 'volumeMounts' | 'resources'>> & {
|
|
17
17
|
/** Container name */
|
|
18
|
-
name
|
|
18
|
+
name?: string;
|
|
19
19
|
/** Container image (e.g., 'mcr.microsoft.com/azuredocs/containerapps-job:latest') */
|
|
20
20
|
image: pulumi.Input<string>;
|
|
21
21
|
}>;
|
|
22
22
|
/** Init containers */
|
|
23
23
|
initContainers?: Array<Partial<Pick<inputs.app.InitContainerArgs, 'args' | 'command' | 'env' | 'volumeMounts' | 'resources'>> & {
|
|
24
|
-
name
|
|
24
|
+
name?: string;
|
|
25
25
|
image: pulumi.Input<string>;
|
|
26
26
|
}>;
|
|
27
27
|
/** Volume definitions */
|
package/app/AppJob.js
CHANGED
|
@@ -108,23 +108,30 @@ class AppJob extends base_1.BaseResourceComponent {
|
|
|
108
108
|
name: s.name,
|
|
109
109
|
value: s.value,
|
|
110
110
|
keyVaultUrl: s.keyVaultUrl,
|
|
111
|
-
identity: s.identity,
|
|
111
|
+
identity: s.identity ?? defaultUAssignedId?.id,
|
|
112
112
|
})),
|
|
113
113
|
},
|
|
114
114
|
template: {
|
|
115
115
|
containers: template.containers.map((c) => ({
|
|
116
116
|
...c,
|
|
117
|
-
name: c.name,
|
|
117
|
+
name: c.name ?? this.name,
|
|
118
118
|
image: c.image,
|
|
119
|
+
imageType: 'ContainerImage',
|
|
119
120
|
resources: c.resources ?? {
|
|
120
121
|
cpu: 0.25,
|
|
121
122
|
memory: '0.5Gi',
|
|
122
123
|
},
|
|
124
|
+
env: c.env ??
|
|
125
|
+
configuration.secrets?.map((s) => ({
|
|
126
|
+
name: s.name,
|
|
127
|
+
secretRef: s.name,
|
|
128
|
+
})),
|
|
123
129
|
})),
|
|
124
130
|
initContainers: template.initContainers?.map((ic) => ({
|
|
125
131
|
...ic,
|
|
126
|
-
name: ic.name
|
|
132
|
+
name: ic.name ?? `${this.name}-init`,
|
|
127
133
|
image: ic.image,
|
|
134
|
+
imageType: 'ContainerImage',
|
|
128
135
|
})),
|
|
129
136
|
volumes: template.volumes,
|
|
130
137
|
},
|
|
@@ -132,4 +139,4 @@ class AppJob extends base_1.BaseResourceComponent {
|
|
|
132
139
|
}
|
|
133
140
|
}
|
|
134
141
|
exports.AppJob = AppJob;
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwSm9iLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9BcHBKb2IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsOERBQWdEO0FBRWhELHVEQUF5QztBQUV6QyxrQ0FBZ0U7QUE2RWhFLE1BQWEsTUFBTyxTQUFRLDRCQUFpQztJQUMzQyxFQUFFLENBQXdCO0lBQzFCLFlBQVksQ0FBd0I7SUFDcEMsbUJBQW1CLENBQTBCO0lBQzdDLG1CQUFtQixDQUF3QjtJQUUzRCxZQUFZLElBQVksRUFBRSxJQUFnQixFQUFFLElBQXNDO1FBQ2hGLEtBQUssQ0FBQyxRQUFRLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUVsQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFFN0IsSUFBSSxDQUFDLEVBQUUsR0FBRyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxZQUFZLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztRQUM3QixJQUFJLENBQUMsbUJBQW1CLEdBQUcsR0FBRyxDQUFDLG1CQUFtQixDQUFDO1FBQ25ELElBQUksQ0FBQyxtQkFBbUIsR0FBRyxHQUFHLENBQUMsbUJBQW1CLENBQUM7UUFFbkQsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFTSxVQUFVO1FBSWYsT0FBTztZQUNMLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsaUJBQWlCLENBQUM7WUFDckUsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLG1CQUFtQixFQUFFLElBQUksQ0FBQyxtQkFBbUI7WUFDN0MsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLG1CQUFtQjtTQUM5QyxD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
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { AppContainerArgs, AppSecretArgs } from './AppContainer';
|
|
2
|
+
import * as types from '../types';
|
|
3
|
+
import { AppJobArgs } from './AppJob';
|
|
4
|
+
import * as pulumi from '@pulumi/pulumi';
|
|
5
|
+
import * as inputs from '@pulumi/azure-native/types/input';
|
|
6
|
+
export type ContainerAppsArgs = Omit<AppContainerArgs, types.CommonProps | 'managedEnvironmentId'>;
|
|
7
|
+
export type ContainerJobsArgs = Omit<AppJobArgs, types.CommonProps | 'managedEnvironmentId'>;
|
|
8
|
+
export declare const createCloudflareTunnelApp: ({ enableResourceIdentity, configuration, container, }: types.WithResourceIdentityFlag & {
|
|
9
|
+
configuration: {
|
|
10
|
+
registries?: pulumi.Input<pulumi.Input<inputs.app.RegistryCredentialsArgs>[]>;
|
|
11
|
+
cloudflareToken: Omit<AppSecretArgs, "name">;
|
|
12
|
+
};
|
|
13
|
+
container: {
|
|
14
|
+
image: pulumi.Input<string>;
|
|
15
|
+
resources?: pulumi.Input<inputs.app.ContainerResourcesArgs>;
|
|
16
|
+
};
|
|
17
|
+
}) => ContainerAppsArgs;
|
|
18
|
+
export declare const createGitRunnerJob: ({ enableResourceIdentity, configuration, container, }: types.WithResourceIdentityFlag & {
|
|
19
|
+
configuration: {
|
|
20
|
+
gitRepoOwner: pulumi.Input<string>;
|
|
21
|
+
gitRepoName: pulumi.Input<string>;
|
|
22
|
+
registries?: pulumi.Input<pulumi.Input<inputs.app.RegistryCredentialsArgs>[]>;
|
|
23
|
+
gitPATSecret: Omit<AppSecretArgs, "name">;
|
|
24
|
+
};
|
|
25
|
+
container: {
|
|
26
|
+
image: pulumi.Input<string>;
|
|
27
|
+
resources?: pulumi.Input<inputs.app.ContainerResourcesArgs>;
|
|
28
|
+
};
|
|
29
|
+
}) => ContainerJobsArgs;
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.createGitRunnerJob = exports.createCloudflareTunnelApp = void 0;
|
|
37
|
+
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
|
+
const createCloudflareTunnelApp = ({ enableResourceIdentity, configuration, container, }) => {
|
|
39
|
+
return {
|
|
40
|
+
enableResourceIdentity,
|
|
41
|
+
configuration: {
|
|
42
|
+
registries: configuration.registries,
|
|
43
|
+
maxInactiveRevisions: 5,
|
|
44
|
+
activeRevisionsMode: 'Single',
|
|
45
|
+
secrets: [
|
|
46
|
+
{
|
|
47
|
+
...configuration.cloudflareToken,
|
|
48
|
+
name: 'cf-tunnel-token',
|
|
49
|
+
},
|
|
50
|
+
],
|
|
51
|
+
},
|
|
52
|
+
template: {
|
|
53
|
+
containers: [
|
|
54
|
+
{
|
|
55
|
+
name: 'cloudflared',
|
|
56
|
+
args: ['tunnel', '--no-autoupdate', 'run', '--token', '$(token)'],
|
|
57
|
+
image: container.image,
|
|
58
|
+
resources: container?.resources,
|
|
59
|
+
env: [
|
|
60
|
+
{
|
|
61
|
+
name: 'token',
|
|
62
|
+
secretRef: 'cf-tunnel-token',
|
|
63
|
+
},
|
|
64
|
+
],
|
|
65
|
+
},
|
|
66
|
+
],
|
|
67
|
+
},
|
|
68
|
+
};
|
|
69
|
+
};
|
|
70
|
+
exports.createCloudflareTunnelApp = createCloudflareTunnelApp;
|
|
71
|
+
const createGitRunnerJob = ({ enableResourceIdentity, configuration, container, }) => {
|
|
72
|
+
return {
|
|
73
|
+
enableResourceIdentity,
|
|
74
|
+
configuration: {
|
|
75
|
+
registries: configuration.registries,
|
|
76
|
+
triggerType: 'Event',
|
|
77
|
+
eventTriggerConfig: {
|
|
78
|
+
parallelism: 1,
|
|
79
|
+
replicaCompletionCount: 1,
|
|
80
|
+
scale: {
|
|
81
|
+
minExecutions: 0,
|
|
82
|
+
maxExecutions: 5,
|
|
83
|
+
rules: [
|
|
84
|
+
{
|
|
85
|
+
name: 'github-runner',
|
|
86
|
+
type: 'github-runner',
|
|
87
|
+
metadata: {
|
|
88
|
+
githubAPIURL: 'https://api.github.com',
|
|
89
|
+
owner: configuration.gitRepoOwner,
|
|
90
|
+
runnerScope: 'repo',
|
|
91
|
+
repos: configuration.gitRepoName,
|
|
92
|
+
targetWorkflowQueueLength: '1',
|
|
93
|
+
},
|
|
94
|
+
auth: [
|
|
95
|
+
{
|
|
96
|
+
triggerParameter: 'personalAccessToken',
|
|
97
|
+
secretRef: 'github-pat-secret',
|
|
98
|
+
},
|
|
99
|
+
],
|
|
100
|
+
},
|
|
101
|
+
],
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
secrets: [
|
|
105
|
+
{
|
|
106
|
+
...configuration.gitPATSecret,
|
|
107
|
+
name: 'github-pat-secret',
|
|
108
|
+
},
|
|
109
|
+
],
|
|
110
|
+
},
|
|
111
|
+
template: {
|
|
112
|
+
containers: [
|
|
113
|
+
{
|
|
114
|
+
name: 'git-runner',
|
|
115
|
+
image: container.image,
|
|
116
|
+
// https://learn.microsoft.com/en-us/azure/container-apps/containers#allocations
|
|
117
|
+
resources: container.resources ?? { cpu: 2.5, memory: '5.0Gi' },
|
|
118
|
+
env: [
|
|
119
|
+
{
|
|
120
|
+
name: 'GITHUB_PAT',
|
|
121
|
+
secretRef: 'github-pat-secret',
|
|
122
|
+
},
|
|
123
|
+
{
|
|
124
|
+
name: 'GH_URL',
|
|
125
|
+
value: pulumi.interpolate `https://github.com/${configuration.gitRepoOwner}/${configuration.gitRepoName}`,
|
|
126
|
+
},
|
|
127
|
+
{
|
|
128
|
+
name: 'REGISTRATION_TOKEN_API_URL',
|
|
129
|
+
value: pulumi.interpolate `https://api.github.com/repos/${configuration.gitRepoOwner}/${configuration.gitRepoName}/actions/runners/registration-token`,
|
|
130
|
+
},
|
|
131
|
+
],
|
|
132
|
+
},
|
|
133
|
+
],
|
|
134
|
+
},
|
|
135
|
+
};
|
|
136
|
+
};
|
|
137
|
+
exports.createGitRunnerJob = createGitRunnerJob;
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwQ29udGFpbmVySGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FwcC9hcHBDb250YWluZXJIZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBR0EsdURBQXlDO0FBTWxDLE1BQU0seUJBQXlCLEdBQUcsQ0FBQyxFQUN4QyxzQkFBc0IsRUFDdEIsYUFBYSxFQUNiLFNBQVMsR0FVVixFQUFxQixFQUFFO0lBQ3RCLE9BQU87UUFDTCxzQkFBc0I7UUFDdEIsYUFBYSxFQUFFO1lBQ2IsVUFBVSxFQUFFLGFBQWEsQ0FBQyxVQUFVO1lBQ3BDLG9CQUFvQixFQUFFLENBQUM7WUFDdkIsbUJBQW1CLEVBQUUsUUFBUTtZQUM3QixPQUFPLEVBQUU7Z0JBQ1A7b0JBQ0UsR0FBRyxhQUFhLENBQUMsZUFBZTtvQkFDaEMsSUFBSSxFQUFFLGlCQUFpQjtpQkFDeEI7YUFDRjtTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1IsVUFBVSxFQUFFO2dCQUNWO29CQUNFLElBQUksRUFBRSxhQUFhO29CQUNuQixJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxVQUFVLENBQUM7b0JBQ2pFLEtBQUssRUFBRSxTQUFTLENBQUMsS0FBSztvQkFDdEIsU0FBUyxFQUFFLFNBQVMsRUFBRSxTQUFTO29CQUMvQixHQUFHLEVBQUU7d0JBQ0g7NEJBQ0UsSUFBSSxFQUFFLE9BQU87NEJBQ2IsU0FBUyxFQUFFLGlCQUFpQjt5QkFDN0I7cUJBQ0Y7aUJBQ0Y7YUFDRjtTQUNGO0tBQ0YsQ0FBQztBQUNKLENBQUMsQ0FBQztBQTVDVyxRQUFBLHlCQUF5Qiw2QkE0Q3BDO0FBRUssTUFBTSxrQkFBa0IsR0FBRyxDQUFDLEVBQ2pDLHNCQUFzQixFQUN0QixhQUFhLEVBQ2IsU0FBUyxHQVlWLEVBQXFCLEVBQUU7SUFDdEIsT0FBTztRQUNMLHNCQUFzQjtRQUN0QixhQUFhLEVBQUU7WUFDYixVQUFVLEVBQUUsYUFBYSxDQUFDLFVBQVU7WUFDcEMsV0FBVyxFQUFFLE9BQU87WUFDcEIsa0JBQWtCLEVBQUU7Z0JBQ2xCLFdBQVcsRUFBRSxDQUFDO2dCQUNkLHNCQUFzQixFQUFFLENBQUM7Z0JBQ3pCLEtBQUssRUFBRTtvQkFDTCxhQUFhLEVBQUUsQ0FBQztvQkFDaEIsYUFBYSxFQUFFLENBQUM7b0JBQ2hCLEtBQUssRUFBRTt3QkFDTDs0QkFDRSxJQUFJLEVBQUUsZUFBZTs0QkFDckIsSUFBSSxFQUFFLGVBQWU7NEJBQ3JCLFFBQVEsRUFBRTtnQ0FDUixZQUFZLEVBQUUsd0JBQXdCO2dDQUN0QyxLQUFLLEVBQUUsYUFBYSxDQUFDLFlBQVk7Z0NBQ2pDLFdBQVcsRUFBRSxNQUFNO2dDQUNuQixLQUFLLEVBQUUsYUFBYSxDQUFDLFdBQVc7Z0NBQ2hDLHlCQUF5QixFQUFFLEdBQUc7NkJBQy9COzRCQUNELElBQUksRUFBRTtnQ0FDSjtvQ0FDRSxnQkFBZ0IsRUFBRSxxQkFBcUI7b0NBQ3ZDLFNBQVMsRUFBRSxtQkFBbUI7aUNBQy9COzZCQUNGO3lCQUNGO3FCQUNGO2lCQUNGO2FBQ0Y7WUFDRCxPQUFPLEVBQUU7Z0JBQ1A7b0JBQ0UsR0FBRyxhQUFhLENBQUMsWUFBWTtvQkFDN0IsSUFBSSxFQUFFLG1CQUFtQjtpQkFDMUI7YUFDRjtTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1IsVUFBVSxFQUFFO2dCQUNWO29CQUNFLElBQUksRUFBRSxZQUFZO29CQUNsQixLQUFLLEVBQUUsU0FBUyxDQUFDLEtBQUs7b0JBQ3RCLGdGQUFnRjtvQkFDaEYsU0FBUyxFQUFFLFNBQVMsQ0FBQyxTQUFTLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUU7b0JBQy9ELEdBQUcsRUFBRTt3QkFDSDs0QkFDRSxJQUFJLEVBQUUsWUFBWTs0QkFDbEIsU0FBUyxFQUFFLG1CQUFtQjt5QkFDL0I7d0JBQ0Q7NEJBQ0UsSUFBSSxFQUFFLFFBQVE7NEJBQ2QsS0FBSyxFQUFFLE1BQU0sQ0FBQyxXQUFXLENBQUEsc0JBQXNCLGFBQWEsQ0FBQyxZQUFZLElBQUksYUFBYSxDQUFDLFdBQVcsRUFBRTt5QkFDekc7d0JBQ0Q7NEJBQ0UsSUFBSSxFQUFFLDRCQUE0Qjs0QkFDbEMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxXQUFXLENBQUEsZ0NBQWdDLGFBQWEsQ0FBQyxZQUFZLElBQUksYUFBYSxDQUFDLFdBQVcscUNBQXFDO3lCQUN0SjtxQkFDRjtpQkFDRjthQUNGO1NBQ0Y7S0FDRixDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBaEZXLFFBQUEsa0JBQWtCLHNCQWdGN0IifQ==
|
package/app/index.d.ts
CHANGED
package/app/index.js
CHANGED
|
@@ -10,10 +10,34 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
11
|
o[k2] = m[k];
|
|
12
12
|
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
13
35
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
36
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
37
|
};
|
|
16
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.appHelpers = void 0;
|
|
40
|
+
exports.appHelpers = __importStar(require("./appContainerHelper"));
|
|
17
41
|
__exportStar(require("./AppCert"), exports);
|
|
18
42
|
__exportStar(require("./AppConfig"), exports);
|
|
19
43
|
__exportStar(require("./AppContainer"), exports);
|
|
@@ -23,4 +47,4 @@ __exportStar(require("./AppService"), exports);
|
|
|
23
47
|
__exportStar(require("./IoTHub"), exports);
|
|
24
48
|
__exportStar(require("./LogicApp"), exports);
|
|
25
49
|
__exportStar(require("./SignalR"), exports);
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXBwL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG1FQUFtRDtBQUNuRCw0Q0FBMEI7QUFDMUIsOENBQTRCO0FBQzVCLGlEQUErQjtBQUMvQixvREFBa0M7QUFDbEMsMkNBQXlCO0FBQ3pCLCtDQUE2QjtBQUM3QiwyQ0FBeUI7QUFDekIsNkNBQTJCO0FBQzNCLDRDQUEwQiJ9
|
package/azAd/AzRole.d.ts
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import * as azAd from '@pulumi/azuread';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import { BaseComponent } from '../base/BaseComponent';
|
|
4
|
-
export interface AzRoleArgs extends Partial<Pick<azAd.GroupArgs, '
|
|
4
|
+
export interface AzRoleArgs extends Partial<Pick<azAd.GroupArgs, 'owners' | 'preventDuplicateNames' | 'description'>> {
|
|
5
|
+
members?: pulumi.Input<string>[];
|
|
5
6
|
}
|
|
6
7
|
export declare class AzRole extends BaseComponent<AzRoleArgs> {
|
|
7
|
-
readonly
|
|
8
|
-
readonly displayName: pulumi.Output<string>;
|
|
8
|
+
readonly group: azAd.Group;
|
|
9
9
|
constructor(name: string, args?: AzRoleArgs, opts?: pulumi.ComponentResourceOptions);
|
|
10
10
|
getOutputs(): {
|
|
11
11
|
objectId: pulumi.Output<string>;
|
|
12
12
|
displayName: pulumi.Output<string>;
|
|
13
13
|
};
|
|
14
|
+
private createGroup;
|
|
15
|
+
private createMembers;
|
|
14
16
|
}
|
package/azAd/AzRole.js
CHANGED
|
@@ -35,38 +35,50 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.AzRole = void 0;
|
|
37
37
|
const azAd = __importStar(require("@pulumi/azuread"));
|
|
38
|
+
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
38
39
|
const BaseComponent_1 = require("../base/BaseComponent");
|
|
39
40
|
const helpers_1 = require("../base/helpers");
|
|
40
41
|
const helpers_2 = require("../helpers");
|
|
41
42
|
class AzRole extends BaseComponent_1.BaseComponent {
|
|
42
|
-
|
|
43
|
-
displayName;
|
|
43
|
+
group;
|
|
44
44
|
constructor(name, args = {}, opts) {
|
|
45
|
-
const
|
|
46
|
-
super((0, helpers_1.getComponentResourceType)('AzRole'),
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
: `ROL ${helpers_2.stackInfo.stack} ${name}`.toUpperCase();
|
|
50
|
-
const role = new azAd.Group(n, {
|
|
51
|
-
displayName: roleName,
|
|
52
|
-
description: roleName,
|
|
53
|
-
members: args.members,
|
|
54
|
-
owners: args.owners,
|
|
55
|
-
securityEnabled: true,
|
|
56
|
-
mailEnabled: false,
|
|
57
|
-
preventDuplicateNames: args.preventDuplicateNames,
|
|
58
|
-
assignableToRole: false,
|
|
59
|
-
}, { parent: this });
|
|
60
|
-
this.objectId = role.objectId;
|
|
61
|
-
this.displayName = role.displayName;
|
|
45
|
+
const rsName = `rol-${name.toLowerCase().replace(/\s+/g, '-')}`;
|
|
46
|
+
super((0, helpers_1.getComponentResourceType)('AzRole'), rsName, args, opts);
|
|
47
|
+
this.group = this.createGroup(rsName);
|
|
48
|
+
this.createMembers(this.group);
|
|
62
49
|
this.registerOutputs();
|
|
63
50
|
}
|
|
64
51
|
getOutputs() {
|
|
65
52
|
return {
|
|
66
|
-
objectId: this.objectId,
|
|
67
|
-
displayName: this.displayName,
|
|
53
|
+
objectId: this.group.objectId,
|
|
54
|
+
displayName: this.group.displayName,
|
|
68
55
|
};
|
|
69
56
|
}
|
|
57
|
+
createGroup(rsName) {
|
|
58
|
+
const { description, owners, preventDuplicateNames } = this.args;
|
|
59
|
+
const roleName = this.name.includes(helpers_2.stackInfo.stack)
|
|
60
|
+
? `ROL ${this.name}`.toUpperCase()
|
|
61
|
+
: `ROL ${helpers_2.stackInfo.stack} ${this.name}`.toUpperCase();
|
|
62
|
+
return new azAd.Group(rsName, {
|
|
63
|
+
displayName: roleName,
|
|
64
|
+
description: description ?? roleName,
|
|
65
|
+
//members: args.members,
|
|
66
|
+
owners: owners,
|
|
67
|
+
preventDuplicateNames,
|
|
68
|
+
securityEnabled: true,
|
|
69
|
+
mailEnabled: false,
|
|
70
|
+
assignableToRole: false,
|
|
71
|
+
}, { parent: this, ignoreChanges: ['members'] });
|
|
72
|
+
}
|
|
73
|
+
createMembers(group) {
|
|
74
|
+
const { members } = this.args;
|
|
75
|
+
if (!members || members.length === 0)
|
|
76
|
+
return;
|
|
77
|
+
pulumi.output(members).apply((ms) => ms.map((m) => new azAd.GroupMember(`${this.name}-mb-${m}`, {
|
|
78
|
+
memberObjectId: m,
|
|
79
|
+
groupObjectId: group.objectId,
|
|
80
|
+
}, { dependsOn: group, parent: this, deletedWith: group, deleteBeforeReplace: true })));
|
|
81
|
+
}
|
|
70
82
|
}
|
|
71
83
|
exports.AzRole = AzRole;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXpSb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6QWQvQXpSb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUN4Qyx1REFBeUM7QUFFekMseURBQXNEO0FBQ3RELDZDQUEyRDtBQUMzRCx3Q0FBdUM7QUFNdkMsTUFBYSxNQUFPLFNBQVEsNkJBQXlCO0lBQ25DLEtBQUssQ0FBYTtJQUVsQyxZQUFZLElBQVksRUFBRSxPQUFtQixFQUFFLEVBQUUsSUFBc0M7UUFDckYsTUFBTSxNQUFNLEdBQUcsT0FBTyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ2hFLEtBQUssQ0FBQyxJQUFBLGtDQUF3QixFQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFOUQsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3RDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRS9CLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QixDQUFDO0lBRU0sVUFBVTtRQUNmLE9BQU87WUFDTCxRQUFRLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRO1lBQzdCLFdBQVcsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVc7U0FDcEMsQ0FBQztJQUNKLENBQUM7SUFFTyxXQUFXLENBQUMsTUFBYztRQUNoQyxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxxQkFBcUIsRUFBRSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7UUFFakUsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsbUJBQVMsQ0FBQyxLQUFLLENBQUM7WUFDbEQsQ0FBQyxDQUFDLE9BQU8sSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRTtZQUNsQyxDQUFDLENBQUMsT0FBTyxtQkFBUyxDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFFeEQsT0FBTyxJQUFJLElBQUksQ0FBQyxLQUFLLENBQ25CLE1BQU0sRUFDTjtZQUNFLFdBQVcsRUFBRSxRQUFRO1lBQ3JCLFdBQVcsRUFBRSxXQUFXLElBQUksUUFBUTtZQUNwQyx3QkFBd0I7WUFDeEIsTUFBTSxFQUFFLE1BQU07WUFDZCxxQkFBcUI7WUFDckIsZUFBZSxFQUFFLElBQUk7WUFDckIsV0FBVyxFQUFFLEtBQUs7WUFDbEIsZ0JBQWdCLEVBQUUsS0FBSztTQUN4QixFQUNELEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUM3QyxDQUFDO0lBQ0osQ0FBQztJQUVPLGFBQWEsQ0FBQyxLQUFpQjtRQUNyQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUM5QixJQUFJLENBQUMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEtBQUssQ0FBQztZQUFFLE9BQU87UUFFN0MsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUNsQyxFQUFFLENBQUMsR0FBRyxDQUNKLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDSixJQUFJLElBQUksQ0FBQyxXQUFXLENBQ2xCLEdBQUcsSUFBSSxDQUFDLElBQUksT0FBTyxDQUFDLEVBQUUsRUFDdEI7WUFDRSxjQUFjLEVBQUUsQ0FBQztZQUNqQixhQUFhLEVBQUUsS0FBSyxDQUFDLFFBQVE7U0FDOUIsRUFDRCxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRSxDQUNsRixDQUNKLENBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQTdERCx3QkE2REMifQ==
|
package/azAd/GroupRole.d.ts
CHANGED
|
@@ -6,14 +6,14 @@ export interface GroupRoleArgs extends Partial<Pick<AzRoleArgs, 'owners' | 'prev
|
|
|
6
6
|
preventDuplicateNames?: pulumi.Input<boolean>;
|
|
7
7
|
}
|
|
8
8
|
export declare class GroupRole extends BaseComponent<GroupRoleArgs> {
|
|
9
|
-
readonly admin:
|
|
10
|
-
readonly contributor:
|
|
11
|
-
readonly readOnly:
|
|
9
|
+
readonly admin: types.AsOutput<types.GroupRoleOutput>;
|
|
10
|
+
readonly contributor: types.AsOutput<types.GroupRoleOutput>;
|
|
11
|
+
readonly readOnly: types.AsOutput<types.GroupRoleOutput>;
|
|
12
12
|
constructor(name?: string, args?: GroupRoleArgs, opts?: pulumi.ComponentResourceOptions);
|
|
13
13
|
getOutputs(): {
|
|
14
|
-
admin:
|
|
15
|
-
contributor:
|
|
16
|
-
readOnly:
|
|
14
|
+
admin: types.AsOutput<types.GroupRoleOutput>;
|
|
15
|
+
contributor: types.AsOutput<types.GroupRoleOutput>;
|
|
16
|
+
readOnly: types.AsOutput<types.GroupRoleOutput>;
|
|
17
17
|
};
|
|
18
18
|
private configHierarchyRoles;
|
|
19
19
|
}
|
package/azAd/GroupRole.js
CHANGED
|
@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.GroupRole = void 0;
|
|
37
37
|
const azAd = __importStar(require("@pulumi/azuread"));
|
|
38
|
-
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
39
38
|
const base_1 = require("../base");
|
|
40
39
|
const helpers_1 = require("../base/helpers");
|
|
41
40
|
const helpers_2 = require("../helpers");
|
|
@@ -55,18 +54,9 @@ class GroupRole extends base_1.BaseComponent {
|
|
|
55
54
|
preventDuplicateNames: args.preventDuplicateNames,
|
|
56
55
|
}, { ...this.opts, parent: this, deletedWith: this }),
|
|
57
56
|
]));
|
|
58
|
-
this.admin =
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
});
|
|
62
|
-
this.contributor = pulumi.output({
|
|
63
|
-
objectId: roleInstances.contributor.objectId,
|
|
64
|
-
displayName: roleInstances.contributor.displayName,
|
|
65
|
-
});
|
|
66
|
-
this.readOnly = pulumi.output({
|
|
67
|
-
objectId: roleInstances.readOnly.objectId,
|
|
68
|
-
displayName: roleInstances.readOnly.displayName,
|
|
69
|
-
});
|
|
57
|
+
this.admin = roleInstances.admin.getOutputs();
|
|
58
|
+
this.contributor = roleInstances.contributor.getOutputs();
|
|
59
|
+
this.readOnly = roleInstances.readOnly.getOutputs();
|
|
70
60
|
this.configHierarchyRoles(roleInstances);
|
|
71
61
|
this.registerOutputs();
|
|
72
62
|
}
|
|
@@ -93,4 +83,4 @@ class GroupRole extends base_1.BaseComponent {
|
|
|
93
83
|
}
|
|
94
84
|
}
|
|
95
85
|
exports.GroupRole = GroupRole;
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR3JvdXBSb2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6QWQvR3JvdXBSb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNEQUF3QztBQUV4QyxrQ0FBd0M7QUFDeEMsNkNBQTJEO0FBQzNELHdDQUF1QztBQUV2QyxxQ0FBOEM7QUFTOUMsTUFBYSxTQUFVLFNBQVEsb0JBQTRCO0lBQ3pDLEtBQUssQ0FBd0M7SUFDN0MsV0FBVyxDQUF3QztJQUNuRCxRQUFRLENBQXdDO0lBRWhFLFlBQVksT0FBZSxtQkFBUyxDQUFDLEtBQUssRUFBRSxPQUFzQixFQUFFLEVBQUUsSUFBc0M7UUFDMUcsS0FBSyxDQUFDLElBQUEsa0NBQXdCLEVBQUMsV0FBVyxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUUvRCxNQUFNLEtBQUssR0FBRyxDQUFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsVUFBVSxDQUFVLENBQUM7UUFFNUQsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FDdEMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUM7WUFDbEIsSUFBSTtZQUNKLElBQUksZUFBTSxDQUNSLEdBQUcsSUFBSSxJQUFJLElBQUksRUFBRSxFQUNqQjtnQkFDRSxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07Z0JBQ25CLE9BQU8sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTztnQkFDNUIscUJBQXFCLEVBQUUsSUFBSSxDQUFDLHFCQUFxQjthQUNsRCxFQUNELEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxDQUNsRDtTQUNGLENBQUMsQ0FDSCxDQUFDO1FBRUYsSUFBSSxDQUFDLEtBQUssR0FBRyxhQUFhLENBQUMsS0FBSyxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQzlDLElBQUksQ0FBQyxXQUFXLEdBQUcsYUFBYSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUMxRCxJQUFJLENBQUMsUUFBUSxHQUFHLGFBQWEsQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLENBQUM7UUFFcEQsSUFBSSxDQUFDLG9CQUFvQixDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBRXpDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN6QixDQUFDO0lBRU0sVUFBVTtRQUNmLE9BQU87WUFDTCxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7WUFDakIsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXO1lBQzdCLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUTtTQUN4QixDQUFDO0lBQ0osQ0FBQztJQUVPLG9CQUFvQixDQUFDLEtBQThCO1FBQ3pELElBQUksSUFBSSxDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDbkMsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUNsQixHQUFHLElBQUksQ0FBQyxJQUFJLG9CQUFvQixFQUNoQztnQkFDRSxhQUFhLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRO2dCQUN4QyxjQUFjLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRO2FBQ3BDLEVBQ0QsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxDQUNsRSxDQUFDO1FBQ0osQ0FBQztRQUVELElBQUksSUFBSSxDQUFDLFdBQVcsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDdEMsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUNsQixHQUFHLElBQUksQ0FBQyxJQUFJLHVCQUF1QixFQUNuQztnQkFDRSxhQUFhLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRO2dCQUNyQyxjQUFjLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRO2FBQzFDLEVBQ0QsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxDQUN4RSxDQUFDO1FBQ0osQ0FBQztJQUNILENBQUM7Q0FDRjtBQWpFRCw4QkFpRUMifQ==
|
package/package.json
CHANGED
package/types.d.ts
CHANGED
|
@@ -57,9 +57,7 @@ export type WithDiskEncryptSet = {
|
|
|
57
57
|
};
|
|
58
58
|
export type WithMemberOfArgs = {
|
|
59
59
|
/** The Id of the EntraID group */
|
|
60
|
-
memberof?:
|
|
61
|
-
objectId: string;
|
|
62
|
-
}>[];
|
|
60
|
+
memberof?: AsInput<GroupRoleOutput>[];
|
|
63
61
|
};
|
|
64
62
|
export type IdentityType = {
|
|
65
63
|
id: string;
|
|
@@ -99,14 +97,14 @@ export interface GroupRoleOutput {
|
|
|
99
97
|
displayName: string;
|
|
100
98
|
}
|
|
101
99
|
export type GroupRoleInputTypes = {
|
|
102
|
-
admin:
|
|
103
|
-
contributor:
|
|
104
|
-
readOnly:
|
|
100
|
+
admin: AsInput<GroupRoleOutput>;
|
|
101
|
+
contributor: AsInput<GroupRoleOutput>;
|
|
102
|
+
readOnly: AsInput<GroupRoleOutput>;
|
|
105
103
|
};
|
|
106
104
|
export type GroupRoleOutputTypes = {
|
|
107
|
-
admin:
|
|
108
|
-
contributor:
|
|
109
|
-
readOnly:
|
|
105
|
+
admin: AsOutput<GroupRoleOutput>;
|
|
106
|
+
contributor: AsOutput<GroupRoleOutput>;
|
|
107
|
+
readOnly: AsOutput<GroupRoleOutput>;
|
|
110
108
|
};
|
|
111
109
|
export type WithGroupRolesArgs = {
|
|
112
110
|
groupRoles?: GroupRoleOutputTypes;
|
|
@@ -5,7 +5,7 @@ export declare function newFirewallPolicy(name: string, { priority, action }: {
|
|
|
5
5
|
priority: number;
|
|
6
6
|
action: 'Allow' | 'Deny';
|
|
7
7
|
}): FirewallPolicyBuilder;
|
|
8
|
-
export declare function defaultAllowedPolicies({ name, priority, sourceAddresses, allowsAllApps, allowsAzurePortal, allowsAzureDevOps, allowsOffice365, allowsWindowsUpdate, }: {
|
|
8
|
+
export declare function defaultAllowedPolicies({ name, priority, sourceAddresses, allowsAllApps, allowsAzurePortal, allowsAzureDevOps, allowsOffice365, allowsWindowsUpdate, allowsGitHubRunner, }: {
|
|
9
9
|
name?: string;
|
|
10
10
|
priority: number;
|
|
11
11
|
sourceAddresses: pulumi.Input<string>[];
|
|
@@ -15,6 +15,7 @@ export declare function defaultAllowedPolicies({ name, priority, sourceAddresses
|
|
|
15
15
|
/**This is dangerous rule use with care*/
|
|
16
16
|
allowsAllApps?: boolean;
|
|
17
17
|
allowsWindowsUpdate?: boolean;
|
|
18
|
+
allowsGitHubRunner?: boolean;
|
|
18
19
|
}): FirewallPolicyBuilder;
|
|
19
20
|
export declare function defaultDeniedPolicies(priority?: number): import("..").RulePolicyArgs;
|
|
20
21
|
export declare function allowsCloudflareTunnels({ name, priority, sourceAddresses, internalDestinationAddresses, internalDestinationPorts, }: {
|
|
@@ -62,7 +62,7 @@ exports.allAzurePorts = [
|
|
|
62
62
|
function newFirewallPolicy(name, { priority, action }) {
|
|
63
63
|
return new FirewallPolicyBuilder_1.FirewallPolicyBuilder(name, { priority, action });
|
|
64
64
|
}
|
|
65
|
-
function defaultAllowedPolicies({ name = 'default-allows', priority = 100, sourceAddresses, allowsAllApps, allowsAzurePortal, allowsAzureDevOps, allowsOffice365, allowsWindowsUpdate, }) {
|
|
65
|
+
function defaultAllowedPolicies({ name = 'default-allows', priority = 100, sourceAddresses, allowsAllApps, allowsAzurePortal, allowsAzureDevOps, allowsOffice365, allowsWindowsUpdate, allowsGitHubRunner, }) {
|
|
66
66
|
const builder = new FirewallPolicyBuilder_1.FirewallPolicyBuilder(name, { priority, action: 'Allow' });
|
|
67
67
|
if (allowsAllApps) {
|
|
68
68
|
builder.addAppRule('allow-everything', {
|
|
@@ -391,6 +391,27 @@ function defaultAllowedPolicies({ name = 'default-allows', priority = 100, sourc
|
|
|
391
391
|
protocols: [{ protocolType: 'Https', port: 443 }],
|
|
392
392
|
});
|
|
393
393
|
}
|
|
394
|
+
if (allowsGitHubRunner) {
|
|
395
|
+
builder.addAppRule('allows-github-runner', {
|
|
396
|
+
description: 'Allows Github Runner',
|
|
397
|
+
sourceAddresses,
|
|
398
|
+
targetFqdns: [
|
|
399
|
+
'github.com',
|
|
400
|
+
'*.github.com',
|
|
401
|
+
'githubusercontent.com',
|
|
402
|
+
'*.githubusercontent.com',
|
|
403
|
+
'github-cloud.s3.amazonaws.com',
|
|
404
|
+
'registry.npmjs.org',
|
|
405
|
+
'*.pulumi.com',
|
|
406
|
+
'*.cloudflare.com',
|
|
407
|
+
'unpkg.com',
|
|
408
|
+
'*.unpkg.com',
|
|
409
|
+
'nodejs.org',
|
|
410
|
+
'*.nodejs.org',
|
|
411
|
+
],
|
|
412
|
+
protocols: [{ protocolType: 'Https', port: 443 }],
|
|
413
|
+
});
|
|
414
|
+
}
|
|
394
415
|
return builder;
|
|
395
416
|
}
|
|
396
417
|
function defaultDeniedPolicies(priority = 6001) {
|
|
@@ -508,6 +529,7 @@ function allowsAksPolicies({ name = 'aks', priority, subnetAddressSpaces, privat
|
|
|
508
529
|
'mcr-0001.mcr-msedge.net',
|
|
509
530
|
'management.azure.com',
|
|
510
531
|
'login.microsoftonline.com',
|
|
532
|
+
'graph.microsoft.com',
|
|
511
533
|
'packages.microsoft.com',
|
|
512
534
|
'acs-mirror.azureedge.net',
|
|
513
535
|
'packages.aks.azure.com',
|
|
@@ -521,9 +543,6 @@ function allowsAksPolicies({ name = 'aks', priority, subnetAddressSpaces, privat
|
|
|
521
543
|
'*.ingest.monitor.azure.com',
|
|
522
544
|
'*.metrics.ingest.monitor.azure.com',
|
|
523
545
|
`${helpers_1.azureEnv.currentRegionCode}.handler.control.monitor.azure.com`,
|
|
524
|
-
//Key Vault
|
|
525
|
-
'vault.azure.net',
|
|
526
|
-
'*.vault.usgovcloudapi.net',
|
|
527
546
|
//Storage for container
|
|
528
547
|
'*.blob.core.windows.net',
|
|
529
548
|
];
|
|
@@ -532,7 +551,7 @@ function allowsAksPolicies({ name = 'aks', priority, subnetAddressSpaces, privat
|
|
|
532
551
|
}
|
|
533
552
|
builder
|
|
534
553
|
//App
|
|
535
|
-
.addAppRule('
|
|
554
|
+
.addAppRule('azure-resources', {
|
|
536
555
|
description: 'Allows pods to access AzureKubernetesService',
|
|
537
556
|
sourceAddresses: subnetAddressSpaces,
|
|
538
557
|
targetFqdns,
|
|
@@ -540,4 +559,4 @@ function allowsAksPolicies({ name = 'aks', priority, subnetAddressSpaces, privat
|
|
|
540
559
|
});
|
|
541
560
|
return builder;
|
|
542
561
|
}
|
|
543
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"commonPolicies.js","sourceRoot":"","sources":["../../../src/vnet/FirewallPolicies/commonPolicies.ts"],"names":[],"mappings":"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"}
|
|
562
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"commonPolicies.js","sourceRoot":"","sources":["../../../src/vnet/FirewallPolicies/commonPolicies.ts"],"names":[],"mappings":"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"}
|
package/vnet/VirtualNetwork.js
CHANGED
|
@@ -171,6 +171,7 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
171
171
|
if (!ipCreate)
|
|
172
172
|
return [];
|
|
173
173
|
this.ipAddressInstance = new IpAddresses_1.IpAddresses(`${this.name}-ip`, { ...ipCreate, rsGroup }, {
|
|
174
|
+
...this.opts,
|
|
174
175
|
parent: this,
|
|
175
176
|
retainOnDelete: true,
|
|
176
177
|
});
|
|
@@ -199,9 +200,9 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
199
200
|
...rsGroup,
|
|
200
201
|
...natGatewayCreate,
|
|
201
202
|
sku: { name: natGatewayCreate.sku },
|
|
202
|
-
zones: natGatewayCreate.sku == 'Standard' ?
|
|
203
|
+
zones: natGatewayCreate.sku == 'Standard' ? undefined : helpers_1.zoneHelper.getDefaultZones(natGatewayCreate.zones),
|
|
203
204
|
publicIpAddresses: ipAddresses,
|
|
204
|
-
}, { dependsOn: this.ipAddressInstance ?? this.opts?.dependsOn, parent: this });
|
|
205
|
+
}, { ...this.opts, dependsOn: this.ipAddressInstance ?? this.opts?.dependsOn, parent: this });
|
|
205
206
|
}
|
|
206
207
|
createVpnGateway(subnets) {
|
|
207
208
|
const { rsGroup, vpnGatewayCreate } = this.args;
|
|
@@ -212,7 +213,7 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
212
213
|
...vpnGatewayCreate,
|
|
213
214
|
rsGroup,
|
|
214
215
|
subnetId: vpnSubnet.id,
|
|
215
|
-
}, { dependsOn: vpnSubnet, parent: this });
|
|
216
|
+
}, { ...this.opts, dependsOn: vpnSubnet, parent: this });
|
|
216
217
|
}
|
|
217
218
|
createFirewall(subnets) {
|
|
218
219
|
const { rsGroup, natGatewayCreate, publicIpAddresses, firewallCreate } = this.args;
|
|
@@ -245,7 +246,11 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
245
246
|
subnet: { id: firewallSubnet.id },
|
|
246
247
|
},
|
|
247
248
|
],
|
|
248
|
-
}, {
|
|
249
|
+
}, {
|
|
250
|
+
...this.opts,
|
|
251
|
+
dependsOn: firewallManageSubnet ? [firewallManageSubnet, firewallSubnet] : firewallSubnet,
|
|
252
|
+
parent: this,
|
|
253
|
+
});
|
|
249
254
|
}
|
|
250
255
|
createBasion(subnets) {
|
|
251
256
|
const { rsGroup, basion } = this.args;
|
|
@@ -257,7 +262,7 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
257
262
|
rsGroup,
|
|
258
263
|
subnetId: basionSubnet.id,
|
|
259
264
|
network: { ...basion.network },
|
|
260
|
-
}, { dependsOn: basionSubnet, parent: this });
|
|
265
|
+
}, { ...this.opts, dependsOn: basionSubnet, parent: this });
|
|
261
266
|
}
|
|
262
267
|
createVnet({ natGateway, routeTable, securityGroup, }) {
|
|
263
268
|
const { rsGroup, firewallCreate, basion, vpnGatewayCreate, vnet } = this.args;
|
|
@@ -324,7 +329,7 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
324
329
|
enabled: true,
|
|
325
330
|
enforcement: network.VirtualNetworkEncryptionEnforcement.AllowUnencrypted,
|
|
326
331
|
},
|
|
327
|
-
}, { dependsOn, ignoreChanges: ['virtualNetworkPeerings', 'subnets'], parent: this });
|
|
332
|
+
}, { ...this.opts, dependsOn, ignoreChanges: ['virtualNetworkPeerings', 'subnets'], parent: this });
|
|
328
333
|
const subs = this.createSubnets({
|
|
329
334
|
subnets,
|
|
330
335
|
vnet: vn,
|
|
@@ -381,7 +386,7 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
381
386
|
resourceGroupName: pulumi.output(this.args.rsGroup.resourceGroupName),
|
|
382
387
|
},
|
|
383
388
|
secondVnet: peeringCreate.vnet,
|
|
384
|
-
}, { dependsOn: vnet, parent: this });
|
|
389
|
+
}, { ...this.opts, dependsOn: vnet, parent: this });
|
|
385
390
|
}
|
|
386
391
|
createPrivateZonesLinks(vnet) {
|
|
387
392
|
const { vnet: { privateZonesLinks }, } = this.args;
|
|
@@ -395,9 +400,9 @@ class Vnet extends base_1.BaseResourceComponent {
|
|
|
395
400
|
location: 'global',
|
|
396
401
|
registrationEnabled: false,
|
|
397
402
|
virtualNetwork: { id: vnet.id },
|
|
398
|
-
}, { dependsOn: vnet, deletedWith: vnet, parent: this });
|
|
403
|
+
}, { ...this.opts, dependsOn: vnet, deletedWith: vnet, parent: this });
|
|
399
404
|
}));
|
|
400
405
|
}
|
|
401
406
|
}
|
|
402
407
|
exports.Vnet = Vnet;
|
|
403
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VirtualNetwork.js","sourceRoot":"","sources":["../../src/vnet/VirtualNetwork.ts"],"names":[],"mappings":"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"}
|
|
408
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"VirtualNetwork.js","sourceRoot":"","sources":["../../src/vnet/VirtualNetwork.ts"],"names":[],"mappings":"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"}
|