@drunk-pulumi/azure 0.0.50 → 0.0.52
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 +12 -31
- package/Aks/index.d.ts +16 -3
- package/Aks/index.js +12 -35
- package/Apps/LogicApp.d.ts +3 -3
- package/Apps/LogicApp.js +4 -5
- package/Builder/ResourceBuilder.js +17 -9
- package/Builder/VaultBuilder.d.ts +7 -4
- package/Builder/VaultBuilder.js +11 -5
- package/Builder/types/resourceBuilder.d.ts +2 -2
- package/Builder/types/vaultBuilder.d.ts +3 -4
- package/ContainerRegistry/index.d.ts +3 -3
- 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/MySql/index.js +3 -1
- package/Postgresql/index.js +3 -1
- package/ServiceBus/index.d.ts +2 -2
- package/ServiceBus/index.js +4 -2
- package/Sql/SqlDb.d.ts +5 -5
- package/Sql/SqlDb.js +7 -7
- package/Sql/index.d.ts +3 -3
- package/Sql/index.js +13 -8
- 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/VirtualWAN.d.ts +6 -6
- package/VNet/VirtualWAN.js +5 -5
- package/VNet/index.d.ts +1 -1
- package/Web/AppCertOrder.d.ts +5 -12
- package/Web/AppCertOrder.js +9 -15
- package/Web/AppGateway.d.ts +2 -2
- package/Web/AppGateway.js +3 -3
- package/package.json +2 -2
- package/types.d.ts +40 -52
package/Aks/Helper.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { KeyVaultInfo, ResourceInfo
|
|
1
|
+
import { KeyVaultInfo, ResourceInfo } from '../types';
|
|
2
2
|
import { Output } from '@pulumi/pulumi';
|
|
3
3
|
/** Get AKS Config from Managed Cluster*/
|
|
4
4
|
export declare const getAksConfig: ({ name, groupName, formattedName, disableLocalAccounts, }: {
|
|
@@ -14,4 +14,4 @@ export declare const getAksVaultConfig: ({ name, version, vaultInfo, formattedNa
|
|
|
14
14
|
vaultInfo: KeyVaultInfo;
|
|
15
15
|
formattedName?: boolean;
|
|
16
16
|
}) => Promise<string>;
|
|
17
|
-
export declare const getAksPrivateDnz: (
|
|
17
|
+
export declare const getAksPrivateDnz: (aksInfo: ResourceInfo) => Output<ResourceInfo | undefined>;
|
package/Aks/Helper.js
CHANGED
|
@@ -24,21 +24,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.getAksPrivateDnz = exports.getAksVaultConfig = exports.getAksConfig = void 0;
|
|
27
|
-
const
|
|
28
|
-
const
|
|
27
|
+
const cs = __importStar(require("@pulumi/azure-native/containerservice"));
|
|
28
|
+
const Common_1 = require("../Common");
|
|
29
29
|
const Helper_1 = require("../KeyVault/Helper");
|
|
30
30
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
31
31
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
32
32
|
/** Get AKS Config from Managed Cluster*/
|
|
33
33
|
const getAksConfig = async ({ name, groupName, formattedName, disableLocalAccounts, }) => {
|
|
34
|
-
const aksName = formattedName ? name : (0,
|
|
35
|
-
const group = formattedName ? groupName : (0,
|
|
34
|
+
const aksName = formattedName ? name : (0, Common_1.getAksName)(name);
|
|
35
|
+
const group = formattedName ? groupName : (0, Common_1.getResourceGroupName)(groupName);
|
|
36
36
|
const aks = disableLocalAccounts
|
|
37
|
-
? await
|
|
37
|
+
? await cs.listManagedClusterUserCredentials({
|
|
38
38
|
resourceName: aksName,
|
|
39
39
|
resourceGroupName: group,
|
|
40
40
|
})
|
|
41
|
-
: await
|
|
41
|
+
: await cs.listManagedClusterAdminCredentials({
|
|
42
42
|
resourceName: aksName,
|
|
43
43
|
resourceGroupName: group,
|
|
44
44
|
});
|
|
@@ -47,7 +47,7 @@ const getAksConfig = async ({ name, groupName, formattedName, disableLocalAccoun
|
|
|
47
47
|
exports.getAksConfig = getAksConfig;
|
|
48
48
|
/** Get AKS Config from Key Vault*/
|
|
49
49
|
const getAksVaultConfig = async ({ name, version, vaultInfo, formattedName, }) => {
|
|
50
|
-
const aksName = formattedName ? name : (0,
|
|
50
|
+
const aksName = formattedName ? name : (0, Common_1.getAksName)(name);
|
|
51
51
|
const rs = await (0, Helper_1.getSecret)({
|
|
52
52
|
name: `${aksName}-config`,
|
|
53
53
|
version,
|
|
@@ -57,12 +57,10 @@ const getAksVaultConfig = async ({ name, version, vaultInfo, formattedName, }) =
|
|
|
57
57
|
return rs?.value || '';
|
|
58
58
|
};
|
|
59
59
|
exports.getAksVaultConfig = getAksVaultConfig;
|
|
60
|
-
const getAksPrivateDnz = (
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
resourceName: name,
|
|
65
|
-
resourceGroupName: groupName,
|
|
60
|
+
const getAksPrivateDnz = (aksInfo) => {
|
|
61
|
+
const aks = cs.getManagedClusterOutput({
|
|
62
|
+
resourceName: aksInfo.name,
|
|
63
|
+
resourceGroupName: aksInfo.group.resourceGroupName,
|
|
66
64
|
});
|
|
67
65
|
return aks.apply((a) => {
|
|
68
66
|
if (!a.privateFQDN)
|
|
@@ -77,21 +75,4 @@ const getAksPrivateDnz = ({ name, groupName, formattedName, }) => {
|
|
|
77
75
|
});
|
|
78
76
|
};
|
|
79
77
|
exports.getAksPrivateDnz = getAksPrivateDnz;
|
|
80
|
-
|
|
81
|
-
// vnetId,
|
|
82
|
-
// name,
|
|
83
|
-
// groupName,
|
|
84
|
-
// formattedName,
|
|
85
|
-
// }: ResourceType & { vnetId: Output<string> }) => {
|
|
86
|
-
// const dns = getAksPrivateDnz({ name, groupName, formattedName });
|
|
87
|
-
// return dns.apply((d) => {
|
|
88
|
-
// if (!d) return;
|
|
89
|
-
// return linkVnetToPrivateDns({
|
|
90
|
-
// name,
|
|
91
|
-
// group: d.group,
|
|
92
|
-
// zoneName: d.resourceName,
|
|
93
|
-
// vnetId,
|
|
94
|
-
// });
|
|
95
|
-
// });
|
|
96
|
-
// };
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RkFBMEU7QUFDMUUsNkNBQW9FO0FBRXBFLCtDQUErQztBQUMvQywyQ0FBcUQ7QUFDckQsaURBQXVFO0FBRXZFLHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBTXJCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsaUNBQWlDLENBQUM7WUFDdkQsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDO1FBQ0osQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsa0NBQWtDLENBQUM7WUFDeEQsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDLENBQUM7SUFFUCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzFFLENBQUMsQ0FBQztBQXpCVyxRQUFBLFlBQVksZ0JBeUJ2QjtBQUVGLG1DQUFtQztBQUM1QixNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxFQUN0QyxJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBTWQsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxrQkFBUyxFQUFDO1FBQ3pCLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUztRQUN6QixPQUFPO1FBQ1AsU0FBUztRQUNULGFBQWEsRUFBRSxLQUFLO0tBQ3JCLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBbkJXLFFBQUEsaUJBQWlCLHFCQW1CNUI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQUMsRUFDL0IsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEdBQ0EsRUFBb0MsRUFBRTtJQUNuRCxJQUFJLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMvQyxTQUFTLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUEsNkJBQW9CLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFFeEUsTUFBTSxHQUFHLEdBQUcsZ0JBQWdCLENBQUMsdUJBQXVCLENBQUM7UUFDbkQsWUFBWSxFQUFFLElBQUk7UUFDbEIsaUJBQWlCLEVBQUUsU0FBUztLQUM3QixDQUFDLENBQUM7SUFFSCxPQUFPLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUNyQixJQUFJLENBQUMsQ0FBQyxDQUFDLFdBQVc7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUNyQyxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzVELE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQztRQUVyQyxPQUFPO1lBQ0wsSUFBSSxFQUFFLE9BQU87WUFDYixLQUFLLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLDRCQUFpQixFQUFFO1lBQ2xFLEVBQUUsRUFBRSxJQUFBLG9CQUFXLEVBQUEsa0JBQWtCLHlCQUFjLG1CQUFtQixPQUFPLGdEQUFnRCxPQUFPLEVBQUU7U0FDbkgsQ0FBQztJQUNwQixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQztBQXhCVyxRQUFBLGdCQUFnQixvQkF3QjNCO0FBRUYsMENBQTBDO0FBQzFDLFlBQVk7QUFDWixVQUFVO0FBQ1YsZUFBZTtBQUNmLG1CQUFtQjtBQUNuQixxREFBcUQ7QUFDckQsc0VBQXNFO0FBQ3RFLDhCQUE4QjtBQUM5QixzQkFBc0I7QUFDdEIsb0NBQW9DO0FBQ3BDLGNBQWM7QUFDZCx3QkFBd0I7QUFDeEIsa0NBQWtDO0FBQ2xDLGdCQUFnQjtBQUNoQixVQUFVO0FBQ1YsUUFBUTtBQUNSLEtBQUsifQ==
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQTZEO0FBRTdELCtDQUErQztBQUMvQywyQ0FBcUQ7QUFDckQsaURBQXVFO0FBRXZFLHlDQUF5QztBQUNsQyxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsSUFBSSxFQUNKLFNBQVMsRUFDVCxhQUFhLEVBQ2Isb0JBQW9CLEdBTXJCLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsbUJBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUN4RCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBQSw2QkFBb0IsRUFBQyxTQUFTLENBQUMsQ0FBQztJQUUxRSxNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLGlDQUFpQyxDQUFDO1lBQ3pDLFlBQVksRUFBRSxPQUFPO1lBQ3JCLGlCQUFpQixFQUFFLEtBQUs7U0FDekIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxrQ0FBa0MsQ0FBQztZQUMxQyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBekJXLFFBQUEsWUFBWSxnQkF5QnZCO0FBRUYsbUNBQW1DO0FBQzVCLE1BQU0saUJBQWlCLEdBQUcsS0FBSyxFQUFFLEVBQ3RDLElBQUksRUFDSixPQUFPLEVBQ1AsU0FBUyxFQUNULGFBQWEsR0FNZCxFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsTUFBTSxFQUFFLEdBQUcsTUFBTSxJQUFBLGtCQUFTLEVBQUM7UUFDekIsSUFBSSxFQUFFLEdBQUcsT0FBTyxTQUFTO1FBQ3pCLE9BQU87UUFDUCxTQUFTO1FBQ1QsYUFBYSxFQUFFLEtBQUs7S0FDckIsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxFQUFFLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztBQUN6QixDQUFDLENBQUM7QUFuQlcsUUFBQSxpQkFBaUIscUJBbUI1QjtBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsT0FBcUIsRUFDYSxFQUFFO0lBQ3BDLE1BQU0sR0FBRyxHQUFHLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQztRQUNyQyxZQUFZLEVBQUUsT0FBTyxDQUFDLElBQUk7UUFDMUIsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxpQkFBaUI7S0FDbkQsQ0FBQyxDQUFDO0lBRUgsT0FBTyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDckIsSUFBSSxDQUFDLENBQUMsQ0FBQyxXQUFXO1lBQUUsT0FBTyxTQUFTLENBQUM7UUFDckMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM1RCxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsaUJBQWtCLENBQUM7UUFFckMsT0FBTztZQUNMLElBQUksRUFBRSxPQUFPO1lBQ2IsS0FBSyxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSw0QkFBaUIsRUFBRTtZQUNsRSxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLGtCQUFrQix5QkFBYyxtQkFBbUIsT0FBTyxnREFBZ0QsT0FBTyxFQUFFO1NBQ25ILENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFuQlcsUUFBQSxnQkFBZ0Isb0JBbUIzQiJ9
|
package/Aks/index.d.ts
CHANGED
|
@@ -38,8 +38,6 @@ export interface NodePoolProps extends Partial<inputs.containerservice.ManagedCl
|
|
|
38
38
|
}
|
|
39
39
|
export type AskAddonProps = {
|
|
40
40
|
enableAzureKeyVault?: boolean;
|
|
41
|
-
enableAzurePolicy?: boolean;
|
|
42
|
-
enableKubeDashboard?: boolean;
|
|
43
41
|
enableVirtualHost?: boolean;
|
|
44
42
|
applicationGateway?: {
|
|
45
43
|
gatewaySubnetId: pulumi.Input<string>;
|
|
@@ -49,6 +47,7 @@ export type AskFeatureProps = {
|
|
|
49
47
|
enablePrivateCluster?: boolean;
|
|
50
48
|
enableAutoScale?: boolean;
|
|
51
49
|
enablePodIdentity?: boolean;
|
|
50
|
+
enableWorkloadIdentity?: boolean;
|
|
52
51
|
enableDiagnosticSetting?: boolean;
|
|
53
52
|
};
|
|
54
53
|
export type AksAccessProps = {
|
|
@@ -71,6 +70,20 @@ export interface AksProps extends BasicResourceArgs {
|
|
|
71
70
|
addon?: AskAddonProps;
|
|
72
71
|
features?: AskFeatureProps;
|
|
73
72
|
aksAccess: AksAccessProps;
|
|
73
|
+
storageProfile?: {
|
|
74
|
+
blobCSIDriver: {
|
|
75
|
+
enabled: boolean;
|
|
76
|
+
};
|
|
77
|
+
diskCSIDriver: {
|
|
78
|
+
enabled: boolean;
|
|
79
|
+
};
|
|
80
|
+
fileCSIDriver: {
|
|
81
|
+
enabled: boolean;
|
|
82
|
+
};
|
|
83
|
+
snapshotController: {
|
|
84
|
+
enabled: boolean;
|
|
85
|
+
};
|
|
86
|
+
};
|
|
74
87
|
acr?: {
|
|
75
88
|
enable: boolean;
|
|
76
89
|
id: Input<string>;
|
|
@@ -93,5 +106,5 @@ export type AksResults = ResourceInfo & {
|
|
|
93
106
|
disableLocalAccounts?: boolean;
|
|
94
107
|
getKubeConfig: () => Output<string> | undefined;
|
|
95
108
|
};
|
|
96
|
-
declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
|
|
109
|
+
declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features, storageProfile, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
|
|
97
110
|
export default _default;
|
package/Aks/index.js
CHANGED
|
@@ -104,10 +104,8 @@ var VmSizes;
|
|
|
104
104
|
VmSizes["Standard_A4m_v2"] = "Standard_A4m_v2";
|
|
105
105
|
})(VmSizes || (exports.VmSizes = VmSizes = {}));
|
|
106
106
|
//Using this to enable the preview feature https://azurecloudai.blog/2019/10/16/aks-enabling-and-using-preview-features-such-as-nodepools-using-cli/
|
|
107
|
-
exports.default = async ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features = { enableDiagnosticSetting: true }, addon = {
|
|
108
|
-
enableAzurePolicy: true,
|
|
107
|
+
exports.default = async ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features = { enableDiagnosticSetting: true }, storageProfile, addon = {
|
|
109
108
|
enableAzureKeyVault: false,
|
|
110
|
-
enableKubeDashboard: false,
|
|
111
109
|
}, tier = native.containerservice.ManagedClusterSKUTier.Free, lock = true, dependsOn = [], importUri, ignoreChanges = [], }) => {
|
|
112
110
|
const aksName = (0, Common_1.getAksName)(name);
|
|
113
111
|
const secretName = `${aksName}-config`;
|
|
@@ -119,27 +117,19 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
119
117
|
.checkSecretExist(secretName)
|
|
120
118
|
.catch(() => false);
|
|
121
119
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}
|
|
120
|
+
//Add Default Ignoring properties
|
|
121
|
+
ignoreChanges.push('privateLinkResources', 'networkProfile', 'nodeResourceGroup', 'linuxProfile', 'windowsProfile');
|
|
125
122
|
const serviceIdentity = (0, Identity_1.default)({
|
|
126
123
|
name: aksName,
|
|
127
124
|
vaultInfo,
|
|
128
125
|
dependsOn,
|
|
129
126
|
});
|
|
130
|
-
//=================Validate ===================================/
|
|
131
|
-
// if (!linux?.sshKeys || !linux.sshKeys[0]) {
|
|
132
|
-
// console.error("Aks sshKeys is required:", name);
|
|
133
|
-
// return undefined;
|
|
134
|
-
// }
|
|
135
127
|
//Create AKS Cluster
|
|
136
128
|
const aks = new native.containerservice.ManagedCluster(aksName, {
|
|
137
129
|
resourceName: aksName,
|
|
138
130
|
...group,
|
|
139
131
|
nodeResourceGroup,
|
|
140
132
|
dnsPrefix: aksName,
|
|
141
|
-
//fqdnSubdomain: '',
|
|
142
|
-
//kubernetesVersion,
|
|
143
133
|
apiServerAccessProfile: {
|
|
144
134
|
authorizedIPRanges: features?.enablePrivateCluster
|
|
145
135
|
? undefined
|
|
@@ -147,7 +137,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
147
137
|
disableRunCommand: true,
|
|
148
138
|
enablePrivateCluster: features?.enablePrivateCluster,
|
|
149
139
|
enablePrivateClusterPublicFQDN: true,
|
|
150
|
-
privateDNSZone: 'system',
|
|
140
|
+
privateDNSZone: features?.enablePrivateCluster ? 'system' : undefined,
|
|
151
141
|
},
|
|
152
142
|
addonProfiles: {
|
|
153
143
|
azureKeyvaultSecretsProvider: {
|
|
@@ -158,8 +148,8 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
158
148
|
: undefined,
|
|
159
149
|
enabled: Boolean(addon.enableAzureKeyVault),
|
|
160
150
|
},
|
|
161
|
-
azurePolicy: { enabled:
|
|
162
|
-
kubeDashboard: { enabled:
|
|
151
|
+
azurePolicy: { enabled: true },
|
|
152
|
+
kubeDashboard: { enabled: false },
|
|
163
153
|
httpApplicationRouting: { enabled: false },
|
|
164
154
|
aciConnectorLinux: {
|
|
165
155
|
enabled: Boolean(network.virtualHostSubnetName),
|
|
@@ -198,12 +188,6 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
198
188
|
env: AzureEnv_1.currentEnv,
|
|
199
189
|
nodeType: 'System',
|
|
200
190
|
enableAutoScaling: features?.enableAutoScale,
|
|
201
|
-
// powerState: {
|
|
202
|
-
// code: "Running",
|
|
203
|
-
// },
|
|
204
|
-
// upgradeSettings: {
|
|
205
|
-
// maxSurge: "10%",
|
|
206
|
-
// },
|
|
207
191
|
}),
|
|
208
192
|
name: 'defaultnodes',
|
|
209
193
|
mode: 'System',
|
|
@@ -255,6 +239,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
255
239
|
clientId: serviceIdentity.clientId,
|
|
256
240
|
secret: serviceIdentity.clientSecret,
|
|
257
241
|
},
|
|
242
|
+
oidcIssuerProfile: { enabled: Boolean(features?.enableWorkloadIdentity) },
|
|
258
243
|
securityProfile: {
|
|
259
244
|
defender: logWpId && AzureEnv_1.isPrd
|
|
260
245
|
? {
|
|
@@ -263,7 +248,9 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
263
248
|
}
|
|
264
249
|
: undefined,
|
|
265
250
|
imageCleaner: { enabled: true, intervalHours: 24 },
|
|
266
|
-
workloadIdentity: {
|
|
251
|
+
workloadIdentity: {
|
|
252
|
+
enabled: Boolean(features?.enableWorkloadIdentity),
|
|
253
|
+
},
|
|
267
254
|
},
|
|
268
255
|
podIdentityProfile: features.enablePodIdentity
|
|
269
256
|
? {
|
|
@@ -289,17 +276,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
289
276
|
tenantID: AzureEnv_1.tenantId,
|
|
290
277
|
}
|
|
291
278
|
: undefined,
|
|
292
|
-
|
|
293
|
-
storageProfile: {
|
|
294
|
-
blobCSIDriver: {
|
|
295
|
-
enabled: true,
|
|
296
|
-
},
|
|
297
|
-
diskCSIDriver: {
|
|
298
|
-
enabled: true,
|
|
299
|
-
},
|
|
300
|
-
fileCSIDriver: { enabled: true },
|
|
301
|
-
snapshotController: { enabled: true },
|
|
302
|
-
},
|
|
279
|
+
storageProfile,
|
|
303
280
|
networkProfile: {
|
|
304
281
|
networkMode: native.containerservice.NetworkMode.Transparent,
|
|
305
282
|
networkPolicy: native.containerservice.NetworkPolicy.Azure,
|
|
@@ -472,4 +449,4 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
472
449
|
: undefined,
|
|
473
450
|
};
|
|
474
451
|
};
|
|
475
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
|
452
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
package/Apps/LogicApp.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as logic from
|
|
2
|
-
import { BasicResourceArgs
|
|
3
|
-
export type WorkflowProps = BasicResourceArgs &
|
|
1
|
+
import * as logic from '@pulumi/azure-native/logic';
|
|
2
|
+
import { BasicResourceArgs } from '../types';
|
|
3
|
+
export type WorkflowProps = BasicResourceArgs & Pick<logic.WorkflowArgs, 'accessControl'>;
|
|
4
4
|
declare const _default: ({ name, group, dependsOn, ignoreChanges, importUri, ...others }: WorkflowProps) => import("@pulumi/azure-native/logic/workflow").Workflow;
|
|
5
5
|
export default _default;
|
package/Apps/LogicApp.js
CHANGED
|
@@ -24,16 +24,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
const logic = __importStar(require("@pulumi/azure-native/logic"));
|
|
27
|
-
const
|
|
27
|
+
const Common_1 = require("../Common");
|
|
28
28
|
exports.default = ({ name, group, dependsOn, ignoreChanges, importUri, ...others }) => {
|
|
29
|
-
const n = (0,
|
|
30
|
-
|
|
29
|
+
const n = (0, Common_1.getWorkflowName)(name);
|
|
30
|
+
return new logic.Workflow(name, {
|
|
31
31
|
workflowName: n,
|
|
32
32
|
...group,
|
|
33
33
|
...others,
|
|
34
34
|
identity: { type: logic.ManagedServiceIdentityType.SystemAssigned },
|
|
35
35
|
accessControl: { actions: {} },
|
|
36
36
|
}, { dependsOn, ignoreChanges, import: importUri });
|
|
37
|
-
return workFlow;
|
|
38
37
|
};
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9naWNBcHAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXBwcy9Mb2dpY0FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBRXBELHNDQUE0QztBQUs1QyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsYUFBYSxFQUNiLFNBQVMsRUFDVCxHQUFHLE1BQU0sRUFDSyxFQUFFLEVBQUU7SUFDbEIsTUFBTSxDQUFDLEdBQUcsSUFBQSx3QkFBZSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRWhDLE9BQU8sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUN2QixJQUFJLEVBQ0o7UUFDRSxZQUFZLEVBQUUsQ0FBQztRQUNmLEdBQUcsS0FBSztRQUNSLEdBQUcsTUFBTTtRQUNULFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsMEJBQTBCLENBQUMsY0FBYyxFQUFFO1FBQ25FLGFBQWEsRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUU7S0FDL0IsRUFDRCxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxDQUNoRCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
|
@@ -36,6 +36,7 @@ const VaultBuilder_1 = __importStar(require("./VaultBuilder"));
|
|
|
36
36
|
class ResourceBuilder {
|
|
37
37
|
name;
|
|
38
38
|
_createRGProps = undefined;
|
|
39
|
+
_createRG = false;
|
|
39
40
|
_RGInfo = undefined;
|
|
40
41
|
_lock = false;
|
|
41
42
|
_createRole = false;
|
|
@@ -70,8 +71,9 @@ class ResourceBuilder {
|
|
|
70
71
|
this._loadRolesFromVault = true;
|
|
71
72
|
return this;
|
|
72
73
|
}
|
|
73
|
-
createRG(props) {
|
|
74
|
+
createRG(props = undefined) {
|
|
74
75
|
this._createRGProps = props;
|
|
76
|
+
this._createRG = true;
|
|
75
77
|
return this;
|
|
76
78
|
}
|
|
77
79
|
withRG(props) {
|
|
@@ -123,12 +125,17 @@ class ResourceBuilder {
|
|
|
123
125
|
else if (this._loadRolesFromVault) {
|
|
124
126
|
if (!this._vaultInfo)
|
|
125
127
|
throw new Error('The KeyVaultInfo needs to be defined to load environment Roles info.');
|
|
126
|
-
this._envRoles = (0, EnvRoles_1.getEnvRolesOutput)(this._vaultInfo
|
|
128
|
+
this._envRoles = (0, EnvRoles_1.getEnvRolesOutput)(this._vaultInfo);
|
|
127
129
|
}
|
|
128
130
|
}
|
|
129
131
|
buildRG() {
|
|
130
|
-
if (!this.
|
|
132
|
+
if (!this._createRG)
|
|
131
133
|
return;
|
|
134
|
+
if (!this._createRGProps)
|
|
135
|
+
this._createRGProps = {
|
|
136
|
+
enableRGRoles: Boolean(this._envRoles),
|
|
137
|
+
enableVaultRoles: this._createVault,
|
|
138
|
+
};
|
|
132
139
|
const rs = (0, ResourceGroup_1.default)({
|
|
133
140
|
name: this.name,
|
|
134
141
|
permissions: {
|
|
@@ -137,8 +144,9 @@ class ResourceBuilder {
|
|
|
137
144
|
},
|
|
138
145
|
lock: this._lock,
|
|
139
146
|
});
|
|
147
|
+
//Collect Info
|
|
140
148
|
this._RGInfo = rs.info();
|
|
141
|
-
this._RGInstance = rs.
|
|
149
|
+
this._RGInstance = rs.instance;
|
|
142
150
|
}
|
|
143
151
|
buildVault() {
|
|
144
152
|
//Create Vault
|
|
@@ -151,7 +159,7 @@ class ResourceBuilder {
|
|
|
151
159
|
}).build();
|
|
152
160
|
//Add Environment Roles to Vault
|
|
153
161
|
if (this._envRolesInstance)
|
|
154
|
-
this._envRolesInstance.addRolesToVault(this._vaultInfo
|
|
162
|
+
this._envRolesInstance.addRolesToVault(this._vaultInfo);
|
|
155
163
|
}
|
|
156
164
|
if (!this._vaultInfo)
|
|
157
165
|
throw new Error('VaultInfo needs to be provided to be continuing to create other resources.');
|
|
@@ -167,14 +175,14 @@ class ResourceBuilder {
|
|
|
167
175
|
const subIds = subnetNames?.map((name) => this._vnetInstance?.findSubnet(name).apply((s) => s.id)) ?? [];
|
|
168
176
|
if (asPrivateLink && subIds.length > 0) {
|
|
169
177
|
(0, KeyVault_1.createVaultPrivateLink)({
|
|
170
|
-
vaultInfo: this._vaultInfo
|
|
178
|
+
vaultInfo: this._vaultInfo,
|
|
171
179
|
subnetIds: subIds,
|
|
172
180
|
});
|
|
173
181
|
}
|
|
174
182
|
else {
|
|
175
183
|
new azure_providers_1.VaultNetworkResource(`${this.name}-vault`, {
|
|
176
|
-
vaultName: this._vaultInfo.
|
|
177
|
-
resourceGroupName: this._vaultInfo.
|
|
184
|
+
vaultName: this._vaultInfo.name,
|
|
185
|
+
resourceGroupName: this._vaultInfo.group.resourceGroupName,
|
|
178
186
|
subscriptionId: AzureEnv_1.subscriptionId,
|
|
179
187
|
subnetIds: subIds,
|
|
180
188
|
ipAddresses: ipAddresses,
|
|
@@ -233,4 +241,4 @@ class ResourceBuilder {
|
|
|
233
241
|
}
|
|
234
242
|
}
|
|
235
243
|
exports.default = (name) => new ResourceBuilder(name);
|
|
236
|
-
//# 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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"}
|
|
@@ -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==
|
|
@@ -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,7 +25,7 @@ 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 {
|
|
@@ -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
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import * as registry from '@pulumi/azure-native/containerregistry';
|
|
2
|
-
import {
|
|
3
|
-
interface Props extends
|
|
2
|
+
import { BasicArgs, KeyVaultInfo, NetworkPropsType, ResourceGroupInfo, ResourceInfoWithInstance } from '../types';
|
|
3
|
+
interface Props extends BasicArgs {
|
|
4
4
|
name: string;
|
|
5
5
|
group?: ResourceGroupInfo;
|
|
6
6
|
adminUserEnabled?: boolean;
|
|
7
7
|
enableStorageAccount?: boolean;
|
|
8
8
|
vaultInfo?: KeyVaultInfo;
|
|
9
|
-
sku?: registry.SkuName;
|
|
9
|
+
sku?: registry.SkuName | string;
|
|
10
10
|
/**Only support Premium sku*/
|
|
11
11
|
network?: Omit<NetworkPropsType, 'subnetId'>;
|
|
12
12
|
}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import * as pulumi from
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import * as pulumi from '@pulumi/pulumi';
|
|
2
|
+
import { DiagnosticSetting } from '@pulumi/azure-native/aadiam/diagnosticSetting';
|
|
3
|
+
import { BasicArgs, DiagnosticProps } from '../types';
|
|
4
4
|
type ClassOf = new (name: string, props: any, opts?: pulumi.CustomResourceOptions) => pulumi.CustomResource & {
|
|
5
5
|
id: pulumi.Output<string>;
|
|
6
6
|
urn: pulumi.Output<string>;
|
|
7
7
|
};
|
|
8
|
-
export type DefaultCreatorProps =
|
|
8
|
+
export type DefaultCreatorProps = BasicArgs & {
|
|
9
|
+
monitoring?: Omit<DiagnosticProps, 'name' | 'targetResourceId'>;
|
|
9
10
|
lock?: boolean;
|
|
10
11
|
};
|
|
11
12
|
/** Create Resource with Locker */
|