@drunk-pulumi/azure 1.0.4 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Aks/Helper.d.ts +3 -5
- package/Aks/Helper.js +1 -1
- package/Aks/Identity.d.ts +2 -5
- package/Aks/Identity.js +1 -1
- package/Aks/VmSetAutoScale/index.d.ts +0 -2
- package/Aks/VmSetAutoScale/index.js +1 -1
- package/Aks/VmSetMonitor/index.d.ts +0 -2
- package/Aks/VmSetMonitor/index.js +6 -6
- package/Aks/index.d.ts +6 -14
- package/Aks/index.js +29 -38
- package/Automation/index.d.ts +2 -3
- package/Automation/index.js +6 -14
- package/AzAd/EnvRoles.Consts.d.ts +4 -3
- package/AzAd/EnvRoles.Consts.js +28 -46
- package/AzAd/EnvRoles.d.ts +5 -4
- package/AzAd/EnvRoles.js +32 -25
- package/AzAd/Group.d.ts +5 -7
- package/AzAd/Group.js +5 -14
- package/AzAd/Helper.d.ts +6 -6
- package/AzAd/Helper.js +39 -54
- package/AzAd/Identities/AzDevOpsIdentity.d.ts +2 -2
- package/AzAd/Identities/AzDevOpsIdentity.js +13 -7
- package/AzAd/Identities/AzDevOpsManagedIdentity.js +2 -7
- package/AzAd/Identities/AzUserAdRevertSync.d.ts +2 -3
- package/AzAd/Identities/AzUserAdRevertSync.js +3 -4
- package/AzAd/Identities/GlobalUserAssignedIdentity.d.ts +4 -0
- package/AzAd/Identities/GlobalUserAssignedIdentity.js +19 -0
- package/AzAd/Identities/index.d.ts +4 -3
- package/AzAd/Identities/index.js +26 -2
- package/AzAd/Identity.d.ts +4 -7
- package/AzAd/Identity.js +19 -27
- package/AzAd/RoleAssignment.d.ts +2 -2
- package/AzAd/RoleAssignment.js +3 -3
- package/AzAd/UserAssignedIdentity.d.ts +3 -3
- package/AzAd/UserAssignedIdentity.js +24 -6
- package/Builder/AksBuilder.js +3 -3
- package/Builder/ApimApiBuilder.js +3 -3
- package/Builder/ApimPolicyBuilder.js +3 -3
- package/Builder/ApimProductBuilder.js +6 -12
- package/Builder/EnvRoleBuilder.d.ts +36 -0
- package/Builder/EnvRoleBuilder.js +57 -0
- package/Builder/ResourceBuilder.js +26 -16
- package/Builder/SqlBuilder.js +7 -1
- package/Builder/VmBuilder.js +2 -5
- package/Builder/index.d.ts +15 -14
- package/Builder/index.js +4 -2
- package/Builder/types/apimPolicyBuilder.d.ts +4 -5
- package/Builder/types/apimPolicyBuilder.js +1 -1
- package/Builder/types/apimProductBuilder.d.ts +8 -10
- package/Builder/types/envRoleBuilder.d.ts +14 -0
- package/Builder/types/envRoleBuilder.js +3 -0
- package/Builder/types/genericBuilder.d.ts +15 -13
- package/Builder/types/genericBuilder.js +1 -1
- package/Builder/types/index.d.ts +15 -14
- package/Builder/types/index.js +2 -1
- package/Builder/types/resourceBuilder.d.ts +7 -6
- package/Builder/types/sqlBuilder.d.ts +2 -3
- package/Builder/types/storageBuilder.d.ts +1 -1
- package/Builder/types/vaultBuilder.d.ts +2 -2
- package/Builder/types/vmBuilder.d.ts +11 -11
- package/Builder/types/vnetBuilder.d.ts +19 -19
- package/Cdn/CdnEndpoint.d.ts +2 -2
- package/Cdn/index.d.ts +2 -2
- package/Cdn/index.js +3 -11
- package/Certificate/index.js +12 -25
- package/Common/AzureEnv.d.ts +1 -2
- package/Common/AzureEnv.js +2 -10
- package/Common/Naming/index.d.ts +1 -0
- package/Common/Naming/index.js +5 -3
- package/ContainerRegistry/Helper.d.ts +2 -3
- package/ContainerRegistry/Helper.js +2 -3
- package/ContainerRegistry/index.d.ts +2 -4
- package/ContainerRegistry/index.js +1 -50
- package/Core/Helper.d.ts +4 -2
- package/Core/Helper.js +7 -2
- package/Core/KeyGenerators.d.ts +2 -4
- package/Core/KeyGenerators.js +7 -12
- package/Core/Random.d.ts +6 -9
- package/Core/Random.js +17 -21
- package/Core/ResourceCreator.d.ts +2 -2
- package/Core/ResourceGroup.d.ts +2 -2
- package/Core/ResourceGroup.js +4 -3
- package/CosmosDb/index.d.ts +4 -9
- package/CosmosDb/index.js +4 -4
- package/IOT/Hub/index.d.ts +4 -5
- package/IOT/Hub/index.js +25 -26
- package/KeyVault/CustomHelper.d.ts +4 -9
- package/KeyVault/CustomHelper.js +3 -4
- package/KeyVault/Helper.d.ts +10 -13
- package/KeyVault/Helper.js +46 -26
- package/KeyVault/index.js +2 -1
- package/Logs/AppInsight.d.ts +2 -3
- package/Logs/AppInsight.js +1 -1
- package/Logs/Helpers.d.ts +3 -8
- package/Logs/Helpers.js +7 -9
- package/Logs/LogAnalytics.d.ts +2 -5
- package/Logs/LogAnalytics.js +13 -17
- package/Logs/index.d.ts +3 -5
- package/Logs/index.js +7 -4
- package/MySql/index.d.ts +3 -10
- package/MySql/index.js +15 -20
- package/Postgresql/index.d.ts +3 -4
- package/Postgresql/index.js +30 -24
- package/RedisCache/index.d.ts +5 -3
- package/RedisCache/index.js +18 -24
- package/ServiceBus/index.d.ts +6 -8
- package/ServiceBus/index.js +9 -15
- package/SignalR/index.d.ts +5 -3
- package/SignalR/index.js +19 -28
- package/Sql/SqlDb.d.ts +3 -3
- package/Sql/SqlDb.js +11 -2
- package/Sql/index.d.ts +5 -9
- package/Sql/index.js +41 -30
- package/Storage/ManagementRules.d.ts +6 -8
- package/Storage/ManagementRules.js +3 -3
- package/Storage/index.d.ts +3 -6
- package/Storage/index.js +24 -27
- package/VM/DiskEncryptionSet.d.ts +8 -0
- package/VM/DiskEncryptionSet.js +43 -0
- package/VM/index.d.ts +5 -11
- package/VM/index.js +24 -12
- package/VNet/Firewall.js +3 -5
- package/VNet/FirewallPolicies/AksFirewallPolicy.d.ts +2 -1
- package/VNet/FirewallPolicies/AksFirewallPolicy.js +22 -19
- package/VNet/Helper.d.ts +2 -2
- package/VNet/Helper.js +6 -3
- package/VNet/IpAddressPrefix.d.ts +5 -7
- package/VNet/IpAddressPrefix.js +5 -5
- package/VNet/PrivateEndpoint.d.ts +2 -2
- package/VNet/PrivateEndpoint.js +2 -3
- package/VNet/RouteTable.d.ts +4 -4
- package/VNet/RouteTable.js +4 -4
- package/VNet/Vnet.js +5 -1
- package/VNet/index.d.ts +3 -5
- package/VNet/index.js +1 -1
- package/VNet/types.d.ts +3 -4
- package/Web/AppCertOrder.d.ts +2 -3
- package/Web/AppCertOrder.js +1 -1
- package/Web/AppConfig.d.ts +2 -5
- package/Web/AppConfig.js +3 -4
- package/package.json +5 -5
- package/types.d.ts +42 -28
package/KeyVault/Helper.js
CHANGED
|
@@ -26,21 +26,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.parseKeyUrl = exports.getSecret = exports.
|
|
29
|
+
exports.parseKeyUrl = exports.getSecret = exports.getKey = exports.addEncryptKey = exports.addKey = void 0;
|
|
30
30
|
const keyvault = __importStar(require("@pulumi/azure-native/keyvault"));
|
|
31
|
-
const pulumi_1 = require("@pulumi/pulumi");
|
|
32
31
|
const Common_1 = require("../Common");
|
|
33
|
-
const Helpers_1 = require("../Common/Helpers");
|
|
34
32
|
const KeyVaultBase_1 = __importDefault(require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase"));
|
|
35
33
|
const addKey = ({ name, vaultInfo, tags, dependsOn, }) => {
|
|
36
34
|
const n = (0, Common_1.getSecretName)(name);
|
|
37
|
-
return new keyvault.Key((0,
|
|
35
|
+
return new keyvault.Key((0, Common_1.replaceAll)(name, '.', '-'), {
|
|
38
36
|
keyName: n,
|
|
39
37
|
vaultName: vaultInfo.name,
|
|
40
38
|
...vaultInfo.group,
|
|
41
|
-
//https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.keyvault.webkey?view=azure-dotnet-legacy
|
|
42
39
|
properties: {
|
|
43
|
-
keySize:
|
|
40
|
+
keySize: 4096,
|
|
44
41
|
kty: 'RSA',
|
|
45
42
|
keyOps: [
|
|
46
43
|
'decrypt',
|
|
@@ -50,13 +47,32 @@ const addKey = ({ name, vaultInfo, tags, dependsOn, }) => {
|
|
|
50
47
|
'wrapKey',
|
|
51
48
|
'unwrapKey',
|
|
52
49
|
],
|
|
53
|
-
//curveName:
|
|
54
|
-
attributes: { enabled: true },
|
|
50
|
+
//curveName: keyvault.JsonWebKeyCurveName.P_521,
|
|
51
|
+
attributes: { enabled: true, exportable: false },
|
|
52
|
+
rotationPolicy: {
|
|
53
|
+
lifetimeActions: [
|
|
54
|
+
{
|
|
55
|
+
action: { type: keyvault.KeyRotationPolicyActionType.Rotate },
|
|
56
|
+
trigger: { timeBeforeExpiry: 'P30D' },
|
|
57
|
+
},
|
|
58
|
+
],
|
|
59
|
+
attributes: { expiryTime: 'P1Y' },
|
|
60
|
+
},
|
|
55
61
|
},
|
|
56
62
|
tags,
|
|
57
|
-
}, { dependsOn });
|
|
63
|
+
}, { dependsOn, ignoreChanges: ['attributes.expires'] });
|
|
58
64
|
};
|
|
59
65
|
exports.addKey = addKey;
|
|
66
|
+
const addEncryptKey = (props) => {
|
|
67
|
+
const key = (0, exports.addKey)({ ...props, name: `${props.name}-encryptKey` });
|
|
68
|
+
return {
|
|
69
|
+
keyName: key.name,
|
|
70
|
+
keyVaultUri: `https://${props.vaultInfo.name}.vault.azure.net`,
|
|
71
|
+
keyVersion: key.keyUriWithVersion.apply((u) => u.split('/').pop()),
|
|
72
|
+
url: key.keyUriWithVersion,
|
|
73
|
+
};
|
|
74
|
+
};
|
|
75
|
+
exports.addEncryptKey = addEncryptKey;
|
|
60
76
|
/** Get Key */
|
|
61
77
|
const getKey = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
62
78
|
const n = nameFormatted ? name : (0, Common_1.getSecretName)(name);
|
|
@@ -65,22 +81,26 @@ const getKey = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
|
65
81
|
};
|
|
66
82
|
exports.getKey = getKey;
|
|
67
83
|
/** Get or create encryption Key */
|
|
68
|
-
const getEncryptionKey = async (
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
+
// const getEncryptionKey = async ({
|
|
85
|
+
// name,
|
|
86
|
+
// vaultInfo,
|
|
87
|
+
// }: Required<NamedWithVaultType>): Promise<KeyVaultPropertiesResults> => {
|
|
88
|
+
// const n = `${name}-encrypt-key`;
|
|
89
|
+
// const key = await getKeyVaultBase(vaultInfo.name).getOrCreateKey(n);
|
|
90
|
+
// return {
|
|
91
|
+
// keyName: key!.properties.name,
|
|
92
|
+
// keyVaultUri: key!.properties.vaultUrl,
|
|
93
|
+
// keyVersion: key!.properties.version,
|
|
94
|
+
// url: `${key!.properties.vaultUrl}/keys/${key!.properties.name}/${key!.properties.version}`,
|
|
95
|
+
// };
|
|
96
|
+
// };
|
|
97
|
+
// export const getEncryptionKeyOutput = ({
|
|
98
|
+
// name,
|
|
99
|
+
// vaultInfo,
|
|
100
|
+
// }: NamedWithVaultType): Output<KeyVaultPropertiesResults> | undefined => {
|
|
101
|
+
// if (!vaultInfo) return undefined;
|
|
102
|
+
// return output(getEncryptionKey({ name, vaultInfo }));
|
|
103
|
+
// };
|
|
84
104
|
/** Get Secret */
|
|
85
105
|
const getSecret = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
86
106
|
const n = nameFormatted ? name : (0, Common_1.getSecretName)(name);
|
|
@@ -99,4 +119,4 @@ const parseKeyUrl = (keyUrl) => {
|
|
|
99
119
|
};
|
|
100
120
|
};
|
|
101
121
|
exports.parseKeyUrl = parseKeyUrl;
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHdFQUEwRDtBQUcxRCxzQ0FBZ0U7QUFDaEUscUdBQWdGO0FBb0J6RSxNQUFNLE1BQU0sR0FBRyxDQUFDLEVBQ3JCLElBQUksRUFDSixTQUFTLEVBQ1QsSUFBSSxFQUNKLFNBQVMsR0FDa0MsRUFBRSxFQUFFO0lBQy9DLE1BQU0sQ0FBQyxHQUFHLElBQUEsc0JBQWEsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU5QixPQUFPLElBQUksUUFBUSxDQUFDLEdBQUcsQ0FDckIsSUFBQSxtQkFBVSxFQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQzFCO1FBQ0UsT0FBTyxFQUFFLENBQUM7UUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7UUFDekIsR0FBRyxTQUFTLENBQUMsS0FBSztRQUNsQixVQUFVLEVBQUU7WUFDVixPQUFPLEVBQUUsSUFBSTtZQUNiLEdBQUcsRUFBRSxLQUFLO1lBQ1YsTUFBTSxFQUFFO2dCQUNOLFNBQVM7Z0JBQ1QsU0FBUztnQkFDVCxNQUFNO2dCQUNOLFFBQVE7Z0JBQ1IsU0FBUztnQkFDVCxXQUFXO2FBQ1o7WUFDRCxnREFBZ0Q7WUFDaEQsVUFBVSxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFO1lBQ2hELGNBQWMsRUFBRTtnQkFDZCxlQUFlLEVBQUU7b0JBQ2Y7d0JBQ0UsTUFBTSxFQUFFLEVBQUUsSUFBSSxFQUFFLFFBQVEsQ0FBQywyQkFBMkIsQ0FBQyxNQUFNLEVBQUU7d0JBQzdELE9BQU8sRUFBRSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRTtxQkFDdEM7aUJBQ0Y7Z0JBQ0QsVUFBVSxFQUFFLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRTthQUNs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
|
package/KeyVault/index.js
CHANGED
|
@@ -64,6 +64,7 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
|
|
|
64
64
|
softDeleteRetentionInDays, //This is not important as pulumi auto restore and update the sift deleted.
|
|
65
65
|
enabledForDeployment: true,
|
|
66
66
|
enabledForDiskEncryption: true,
|
|
67
|
+
enabledForTemplateDeployment: true,
|
|
67
68
|
networkAcls: {
|
|
68
69
|
bypass: 'AzureServices',
|
|
69
70
|
defaultAction: types_1.enums.keyvault.NetworkRuleAction.Allow,
|
|
@@ -107,4 +108,4 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
|
|
|
107
108
|
createPrivateLink,
|
|
108
109
|
};
|
|
109
110
|
};
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RUFBMEQ7QUFDMUQsc0RBQW1EO0FBRW5ELGlEQUE4QztBQUM5QyxzQ0FBNEM7QUFDNUMsNkNBQW1EO0FBUW5ELDhFQUFzRDtBQU8vQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsRUFDckMsU0FBUyxFQUNULEdBQUcsS0FBSyxFQUdULEVBQUUsRUFBRSxDQUNILElBQUEseUJBQWUsRUFBQztJQUNkLFlBQVksRUFBRSxTQUFTO0lBQ3ZCLEdBQUcsS0FBSztJQUNSLGtCQUFrQixFQUFFLGlDQUFpQztJQUNyRCxtQkFBbUIsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUM7Q0FDOUQsQ0FBQyxDQUFDO0FBWFEsUUFBQSxzQkFBc0IsMEJBVzlCO0FBRUUsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLEVBQ3BDLFNBQVMsRUFDVCxPQUFPLEdBSVIsRUFBRSxFQUFFLENBQ0gsSUFBQSwwQkFBZ0IsRUFBQztJQUNmLElBQUksRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLFFBQVE7SUFDL0IsZ0JBQWdCLEVBQUUsU0FBUyxDQUFDLEVBQUU7SUFDOUIsR0FBRyxPQUFPO0lBQ1YsY0FBYyxFQUFFLENBQUMsWUFBWSxDQUFDO0NBQy9CLENBQUMsQ0FBQztBQVpRLFFBQUEscUJBQXFCLHlCQVk3QjtBQUVMLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLE9BQU8sRUFDUCx5QkFBeUIsR0FBRyxDQUFDLEVBQzdCLGFBQWEsR0FBRyxFQUFFLEVBQ2xCLFNBQVMsRUFDVCxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0ssRUFBRSxFQUFFO0lBQ2xCLE1BQU0sU0FBUyxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV4QyxNQUFNLEtBQUssR0FBRyxJQUFJLFFBQVEsQ0FBQyxLQUFLLENBQzlCLFNBQVMsRUFDVDtRQUNFLFNBQVM7UUFDVCxHQUFHLEtBQUs7UUFDUixHQUFHLE1BQU07UUFFVCxVQUFVLEVBQUU7WUFDVixRQUFRLEVBQVIsbUJBQVE7WUFDUixHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUU7WUFDdEMsVUFBVSxFQUFFLFNBQVM7WUFFckIsdUJBQXVCLEVBQUUsSUFBSTtZQUM3QixjQUFjLEVBQUUsU0FBUztZQUV6QixxQkFBcUIsRUFBRSxJQUFJO1lBQzNCLGdCQUFnQixFQUFFLElBQUk7WUFDdEIseUJBQXlCLEVBQUUsMkVBQTJFO1lBRXRHLG9CQUFvQixFQUFFLElBQUk7WUFDMUIsd0JBQXdCLEVBQUUsSUFBSTtZQUM5Qiw0QkFBNEIsRUFBRSxJQUFJO1lBRWxDLFdBQVcsRUFBRTtnQkFDWCxNQUFNLEVBQUUsZUFBZTtnQkFDdkIsYUFBYSxFQUFFLGFBQUssQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQUMsS0FBSztnQkFFckQsT0FBTyxFQUFFLE9BQU8sRUFBRSxXQUFXO29CQUMzQixDQUFDLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztvQkFDaEQsQ0FBQyxDQUFDLEVBQUU7Z0JBRU4sbUJBQW1CLEVBQUUsT0FBTyxFQUFFLFFBQVE7b0JBQ3BDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQztvQkFDNUIsQ0FBQyxDQUFDLFNBQVM7YUFDZDtTQUNGO0tBQ0YsRUFDRDtRQUNFLFNBQVM7UUFDVCxNQUFNLEVBQUUsU0FBUztRQUNqQixhQUFhLEVBQUU7WUFDYiwyQkFBMkI7WUFDM0Isa0JBQWtCO1lBQ2xCLHVCQUF1QjtZQUN2QixHQUFHLGFBQWE7U0FDakI7S0FDRixDQUNGLENBQUM7SUFFRixlQUFlO0lBQ2YsTUFBTSxJQUFJLEdBQUcsR0FBRyxFQUFFLENBQUMsQ0FBQztRQUNsQixJQUFJLEVBQUUsU0FBUztRQUNmLEtBQUs7UUFDTCxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUU7S0FDYixDQUFDLENBQUM7SUFFSCxzQkFBc0I7SUFDdEIsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLEtBQTJCLEVBQUUsRUFBRSxDQUN4RCxJQUFBLDhCQUFzQixFQUFDLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsS0FBSyxFQUFFLENBQUMsQ0FBQztJQUUxRCxxQkFBcUI7SUFDckIsSUFBSSxPQUFPLEVBQUUsV0FBVyxFQUFFLENBQUM7UUFDekIsaUJBQWlCLENBQUMsT0FBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFRCxnQkFBZ0I7SUFDaEIsTUFBTSxhQUFhLEdBQUcsQ0FBQyxPQUF5QixFQUFFLEVBQUUsQ0FDbEQsSUFBQSw2QkFBcUIsRUFBQyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRXhELE9BQU87UUFDTCxJQUFJLEVBQUUsU0FBUztRQUNmLEtBQUs7UUFDTCxJQUFJO1FBQ0osYUFBYTtRQUNiLGlCQUFpQjtLQUNsQixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
package/Logs/AppInsight.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import * as native from '@pulumi/azure-native';
|
|
2
|
-
import {
|
|
2
|
+
import { BasicResourceWithVaultArgs, KeyVaultInfo, ResourceInfo } from '../types';
|
|
3
3
|
import { Input } from '@pulumi/pulumi';
|
|
4
|
-
interface Props extends
|
|
4
|
+
interface Props extends BasicResourceWithVaultArgs {
|
|
5
5
|
dailyCapGb?: number;
|
|
6
|
-
vaultInfo?: KeyVaultInfo;
|
|
7
6
|
immediatePurgeDataOn30Days?: boolean;
|
|
8
7
|
ingestionMode?: native.insights.IngestionMode;
|
|
9
8
|
workspaceResourceId?: Input<string>;
|
package/Logs/AppInsight.js
CHANGED
|
@@ -71,4 +71,4 @@ const getAppInsightKey = async ({ resourceInfo, vaultInfo, }) => {
|
|
|
71
71
|
return key?.value ?? '';
|
|
72
72
|
};
|
|
73
73
|
exports.getAppInsightKey = getAppInsightKey;
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwSW5zaWdodC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0FwcEluc2lnaHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFNL0MsK0NBQStDO0FBQy9DLHNDQUE4QztBQUM5QywyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osVUFBVSxHQUFHLEtBQUssRUFDbEIsMEJBQTBCLEdBQUcsSUFBSSxFQUNqQyxhQUFhLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsbUJBQW1CLEVBQ2pFLG1CQUFtQixFQUNuQixTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFL0IsTUFBTSxVQUFVLEdBQUcsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7UUFDckQsWUFBWSxFQUFFLElBQUk7UUFDbEIsR0FBRyxLQUFLO1FBRVIsSUFBSSxFQUFFLEtBQUs7UUFDWCxnQkFBZ0IsRUFBRSxJQUFJO1FBQ3RCLGVBQWUsRUFBRSxLQUFLO1FBQ3RCLFFBQVEsRUFBRSxXQUFXO1FBRXJCLHVDQUF1QztRQUN2QyxlQUFlLEVBQUUsRUFBRTtRQUVuQiwwQkFBMEI7UUFDMUIsYUFBYTtRQUViLGdCQUFnQixFQUFFLElBQUk7UUFDdEIsbUJBQW1CO0tBQ3BCLENBQUMsQ0FBQztJQUVILElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyw4QkFBOEIsQ0FDaEQsR0FBRyxJQUFJLHdCQUF3QixFQUMvQjtRQUNFLHNCQUFzQixFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsZ0RBQWdEO1FBQ25GLGFBQWEsRUFBRTtZQUNiLEdBQUcsRUFBRSxVQUFVO1lBQ2YsOEJBQThCLEVBQUUsSUFBSTtTQUNyQztRQUNELGlCQUFpQixFQUFFLEtBQUssQ0FBQyxpQkFBaUI7UUFDMUMsWUFBWSxFQUFFLFVBQVUsQ0FBQyxJQUFJO0tBQzlCLENBQ0YsQ0FBQztJQUVGLElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxJQUFBLDhCQUFlLEVBQUM7WUFDZCxJQUFJO1lBQ0osS0FBSyxFQUFFLFVBQVUsQ0FBQyxrQkFBa0I7WUFDcEMsU0FBUztZQUNULFdBQVcsRUFBRSxZQUFZO1NBQzFCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLFVBQVUsQ0FBQztBQUNwQixDQUFDLENBQUM7QUFFSyxNQUFNLGdCQUFnQixHQUFHLEtBQUssRUFBRSxFQUNyQyxZQUFZLEVBQ1osU0FBUyxHQUlWLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFBLGtCQUFTLEVBQUM7UUFDMUIsSUFBSSxFQUFFLFlBQVksQ0FBQyxJQUFJO1FBQ3ZCLFNBQVM7S0FDVixDQUFDLENBQUM7SUFDSCxPQUFPLEdBQUcsRUFBRSxLQUFLLElBQUksRUFBRSxDQUFDO0FBQzFCLENBQUMsQ0FBQztBQVpXLFFBQUEsZ0JBQWdCLG9CQVkzQiJ9
|
package/Logs/Helpers.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { Input, Output } from '@pulumi/pulumi';
|
|
2
2
|
import { StorageConnectionInfo } from '../Storage/Helper';
|
|
3
|
-
import { DiagnosticProps, KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from '../types';
|
|
3
|
+
import { DiagnosticProps, KeyVaultInfo, NamedType, ResourceGroupInfo, ResourceInfo, ResourceWithVaultArgs } from '../types';
|
|
4
4
|
export declare const createDiagnostic: ({ name, targetResourceId, logWpId, logStorageId, metricsCategories, logsCategories, dependsOn, }: DiagnosticProps) => import("@pulumi/azure-native/insights/diagnosticSetting").DiagnosticSetting | undefined;
|
|
5
|
-
interface ThreatProtectionProps {
|
|
6
|
-
name: string;
|
|
5
|
+
interface ThreatProtectionProps extends NamedType {
|
|
7
6
|
targetResourceId: Input<string>;
|
|
8
7
|
}
|
|
9
8
|
export declare const createThreatProtection: ({ name, targetResourceId, }: ThreatProtectionProps) => import("@pulumi/azure-native/security/advancedThreatProtection").AdvancedThreatProtection;
|
|
@@ -49,11 +48,7 @@ export declare const getLogStorageInfo: ({ storageName, group, vaultInfo, }: {
|
|
|
49
48
|
export type AppInsightInfo = ResourceInfo & {
|
|
50
49
|
instrumentationKey?: Output<string>;
|
|
51
50
|
};
|
|
52
|
-
export declare const getAppInsightInfo: ({ name, group, vaultInfo, }:
|
|
53
|
-
name: string;
|
|
54
|
-
group: ResourceGroupInfo;
|
|
55
|
-
vaultInfo?: KeyVaultInfo;
|
|
56
|
-
}) => AppInsightInfo;
|
|
51
|
+
export declare const getAppInsightInfo: ({ name, group, vaultInfo, }: ResourceWithVaultArgs) => AppInsightInfo;
|
|
57
52
|
export type LogInfoResults = {
|
|
58
53
|
logWp: LogWpInfo;
|
|
59
54
|
logStorage: LogStorageInfo;
|
package/Logs/Helpers.js
CHANGED
|
@@ -26,11 +26,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.getLogInfo = exports.getAppInsightInfo = exports.getLogStorageInfo = exports.getLogWpInfo = exports.getLogWpSecretsById = exports.getLogWpSecrets = exports.createThreatProtection = exports.createDiagnostic = void 0;
|
|
27
27
|
const native = __importStar(require("@pulumi/azure-native"));
|
|
28
28
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
29
|
-
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
30
29
|
const Common_1 = require("../Common");
|
|
31
30
|
const Helper_1 = require("../KeyVault/Helper");
|
|
32
31
|
const Helper_2 = require("../Storage/Helper");
|
|
33
|
-
const ResourceEnv_1 = require("../Common/ResourceEnv");
|
|
34
32
|
const AppInsight_1 = require("./AppInsight");
|
|
35
33
|
const createDiagnostic = ({ name, targetResourceId, logWpId, logStorageId, metricsCategories = ['AllMetrics'], logsCategories, dependsOn, }) => {
|
|
36
34
|
//Ensure logWpId or logStorageId is provided
|
|
@@ -89,7 +87,7 @@ const getLogWpSecrets = async ({ fullName, vaultInfo, }) => {
|
|
|
89
87
|
};
|
|
90
88
|
exports.getLogWpSecrets = getLogWpSecrets;
|
|
91
89
|
const getLogWpSecretsById = async ({ logWpId, vaultInfo, }) => {
|
|
92
|
-
const info = (0,
|
|
90
|
+
const info = (0, Common_1.parseResourceInfoFromId)(logWpId);
|
|
93
91
|
const secrets = info
|
|
94
92
|
? await (0, exports.getLogWpSecrets)({ fullName: info.name, vaultInfo })
|
|
95
93
|
: undefined;
|
|
@@ -98,7 +96,7 @@ const getLogWpSecretsById = async ({ logWpId, vaultInfo, }) => {
|
|
|
98
96
|
exports.getLogWpSecretsById = getLogWpSecretsById;
|
|
99
97
|
const getLogWpInfo = ({ logWpName, vaultInfo, group, }) => {
|
|
100
98
|
const n = (0, Common_1.getLogWpName)(logWpName);
|
|
101
|
-
const id = (0, pulumi_1.interpolate) `/subscriptions/${
|
|
99
|
+
const id = (0, pulumi_1.interpolate) `/subscriptions/${Common_1.subscriptionId}/resourcegroups/${group.resourceGroupName}/providers/microsoft.operationalinsights/workspaces/${n}`;
|
|
102
100
|
const secrets = vaultInfo
|
|
103
101
|
? (0, pulumi_1.output)((0, exports.getLogWpSecrets)({ fullName: n, vaultInfo }))
|
|
104
102
|
: undefined;
|
|
@@ -107,7 +105,7 @@ const getLogWpInfo = ({ logWpName, vaultInfo, group, }) => {
|
|
|
107
105
|
exports.getLogWpInfo = getLogWpInfo;
|
|
108
106
|
const getLogStorageInfo = ({ storageName, group, vaultInfo, }) => {
|
|
109
107
|
const n = (0, Common_1.getStorageName)(storageName);
|
|
110
|
-
const id = (0, pulumi_1.interpolate) `/subscriptions/${
|
|
108
|
+
const id = (0, pulumi_1.interpolate) `/subscriptions/${Common_1.subscriptionId}/resourcegroups/${group.resourceGroupName}/providers/Microsoft.Storage/storageAccounts/${n}`;
|
|
111
109
|
const secrets = vaultInfo
|
|
112
110
|
? (0, pulumi_1.output)((0, Helper_2.getStorageSecrets)({ name: n, nameFormatted: true, vaultInfo }))
|
|
113
111
|
: undefined;
|
|
@@ -116,7 +114,7 @@ const getLogStorageInfo = ({ storageName, group, vaultInfo, }) => {
|
|
|
116
114
|
exports.getLogStorageInfo = getLogStorageInfo;
|
|
117
115
|
const getAppInsightInfo = ({ name, group, vaultInfo, }) => {
|
|
118
116
|
const n = (0, Common_1.getAppInsightName)(name);
|
|
119
|
-
const id = (0, pulumi_1.interpolate) `/subscriptions/${
|
|
117
|
+
const id = (0, pulumi_1.interpolate) `/subscriptions/${Common_1.subscriptionId}/resourceGroups/${group.resourceGroupName}/providers/microsoft.insights/components/${n}`;
|
|
120
118
|
const instrumentationKey = vaultInfo
|
|
121
119
|
? (0, pulumi_1.output)((0, AppInsight_1.getAppInsightKey)({
|
|
122
120
|
resourceInfo: { name: n, group, id },
|
|
@@ -128,8 +126,8 @@ const getAppInsightInfo = ({ name, group, vaultInfo, }) => {
|
|
|
128
126
|
exports.getAppInsightInfo = getAppInsightInfo;
|
|
129
127
|
const getLogInfo = (groupName, vaultInfo = undefined) => {
|
|
130
128
|
const rgName = (0, Common_1.getResourceGroupName)(groupName);
|
|
131
|
-
const name = (0,
|
|
132
|
-
const group = { resourceGroupName: rgName, location:
|
|
129
|
+
const name = (0, Common_1.getResourceName)(groupName, { suffix: 'logs' });
|
|
130
|
+
const group = { resourceGroupName: rgName, location: Common_1.currentRegionName };
|
|
133
131
|
const logWp = (0, exports.getLogWpInfo)({
|
|
134
132
|
logWpName: name,
|
|
135
133
|
vaultInfo,
|
|
@@ -148,4 +146,4 @@ const getLogInfo = (groupName, vaultInfo = undefined) => {
|
|
|
148
146
|
return { logWp, logStorage, appInsight };
|
|
149
147
|
};
|
|
150
148
|
exports.getLogInfo = getLogInfo;
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQW9FO0FBQ3BFLHNDQVVtQjtBQUNuQiwrQ0FBK0M7QUFDL0MsOENBQTZFO0FBVTdFLDZDQUFnRDtBQUV6QyxNQUFNLGdCQUFnQixHQUFHLENBQUMsRUFDL0IsSUFBSSxFQUNKLGdCQUFnQixFQUNoQixPQUFPLEVBQ1AsWUFBWSxFQUNaLGlCQUFpQixHQUFHLENBQUMsWUFBWSxDQUFDLEVBQ2xDLGNBQWMsRUFDZCxTQUFTLEdBQ08sRUFBRSxFQUFFO0lBQ3BCLDRDQUE0QztJQUM1QyxJQUFJLENBQUMsT0FBTyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDOUIsT0FBTyxDQUFDLEtBQUssQ0FDWCxtQkFBbUIsSUFBSSxtREFBbUQsQ0FDM0UsQ0FBQztRQUNGLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxrQ0FBa0M7SUFDbEMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDdEIsT0FBTyxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsSUFBSSxxQkFBcUIsQ0FBQyxDQUFDO1FBQ2hFLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxNQUFNLENBQUMsR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDO0lBQ3pCLE9BQU8sSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUMxQyxDQUFDLEVBQ0Q7UUFDRSxJQUFJLEVBQUUsQ0FBQztRQUNQLFdBQVcsRUFBRSxnQkFBZ0I7UUFDN0IsMkJBQTJCLEVBQUUsa0JBQWtCO1FBRS9DLFdBQVcsRUFBRSxPQUFPO1FBQ3BCLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxZQUFZO1FBRXBELFFBQVE7UUFDUixP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
|
package/Logs/LogAnalytics.d.ts
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import * as operationalinsights from '@pulumi/azure-native/operationalinsights';
|
|
2
|
-
import {
|
|
3
|
-
interface Props {
|
|
4
|
-
name: string;
|
|
5
|
-
group: ResourceGroupInfo;
|
|
2
|
+
import { ResourceWithVaultArgs } from '../types';
|
|
3
|
+
interface Props extends ResourceWithVaultArgs {
|
|
6
4
|
sku?: operationalinsights.WorkspaceSkuNameEnum;
|
|
7
5
|
dailyQuotaGb?: number;
|
|
8
|
-
vaultInfo?: KeyVaultInfo;
|
|
9
6
|
}
|
|
10
7
|
declare const _default: ({ name, group, sku, dailyQuotaGb, vaultInfo, }: Props) => {
|
|
11
8
|
log: import("@pulumi/azure-native/operationalinsights/workspace").Workspace;
|
package/Logs/LogAnalytics.js
CHANGED
|
@@ -57,28 +57,24 @@ exports.default = ({ name, group, sku = operationalinsights.WorkspaceSkuNameEnum
|
|
|
57
57
|
workspaceName: name,
|
|
58
58
|
resourceGroupName: group.resourceGroupName,
|
|
59
59
|
});
|
|
60
|
-
(0, CustomHelper_1.
|
|
61
|
-
name: workspaceIdKeyName,
|
|
62
|
-
value: id,
|
|
60
|
+
(0, CustomHelper_1.addCustomSecrets)({
|
|
63
61
|
contentType: 'Log Analytics',
|
|
64
|
-
vaultInfo,
|
|
65
|
-
});
|
|
66
|
-
(0, CustomHelper_1.addCustomSecret)({
|
|
67
|
-
name: primaryKeyName,
|
|
68
62
|
formattedName: true,
|
|
69
|
-
value: keys.primarySharedKey,
|
|
70
|
-
contentType: 'Log Analytics',
|
|
71
|
-
vaultInfo,
|
|
72
|
-
});
|
|
73
|
-
(0, CustomHelper_1.addCustomSecret)({
|
|
74
|
-
name: secondaryKeyName,
|
|
75
|
-
formattedName: true,
|
|
76
|
-
value: keys.secondarySharedKey,
|
|
77
|
-
contentType: 'Log Analytics',
|
|
78
63
|
vaultInfo,
|
|
64
|
+
items: [
|
|
65
|
+
{ name: workspaceIdKeyName, value: id },
|
|
66
|
+
{
|
|
67
|
+
name: primaryKeyName,
|
|
68
|
+
value: keys.primarySharedKey,
|
|
69
|
+
},
|
|
70
|
+
{
|
|
71
|
+
name: secondaryKeyName,
|
|
72
|
+
value: keys.secondarySharedKey,
|
|
73
|
+
},
|
|
74
|
+
],
|
|
79
75
|
});
|
|
80
76
|
});
|
|
81
77
|
}
|
|
82
78
|
return { log, vaultNames: { primaryKeyName, secondaryKeyName } };
|
|
83
79
|
};
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nQW5hbHl0aWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0xvZ3MvTG9nQW5hbHl0aWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4RkFBZ0Y7QUFFaEYsc0NBQXFEO0FBQ3JELDJEQUE2RTtBQU83RSxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxHQUFHLEdBQUcsbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUNuRCxZQUFZLEdBQUcsS0FBSyxFQUNwQixTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEscUJBQVksRUFBQyxJQUFJLENBQUMsQ0FBQztJQUMxQixNQUFNLGtCQUFrQixHQUFHLEdBQUcsSUFBSSxLQUFLLENBQUM7SUFDeEMsTUFBTSxjQUFjLEdBQUcsSUFBQSxtQkFBVSxFQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNuRCxNQUFNLGdCQUFnQixHQUFHLElBQUEsbUJBQVUsRUFBQyxJQUFJLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFFdkQsTUFBTSxHQUFHLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFO1FBQ2xELGFBQWEsRUFBRSxJQUFJO1FBQ25CLEdBQUcsS0FBSztRQUVSLCtCQUErQixFQUFFLFNBQVM7UUFDMUMsMkJBQTJCLEVBQUUsU0FBUztRQUN0QyxRQUFRLEVBQUU7WUFDUiwyQ0FBMkM7WUFDM0MseUJBQXlCO1lBQ3pCLDBCQUEwQjtZQUMxQixzRUFBc0U7WUFDdEUsMEJBQTBCLEVBQUUsSUFBSTtTQUNqQztRQUNELGdCQUFnQixFQUNkLEdBQUcsS0FBSyxtQkFBbUIsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJO1lBQ25ELENBQUMsQ0FBQyxTQUFTO1lBQ1gsQ0FBQyxDQUFDLEVBQUUsWUFBWSxFQUFFLEVBQUUsZ0NBQWdDO1FBRXhELGVBQWUsRUFDYixHQUFHLEtBQUssbUJBQW1CLENBQUMsb0JBQW9CLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxxQkFBcUI7UUFDdkYsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRTtLQUNuQixDQUFDLENBQUM7SUFFSCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ2hDLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFFaEIsTUFBTSxJQUFJLEdBQUcsTUFBTSxtQkFBbUIsQ0FBQyxhQUFhLENBQUM7Z0JBQ25ELGFBQWEsRUFBRSxJQUFJO2dCQUNuQixpQkFBaUIsRUFBRSxLQUFLLENBQUMsaUJBQWlCO2FBQzNDLENBQUMsQ0FBQztZQUNILElBQUEsK0JBQWdCLEVBQUM7Z0JBQ2YsV0FBVyxFQUFFLGVBQWU7Z0JBQzVCLGFBQWEsRUFBRSxJQUFJO2dCQUNuQixTQUFTO2dCQUNULEtBQUssRUFBRTtvQkFDTCxFQUFFLElBQUksRUFBRSxrQkFBa0IsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO29CQUN2Qzt3QkFDRSxJQUFJLEVBQUUsY0FBYzt3QkFDcEIsS0FBSyxFQUFFLElBQUksQ0FBQyxnQkFBaUI7cUJBQzlCO29CQUNEO3dCQUNFLElBQUksRUFBRSxnQkFBZ0I7d0JBQ3RCLEtBQUssRUFBRSxJQUFJLENBQUMsa0JBQW1CO3FCQUNoQztpQkFDRjthQUNGLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLEVBQUUsQ0FBQztBQUNuRSxDQUFDLENBQUMifQ==
|
package/Logs/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BasicMonitorArgs, KeyVaultInfo
|
|
1
|
+
import { BasicEncryptResourceArgs, BasicMonitorArgs, KeyVaultInfo } from '../types';
|
|
2
2
|
import * as operationalinsights from '@pulumi/azure-native/operationalinsights';
|
|
3
3
|
import { DefaultManagementRules } from '../Storage/ManagementRules';
|
|
4
4
|
type WorkspaceType = {
|
|
@@ -6,9 +6,7 @@ type WorkspaceType = {
|
|
|
6
6
|
sku?: operationalinsights.WorkspaceSkuNameEnum;
|
|
7
7
|
dailyQuotaGb?: number;
|
|
8
8
|
};
|
|
9
|
-
interface Props {
|
|
10
|
-
name: string;
|
|
11
|
-
group: ResourceGroupInfo;
|
|
9
|
+
interface Props extends BasicEncryptResourceArgs {
|
|
12
10
|
workspace?: WorkspaceType;
|
|
13
11
|
storage?: {
|
|
14
12
|
/** The management rule applied to Storage level (all containers)*/
|
|
@@ -16,7 +14,7 @@ interface Props {
|
|
|
16
14
|
};
|
|
17
15
|
vaultInfo?: KeyVaultInfo;
|
|
18
16
|
}
|
|
19
|
-
declare const _default: ({ group, name, workspace, storage, vaultInfo }: Props) => {
|
|
17
|
+
declare const _default: ({ group, name, workspace, storage, vaultInfo, ...others }: Props) => {
|
|
20
18
|
logWp: {
|
|
21
19
|
log: import("@pulumi/azure-native/operationalinsights/workspace").Workspace;
|
|
22
20
|
vaultNames: {
|
package/Logs/index.js
CHANGED
|
@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
const operationalinsights = __importStar(require("@pulumi/azure-native/operationalinsights"));
|
|
30
30
|
const LogAnalytics_1 = __importDefault(require("./LogAnalytics"));
|
|
31
31
|
const Storage_1 = __importDefault(require("../Storage"));
|
|
32
|
-
const
|
|
32
|
+
const Common_1 = require("../Common");
|
|
33
33
|
const AppInsight_1 = __importDefault(require("./AppInsight"));
|
|
34
34
|
const defaultLogWorkspace = {
|
|
35
35
|
createAppInsight: false,
|
|
@@ -42,13 +42,14 @@ const defaultStorageRules = [
|
|
|
42
42
|
filters: { blobTypes: ['blockBlob'] },
|
|
43
43
|
},
|
|
44
44
|
];
|
|
45
|
-
exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
|
|
46
|
-
name = (0,
|
|
45
|
+
exports.default = ({ group, name, workspace, storage, vaultInfo, ...others }) => {
|
|
46
|
+
name = (0, Common_1.getResourceName)(name, { suffix: 'logs' });
|
|
47
47
|
const createWp = workspace
|
|
48
48
|
? { ...defaultLogWorkspace, ...workspace }
|
|
49
49
|
: undefined;
|
|
50
50
|
const logWp = createWp
|
|
51
51
|
? (0, LogAnalytics_1.default)({
|
|
52
|
+
...others,
|
|
52
53
|
group,
|
|
53
54
|
name,
|
|
54
55
|
sku: createWp.sku,
|
|
@@ -58,6 +59,7 @@ exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
|
|
|
58
59
|
: undefined;
|
|
59
60
|
const appInsight = logWp && createWp?.createAppInsight
|
|
60
61
|
? (0, AppInsight_1.default)({
|
|
62
|
+
...others,
|
|
61
63
|
group,
|
|
62
64
|
name,
|
|
63
65
|
dailyCapGb: createWp.dailyQuotaGb,
|
|
@@ -69,6 +71,7 @@ exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
|
|
|
69
71
|
: undefined;
|
|
70
72
|
const logStorage = storage
|
|
71
73
|
? (0, Storage_1.default)({
|
|
74
|
+
...others,
|
|
72
75
|
group,
|
|
73
76
|
name,
|
|
74
77
|
vaultInfo,
|
|
@@ -94,4 +97,4 @@ exports.default = ({ group, name, workspace, storage, vaultInfo }) => {
|
|
|
94
97
|
}),
|
|
95
98
|
};
|
|
96
99
|
};
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTG9ncy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBTUEsOEZBQWdGO0FBQ2hGLGtFQUFtQztBQUNuQyx5REFBaUM7QUFDakMsc0NBQTRDO0FBRTVDLDhEQUFzQztBQVF0QyxNQUFNLG1CQUFtQixHQUFrQjtJQUN6QyxnQkFBZ0IsRUFBRSxLQUFLO0lBQ3ZCLEdBQUcsRUFBRSxtQkFBbUIsQ0FBQyxvQkFBb0IsQ0FBQyxTQUFTO0lBQ3ZELFlBQVksRUFBRSxHQUFHO0NBQ2xCLENBQUM7QUFFRixNQUFNLG1CQUFtQixHQUFrQztJQUN6RDtRQUNFLE9BQU8sRUFBRSxFQUFFLFFBQVEsRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLGdDQUFnQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUU7UUFDM0UsT0FBTyxFQUFFLEVBQUUsU0FBUyxFQUFFLENBQUMsV0FBVyxDQUFDLEVBQUU7S0FDdEM7Q0FDRixDQUFDO0FBV0Ysa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osU0FBUyxFQUNULE9BQU8sRUFDUCxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsd0JBQWUsRUFBQyxJQUFJLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUVqRCxNQUFNLFFBQVEsR0FBOEIsU0FBUztRQUNuRCxDQUFDLENBQUMsRUFBRSxHQUFHLG1CQUFtQixFQUFFLEdBQUcsU0FBUyxFQUFFO1FBQzFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFZCxNQUFNLEtBQUssR0FBRyxRQUFRO1FBQ3BCLENBQUMsQ0FBQyxJQUFBLHNCQUFLLEVBQUM7WUFDSixHQUFHLE1BQU07WUFDVCxLQUFLO1lBQ0wsSUFBSTtZQUNKLEdBQUcsRUFBRSxRQUFRLENBQUMsR0FBRztZQUNqQixZQUFZLEVBQUUsUUFBUSxDQUFDLFlBQVk7WUFDbkMsU0FBUztTQUNWLENBQUM7UUFDSixDQUFDLENBQUMsU0FBUyxDQUFDO0lBRWQsTUFBTSxVQUFVLEdBQ2QsS0FBSyxJQUFJLFFBQVEsRUFBRSxnQkFBZ0I7UUFDakMsQ0FBQyxDQUFDLElBQUEsb0JBQVUsRUFBQztZQUNULEdBQUcsTUFBTTtZQUNULEtBQUs7WUFDTCxJQUFJO1lBQ0osVUFBVSxFQUFFLFFBQVEsQ0FBQyxZQUFZO1lBQ2pDLDBCQUEwQixFQUFFLElBQUk7WUFDaEMsbUJBQW1CLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ2pDLGFBQWEsRUFBRSxjQUFjO1lBQzdCLFNBQVM7U0FDVixDQUFDO1FBQ0osQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVoQixNQUFNLFVBQVUsR0FBRyxPQUFPO1FBQ3hCLENBQUMsQ0FBQyxJQUFBLGlCQUFPLEVBQUM7WUFDTixHQUFHLE1BQU07WUFDVCxLQUFLO1lBQ0wsSUFBSTtZQUNKLFNBQVM7WUFDVCxRQUFRLEVBQUU7Z0JBQ1Isc0JBQXNCLEVBQUUsT0FBTyxDQUFDLFlBQVksSUFBSSxtQkFBbUI7YUFDcEU7WUFDRCxRQUFRLEVBQUUsRUFBRSxvQkFBb0IsRUFBRSxJQUFJLEVBQUU7U0FDekMsQ0FBQztRQUNKLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFZCxPQUFPO1FBQ0wsS0FBSztRQUNMLFVBQVU7UUFDVixVQUFVO1FBQ1YsSUFBSSxFQUFFLEdBQXFCLEVBQUUsQ0FBQyxDQUFDO1lBQzdCLE9BQU8sRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUU7WUFDdEIsWUFBWSxFQUFFLFVBQVUsRUFBRSxFQUFFO1NBQzdCLENBQUM7UUFDRixnQkFBZ0IsRUFBRSxHQUFxQixFQUFFLENBQUMsQ0FBQztZQUN6QyxZQUFZLEVBQUUsVUFBVSxFQUFFLEVBQUU7U0FDN0IsQ0FBQztRQUNGLFdBQVcsRUFBRSxHQUFxQixFQUFFLENBQUMsQ0FBQztZQUNwQyxPQUFPLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFO1NBQ3ZCLENBQUM7S0FDSCxDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=
|
package/MySql/index.d.ts
CHANGED
|
@@ -1,16 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BasicEncryptResourceArgs, LoginWithEnvRolesArgs, NetworkPropsType } from '../types';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import * as dbformysql from '@pulumi/azure-native/dbformysql';
|
|
4
4
|
import * as inputs from '@pulumi/azure-native/types/input';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
enableEncryption?: boolean;
|
|
8
|
-
vaultInfo: KeyVaultInfo;
|
|
9
|
-
auth?: {
|
|
10
|
-
envRoles?: EnvRolesResults;
|
|
11
|
-
adminLogin?: pulumi.Input<string>;
|
|
12
|
-
password?: pulumi.Input<string>;
|
|
13
|
-
};
|
|
5
|
+
export interface MySqlProps extends BasicEncryptResourceArgs {
|
|
6
|
+
auth?: LoginWithEnvRolesArgs;
|
|
14
7
|
sku?: pulumi.Input<inputs.dbformysql.SkuArgs>;
|
|
15
8
|
version?: dbformysql.ServerVersion;
|
|
16
9
|
storageSizeGB?: number;
|
package/MySql/index.js
CHANGED
|
@@ -32,7 +32,6 @@ const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
|
32
32
|
const dbformysql = __importStar(require("@pulumi/azure-native/dbformysql"));
|
|
33
33
|
const Random_1 = require("../Core/Random");
|
|
34
34
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
35
|
-
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
36
35
|
const Group_1 = require("../AzAd/Group");
|
|
37
36
|
const Helper_1 = require("../KeyVault/Helper");
|
|
38
37
|
const UserAssignedIdentity_1 = __importDefault(require("../AzAd/UserAssignedIdentity"));
|
|
@@ -62,7 +61,7 @@ sku = {
|
|
|
62
61
|
options: { special: false },
|
|
63
62
|
}).result;
|
|
64
63
|
const encryptKey = enableEncryption
|
|
65
|
-
? (0, Helper_1.
|
|
64
|
+
? (0, Helper_1.addEncryptKey)({ name, vaultInfo: vaultInfo })
|
|
66
65
|
: undefined;
|
|
67
66
|
const userIdentity = enableEncryption
|
|
68
67
|
? (0, UserAssignedIdentity_1.default)({ name, group, vaultInfo })
|
|
@@ -73,8 +72,8 @@ sku = {
|
|
|
73
72
|
version,
|
|
74
73
|
storage: {
|
|
75
74
|
storageSizeGB,
|
|
76
|
-
autoGrow:
|
|
77
|
-
autoIoScaling:
|
|
75
|
+
autoGrow: Common_1.isPrd ? 'Enabled' : 'Disabled',
|
|
76
|
+
autoIoScaling: Common_1.isPrd ? 'Enabled' : 'Disabled',
|
|
78
77
|
},
|
|
79
78
|
// identity: {
|
|
80
79
|
// type: dbformysql.ManagedServiceIdentityType.UserAssigned,
|
|
@@ -91,17 +90,17 @@ sku = {
|
|
|
91
90
|
primaryKeyURI: encryptKey.url,
|
|
92
91
|
}
|
|
93
92
|
: { type: dbformysql.DataEncryptionType.SystemManaged },
|
|
94
|
-
|
|
93
|
+
maintenanceWindow: { dayOfWeek: 6, startHour: 0, startMinute: 0 },
|
|
95
94
|
sku,
|
|
96
95
|
backup: {
|
|
97
|
-
geoRedundantBackup:
|
|
98
|
-
backupRetentionDays:
|
|
96
|
+
geoRedundantBackup: Common_1.isPrd ? 'Enabled' : 'Disabled',
|
|
97
|
+
backupRetentionDays: Common_1.isPrd ? 7 : 1,
|
|
99
98
|
},
|
|
100
99
|
highAvailability: {
|
|
101
|
-
mode:
|
|
100
|
+
mode: Common_1.isPrd ? 'ZoneRedundant' : 'Disabled',
|
|
102
101
|
standbyAvailabilityZone: '3',
|
|
103
102
|
},
|
|
104
|
-
availabilityZone:
|
|
103
|
+
availabilityZone: Common_1.isPrd ? '3' : '1',
|
|
105
104
|
}, {
|
|
106
105
|
dependsOn,
|
|
107
106
|
ignoreChanges: [
|
|
@@ -132,7 +131,7 @@ sku = {
|
|
|
132
131
|
login: username,
|
|
133
132
|
administratorType: 'ActiveDirectory',
|
|
134
133
|
sid: adminGroup.objectId,
|
|
135
|
-
tenantId:
|
|
134
|
+
tenantId: Common_1.tenantId,
|
|
136
135
|
}, { ignoreChanges: ['administratorName'] });
|
|
137
136
|
}
|
|
138
137
|
if (network) {
|
|
@@ -165,17 +164,13 @@ sku = {
|
|
|
165
164
|
}
|
|
166
165
|
}
|
|
167
166
|
if (vaultInfo) {
|
|
168
|
-
(0, CustomHelper_1.
|
|
169
|
-
name: `${name}-login`,
|
|
170
|
-
value: username,
|
|
171
|
-
vaultInfo,
|
|
172
|
-
contentType: name,
|
|
173
|
-
});
|
|
174
|
-
(0, CustomHelper_1.addCustomSecret)({
|
|
175
|
-
name: `${name}-pass`,
|
|
176
|
-
value: password,
|
|
167
|
+
(0, CustomHelper_1.addCustomSecrets)({
|
|
177
168
|
vaultInfo,
|
|
178
169
|
contentType: name,
|
|
170
|
+
items: [
|
|
171
|
+
{ name: `${name}-login`, value: username },
|
|
172
|
+
{ name: `${name}-pass`, value: password },
|
|
173
|
+
],
|
|
179
174
|
});
|
|
180
175
|
}
|
|
181
176
|
if (databases) {
|
|
@@ -187,4 +182,4 @@ sku = {
|
|
|
187
182
|
}
|
|
188
183
|
return mySql;
|
|
189
184
|
};
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDREQUE4QztBQU05QyxzQ0FBMEQ7QUFDMUQsdURBQXlDO0FBQ3pDLDRFQUE4RDtBQUM5RCwyQ0FBZ0Q7QUFFaEQsMkRBQTREO0FBQzVELHlDQUFpRDtBQUNqRCwrQ0FBbUQ7QUFDbkQsd0ZBQWdFO0FBQ2hFLDJDQUE4QztBQUM5QywyQ0FBa0Q7QUFDbEQsOEVBQXNEO0FBYXRELGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLElBQUksRUFDSixnQkFBZ0IsRUFDaEIsT0FBTyxHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQ3ZELGFBQWEsR0FBRyxFQUFFO0FBQ2xCOztHQUVHO0FBQ0gsR0FBRyxHQUFHO0lBQ0osSUFBSSxFQUFFLGVBQWU7SUFDckIsSUFBSSxFQUFFLFdBQVc7Q0FDbEIsRUFDRCxPQUFPLEVBQ1AsU0FBUyxFQUNULFNBQVMsRUFDVCxTQUFTLEdBQ0UsRUFBRSxFQUFFO0lBQ2YsSUFBSSxHQUFHLElBQUEscUJBQVksRUFBQyxJQUFJLENBQUMsQ0FBQztJQUUxQixNQUFNLFFBQVEsR0FDWixJQUFJLEVBQUUsVUFBVTtRQUNoQixJQUFJLHFCQUFZLENBQUMsSUFBSSxFQUFFO1lBQ3JCLE9BQU8sRUFBRSxLQUFLO1lBQ2QsTUFBTSxFQUFFLENBQUM7WUFDVCxLQUFLLEVBQUUsSUFBSTtZQUNYLEtBQUssRUFBRSxLQUFLO1NBQ2IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUV0QyxNQUFNLFFBQVEsR0FDWixJQUFJLEVBQUUsUUFBUTtRQUNkLElBQUEsdUJBQWMsRUFBQztZQUNiLElBQUk7WUFDSixNQUFN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
|
package/Postgresql/index.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BasicEncryptResourceArgs, NetworkPropsType } from '../types';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
3
|
import * as azure from '@pulumi/azure-native';
|
|
4
4
|
import * as inputs from '@pulumi/azure-native/types/input';
|
|
5
|
-
export interface PostgresProps extends
|
|
5
|
+
export interface PostgresProps extends BasicEncryptResourceArgs {
|
|
6
6
|
sku?: pulumi.Input<inputs.dbforpostgresql.SkuArgs>;
|
|
7
|
-
vaultInfo?: KeyVaultInfo;
|
|
8
7
|
version?: azure.dbforpostgresql.ServerVersion;
|
|
9
8
|
storageSizeGB?: number;
|
|
10
9
|
databases?: Array<string>;
|
|
@@ -13,5 +12,5 @@ export interface PostgresProps extends BasicResourceArgs {
|
|
|
13
12
|
};
|
|
14
13
|
lock?: true;
|
|
15
14
|
}
|
|
16
|
-
declare const _default: ({ name, group, version, storageSizeGB, sku, network, databases, vaultInfo, dependsOn, lock, }: PostgresProps) => import("@pulumi/azure-native/dbforpostgresql/server").Server;
|
|
15
|
+
declare const _default: ({ name, group, version, storageSizeGB, sku, network, databases, vaultInfo, enableEncryption, dependsOn, lock, }: PostgresProps) => import("@pulumi/azure-native/dbforpostgresql/server").Server;
|
|
17
16
|
export default _default;
|