@drunk-pulumi/azure 0.0.39 → 0.0.40
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 +2 -2
- package/Aks/Helper.js +2 -2
- package/Aks/index.d.ts +2 -1
- package/Aks/index.js +39 -46
- package/Apim/index.d.ts +4 -4
- package/Apim/index.js +2 -3
- package/AzAd/B2C.d.ts +3 -4
- package/AzAd/B2C.js +11 -15
- package/AzAd/EnvRoles.js +2 -2
- package/AzAd/Helper.js +9 -5
- package/AzAd/Identities/AzDevOpsManagedIdentity.d.ts +0 -1
- package/AzAd/Identities/AzDevOpsManagedIdentity.js +1 -2
- package/AzAd/UserAssignedIdentity.d.ts +1 -2
- package/AzAd/UserAssignedIdentity.js +2 -8
- package/Builder/AksBuilder.js +3 -4
- package/Builder/ResourceBuilder.js +117 -35
- package/Builder/SqlBuilder.d.ts +3 -0
- package/Builder/SqlBuilder.js +81 -0
- package/Builder/VaultBuilder.d.ts +18 -0
- package/Builder/VaultBuilder.js +74 -0
- package/Builder/VmBuilder.d.ts +3 -0
- package/Builder/VmBuilder.js +83 -0
- package/Builder/VnetBuilder.d.ts +2 -2
- package/Builder/VnetBuilder.js +16 -8
- package/Builder/index.d.ts +6 -3
- package/Builder/index.js +14 -4
- package/Builder/types/askBuilder.d.ts +2 -4
- package/Builder/types/genericBuilder.d.ts +10 -0
- package/Builder/types/genericBuilder.js +1 -1
- package/Builder/types/index.d.ts +4 -2
- package/Builder/types/index.js +5 -3
- package/Builder/types/resourceBuilder.d.ts +28 -6
- package/Builder/types/sqlBuilder.d.ts +20 -0
- package/Builder/types/sqlBuilder.js +3 -0
- package/Builder/types/vaultBuilder.d.ts +16 -0
- package/Builder/types/vaultBuilder.js +3 -0
- package/Builder/types/vmBuilder.d.ts +29 -0
- package/Builder/types/vmBuilder.js +3 -0
- package/Builder/types/vnetBuilder.d.ts +5 -6
- package/Certificate/p12.js +2 -3
- package/Common/GlobalEnv.d.ts +1 -1
- package/Common/Helpers.js +3 -3
- package/ContainerRegistry/index.d.ts +4 -5
- package/ContainerRegistry/index.js +14 -16
- package/Core/Random.d.ts +1 -1
- package/Core/Random.js +6 -2
- package/Core/ResourceCreator.d.ts +7 -4
- package/Core/ResourceCreator.js +5 -5
- package/Core/ResourceGroup.d.ts +2 -1
- package/Core/ResourceGroup.js +2 -2
- package/IOT/Hub/index.d.ts +1 -2
- package/IOT/Hub/index.js +2 -6
- package/KeyVault/CustomHelper.d.ts +5 -5
- package/KeyVault/CustomHelper.js +8 -9
- package/KeyVault/index.d.ts +15 -6
- package/KeyVault/index.js +45 -36
- package/MySql/index.d.ts +1 -2
- package/MySql/index.js +3 -8
- package/Postgresql/index.js +2 -2
- package/ServiceBus/index.d.ts +12 -15
- package/ServiceBus/index.js +20 -32
- package/SignalR/index.d.ts +6 -9
- package/SignalR/index.js +16 -17
- package/Sql/SqlDb.d.ts +5 -6
- package/Sql/SqlDb.js +4 -18
- package/Sql/index.d.ts +37 -38
- package/Sql/index.js +43 -55
- package/VM/index.js +2 -2
- package/VNet/Bastion.js +1 -2
- package/VNet/FirewallPolicies/AksFirewallPolicy.js +6 -21
- package/VNet/FirewallPolicies/CFTunnelFirewallPolicy.d.ts +9 -0
- package/VNet/FirewallPolicies/CFTunnelFirewallPolicy.js +59 -0
- package/VNet/FirewallPolicies/CloudPCFirewallPolicy.js +2 -2
- package/VNet/FirewallPolicies/index.d.ts +4 -4
- package/VNet/FirewallPolicies/index.js +10 -8
- package/VNet/IpAddressPrefix.js +1 -1
- package/VNet/PrivateDns.d.ts +7 -7
- package/VNet/PrivateDns.js +11 -6
- package/VNet/PrivateEndpoint.d.ts +1 -1
- package/VNet/PrivateEndpoint.js +29 -49
- package/VNet/index.d.ts +3 -3
- package/Web/FuncApp.d.ts +5 -6
- package/Web/FuncApp.js +2 -6
- package/Web/WebAppPlan.d.ts +3 -4
- package/Web/WebAppPlan.js +5 -9
- package/package.json +5 -5
- package/types.d.ts +2 -4
package/Aks/Helper.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { KeyVaultInfo, ResourceInfo, ResourceType } from "../types";
|
|
2
2
|
import { Output } from "@pulumi/pulumi";
|
|
3
3
|
/** Get AKS Config from Managed Cluster*/
|
|
4
|
-
export declare const getAksConfig: ({ name, groupName, formattedName,
|
|
4
|
+
export declare const getAksConfig: ({ name, groupName, formattedName, disableLocalAccounts, }: {
|
|
5
5
|
name: string;
|
|
6
6
|
groupName: string;
|
|
7
7
|
formattedName?: boolean;
|
|
8
|
-
|
|
8
|
+
disableLocalAccounts?: boolean;
|
|
9
9
|
}) => Promise<string>;
|
|
10
10
|
/** Get AKS Config from Key Vault*/
|
|
11
11
|
export declare const getAksVaultConfig: ({ name, version, vaultInfo, formattedName, }: {
|
package/Aks/Helper.js
CHANGED
|
@@ -8,10 +8,10 @@ const pulumi_1 = require("@pulumi/pulumi");
|
|
|
8
8
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
9
9
|
const PrivateDns_1 = require("../VNet/PrivateDns");
|
|
10
10
|
/** Get AKS Config from Managed Cluster*/
|
|
11
|
-
const getAksConfig = async ({ name, groupName, formattedName,
|
|
11
|
+
const getAksConfig = async ({ name, groupName, formattedName, disableLocalAccounts, }) => {
|
|
12
12
|
const aksName = formattedName ? name : (0, Naming_1.getAksName)(name);
|
|
13
13
|
const group = formattedName ? groupName : (0, Naming_1.getResourceGroupName)(groupName);
|
|
14
|
-
const aks =
|
|
14
|
+
const aks = disableLocalAccounts
|
|
15
15
|
? await containerservice.listManagedClusterUserCredentials({
|
|
16
16
|
resourceName: aksName,
|
|
17
17
|
resourceGroupName: group,
|
package/Aks/index.d.ts
CHANGED
|
@@ -54,6 +54,7 @@ export type AskFeatureProps = {
|
|
|
54
54
|
export type AksAccessProps = {
|
|
55
55
|
envRoles: EnvRolesResults;
|
|
56
56
|
authorizedIPRanges?: Input<string>[];
|
|
57
|
+
disableLocalAccounts?: boolean;
|
|
57
58
|
};
|
|
58
59
|
export type AksNetworkProps = {
|
|
59
60
|
subnetId: pulumi.Input<string>;
|
|
@@ -69,7 +70,7 @@ export interface AksProps extends BasicResourceArgs {
|
|
|
69
70
|
tier?: native.containerservice.ManagedClusterSKUTier;
|
|
70
71
|
addon?: AskAddonProps;
|
|
71
72
|
features?: AskFeatureProps;
|
|
72
|
-
aksAccess
|
|
73
|
+
aksAccess: AksAccessProps;
|
|
73
74
|
acr?: {
|
|
74
75
|
enable: boolean;
|
|
75
76
|
id: Input<string>;
|
package/Aks/index.js
CHANGED
|
@@ -87,10 +87,12 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
87
87
|
const secretName = `${aksName}-config`;
|
|
88
88
|
const acrScope = acr?.enable ? acr.id ?? AzureEnv_1.defaultScope : undefined;
|
|
89
89
|
const nodeResourceGroup = (0, Naming_1.getResourceGroupName)(`${aksName}-nodes`);
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
.
|
|
93
|
-
|
|
90
|
+
//Auto detect and disable Local Account
|
|
91
|
+
if (aksAccess.disableLocalAccounts === undefined) {
|
|
92
|
+
aksAccess.disableLocalAccounts = await (0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
|
|
93
|
+
.checkSecretExist(secretName)
|
|
94
|
+
.catch(() => false);
|
|
95
|
+
}
|
|
94
96
|
ignoreChanges.push("privateLinkResources", "networkProfile", "linuxProfile");
|
|
95
97
|
const serviceIdentity = (0, Identity_1.default)({
|
|
96
98
|
name: aksName,
|
|
@@ -113,7 +115,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
113
115
|
apiServerAccessProfile: {
|
|
114
116
|
authorizedIPRanges: features?.enablePrivateCluster
|
|
115
117
|
? undefined
|
|
116
|
-
: aksAccess
|
|
118
|
+
: aksAccess.authorizedIPRanges || [],
|
|
117
119
|
disableRunCommand: true,
|
|
118
120
|
enablePrivateCluster: features?.enablePrivateCluster,
|
|
119
121
|
enablePrivateClusterPublicFQDN: true,
|
|
@@ -249,16 +251,14 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
249
251
|
upgradeChannel: native.containerservice.UpgradeChannel.Patch,
|
|
250
252
|
//nodeOSUpgradeChannel: "NodeImage",
|
|
251
253
|
},
|
|
252
|
-
disableLocalAccounts,
|
|
254
|
+
disableLocalAccounts: Boolean(aksAccess.disableLocalAccounts),
|
|
253
255
|
enableRBAC: true,
|
|
254
|
-
aadProfile:
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
}
|
|
261
|
-
: undefined,
|
|
256
|
+
aadProfile: {
|
|
257
|
+
enableAzureRBAC: true,
|
|
258
|
+
managed: true,
|
|
259
|
+
adminGroupObjectIDs: [aksAccess.envRoles.admin.objectId],
|
|
260
|
+
tenantID: AzureEnv_1.tenantId,
|
|
261
|
+
},
|
|
262
262
|
oidcIssuerProfile: { enabled: false },
|
|
263
263
|
storageProfile: {
|
|
264
264
|
blobCSIDriver: {
|
|
@@ -345,27 +345,6 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
345
345
|
osType: "Linux",
|
|
346
346
|
}));
|
|
347
347
|
}
|
|
348
|
-
if (vaultInfo) {
|
|
349
|
-
aks.id.apply(async (id) => {
|
|
350
|
-
if (!id)
|
|
351
|
-
return;
|
|
352
|
-
const config = await (0, Helper_1.getAksConfig)({
|
|
353
|
-
name: aksName,
|
|
354
|
-
groupName: group.resourceGroupName,
|
|
355
|
-
formattedName: true,
|
|
356
|
-
localAccountDisabled: disableLocalAccounts,
|
|
357
|
-
});
|
|
358
|
-
(0, CustomHelper_1.addCustomSecret)({
|
|
359
|
-
name: secretName,
|
|
360
|
-
value: config,
|
|
361
|
-
formattedName: true,
|
|
362
|
-
dependsOn: aks,
|
|
363
|
-
ignoreChange: true,
|
|
364
|
-
contentType: name,
|
|
365
|
-
vaultInfo,
|
|
366
|
-
});
|
|
367
|
-
});
|
|
368
|
-
}
|
|
369
348
|
//Grant permission for Group
|
|
370
349
|
aks.id.apply(async (id) => {
|
|
371
350
|
if (!id)
|
|
@@ -382,15 +361,13 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
382
361
|
roleName: "AcrPull",
|
|
383
362
|
scope: acrScope,
|
|
384
363
|
});
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
});
|
|
393
|
-
}
|
|
364
|
+
(0, CustomHelper_1.addCustomSecret)({
|
|
365
|
+
name: `${name}-identity-clientId`,
|
|
366
|
+
value: identityProfile["kubeletidentity"].clientId,
|
|
367
|
+
dependsOn: aks,
|
|
368
|
+
contentType: name,
|
|
369
|
+
vaultInfo,
|
|
370
|
+
});
|
|
394
371
|
}
|
|
395
372
|
if (network.subnetId && identity) {
|
|
396
373
|
(0, RoleAssignment_1.roleAssignment)({
|
|
@@ -404,6 +381,23 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
404
381
|
});
|
|
405
382
|
}
|
|
406
383
|
});
|
|
384
|
+
//Update Vault
|
|
385
|
+
const config = await (0, Helper_1.getAksConfig)({
|
|
386
|
+
name: aksName,
|
|
387
|
+
groupName: group.resourceGroupName,
|
|
388
|
+
formattedName: true,
|
|
389
|
+
disableLocalAccounts: aksAccess.disableLocalAccounts,
|
|
390
|
+
});
|
|
391
|
+
(0, CustomHelper_1.addCustomSecret)({
|
|
392
|
+
name: secretName,
|
|
393
|
+
value: config,
|
|
394
|
+
formattedName: true,
|
|
395
|
+
dependsOn: aks,
|
|
396
|
+
contentType: aksAccess.disableLocalAccounts
|
|
397
|
+
? `${name}-UserCredentials`
|
|
398
|
+
: `${name}-AdminCredentials`,
|
|
399
|
+
vaultInfo,
|
|
400
|
+
});
|
|
407
401
|
//Diagnostic
|
|
408
402
|
if (features.enableDiagnosticSetting && logWpId) {
|
|
409
403
|
(0, Helpers_1.createDiagnostic)({
|
|
@@ -432,10 +426,9 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
432
426
|
return {
|
|
433
427
|
aks,
|
|
434
428
|
serviceIdentity,
|
|
435
|
-
disableLocalAccounts,
|
|
436
429
|
getKubeConfig: () => (0, pulumi_1.output)((0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
|
|
437
430
|
.getSecret(secretName)
|
|
438
431
|
.then((s) => s.value)),
|
|
439
432
|
};
|
|
440
433
|
};
|
|
441
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
|
434
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
package/Apim/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as apimanagement from
|
|
2
|
-
import { Input } from
|
|
3
|
-
import { ApimInfo, BasicResourceArgs, DefaultResourceArgs } from
|
|
1
|
+
import * as apimanagement from "@pulumi/azure-native/apimanagement";
|
|
2
|
+
import { Input } from "@pulumi/pulumi";
|
|
3
|
+
import { ApimInfo, BasicResourceArgs, DefaultResourceArgs } from "../types";
|
|
4
4
|
interface Props extends BasicResourceArgs, Omit<DefaultResourceArgs, "monitoring"> {
|
|
5
5
|
insight?: {
|
|
6
6
|
id: Input<string>;
|
|
@@ -15,7 +15,7 @@ interface Props extends BasicResourceArgs, Omit<DefaultResourceArgs, "monitoring
|
|
|
15
15
|
certificatePassword?: Input<string>;
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
|
-
declare const _default: ({ name, group, customDomain, insight, sku, capacity,
|
|
18
|
+
declare const _default: ({ name, group, customDomain, insight, sku, capacity, alertEmail, ...others }: Props) => {
|
|
19
19
|
apim: import("@pulumi/azure-native/apimanagement/apiManagementService").ApiManagementService;
|
|
20
20
|
toApimInfo: () => ApimInfo;
|
|
21
21
|
};
|
package/Apim/index.js
CHANGED
|
@@ -7,7 +7,7 @@ const Random_1 = require("../Core/Random");
|
|
|
7
7
|
const ResourceCreator_1 = require("../Core/ResourceCreator");
|
|
8
8
|
const ApimSignInSettings_1 = require("@drunk-pulumi/azure-providers/ApimSignInSettings");
|
|
9
9
|
const ApimSignUpSettings_1 = require("@drunk-pulumi/azure-providers/ApimSignUpSettings");
|
|
10
|
-
exports.default = ({ name, group, customDomain, insight, sku, capacity = 1,
|
|
10
|
+
exports.default = ({ name, group, customDomain, insight, sku, capacity = 1, alertEmail, ...others }) => {
|
|
11
11
|
const apimName = (0, Naming_1.getApimName)(name);
|
|
12
12
|
const { resource } = (0, ResourceCreator_1.default)(apimanagement.ApiManagementService, {
|
|
13
13
|
serviceName: apimName,
|
|
@@ -73,7 +73,6 @@ exports.default = ({ name, group, customDomain, insight, sku, capacity = 1, lock
|
|
|
73
73
|
"Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false",
|
|
74
74
|
"Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false",
|
|
75
75
|
},
|
|
76
|
-
lock,
|
|
77
76
|
...others,
|
|
78
77
|
ignoreChanges: [],
|
|
79
78
|
});
|
|
@@ -113,4 +112,4 @@ exports.default = ({ name, group, customDomain, insight, sku, capacity = 1, lock
|
|
|
113
112
|
toApimInfo: () => ({ serviceName: apimName, group }),
|
|
114
113
|
};
|
|
115
114
|
};
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXBpbS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG9FQUFvRTtBQUVwRSw2Q0FBK0M7QUFDL0MsaURBQWtEO0FBQ2xELDJDQUE0QztBQUM1Qyw2REFBOEM7QUFDOUMseUZBQThGO0FBQzlGLHlGQUE4RjtBQWlCOUYsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsWUFBWSxFQUNaLE9BQU8sRUFDUCxHQUFHLEVBQ0gsUUFBUSxHQUFHLENBQUMsRUFDWixVQUFVLEVBQ1YsR0FBRyxNQUFNLEVBQ0gsRUFBRSxFQUFFO0lBQ1YsTUFBTSxRQUFRLEdBQUcsSUFBQSxvQkFBVyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25DLE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxJQUFBLHlCQUFPLEVBQUMsYUFBYSxDQUFDLG9CQUFvQixFQUFFO1FBQy9ELFdBQVcsRUFBRSxRQUFRO1FBQ3JCLEdBQUcsS0FBSztRQUVSLGNBQWMsRUFBRSxVQUFVO1FBQzFCLGFBQWEsRUFBRSx1QkFBWTtRQUMzQix1QkFBdUIsRUFBRSx1Q0FBdUM7UUFFaEUsZ0NBQWdDO1FBQ2hDLEdBQUcsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsUUFBUSxFQUFFLEdBQUcsS0FBSyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO1FBQ2xFLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRTtRQUVwQyxzQkFBc0IsRUFBRSxZQUFZO1lBQ2xDLENBQUMsQ0FBQztnQkFDRSxNQUFNO2dCQUNOLDBCQUEwQjtnQkFDMUIsNkNBQTZDO2dCQUU3Qyw2REFBNkQ7Z0JBQzdELHlDQUF5QztnQkFDekMsb0RBQW9EO2dCQUNwRCxnQ0FBZ0M7Z0JBQ2hDLE9BQU87Z0JBQ1AsTUFBTTtnQkFDTiwrQkFBK0I7Z0JBQy9CLDhDQUE4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
|
package/AzAd/B2C.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { BasicResourceArgs } from
|
|
2
|
-
type Locations =
|
|
1
|
+
import { BasicResourceArgs } from "../types";
|
|
2
|
+
type Locations = "United States" | "Europe" | "Asia Pacific" | "Australia";
|
|
3
3
|
interface Props extends BasicResourceArgs {
|
|
4
4
|
displayName: string;
|
|
5
5
|
location: Locations;
|
|
6
|
-
lock?: boolean;
|
|
7
6
|
}
|
|
8
|
-
declare const _default: ({ name, group, location, displayName
|
|
7
|
+
declare const _default: ({ name, group, location, displayName }: Props) => import("@pulumi/azure-native/azureactivedirectory/b2ctenant").B2CTenant;
|
|
9
8
|
export default _default;
|
package/AzAd/B2C.js
CHANGED
|
@@ -2,22 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const native = require("@pulumi/azure-native");
|
|
4
4
|
const Naming_1 = require("../Common/Naming");
|
|
5
|
-
const Locker_1 = require("../Core/Locker");
|
|
6
5
|
const getCountryCode = (location) => {
|
|
7
6
|
switch (location) {
|
|
8
|
-
case
|
|
9
|
-
return
|
|
10
|
-
case
|
|
11
|
-
return
|
|
12
|
-
case
|
|
13
|
-
return
|
|
14
|
-
case
|
|
15
|
-
return
|
|
7
|
+
case "Asia Pacific":
|
|
8
|
+
return "SG";
|
|
9
|
+
case "Australia":
|
|
10
|
+
return "AU";
|
|
11
|
+
case "United States":
|
|
12
|
+
return "US";
|
|
13
|
+
case "Europe":
|
|
14
|
+
return "EU";
|
|
16
15
|
default:
|
|
17
|
-
return
|
|
16
|
+
return "SG";
|
|
18
17
|
}
|
|
19
18
|
};
|
|
20
|
-
exports.default = ({ name, group, location, displayName
|
|
19
|
+
exports.default = ({ name, group, location, displayName }) => {
|
|
21
20
|
const n = (0, Naming_1.getB2cName)(name);
|
|
22
21
|
const b2cTenant = new native.azureactivedirectory.B2CTenant(n, {
|
|
23
22
|
resourceName: n,
|
|
@@ -30,9 +29,6 @@ exports.default = ({ name, group, location, displayName, lock }) => {
|
|
|
30
29
|
tier: native.azureactivedirectory.B2CResourceSKUTier.A0,
|
|
31
30
|
},
|
|
32
31
|
});
|
|
33
|
-
if (lock) {
|
|
34
|
-
(0, Locker_1.default)({ name, resource: b2cTenant });
|
|
35
|
-
}
|
|
36
32
|
return b2cTenant;
|
|
37
33
|
};
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQjJDLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvQjJDLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBRS9DLDZDQUE4QztBQVc5QyxNQUFNLGNBQWMsR0FBRyxDQUFDLFFBQW1CLEVBQUUsRUFBRTtJQUM3QyxRQUFRLFFBQVEsRUFBRSxDQUFDO1FBQ2pCLEtBQUssY0FBYztZQUNqQixPQUFPLElBQUksQ0FBQztRQUNkLEtBQUssV0FBVztZQUNkLE9BQU8sSUFBSSxDQUFDO1FBQ2QsS0FBSyxlQUFlO1lBQ2xCLE9BQU8sSUFBSSxDQUFDO1FBQ2QsS0FBSyxRQUFRO1lBQ1gsT0FBTyxJQUFJLENBQUM7UUFDZDtZQUNFLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7QUFDSCxDQUFDLENBQUM7QUFFRixrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFTLEVBQUUsRUFBRTtJQUMvRCxNQUFNLENBQUMsR0FBRyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFM0IsTUFBTSxTQUFTLEdBQUcsSUFBSSxNQUFNLENBQUMsb0JBQW9CLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRTtRQUM3RCxZQUFZLEVBQUUsQ0FBQztRQUNmLEdBQUcsS0FBSztRQUNSLFFBQVE7UUFFUixXQUFXLEVBQUUsY0FBYyxDQUFDLFFBQVEsQ0FBQztRQUNyQyxXQUFXO1FBRVgsR0FBRyxFQUFFO1lBQ0gsSUFBSSxFQUFFLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxrQkFBa0IsQ0FBQyxRQUFRO1lBQzdELElBQUksRUFBRSxNQUFNLENBQUMsb0JBQW9CLENBQUMsa0JBQWtCLENBQUMsRUFBRTtTQUN4RDtLQUNGLENBQUMsQ0FBQztJQUVILE9BQU8sU0FBUyxDQUFDO0FBQ25CLENBQUMsQ0FBQyJ9
|
package/AzAd/EnvRoles.js
CHANGED
|
@@ -62,7 +62,7 @@ exports.createEnvRoles = createEnvRoles;
|
|
|
62
62
|
/** Get Single Env Role Object */
|
|
63
63
|
const getEnvRole = async (name, vaultInfo) => {
|
|
64
64
|
const secretNames = getRoleSecretName(name);
|
|
65
|
-
console.log(`getEnvRole:`, secretNames);
|
|
65
|
+
//console.log(`getEnvRole:`, secretNames);
|
|
66
66
|
const [objectId, displayName] = await Promise.all([
|
|
67
67
|
(0, Helper_1.getSecret)({ name: secretNames.objectIdName, vaultInfo }),
|
|
68
68
|
(0, Helper_1.getSecret)({ name: secretNames.displayName, vaultInfo }),
|
|
@@ -82,4 +82,4 @@ const getEnvRolesOutput = (vaultInfo) => {
|
|
|
82
82
|
return rs;
|
|
83
83
|
};
|
|
84
84
|
exports.getEnvRolesOutput = getEnvRolesOutput;
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9FbnZSb2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxpQ0FBeUM7QUFFekMsMkNBQWdEO0FBRWhELDZDQUFpRDtBQUNqRCwyREFBMkQ7QUFDM0QsK0NBQStDO0FBSS9DLE1BQU0sYUFBYSxHQUF1QztJQUN4RCxRQUFRLEVBQUU7UUFDUixRQUFRLEVBQUUsVUFBVTtRQUNwQixPQUFPLEVBQUUsT0FBTztLQUNqQjtJQUNELFdBQVcsRUFBRTtRQUNYLFFBQVEsRUFBRSxhQUFhO1FBQ3ZCLE9BQU8sRUFBRSxPQUFPO0tBQ2pCO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsUUFBUSxFQUFFLE9BQU87UUFDakIsT0FBTyxFQUFFLE9BQU87S0FDakI7Q0FDRixDQUFDO0FBUUYsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsQ0FBQztJQUMzQyxZQUFZLEVBQUUsSUFBQSxzQkFBYSxFQUFDLFlBQVksSUFBSSxZQUFZLENBQUM7SUFDekQsV0FBVyxFQUFFLElBQUEsc0JBQWEsRUFBQyxZQUFZLElBQUksZUFBZSxDQUFDO0NBQzVELENBQUMsQ0FBQztBQVNJLE1BQU0sY0FBYyxHQUFHLEdBQUcsRUFBRTtJQUNqQyxNQUFNLE1BQU0sR0FBNEMsRUFBRSxDQUFDO0lBRTNELE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDekMsTUFBTSxNQUFNLEdBQUcsYUFBYSxDQUFDLEdBQXNCLENBQUMsQ0FBQztRQUNyRCxNQUFNLENBQUMsR0FBRyxJQUFBLGNBQUksRUFBQyxNQUFNLENBQUMsQ0FBQztRQUV2QixNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBQSxlQUFNLEVBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxD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
|
package/AzAd/Helper.js
CHANGED
|
@@ -87,10 +87,14 @@ const grantIdentityToResourceRoles = ({ name, roles, principalId, }) => roles.ma
|
|
|
87
87
|
}));
|
|
88
88
|
const grantIdentityEnvRolesGroup = ({ name, roleType, vaultInfo, principalId, }) => {
|
|
89
89
|
const role = (0, pulumi_1.output)((0, EnvRoles_1.getEnvRole)(roleType, vaultInfo));
|
|
90
|
-
return (
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
90
|
+
return role.apply((r) => {
|
|
91
|
+
if (!role.objectId)
|
|
92
|
+
return;
|
|
93
|
+
return (0, Group_1.addMemberToGroup)({
|
|
94
|
+
name,
|
|
95
|
+
objectId: principalId,
|
|
96
|
+
groupObjectId: r.objectId,
|
|
97
|
+
});
|
|
94
98
|
});
|
|
95
99
|
};
|
|
96
100
|
const grantIdentityPermissions = ({ name, principalId, vaultInfo, roles, envRole, }) => {
|
|
@@ -107,4 +111,4 @@ const grantIdentityPermissions = ({ name, principalId, vaultInfo, roles, envRole
|
|
|
107
111
|
}
|
|
108
112
|
};
|
|
109
113
|
exports.grantIdentityPermissions = grantIdentityPermissions;
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0F6QWQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUFrRTtBQUNsRSwrQ0FBK0M7QUFFL0MsMkNBQXlEO0FBQ3pELHlDQUF5RDtBQUV6RCxxREFBa0Q7QUFFbEQsbUNBQTJDO0FBaUJwQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZELFlBQVksRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUNoRCxlQUFlLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxZQUFZLENBQUM7SUFDbkQsbUJBQW1CLEVBQUUsSUFBQSxzQkFBYSxFQUFDLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQztJQUMzRCxrQkFBa0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLGVBQWUsQ0FBQztJQUN6RCxzQkFBc0IsRUFBRSxJQUFBLHNCQUFhLEVBQUMsR0FBRyxJQUFJLG1CQUFtQixDQUFDO0NBQ2xFLENBQUMsQ0FBQztBQU5VLFFBQUEsc0JBQXNCLDBCQU1oQztBQUVJLE1BQU0sZUFBZSxHQUFHLEtBQUssRUFBRSxFQUNwQyxJQUFJLEVBQ0osU0FBUyxFQUNULGdCQUFnQixHQUNWLEVBQWdDLEVBQUU7SUFDeEMsSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUM3QixNQUFNLFdBQVcsR0FBRyxJQUFBLDhCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWpELE1BQU0sQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLFlBQVksQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUMzRCxJQUFBLGtCQUFTLEVBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLFlBQVksRUFBRSxTQUFTLEVBQUUsQ0FBQztRQUN4RCxJQUFBLGtCQUFTLEVB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
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { BasicResourceArgs } from "../../types";
|
|
2
2
|
interface Props extends Omit<BasicResourceArgs, "name"> {
|
|
3
3
|
name?: string;
|
|
4
|
-
lock?: boolean;
|
|
5
4
|
}
|
|
6
5
|
declare const _default: ({ name, ...others }: Props) => import("@pulumi/azure-native/managedidentity/userAssignedIdentity").UserAssignedIdentity;
|
|
7
6
|
export default _default;
|
|
@@ -8,8 +8,7 @@ exports.default = ({ name = AzDevOpsIdentity_1.defaultAzAdoName, ...others }) =>
|
|
|
8
8
|
return (0, UserAssignedIdentity_1.default)({
|
|
9
9
|
name,
|
|
10
10
|
roles: additionRoles.map((role) => ({ name: role, scope: AzureEnv_1.defaultScope })),
|
|
11
|
-
lock: true,
|
|
12
11
|
...others,
|
|
13
12
|
});
|
|
14
13
|
};
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXpEZXZPcHNNYW5hZ2VkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQXpBZC9JZGVudGl0aWVzL0F6RGV2T3BzTWFuYWdlZElkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0Esa0VBQTJEO0FBQzNELHlEQUFzRDtBQUN0RCxvREFBcUQ7QUFNckQsa0JBQWUsQ0FBQyxFQUFFLElBQUksR0FBRyxtQ0FBZ0IsRUFBRSxHQUFHLE1BQU0sRUFBUyxFQUFFLEVBQUU7SUFDL0QsTUFBTSxhQUFhLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUVoQyxPQUFPLElBQUEsOEJBQW9CLEVBQUM7UUFDMUIsSUFBSTtRQUNKLEtBQUssRUFBRSxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsdUJBQVksRUFBRSxDQUFDLENBQUM7UUFDekUsR0FBRyxNQUFNO0tBQ1YsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDIn0=
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { BasicResourceArgs, IdentityRoleAssignment } from "../types";
|
|
2
2
|
interface Props extends BasicResourceArgs, IdentityRoleAssignment {
|
|
3
|
-
lock?: boolean;
|
|
4
3
|
}
|
|
5
|
-
declare const _default: ({ name, group,
|
|
4
|
+
declare const _default: ({ name, group, roles, envRole, vaultInfo, dependsOn, importUri, ignoreChanges, }: Props) => import("@pulumi/azure-native/managedidentity/userAssignedIdentity").UserAssignedIdentity;
|
|
6
5
|
export default _default;
|
|
@@ -2,9 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const azure = require("@pulumi/azure-native");
|
|
4
4
|
const Naming_1 = require("../Common/Naming");
|
|
5
|
-
const Locker_1 = require("../Core/Locker");
|
|
6
5
|
const Helper_1 = require("./Helper");
|
|
7
|
-
exports.default = ({ name, group,
|
|
6
|
+
exports.default = ({ name, group, roles, envRole, vaultInfo, dependsOn, importUri, ignoreChanges, }) => {
|
|
8
7
|
name = (0, Naming_1.getManagedIdentityName)(name);
|
|
9
8
|
const managedIdentity = new azure.managedidentity.UserAssignedIdentity(name, {
|
|
10
9
|
resourceName: name,
|
|
@@ -17,11 +16,6 @@ exports.default = ({ name, group, lock, roles, envRole, vaultInfo, dependsOn, im
|
|
|
17
16
|
vaultInfo,
|
|
18
17
|
principalId: managedIdentity.principalId,
|
|
19
18
|
});
|
|
20
|
-
if (lock)
|
|
21
|
-
(0, Locker_1.default)({
|
|
22
|
-
name,
|
|
23
|
-
resource: managedIdentity,
|
|
24
|
-
});
|
|
25
19
|
return managedIdentity;
|
|
26
20
|
};
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFzc2lnbmVkSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9Vc2VyQXNzaWduZWRJZGVudGl0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLDhDQUE4QztBQUM5Qyw2Q0FBMEQ7QUFFMUQscUNBQW9EO0FBSXBELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLEtBQUssRUFDTCxPQUFPLEVBQ1AsU0FBUyxFQUNULFNBQVMsRUFDVCxTQUFTLEVBQ1QsYUFBYSxHQUNQLEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxJQUFBLCtCQUFzQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLE1BQU0sZUFBZSxHQUFHLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxvQkFBb0IsQ0FDcEUsSUFBSSxFQUNKO1FBQ0UsWUFBWSxFQUFFLElBQUk7UUFDbEIsR0FBRyxLQUFLO0tBQ1QsRUFDRCxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxDQUNoRCxDQUFDO0lBRUYsSUFBQSxpQ0FBd0IsRUFBQztRQUN2QixJQUFJO1FBQ0osT0FBTztRQUNQLEtBQUs7UUFDTCxTQUFTO1FBQ1QsV0FBVyxFQUFFLGVBQWUsQ0FBQyxXQUFXO0tBQ3pDLENBQUMsQ0FBQztJQUVILE9BQU8sZUFBZSxDQUFDO0FBQ3pCLENBQUMsQ0FBQyJ9
|
package/Builder/AksBuilder.js
CHANGED
|
@@ -13,7 +13,7 @@ class AksBuilder extends types_1.BuilderAsync {
|
|
|
13
13
|
_nodePoolsProps = [];
|
|
14
14
|
_addonProps = undefined;
|
|
15
15
|
_featureProps = undefined;
|
|
16
|
-
_authProps =
|
|
16
|
+
_authProps = {};
|
|
17
17
|
_tier = containerservice_1.ManagedClusterSKUTier.Free;
|
|
18
18
|
_networkProps = undefined;
|
|
19
19
|
_defaultNode = undefined;
|
|
@@ -70,7 +70,7 @@ class AksBuilder extends types_1.BuilderAsync {
|
|
|
70
70
|
this._askInstance = await (0, Aks_1.default)({
|
|
71
71
|
...this.commonProps,
|
|
72
72
|
addon: this._addonProps,
|
|
73
|
-
aksAccess: this._authProps,
|
|
73
|
+
aksAccess: { ...this._authProps, envRoles: this.commonProps.envRoles },
|
|
74
74
|
tier: this._tier,
|
|
75
75
|
linux: {
|
|
76
76
|
adminUsername: this._sshInstance.userName,
|
|
@@ -82,7 +82,6 @@ class AksBuilder extends types_1.BuilderAsync {
|
|
|
82
82
|
network: this._networkProps,
|
|
83
83
|
importUri: this._importProps?.id,
|
|
84
84
|
ignoreChanges: this._importProps?.ignoreChanges,
|
|
85
|
-
//nodeResourceGroup: getResourceGroupName(""),
|
|
86
85
|
});
|
|
87
86
|
}
|
|
88
87
|
async build() {
|
|
@@ -92,4 +91,4 @@ class AksBuilder extends types_1.BuilderAsync {
|
|
|
92
91
|
}
|
|
93
92
|
}
|
|
94
93
|
exports.default = (props) => new AksBuilder(props);
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWtzQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9CdWlsZGVyL0Frc0J1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxtQ0FVaUI7QUFDakIseURBQWdFO0FBQ2hFLDRFQUE4RTtBQUM5RSxnQ0FRZ0I7QUFFaEIsTUFBTSxVQUNKLFNBQVEsb0JBQStCO0lBT3ZDLFdBQVc7SUFDSCxZQUFZLEdBQTJCLFNBQVMsQ0FBQztJQUNqRCxZQUFZLEdBQTJCLFNBQVMsQ0FBQztJQUV6RCxPQUFPO0lBQ0MsU0FBUyxHQUFnQyxTQUFTLENBQUM7SUFDbkQsZUFBZSxHQUF1QixFQUFFLENBQUM7SUFDekMsV0FBVyxHQUE4QixTQUFTLENBQUM7SUFDbkQsYUFBYSxHQUFnQyxTQUFTLENBQUM7SUFDdkQsVUFBVSxHQUFpRCxFQUFFLENBQUM7SUFDOUQsS0FBSyxHQUEwQix3Q0FBcUIsQ0FBQyxJQUFJLENBQUM7SUFDMUQsYUFBYSxHQUFnQyxTQUFTLENBQUM7SUFDdkQsWUFBWSxHQUF3QyxTQUFTLENBQUM7SUFDOUQsWUFBWSxHQUErQixTQUFTLENBQUM7SUFFN0QsWUFBWSxLQUFtQjtRQUM3QixLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDZixDQUFDO0lBRUQseUJBQXlCO0lBQ2xCLFVBQVUsQ0FBQyxLQUFzQjtRQUN0QyxJQUFJLENBQUMsU0FBUyxHQUFHLEtBQUssQ0FBQztRQUN2QixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFTSxZQUFZLENBQUMsS0FBdUI7UUFDekMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDakMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ00sU0FBUyxDQUFDLEtBQW9CO1FBQ25DLElBQUksQ0FBQyxXQUFXLEdBQUcsS0FBSyxDQUFDO1FBQ3pCLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNNLFdBQVcsQ0FBQyxLQUFz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
|