@drunk-pulumi/azure 0.0.49 → 0.0.51
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/Helper.d.ts +3 -3
- package/Aks/Helper.js +16 -35
- package/Aks/Identity.d.ts +2 -2
- package/Aks/Identity.js +5 -5
- package/Aks/index.d.ts +19 -6
- package/Aks/index.js +57 -70
- package/Apim/Helpers.d.ts +1 -1
- package/Apim/Helpers.js +2 -2
- package/Apps/LogicApp.d.ts +3 -3
- package/Apps/LogicApp.js +4 -5
- package/AzAd/Identity.d.ts +7 -7
- package/AzAd/Identity.js +49 -43
- package/Builder/AksBuilder.d.ts +1 -1
- package/Builder/AksBuilder.js +5 -1
- package/Builder/ApimApiBuilder.d.ts +3 -3
- package/Builder/ApimApiBuilder.js +11 -11
- package/Builder/ApimBuilder.d.ts +1 -1
- package/Builder/ApimBuilder.js +47 -47
- package/Builder/ApimPolicyBuilder.d.ts +1 -1
- package/Builder/ApimPolicyBuilder.js +21 -21
- package/Builder/ApimProductBuilder.d.ts +2 -2
- package/Builder/ApimProductBuilder.js +27 -25
- package/Builder/ApimRootBuilder.d.ts +3 -3
- package/Builder/ApimRootBuilder.js +3 -3
- package/Builder/ApimWorkspaceBuilder.d.ts +2 -2
- package/Builder/ApimWorkspaceBuilder.js +2 -2
- package/Builder/DnsZoneBuilder.d.ts +2 -2
- package/Builder/DnsZoneBuilder.js +6 -6
- package/Builder/PrivateDnsZoneBuilder.d.ts +2 -2
- package/Builder/PrivateDnsZoneBuilder.js +6 -6
- package/Builder/ResourceBuilder.js +43 -13
- package/Builder/SqlBuilder.d.ts +1 -1
- package/Builder/SqlBuilder.js +2 -2
- package/Builder/StorageBuilder.d.ts +1 -1
- package/Builder/StorageBuilder.js +7 -7
- package/Builder/VaultBuilder.d.ts +7 -4
- package/Builder/VaultBuilder.js +11 -5
- package/Builder/VdiBuilder.d.ts +1 -2
- package/Builder/VdiBuilder.js +7 -7
- package/Builder/VmBuilder.d.ts +1 -1
- package/Builder/VmBuilder.js +4 -4
- package/Builder/types/genericBuilder.d.ts +7 -6
- package/Builder/types/genericBuilder.js +1 -1
- package/Builder/types/resourceBuilder.d.ts +3 -3
- package/Builder/types/vaultBuilder.d.ts +3 -4
- package/Cdn/CdnEndpoint.d.ts +2 -2
- package/Cdn/CdnEndpoint.js +19 -19
- package/Cdn/index.d.ts +4 -6
- package/Cdn/index.js +4 -5
- package/Common/AzureEnv.d.ts +6 -10
- package/Common/AzureEnv.js +16 -16
- package/Common/GlobalEnv.js +2 -2
- package/ContainerRegistry/index.d.ts +6 -16
- package/ContainerRegistry/index.js +25 -34
- package/Core/ResourceCreator.d.ts +5 -4
- package/Core/ResourceCreator.js +4 -5
- package/Core/ResourceGroup.d.ts +3 -3
- package/Core/ResourceGroup.js +3 -4
- package/CosmosDb/index.js +6 -4
- package/KeyVault/Helper.d.ts +3 -3
- package/KeyVault/Helper.js +16 -12
- package/KeyVault/index.d.ts +2 -3
- package/KeyVault/index.js +13 -13
- package/Logs/AppInsight.d.ts +3 -3
- package/Logs/AppInsight.js +10 -10
- package/Logs/Helpers.d.ts +4 -4
- package/Logs/Helpers.js +16 -16
- package/MySql/index.d.ts +5 -5
- package/MySql/index.js +22 -22
- package/Postgresql/index.d.ts +4 -4
- package/Postgresql/index.js +21 -21
- package/RedisCache/index.d.ts +2 -2
- package/RedisCache/index.js +14 -14
- package/ServiceBus/index.d.ts +11 -11
- package/ServiceBus/index.js +20 -18
- package/SignalR/index.d.ts +5 -5
- package/SignalR/index.js +18 -18
- package/Sql/SqlDb.d.ts +5 -5
- package/Sql/SqlDb.js +7 -7
- package/Sql/index.d.ts +10 -10
- package/Sql/index.js +43 -41
- package/Storage/Helper.d.ts +3 -3
- package/Storage/Helper.js +8 -8
- package/Storage/index.d.ts +9 -9
- package/Storage/index.js +26 -24
- package/VM/index.d.ts +11 -11
- package/VM/index.js +15 -15
- package/VNet/Firewall.d.ts +7 -7
- package/VNet/Firewall.js +15 -15
- package/VNet/FirewallPolicy.d.ts +5 -5
- package/VNet/FirewallPolicy.js +8 -8
- package/VNet/Helper.d.ts +5 -5
- package/VNet/Helper.js +19 -19
- package/VNet/PrivateEndpoint.d.ts +2 -2
- package/VNet/PrivateEndpoint.js +4 -4
- package/VNet/VirtualWAN.d.ts +6 -6
- package/VNet/VirtualWAN.js +5 -5
- package/VNet/Vnet.d.ts +8 -8
- package/VNet/Vnet.js +13 -13
- package/VNet/index.d.ts +2 -2
- package/Web/AppCertOrder.d.ts +5 -12
- package/Web/AppCertOrder.js +9 -15
- package/Web/AppConfig.d.ts +2 -2
- package/Web/AppConfig.js +8 -8
- package/Web/AppGateway.d.ts +2 -2
- package/Web/AppGateway.js +3 -3
- package/package.json +7 -7
- package/types.d.ts +45 -57
|
@@ -1,4 +1,27 @@
|
|
|
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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -9,11 +32,11 @@ const KeyVault_1 = require("../KeyVault");
|
|
|
9
32
|
const VnetBuilder_1 = __importDefault(require("./VnetBuilder"));
|
|
10
33
|
const azure_providers_1 = require("@drunk-pulumi/azure-providers");
|
|
11
34
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
12
|
-
const VaultBuilder_1 = require("./VaultBuilder");
|
|
13
|
-
const VaultBuilder_2 = __importDefault(require("./VaultBuilder"));
|
|
35
|
+
const VaultBuilder_1 = __importStar(require("./VaultBuilder"));
|
|
14
36
|
class ResourceBuilder {
|
|
15
37
|
name;
|
|
16
38
|
_createRGProps = undefined;
|
|
39
|
+
_createRG = false;
|
|
17
40
|
_RGInfo = undefined;
|
|
18
41
|
_lock = false;
|
|
19
42
|
_createRole = false;
|
|
@@ -48,8 +71,9 @@ class ResourceBuilder {
|
|
|
48
71
|
this._loadRolesFromVault = true;
|
|
49
72
|
return this;
|
|
50
73
|
}
|
|
51
|
-
createRG(props) {
|
|
74
|
+
createRG(props = undefined) {
|
|
52
75
|
this._createRGProps = props;
|
|
76
|
+
this._createRG = true;
|
|
53
77
|
return this;
|
|
54
78
|
}
|
|
55
79
|
withRG(props) {
|
|
@@ -101,12 +125,17 @@ class ResourceBuilder {
|
|
|
101
125
|
else if (this._loadRolesFromVault) {
|
|
102
126
|
if (!this._vaultInfo)
|
|
103
127
|
throw new Error('The KeyVaultInfo needs to be defined to load environment Roles info.');
|
|
104
|
-
this._envRoles = (0, EnvRoles_1.getEnvRolesOutput)(this._vaultInfo
|
|
128
|
+
this._envRoles = (0, EnvRoles_1.getEnvRolesOutput)(this._vaultInfo);
|
|
105
129
|
}
|
|
106
130
|
}
|
|
107
131
|
buildRG() {
|
|
108
|
-
if (!this.
|
|
132
|
+
if (!this._createRG)
|
|
109
133
|
return;
|
|
134
|
+
if (!this._createRGProps)
|
|
135
|
+
this._createRGProps = {
|
|
136
|
+
enableRGRoles: Boolean(this._envRoles),
|
|
137
|
+
enableVaultRoles: this._createVault,
|
|
138
|
+
};
|
|
110
139
|
const rs = (0, ResourceGroup_1.default)({
|
|
111
140
|
name: this.name,
|
|
112
141
|
permissions: {
|
|
@@ -115,13 +144,14 @@ class ResourceBuilder {
|
|
|
115
144
|
},
|
|
116
145
|
lock: this._lock,
|
|
117
146
|
});
|
|
147
|
+
//Collect Info
|
|
118
148
|
this._RGInfo = rs.info();
|
|
119
|
-
this._RGInstance = rs.
|
|
149
|
+
this._RGInstance = rs.instance;
|
|
120
150
|
}
|
|
121
151
|
buildVault() {
|
|
122
152
|
//Create Vault
|
|
123
153
|
if (this._createVault) {
|
|
124
|
-
this._vaultInfo = (0,
|
|
154
|
+
this._vaultInfo = (0, VaultBuilder_1.default)({
|
|
125
155
|
name: this._createVaultName ?? this.name,
|
|
126
156
|
group: this._RGInfo,
|
|
127
157
|
envRoles: this._envRoles,
|
|
@@ -129,7 +159,7 @@ class ResourceBuilder {
|
|
|
129
159
|
}).build();
|
|
130
160
|
//Add Environment Roles to Vault
|
|
131
161
|
if (this._envRolesInstance)
|
|
132
|
-
this._envRolesInstance.addRolesToVault(this._vaultInfo
|
|
162
|
+
this._envRolesInstance.addRolesToVault(this._vaultInfo);
|
|
133
163
|
}
|
|
134
164
|
if (!this._vaultInfo)
|
|
135
165
|
throw new Error('VaultInfo needs to be provided to be continuing to create other resources.');
|
|
@@ -145,14 +175,14 @@ class ResourceBuilder {
|
|
|
145
175
|
const subIds = subnetNames?.map((name) => this._vnetInstance?.findSubnet(name).apply((s) => s.id)) ?? [];
|
|
146
176
|
if (asPrivateLink && subIds.length > 0) {
|
|
147
177
|
(0, KeyVault_1.createVaultPrivateLink)({
|
|
148
|
-
vaultInfo: this._vaultInfo
|
|
178
|
+
vaultInfo: this._vaultInfo,
|
|
149
179
|
subnetIds: subIds,
|
|
150
180
|
});
|
|
151
181
|
}
|
|
152
182
|
else {
|
|
153
183
|
new azure_providers_1.VaultNetworkResource(`${this.name}-vault`, {
|
|
154
|
-
vaultName: this._vaultInfo.
|
|
155
|
-
resourceGroupName: this._vaultInfo.
|
|
184
|
+
vaultName: this._vaultInfo.name,
|
|
185
|
+
resourceGroupName: this._vaultInfo.group.resourceGroupName,
|
|
156
186
|
subscriptionId: AzureEnv_1.subscriptionId,
|
|
157
187
|
subnetIds: subIds,
|
|
158
188
|
ipAddresses: ipAddresses,
|
|
@@ -168,7 +198,7 @@ class ResourceBuilder {
|
|
|
168
198
|
//Other resources
|
|
169
199
|
this._otherResources.forEach((b) => {
|
|
170
200
|
const rs = b(this.getResults());
|
|
171
|
-
this._otherInstances[rs.
|
|
201
|
+
this._otherInstances[rs.name] = rs;
|
|
172
202
|
});
|
|
173
203
|
//Other builders
|
|
174
204
|
this._otherBuilders.forEach((b) => {
|
|
@@ -211,4 +241,4 @@ class ResourceBuilder {
|
|
|
211
241
|
}
|
|
212
242
|
}
|
|
213
243
|
exports.default = (name) => new ResourceBuilder(name);
|
|
214
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
244
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ResourceBuilder.js","sourceRoot":"","sources":["../../src/Builder/ResourceBuilder.ts"],"names":[],"mappings":"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"}
|
package/Builder/SqlBuilder.d.ts
CHANGED
package/Builder/SqlBuilder.js
CHANGED
|
@@ -55,7 +55,7 @@ class SqlBuilder extends types_1.Builder {
|
|
|
55
55
|
maxUserNameLength: 25,
|
|
56
56
|
passwordOptions: {
|
|
57
57
|
length: 50,
|
|
58
|
-
policy:
|
|
58
|
+
policy: 'yearly',
|
|
59
59
|
options: { lower: true, upper: true, special: false, numeric: true },
|
|
60
60
|
},
|
|
61
61
|
vaultInfo: this.commonProps.vaultInfo,
|
|
@@ -93,4 +93,4 @@ class SqlBuilder extends types_1.Builder {
|
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
exports.default = (props) => new SqlBuilder(props);
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9CdWlsZGVyL1NxbEJ1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxpREFBNkU7QUFDN0UsbUNBV2lCO0FBQ2pCLDJDQUE2QztBQUU3QyxNQUFNLFVBQ0osU0FBUSxlQUFtQjtJQUduQixjQUFjLEdBQVksS0FBSyxDQUFDO0lBQ2hDLFVBQVUsR0FBa0MsU0FBUyxDQUFDO0lBQ3RELFlBQVksR0FBOEIsRUFBRSxDQUFDO0lBQzdDLGFBQWEsR0FBK0IsU0FBUyxDQUFDO0lBQ3RELGlCQUFpQixHQUFtQyxTQUFTLENBQUM7SUFDOUQsZUFBZSxHQUFxQixFQUFFLENBQUM7SUFDdkMsd0JBQXdCLEdBRWhCLFNBQVMsQ0FBQztJQUVsQixZQUFZLEdBQTJCLFNBQVMsQ0FBQztJQUV6RCxZQUFZLEtBQW1CO1FBQzdCLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNmLENBQUM7SUFFRCwyQkFBMkIsQ0FDekIsS0FBNEM7UUFFNUMsSUFBSSxDQUFDLHdCQUF3QixHQUFHLEtBQUssQ0FBQztRQUN0QyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFTSxlQUFlLENBQUMsS0FBeUI7UUFDOUMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLEtBQUssQ0FBQztRQUMvQixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDTSxhQUFhLENBQUMsS0FBdUI7UUFDMUMsSUFBSSxDQUFDLGVBQWUsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLGVBQWUsRUFBRSxHQUFHLEtBQUssRUFBRSxDQUFDO1FBQzdELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNNLFdBQVcsQ0FBQyxLQUFxQjtRQUN0QyxJQUFJLENBQUMsYUFBYSxHQUFHLEtBQUssQ0FBQztRQUMzQixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDTSxlQUFlLENBQUMsS0FBZ0M7UUFDckQsSUFBSSxD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
|
|
@@ -8,7 +8,7 @@ const CdnEndpoint_1 = __importDefault(require("../Cdn/CdnEndpoint"));
|
|
|
8
8
|
const CdnRules_1 = require("../Cdn/CdnRules");
|
|
9
9
|
const types_1 = require("./types");
|
|
10
10
|
class StorageBuilder extends types_1.Builder {
|
|
11
|
-
_type =
|
|
11
|
+
_type = 'storage';
|
|
12
12
|
_policies = undefined;
|
|
13
13
|
_features = {};
|
|
14
14
|
_containers = [];
|
|
@@ -22,11 +22,11 @@ class StorageBuilder extends types_1.Builder {
|
|
|
22
22
|
super(props);
|
|
23
23
|
}
|
|
24
24
|
asStorage() {
|
|
25
|
-
this._type =
|
|
25
|
+
this._type = 'storage';
|
|
26
26
|
return this;
|
|
27
27
|
}
|
|
28
28
|
asStaticWebStorage() {
|
|
29
|
-
this._type =
|
|
29
|
+
this._type = 'staticWeb';
|
|
30
30
|
return this;
|
|
31
31
|
}
|
|
32
32
|
withCdn(props) {
|
|
@@ -71,7 +71,7 @@ class StorageBuilder extends types_1.Builder {
|
|
|
71
71
|
policies: this._policies,
|
|
72
72
|
featureFlags: {
|
|
73
73
|
...this._features,
|
|
74
|
-
enableStaticWebsite: this._type ===
|
|
74
|
+
enableStaticWebsite: this._type === 'staticWeb',
|
|
75
75
|
},
|
|
76
76
|
lock: this._lock,
|
|
77
77
|
});
|
|
@@ -82,9 +82,9 @@ class StorageBuilder extends types_1.Builder {
|
|
|
82
82
|
const securityHeaders = this._cdnProps.securityResponseHeaders ??
|
|
83
83
|
(0, CdnRules_1.getDefaultResponseHeaders)(this._cdnProps.domainName);
|
|
84
84
|
//Create Azure CDN if customDomain provided
|
|
85
|
-
const origin = `${this._storageInstance.
|
|
85
|
+
const origin = `${this._storageInstance.name}.z23.web.core.windows.net`;
|
|
86
86
|
(0, CdnEndpoint_1.default)({
|
|
87
|
-
name: this._storageInstance.
|
|
87
|
+
name: this._storageInstance.name,
|
|
88
88
|
...this._cdnProps,
|
|
89
89
|
origin,
|
|
90
90
|
httpsEnabled: true,
|
|
@@ -98,4 +98,4 @@ class StorageBuilder extends types_1.Builder {
|
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
exports.default = (props) => new StorageBuilder(props);
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RvcmFnZUJ1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQnVpbGRlci9TdG9yYWdlQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHlEQUtvQjtBQUNwQixxRUFBNkM7QUFDN0MsOENBQTREO0FBRTVELG1DQVNpQjtBQUVqQixNQUFNLGNBQ0osU0FBUSxlQUFxQjtJQUdyQixLQUFLLEdBQTRCLFNBQVMsQ0FBQztJQUMzQyxTQUFTLEdBQWtDLFNBQVMsQ0FBQztJQUNyRCxTQUFTLEdBQThCLEVBQUUsQ0FBQztJQUMxQyxXQUFXLEdBQXFCLEVBQUUsQ0FBQztJQUNuQyxPQUFPLEdBQWEsRUFBRSxDQUFDO0lBQ3ZCLFdBQVcsR0FBYSxFQUFFLENBQUM7SUFDM0IsU0FBUyxHQUErQixTQUFTLENBQUM7SUFDbEQsUUFBUSxHQUFtQyxTQUFTLENBQUM7SUFDckQsS0FBSyxHQUFZLEtBQUssQ0FBQztJQUV2QixnQkFBZ0IsR0FBK0IsU0FBUyxDQUFDO0lBRWpFLFlBQW1CLEtBQW1CO1FBQ3BDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNmLENBQUM7SUFDTSxTQUFTO1FBQ2QsSUFBSSxDQUFDLEtBQUssR0FBRyxTQUFTLENBQUM7UUFDdkIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ00sa0JBQWtCO1FBQ3ZCLElBQUksQ0FBQyxLQUFLLEdBQUcsV0FBVyxDQUFDO1FBQ3pCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNNLE9BQU8sQ0FBQyxLQUFxQjtRQUNsQyxJQUFJLENBQUMsU0FBUyxHQUFHLEtBQUssQ0FBQztRQUN2QixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDTSxhQUFhLENBQUMsS0FBcUI7UUFDeEMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDN0IsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ00sU0FBUyxDQUFD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
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
-
import { BuilderProps } from
|
|
2
|
-
import { IVaultBuilder, IVaultBuilderResults } from
|
|
3
|
-
import { KeyVaultInfo } from
|
|
4
|
-
import { Input } from
|
|
1
|
+
import { BuilderProps } from './types';
|
|
2
|
+
import { IVaultBuilder, IVaultBuilderResults } from './types/vaultBuilder';
|
|
3
|
+
import { KeyVaultInfo, ResourceGroupInfo } from '../types';
|
|
4
|
+
import { Input, Output } from '@pulumi/pulumi';
|
|
5
5
|
export declare class VaultBuilderResults implements IVaultBuilderResults {
|
|
6
6
|
private readonly vaultInfo;
|
|
7
7
|
private constructor();
|
|
8
8
|
static from(vaultInfo: KeyVaultInfo): IVaultBuilderResults;
|
|
9
|
+
get name(): string;
|
|
10
|
+
get group(): ResourceGroupInfo;
|
|
11
|
+
get id(): Output<string>;
|
|
9
12
|
info(): KeyVaultInfo;
|
|
10
13
|
linkTo(props: {
|
|
11
14
|
subnetIds: Input<string>[];
|
package/Builder/VaultBuilder.js
CHANGED
|
@@ -35,9 +35,18 @@ class VaultBuilderResults {
|
|
|
35
35
|
}
|
|
36
36
|
static from(vaultInfo) {
|
|
37
37
|
if (!vaultInfo || !vaultInfo.name || !vaultInfo.id)
|
|
38
|
-
throw new Error(
|
|
38
|
+
throw new Error('VaultBuilderResult is not defined');
|
|
39
39
|
return new VaultBuilderResults(vaultInfo);
|
|
40
40
|
}
|
|
41
|
+
get name() {
|
|
42
|
+
return this.vaultInfo.name;
|
|
43
|
+
}
|
|
44
|
+
get group() {
|
|
45
|
+
return this.vaultInfo.group;
|
|
46
|
+
}
|
|
47
|
+
get id() {
|
|
48
|
+
return this.vaultInfo.id;
|
|
49
|
+
}
|
|
41
50
|
info() {
|
|
42
51
|
return this.vaultInfo;
|
|
43
52
|
}
|
|
@@ -82,9 +91,6 @@ class VaultBuilder {
|
|
|
82
91
|
this._logInfo = logInfo;
|
|
83
92
|
return this;
|
|
84
93
|
}
|
|
85
|
-
get name() {
|
|
86
|
-
return this._props.name;
|
|
87
|
-
}
|
|
88
94
|
build() {
|
|
89
95
|
const rs = (0, KeyVault_1.default)(this._props);
|
|
90
96
|
if (this._logInfo)
|
|
@@ -93,4 +99,4 @@ class VaultBuilder {
|
|
|
93
99
|
}
|
|
94
100
|
}
|
|
95
101
|
exports.default = (props) => new VaultBuilder(props);
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVmF1bHRCdWlsZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0J1aWxkZXIvVmF1bHRCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRUEsd0RBQTREO0FBRzVELG1FQUFxRTtBQUNyRSxpREFBb0Q7QUFDcEQsMkRBQTJEO0FBRTNELE1BQWEsbUJBQW1CO0lBQ087SUFBckMsWUFBcUMsU0FBdUI7UUFBdkIsY0FBUyxHQUFULFNBQVMsQ0FBYztJQUFHLENBQUM7SUFFekQsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUF1QjtRQUN4QyxJQUFJLENBQUMsU0FBUyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFO1lBQ2hELE1BQU0sSUFBSSxLQUFLLENBQUMsbUNBQW1DLENBQUMsQ0FBQztRQUN2RCxPQUFPLElBQUksbUJBQW1CLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDNUMsQ0FBQztJQUVELElBQVcsSUFBSTtRQUNiLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUM7SUFDN0IsQ0FBQztJQUNELElBQVcsS0FBSztRQUNkLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUM7SUFDOUIsQ0FBQztJQUNELElBQVcsRUFBRTtRQUNYLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUNNLElBQUk7UUFDVCxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDeEIsQ0FBQztJQUVNLE1BQU0sQ0FBQyxLQUdiO1FBQ0MsSUFBSSxzQ0FBb0IsQ0FBQyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxhQUFhLEVBQUU7WUFDNUQsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSTtZQUM5QixpQkFBaUIsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxpQkFBaUI7WUFDekQsY0FBYyxFQUFkLHlCQUFjO1lBQ2QsR0FBRyxLQUFLO1NBQ1QsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRU0sYUFBYSxDQUFDLFNBQTBCO1FBQzdDLElBQUEsaUNBQXNCLEVBQUM7WUFDckIsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTO1lBQ3pCLFNBQVM7U0FDVixDQUFDLENBQUM7UUFDSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFTSxVQUFVLENBQ2YsS0FBb0M7UUFFcEMsdUJBQXVCO1FBQ3ZCLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDN0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3ZCLE9BQU8sSUFBQSw4QkFBZSxFQUFDO2dCQUNyQixJQUFJLEVBQUUsR0FBRztnQkFDVCxLQUFLLEVBQUUsR0FBRztnQkFDVixXQUFXLEVBQUUsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksSUFBSSxHQUFHLEVBQUU7Z0JBQzVDLFNBQVMsRUFBRSxJQUFJLENBQUMsU0FBUzthQUMxQixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztRQUNILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGO0FBMURELGtEQTBEQztBQUVELE1BQU0sWUFBWTtJQUNDLE1BQU0sQ0FBa0M7SUFDakQsUUFBUSxHQUFpQyxTQUFTLENBQUM7SUFFM0QsWUFBWSxLQUFzQztRQUNoRCxJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQztJQUN0QixDQUFDO0lBRU0sY0FBYyxDQUFDLE9BQXlCO1FBQzdDLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDO1FBQ3hCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVNLEtBQUs7UUFDVixNQUFNLEVBQUUsR0FBRyxJQUFBLGtCQUFLLEVBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzlCLElBQUksSUFBSSxDQUFDLFFBQVE7WUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNuRCxPQUFPLG1CQUFtQixDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUM3QyxDQUFDO0NBQ0Y7QUFFRCxrQkFBZSxDQUFDLEtBQXNDLEVBQUUsRUFBRSxDQUN4RCxJQUFJLFlBQVksQ0FBQyxLQUFLLENBQWtCLENBQUMifQ==
|
package/Builder/VdiBuilder.d.ts
CHANGED
package/Builder/VdiBuilder.js
CHANGED
|
@@ -53,17 +53,17 @@ class VdiBuilder extends types_1.Builder {
|
|
|
53
53
|
description: `${this._hostPoolName} HostPool`,
|
|
54
54
|
friendlyName: `${this._hostPoolName} HostPool`,
|
|
55
55
|
identity: { type: vdi.ResourceIdentityType.SystemAssigned },
|
|
56
|
-
personalDesktopAssignmentType:
|
|
56
|
+
personalDesktopAssignmentType: 'Automatic',
|
|
57
57
|
startVMOnConnect: true,
|
|
58
58
|
agentUpdate: {
|
|
59
59
|
useSessionHostLocalTime: true,
|
|
60
60
|
type: vdi.SessionHostComponentUpdateType.Scheduled,
|
|
61
61
|
maintenanceWindows: [
|
|
62
|
-
{ dayOfWeek:
|
|
63
|
-
{ dayOfWeek:
|
|
62
|
+
{ dayOfWeek: 'Saturday', hour: 0 },
|
|
63
|
+
{ dayOfWeek: 'Sunday', hour: 0 },
|
|
64
64
|
],
|
|
65
65
|
},
|
|
66
|
-
customRdpProperty:
|
|
66
|
+
customRdpProperty: 'audiocapturemode:i:1;audiomode:i:0;targetisaadjoined:i:1',
|
|
67
67
|
validationEnvironment: true,
|
|
68
68
|
...this.commonProps.group,
|
|
69
69
|
...this._options,
|
|
@@ -71,7 +71,7 @@ class VdiBuilder extends types_1.Builder {
|
|
|
71
71
|
}
|
|
72
72
|
buildAppGroups() {
|
|
73
73
|
if (this._appGroups.length <= 0)
|
|
74
|
-
this._appGroups.push({ applicationGroupType:
|
|
74
|
+
this._appGroups.push({ applicationGroupType: 'Desktop' });
|
|
75
75
|
const apps = this._appGroups.map((appGroup) => {
|
|
76
76
|
const n = `${appGroup.applicationGroupType}-vdi-apps`;
|
|
77
77
|
return new vdi.ApplicationGroup(n, {
|
|
@@ -95,11 +95,11 @@ class VdiBuilder extends types_1.Builder {
|
|
|
95
95
|
this.buildHost();
|
|
96
96
|
this.buildAppGroups();
|
|
97
97
|
return {
|
|
98
|
-
|
|
98
|
+
name: this._hostPoolName,
|
|
99
99
|
group: this.commonProps.group,
|
|
100
100
|
id: this._hostPoolInstance.id,
|
|
101
101
|
};
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
exports.default = (props) => new VdiBuilder(props);
|
|
105
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVmRpQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9CdWlsZGVyL1ZkaUJ1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQUF1QztBQUV2QyxnRkFBa0U7QUFDbEUsbUNBU2lCO0FBRWpCLE1BQU0sVUFDSixTQUFRLGVBQXFCO0lBR3JCLFVBQVUsR0FBNkIsRUFBRSxDQUFDO0lBQzFDLFFBQVEsR0FBc0MsU0FBUyxDQUFDO0lBQ3hELFFBQVEsR0FBc0MsU0FBUyxDQUFDO0lBRXhELGlCQUFpQixHQUE2QixTQUFTLENBQUM7SUFDL0MsYUFBYSxDQUFTO0lBRXZDLFlBQW1CLEtBQW1CO1FBQ3BDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNiLElBQUksQ0FBQyxhQUFhLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekQsQ0FBQztJQUVELFlBQVksQ0FBQyxLQUE2QjtRQUN4QyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1QixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxXQUFXLENBQUMsS0FBNEI7UUFDdEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUM7UUFDdEIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ0QsV0FBVyxDQUFDLEtBQTRCO1FBQ3RDLElBQUksQ0FBQyxRQUFRLEdBQUcsS0FBSyxDQUFDO1FBQ3RCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVPLFNBQVM7UUFDZixJQUFJLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxHQUFHLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDNUQsV0FBVyxFQUFFLEdBQUcsSUFBSSxDQUFDLGFBQWEsV0FBVztZQUM3QyxZQUFZLEVBQUUsR0FBRyxJQUFJLENBQUMsYUFBYSxXQUFXO1lBQzlDLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsb0JBQW9CLENBQUMsY0FBYyxFQUFFO1lBQzNELDZCQUE2QixFQUFFLFdBQVc7WUFDMUMsZ0JBQWdCLEVBQUUsSUFBSTtZQUN0QixXQUFXLEVBQUU7Z0JBQ1gsdUJBQXVCLEVBQUUsSUFBSTtnQkFDN0IsSUFBSSxFQUFFLEdBQUcsQ0FBQyw4QkFBOEIsQ0FBQyxTQUFTO2dCQUNsRCxrQkFBa0IsRUFBRTtvQkFDbEIsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUU7b0JBQ2xDLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFO2lCQUNqQzthQUNGO1lBQ0QsaUJBQWlCLEVBQ2YsMERBQTBEO1lBQzVELHFCQUFxQixFQUFFLElBQUk7WUFDM0IsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUs7WUFDekIsR0FBRyxJQUFJLENBQUMsUUFBUztTQUNsQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRU8sY0FBYztRQUNwQixJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxJQUFJLENBQUM7WUFDN0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxvQkFBb0IsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO1FBRTVELE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUU7WUFDNUMsTUFBTSxDQUFDLEdBQUcsR0FBRyxRQUFRLENBQUMsb0JBQW9CLFdBQVcsQ0FBQztZQUN0RCxPQUFPLElBQUksR0FBRyxDQUFDLGdCQUFnQixDQUM3QixDQUFDLEVBQ0Q7Z0JBQ0UsV0FBVyxFQUFFLEdBQUcsUUFBUSxDQUFDLG9CQUFvQix1QkFBdUI7Z0JBQ3BFLFlBQVksRUFBRSxHQUFHLFFBQVEsQ0FBQyxvQkFBb0IsdUJBQXVCO2dCQUNyRSxvQkFBb0IsRUFBRSxRQUFRLENBQUMsb0JBQW9CO2dCQUNuRCxlQUFlLEVBQUUsSUFBSSxDQUFDLGlCQUFrQixDQUFDLEVBQUU7Z0JBQzNDLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLO2FBQzFCLEVBQ0QsRUFBRSxTQUFTLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQ3RDLENBQUM7UUFDSixDQUFDLENBQUMsQ0FBQztRQUVILE1BQU0sRUFBRSxHQUFHLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FDMUIsSUFBSSxDQUFDLGFBQWMsRUFDbkI7WUFDRSxXQUFXLEVBQUUsR0FBRyxJQUFJLENBQUMsYUFBYSxZQUFZO1lBQzlDLFlBQVksRUFBRSxHQUFHLElBQUksQ0FBQyxhQUFhLFlBQVk7WUFDL0MsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUs7WUFDekIsMEJBQTBCLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUNqRCxHQUFHLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHO1lBQ3ZCLElBQUksRUFBRSxJQUFJLENBQUMsUUFBUSxFQUFFLElBQUk7U0FDMUIsRUFDRCxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FDcEIsQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLO1FBQ1YsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUV0QixPQUFPO1lBQ0wsSUFBSSxFQUFFLElBQUksQ0FBQyxhQUFjO1lBQ3pCLEtBQUssRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUs7WUFDN0IsRUFBRSxFQUFFLElBQUksQ0FBQyxpQkFBa0IsQ0FBQyxFQUFFO1NBQy9CLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFFRCxrQkFBZSxDQUFDLEtBQW1CLEVBQUUsRUFBRSxDQUNyQyxJQUFJLFVBQVUsQ0FBQyxLQUFLLENBQXVCLENBQUMifQ==
|
package/Builder/VmBuilder.d.ts
CHANGED
package/Builder/VmBuilder.js
CHANGED
|
@@ -60,7 +60,7 @@ class VmBuilder extends types_1.Builder {
|
|
|
60
60
|
maxUserNameLength: 25,
|
|
61
61
|
passwordOptions: {
|
|
62
62
|
length: 50,
|
|
63
|
-
policy:
|
|
63
|
+
policy: 'yearly',
|
|
64
64
|
options: { lower: true, upper: true, special: true, numeric: true },
|
|
65
65
|
},
|
|
66
66
|
vaultInfo: this.commonProps.vaultInfo,
|
|
@@ -72,7 +72,7 @@ class VmBuilder extends types_1.Builder {
|
|
|
72
72
|
...this.commonProps,
|
|
73
73
|
subnetId: this._subnetProps,
|
|
74
74
|
vmSize: this._vmSize,
|
|
75
|
-
osType: Boolean(this._linuxImage) ?
|
|
75
|
+
osType: Boolean(this._linuxImage) ? 'Linux' : 'Windows',
|
|
76
76
|
image: this._linuxImage ?? this._windowImage,
|
|
77
77
|
login: {
|
|
78
78
|
userName: this._loginProps.adminLogin,
|
|
@@ -86,11 +86,11 @@ class VmBuilder extends types_1.Builder {
|
|
|
86
86
|
this.buildLogin();
|
|
87
87
|
this.buildVm();
|
|
88
88
|
return {
|
|
89
|
-
|
|
89
|
+
name: this.commonProps.name,
|
|
90
90
|
group: this.commonProps.group,
|
|
91
91
|
id: this._vmInstance.id,
|
|
92
92
|
};
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
exports.default = (props) => new VmBuilder(props);
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm1CdWlsZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0J1aWxkZXIvVm1CdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBRUEsbUNBWWlCO0FBQ2pCLDJDQUE2QztBQUM3QywrQ0FBMkM7QUFHM0MsTUFBTSxTQUNKLFNBQVEsZUFBcUI7SUFRckIsWUFBWSxHQUE4QixTQUFTLENBQUM7SUFDcEQsVUFBVSxHQUE4QyxTQUFTLENBQUM7SUFDbEUsY0FBYyxHQUFZLEtBQUssQ0FBQztJQUNoQyxXQUFXLEdBQWtDLFNBQVMsQ0FBQztJQUN2RCxPQUFPLEdBQTRCLFNBQVMsQ0FBQztJQUM3QyxZQUFZLEdBQXdDLFNBQVMsQ0FBQztJQUM5RCxXQUFXLEdBQXNDLFNBQVMsQ0FBQztJQUMzRCxTQUFTLEdBQStCLFNBQVMsQ0FBQztJQUVsRCxXQUFXLEdBQStCLFNBQVMsQ0FBQztJQUU1RCxZQUFZLEtBQW1CO1FBQzdCLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNmLENBQUM7SUFDTSxZQUFZLENBQUMsS0FBcUI7UUFDdkMsSUFBSSxDQUFDLFNBQVMsR0FBRyxLQUFLLENBQUM7UUFDdkIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ00sWUFBWSxDQUFDLEtBQW9CO1FBQ3RDLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDO1FBQzFCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNNLFFBQVEsQ0FBQyxLQUFvQztRQUNsRCxJQUFJLENBQUMsVUFBVSxHQUFHLEtBQUssQ0FBQztRQUN4QixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDTSxhQUFhO1FBQ2xCLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDO1FBQzNCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNNLGFBQWEsQ0FBQyxLQUF3QjtRQUMzQyxJQUFJLENBQUMsV0FBVyxHQUFHLEtBQUssQ0FBQztRQUN6QixPQUFPLElB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
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { Input, Resource } from
|
|
2
|
-
import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from
|
|
3
|
-
import { EnvRolesResults } from
|
|
1
|
+
import { Input, Resource } from '@pulumi/pulumi';
|
|
2
|
+
import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from '../../types';
|
|
3
|
+
import { EnvRolesResults } from '../../AzAd/EnvRoles';
|
|
4
4
|
export type BuilderProps = {
|
|
5
5
|
name: string;
|
|
6
6
|
group: ResourceGroupInfo;
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
/** the below are optionals property and will be available depend on the situation*/
|
|
8
|
+
envRoles?: EnvRolesResults;
|
|
9
|
+
vaultInfo?: KeyVaultInfo;
|
|
9
10
|
dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
|
|
10
11
|
};
|
|
11
12
|
export type CommonOmit<T> = Omit<T, keyof BuilderProps>;
|
|
@@ -26,7 +27,7 @@ export declare abstract class Builder<TResults extends ResourceInfo> implements
|
|
|
26
27
|
protected constructor(commonProps: BuilderProps);
|
|
27
28
|
abstract build(): TResults;
|
|
28
29
|
}
|
|
29
|
-
export interface IBuilderAsync<TResults extends ResourceInfo> extends Omit<IBuilder<TResults>,
|
|
30
|
+
export interface IBuilderAsync<TResults extends ResourceInfo> extends Omit<IBuilder<TResults>, 'build'> {
|
|
30
31
|
build(): Promise<TResults>;
|
|
31
32
|
}
|
|
32
33
|
export declare abstract class BuilderAsync<TResults extends ResourceInfo> implements IBuilderAsync<TResults> {
|
|
@@ -15,4 +15,4 @@ class BuilderAsync {
|
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
exports.BuilderAsync = BuilderAsync;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJpY0J1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQnVpbGRlci90eXBlcy9nZW5lcmljQnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUErQkEsTUFBc0IsT0FBTztJQUdFO0lBQTdCLFlBQTZCLFdBQXlCO1FBQXpCLGdCQUFXLEdBQVgsV0FBVyxDQUFjO0lBQUcsQ0FBQztDQUUzRDtBQUxELDBCQUtDO0FBUUQsTUFBc0IsWUFBWTtJQUdIO0lBQTdCLFlBQTZCLFdBQXlCO1FBQXpCLGdCQUFXLEdBQVgsV0FBVyxDQUFjO0lBQUcsQ0FBQztDQUUzRDtBQUxELG9DQUtDIn0=
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EnvRolesResults } from '../../AzAd/EnvRoles';
|
|
2
2
|
import { RGPermissionType } from '../../Core/ResourceGroup';
|
|
3
3
|
import { KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from '../../types';
|
|
4
|
-
import { IBuilder, IBuilderAsync
|
|
4
|
+
import { BuilderProps, IBuilder, IBuilderAsync } from './genericBuilder';
|
|
5
5
|
import { IVnetBuilder, IVnetBuilderStart, VnetBuilderResults } from './vnetBuilder';
|
|
6
6
|
import { Input } from '@pulumi/pulumi';
|
|
7
7
|
export type ResourceBuilderResults = BuilderProps & {
|
|
@@ -25,11 +25,11 @@ export interface IResourceRoleBuilder {
|
|
|
25
25
|
withRolesFromVault(): IResourceGroupBuilder;
|
|
26
26
|
}
|
|
27
27
|
export interface IResourceGroupBuilder {
|
|
28
|
-
createRG(props
|
|
28
|
+
createRG(props?: ResourceGroupBuilderType): IResourceVaultBuilder;
|
|
29
29
|
withRG(props: ResourceGroupInfo): IResourceVaultBuilder;
|
|
30
30
|
}
|
|
31
31
|
export interface IResourceVaultBuilder {
|
|
32
|
-
createVault(name
|
|
32
|
+
createVault(name?: string): IResourceBuilder;
|
|
33
33
|
withVault(props: KeyVaultInfo): IResourceBuilder;
|
|
34
34
|
}
|
|
35
35
|
export interface IResourceVaultItemsBuilder {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BasicMonitorArgs, KeyVaultInfo } from
|
|
2
|
-
import { Input } from
|
|
3
|
-
export interface IVaultBuilderResults {
|
|
1
|
+
import { BasicMonitorArgs, KeyVaultInfo } from '../../types';
|
|
2
|
+
import { Input } from '@pulumi/pulumi';
|
|
3
|
+
export interface IVaultBuilderResults extends KeyVaultInfo {
|
|
4
4
|
info(): KeyVaultInfo;
|
|
5
5
|
addSecrets(items: Record<string, Input<string>>): IVaultBuilderResults;
|
|
6
6
|
privateLinkTo(subnetIds: Input<string>[]): IVaultBuilderResults;
|
|
@@ -10,7 +10,6 @@ export interface IVaultBuilderResults {
|
|
|
10
10
|
}): IVaultBuilderResults;
|
|
11
11
|
}
|
|
12
12
|
export interface IVaultBuilder {
|
|
13
|
-
name: string;
|
|
14
13
|
withDiagnostic(logInfo: BasicMonitorArgs): IVaultBuilder;
|
|
15
14
|
build(): IVaultBuilderResults;
|
|
16
15
|
}
|
package/Cdn/CdnEndpoint.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Input } from
|
|
2
|
-
import { BasicArgs, ResourceInfo } from
|
|
1
|
+
import { Input } from '@pulumi/pulumi';
|
|
2
|
+
import { BasicArgs, ResourceInfo } from '../types';
|
|
3
3
|
export interface CdnEndpointProps extends BasicArgs {
|
|
4
4
|
name: string;
|
|
5
5
|
origin: Input<string>;
|
package/Cdn/CdnEndpoint.js
CHANGED
|
@@ -32,9 +32,9 @@ const AzureEnv_1 = require("../Common/AzureEnv");
|
|
|
32
32
|
const CdnRules_1 = require("./CdnRules");
|
|
33
33
|
const GlobalEnv_1 = require("../Common/GlobalEnv");
|
|
34
34
|
const Helpers_1 = require("../Common/Helpers");
|
|
35
|
-
const
|
|
35
|
+
const Common_1 = require("../Common");
|
|
36
36
|
exports.default = ({ name, domainName, origin, cors, httpsEnabled, securityResponseHeaders, cdnProfileInfo = GlobalEnv_1.cdnProfileInfo, dependsOn, }) => {
|
|
37
|
-
name = (0,
|
|
37
|
+
name = (0, Common_1.getCdnEndpointName)(name);
|
|
38
38
|
const rules = [CdnRules_1.enforceHttpsRule, CdnRules_1.indexFileCacheRule];
|
|
39
39
|
if (securityResponseHeaders) {
|
|
40
40
|
rules.push((0, CdnRules_1.getResponseHeadersRule)(securityResponseHeaders));
|
|
@@ -47,26 +47,26 @@ exports.default = ({ name, domainName, origin, cors, httpsEnabled, securityRespo
|
|
|
47
47
|
const endpoint = new native.cdn.Endpoint(name, {
|
|
48
48
|
endpointName: name,
|
|
49
49
|
...cdnProfileInfo.group,
|
|
50
|
-
profileName: cdnProfileInfo.
|
|
50
|
+
profileName: cdnProfileInfo.name,
|
|
51
51
|
origins: [{ name, hostName: origin }],
|
|
52
52
|
originHostHeader: origin,
|
|
53
|
-
optimizationType:
|
|
54
|
-
queryStringCachingBehavior:
|
|
53
|
+
optimizationType: 'GeneralWebDelivery',
|
|
54
|
+
queryStringCachingBehavior: 'IgnoreQueryString',
|
|
55
55
|
deliveryPolicy: {
|
|
56
56
|
rules,
|
|
57
|
-
description:
|
|
57
|
+
description: 'Static Website Rules',
|
|
58
58
|
},
|
|
59
59
|
isCompressionEnabled: true,
|
|
60
60
|
contentTypesToCompress: [
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
61
|
+
'text/plain',
|
|
62
|
+
'text/html',
|
|
63
|
+
'text/xml',
|
|
64
|
+
'text/css',
|
|
65
|
+
'application/xml',
|
|
66
|
+
'application/xhtml+xml',
|
|
67
|
+
'application/rss+xml',
|
|
68
|
+
'application/javascript',
|
|
69
|
+
'application/x-javascript',
|
|
70
70
|
],
|
|
71
71
|
isHttpAllowed: true,
|
|
72
72
|
isHttpsAllowed: true,
|
|
@@ -75,15 +75,15 @@ exports.default = ({ name, domainName, origin, cors, httpsEnabled, securityRespo
|
|
|
75
75
|
const customDomain = new native.cdn.CustomDomain(name, {
|
|
76
76
|
endpointName: endpoint.name,
|
|
77
77
|
...cdnProfileInfo.group,
|
|
78
|
-
profileName: cdnProfileInfo.
|
|
79
|
-
customDomainName: (0, Helpers_1.replaceAll)(domainName,
|
|
78
|
+
profileName: cdnProfileInfo.name,
|
|
79
|
+
customDomainName: (0, Helpers_1.replaceAll)(domainName, '.', '-'),
|
|
80
80
|
hostName: domainName,
|
|
81
81
|
}, { dependsOn: endpoint });
|
|
82
82
|
if (httpsEnabled) {
|
|
83
83
|
new CdnHttpsEnable_1.default(name, {
|
|
84
84
|
endpointName: endpoint.name,
|
|
85
85
|
...cdnProfileInfo.group,
|
|
86
|
-
profileName: cdnProfileInfo.
|
|
86
|
+
profileName: cdnProfileInfo.name,
|
|
87
87
|
customDomainName: customDomain.name,
|
|
88
88
|
subscriptionId: AzureEnv_1.subscriptionId,
|
|
89
89
|
}, { dependsOn: customDomain });
|
|
@@ -91,4 +91,4 @@ exports.default = ({ name, domainName, origin, cors, httpsEnabled, securityRespo
|
|
|
91
91
|
}
|
|
92
92
|
return endpoint;
|
|
93
93
|
};
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2RuRW5kcG9pbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQ2RuL0NkbkVuZHBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDQSw2REFBK0M7QUFDL0Msa0dBQTBFO0FBQzFFLGlEQUFvRDtBQUNwRCx5Q0FLb0I7QUFDcEIsbURBQTZFO0FBQzdFLCtDQUErQztBQUMvQyxzQ0FBK0M7QUFhL0Msa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixVQUFVLEVBQ1YsTUFBTSxFQUNOLElBQUksRUFDSixZQUFZLEVBQ1osdUJBQXVCLEVBQ3ZCLGNBQWMsR0FBRywwQkFBb0IsRUFDckMsU0FBUyxHQUNRLEVBQUUsRUFBRTtJQUNyQixJQUFJLEdBQUcsSUFBQSwyQkFBa0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUVoQyxNQUFNLEtBQUssR0FBRyxDQUFDLDJCQUFnQixFQUFFLDZCQUFrQixDQUFDLENBQUM7SUFDckQsSUFBSSx1QkFBdUIsRUFBRSxDQUFDO1FBQzVCLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBQSxpQ0FBc0IsRUFBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUNELElBQUksSUFBSSxFQUFFLENBQUM7UUFDVCxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBQSwwQkFBZSxFQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDdkMsQ0FBQztJQUVELG1CQUFtQjtJQUNuQixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRTNDLE1BQU0sUUFBUSxHQUFHLElBQUksTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQ3RDLElBQUksRUFDSjtRQUNFLFlBQVksRUFBRSxJQUFJO1FBQ2xCLEdBQUcsY0FBZSxDQUFDLEtBQUs7UUFDeEIsV0FBVyxFQUFFLGNBQWUsQ0FBQyxJQUFJO1FBRWpDLE9BQU8sRUFBRSxDQUFDLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQztRQUNyQyxnQkFBZ0IsRUFBRSxNQUFNO1FBRXhCLGdCQUFnQixFQUFFLG9CQUFvQjtRQUN0QywwQkFBMEIsRUFBRSxtQkFBbUI7UUFFL0MsY0FBYyxFQUFFO1lBQ2QsS0FBSztZQUNMLFdBQVcsRUFBRSxzQkFBc0I7U0FDcEM7UUFFRCxvQkFBb0IsRUFBRSxJQUFJO1FBQzFCLHNCQUFzQixFQUFFO1lBQ3RCLFlBQVk7WUFDWixXQUFXO1lBQ1gsVUFBVTtZQUNWLFVBQVU7WUFDVixpQkFBaUI7WUFDakIsdUJBQXVCO1lBQ3ZCLHFCQUFxQjtZQUNyQix3QkFBd0I7WUFDeEIsMEJBQTBCO1NBQzNCO1FBRUQsYUFBYSxFQUFFLElBQUk7UUFDbkIsY0FBYyxFQUFFLElBQUk7S0FDckIsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7SUFFRixJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ2YsTUFBTSxZQUFZLEdBQUcsSUFBSSxNQUFNLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FDOUMsSUFBSSxFQUNKO1lBQ0UsWUFBWSxFQUFFLFFBQVEsQ0FBQyxJQUFJO1lBQzNCLEdBQUcsY0FBZSxDQUFDLEtBQUs7WUFDeEIsV0FBVyxFQUFFLGNBQWUsQ0FBQyxJQUFJO1lBQ2pDLGdCQUFnQixFQUFFLElBQUEsb0JBQVUsRUFBQyxVQUFVLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQztZQUNsRCxRQUFRLEVBQUUsVUFBVTtTQUNyQixFQUNELEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxDQUN4QixDQUFDO1FBRUYsSUFBSSxZQUFZLEVBQUUsQ0FBQztZQUNqQixJQUFJLHdCQUFjLENBQ2hCLElBQUksRUFDSjtnQkFDRSxZQUFZLEVBQUUsUUFBUSxDQUFDLElBQUk7Z0JBQzNCLEdBQUcsY0FBZSxDQUFDLEtBQUs7Z0JBQ3hCLFdBQVcsRUFBRSxjQUFlLENBQUMsSUFBSTtnQkFDakMsZ0JBQWdCLEVBQUUsWUFBWSxDQUFDLElBQUk7Z0JBQ25DLGNBQWMsRUFBZCx5QkFBYzthQUNmLEVBQ0QsRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLENBQzVCLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sUUFBUSxDQUFDO0FBQ2xCLENBQUMsQ0FBQyJ9
|