@drunk-pulumi/azure 0.0.48 → 0.0.50
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 +5 -5
- package/Aks/Identity.d.ts +2 -2
- package/Aks/Identity.js +5 -5
- package/Aks/index.d.ts +13 -13
- package/Aks/index.js +99 -89
- package/Apim/Helpers.d.ts +1 -1
- package/Apim/Helpers.js +2 -2
- package/AzAd/Identity.d.ts +7 -7
- package/AzAd/Identity.js +49 -43
- package/Builder/AksBuilder.d.ts +1 -1
- package/Builder/AksBuilder.js +7 -3
- 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.d.ts +1 -1
- package/Builder/ResourceBuilder.js +33 -9
- 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/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/askBuilder.d.ts +6 -6
- package/Builder/types/genericBuilder.d.ts +7 -6
- package/Builder/types/genericBuilder.js +1 -1
- package/Builder/types/resourceBuilder.d.ts +8 -8
- 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.d.ts +1 -3
- package/Common/GlobalEnv.js +5 -11
- package/Common/ResourceEnv.d.ts +1 -2
- package/Common/ResourceEnv.js +15 -15
- package/ContainerRegistry/index.d.ts +5 -15
- package/ContainerRegistry/index.js +25 -34
- package/Core/{KeyGenetators.js → KeyGenerators.js} +1 -1
- package/Core/ResourceGroup.d.ts +4 -4
- package/Core/ResourceGroup.js +3 -3
- 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 +10 -10
- package/ServiceBus/index.js +17 -17
- package/SignalR/index.d.ts +5 -5
- package/SignalR/index.js +18 -18
- package/Sql/index.d.ts +8 -8
- package/Sql/index.js +37 -35
- 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/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/Vnet.d.ts +8 -8
- package/VNet/Vnet.js +13 -13
- package/VNet/index.d.ts +1 -1
- package/Web/AppConfig.d.ts +2 -2
- package/Web/AppConfig.js +8 -8
- package/package.json +7 -7
- package/types.d.ts +29 -22
- package/config.d.ts +0 -9
- package/config.js +0 -7
- /package/Core/{KeyGenetators.d.ts → KeyGenerators.d.ts} +0 -0
package/Aks/Helper.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { KeyVaultInfo, ResourceInfo, ResourceType } from
|
|
2
|
-
import { Output } from
|
|
1
|
+
import { KeyVaultInfo, ResourceInfo, ResourceType } from '../types';
|
|
2
|
+
import { Output } from '@pulumi/pulumi';
|
|
3
3
|
/** Get AKS Config from Managed Cluster*/
|
|
4
4
|
export declare const getAksConfig: ({ name, groupName, formattedName, disableLocalAccounts, }: {
|
|
5
5
|
name: string;
|
package/Aks/Helper.js
CHANGED
|
@@ -42,7 +42,7 @@ const getAksConfig = async ({ name, groupName, formattedName, disableLocalAccoun
|
|
|
42
42
|
resourceName: aksName,
|
|
43
43
|
resourceGroupName: group,
|
|
44
44
|
});
|
|
45
|
-
return Buffer.from(aks.kubeconfigs[0].value,
|
|
45
|
+
return Buffer.from(aks.kubeconfigs[0].value, 'base64').toString('utf8');
|
|
46
46
|
};
|
|
47
47
|
exports.getAksConfig = getAksConfig;
|
|
48
48
|
/** Get AKS Config from Key Vault*/
|
|
@@ -54,7 +54,7 @@ const getAksVaultConfig = async ({ name, version, vaultInfo, formattedName, }) =
|
|
|
54
54
|
vaultInfo,
|
|
55
55
|
nameFormatted: false,
|
|
56
56
|
});
|
|
57
|
-
return rs?.value ||
|
|
57
|
+
return rs?.value || '';
|
|
58
58
|
};
|
|
59
59
|
exports.getAksVaultConfig = getAksVaultConfig;
|
|
60
60
|
const getAksPrivateDnz = ({ name, groupName, formattedName, }) => {
|
|
@@ -67,10 +67,10 @@ const getAksPrivateDnz = ({ name, groupName, formattedName, }) => {
|
|
|
67
67
|
return aks.apply((a) => {
|
|
68
68
|
if (!a.privateFQDN)
|
|
69
69
|
return undefined;
|
|
70
|
-
const dnsName = a.privateFQDN.split(
|
|
70
|
+
const dnsName = a.privateFQDN.split(':').slice(1).join('.');
|
|
71
71
|
const rsGroup = a.nodeResourceGroup;
|
|
72
72
|
return {
|
|
73
|
-
|
|
73
|
+
name: dnsName,
|
|
74
74
|
group: { resourceGroupName: rsGroup, location: AzureEnv_1.currentRegionName },
|
|
75
75
|
id: (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourceGroups/${rsGroup}/providers/Microsoft.Network/privateDnsZones/${dnsName}`,
|
|
76
76
|
};
|
|
@@ -94,4 +94,4 @@ exports.getAksPrivateDnz = getAksPrivateDnz;
|
|
|
94
94
|
// });
|
|
95
95
|
// });
|
|
96
96
|
// };
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RkFBMEU7QUFDMUUsNkNBQW9FO0FBRXBFLCtDQUErQztBQUMvQywyQ0FBcUQ7QUFDckQsaURBQXVFO0FBRXZFLHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBTXJCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsaUNBQWlDLENBQUM7WUFDdkQsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDO1FBQ0osQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsa0NBQWtDLENBQUM7WUFDeEQsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDLENBQUM7SUFFUCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzFFLENBQUMsQ0FBQztBQXpCVyxRQUFBLFlBQVksZ0JBeUJ2QjtBQUVGLG1DQUFtQztBQUM1QixNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxFQUN0QyxJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBTWQsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxrQkFBUyxFQUFDO1FBQ3pCLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUztRQUN6QixPQUFPO1FBQ1AsU0FBUztRQUNULGFBQWEsRUFBRSxLQUFLO0tBQ3JCLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBbkJXLFFBQUEsaUJBQWlCLHFCQW1CNUI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQUMsRUFDL0IsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEdBQ0EsRUFBb0MsRUFBRTtJQUNuRCxJQUFJLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMvQyxTQUFTLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUEsNkJBQW9CLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFFeEUsTUFBTSxHQUFHLEdBQUcsZ0JBQWdCLENBQUMsdUJBQXVCLENBQUM7UUFDbkQsWUFBWSxFQUFFLElBQUk7UUFDbEIsaUJBQWlCLEVBQUUsU0FBUztLQUM3QixDQUFDLENBQUM7SUFFSCxPQUFPLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNyQixJQUFJLENBQUMsQ0FBQyxDQUFDLFdBQVc7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUNyQyxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzVELE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQztRQUVyQyxPQUFPO1lBQ0wsSUFBSSxFQUFFLE9BQU87WUFDYixLQUFLLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLDRCQUFpQixFQUFFO1lBQ2xFLEVBQUUsRUFBRSxJQUFBLG9CQUFXLEVBQUEsa0JBQWtCLHlCQUFjLG1CQUFtQixPQUFPLGdEQUFnRCxPQUFPLEVBQUU7U0FDbkgsQ0FBQztJQUNwQixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQztBQXhCVyxRQUFBLGdCQUFnQixvQkF3QjNCO0FBRUYsMENBQTBDO0FBQzFDLFlBQVk7QUFDWixVQUFVO0FBQ1YsZUFBZTtBQUNmLG1CQUFtQjtBQUNuQixxREFBcUQ7QUFDckQsc0VBQXNFO0FBQ3RFLDhCQUE4QjtBQUM5QixzQkFBc0I7QUFDdEIsb0NBQW9DO0FBQ3BDLGNBQWM7QUFDZCx3QkFBd0I7QUFDeEIsa0NBQWtDO0FBQ2xDLGdCQUFnQjtBQUNoQixVQUFVO0FBQ1YsUUFBUTtBQUNSLEtBQUsifQ==
|
package/Aks/Identity.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { BasicArgs, KeyVaultInfo } from
|
|
1
|
+
import { BasicArgs, KeyVaultInfo } from '../types';
|
|
2
2
|
interface Props extends BasicArgs {
|
|
3
3
|
name: string;
|
|
4
|
-
vaultInfo
|
|
4
|
+
vaultInfo?: KeyVaultInfo;
|
|
5
5
|
}
|
|
6
6
|
declare const _default: ({ name, vaultInfo, dependsOn }: Props) => import("../AzAd/Identity").IdentityResult;
|
|
7
7
|
export default _default;
|
package/Aks/Identity.js
CHANGED
|
@@ -10,24 +10,24 @@ const AzureEnv_1 = require("../Common/AzureEnv");
|
|
|
10
10
|
//** The AzAD app Identity for Azure Kubernetes for RBAC */
|
|
11
11
|
exports.default = ({ name, vaultInfo, dependsOn }) => {
|
|
12
12
|
//AKS need this permission for AAD integration
|
|
13
|
-
const graphAccess = (0, GraphDefinition_1.getGraphPermissions)({ name:
|
|
13
|
+
const graphAccess = (0, GraphDefinition_1.getGraphPermissions)({ name: 'User.Read', type: 'Scope' }, { name: 'Group.Read.All', type: 'Scope' },
|
|
14
14
|
//{ name: 'Directory.Read.All', type: 'Scope' },
|
|
15
|
-
{ name:
|
|
15
|
+
{ name: 'Directory.Read.All', type: 'Role' });
|
|
16
16
|
const serverIdentity = (0, Identity_1.default)({
|
|
17
17
|
name,
|
|
18
18
|
createClientSecret: true,
|
|
19
19
|
createPrincipal: true,
|
|
20
20
|
requiredResourceAccesses: [graphAccess],
|
|
21
21
|
publicClient: false,
|
|
22
|
-
appType:
|
|
22
|
+
appType: 'api',
|
|
23
23
|
vaultInfo,
|
|
24
24
|
dependsOn,
|
|
25
25
|
});
|
|
26
26
|
(0, RoleAssignment_1.roleAssignment)({
|
|
27
27
|
name: `${name}-aks-identity-acr-pull`,
|
|
28
28
|
principalId: serverIdentity.principalId,
|
|
29
|
-
principalType:
|
|
30
|
-
roleName:
|
|
29
|
+
principalType: 'ServicePrincipal',
|
|
30
|
+
roleName: 'AcrPull',
|
|
31
31
|
scope: AzureEnv_1.defaultScope,
|
|
32
32
|
dependsOn: serverIdentity.resource,
|
|
33
33
|
});
|
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",
|
|
@@ -52,7 +52,7 @@ export type AskFeatureProps = {
|
|
|
52
52
|
enableDiagnosticSetting?: boolean;
|
|
53
53
|
};
|
|
54
54
|
export type AksAccessProps = {
|
|
55
|
-
envRoles
|
|
55
|
+
envRoles?: EnvRolesResults;
|
|
56
56
|
authorizedIPRanges?: Input<string>[];
|
|
57
57
|
disableLocalAccounts?: boolean;
|
|
58
58
|
};
|
|
@@ -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;
|
|
@@ -82,7 +82,7 @@ export interface AksProps extends BasicResourceArgs {
|
|
|
82
82
|
sshKeys: Array<pulumi.Input<string>>;
|
|
83
83
|
};
|
|
84
84
|
nodePools?: Array<AksNodePoolProps>;
|
|
85
|
-
vaultInfo
|
|
85
|
+
vaultInfo?: KeyVaultInfo;
|
|
86
86
|
logWpId?: Input<string>;
|
|
87
87
|
/**Lock resource from delete*/
|
|
88
88
|
lock?: boolean;
|
|
@@ -91,7 +91,7 @@ export type AksResults = ResourceInfo & {
|
|
|
91
91
|
serviceIdentity: IdentityResult;
|
|
92
92
|
aks: ManagedCluster;
|
|
93
93
|
disableLocalAccounts?: boolean;
|
|
94
|
-
getKubeConfig: () => Output<string
|
|
94
|
+
getKubeConfig: () => Output<string> | undefined;
|
|
95
95
|
};
|
|
96
96
|
declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
|
|
97
97
|
export default _default;
|
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,18 +109,18 @@ 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
|
-
if (aksAccess.disableLocalAccounts === undefined) {
|
|
117
|
+
if (aksAccess.disableLocalAccounts === undefined && vaultInfo) {
|
|
118
118
|
aksAccess.disableLocalAccounts = await (0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
|
|
119
119
|
.checkSecretExist(secretName)
|
|
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
|
|
@@ -281,12 +281,14 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
281
281
|
},
|
|
282
282
|
disableLocalAccounts: Boolean(aksAccess.disableLocalAccounts),
|
|
283
283
|
enableRBAC: true,
|
|
284
|
-
aadProfile:
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
284
|
+
aadProfile: aksAccess.envRoles
|
|
285
|
+
? {
|
|
286
|
+
enableAzureRBAC: true,
|
|
287
|
+
managed: true,
|
|
288
|
+
adminGroupObjectIDs: [aksAccess.envRoles.admin.objectId],
|
|
289
|
+
tenantID: AzureEnv_1.tenantId,
|
|
290
|
+
}
|
|
291
|
+
: undefined,
|
|
290
292
|
oidcIssuerProfile: { enabled: false },
|
|
291
293
|
storageProfile: {
|
|
292
294
|
blobCSIDriver: {
|
|
@@ -308,7 +310,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
308
310
|
outboundType: features?.enablePrivateCluster || !network.outboundIpAddress
|
|
309
311
|
? native.containerservice.OutboundType.UserDefinedRouting
|
|
310
312
|
: native.containerservice.OutboundType.LoadBalancer,
|
|
311
|
-
loadBalancerSku:
|
|
313
|
+
loadBalancerSku: 'Standard',
|
|
312
314
|
loadBalancerProfile: network.outboundIpAddress
|
|
313
315
|
? {
|
|
314
316
|
outboundIPs: network.outboundIpAddress.ipAddressId
|
|
@@ -334,7 +336,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
334
336
|
ignoreChanges,
|
|
335
337
|
});
|
|
336
338
|
new native.containerservice.MaintenanceConfiguration(`${aksName}-MaintenanceConfiguration`, {
|
|
337
|
-
configName:
|
|
339
|
+
configName: 'default',
|
|
338
340
|
// notAllowedTime: [
|
|
339
341
|
// {
|
|
340
342
|
// end: "2020-11-30T12:00:00Z",
|
|
@@ -365,12 +367,12 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
365
367
|
nodeType: p.mode,
|
|
366
368
|
enableAutoScaling: features.enableAutoScale,
|
|
367
369
|
}),
|
|
368
|
-
count: p.mode ===
|
|
370
|
+
count: p.mode === 'System' ? 1 : 0,
|
|
369
371
|
//orchestratorVersion: kubernetesVersion,
|
|
370
372
|
vnetSubnetID: network.subnetId,
|
|
371
|
-
kubeletDiskType:
|
|
372
|
-
osSKU:
|
|
373
|
-
osType:
|
|
373
|
+
kubeletDiskType: 'OS',
|
|
374
|
+
osSKU: 'Ubuntu',
|
|
375
|
+
osType: 'Linux',
|
|
374
376
|
}));
|
|
375
377
|
}
|
|
376
378
|
//Grant permission for Group
|
|
@@ -381,28 +383,30 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
381
383
|
pulumi
|
|
382
384
|
.all([aks.identity, aks.identityProfile, network.subnetId])
|
|
383
385
|
.apply(([identity, identityProfile, sId]) => {
|
|
384
|
-
if (acrScope && identityProfile && identityProfile[
|
|
386
|
+
if (acrScope && identityProfile && identityProfile['kubeletidentity']) {
|
|
385
387
|
(0, RoleAssignment_1.roleAssignment)({
|
|
386
388
|
name: `${name}-aks-identity-profile-pull`,
|
|
387
|
-
principalId: identityProfile[
|
|
388
|
-
principalType:
|
|
389
|
-
roleName:
|
|
389
|
+
principalId: identityProfile['kubeletidentity'].objectId,
|
|
390
|
+
principalType: 'ServicePrincipal',
|
|
391
|
+
roleName: 'AcrPull',
|
|
390
392
|
scope: acrScope,
|
|
391
393
|
});
|
|
392
|
-
(
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
394
|
+
if (vaultInfo) {
|
|
395
|
+
(0, CustomHelper_1.addCustomSecret)({
|
|
396
|
+
name: `${name}-identity-clientId`,
|
|
397
|
+
value: identityProfile['kubeletidentity'].clientId,
|
|
398
|
+
dependsOn: aks,
|
|
399
|
+
contentType: name,
|
|
400
|
+
vaultInfo,
|
|
401
|
+
});
|
|
402
|
+
}
|
|
399
403
|
}
|
|
400
404
|
if (network.subnetId && identity) {
|
|
401
405
|
(0, RoleAssignment_1.roleAssignment)({
|
|
402
406
|
name: `${name}-system-net`,
|
|
403
407
|
principalId: identity.principalId,
|
|
404
|
-
roleName:
|
|
405
|
-
principalType:
|
|
408
|
+
roleName: 'Contributor',
|
|
409
|
+
principalType: 'ServicePrincipal',
|
|
406
410
|
scope: (0, AzureEnv_1.getResourceIdFromInfo)({
|
|
407
411
|
group: (0, AzureEnv_1.parseResourceInfoFromId)(sId).group,
|
|
408
412
|
}),
|
|
@@ -416,16 +420,18 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
416
420
|
formattedName: true,
|
|
417
421
|
disableLocalAccounts: aksAccess.disableLocalAccounts,
|
|
418
422
|
});
|
|
419
|
-
(
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
423
|
+
if (vaultInfo) {
|
|
424
|
+
(0, CustomHelper_1.addCustomSecret)({
|
|
425
|
+
name: secretName,
|
|
426
|
+
value: config,
|
|
427
|
+
formattedName: true,
|
|
428
|
+
dependsOn: aks,
|
|
429
|
+
contentType: aksAccess.disableLocalAccounts
|
|
430
|
+
? `${name}-UserCredentials`
|
|
431
|
+
: `${name}-AdminCredentials`,
|
|
432
|
+
vaultInfo,
|
|
433
|
+
});
|
|
434
|
+
}
|
|
429
435
|
//Diagnostic
|
|
430
436
|
if (features.enableDiagnosticSetting && logWpId) {
|
|
431
437
|
(0, Helpers_1.createDiagnostic)({
|
|
@@ -433,33 +439,37 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
433
439
|
targetResourceId: id,
|
|
434
440
|
logWpId,
|
|
435
441
|
logsCategories: [
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
+
'guard',
|
|
443
|
+
'kube-controller-manager',
|
|
444
|
+
'kube-audit-admin',
|
|
445
|
+
'kube-audit',
|
|
446
|
+
'kube-scheduler',
|
|
447
|
+
'cluster-autoscaler',
|
|
442
448
|
],
|
|
443
449
|
dependsOn: aks,
|
|
444
450
|
});
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
451
|
+
if (vaultInfo) {
|
|
452
|
+
//Apply monitoring for VMScale Sets
|
|
453
|
+
(0, VmSetMonitor_1.default)({
|
|
454
|
+
group: { resourceGroupName: nodeResourceGroup },
|
|
455
|
+
logWpId,
|
|
456
|
+
vaultInfo,
|
|
457
|
+
dependsOn: aks,
|
|
458
|
+
});
|
|
459
|
+
}
|
|
452
460
|
}
|
|
453
461
|
});
|
|
454
462
|
return {
|
|
455
|
-
|
|
463
|
+
name,
|
|
456
464
|
group,
|
|
457
465
|
id: aks.id,
|
|
458
466
|
aks,
|
|
459
467
|
serviceIdentity,
|
|
460
|
-
getKubeConfig: () =>
|
|
461
|
-
.
|
|
462
|
-
|
|
468
|
+
getKubeConfig: () => vaultInfo
|
|
469
|
+
? (0, pulumi_1.output)((0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name)
|
|
470
|
+
.getSecret(secretName)
|
|
471
|
+
.then((s) => s.value))
|
|
472
|
+
: undefined,
|
|
463
473
|
};
|
|
464
474
|
};
|
|
465
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA+C;AAC/C,uDAAyC;AACzC,2CAAuD;AACvD,kEAA2C;AAE3C,iDAQ4B;AAC5B,4DAAoC;AACpC,0DAA4C;AAC5C,iDAA2C;AAC3C,6CAAmD;AACnD,6CAAoE;AACpE,2DAAwD;AAExD,qCAAwC;AACxC,2DAA2D;AAE3D,oFAAoF;AAIpF,MAAM,YAAY,GAAG,CAAC,EACpB,iBAAiB,EACjB,QAAQ,EACR,GAAG,GAKJ,EAAE,EAAE;IACH,MAAM,SAAS,GAAG,CAAC,CAAC;IACpB,MAAM,QAAQ,GAAG,CAAC,CAAC;IACnB,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,IAAI,GAAG,KAAK,uBAAY,CAAC,GAAG,EAAE,CAAC;QAC7B,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,MAAM;gBACT,QAAQ,GAAG,CAAC,CAAC;gBACb,MAAM;YAER,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ,CAAC;YACd;gBACE,QAAQ,GAAG,CAAC,CAAC;gBACb,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO;QACL,iBAAiB;QACjB,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QACpD,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QAClD,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;KACnD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG;IAC3B,iBAAiB,EAAE,gBAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;IACtD,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,uBAAuB;IACnE,MAAM,EAAE,cAAc;IAEtB,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,KAAK;IACjB,kBAAkB,EAAE,KAAK;IACzB,gCAAgC;IAEhC,cAAc,EAAE,gBAAK;IACrB,YAAY,EAAE,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC,OAAO;IAEtD,UAAU,EAAE;QACV,WAAW,EAAE,qBAAU;QACvB,KAAK,EAAL,gBAAK;KACN;CACF,CAAC;AAEF,IAAY,OAqBX;AArBD,WAAY,OAAO;IACjB,+BAA+B;IAC/B,gDAAqC,CAAA;IACrC,6BAA6B;IAC7B,0CAA+B,CAAA;IAC/B,+BAA+B;IAC/B,0CAA+B,CAAA;IAC/B,4BAA4B;IAC5B,gDAAqC,CAAA;IACrC,4BAA4B;IAC5B,8CAAmC,CAAA;IACnC,4BAA4B;IAC5B,8CAAmC,CAAA;IACnC,+BAA+B;IAC/B,gDAAqC,CAAA;IACrC,6BAA6B;IAC7B,4CAAiC,CAAA;IACjC,8BAA8B;IAC9B,4CAAiC,CAAA;IACjC,+BAA+B;IAC/B,8CAAmC,CAAA;AACrC,CAAC,EArBW,OAAO,uBAAP,OAAO,QAqBlB;AA+ED,oJAAoJ;AACpJ,kBAAe,KAAK,EAAE,EACpB,KAAK,EACL,IAAI,EACJ,KAAK,EACL,eAAe,EACf,SAAS,EACT,OAAO,EACP,OAAO,EACP,GAAG,EACH,SAAS,EACT,SAAS,EACT,QAAQ,GAAG,EAAE,uBAAuB,EAAE,IAAI,EAAE,EAC5C,KAAK,GAAG;IACN,iBAAiB,EAAE,IAAI;IACvB,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;CAC3B,EACD,IAAI,GAAG,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,EACzD,IAAI,GAAG,IAAI,EACX,SAAS,GAAG,EAAE,EACd,SAAS,EACT,aAAa,GAAG,EAAE,GACT,EAAuB,EAAE;IAClC,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IACjC,MAAM,UAAU,GAAG,GAAG,OAAO,SAAS,CAAC;IACvC,MAAM,QAAQ,GAAG,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,uBAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,MAAM,iBAAiB,GAAG,IAAA,6BAAoB,EAAC,GAAG,OAAO,QAAQ,CAAC,CAAC;IAEnE,uCAAuC;IACvC,IAAI,SAAS,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACjD,SAAS,CAAC,oBAAoB,GAAG,MAAM,IAAA,8BAAe,EAAC,SAAS,CAAC,IAAI,CAAC;aACnE,gBAAgB,CAAC,UAAU,CAAC;aAC5B,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAC9B,aAAa,CAAC,IAAI,CAChB,sBAAsB,EACtB,gBAAgB,EAChB,cAAc,EACd,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAG,IAAA,kBAAkB,EAAC;QACzC,IAAI,EAAE,OAAO;QACb,SAAS;QACT,SAAS;KACV,CAAC,CAAC;IAEH,gEAAgE;IAChE,8CAA8C;IAC9C,qDAAqD;IACrD,sBAAsB;IACtB,IAAI;IAEJ,oBAAoB;IACpB,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,cAAc,CACpD,OAAO,EACP;QACE,YAAY,EAAE,OAAO;QACrB,GAAG,KAAK;QACR,iBAAiB;QACjB,SAAS,EAAE,OAAO;QAClB,oBAAoB;QACpB,oBAAoB;QAEpB,sBAAsB,EAAE;YACtB,kBAAkB,EAAE,QAAQ,EAAE,oBAAoB;gBAChD,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,SAAS,CAAC,kBAAkB,IAAI,EAAE;YACtC,iBAAiB,EAAE,IAAI;YACvB,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB;YACpD,8BAA8B,EAAE,IAAI;YACpC,cAAc,EAAE,QAAQ;SACzB;QAED,aAAa,EAAE;YACb,4BAA4B,EAAE;gBAC5B,MAAM,EAAE,KAAK,CAAC,mBAAmB;oBAC/B,CAAC,CAAC;wBACE,oBAAoB,EAAE,MAAM;qBAC7B;oBACH,CAAC,CAAC,SAAS;gBACb,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC;aAC5C;YAED,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE;YAC1D,aAAa,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE;YAC9D,sBAAsB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;YAE1C,iBAAiB,EAAE;gBACjB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;gBAC/C,MAAM,EAAE,OAAO,CAAC,qBAAqB;oBACnC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,qBAAqB,EAAE;oBAC/C,CAAC,CAAC,SAAS;aACd;YAED,yBAAyB,EAAE;gBACzB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC;gBAC1C,MAAM,EAAE,KAAK,CAAC,kBAAkB;oBAC9B,CAAC,CAAC;wBACE,WAAW,EAAE,GAAG,IAAI,UAAU;wBAC9B,QAAQ,EAAE,KAAK,CAAC,kBAAkB,CAAC,eAAe;qBACnD;oBACH,CAAC,CAAC,SAAS;aACd;YAED,QAAQ,EAAE;gBACR,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;gBACzB,MAAM,EAAE,OAAO;oBACb,CAAC,CAAC;wBACE,+BAA+B,EAAE,OAAO;qBACzC;oBACH,CAAC,CAAC,SAAS;aACd;SACF;QAED,GAAG,EAAE;YACH,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,IAAI;YACxD,IAAI;SACL;QACD,WAAW,EACT,MAAM,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,kBAAkB;QAClE,iBAAiB,EAAE;YACjB;gBACE,GAAG,oBAAoB;gBACvB,GAAG,eAAe;gBAClB,GAAG,YAAY,CAAC;oBACd,GAAG,EAAE,qBAAU;oBACf,QAAQ,EAAE,QAAQ;oBAClB,iBAAiB,EAAE,QAAQ,EAAE,eAAe;oBAC5C,gBAAgB;oBAChB,qBAAqB;oBACrB,KAAK;oBACL,qBAAqB;oBACrB,qBAAqB;oBACrB,KAAK;iBACN,CAAC;gBAEF,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,CAAC;gBACR,YAAY,EAAE,OAAO,CAAC,QAAQ;gBAC9B,eAAe,EAAE,IAAI;gBACrB,KAAK,EAAE,QAAQ;gBACf,MAAM,EAAE,OAAO;aAChB;SACF;QACD,YAAY,EAAE,KAAK;YACjB,CAAC,CAAC;gBACE,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE;aAChE;YACH,CAAC,CAAC,SAAS;QACb,mBAAmB;QACnB,cAAc,EAAE;YACd,aAAa,EAAE,WAAW;YAC1B,cAAc,EAAE,IAAI;SACrB;QACD,iBAAiB,EAAE;YACjB,wBAAwB,EAAE,MAAM;YAChC,QAAQ,EAAE,QAAQ;YAClB,kBAAkB,EAAE,IAAI;YACxB,yBAAyB,EAAE,KAAK;YAChC,oBAAoB,EAAE,KAAK;YAC3B,yBAAyB,EAAE,IAAI;YAC/B,kBAAkB,EAAE,IAAI;YACxB,mBAAmB,EAAE,GAAG;YACxB,sBAAsB,EAAE,KAAK;YAC7B,yBAAyB,EAAE,KAAK;YAChC,0BAA0B,EAAE,KAAK;YACjC,qBAAqB,EAAE,KAAK;YAC5B,oBAAoB,EAAE,KAAK;YAC3B,6BAA6B,EAAE,KAAK;YACpC,YAAY,EAAE,KAAK;YACnB,yBAAyB,EAAE,OAAO;YAClC,uBAAuB,EAAE,MAAM;SAChC;QAED,qBAAqB;QACrB,6CAA6C;QAC7C,kCAAkC;QAClC,iBAAiB;QACjB,gDAAgD;QAChD,yFAAyF;QACzF,gCAAgC;QAEhC,uBAAuB,EAAE;YACvB,QAAQ,EAAE,eAAe,CAAC,QAAQ;YAClC,MAAM,EAAE,eAAe,CAAC,YAAY;SACrC;QACD,eAAe,EAAE;YACf,QAAQ,EACN,OAAO,IAAI,gBAAK;gBACd,CAAC,CAAC;oBACE,+BAA+B,EAAE,OAAO;oBACxC,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;iBACtC;gBACH,CAAC,CAAC,SAAS;YACf,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE;YAClD,gBAAgB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;SACrC;QACD,kBAAkB,EAAE,QAAQ,CAAC,iBAAiB;YAC5C,CAAC,CAAC;gBACE,OAAO,EAAE,QAAQ,CAAC,iBAAiB;gBACnC,qCAAqC;gBACrC,yBAAyB,EAAE,KAAK;aACjC;YACH,CAAC,CAAC,SAAS;QACb,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,cAAc;SAClE;QACD,kBAAkB,EAAE;YAClB,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK;YAC5D,oCAAoC;SACrC;QACD,oBAAoB,EAAE,OAAO,CAAC,SAAS,CAAC,oBAAoB,CAAC;QAC7D,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE;YACV,eAAe,EAAE,IAAI;YACrB,OAAO,EAAE,IAAI;YACb,mBAAmB,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;YACxD,QAAQ,EAAE,mBAAQ;SACnB;QACD,iBAAiB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;QACrC,cAAc,EAAE;YACd,aAAa,EAAE;gBACb,OAAO,EAAE,IAAI;aACd;YACD,aAAa,EAAE;gBACb,OAAO,EAAE,IAAI;aACd;YACD,aAAa,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;YAChC,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;SACtC;QACD,cAAc,EAAE;YACd,WAAW,EAAE,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,WAAW;YAC5D,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,KAAK;YAC1D,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,KAAK;YAE1D,4BAA4B;YAC5B,oCAAoC;YACpC,6BAA6B;YAE7B,YAAY,EACV,QAAQ,EAAE,oBAAoB,IAAI,CAAC,OAAO,CAAC,iBAAiB;gBAC1D,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,kBAAkB;gBACzD,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,YAAY;YAEvD,eAAe,EAAE,UAAU;YAC3B,mBAAmB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,CAAC,CAAC;oBACE,WAAW,EAAE,OAAO,CAAC,iBAAiB,CAAC,WAAW;wBAChD,CAAC,CAAC;4BACE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC;yBAC3D;wBACH,CAAC,CAAC,SAAS;oBACb,kBAAkB,EAAE,OAAO,CAAC,iBAAiB,CAAC,iBAAiB;wBAC7D,CAAC,CAAC;4BACE,gBAAgB,EAAE;gCAChB,EAAE,EAAE,EAAE,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,EAAE;6BACpD;yBACF;wBACH,CAAC,CAAC,SAAS;iBACd;gBACH,CAAC,CAAC,SAAS;SACd;KACF,EACD;QACE,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,eAAe,CAAC,QAAQ;QACnC,MAAM,EAAE,SAAS;QACjB,mBAAmB,EAAE,IAAI;QACzB,aAAa;KACd,CACF,CAAC;IAEF,IAAI,MAAM,CAAC,gBAAgB,CAAC,wBAAwB,CAClD,GAAG,OAAO,2BAA2B,EACrC;QACE,UAAU,EAAE,SAAS;QACrB,oBAAoB;QACpB,MAAM;QACN,mCAAmC;QACnC,qCAAqC;QACrC,OAAO;QACP,KAAK;QACL,GAAG,KAAK;QACR,YAAY,EAAE,GAAG,CAAC,IAAI;QACtB,UAAU,EAAE;YACV;gBACE,GAAG,EAAE,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM;gBAC3C,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;aACnB;SACF;KACF,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,CACnB,CAAC;IAEF,IAAI,IAAI,EAAE,CAAC;QACT,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,GAAG,CACX,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACzD,uBAAuB;YACvB,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,GAAG,KAAK;YACR,GAAG,oBAAoB;YACvB,GAAG,CAAC;YAEJ,GAAG,YAAY,CAAC;gBACd,GAAG,EAAE,qBAAU;gBACf,QAAQ,EAAE,CAAC,CAAC,IAAI;gBAChB,iBAAiB,EAAE,QAAQ,CAAC,eAAe;aAC5C,CAAC;YAEF,KAAK,EAAE,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,yCAAyC;YACzC,YAAY,EAAE,OAAO,CAAC,QAAQ;YAC9B,eAAe,EAAE,IAAI;YACrB,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,OAAO;SAChB,CAAC,CACL,CAAC;IACJ,CAAC;IAED,4BAA4B;IAC5B,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACxB,IAAI,CAAC,EAAE;YAAE,OAAO;QAEhB,+BAA+B;QAC/B,MAAM;aACH,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;aAC1D,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,EAAE;YAC1C,IAAI,QAAQ,IAAI,eAAe,IAAI,eAAe,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACtE,IAAA,+BAAc,EAAC;oBACb,IAAI,EAAE,GAAG,IAAI,4BAA4B;oBACzC,WAAW,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAC,QAAS;oBACzD,aAAa,EAAE,kBAAkB;oBACjC,QAAQ,EAAE,SAAS;oBACnB,KAAK,EAAE,QAAQ;iBAChB,CAAC,CAAC;gBAEH,IAAA,8BAAe,EAAC;oBACd,IAAI,EAAE,GAAG,IAAI,oBAAoB;oBACjC,KAAK,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAC,QAAS;oBACnD,SAAS,EAAE,GAAG;oBACd,WAAW,EAAE,IAAI;oBACjB,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;YAED,IAAI,OAAO,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACjC,IAAA,+BAAc,EAAC;oBACb,IAAI,EAAE,GAAG,IAAI,aAAa;oBAC1B,WAAW,EAAE,QAAQ,CAAC,WAAW;oBACjC,QAAQ,EAAE,aAAa;oBACvB,aAAa,EAAE,kBAAkB;oBACjC,KAAK,EAAE,IAAA,gCAAqB,EAAC;wBAC3B,KAAK,EAAE,IAAA,kCAAuB,EAAC,GAAG,CAAE,CAAC,KAAK;qBAC3C,CAAC;iBACH,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,cAAc;QACd,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAY,EAAC;YAChC,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,KAAK,CAAC,iBAAiB;YAClC,aAAa,EAAE,IAAI;YACnB,oBAAoB,EAAE,SAAS,CAAC,oBAAoB;SACrD,CAAC,CAAC;QAEH,IAAA,8BAAe,EAAC;YACd,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,MAAM;YACb,aAAa,EAAE,IAAI;YACnB,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,SAAS,CAAC,oBAAoB;gBACzC,CAAC,CAAC,GAAG,IAAI,kBAAkB;gBAC3B,CAAC,CAAC,GAAG,IAAI,mBAAmB;YAC9B,SAAS;SACV,CAAC,CAAC;QAEH,YAAY;QACZ,IAAI,QAAQ,CAAC,uBAAuB,IAAI,OAAO,EAAE,CAAC;YAChD,IAAA,0BAAgB,EAAC;gBACf,IAAI;gBACJ,gBAAgB,EAAE,EAAE;gBACpB,OAAO;gBACP,cAAc,EAAE;oBACd,OAAO;oBACP,yBAAyB;oBACzB,kBAAkB;oBAClB,YAAY;oBACZ,gBAAgB;oBAChB,oBAAoB;iBACrB;gBACD,SAAS,EAAE,GAAG;aACf,CAAC,CAAC;YAEH,mCAAmC;YACnC,IAAA,sBAAa,EAAC;gBACZ,KAAK,EAAE,EAAE,iBAAiB,EAAE,iBAAiB,EAAE;gBAC/C,OAAO;gBACP,SAAS;gBACT,SAAS,EAAE,GAAG;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,YAAY,EAAE,IAAI;QAClB,KAAK;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,GAAG;QACH,eAAe;QACf,aAAa,EAAE,GAAmB,EAAE,CAClC,IAAA,eAAM,EACJ,IAAA,8BAAe,EAAC,SAAS,CAAC,IAAI,CAAC;aAC5B,SAAS,CAAC,UAAU,CAAC;aACrB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC,KAAM,CAAC,CAC1B;KACJ,CAAC;AACJ,CAAC,CAAC"}
|
|
475
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
package/Apim/Helpers.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { ResourceInfo } from
|
|
1
|
+
import { ResourceInfo } from '../types';
|
|
2
2
|
export declare const getApimInfo: (nameAndGroup: string) => ResourceInfo;
|
package/Apim/Helpers.js
CHANGED
|
@@ -9,10 +9,10 @@ const getApimInfo = (nameAndGroup) => {
|
|
|
9
9
|
const rgName = (0, Naming_1.getResourceGroupName)(nameAndGroup);
|
|
10
10
|
const id = (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourceGroups/${rgName}/providers/Microsoft.ApiManagement/service/${name}`;
|
|
11
11
|
return {
|
|
12
|
-
|
|
12
|
+
name,
|
|
13
13
|
group: { resourceGroupName: rgName, location: AzureEnv_1.currentRegionName },
|
|
14
14
|
id,
|
|
15
15
|
};
|
|
16
16
|
};
|
|
17
17
|
exports.getApimInfo = getApimInfo;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9BcGltL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkNBQXFFO0FBQ3JFLDJDQUE2QztBQUM3QyxpREFBdUU7QUFFaEUsTUFBTSxXQUFXLEdBQUcsQ0FBQyxZQUFvQixFQUFnQixFQUFFO0lBQ2hFLE1BQU0sSUFBSSxHQUFHLElBQUEsb0JBQVcsRUFBQyxZQUFZLENBQUMsQ0FBQztJQUN2QyxNQUFNLE1BQU0sR0FBRyxJQUFBLDZCQUFvQixFQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2xELE1BQU0sRUFBRSxHQUFHLElBQUEsb0JBQVcsRUFBQSxrQkFBa0IseUJBQWMsbUJBQW1CLE1BQU0sOENBQThDLElBQUksRUFBRSxDQUFDO0lBRXBJLE9BQU87UUFDTCxJQUFJO1FBQ0osS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSw0QkFBaUIsRUFBRTtRQUNqRSxFQUFFO0tBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQztBQVZXLFFBQUEsV0FBVyxlQVV0QiJ9
|
package/AzAd/Identity.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import * as azureAD from
|
|
2
|
-
import * as pulumi from
|
|
3
|
-
import { Output } from
|
|
4
|
-
import { ApplicationApiOauth2PermissionScope, ApplicationAppRole,
|
|
5
|
-
import { BasicArgs, IdentityRoleAssignment, KeyVaultInfo } from
|
|
1
|
+
import * as azureAD from '@pulumi/azuread';
|
|
2
|
+
import * as pulumi from '@pulumi/pulumi';
|
|
3
|
+
import { Output } from '@pulumi/pulumi';
|
|
4
|
+
import { ApplicationApiOauth2PermissionScope, ApplicationAppRole, ApplicationOptionalClaims, ApplicationRequiredResourceAccess } from '@pulumi/azuread/types/input';
|
|
5
|
+
import { BasicArgs, IdentityRoleAssignment, KeyVaultInfo } from '../types';
|
|
6
6
|
type PreAuthApplicationProps = {
|
|
7
7
|
appId: string;
|
|
8
8
|
oauth2PermissionNames: string[];
|
|
@@ -16,7 +16,7 @@ interface IdentityProps extends BasicArgs, IdentityRoleAssignment {
|
|
|
16
16
|
publicClient?: boolean;
|
|
17
17
|
createPrincipal?: boolean;
|
|
18
18
|
replyUrls?: pulumi.Input<pulumi.Input<string>[]>;
|
|
19
|
-
appType?:
|
|
19
|
+
appType?: 'spa' | 'web' | 'api';
|
|
20
20
|
allowMultiOrg?: boolean;
|
|
21
21
|
appRoles?: pulumi.Input<pulumi.Input<ApplicationAppRole>[]>;
|
|
22
22
|
oauth2Permissions?: pulumi.Input<pulumi.Input<ApplicationApiOauth2PermissionScope>[]>;
|
|
@@ -24,7 +24,7 @@ interface IdentityProps extends BasicArgs, IdentityRoleAssignment {
|
|
|
24
24
|
preAuthApplications?: PreAuthApplicationProps[];
|
|
25
25
|
requiredResourceAccesses?: pulumi.Input<pulumi.Input<ApplicationRequiredResourceAccess>[]>;
|
|
26
26
|
optionalClaims?: pulumi.Input<ApplicationOptionalClaims>;
|
|
27
|
-
vaultInfo
|
|
27
|
+
vaultInfo?: KeyVaultInfo;
|
|
28
28
|
}
|
|
29
29
|
export type IdentityResult = {
|
|
30
30
|
name: string;
|