@drunk-pulumi/azure 0.0.47 → 0.0.49
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/index.d.ts +10 -10
- package/Aks/index.js +55 -55
- package/Builder/AksBuilder.d.ts +1 -1
- package/Builder/AksBuilder.js +2 -2
- package/Builder/ResourceBuilder.d.ts +1 -1
- package/Builder/ResourceBuilder.js +7 -5
- package/Builder/types/askBuilder.d.ts +6 -6
- package/Builder/types/resourceBuilder.d.ts +8 -8
- package/Common/GlobalEnv.d.ts +1 -3
- package/Common/GlobalEnv.js +4 -10
- package/Common/ResourceEnv.d.ts +1 -2
- package/Common/ResourceEnv.js +36 -10
- package/Core/{KeyGenetators.js → KeyGenerators.js} +1 -1
- package/Core/ResourceGroup.d.ts +4 -4
- package/Core/ResourceGroup.js +3 -3
- package/package.json +1 -1
- package/types.d.ts +12 -5
- /package/Core/{KeyGenetators.d.ts → KeyGenerators.d.ts} +0 -0
package/Aks/index.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import * as native from
|
|
2
|
-
import * as pulumi from
|
|
3
|
-
import { Input, Output } from
|
|
4
|
-
import { BasicResourceArgs, KeyVaultInfo, ResourceInfo } from
|
|
5
|
-
import { EnvRolesResults } from
|
|
6
|
-
import * as inputs from
|
|
7
|
-
import { IdentityResult } from
|
|
8
|
-
import { ManagedCluster } from
|
|
1
|
+
import * as native from '@pulumi/azure-native';
|
|
2
|
+
import * as pulumi from '@pulumi/pulumi';
|
|
3
|
+
import { Input, Output } from '@pulumi/pulumi';
|
|
4
|
+
import { BasicResourceArgs, KeyVaultInfo, ResourceInfo } from '../types';
|
|
5
|
+
import { EnvRolesResults } from '../AzAd/EnvRoles';
|
|
6
|
+
import * as inputs from '@pulumi/azure-native/types/input';
|
|
7
|
+
import { IdentityResult } from '../AzAd/Identity';
|
|
8
|
+
import { ManagedCluster } from '@pulumi/azure-native/containerservice';
|
|
9
9
|
export declare enum VmSizes {
|
|
10
10
|
/** 32G RAM - 4CPU - $221.92 */
|
|
11
11
|
Standard_E4as_v4 = "Standard_E4as_v4",
|
|
@@ -64,8 +64,8 @@ export type AksNetworkProps = {
|
|
|
64
64
|
ipAddressPrefixId?: pulumi.Input<string>;
|
|
65
65
|
};
|
|
66
66
|
};
|
|
67
|
-
export type AksNodePoolProps = Omit<NodePoolProps,
|
|
68
|
-
export type DefaultAksNodePoolProps = Omit<AksNodePoolProps,
|
|
67
|
+
export type AksNodePoolProps = Omit<NodePoolProps, 'subnetId' | 'aksId'>;
|
|
68
|
+
export type DefaultAksNodePoolProps = Omit<AksNodePoolProps, 'name' | 'mode'>;
|
|
69
69
|
export interface AksProps extends BasicResourceArgs {
|
|
70
70
|
tier?: native.containerservice.ManagedClusterSKUTier;
|
|
71
71
|
addon?: AskAddonProps;
|
package/Aks/index.js
CHANGED
|
@@ -36,7 +36,7 @@ const Locker_1 = __importDefault(require("../Core/Locker"));
|
|
|
36
36
|
const Identity_1 = __importDefault(require("./Identity"));
|
|
37
37
|
const StackEnv_1 = require("../Common/StackEnv");
|
|
38
38
|
const Helpers_1 = require("../Logs/Helpers");
|
|
39
|
-
const
|
|
39
|
+
const Common_1 = require("../Common");
|
|
40
40
|
const RoleAssignment_1 = require("../AzAd/RoleAssignment");
|
|
41
41
|
const Helper_1 = require("./Helper");
|
|
42
42
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
@@ -47,11 +47,11 @@ const autoScaleFor = ({ enableAutoScaling, nodeType, env, }) => {
|
|
|
47
47
|
let maxCount = 3;
|
|
48
48
|
if (env === AzureEnv_1.Environments.Prd) {
|
|
49
49
|
switch (nodeType) {
|
|
50
|
-
case
|
|
50
|
+
case 'User':
|
|
51
51
|
maxCount = 5;
|
|
52
52
|
break;
|
|
53
|
-
case
|
|
54
|
-
case
|
|
53
|
+
case 'Default':
|
|
54
|
+
case 'System':
|
|
55
55
|
default:
|
|
56
56
|
maxCount = 3;
|
|
57
57
|
break;
|
|
@@ -65,9 +65,9 @@ const autoScaleFor = ({ enableAutoScaling, nodeType, env, }) => {
|
|
|
65
65
|
};
|
|
66
66
|
};
|
|
67
67
|
const defaultNodePoolProps = {
|
|
68
|
-
availabilityZones: AzureEnv_1.isPrd ? [
|
|
68
|
+
availabilityZones: AzureEnv_1.isPrd ? ['1', '2', '3'] : undefined,
|
|
69
69
|
type: native.containerservice.AgentPoolType.VirtualMachineScaleSets,
|
|
70
|
-
vmSize:
|
|
70
|
+
vmSize: 'Standard_B2s',
|
|
71
71
|
maxPods: 50,
|
|
72
72
|
enableFIPS: false,
|
|
73
73
|
enableNodePublicIP: false,
|
|
@@ -109,10 +109,10 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
109
109
|
enableAzureKeyVault: false,
|
|
110
110
|
enableKubeDashboard: false,
|
|
111
111
|
}, tier = native.containerservice.ManagedClusterSKUTier.Free, lock = true, dependsOn = [], importUri, ignoreChanges = [], }) => {
|
|
112
|
-
const aksName = (0,
|
|
112
|
+
const aksName = (0, Common_1.getAksName)(name);
|
|
113
113
|
const secretName = `${aksName}-config`;
|
|
114
114
|
const acrScope = acr?.enable ? acr.id ?? AzureEnv_1.defaultScope : undefined;
|
|
115
|
-
const nodeResourceGroup = (0,
|
|
115
|
+
const nodeResourceGroup = (0, Common_1.getResourceGroupName)(`${aksName}-nodes`);
|
|
116
116
|
//Auto detect and disable Local Account
|
|
117
117
|
if (aksAccess.disableLocalAccounts === undefined) {
|
|
118
118
|
aksAccess.disableLocalAccounts = await (0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
|
|
@@ -120,7 +120,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
120
120
|
.catch(() => false);
|
|
121
121
|
}
|
|
122
122
|
if (ignoreChanges.length <= 0) {
|
|
123
|
-
ignoreChanges.push(
|
|
123
|
+
ignoreChanges.push('privateLinkResources', 'networkProfile', 'linuxProfile', 'windowsProfile');
|
|
124
124
|
}
|
|
125
125
|
const serviceIdentity = (0, Identity_1.default)({
|
|
126
126
|
name: aksName,
|
|
@@ -147,13 +147,13 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
147
147
|
disableRunCommand: true,
|
|
148
148
|
enablePrivateCluster: features?.enablePrivateCluster,
|
|
149
149
|
enablePrivateClusterPublicFQDN: true,
|
|
150
|
-
privateDNSZone:
|
|
150
|
+
privateDNSZone: 'system',
|
|
151
151
|
},
|
|
152
152
|
addonProfiles: {
|
|
153
153
|
azureKeyvaultSecretsProvider: {
|
|
154
154
|
config: addon.enableAzureKeyVault
|
|
155
155
|
? {
|
|
156
|
-
enableSecretRotation:
|
|
156
|
+
enableSecretRotation: 'true',
|
|
157
157
|
}
|
|
158
158
|
: undefined,
|
|
159
159
|
enabled: Boolean(addon.enableAzureKeyVault),
|
|
@@ -196,7 +196,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
196
196
|
...defaultNodePool,
|
|
197
197
|
...autoScaleFor({
|
|
198
198
|
env: AzureEnv_1.currentEnv,
|
|
199
|
-
nodeType:
|
|
199
|
+
nodeType: 'System',
|
|
200
200
|
enableAutoScaling: features?.enableAutoScale,
|
|
201
201
|
// powerState: {
|
|
202
202
|
// code: "Running",
|
|
@@ -205,13 +205,13 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
205
205
|
// maxSurge: "10%",
|
|
206
206
|
// },
|
|
207
207
|
}),
|
|
208
|
-
name:
|
|
209
|
-
mode:
|
|
208
|
+
name: 'defaultnodes',
|
|
209
|
+
mode: 'System',
|
|
210
210
|
count: 1,
|
|
211
211
|
vnetSubnetID: network.subnetId,
|
|
212
|
-
kubeletDiskType:
|
|
213
|
-
osSKU:
|
|
214
|
-
osType:
|
|
212
|
+
kubeletDiskType: 'OS',
|
|
213
|
+
osSKU: 'Ubuntu',
|
|
214
|
+
osType: 'Linux',
|
|
215
215
|
},
|
|
216
216
|
],
|
|
217
217
|
linuxProfile: linux
|
|
@@ -222,27 +222,27 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
222
222
|
: undefined,
|
|
223
223
|
//This is not inuse
|
|
224
224
|
windowsProfile: {
|
|
225
|
-
adminUsername:
|
|
225
|
+
adminUsername: 'azureuser',
|
|
226
226
|
enableCSIProxy: true,
|
|
227
227
|
},
|
|
228
228
|
autoScalerProfile: {
|
|
229
|
-
balanceSimilarNodeGroups:
|
|
230
|
-
expander:
|
|
231
|
-
maxEmptyBulkDelete:
|
|
232
|
-
maxGracefulTerminationSec:
|
|
233
|
-
maxNodeProvisionTime:
|
|
234
|
-
maxTotalUnreadyPercentage:
|
|
235
|
-
newPodScaleUpDelay:
|
|
236
|
-
okTotalUnreadyCount:
|
|
237
|
-
scaleDownDelayAfterAdd:
|
|
238
|
-
scaleDownDelayAfterDelete:
|
|
239
|
-
scaleDownDelayAfterFailure:
|
|
240
|
-
scaleDownUnneededTime:
|
|
241
|
-
scaleDownUnreadyTime:
|
|
242
|
-
scaleDownUtilizationThreshold:
|
|
243
|
-
scanInterval:
|
|
244
|
-
skipNodesWithLocalStorage:
|
|
245
|
-
skipNodesWithSystemPods:
|
|
229
|
+
balanceSimilarNodeGroups: 'true',
|
|
230
|
+
expander: 'random',
|
|
231
|
+
maxEmptyBulkDelete: '10',
|
|
232
|
+
maxGracefulTerminationSec: '600',
|
|
233
|
+
maxNodeProvisionTime: '15m',
|
|
234
|
+
maxTotalUnreadyPercentage: '45',
|
|
235
|
+
newPodScaleUpDelay: '0s',
|
|
236
|
+
okTotalUnreadyCount: '3',
|
|
237
|
+
scaleDownDelayAfterAdd: '30m',
|
|
238
|
+
scaleDownDelayAfterDelete: '60s',
|
|
239
|
+
scaleDownDelayAfterFailure: '10m',
|
|
240
|
+
scaleDownUnneededTime: '10m',
|
|
241
|
+
scaleDownUnreadyTime: '20m',
|
|
242
|
+
scaleDownUtilizationThreshold: '0.5',
|
|
243
|
+
scanInterval: '60s',
|
|
244
|
+
skipNodesWithLocalStorage: 'false',
|
|
245
|
+
skipNodesWithSystemPods: 'true',
|
|
246
246
|
},
|
|
247
247
|
//Still under preview
|
|
248
248
|
// workloadAutoScalerProfile: enableAutoScale
|
|
@@ -308,7 +308,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
308
308
|
outboundType: features?.enablePrivateCluster || !network.outboundIpAddress
|
|
309
309
|
? native.containerservice.OutboundType.UserDefinedRouting
|
|
310
310
|
: native.containerservice.OutboundType.LoadBalancer,
|
|
311
|
-
loadBalancerSku:
|
|
311
|
+
loadBalancerSku: 'Standard',
|
|
312
312
|
loadBalancerProfile: network.outboundIpAddress
|
|
313
313
|
? {
|
|
314
314
|
outboundIPs: network.outboundIpAddress.ipAddressId
|
|
@@ -334,7 +334,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
334
334
|
ignoreChanges,
|
|
335
335
|
});
|
|
336
336
|
new native.containerservice.MaintenanceConfiguration(`${aksName}-MaintenanceConfiguration`, {
|
|
337
|
-
configName:
|
|
337
|
+
configName: 'default',
|
|
338
338
|
// notAllowedTime: [
|
|
339
339
|
// {
|
|
340
340
|
// end: "2020-11-30T12:00:00Z",
|
|
@@ -365,12 +365,12 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
365
365
|
nodeType: p.mode,
|
|
366
366
|
enableAutoScaling: features.enableAutoScale,
|
|
367
367
|
}),
|
|
368
|
-
count: p.mode ===
|
|
368
|
+
count: p.mode === 'System' ? 1 : 0,
|
|
369
369
|
//orchestratorVersion: kubernetesVersion,
|
|
370
370
|
vnetSubnetID: network.subnetId,
|
|
371
|
-
kubeletDiskType:
|
|
372
|
-
osSKU:
|
|
373
|
-
osType:
|
|
371
|
+
kubeletDiskType: 'OS',
|
|
372
|
+
osSKU: 'Ubuntu',
|
|
373
|
+
osType: 'Linux',
|
|
374
374
|
}));
|
|
375
375
|
}
|
|
376
376
|
//Grant permission for Group
|
|
@@ -381,17 +381,17 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
381
381
|
pulumi
|
|
382
382
|
.all([aks.identity, aks.identityProfile, network.subnetId])
|
|
383
383
|
.apply(([identity, identityProfile, sId]) => {
|
|
384
|
-
if (acrScope && identityProfile && identityProfile[
|
|
384
|
+
if (acrScope && identityProfile && identityProfile['kubeletidentity']) {
|
|
385
385
|
(0, RoleAssignment_1.roleAssignment)({
|
|
386
386
|
name: `${name}-aks-identity-profile-pull`,
|
|
387
|
-
principalId: identityProfile[
|
|
388
|
-
principalType:
|
|
389
|
-
roleName:
|
|
387
|
+
principalId: identityProfile['kubeletidentity'].objectId,
|
|
388
|
+
principalType: 'ServicePrincipal',
|
|
389
|
+
roleName: 'AcrPull',
|
|
390
390
|
scope: acrScope,
|
|
391
391
|
});
|
|
392
392
|
(0, CustomHelper_1.addCustomSecret)({
|
|
393
393
|
name: `${name}-identity-clientId`,
|
|
394
|
-
value: identityProfile[
|
|
394
|
+
value: identityProfile['kubeletidentity'].clientId,
|
|
395
395
|
dependsOn: aks,
|
|
396
396
|
contentType: name,
|
|
397
397
|
vaultInfo,
|
|
@@ -401,8 +401,8 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
401
401
|
(0, RoleAssignment_1.roleAssignment)({
|
|
402
402
|
name: `${name}-system-net`,
|
|
403
403
|
principalId: identity.principalId,
|
|
404
|
-
roleName:
|
|
405
|
-
principalType:
|
|
404
|
+
roleName: 'Contributor',
|
|
405
|
+
principalType: 'ServicePrincipal',
|
|
406
406
|
scope: (0, AzureEnv_1.getResourceIdFromInfo)({
|
|
407
407
|
group: (0, AzureEnv_1.parseResourceInfoFromId)(sId).group,
|
|
408
408
|
}),
|
|
@@ -433,12 +433,12 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
433
433
|
targetResourceId: id,
|
|
434
434
|
logWpId,
|
|
435
435
|
logsCategories: [
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
436
|
+
'guard',
|
|
437
|
+
'kube-controller-manager',
|
|
438
|
+
'kube-audit-admin',
|
|
439
|
+
'kube-audit',
|
|
440
|
+
'kube-scheduler',
|
|
441
|
+
'cluster-autoscaler',
|
|
442
442
|
],
|
|
443
443
|
dependsOn: aks,
|
|
444
444
|
});
|
|
@@ -462,4 +462,4 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
462
462
|
.then((s) => s.value)),
|
|
463
463
|
};
|
|
464
464
|
};
|
|
465
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
|
465
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
package/Builder/AksBuilder.d.ts
CHANGED
package/Builder/AksBuilder.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const types_1 = require("./types");
|
|
7
|
-
const
|
|
7
|
+
const KeyGenerators_1 = require("../Core/KeyGenerators");
|
|
8
8
|
const containerservice_1 = require("@pulumi/azure-native/containerservice");
|
|
9
9
|
const Aks_1 = __importDefault(require("../Aks"));
|
|
10
10
|
class AksBuilder extends types_1.BuilderAsync {
|
|
@@ -63,7 +63,7 @@ class AksBuilder extends types_1.BuilderAsync {
|
|
|
63
63
|
}
|
|
64
64
|
//Build Methods
|
|
65
65
|
buildSsh() {
|
|
66
|
-
this._sshInstance = (0,
|
|
66
|
+
this._sshInstance = (0, KeyGenerators_1.generateSsh)({
|
|
67
67
|
...this.commonProps,
|
|
68
68
|
...this._sshProps,
|
|
69
69
|
});
|
|
@@ -18,6 +18,7 @@ class ResourceBuilder {
|
|
|
18
18
|
_lock = false;
|
|
19
19
|
_createRole = false;
|
|
20
20
|
_createVault = false;
|
|
21
|
+
_createVaultName = undefined;
|
|
21
22
|
_loadRolesFromVault = false;
|
|
22
23
|
_envRoles = undefined;
|
|
23
24
|
_otherBuilders = new Array();
|
|
@@ -55,8 +56,9 @@ class ResourceBuilder {
|
|
|
55
56
|
this._RGInfo = props;
|
|
56
57
|
return this;
|
|
57
58
|
}
|
|
58
|
-
createVault() {
|
|
59
|
+
createVault(name = undefined) {
|
|
59
60
|
this._createVault = true;
|
|
61
|
+
this._createVaultName = name;
|
|
60
62
|
return this;
|
|
61
63
|
}
|
|
62
64
|
withVault(props) {
|
|
@@ -98,7 +100,7 @@ class ResourceBuilder {
|
|
|
98
100
|
}
|
|
99
101
|
else if (this._loadRolesFromVault) {
|
|
100
102
|
if (!this._vaultInfo)
|
|
101
|
-
throw new Error(
|
|
103
|
+
throw new Error('The KeyVaultInfo needs to be defined to load environment Roles info.');
|
|
102
104
|
this._envRoles = (0, EnvRoles_1.getEnvRolesOutput)(this._vaultInfo.info());
|
|
103
105
|
}
|
|
104
106
|
}
|
|
@@ -120,7 +122,7 @@ class ResourceBuilder {
|
|
|
120
122
|
//Create Vault
|
|
121
123
|
if (this._createVault) {
|
|
122
124
|
this._vaultInfo = (0, VaultBuilder_2.default)({
|
|
123
|
-
name: this.name,
|
|
125
|
+
name: this._createVaultName ?? this.name,
|
|
124
126
|
group: this._RGInfo,
|
|
125
127
|
envRoles: this._envRoles,
|
|
126
128
|
dependsOn: this._RGInstance,
|
|
@@ -130,7 +132,7 @@ class ResourceBuilder {
|
|
|
130
132
|
this._envRolesInstance.addRolesToVault(this._vaultInfo.info());
|
|
131
133
|
}
|
|
132
134
|
if (!this._vaultInfo)
|
|
133
|
-
throw new Error(
|
|
135
|
+
throw new Error('VaultInfo needs to be provided to be continuing to create other resources.');
|
|
134
136
|
//Add Secrets to Vaults
|
|
135
137
|
if (this._secrets)
|
|
136
138
|
this._vaultInfo.addSecrets(this._secrets);
|
|
@@ -209,4 +211,4 @@ class ResourceBuilder {
|
|
|
209
211
|
}
|
|
210
212
|
}
|
|
211
213
|
exports.default = (name) => new ResourceBuilder(name);
|
|
212
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
214
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ResourceBuilder.js","sourceRoot":"","sources":["../../src/Builder/ResourceBuilder.ts"],"names":[],"mappings":";;;;;AAcA,+CAK0B;AAE1B,0EAAuC;AAEvC,0CAAqD;AAErD,gEAAwC;AACxC,mEAAqE;AACrE,iDAAoD;AAEpD,iDAAqD;AACrD,kEAA0C;AAE1C,MAAM,eAAe;IA8BA;IAvBX,cAAc,GAAyC,SAAS,CAAC;IACjE,OAAO,GAAkC,SAAS,CAAC;IACnD,KAAK,GAAY,KAAK,CAAC;IACvB,WAAW,GAAY,KAAK,CAAC;IAC7B,YAAY,GAAY,KAAK,CAAC;IAC9B,gBAAgB,GAAuB,SAAS,CAAC;IACjD,mBAAmB,GAAY,KAAK,CAAC;IACrC,SAAS,GAAgC,SAAS,CAAC;IACnD,cAAc,GAAG,IAAI,KAAK,EAAuB,CAAC;IAClD,mBAAmB,GAAG,IAAI,KAAK,EAA4B,CAAC;IAC5D,UAAU,GAAqC,SAAS,CAAC;IACzD,YAAY,GAAwC,SAAS,CAAC;IAC9D,QAAQ,GAAkC,EAAE,CAAC;IAC7C,kBAAkB,GACxB,SAAS,CAAC;IACJ,eAAe,GAAuB,EAAE,CAAC;IAEjD,WAAW;IACH,WAAW,GAA8B,SAAS,CAAC;IACnD,iBAAiB,GAAmC,SAAS,CAAC;IAC9D,eAAe,GAAiC,EAAE,CAAC;IACnD,aAAa,GAAmC,SAAS,CAAC;IAElE,YAAmB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;IAAG,CAAC;IAE5B,WAAW;QAChB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IACM,SAAS,CAAC,KAAsB;QACrC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IACM,kBAAkB;QACvB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IACM,QAAQ,CAAC,KAA+B;QAC7C,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACM,MAAM,CAAC,KAAwB;QACpC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IACM,WAAW,CAAC,OAA2B,SAAS;QACrD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IACM,SAAS,CAAC,KAAmB;QAClC,IAAI,CAAC,UAAU,GAAG,kCAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IACM,WAAW,CAAC,KAAsC;QACvD,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IACM,UAAU,CAAC,KAAoC;QACpD,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,KAAK,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,QAAQ,CAAC,KAA8B;QAC5C,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACM,WAAW,CAAC,KAA0B;QAC3C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IACM,gBAAgB,CAAC,KAA+B;QACrD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IACM,YAAY,CAAC,OAAyB;QAC3C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IACM,IAAI;QACT,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,UAAU;QAChB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,CAAC,iBAAiB,GAAG,IAAA,yBAAc,GAAE,CAAC;YAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAC1C,CAAC;aAAM,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,UAAU;gBAClB,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;YACJ,IAAI,CAAC,SAAS,GAAG,IAAA,4BAAiB,EAAC,IAAI,CAAC,UAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAEO,OAAO;QACb,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO;QAEjC,MAAM,EAAE,GAAG,IAAA,uBAAE,EAAC;YACZ,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE;gBACX,QAAQ,EAAE,IAAI,CAAC,SAAU;gBACzB,GAAG,IAAI,CAAC,cAAc;aACvB;YACD,IAAI,EAAE,IAAI,CAAC,KAAK;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEO,UAAU;QAChB,cAAc;QACd,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,IAAA,sBAAY,EAAC;gBAC7B,IAAI,EAAE,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,IAAI;gBACxC,KAAK,EAAE,IAAI,CAAC,OAAQ;gBACpB,QAAQ,EAAE,IAAI,CAAC,SAAU;gBACzB,SAAS,EAAE,IAAI,CAAC,WAAW;aAC5B,CAAC,CAAC,KAAK,EAAE,CAAC;YAEX,gCAAgC;YAChC,IAAI,IAAI,CAAC,iBAAiB;gBACxB,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,UAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,UAAU;YAClB,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;QAEJ,uBAAuB;QACvB,IAAI,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,UAAW,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,mDAAmD;IAC3C,iBAAiB;QACvB,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,aAAa;YAAE,OAAO;QAC5D,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAE5E,MAAM,MAAM,GACV,WAAW,EAAE,GAAG,CACd,CAAC,IAAY,EAAE,EAAE,CACf,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,IAAI,CAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC,EAAG,CAAE,CAC9D,IAAI,EAAE,CAAC;QAEV,IAAI,aAAa,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvC,IAAA,iCAAsB,EAAC;gBACrB,SAAS,EAAE,IAAI,CAAC,UAAW,CAAC,IAAI,EAAE;gBAClC,SAAS,EAAE,MAAM;aAClB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,sCAAoB,CACtB,GAAG,IAAI,CAAC,IAAI,QAAQ,EACpB;gBACE,SAAS,EAAE,IAAI,CAAC,UAAW,CAAC,IAAI,EAAG,CAAC,IAAI;gBACxC,iBAAiB,EAAE,IAAI,CAAC,UAAW,CAAC,IAAI,EAAG,CAAC,KAAK,CAAC,iBAAiB;gBACnE,cAAc,EAAd,yBAAc;gBACd,SAAS,EAAE,MAAM;gBACjB,WAAW,EAAE,WAAW;aACzB,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,CAC5D,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,SAAS;QACf,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CACpC,IAAA,qBAAW,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAC/B,CAAC,KAAK,EAAE,CAAC;IACZ,CAAC;IAEO,WAAW;QACjB,iBAAiB;QACjB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAChC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,gBAAgB;QAChB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,CAAC,CAAC;gBAChB,GAAG,IAAI,CAAC,UAAU,EAAE;gBACpB,SAAS,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,IAAI,IAAI,CAAC,WAAW;aACxD,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,OAAO,GAAG,CAAC,CAAC;gBAChB,GAAG,IAAI,CAAC,UAAU,EAAE;gBACpB,SAAS,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,IAAI,IAAI,CAAC,WAAW;aACxD,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACzE,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,UAAU;QAChB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,OAAQ;YACpB,SAAS,EAAE,IAAI,CAAC,UAAW,CAAC,IAAI,EAAE;YAClC,QAAQ,EAAE,IAAI,CAAC,SAAU;YACzB,YAAY,EAAE,IAAI,CAAC,aAAa;YAChC,cAAc,EAAE,IAAI,CAAC,eAAgB;YACrC,SAAS,EAAE,IAAI,CAAC,WAAW;SAC5B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,kBAAe,CAAC,IAAY,EAAE,EAAE,CAC9B,IAAI,eAAe,CAAC,IAAI,CAAyB,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import * as native from
|
|
2
|
-
import { SshGenerationProps } from
|
|
3
|
-
import { IBuilderAsync } from
|
|
4
|
-
import { AksAccessProps, AksNetworkProps, AksNodePoolProps, AksResults, AskAddonProps, AskFeatureProps, DefaultAksNodePoolProps } from
|
|
5
|
-
export type SshBuilderProps = Omit<SshGenerationProps,
|
|
1
|
+
import * as native from '@pulumi/azure-native';
|
|
2
|
+
import { SshGenerationProps } from '../../Core/KeyGenerators';
|
|
3
|
+
import { IBuilderAsync } from './genericBuilder';
|
|
4
|
+
import { AksAccessProps, AksNetworkProps, AksNodePoolProps, AksResults, AskAddonProps, AskFeatureProps, DefaultAksNodePoolProps } from '../../Aks';
|
|
5
|
+
export type SshBuilderProps = Omit<SshGenerationProps, 'vaultInfo' | 'name'>;
|
|
6
6
|
export type AksImportProps = {
|
|
7
7
|
id: string;
|
|
8
8
|
ignoreChanges?: string[];
|
|
@@ -17,7 +17,7 @@ export interface IAksDefaultNodePoolBuilder {
|
|
|
17
17
|
withDefaultNodePool(props: DefaultAksNodePoolProps): IAksBuilder;
|
|
18
18
|
}
|
|
19
19
|
export interface IAksBuilder extends IBuilderAsync<AksResults> {
|
|
20
|
-
withAuth(props: Omit<AksAccessProps,
|
|
20
|
+
withAuth(props: Omit<AksAccessProps, 'envRoles'>): IAksBuilder;
|
|
21
21
|
withNodePool(props: AksNodePoolProps): IAksBuilder;
|
|
22
22
|
withAddon(props: AskAddonProps): IAksBuilder;
|
|
23
23
|
withFeature(props: AskFeatureProps): IAksBuilder;
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { EnvRolesResults } from
|
|
2
|
-
import { RGPermissionType } from
|
|
3
|
-
import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from
|
|
4
|
-
import { IBuilder, IBuilderAsync, BuilderProps } from
|
|
5
|
-
import { IVnetBuilder, IVnetBuilderStart, VnetBuilderResults } from
|
|
6
|
-
import { Input } from
|
|
1
|
+
import { EnvRolesResults } from '../../AzAd/EnvRoles';
|
|
2
|
+
import { RGPermissionType } from '../../Core/ResourceGroup';
|
|
3
|
+
import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from '../../types';
|
|
4
|
+
import { IBuilder, IBuilderAsync, BuilderProps } from './genericBuilder';
|
|
5
|
+
import { IVnetBuilder, IVnetBuilderStart, VnetBuilderResults } from './vnetBuilder';
|
|
6
|
+
import { Input } from '@pulumi/pulumi';
|
|
7
7
|
export type ResourceBuilderResults = BuilderProps & {
|
|
8
8
|
envRoles: EnvRolesResults;
|
|
9
9
|
vnetInstance?: VnetBuilderResults;
|
|
10
10
|
otherInstances: Record<string, any>;
|
|
11
11
|
};
|
|
12
|
-
export type ResourceGroupBuilderType = Omit<RGPermissionType,
|
|
12
|
+
export type ResourceGroupBuilderType = Omit<RGPermissionType, 'envRoles'>;
|
|
13
13
|
export type BuilderFunctionType = (props: ResourceBuilderResults) => IBuilder<any>;
|
|
14
14
|
export type BuilderAsyncFunctionType = (props: ResourceBuilderResults) => IBuilderAsync<any>;
|
|
15
15
|
export type ResourceVnetBuilderType = (builder: IVnetBuilderStart) => IVnetBuilder;
|
|
@@ -29,7 +29,7 @@ export interface IResourceGroupBuilder {
|
|
|
29
29
|
withRG(props: ResourceGroupInfo): IResourceVaultBuilder;
|
|
30
30
|
}
|
|
31
31
|
export interface IResourceVaultBuilder {
|
|
32
|
-
createVault(): IResourceBuilder;
|
|
32
|
+
createVault(name: string | undefined): IResourceBuilder;
|
|
33
33
|
withVault(props: KeyVaultInfo): IResourceBuilder;
|
|
34
34
|
}
|
|
35
35
|
export interface IResourceVaultItemsBuilder {
|
package/Common/GlobalEnv.d.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from '../types';
|
|
2
2
|
export declare const globalKeyName = "global";
|
|
3
|
-
/**The Global resource group name.*/
|
|
4
|
-
export declare const globalConvention: ConventionProps;
|
|
5
3
|
export declare const groupInfo: ResourceGroupInfo;
|
|
6
4
|
export declare const cdnProfileInfo: ResourceInfo;
|
|
7
5
|
export declare const keyVaultInfo: KeyVaultInfo;
|
package/Common/GlobalEnv.js
CHANGED
|
@@ -1,19 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.keyVaultInfo = exports.cdnProfileInfo = exports.groupInfo = exports.
|
|
3
|
+
exports.keyVaultInfo = exports.cdnProfileInfo = exports.groupInfo = exports.globalKeyName = void 0;
|
|
4
4
|
const AzureEnv_1 = require("./AzureEnv");
|
|
5
5
|
const Naming_1 = require("./Naming");
|
|
6
6
|
const ResourceEnv_1 = require("./ResourceEnv");
|
|
7
7
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
8
|
-
|
|
9
|
-
exports.globalKeyName = "global";
|
|
10
|
-
/**The Global resource group name.*/
|
|
11
|
-
exports.globalConvention = {
|
|
12
|
-
prefix: exports.globalKeyName,
|
|
13
|
-
suffix: StackEnv_1.organization ? `grp-${StackEnv_1.organization}` : "grp",
|
|
14
|
-
};
|
|
8
|
+
exports.globalKeyName = 'global';
|
|
15
9
|
exports.groupInfo = {
|
|
16
|
-
resourceGroupName: (0, ResourceEnv_1.getResourceName)(exports.globalKeyName
|
|
10
|
+
resourceGroupName: (0, ResourceEnv_1.getResourceName)(exports.globalKeyName),
|
|
17
11
|
};
|
|
18
12
|
const cdnProfileName = (0, Naming_1.getCdnProfileName)(exports.globalKeyName);
|
|
19
13
|
exports.cdnProfileInfo = {
|
|
@@ -31,4 +25,4 @@ exports.keyVaultInfo = {
|
|
|
31
25
|
group: exports.groupInfo,
|
|
32
26
|
id: (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourceGroups/${exports.groupInfo.resourceGroupName}/providers/Microsoft.KeyVault/vaults/${vaultName}`,
|
|
33
27
|
};
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR2xvYmFsRW52LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvbW1vbi9HbG9iYWxFbnYudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBTUEseUNBQTRDO0FBQzVDLHFDQUE4RDtBQUM5RCwrQ0FBZ0Q7QUFDaEQsMkNBQTZDO0FBR2hDLFFBQUEsYUFBYSxHQUFHLFFBQVEsQ0FBQztBQUV6QixRQUFBLFNBQVMsR0FBc0I7SUFDMUMsaUJBQWlCLEVBQUUsSUFBQSw2QkFBZSxFQUFDLHFCQUFhLENBQUM7Q0FDbEQsQ0FBQztBQUVGLE1BQU0sY0FBYyxHQUFHLElBQUEsMEJBQWlCLEVBQUMscUJBQWEsQ0FBQyxDQUFDO0FBQzNDLFFBQUEsY0FBYyxHQUFpQjtJQUMxQyxZQUFZLEVBQUUsY0FBYztJQUM1QixLQUFLLEVBQUU7UUFDTCxpQkFBaUIsRUFBRSxpQkFBUyxDQUFDLGlCQUFpQjtRQUM5QyxRQUFRLEVBQUUscUJBQWE7S0FDeEI7SUFDRCxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLGtCQUFrQix5QkFBYyxtQkFBbUIsaUJBQVMsQ0FBQyxpQkFBaUIscUNBQXFDLGNBQWMsRUFBRTtDQUNuSixDQUFDO0FBRUYsNEJBQTRCO0FBQzVCLE1BQU0sU0FBUyxHQUFHLElBQUEsd0JBQWUsRUFBQyxxQkFBYSxDQUFDLENBQUM7QUFDcEMsUUFBQSxZQUFZLEdBQWlCO0lBQ3hDLElBQUksRUFBRSxTQUFTO0lBQ2YsS0FBSyxFQUFFLGlCQUFTO0lBQ2hCLEVBQUUsRUFBRSxJQUFBLG9CQUFXLEVBQUEsa0JBQWtCLHlCQUFjLG1CQUFtQixpQkFBUyxDQUFDLGlCQUFpQix3Q0FBd0MsU0FBUyxFQUFFO0NBQ2pKLENBQUMifQ==
|
package/Common/ResourceEnv.d.ts
CHANGED
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
import { ConventionProps } from
|
|
2
|
-
/** The method to get Resource Name. This is not applicable for Azure Storage Account and CosmosDb*/
|
|
1
|
+
import { ConventionProps } from '../types';
|
|
3
2
|
export declare const getResourceName: (name: string, convention?: ConventionProps) => string;
|
package/Common/ResourceEnv.js
CHANGED
|
@@ -1,19 +1,47 @@
|
|
|
1
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 (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
26
|
exports.getResourceName = void 0;
|
|
27
|
+
const process = __importStar(require("node:process"));
|
|
4
28
|
const AzureEnv_1 = require("./AzureEnv");
|
|
5
29
|
const Helpers_1 = require("./Helpers");
|
|
6
30
|
const StackEnv_1 = require("./StackEnv");
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
31
|
+
const getResourceName = (name, convention = {}) => {
|
|
32
|
+
if (process.env.DPA_NAMING_DISABLE_PREFIX === 'true')
|
|
33
|
+
convention.prefix = undefined;
|
|
34
|
+
else if (convention.prefix === undefined)
|
|
10
35
|
convention.prefix = StackEnv_1.stack;
|
|
11
|
-
if (
|
|
36
|
+
if (process.env.DPA_NAMING_DISABLE_SUFFIX === 'true')
|
|
37
|
+
convention.suffix = undefined;
|
|
38
|
+
if (process.env.DPA_NAMING_DISABLE_REGION === 'true')
|
|
39
|
+
convention.region = undefined;
|
|
40
|
+
else if (convention.region === undefined)
|
|
12
41
|
convention.region = AzureEnv_1.currentCountryCode;
|
|
13
|
-
//console.log(convention);
|
|
14
42
|
if (!name)
|
|
15
43
|
return name;
|
|
16
|
-
name = (0, Helpers_1.replaceAll)(name,
|
|
44
|
+
name = (0, Helpers_1.replaceAll)(name, ' ', '-').toLowerCase();
|
|
17
45
|
const rs = [];
|
|
18
46
|
//Add prefix
|
|
19
47
|
if (convention.prefix && !name.startsWith(convention.prefix.toLowerCase())) {
|
|
@@ -31,9 +59,7 @@ const getName = (name, convention) => {
|
|
|
31
59
|
//Add the suffix
|
|
32
60
|
if (convention.suffix && !name.endsWith(convention.suffix.toLowerCase()))
|
|
33
61
|
rs.push(convention.suffix.toLowerCase());
|
|
34
|
-
return rs.join(
|
|
62
|
+
return rs.join('-');
|
|
35
63
|
};
|
|
36
|
-
/** The method to get Resource Name. This is not applicable for Azure Storage Account and CosmosDb*/
|
|
37
|
-
const getResourceName = (name, convention = {}) => getName(name, convention);
|
|
38
64
|
exports.getResourceName = getResourceName;
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VFbnYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ29tbW9uL1Jlc291cmNlRW52LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0RBQXdDO0FBQ3hDLHlDQUFnRDtBQUNoRCx1Q0FBdUM7QUFFdkMseUNBQWlEO0FBRTFDLE1BQU0sZUFBZSxHQUFHLENBQzdCLElBQVksRUFDWixhQUE4QixFQUFFLEVBQ3hCLEVBQUU7SUFDVixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLEtBQUssTUFBTTtRQUNsRCxVQUFVLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQztTQUMzQixJQUFJLFVBQVUsQ0FBQyxNQUFNLEtBQUssU0FBUztRQUFFLFVBQVUsQ0FBQyxNQUFNLEdBQUcsZ0JBQUssQ0FBQztJQUVwRSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLEtBQUssTUFBTTtRQUNsRCxVQUFVLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUVoQyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLEtBQUssTUFBTTtRQUNsRCxVQUFVLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQztTQUMzQixJQUFJLFVBQVUsQ0FBQyxNQUFNLEtBQUssU0FBUztRQUN0QyxVQUFVLENBQUMsTUFBTSxHQUFHLDZCQUFrQixDQUFDO0lBRXpDLElBQUksQ0FBQyxJQUFJO1FBQUUsT0FBTyxJQUFJLENBQUM7SUFDdkIsSUFBSSxHQUFHLElBQUEsb0JBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ2hELE1BQU0sRUFBRSxHQUFhLEVBQUUsQ0FBQztJQUV4QixZQUFZO0lBQ1osSUFBSSxVQUFVLENBQUMsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUMzRSxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVkLGNBQWM7SUFDZCxJQUFJLFVBQVUsQ0FBQyxjQUFjLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLHVCQUFZLENBQUMsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDO1FBQzVFLEVBQUUsQ0FBQyxJQUFJLENBQUMsdUJBQVksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRCxRQUFRO0lBQ1IsSUFBSSxVQUFVLENBQUMsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUN6RSxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQsZ0JBQWdCO0lBQ2hCLElBQUksVUFBVSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUN0RSxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUUzQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDdEIsQ0FBQyxDQUFDO0FBMUNXLFFBQUEsZUFBZSxtQkEwQzFCIn0=
|
|
@@ -64,4 +64,4 @@ const generatePGP = ({ name, options, vaultInfo, }) => {
|
|
|
64
64
|
};
|
|
65
65
|
};
|
|
66
66
|
exports.generatePGP = generatePGP;
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiS2V5R2VuZXJhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL0tleUdlbmVyYXRvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkNBQThDO0FBQzlDLG1GQUErRTtBQUMvRSwyREFBMkQ7QUFDM0QsK0NBQStDO0FBQy9DLHFDQUFzRTtBQUN0RSw2RUFHb0Q7QUFDcEQsMkNBQWdEO0FBZXpDLE1BQU0sV0FBVyxHQUFHLENBQUMsRUFDMUIsSUFBSSxFQUNKLFdBQVcsRUFDWCxpQkFBaUIsRUFDakIsU0FBUyxHQUNVLEVBQWMsRUFBRTtJQUNuQyxJQUFJLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXhCLE1BQU0sV0FBVyxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUM7SUFDbkMsTUFBTSxlQUFlLEdBQUcsR0FBRyxJQUFJLFdBQVcsQ0FBQztJQUMzQyxNQUFNLGFBQWEsR0FBRyxHQUFHLElBQUksWUFBWSxDQUFDO0lBQzFDLE1BQU0sY0FBYyxHQUFHLEdBQUcsSUFBSSxhQUFhLENBQUM7SUFFNUMsTUFBTSxRQUFRLEdBQUcsSUFBQSx1QkFBYyxFQUFDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUM7SUFDMUUsTUFBTSxJQUFJLEdBQUcsSUFBQSx1QkFBYyxFQUFDLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBRXJELE1BQU0sRUFBRSxHQUFHLElBQUksZ0NBQWMsQ0FDM0IsSUFBSSxFQUNKO1FBQ0UsUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNO1FBQ3JCLFNBQVM7UUFDVCxnQkFBZ0I7UUFDaEIsaUJBQWlCO0tBQ2xCLEVBQ0QsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQ3BCLENBQUM7SUFFRixJQUFBLDhCQUFlLEVBQUM7UUFDZCxJQUFJLEVBQUUsV0FBVztRQUNqQixLQUFLLEVBQUUsUUFB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
|
package/Core/ResourceGroup.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { DefaultResourceArgs, ResourceGroupInfo, ResourceResultProps, BasicResourceArgs } from
|
|
2
|
-
import { ResourceGroup } from
|
|
3
|
-
import { EnvRolesResults } from
|
|
1
|
+
import { DefaultResourceArgs, ResourceGroupInfo, ResourceResultProps, BasicResourceArgs } from '../types';
|
|
2
|
+
import { ResourceGroup } from '@pulumi/azure-native/resources';
|
|
3
|
+
import { EnvRolesResults } from '../AzAd/EnvRoles';
|
|
4
4
|
export type RGPermissionType = {
|
|
5
5
|
envRoles: EnvRolesResults;
|
|
6
6
|
enableRGRoles?: boolean;
|
|
@@ -8,7 +8,7 @@ export type RGPermissionType = {
|
|
|
8
8
|
enableIotRoles?: boolean;
|
|
9
9
|
enableVaultRoles?: boolean;
|
|
10
10
|
};
|
|
11
|
-
interface Props extends Omit<DefaultResourceArgs,
|
|
11
|
+
interface Props extends Omit<DefaultResourceArgs, 'monitoring'>, Omit<BasicResourceArgs, 'group'> {
|
|
12
12
|
formattedName?: boolean;
|
|
13
13
|
location?: string;
|
|
14
14
|
/** Grant permission of this group into Environment Roles groups*/
|
package/Core/ResourceGroup.js
CHANGED
|
@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const resources_1 = require("@pulumi/azure-native/resources");
|
|
7
7
|
const ResourceCreator_1 = __importDefault(require("./ResourceCreator"));
|
|
8
|
-
const
|
|
8
|
+
const Common_1 = require("../Common");
|
|
9
9
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
10
10
|
const EnvRoles_Consts_1 = require("../AzAd/EnvRoles.Consts");
|
|
11
11
|
exports.default = ({ name, formattedName, permissions, ...others }) => {
|
|
12
|
-
name = formattedName ? name : (0,
|
|
12
|
+
name = formattedName ? name : (0, Common_1.getResourceGroupName)(name);
|
|
13
13
|
const { resource, locker, diagnostic } = (0, ResourceCreator_1.default)(resources_1.ResourceGroup, {
|
|
14
14
|
resourceGroupName: name,
|
|
15
15
|
...others,
|
|
@@ -33,4 +33,4 @@ exports.default = ({ name, formattedName, permissions, ...others }) => {
|
|
|
33
33
|
}),
|
|
34
34
|
};
|
|
35
35
|
};
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VHcm91cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Db3JlL1Jlc291cmNlR3JvdXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFNQSw4REFHd0M7QUFDeEMsd0VBQWdEO0FBQ2hELHNDQUFpRDtBQUVqRCxpREFBdUQ7QUFDdkQsNkRBQThEO0FBcUI5RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLGFBQWEsRUFDYixXQUFXLEVBQ1gsR0FBRyxNQUFNLEVBQ0gsRUFFTixFQUFFO0lBQ0YsSUFBSSxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLDZCQUFvQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRXpELE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUEseUJBQWUsRUFBQyx5QkFBYSxFQUFFO1FBQ3RFLGlCQUFpQixFQUFFLElBQUk7UUFDdkIsR0FBRyxNQUFNO0tBQ2lDLENBQUMsQ0FBQztJQUU5QyxJQUFJLFdBQVcsRUFBRSxDQUFDO1FBQ2hCLElBQUEscUNBQW1CLEVBQUM7WUFDbEIsSUFBSTtZQUNKLEdBQUcsV0FBVztZQUNkLEtBQUssRUFBRSxRQUFRLENBQUMsRUFBRTtZQUNsQixTQUFTLEVBQUUsUUFBUTtTQUNwQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUk7UUFDSixRQUFRLEVBQUUsUUFBeUI7UUFDbkMsTUFBTTtRQUNOLFVBQVU7UUFDVixJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUNYLGlCQUFpQixFQUFFLElBQUk7WUFDdkIsUUFBUSxFQUFFLDRCQUFpQjtTQUM1QixDQUFDO0tBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
|
package/package.json
CHANGED
package/types.d.ts
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
|
-
import { Input, Output, Resource } from
|
|
2
|
-
import * as authorization from
|
|
3
|
-
import { DiagnosticSetting } from
|
|
4
|
-
import { EnvRoleKeyTypes } from
|
|
1
|
+
import { Input, Output, Resource } from '@pulumi/pulumi';
|
|
2
|
+
import * as authorization from '@pulumi/azure-native/authorization';
|
|
3
|
+
import { DiagnosticSetting } from '@pulumi/azure-native/aadiam/diagnosticSetting';
|
|
4
|
+
import { EnvRoleKeyTypes } from './AzAd/EnvRoles';
|
|
5
|
+
export declare namespace NodeJS {
|
|
6
|
+
interface ProcessEnv {
|
|
7
|
+
DPA_NAMING_DISABLE_PREFIX?: string;
|
|
8
|
+
DPA_NAMING_DISABLE_REGION?: string;
|
|
9
|
+
DPA_NAMING_DISABLE_SUFFIX?: string;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
5
12
|
export interface ResourceInfoArg {
|
|
6
13
|
/**If name and provider of the resource is not provided then the Id will be resource group Id*/
|
|
7
14
|
name?: Input<string>;
|
|
@@ -52,7 +59,7 @@ export interface BasicResourceArgs extends BasicArgs {
|
|
|
52
59
|
group: ResourceGroupInfo;
|
|
53
60
|
}
|
|
54
61
|
export interface DefaultResourceArgs extends BasicArgs {
|
|
55
|
-
monitoring?: Omit<DiagnosticProps,
|
|
62
|
+
monitoring?: Omit<DiagnosticProps, 'name' | 'targetResourceId'>;
|
|
56
63
|
}
|
|
57
64
|
export type PrivateLinkPropsType = {
|
|
58
65
|
subnetIds: Input<string>[];
|
|
File without changes
|