@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/KeyVault/index.js
CHANGED
|
@@ -30,33 +30,33 @@ exports.createVaultDiagnostic = exports.createVaultPrivateLink = void 0;
|
|
|
30
30
|
const keyvault = __importStar(require("@pulumi/azure-native/keyvault"));
|
|
31
31
|
const types_1 = require("@pulumi/azure-native/types");
|
|
32
32
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
33
|
-
const
|
|
33
|
+
const Common_1 = require("../Common");
|
|
34
34
|
const Helpers_1 = require("../Logs/Helpers");
|
|
35
35
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
36
36
|
const createVaultPrivateLink = ({ vaultInfo, ...props }) => (0, PrivateEndpoint_1.default)({
|
|
37
|
-
resourceInfo:
|
|
37
|
+
resourceInfo: vaultInfo,
|
|
38
38
|
...props,
|
|
39
|
-
privateDnsZoneName:
|
|
40
|
-
linkServiceGroupIds: props.type ? [props.type] : [
|
|
39
|
+
privateDnsZoneName: 'privatelink.vaultcore.azure.net',
|
|
40
|
+
linkServiceGroupIds: props.type ? [props.type] : ['keyVault'],
|
|
41
41
|
});
|
|
42
42
|
exports.createVaultPrivateLink = createVaultPrivateLink;
|
|
43
43
|
const createVaultDiagnostic = ({ vaultInfo, logInfo, }) => (0, Helpers_1.createDiagnostic)({
|
|
44
44
|
name: `${vaultInfo.name}-vault`,
|
|
45
45
|
targetResourceId: vaultInfo.id,
|
|
46
46
|
...logInfo,
|
|
47
|
-
logsCategories: [
|
|
47
|
+
logsCategories: ['AuditEvent'],
|
|
48
48
|
});
|
|
49
49
|
exports.createVaultDiagnostic = createVaultDiagnostic;
|
|
50
50
|
exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignoreChanges = [], dependsOn, importUri, ...others }) => {
|
|
51
|
-
const vaultName = (0,
|
|
51
|
+
const vaultName = (0, Common_1.getKeyVaultName)(name);
|
|
52
52
|
const vault = new keyvault.Vault(vaultName, {
|
|
53
53
|
vaultName,
|
|
54
54
|
...group,
|
|
55
55
|
...others,
|
|
56
56
|
properties: {
|
|
57
57
|
tenantId: AzureEnv_1.tenantId,
|
|
58
|
-
sku: { name:
|
|
59
|
-
createMode:
|
|
58
|
+
sku: { name: 'standard', family: 'A' },
|
|
59
|
+
createMode: 'default',
|
|
60
60
|
enableRbacAuthorization: true,
|
|
61
61
|
accessPolicies: undefined,
|
|
62
62
|
enablePurgeProtection: true,
|
|
@@ -65,7 +65,7 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
|
|
|
65
65
|
enabledForDeployment: true,
|
|
66
66
|
enabledForDiskEncryption: true,
|
|
67
67
|
networkAcls: {
|
|
68
|
-
bypass:
|
|
68
|
+
bypass: 'AzureServices',
|
|
69
69
|
defaultAction: types_1.enums.keyvault.NetworkRuleAction.Allow,
|
|
70
70
|
ipRules: network?.ipAddresses
|
|
71
71
|
? network.ipAddresses.map((i) => ({ value: i }))
|
|
@@ -79,9 +79,9 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
|
|
|
79
79
|
dependsOn,
|
|
80
80
|
import: importUri,
|
|
81
81
|
ignoreChanges: [
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
'softDeleteRetentionInDays',
|
|
83
|
+
'enableSoftDelete',
|
|
84
|
+
'enablePurgeProtection',
|
|
85
85
|
...ignoreChanges,
|
|
86
86
|
],
|
|
87
87
|
});
|
|
@@ -107,4 +107,4 @@ exports.default = ({ name, group, network, softDeleteRetentionInDays = 7, ignore
|
|
|
107
107
|
createPrivateLink,
|
|
108
108
|
};
|
|
109
109
|
};
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RUFBMEQ7QUFDMUQsc0RBQW1EO0FBRW5ELGlEQUE4QztBQUM5QyxzQ0FBNEM7QUFDNUMsNkNBQW1EO0FBUW5ELDhFQUFzRDtBQU8vQyxNQUFNLHNCQUFzQixHQUFHLENBQUMsRUFDckMsU0FBUyxFQUNULEdBQUcsS0FBSyxFQUdULEVBQUUsRUFBRSxDQUNILElBQUEseUJBQWUsRUFBQztJQUNkLFlBQVksRUFBRSxTQUFTO0lBQ3ZCLEdBQUcsS0FBSztJQUNSLGtCQUFrQixFQUFFLGlDQUFpQztJQUNyRCxtQkFBbUIsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUM7Q0FDOUQsQ0FBQyxDQUFDO0FBWFEsUUFBQSxzQkFBc0IsMEJBVzlCO0FBRUUsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLEVBQ3BDLFNBQVMsRUFDVCxPQUFPLEdBSVIsRUFBRSxFQUFFLENBQ0gsSUFBQSwwQkFBZ0IsRUFBQztJQUNmLElBQUksRUFBRSxHQUFHLFNBQVMsQ0FBQyxJQUFJLFFBQVE7SUFDL0IsZ0JBQWdCLEVBQUUsU0FBUyxDQUFDLEVBQUU7SUFDOUIsR0FBRyxPQUFPO0lBQ1YsY0FBYyxFQUFFLENBQUMsWUFBWSxDQUFDO0NBQy9CLENBQUMsQ0FBQztBQVpRLFFBQUEscUJBQXFCLHlCQVk3QjtBQUVMLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLE9BQU8sRUFDUCx5QkFBeUIsR0FBRyxDQUFDLEVBQzdCLGFBQWEsR0FBRyxFQUFFLEVBQ2xCLFNBQVMsRUFDVCxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0ssRUFBRSxFQUFFO0lBQ2xC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
|
package/Logs/AppInsight.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as native from
|
|
2
|
-
import { BasicResourceArgs, KeyVaultInfo, ResourceInfo } from
|
|
3
|
-
import { Input } from
|
|
1
|
+
import * as native from '@pulumi/azure-native';
|
|
2
|
+
import { BasicResourceArgs, KeyVaultInfo, ResourceInfo } from '../types';
|
|
3
|
+
import { Input } from '@pulumi/pulumi';
|
|
4
4
|
interface Props extends BasicResourceArgs {
|
|
5
5
|
dailyCapGb?: number;
|
|
6
6
|
vaultInfo?: KeyVaultInfo;
|
package/Logs/AppInsight.js
CHANGED
|
@@ -26,17 +26,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.getAppInsightKey = void 0;
|
|
27
27
|
const native = __importStar(require("@pulumi/azure-native"));
|
|
28
28
|
const Helper_1 = require("../KeyVault/Helper");
|
|
29
|
-
const
|
|
29
|
+
const Common_1 = require("../Common");
|
|
30
30
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
31
31
|
exports.default = ({ group, name, dailyCapGb = 0.023, immediatePurgeDataOn30Days = true, ingestionMode = native.insights.IngestionMode.ApplicationInsights, workspaceResourceId, vaultInfo, }) => {
|
|
32
|
-
name = (0,
|
|
32
|
+
name = (0, Common_1.getAppInsightName)(name);
|
|
33
33
|
const appInsight = new native.insights.Component(name, {
|
|
34
34
|
resourceName: name,
|
|
35
35
|
...group,
|
|
36
|
-
kind:
|
|
36
|
+
kind: 'web',
|
|
37
37
|
disableIpMasking: true,
|
|
38
|
-
applicationType:
|
|
39
|
-
flowType:
|
|
38
|
+
applicationType: 'web',
|
|
39
|
+
flowType: 'Bluefield',
|
|
40
40
|
//samplingPercentage: isPrd ? 100 : 50,
|
|
41
41
|
retentionInDays: 30,
|
|
42
42
|
immediatePurgeDataOn30Days,
|
|
@@ -45,7 +45,7 @@ exports.default = ({ group, name, dailyCapGb = 0.023, immediatePurgeDataOn30Days
|
|
|
45
45
|
workspaceResourceId,
|
|
46
46
|
});
|
|
47
47
|
new native.insights.ComponentCurrentBillingFeature(`${name}-CurrentBillingFeature`, {
|
|
48
|
-
currentBillingFeatures: [
|
|
48
|
+
currentBillingFeatures: ['Basic'], // ['Basic', 'Application Insights Enterprise'],
|
|
49
49
|
dataVolumeCap: {
|
|
50
50
|
cap: dailyCapGb,
|
|
51
51
|
stopSendNotificationWhenHitCap: true,
|
|
@@ -58,17 +58,17 @@ exports.default = ({ group, name, dailyCapGb = 0.023, immediatePurgeDataOn30Days
|
|
|
58
58
|
name,
|
|
59
59
|
value: appInsight.instrumentationKey,
|
|
60
60
|
vaultInfo,
|
|
61
|
-
contentType:
|
|
61
|
+
contentType: 'AppInsight',
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
return appInsight;
|
|
65
65
|
};
|
|
66
66
|
const getAppInsightKey = async ({ resourceInfo, vaultInfo, }) => {
|
|
67
67
|
const key = await (0, Helper_1.getSecret)({
|
|
68
|
-
name: resourceInfo.
|
|
68
|
+
name: resourceInfo.name,
|
|
69
69
|
vaultInfo,
|
|
70
70
|
});
|
|
71
|
-
return key?.value ??
|
|
71
|
+
return key?.value ?? '';
|
|
72
72
|
};
|
|
73
73
|
exports.getAppInsightKey = getAppInsightKey;
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwSW5zaWdodC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0FwcEluc2lnaHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFHL0MsK0NBQStDO0FBQy9DLHNDQUE4QztBQUM5QywyREFBMkQ7QUFXM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osVUFBVSxHQUFHLEtBQUssRUFDbEIsMEJBQTBCLEdBQUcsSUFBSSxFQUNqQyxhQUFhLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsbUJBQW1CLEVBQ2pFLG1CQUFtQixFQUNuQixTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFL0IsTUFBTSxVQUFVLEdBQUcsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUU7UUFDckQsWUFBWSxFQUFFLElBQUk7UUFDbEIsR0FBRyxLQUFLO1FBRVIsSUFBSSxFQUFFLEtBQUs7UUFDWCxnQkFBZ0IsRUFBRSxJQUFJO1FBQ3RCLGVBQWUsRUFBRSxLQUFLO1FBQ3RCLFFBQVEsRUFBRSxXQUFXO1FBRXJCLHVDQUF1QztRQUN2QyxlQUFlLEVBQUUsRUFBRTtRQUVuQiwwQkFBMEI7UUFDMUIsYUFBYTtRQUViLGdCQUFnQixFQUFFLElBQUk7UUFDdEIsbUJBQW1CO0tBQ3BCLENBQUMsQ0FBQztJQUVILElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyw4QkFBOEIsQ0FDaEQsR0FBRyxJQUFJLHdCQUF3QixFQUMvQjtRQUNFLHNCQUFzQixFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsZ0RBQWdEO1FBQ25GLGFBQWEsRUFBRTtZQUNiLEdBQUcsRUFBRSxVQUFVO1lBQ2YsOEJBQThCLEVBQUUsSUFBSTtTQUNyQztRQUNELGlCQUFpQixFQUFFLEtBQUssQ0FBQyxpQkFBaUI7UUFDMUMsWUFBWSxFQUFFLFVBQVUsQ0FBQyxJQUFJO0tBQzlCLENBQ0YsQ0FBQztJQUVGLElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxJQUFBLDhCQUFlLEVBQUM7WUFDZCxJQUFJO1lBQ0osS0FBSyxFQUFFLFVBQVUsQ0FBQyxrQkFBa0I7WUFDcEMsU0FBUztZQUNULFdBQVcsRUFBRSxZQUFZO1NBQzFCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxPQUFPLFVBQVUsQ0FBQztBQUNwQixDQUFDLENBQUM7QUFFSyxNQUFNLGdCQUFnQixHQUFHLEtBQUssRUFBRSxFQUNyQyxZQUFZLEVBQ1osU0FBUyxHQUlWLEVBQW1CLEVBQUU7SUFDcEIsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFBLGtCQUFTLEVBQUM7UUFDMUIsSUFBSSxFQUFFLFlBQVksQ0FBQyxJQUFJO1FBQ3ZCLFNBQVM7S0FDVixDQUFDLENBQUM7SUFDSCxPQUFPLEdBQUcsRUFBRSxLQUFLLElBQUksRUFBRSxDQUFDO0FBQzFCLENBQUMsQ0FBQztBQVpXLFFBQUEsZ0JBQWdCLG9CQVkzQiJ9
|
package/Logs/Helpers.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Input, Output } from
|
|
2
|
-
import { StorageConnectionInfo } from
|
|
3
|
-
import { DiagnosticProps, KeyVaultInfo, ResourceGroupInfo, ResourceInfo } from
|
|
1
|
+
import { Input, Output } from '@pulumi/pulumi';
|
|
2
|
+
import { StorageConnectionInfo } from '../Storage/Helper';
|
|
3
|
+
import { DiagnosticProps, KeyVaultInfo, ResourceGroupInfo, ResourceInfo } 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
5
|
interface ThreatProtectionProps {
|
|
6
6
|
name: string;
|
|
@@ -19,7 +19,7 @@ export declare const getLogWpSecretsById: ({ logWpId, vaultInfo, }: {
|
|
|
19
19
|
logWpId: string;
|
|
20
20
|
vaultInfo: KeyVaultInfo;
|
|
21
21
|
}) => Promise<{
|
|
22
|
-
info: import("../Common/AzureEnv").
|
|
22
|
+
info: import("../Common/AzureEnv").ParsedResourceInfo | undefined;
|
|
23
23
|
secrets: {
|
|
24
24
|
wpId: string | undefined;
|
|
25
25
|
primaryKey: string | undefined;
|
package/Logs/Helpers.js
CHANGED
|
@@ -27,12 +27,12 @@ exports.getLogInfo = exports.getAppInsightInfo = exports.getLogStorageInfo = exp
|
|
|
27
27
|
const native = __importStar(require("@pulumi/azure-native"));
|
|
28
28
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
29
29
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
30
|
-
const
|
|
30
|
+
const Common_1 = require("../Common");
|
|
31
31
|
const Helper_1 = require("../KeyVault/Helper");
|
|
32
32
|
const Helper_2 = require("../Storage/Helper");
|
|
33
33
|
const ResourceEnv_1 = require("../Common/ResourceEnv");
|
|
34
34
|
const AppInsight_1 = require("./AppInsight");
|
|
35
|
-
const createDiagnostic = ({ name, targetResourceId, logWpId, logStorageId, metricsCategories = [
|
|
35
|
+
const createDiagnostic = ({ name, targetResourceId, logWpId, logStorageId, metricsCategories = ['AllMetrics'], logsCategories, dependsOn, }) => {
|
|
36
36
|
//Ensure logWpId or logStorageId is provided
|
|
37
37
|
if (!logWpId && !logStorageId) {
|
|
38
38
|
console.error(`Diagnostic for "${name}" must have either a "logWpId" or "logStorageId".`);
|
|
@@ -47,7 +47,7 @@ const createDiagnostic = ({ name, targetResourceId, logWpId, logStorageId, metri
|
|
|
47
47
|
return new native.insights.DiagnosticSetting(n, {
|
|
48
48
|
name: n,
|
|
49
49
|
resourceUri: targetResourceId,
|
|
50
|
-
logAnalyticsDestinationType:
|
|
50
|
+
logAnalyticsDestinationType: 'AzureDiagnostics',
|
|
51
51
|
workspaceId: logWpId,
|
|
52
52
|
storageAccountId: logWpId ? undefined : logStorageId,
|
|
53
53
|
//Metric
|
|
@@ -72,14 +72,14 @@ exports.createDiagnostic = createDiagnostic;
|
|
|
72
72
|
const createThreatProtection = ({ name, targetResourceId, }) => new native.security.AdvancedThreatProtection(name, {
|
|
73
73
|
isEnabled: true,
|
|
74
74
|
resourceId: targetResourceId,
|
|
75
|
-
settingName:
|
|
75
|
+
settingName: 'current',
|
|
76
76
|
});
|
|
77
77
|
exports.createThreatProtection = createThreatProtection;
|
|
78
78
|
//========================Log WP===========================
|
|
79
79
|
const getLogWpSecrets = async ({ fullName, vaultInfo, }) => {
|
|
80
80
|
const workspaceIdKeyName = `${fullName}-Id`;
|
|
81
|
-
const primaryKeyName = (0,
|
|
82
|
-
const secondaryKeyName = (0,
|
|
81
|
+
const primaryKeyName = (0, Common_1.getKeyName)(fullName, 'primary');
|
|
82
|
+
const secondaryKeyName = (0, Common_1.getKeyName)(fullName, 'secondary');
|
|
83
83
|
const [wpId, primaryKey, secondaryKey] = await Promise.all([
|
|
84
84
|
(0, Helper_1.getSecret)({ name: workspaceIdKeyName, vaultInfo }).then((i) => i?.value),
|
|
85
85
|
(0, Helper_1.getSecret)({ name: primaryKeyName, nameFormatted: true, vaultInfo }).then((i) => i?.value),
|
|
@@ -97,38 +97,38 @@ const getLogWpSecretsById = async ({ logWpId, vaultInfo, }) => {
|
|
|
97
97
|
};
|
|
98
98
|
exports.getLogWpSecretsById = getLogWpSecretsById;
|
|
99
99
|
const getLogWpInfo = ({ logWpName, vaultInfo, group, }) => {
|
|
100
|
-
const n = (0,
|
|
100
|
+
const n = (0, Common_1.getLogWpName)(logWpName);
|
|
101
101
|
const id = (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourcegroups/${group.resourceGroupName}/providers/microsoft.operationalinsights/workspaces/${n}`;
|
|
102
102
|
const secrets = vaultInfo
|
|
103
103
|
? (0, pulumi_1.output)((0, exports.getLogWpSecrets)({ fullName: n, vaultInfo }))
|
|
104
104
|
: undefined;
|
|
105
|
-
return {
|
|
105
|
+
return { name: n, group, id, secrets };
|
|
106
106
|
};
|
|
107
107
|
exports.getLogWpInfo = getLogWpInfo;
|
|
108
108
|
const getLogStorageInfo = ({ storageName, group, vaultInfo, }) => {
|
|
109
|
-
const n = (0,
|
|
109
|
+
const n = (0, Common_1.getStorageName)(storageName);
|
|
110
110
|
const id = (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourcegroups/${group.resourceGroupName}/providers/Microsoft.Storage/storageAccounts/${n}`;
|
|
111
111
|
const secrets = vaultInfo
|
|
112
112
|
? (0, pulumi_1.output)((0, Helper_2.getStorageSecrets)({ name: n, nameFormatted: true, vaultInfo }))
|
|
113
113
|
: undefined;
|
|
114
|
-
return {
|
|
114
|
+
return { name: n, group, id, secrets };
|
|
115
115
|
};
|
|
116
116
|
exports.getLogStorageInfo = getLogStorageInfo;
|
|
117
117
|
const getAppInsightInfo = ({ name, group, vaultInfo, }) => {
|
|
118
|
-
const n = (0,
|
|
118
|
+
const n = (0, Common_1.getAppInsightName)(name);
|
|
119
119
|
const id = (0, pulumi_1.interpolate) `/subscriptions/${AzureEnv_1.subscriptionId}/resourceGroups/${group.resourceGroupName}/providers/microsoft.insights/components/${n}`;
|
|
120
120
|
const instrumentationKey = vaultInfo
|
|
121
121
|
? (0, pulumi_1.output)((0, AppInsight_1.getAppInsightKey)({
|
|
122
|
-
resourceInfo: {
|
|
122
|
+
resourceInfo: { name: n, group, id },
|
|
123
123
|
vaultInfo,
|
|
124
124
|
}))
|
|
125
125
|
: undefined;
|
|
126
|
-
return {
|
|
126
|
+
return { name: n, group, id, instrumentationKey };
|
|
127
127
|
};
|
|
128
128
|
exports.getAppInsightInfo = getAppInsightInfo;
|
|
129
129
|
const getLogInfo = (groupName, vaultInfo = undefined) => {
|
|
130
|
-
const rgName = (0,
|
|
131
|
-
const name = (0, ResourceEnv_1.getResourceName)(groupName, { suffix:
|
|
130
|
+
const rgName = (0, Common_1.getResourceGroupName)(groupName);
|
|
131
|
+
const name = (0, ResourceEnv_1.getResourceName)(groupName, { suffix: 'logs' });
|
|
132
132
|
const group = { resourceGroupName: rgName, location: AzureEnv_1.currentRegionName };
|
|
133
133
|
const logWp = (0, exports.getLogWpInfo)({
|
|
134
134
|
logWpName: name,
|
|
@@ -148,4 +148,4 @@ const getLogInfo = (groupName, vaultInfo = undefined) => {
|
|
|
148
148
|
return { logWp, logStorage, appInsight };
|
|
149
149
|
};
|
|
150
150
|
exports.getLogInfo = getLogInfo;
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQW9FO0FBQ3BFLGlEQUk0QjtBQUM1QixzQ0FNbUI7QUFDbkIsK0NBQStDO0FBQy9DLDhDQUE2RTtBQU83RSx1REFBd0Q7QUFDeEQsNkNBQWdEO0FBRXpDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osZ0JBQWdCLEVBQ2hCLE9BQU8sRUFDUCxZQUFZLEVBQ1osaUJBQWlCLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFDbEMsY0FBYyxFQUNkLFNBQVMsR0FDTyxFQUFFLEVBQUU7SUFDcEIsNENBQTRDO0lBQzVDLElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUM5QixPQUFPLENBQUMsS0FBSyxDQUNYLG1CQUFtQixJQUFJLG1EQUFtRCxDQUMzRSxDQUFDO1FBQ0YsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVELGtDQUFrQztJQUNsQyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUN0QixPQUFPLENBQUMsS0FBSyxDQUFDLHVCQUF1QixJQUFJLHFCQUFxQixDQUFDLENBQUM7UUFDaEUsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVELE1BQU0sQ0FBQyxHQUFHLEdBQUcsSUFBSSxPQUFPLENBQUM7SUFDekIsT0FBTyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQzFDLENBQUMsRUFDRDtRQUNFLElBQUksRUFBRSxDQUFDO1FBQ1AsV0FBVyxFQUFFLGdCQUFnQjtRQUM3QiwyQkFBMkIsRUFBRSxrQkFBa0I7UUFFL0MsV0FBVyxFQUFFLE9BQU87UUFDcEIsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxD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
|
package/MySql/index.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from
|
|
2
|
-
import * as pulumi from
|
|
3
|
-
import * as dbformysql from
|
|
4
|
-
import * as inputs from
|
|
5
|
-
import { EnvRolesResults } from
|
|
1
|
+
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from '../types';
|
|
2
|
+
import * as pulumi from '@pulumi/pulumi';
|
|
3
|
+
import * as dbformysql from '@pulumi/azure-native/dbformysql';
|
|
4
|
+
import * as inputs from '@pulumi/azure-native/types/input';
|
|
5
|
+
import { EnvRolesResults } from '../AzAd/EnvRoles';
|
|
6
6
|
export interface MySqlProps extends BasicResourceArgs {
|
|
7
7
|
enableEncryption?: boolean;
|
|
8
8
|
vaultInfo: KeyVaultInfo;
|
package/MySql/index.js
CHANGED
|
@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
const azure = __importStar(require("@pulumi/azure-native"));
|
|
30
|
-
const
|
|
30
|
+
const Common_1 = require("../Common");
|
|
31
31
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
32
32
|
const dbformysql = __importStar(require("@pulumi/azure-native/dbformysql"));
|
|
33
33
|
const Random_1 = require("../Core/Random");
|
|
@@ -44,10 +44,10 @@ exports.default = ({ name, group, auth, enableEncryption, version = dbformysql.S
|
|
|
44
44
|
[Standard_B1ms, Standard_B1s, Standard_B2ms, Standard_B2s, Standard_B4ms, Standard_B8ms, Standard_D16s_v3, Standard_D2s_v3, Standard_D32s_v3, Standard_D4s_v3, Standard_D64s_v3, Standard_D8s_v3, Standard_E16s_v3, Standard_E2s_v3, Standard_E32s_v3, Standard_E4s_v3, Standard_E64s_v3, Standard_E8s_v3, Standard_M128ms, Standard_M128s, Standard_M64ms, Standard_M64s, Standard_E48s_v3, Standard_D2ds_v4, Standard_D4ds_v4, Standard_D8ds_v4, Standard_D16ds_v4, Standard_D32ds_v4, Standard_D48ds_v4, Standard_D64ds_v4, Standard_E2ds_v4, Standard_E4ds_v4, Standard_E8ds_v4, Standard_E16ds_v4, Standard_E32ds_v4, Standard_E48ds_v4, Standard_E64ds_v4, Standard_D48s_v3, Standard_E20ds_v4, Standard_M8ms, Standard_M16ms, Standard_M32ts, Standard_M32ls, Standard_M32ms, Standard_M64ls, Standard_M64, Standard_M64m, Standard_M128, Standard_M128m, Standard_B12ms, Standard_B16ms, Standard_B20ms, Standard_D2ads_v5, Standard_D4ads_v5, Standard_D8ads_v5, Standard_D16ads_v5, Standard_D32ads_v5, Standard_D48ads_v5, Standard_D64ads_v5, Standard_D96ads_v5, Standard_E2ads_v5, Standard_E4ads_v5, Standard_E8ads_v5, Standard_E16ads_v5, Standard_E20ads_v5, Standard_E32ads_v5, Standard_E48ads_v5, Standard_E64ads_v5, Standard_E96ads_v5, Standard_D2_v5, Standard_D4_v5, Standard_D8_v5, Standard_D16_v5, Standard_D32_v5, Standard_D48_v5, Standard_D64_v5, Standard_D96_v5, Standard_D2ds_v5, Standard_D4ds_v5, Standard_D8ds_v5, Standard_D16ds_v5, Standard_D32ds_v5, Standard_D48ds_v5, Standard_D64ds_v5, Standard_D96ds_v5, Standard_E2ds_v5, Standard_E4ds_v5, Standard_E8ds_v5, Standard_E16ds_v5, Standard_E20ds_v5, Standard_E32ds_v5, Standard_E48ds_v5, Standard_E64ds_v5, Standard_E96ds_v5, Standard_E104ids_v5, Standard_E2bds_v5, Standard_E4bds_v5, Standard_E8bds_v5, Standard_E16bds_v5, Standard_E32bds_v5, Standard_E48bds_v5, Standard_E64bds_v5, Standard_E112iads_v5, Standard_M32dms_v2, Standard_M64ds_v2, Standard_M64dms_v2, Standard_M128ds_v2, Standard_M128dms_v2, Standard_M192ids_v2, Standard_M192idms_v2]
|
|
45
45
|
*/
|
|
46
46
|
sku = {
|
|
47
|
-
name:
|
|
48
|
-
tier:
|
|
47
|
+
name: 'Standard_B1ms',
|
|
48
|
+
tier: 'Burstable',
|
|
49
49
|
}, network, databases, vaultInfo, dependsOn, }) => {
|
|
50
|
-
name = (0,
|
|
50
|
+
name = (0, Common_1.getMySqlName)(name);
|
|
51
51
|
const username = auth?.adminLogin ||
|
|
52
52
|
new random_1.RandomString(name, {
|
|
53
53
|
special: false,
|
|
@@ -73,8 +73,8 @@ sku = {
|
|
|
73
73
|
version,
|
|
74
74
|
storage: {
|
|
75
75
|
storageSizeGB,
|
|
76
|
-
autoGrow: AzureEnv_1.isPrd ?
|
|
77
|
-
autoIoScaling: AzureEnv_1.isPrd ?
|
|
76
|
+
autoGrow: AzureEnv_1.isPrd ? 'Enabled' : 'Disabled',
|
|
77
|
+
autoIoScaling: AzureEnv_1.isPrd ? 'Enabled' : 'Disabled',
|
|
78
78
|
},
|
|
79
79
|
// identity: {
|
|
80
80
|
// type: dbformysql.ManagedServiceIdentityType.UserAssigned,
|
|
@@ -94,22 +94,22 @@ sku = {
|
|
|
94
94
|
//maintenanceWindow: { dayOfWeek: 6 },
|
|
95
95
|
sku,
|
|
96
96
|
backup: {
|
|
97
|
-
geoRedundantBackup: AzureEnv_1.isPrd ?
|
|
97
|
+
geoRedundantBackup: AzureEnv_1.isPrd ? 'Enabled' : 'Disabled',
|
|
98
98
|
backupRetentionDays: AzureEnv_1.isPrd ? 7 : 1,
|
|
99
99
|
},
|
|
100
100
|
highAvailability: {
|
|
101
|
-
mode: AzureEnv_1.isPrd ?
|
|
102
|
-
standbyAvailabilityZone:
|
|
101
|
+
mode: AzureEnv_1.isPrd ? 'ZoneRedundant' : 'Disabled',
|
|
102
|
+
standbyAvailabilityZone: '3',
|
|
103
103
|
},
|
|
104
|
-
availabilityZone: AzureEnv_1.isPrd ?
|
|
104
|
+
availabilityZone: AzureEnv_1.isPrd ? '3' : '1',
|
|
105
105
|
}, {
|
|
106
106
|
dependsOn,
|
|
107
107
|
ignoreChanges: [
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
108
|
+
'serverName',
|
|
109
|
+
'highAvailability',
|
|
110
|
+
'availabilityZone',
|
|
111
|
+
'administratorLogin',
|
|
112
|
+
'dataEncryption',
|
|
113
113
|
],
|
|
114
114
|
});
|
|
115
115
|
//Enable AD Administrator
|
|
@@ -127,7 +127,7 @@ sku = {
|
|
|
127
127
|
serverName: mySql.name,
|
|
128
128
|
...group,
|
|
129
129
|
login: username,
|
|
130
|
-
administratorType:
|
|
130
|
+
administratorType: 'ActiveDirectory',
|
|
131
131
|
sid: adminGroup.objectId,
|
|
132
132
|
tenantId: AzureEnv_1.tenantId,
|
|
133
133
|
});
|
|
@@ -147,16 +147,16 @@ sku = {
|
|
|
147
147
|
firewallRuleName: `${name}-firewall-allowpublic`,
|
|
148
148
|
serverName: mySql.name,
|
|
149
149
|
...group,
|
|
150
|
-
startIpAddress:
|
|
151
|
-
endIpAddress:
|
|
150
|
+
startIpAddress: '0.0.0.0',
|
|
151
|
+
endIpAddress: '255.255.255.255',
|
|
152
152
|
});
|
|
153
153
|
if (network.privateLink) {
|
|
154
154
|
(0, PrivateEndpoint_1.default)({
|
|
155
|
-
resourceInfo: {
|
|
156
|
-
privateDnsZoneName:
|
|
155
|
+
resourceInfo: { name, group, id: mySql.id },
|
|
156
|
+
privateDnsZoneName: 'mysql.database.azure.com',
|
|
157
157
|
linkServiceGroupIds: network.privateLink.type
|
|
158
158
|
? [network.privateLink.type]
|
|
159
|
-
: [
|
|
159
|
+
: ['mysql'],
|
|
160
160
|
subnetIds: network.privateLink.subnetIds,
|
|
161
161
|
});
|
|
162
162
|
}
|
|
@@ -184,4 +184,4 @@ sku = {
|
|
|
184
184
|
}
|
|
185
185
|
return mySql;
|
|
186
186
|
};
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
187
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvTXlTcWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDREQUE4QztBQUU5QyxzQ0FBeUM7QUFDekMsdURBQXlDO0FBQ3pDLDRFQUE4RDtBQUM5RCwyQ0FBZ0Q7QUFFaEQsMkRBQTJEO0FBQzNELGlEQUFxRDtBQUNyRCx5Q0FBaUQ7QUFFakQsK0NBQTREO0FBQzVELHdGQUFnRTtBQUNoRSwyQ0FBOEM7QUFDOUMsMkNBQWtEO0FBQ2xELDhFQUFzRDtBQW1CdEQsa0JBQWUsQ0FBQyxFQUNkLElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLGdCQUFnQixFQUNoQixPQUFPLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQyxvQkFBb0IsRUFDdkQsYUFBYSxHQUFHLEVBQUU7QUFDbEI7O0dBRUc7QUFDSCxHQUFHLEdBQUc7SUFDSixJQUFJLEVBQUUsZUFBZTtJQUNyQixJQUFJLEVBQUUsV0FBVztDQUNsQixFQUNELE9BQU8sRUFDUCxTQUFTLEVBQ1QsU0FBUyxFQUNULFNBQVMsR0FDRSxFQUFFLEVBQUU7SUFDZixJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxVQUFVO1FBQ2hCLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7WUFDckIsT0FBTyxFQUFFLEtBQUs7WUFDZCxNQUFNLEVBQUUsQ0FBQztZQUNULEtBQUssRUFBRSxJQUFJO1lBQ1gsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXRDLE1BQU0sUUFBUSxHQUNaLElBQUksRUFBRSxRQUFRO1FBQ2QsSUFBQSx1QkFBYyxFQUFDO1lBQ2Is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
|
package/Postgresql/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from
|
|
2
|
-
import * as pulumi from
|
|
3
|
-
import * as azure from
|
|
4
|
-
import * as inputs from
|
|
1
|
+
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from '../types';
|
|
2
|
+
import * as pulumi from '@pulumi/pulumi';
|
|
3
|
+
import * as azure from '@pulumi/azure-native';
|
|
4
|
+
import * as inputs from '@pulumi/azure-native/types/input';
|
|
5
5
|
export interface PostgresProps extends BasicResourceArgs {
|
|
6
6
|
sku?: pulumi.Input<inputs.dbforpostgresql.SkuArgs>;
|
|
7
7
|
vaultInfo?: KeyVaultInfo;
|
package/Postgresql/index.js
CHANGED
|
@@ -26,7 +26,7 @@ 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
|
-
const
|
|
29
|
+
const Common_1 = require("../Common");
|
|
30
30
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
31
31
|
const azure = __importStar(require("@pulumi/azure-native"));
|
|
32
32
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
@@ -43,10 +43,10 @@ version = azure.dbforpostgresql.ServerVersion.ServerVersion_14, storageSizeGB =
|
|
|
43
43
|
[Standard_B1ms, Standard_B1s, Standard_B2ms, Standard_B2s, Standard_B4ms, Standard_B8ms, Standard_D16s_v3, Standard_D2s_v3, Standard_D32s_v3, Standard_D4s_v3, Standard_D64s_v3, Standard_D8s_v3, Standard_E16s_v3, Standard_E2s_v3, Standard_E32s_v3, Standard_E4s_v3, Standard_E64s_v3, Standard_E8s_v3, Standard_M128ms, Standard_M128s, Standard_M64ms, Standard_M64s, Standard_E48s_v3, Standard_D2ds_v4, Standard_D4ds_v4, Standard_D8ds_v4, Standard_D16ds_v4, Standard_D32ds_v4, Standard_D48ds_v4, Standard_D64ds_v4, Standard_E2ds_v4, Standard_E4ds_v4, Standard_E8ds_v4, Standard_E16ds_v4, Standard_E32ds_v4, Standard_E48ds_v4, Standard_E64ds_v4, Standard_D48s_v3, Standard_E20ds_v4, Standard_M8ms, Standard_M16ms, Standard_M32ts, Standard_M32ls, Standard_M32ms, Standard_M64ls, Standard_M64, Standard_M64m, Standard_M128, Standard_M128m, Standard_B12ms, Standard_B16ms, Standard_B20ms, Standard_D2ads_v5, Standard_D4ads_v5, Standard_D8ads_v5, Standard_D16ads_v5, Standard_D32ads_v5, Standard_D48ads_v5, Standard_D64ads_v5, Standard_D96ads_v5, Standard_E2ads_v5, Standard_E4ads_v5, Standard_E8ads_v5, Standard_E16ads_v5, Standard_E20ads_v5, Standard_E32ads_v5, Standard_E48ads_v5, Standard_E64ads_v5, Standard_E96ads_v5, Standard_D2_v5, Standard_D4_v5, Standard_D8_v5, Standard_D16_v5, Standard_D32_v5, Standard_D48_v5, Standard_D64_v5, Standard_D96_v5, Standard_D2ds_v5, Standard_D4ds_v5, Standard_D8ds_v5, Standard_D16ds_v5, Standard_D32ds_v5, Standard_D48ds_v5, Standard_D64ds_v5, Standard_D96ds_v5, Standard_E2ds_v5, Standard_E4ds_v5, Standard_E8ds_v5, Standard_E16ds_v5, Standard_E20ds_v5, Standard_E32ds_v5, Standard_E48ds_v5, Standard_E64ds_v5, Standard_E96ds_v5, Standard_E104ids_v5, Standard_E2bds_v5, Standard_E4bds_v5, Standard_E8bds_v5, Standard_E16bds_v5, Standard_E32bds_v5, Standard_E48bds_v5, Standard_E64bds_v5, Standard_E112iads_v5, Standard_M32dms_v2, Standard_M64ds_v2, Standard_M64dms_v2, Standard_M128ds_v2, Standard_M128dms_v2, Standard_M192ids_v2, Standard_M192idms_v2]
|
|
44
44
|
*/
|
|
45
45
|
sku = {
|
|
46
|
-
name:
|
|
47
|
-
tier:
|
|
46
|
+
name: 'Standard_B1ms',
|
|
47
|
+
tier: 'Burstable',
|
|
48
48
|
}, network, databases, vaultInfo, dependsOn, lock = true, }) => {
|
|
49
|
-
name = (0,
|
|
49
|
+
name = (0, Common_1.getPostgresqlName)(name);
|
|
50
50
|
const username = new random_1.RandomString(name, {
|
|
51
51
|
special: false,
|
|
52
52
|
length: 5,
|
|
@@ -64,31 +64,31 @@ sku = {
|
|
|
64
64
|
version,
|
|
65
65
|
storage: { storageSizeGB },
|
|
66
66
|
authConfig: {
|
|
67
|
-
passwordAuth:
|
|
68
|
-
activeDirectoryAuth:
|
|
67
|
+
passwordAuth: 'Enabled',
|
|
68
|
+
activeDirectoryAuth: 'Enabled',
|
|
69
69
|
tenantId: AzureEnv_1.tenantId,
|
|
70
70
|
},
|
|
71
71
|
administratorLogin: username,
|
|
72
72
|
administratorLoginPassword: password,
|
|
73
|
-
dataEncryption: { type:
|
|
73
|
+
dataEncryption: { type: 'SystemManaged' },
|
|
74
74
|
//maintenanceWindow: { dayOfWeek: 6 },
|
|
75
75
|
sku,
|
|
76
76
|
//network: {},
|
|
77
77
|
backup: {
|
|
78
|
-
geoRedundantBackup: AzureEnv_1.isPrd ?
|
|
78
|
+
geoRedundantBackup: AzureEnv_1.isPrd ? 'Enabled' : 'Disabled',
|
|
79
79
|
backupRetentionDays: 7,
|
|
80
80
|
},
|
|
81
|
-
highAvailability: { mode: AzureEnv_1.isPrd ?
|
|
82
|
-
availabilityZone: AzureEnv_1.isPrd ?
|
|
81
|
+
highAvailability: { mode: AzureEnv_1.isPrd ? 'ZoneRedundant' : 'Disabled' },
|
|
82
|
+
availabilityZone: AzureEnv_1.isPrd ? '3' : '1',
|
|
83
83
|
}, {
|
|
84
84
|
dependsOn,
|
|
85
85
|
protect: lock,
|
|
86
86
|
ignoreChanges: [
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
87
|
+
'serverName',
|
|
88
|
+
'highAvailability',
|
|
89
|
+
'availabilityZone',
|
|
90
|
+
'administratorLogin',
|
|
91
|
+
'dataEncryption',
|
|
92
92
|
],
|
|
93
93
|
});
|
|
94
94
|
if (lock) {
|
|
@@ -109,16 +109,16 @@ sku = {
|
|
|
109
109
|
firewallRuleName: `${name}-firewall-allowpublic`,
|
|
110
110
|
serverName: postgres.name,
|
|
111
111
|
...group,
|
|
112
|
-
startIpAddress:
|
|
113
|
-
endIpAddress:
|
|
112
|
+
startIpAddress: '0.0.0.0',
|
|
113
|
+
endIpAddress: '255.255.255.255',
|
|
114
114
|
});
|
|
115
115
|
if (network.privateLink) {
|
|
116
116
|
(0, PrivateEndpoint_1.default)({
|
|
117
|
-
resourceInfo: {
|
|
118
|
-
privateDnsZoneName:
|
|
117
|
+
resourceInfo: { name, group, id: postgres.id },
|
|
118
|
+
privateDnsZoneName: 'postgres.database.azure.com',
|
|
119
119
|
linkServiceGroupIds: network.privateLink.type
|
|
120
120
|
? [network.privateLink.type]
|
|
121
|
-
: [
|
|
121
|
+
: ['postgresql'],
|
|
122
122
|
subnetIds: network.privateLink.subnetIds,
|
|
123
123
|
});
|
|
124
124
|
}
|
|
@@ -146,4 +146,4 @@ sku = {
|
|
|
146
146
|
}
|
|
147
147
|
return postgres;
|
|
148
148
|
};
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUG9zdGdyZXNxbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0Esc0NBQThDO0FBQzlDLHVEQUF5QztBQUN6Qyw0REFBOEM7QUFDOUMsaURBQXFEO0FBQ3JELDJDQUFnRDtBQUVoRCwyREFBMkQ7QUFDM0QsMkNBQThDO0FBQzlDLDJDQUFrRDtBQUNsRCw4RUFBc0Q7QUFDdEQsNERBQW9DO0FBa0JwQyxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUs7QUFDTCxPQUFPO0FBQ1AsT0FBTyxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLGdCQUFnQixFQUM5RCxhQUFhLEdBQUcsR0FBRztBQUNuQjs7R0FFRztBQUNILEdBQUcsR0FBRztJQUNKLElBQUksRUFBRSxlQUFlO0lBQ3JCLElBQUksRUFBRSxXQUFXO0NBQ2xCLEVBQ0QsT0FBTyxFQUNQLFNBQVMsRUFDVCxTQUFTLEVBQ1QsU0FBUyxFQUNULElBQUksR0FBRyxJQUFJLEdBQ0csRUFBRSxFQUFFO0lBQ2xCLElBQUksR0FBRyxJQUFBLDBCQUFpQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9CLE1BQU0sUUFBUSxHQUFHLElBQUkscUJBQVksQ0FBQyxJQUFJLEVBQUU7UUFDdEMsT0FBTyxFQUFFLEtBQUs7UUFDZCxNQUFNLEVBQUUsQ0FBQztRQUNULEtBQUssRUFBRSxJQUFJO1FBQ1gsS0FBSyxFQUFFLEtBQUs7S0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sUUFBUSxHQUFHLElBQUEsdUJBQWMsRUFBQztRQUM5QixJQUFJO1FBQ0osTUFBTSxFQUFFLEVBQUU7UUFDVixPQUFPLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFO0tBQzVCLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFFVixNQUFNLFFBQVEsR0FBRyxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUMvQyxJQUFJLEVBQ0o7UUFDRSxVQUFVLEVBQUUsSUFBSTtRQUNoQixHQUFHLEtBQUs7UUFDUixPQUFPO1FBQ1AsT0FBTyxFQUFFLEVBQUUsYUFBYSxFQUFFO1FBRTFCLFVBQVUsRUFBRTtZQUNWLFlBQVksRUFBRSxTQUFTO1lBQ3ZCLG1CQUFtQixFQUFFLFNBQVM7WUFDOUIsUUFBUSxFQUFSLG1CQUFRO1NBQ1Q7UUFDRCxrQkFBa0IsRUFBRSxRQUFRO1FBQzVCLDBCQUEwQixFQUFFLFFBQVE7UUFDcEMsY0FBYyxFQUFFLEVBQUUsSUFBSSxFQUFFLGVBQWUsRUFBRTtRQUN6QyxzQ0FBc0M7UUFDdEMsR0FBRztRQUNILGNBQWM7UUFDZCxNQUFNLEVBQUU7WUFDTixrQkFBa0IsRUFBRSxnQkFBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLFVBQVU7WUFDbEQsbUJBQW1CLEVBQUUsQ0FBQztTQUN2QjtRQUNELGdCQUFnQixFQUFFLEVBQUUsSUFBSSxFQUFFLGdCQUFLLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsVUFBVSxFQUFFO1FBQ2hFLGdCQUFnQixFQUFFLGdCQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRztLQUNwQyxFQUNEO1FBQ0UsU0FBUztRQUNULE9BQU8sRUFBRSxJQUFJO1FBQ2IsYUFBYSxFQUFFO1lBQ2IsWUFBWTtZQUNaLGtCQUFrQjtZQUNsQixrQkFBa0I7WUFDbEIsb0JBQW9CO1lBQ3BCLGdCQUFnQjtTQUNqQjtLQUNGLENBQ0YsQ0FBQztJQUVGLElBQUksSUFBSSxFQUFFLENBQUM7UUFDVCxJQUFBLGdCQUFNLEVBQUMsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDdkMsQ0FBQztJQUVELElBQUksT0FBTyxFQUFFLENBQUM7UUFDWixJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUMvQyxJQUFBLHlCQUFnQixFQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FDdkIsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FDUCxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsWUFBWSxDQUFDLEdBQUcsSUFBSSxhQUFhLENBQUMsRUFBRSxFQUFFO2dCQUM5RCxnQkFBZ0IsRUFBRSxHQUFHLElBQUksYUFBYSxDQUFDLEVBQUU7Z0JBQ3pDLFVBQVUsRUFBRSxRQUFRLENBQUMsSUFBSTtnQkFDekIsR0FBRyxLQUFLO2dCQUNSLGNBQWMsRUFBRSxDQUFDLENBQUMsS0FBSztnQkFDdkIsWUFBWSxFQUFFLENBQUMsQ0FBQyxHQUFHO2FBQ3BCLENBQUMsQ0FDTCxDQUNGLENBQUM7UUFDSixDQUFDO1FBRUQsSUFBSSxPQUFPLENBQUMsa0JBQWtCO1lBQzVCLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxZQUFZLENBQUMsR0FBRyxJQUFJLHVCQUF1QixFQUFFO2dCQUNyRSxnQkFBZ0IsRUFBRSxHQUFHLElBQUksdUJBQXVCO2dCQUNoRCxVQUFVLEVBQUUsUUFBUSxDQUFDLElBQUk7Z0JBQ3pCLEdBQUcsS0FBSztnQkFDUixjQUFjLEVBQUUsU0FBUztnQkFDekIsWUFBWSxFQUFFLGlCQUFpQjthQUNoQyxDQUFDLENBQUM7UUFFTCxJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUN4QixJQUFBLHlCQUFlLEVBQUM7Z0JBQ2QsWUFBWSxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsUUFBUSxDQUFDLEVBQUUsRUFBRTtnQkFDOUMsa0JBQWtCLEVBQUUsNkJBQTZCO2dCQUNqRCxtQkFBbUIsRUFBRSxPQUFPLENBQUMsV0FBVyxDQUFDLElBQUk7b0JBQzNDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO29CQUM1QixDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUM7Z0JBQ2xCLFNBQVMsRUFBRSxPQUFPLENBQUMsV0FBVyxDQUFDLFNBQVM7YUFDekMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztJQUNILENBQUM7SUFFRCxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsSUFBQSw4QkFBZSxFQUFDO1lBQ2QsSUFBSSxFQUFFLEdBQUcsSUFBSSxRQUFRO1lBQ3JCLEtBQUssRUFBRSxRQUFRO1lBQ2YsU0FBUztZQUNULFdBQVcsRUFBRSxJQUFJO1NBQ2xCLENBQUMsQ0FBQztRQUNILElBQUEsOEJBQWUsRUFBQztZQUNkLElBQUksRUFBRSxHQUFHLElBQUksT0FBTztZQUNwQixLQUFLLEVBQUUsUUFBUTtZQUNmLFNBQVM7WUFDVCxXQUFXLEVBQUUsSUFBSTtTQUNsQixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLFNBQVMsQ0FBQyxHQUFHLENBQ1gsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUNKLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxRQUFRLENBQ2hDLEdBQUcsSUFBSSxJQUFJLENBQUMsRUFBRSxFQUNkO1lBQ0UsVUFBVSxFQUFFLFFBQVEsQ0FBQyxJQUFJO1lBQ3pCLFlBQVksRUFBRSxDQUFDO1lBQ2YsR0FBRyxLQUFLO1NBQ1QsRUFDRCxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUN2QyxDQUNKLENBQUM7SUFDSixDQUFDO0lBRUQsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQyxDQUFDIn0=
|
package/RedisCache/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as cache from
|
|
2
|
-
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from
|
|
1
|
+
import * as cache from '@pulumi/azure-native/cache';
|
|
2
|
+
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from '../types';
|
|
3
3
|
interface Props extends BasicResourceArgs {
|
|
4
4
|
vaultInfo?: KeyVaultInfo;
|
|
5
5
|
network?: NetworkPropsType;
|