@drunk-pulumi/azure 1.0.3 → 1.0.4
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.js +4 -3
- package/Aks/Identity.js +3 -3
- package/Aks/index.d.ts +8 -7
- package/Aks/index.js +73 -57
- package/Automation/index.d.ts +1 -1
- package/Automation/index.js +5 -5
- package/AzAd/EnvRoles.Consts.d.ts +11 -7
- package/AzAd/EnvRoles.Consts.js +43 -50
- package/AzAd/EnvRoles.d.ts +3 -3
- package/AzAd/EnvRoles.js +10 -10
- package/AzAd/Group.d.ts +2 -2
- package/AzAd/Group.js +12 -12
- package/AzAd/Identities/AzDevOpsIdentity.d.ts +1 -1
- package/AzAd/Identities/AzDevOpsIdentity.js +9 -6
- package/AzAd/Identities/AzDevOpsManagedIdentity.d.ts +2 -2
- package/AzAd/Identities/AzDevOpsManagedIdentity.js +6 -3
- package/AzAd/RoleAssignment.d.ts +3 -3
- package/AzAd/RoleAssignment.js +3 -3
- package/AzAd/RoleDefinitions/JustInTimeRequestRole.js +10 -10
- package/Builder/AksBuilder.js +15 -1
- package/Builder/PrivateDnsZoneBuilder.d.ts +2 -1
- package/Builder/PrivateDnsZoneBuilder.js +41 -23
- package/Builder/ResourceBuilder.js +12 -6
- package/Builder/SqlBuilder.js +7 -1
- package/Builder/StorageBuilder.js +14 -14
- package/Builder/VaultBuilder.d.ts +2 -1
- package/Builder/VaultBuilder.js +8 -1
- package/Builder/types/resourceBuilder.d.ts +2 -0
- package/Builder/types/sqlBuilder.d.ts +2 -1
- package/Builder/types/storageBuilder.d.ts +10 -8
- package/Builder/types/vaultBuilder.d.ts +6 -1
- package/Cdn/CdnEndpoint.d.ts +2 -3
- package/Cdn/CdnEndpoint.js +15 -17
- package/Cdn/CdnRules.d.ts +6 -2
- package/Cdn/CdnRules.js +51 -56
- package/Certificate/index.d.ts +2 -2
- package/Certificate/index.js +29 -29
- package/Common/AzureEnv.d.ts +2 -3
- package/Common/AzureEnv.js +21 -8
- package/Common/Naming/index.d.ts +1 -1
- package/Common/Naming/index.js +65 -61
- package/Common/index.d.ts +11 -6
- package/Common/index.js +6 -1
- package/ContainerRegistry/index.d.ts +5 -5
- package/ContainerRegistry/index.js +75 -50
- package/Core/KeyGenerators.d.ts +5 -5
- package/Core/KeyGenerators.js +5 -5
- package/CustomRoles/index.js +3 -3
- package/KeyVault/CustomHelper.d.ts +4 -4
- package/KeyVault/CustomHelper.js +7 -7
- package/KeyVault/Helper.js +12 -9
- package/Logs/Helpers.d.ts +1 -1
- package/RedisCache/index.d.ts +2 -2
- package/RedisCache/index.js +10 -5
- package/SignalR/index.d.ts +4 -4
- package/SignalR/index.js +26 -21
- package/Sql/SqlDb.js +2 -3
- package/Sql/index.d.ts +3 -4
- package/Sql/index.js +11 -11
- package/Storage/Helper.d.ts +1 -1
- package/Storage/index.d.ts +2 -3
- package/Storage/index.js +2 -2
- package/VNet/FirewallPolicies/AksFirewallPolicy.d.ts +2 -2
- package/VNet/FirewallPolicies/AksFirewallPolicy.js +107 -117
- package/VNet/FirewallPolicies/CloudPCFirewallPolicy.d.ts +4 -3
- package/VNet/FirewallPolicies/CloudPCFirewallPolicy.js +150 -132
- package/VNet/Helper.d.ts +1 -0
- package/VNet/Helper.js +25 -19
- package/VNet/index.d.ts +9 -9
- package/VNet/index.js +58 -49
- package/VNet/types.d.ts +9 -6
- package/package.json +6 -6
package/KeyVault/CustomHelper.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addCustomSecrets = exports.addCustomSecret = exports.addVaultSecretFrom = void 0;
|
|
4
4
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
5
|
-
const
|
|
5
|
+
const Common_1 = require("../Common");
|
|
6
6
|
const VaultSecret_1 = require("@drunk-pulumi/azure-providers/VaultSecret");
|
|
7
7
|
const ConfigHelper_1 = require("../Common/ConfigHelper");
|
|
8
8
|
const Helpers_1 = require("../Common/Helpers");
|
|
@@ -16,17 +16,17 @@ const addVaultSecretFrom = ({ name, value, vaultInfo }) => {
|
|
|
16
16
|
name,
|
|
17
17
|
value,
|
|
18
18
|
vaultInfo,
|
|
19
|
-
contentType:
|
|
19
|
+
contentType: 'config variables',
|
|
20
20
|
});
|
|
21
21
|
};
|
|
22
22
|
exports.addVaultSecretFrom = addVaultSecretFrom;
|
|
23
23
|
/** Add a secret to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
|
|
24
24
|
const addCustomSecret = ({ name, formattedName, vaultInfo, value, contentType, dependsOn, ...others }) => {
|
|
25
|
-
const n = formattedName ? name : (0,
|
|
25
|
+
const n = formattedName ? name : (0, Common_1.getSecretName)(name);
|
|
26
26
|
//This KeyVault Secret is not auto recovery the deleted one.
|
|
27
|
-
return new VaultSecret_1.VaultSecretResource((0, Helpers_1.replaceAll)(name,
|
|
28
|
-
name: (0, Helpers_1.replaceAll)(n,
|
|
29
|
-
value: value ? (0, pulumi_1.output)(value).apply((v) => v ||
|
|
27
|
+
return new VaultSecret_1.VaultSecretResource((0, Helpers_1.replaceAll)(name, '.', '-'), {
|
|
28
|
+
name: (0, Helpers_1.replaceAll)(n, '.', '-'),
|
|
29
|
+
value: value ? (0, pulumi_1.output)(value).apply((v) => v || '') : '',
|
|
30
30
|
vaultName: vaultInfo.name,
|
|
31
31
|
contentType: contentType || name,
|
|
32
32
|
...others,
|
|
@@ -36,4 +36,4 @@ exports.addCustomSecret = addCustomSecret;
|
|
|
36
36
|
/** Add multi secrets to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
|
|
37
37
|
const addCustomSecrets = ({ items, ...others }) => items.map((i) => (0, exports.addCustomSecret)({ ...i, ...others }));
|
|
38
38
|
exports.addCustomSecrets = addCustomSecrets;
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0N1c3RvbUhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwyQ0FBeUQ7QUFDekQsc0NBQTBDO0FBQzFDLDJFQUFnRjtBQUVoRix5REFBbUQ7QUFDbkQsK0NBQStDO0FBUy9DLDRFQUE0RTtBQUNyRSxNQUFNLGtCQUFrQixHQUFHLENBQUMsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBUyxFQUFFLEVBQUU7SUFDdEUsSUFBSSxDQUFDLEtBQUs7UUFBRSxLQUFLLEdBQUcsSUFBQSx3QkFBUyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLElBQUksQ0FBQyxLQUFLO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxtQkFBbUIsQ0FBQyxDQUFDO0lBRXRFLE9BQU8sSUFBQSx1QkFBZSxFQUFDO1FBQ3JCLElBQUk7UUFDSixLQUFLO1FBQ0wsU0FBUztRQUNULFdBQVcsRUFBRSxrQkFBa0I7S0FDaEMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBVlcsUUFBQSxrQkFBa0Isc0JBVTdCO0FBZ0JGLGlIQUFpSDtBQUMxRyxNQUFNLGVBQWUsR0FBRyxDQUFDLEVBQzlCLElBQUksRUFDSixhQUFhLEVBQ2IsU0FBUyxFQUNULEtBQUssRUFDTCxXQUFXLEVBQ1gsU0FBUyxFQUNULEdBQUcsTUFBTSxFQUNHLEVBQUUsRUFBRTtJQUNoQixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxzQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELDREQUE0RDtJQUM1RCxPQUFPLElBQUksaUNBQW1CLENBQzVCLElBQUEsb0JBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUMxQjtRQUNFLElBQUksRUFBRSxJQUFBLG9CQUFVLEVBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUM7UUFDN0IsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBQSxlQUFNLEVBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDdkQsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJO1FBQ3pCLFdBQVcsRUFBRSxXQUFXLElBQUksSUFBSTtRQUNoQyxHQUFHLE1BQU07S0FDVixFQUNELEVBQUUsU0FBUyxFQUFFLENBQ2QsQ0FBQztBQUNKLENBQUMsQ0FBQztBQXRCVyxRQUFBLGVBQWUsbUJBc0IxQjtBQU1GLHNIQUFzSDtBQUMvRyxNQUFNLGdCQUFnQixHQUFHLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLEVBQW9CLEVBQUUsRUFBRSxDQUN6RSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFBLHVCQUFlLEVBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztBQUQ1QyxRQUFBLGdCQUFnQixvQkFDNEIifQ==
|
package/KeyVault/Helper.js
CHANGED
|
@@ -22,15 +22,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
25
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
29
|
exports.parseKeyUrl = exports.getSecret = exports.getEncryptionKeyOutput = exports.getKey = exports.addKey = void 0;
|
|
27
30
|
const keyvault = __importStar(require("@pulumi/azure-native/keyvault"));
|
|
28
31
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
29
|
-
const
|
|
32
|
+
const Common_1 = require("../Common");
|
|
30
33
|
const Helpers_1 = require("../Common/Helpers");
|
|
31
|
-
const KeyVaultBase_1 = require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase");
|
|
34
|
+
const KeyVaultBase_1 = __importDefault(require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase"));
|
|
32
35
|
const addKey = ({ name, vaultInfo, tags, dependsOn, }) => {
|
|
33
|
-
const n = (0,
|
|
36
|
+
const n = (0, Common_1.getSecretName)(name);
|
|
34
37
|
return new keyvault.Key((0, Helpers_1.replaceAll)(name, '.', '-'), {
|
|
35
38
|
keyName: n,
|
|
36
39
|
vaultName: vaultInfo.name,
|
|
@@ -56,15 +59,15 @@ const addKey = ({ name, vaultInfo, tags, dependsOn, }) => {
|
|
|
56
59
|
exports.addKey = addKey;
|
|
57
60
|
/** Get Key */
|
|
58
61
|
const getKey = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
59
|
-
const n = nameFormatted ? name : (0,
|
|
60
|
-
const client = (0, KeyVaultBase_1.
|
|
62
|
+
const n = nameFormatted ? name : (0, Common_1.getSecretName)(name);
|
|
63
|
+
const client = (0, KeyVaultBase_1.default)(vaultInfo.name);
|
|
61
64
|
return client.getKey(n, version);
|
|
62
65
|
};
|
|
63
66
|
exports.getKey = getKey;
|
|
64
67
|
/** Get or create encryption Key */
|
|
65
68
|
const getEncryptionKey = async (name, vaultInfo) => {
|
|
66
69
|
const n = `${name}-encrypt-key`;
|
|
67
|
-
const key = await (0, KeyVaultBase_1.
|
|
70
|
+
const key = await (0, KeyVaultBase_1.default)(vaultInfo.name).getOrCreateKey(n);
|
|
68
71
|
return {
|
|
69
72
|
keyName: key.properties.name,
|
|
70
73
|
keyVaultUri: key.properties.vaultUrl,
|
|
@@ -80,8 +83,8 @@ const getEncryptionKeyOutput = (name, vaultInfo) => {
|
|
|
80
83
|
exports.getEncryptionKeyOutput = getEncryptionKeyOutput;
|
|
81
84
|
/** Get Secret */
|
|
82
85
|
const getSecret = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
83
|
-
const n = nameFormatted ? name : (0,
|
|
84
|
-
const client = (0, KeyVaultBase_1.
|
|
86
|
+
const n = nameFormatted ? name : (0, Common_1.getSecretName)(name);
|
|
87
|
+
const client = (0, KeyVaultBase_1.default)(vaultInfo.name);
|
|
85
88
|
return client.getSecret(n, version);
|
|
86
89
|
};
|
|
87
90
|
exports.getSecret = getSecret;
|
|
@@ -96,4 +99,4 @@ const parseKeyUrl = (keyUrl) => {
|
|
|
96
99
|
};
|
|
97
100
|
};
|
|
98
101
|
exports.parseKeyUrl = parseKeyUrl;
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHdFQUEwRDtBQUMxRCwyQ0FBaUU7QUFFakUsc0NBQTBDO0FBQzFDLCtDQUErQztBQUMvQyxxR0FBZ0Y7QUF3QnpFLE1BQU0sTUFBTSxHQUFHLENBQUMsRUFDckIsSUFBSSxFQUNKLFNBQVMsRUFDVCxJQUFJLEVBQ0osU0FBUyxHQUNrQyxFQUFFLEVBQUU7SUFDL0MsTUFBTSxDQUFDLEdBQUcsSUFBQSxzQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTlCLE9BQU8sSUFBSSxRQUFRLENBQUMsR0FBRyxDQUNyQixJQUFBLG9CQUFVLEVBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFDMUI7UUFDRSxPQUFPLEVBQUUsQ0FBQztRQUNWLFNBQVMsRUFBRSxTQUFTLENBQUMsSUFBSTtRQUN6QixHQUFHLFNBQVMsQ0FBQyxLQUFLO1FBQ2xCLHNHQUFzRztRQUN0RyxVQUFVLEVBQUU7WUFDVixPQUFPLEVBQUUsSUFBSTtZQUNiLEdBQUcsRUFBRSxLQUFLO1lBQ1YsTUFBTSxFQUFFO2dCQUNOLFNBQVM7Z0JBQ1QsU0FBUztnQkFDVCxNQUFNO2dCQUNOLFFBQVE7Z0JBQ1IsU0FBUztnQkFDVCxXQUFXO2FBQ1o7WUFDRCxvQkFBb0I7WUFDcEIsVUFBVSxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRTtTQUM5QjtRQUNELElBQUk7S0FDTCxFQUNELEVBQUUsU0FBUyxFQUFFLENBQ2QsQ0FBQztBQUNKLENBQUMsQ0FBQztBQWpDVyxRQUFBLE1BQU0sVUFpQ2pCO0FBRUYsY0FBYztBQUNQLE1BQU0sTUFBTSxHQUFHLEtBQUssRUFBRSxFQUMzQixJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBQ0ssRUFBRSxFQUFF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
|
package/Logs/Helpers.d.ts
CHANGED
|
@@ -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
|
|
22
|
+
info: import("../Common").ParsedResourceInfo | undefined;
|
|
23
23
|
secrets: {
|
|
24
24
|
wpId: string | undefined;
|
|
25
25
|
primaryKey: string | undefined;
|
package/RedisCache/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as cache from '@pulumi/azure-native/cache';
|
|
2
|
-
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType } from '../types';
|
|
2
|
+
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceInfoWithInstance } from '../types';
|
|
3
3
|
interface Props extends BasicResourceArgs {
|
|
4
4
|
vaultInfo?: KeyVaultInfo;
|
|
5
5
|
network?: NetworkPropsType;
|
|
@@ -9,5 +9,5 @@ interface Props extends BasicResourceArgs {
|
|
|
9
9
|
capacity: number;
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
-
declare const _default: ({ name, group, network, vaultInfo, sku, }: Props) =>
|
|
12
|
+
declare const _default: ({ name, group, network, vaultInfo, sku, dependsOn, ignoreChanges, importUri, }: Props) => ResourceInfoWithInstance<cache.Redis>;
|
|
13
13
|
export default _default;
|
package/RedisCache/index.js
CHANGED
|
@@ -35,7 +35,7 @@ const AzureEnv_1 = require("../Common/AzureEnv");
|
|
|
35
35
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
36
36
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
37
37
|
const toWord = new to_words_1.ToWords();
|
|
38
|
-
exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', family: 'C', capacity: 0 }, }) => {
|
|
38
|
+
exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', family: 'C', capacity: 0 }, dependsOn, ignoreChanges, importUri, }) => {
|
|
39
39
|
name = (0, Common_1.getRedisCacheName)(name);
|
|
40
40
|
const redis = new cache.Redis(name, {
|
|
41
41
|
name,
|
|
@@ -47,7 +47,7 @@ exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', fam
|
|
|
47
47
|
zones: AzureEnv_1.isPrd && sku.name === 'Premium' ? ['1', '2', '3'] : undefined,
|
|
48
48
|
subnetId: network?.subnetId,
|
|
49
49
|
publicNetworkAccess: network?.privateLink ? 'Disabled' : 'Enabled',
|
|
50
|
-
});
|
|
50
|
+
}, { dependsOn, import: importUri, ignoreChanges });
|
|
51
51
|
//Whitelist IpAddress
|
|
52
52
|
if (network?.ipAddresses) {
|
|
53
53
|
pulumi.output(network.ipAddresses).apply((ips) => {
|
|
@@ -66,9 +66,9 @@ exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', fam
|
|
|
66
66
|
//Private Link
|
|
67
67
|
if (network?.privateLink) {
|
|
68
68
|
(0, PrivateEndpoint_1.default)({
|
|
69
|
+
...network.privateLink,
|
|
69
70
|
resourceInfo: { name, group, id: redis.id },
|
|
70
71
|
privateDnsZoneName: 'privatelink.redis.cache.windows.net',
|
|
71
|
-
subnetIds: network.privateLink.subnetIds,
|
|
72
72
|
linkServiceGroupIds: network.privateLink.type
|
|
73
73
|
? [network.privateLink.type]
|
|
74
74
|
: ['redisCache'],
|
|
@@ -108,6 +108,11 @@ exports.default = ({ name, group, network, vaultInfo, sku = { name: 'Basic', fam
|
|
|
108
108
|
});
|
|
109
109
|
});
|
|
110
110
|
}
|
|
111
|
-
return
|
|
111
|
+
return {
|
|
112
|
+
name,
|
|
113
|
+
group,
|
|
114
|
+
id: redis.id,
|
|
115
|
+
instance: redis,
|
|
116
|
+
};
|
|
112
117
|
};
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVkaXNDYWNoZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0VBQW9EO0FBQ3BELHVEQUF5QztBQVN6Qyx1Q0FBbUM7QUFDbkMsMkNBQWtEO0FBQ2xELHNDQUE4QztBQUM5QyxpREFBMkM7QUFDM0MsMkRBQTJEO0FBQzNELDhFQUE2RDtBQUU3RCxNQUFNLE1BQU0sR0FBRyxJQUFJLGtCQUFPLEVBQUUsQ0FBQztBQVk3QixrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxPQUFPLEVBQ1AsU0FBUyxFQUNULEdBQUcsR0FBRyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFFLEVBQ2pELFNBQVMsRUFDVCxhQUFhLEVBQ2IsU0FBUyxHQUNILEVBQXlDLEVBQUU7SUFDakQsSUFBSSxHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0IsTUFBTSxLQUFLLEdBQUcsSUFBSSxLQUFLLENBQUMsS0FBSyxDQUMzQixJQUFJLEVBQ0o7UUFDRSxJQUFJO1FBQ0osR0FBRyxLQUFLO1FBQ1IsaUJBQWlCLEVBQUUsS0FBSztRQUN4QixnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsMEJBQTBCLENBQUMsY0FBYyxFQUFFO1FBQ25FLEdBQUc7UUFDSCxLQUFLLEVBQUUsZ0JBQUssSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTO1FBQ3BFLFFBQVEsRUFBRSxPQUFPLEVBQUUsUUFBUTtRQUMzQixtQkFBbUIsRUFBRSxPQUFPLEVBQUUs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
|
package/SignalR/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as
|
|
1
|
+
import * as ss from '@pulumi/azure-native/signalrservice';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
|
-
import { BasicResourceArgs, KeyVaultInfo, PrivateLinkPropsType } from '../types';
|
|
3
|
+
import { BasicResourceArgs, KeyVaultInfo, PrivateLinkPropsType, ResourceInfoWithInstance } from '../types';
|
|
4
4
|
interface ResourceSkuArgs {
|
|
5
5
|
capacity?: 1 | 2 | 5 | 10 | 20 | 50 | 100;
|
|
6
6
|
name: 'Standard_S1' | 'Free_F1';
|
|
@@ -10,8 +10,8 @@ interface Props extends BasicResourceArgs {
|
|
|
10
10
|
vaultInfo?: KeyVaultInfo;
|
|
11
11
|
allowedOrigins?: pulumi.Input<pulumi.Input<string>[]>;
|
|
12
12
|
privateLink?: PrivateLinkPropsType;
|
|
13
|
-
kind?:
|
|
13
|
+
kind?: ss.ServiceKind | string;
|
|
14
14
|
sku?: pulumi.Input<ResourceSkuArgs>;
|
|
15
15
|
}
|
|
16
|
-
declare const _default: ({ name, group, vaultInfo, privateLink, kind, sku, allowedOrigins, }: Props) =>
|
|
16
|
+
declare const _default: ({ name, group, vaultInfo, privateLink, kind, sku, allowedOrigins, }: Props) => ResourceInfoWithInstance<ss.SignalR>;
|
|
17
17
|
export default _default;
|
package/SignalR/index.js
CHANGED
|
@@ -26,17 +26,22 @@ 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 ss = __importStar(require("@pulumi/azure-native/signalrservice"));
|
|
30
30
|
const Common_1 = require("../Common");
|
|
31
31
|
const PrivateEndpoint_1 = __importDefault(require("../VNet/PrivateEndpoint"));
|
|
32
32
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
33
|
-
exports.default = ({ name, group, vaultInfo, privateLink, kind =
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
33
|
+
exports.default = ({ name, group, vaultInfo, privateLink, kind = ss.ServiceKind.SignalR, sku = Common_1.isPrd
|
|
34
|
+
? {
|
|
35
|
+
name: 'Standard_S1',
|
|
36
|
+
tier: ss.SignalRSkuTier.Standard,
|
|
37
|
+
capacity: 1,
|
|
38
|
+
}
|
|
39
|
+
: {
|
|
40
|
+
name: 'Free_F1',
|
|
41
|
+
tier: 'Free',
|
|
42
|
+
}, allowedOrigins, }) => {
|
|
38
43
|
name = (0, Common_1.getSignalRName)(name);
|
|
39
|
-
const signalR = new
|
|
44
|
+
const signalR = new ss.SignalR(name, {
|
|
40
45
|
resourceName: name,
|
|
41
46
|
...group,
|
|
42
47
|
kind,
|
|
@@ -47,33 +52,33 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
47
52
|
],
|
|
48
53
|
networkACLs: privateLink
|
|
49
54
|
? {
|
|
50
|
-
defaultAction:
|
|
55
|
+
defaultAction: ss.ACLAction.Allow,
|
|
51
56
|
publicNetwork: {
|
|
52
|
-
allow: [
|
|
57
|
+
allow: [ss.SignalRRequestType.ClientConnection],
|
|
53
58
|
deny: [
|
|
54
|
-
|
|
55
|
-
|
|
59
|
+
ss.SignalRRequestType.ServerConnection,
|
|
60
|
+
ss.SignalRRequestType.RESTAPI,
|
|
56
61
|
],
|
|
57
62
|
},
|
|
58
63
|
privateEndpoints: [
|
|
59
64
|
{
|
|
60
65
|
name: (0, Common_1.getPrivateEndpointName)(name),
|
|
61
66
|
allow: [
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
native.signalrservice.SignalRRequestType.RESTAPI,
|
|
67
|
+
ss.SignalRRequestType.ClientConnection,
|
|
68
|
+
ss.SignalRRequestType.ServerConnection,
|
|
65
69
|
],
|
|
70
|
+
deny: [ss.SignalRRequestType.RESTAPI],
|
|
66
71
|
},
|
|
67
72
|
],
|
|
68
73
|
}
|
|
69
74
|
: {
|
|
70
|
-
defaultAction:
|
|
75
|
+
defaultAction: ss.ACLAction.Allow,
|
|
71
76
|
publicNetwork: {
|
|
72
77
|
allow: [
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
native.signalrservice.SignalRRequestType.RESTAPI,
|
|
78
|
+
ss.SignalRRequestType.ClientConnection,
|
|
79
|
+
ss.SignalRRequestType.ServerConnection,
|
|
76
80
|
],
|
|
81
|
+
deny: [ss.SignalRRequestType.RESTAPI],
|
|
77
82
|
},
|
|
78
83
|
},
|
|
79
84
|
sku,
|
|
@@ -91,7 +96,7 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
91
96
|
signalR.hostName.apply(async (h) => {
|
|
92
97
|
if (!h)
|
|
93
98
|
return;
|
|
94
|
-
const keys = await
|
|
99
|
+
const keys = await ss.listSignalRKeys({
|
|
95
100
|
resourceName: name,
|
|
96
101
|
resourceGroupName: group.resourceGroupName,
|
|
97
102
|
});
|
|
@@ -127,6 +132,6 @@ exports.default = ({ name, group, vaultInfo, privateLink, kind = native.signalrs
|
|
|
127
132
|
});
|
|
128
133
|
});
|
|
129
134
|
}
|
|
130
|
-
return signalR;
|
|
135
|
+
return { name, group, id: signalR.id, instance: signalR };
|
|
131
136
|
};
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
137
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2lnbmFsUi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsd0VBQTBEO0FBRTFELHNDQUEwRTtBQU8xRSw4RUFBc0Q7QUFDdEQsMkRBQTJEO0FBZ0IzRCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsV0FBVyxFQUNYLElBQUksR0FBRyxFQUFFLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFDN0IsR0FBRyxHQUFHLGNBQUs7SUFDVCxDQUFDLENBQUM7UUFDRSxJQUFJLEVBQUUsYUFBYTtRQUNuQixJQUFJLEVBQUUsRUFBRSxDQUFDLGNBQWMsQ0FBQyxRQUFRO1FBQ2hDLFFBQVEsRUFBRSxDQUFDO0tBQ1o7SUFDSCxDQUFDLENBQUM7UUFDRSxJQUFJLEVBQUUsU0FBUztRQUNmLElBQUksRUFBRSxNQUFNO0tBQ2IsRUFDTCxjQUFjLEdBQ1IsRUFBd0MsRUFBRTtJQUNoRCxJQUFJLEdBQUcsSUFBQSx1QkFBYyxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTVCLE1BQU0sT0FBTyxHQUFHLElBQUksRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUU7UUFDbkMsWUFBWSxFQUFFLElBQUk7UUFDbEIsR0FBRyxLQUFLO1FBQ1IsSUFBSTtRQUVKLElBQUksRUFBRSxFQUFFLGNBQWMsRUFBRTtRQUN4QixRQUFRLEVBQUU7WUFDUixFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRTtZQUN6Qyx1REFBdUQ7U0FDeEQ7UUFDRCxXQUFXLEVBQUUsV0FBVztZQUN0QixDQUFDLENBQUM7Z0JBQ0UsYUFBYSxFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsS0FBSztnQkFDakMsYUFBYSxFQUFFO29CQUNiLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxn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
|
package/Sql/SqlDb.js
CHANGED
|
@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
const sql = __importStar(require("@pulumi/azure-native/sql"));
|
|
27
|
-
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
28
27
|
const Common_1 = require("../Common");
|
|
29
28
|
//https://blog.bredvid.no/handling-azure-managed-identity-access-to-azure-sql-in-an-azure-devops-pipeline-1e74e1beb10b
|
|
30
29
|
exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSecondaryFrom, sku = 'S0', dependsOn, importUri, ignoreChanges, }) => {
|
|
@@ -39,7 +38,7 @@ exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSeco
|
|
|
39
38
|
: {
|
|
40
39
|
name: sku,
|
|
41
40
|
},
|
|
42
|
-
requestedBackupStorageRedundancy:
|
|
41
|
+
requestedBackupStorageRedundancy: Common_1.isPrd ? 'Zone' : 'Local',
|
|
43
42
|
createMode: sql.CreateMode.Default,
|
|
44
43
|
};
|
|
45
44
|
if (copyFrom) {
|
|
@@ -59,4 +58,4 @@ exports.default = ({ group, name, sqlServerName, elasticPoolId, copyFrom, asSeco
|
|
|
59
58
|
});
|
|
60
59
|
return { name, group, id: sqlDb.id, instance: sqlDb };
|
|
61
60
|
};
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3FsRGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3FsL1NxbERiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4REFBZ0Q7QUFHaEQsc0NBQWdEO0FBdUJoRCxzSEFBc0g7QUFDdEgsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osYUFBYSxFQUNiLGFBQWEsRUFDYixRQUFRLEVBQ1IsZUFBZSxFQUNmLEdBQUcsR0FBRyxJQUFJLEVBQ1YsU0FBUyxFQUNULFNBQVMsRUFDVCxhQUFhLEdBQ0YsRUFBMEMsRUFBRTtJQUN2RCxJQUFJLEdBQUcsSUFBQSxxQkFBWSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBRTFCLE1BQU0sT0FBTyxHQUFxQjtRQUNoQyxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFDUixVQUFVLEVBQUUsYUFBYTtRQUN6QixhQUFhO1FBQ2IsR0FBRyxFQUFFLGFBQWE7WUFDaEIsQ0FBQyxDQUFDLFNBQVM7WUFDWCxDQUFDLENBQUM7Z0JBQ0UsSUFBSSxFQUFFLEdBQUc7YUFDVjtRQUNMLGdDQUFnQyxFQUFFLGNBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxPQUFPO1FBQzFELFVBQVUsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLE9BQU87S0FDbkMsQ0FBQztJQUVGLElBQUksUUFBUSxFQUFFLENBQUM7UUFDYixPQUFPLENBQUMsZ0JBQWdCLEdBQUcsUUFBUSxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUM7SUFDM0MsQ0FBQztTQUFNLElBQUksZUFBZSxFQUFFLENBQUM7UUFDM0IsT0FBTyxDQUFDLGdCQUFnQixHQUFHLGVBQWUsQ0FBQztRQUMzQyxPQUFPLENBQUMsVUFBVSxHQUFHLEdBQUcsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO1FBQzlDLE9BQU8sQ0FBQyxhQUFhLEdBQUcsR0FBRyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUM7SUFDaEQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFO1FBQzVDLFNBQVM7UUFDVCxhQUFhO1FBQ2IsTUFBTSxFQUFFLFNBQVM7UUFDakIsbUJBQW1CLEVBQUUsSUFBSTtLQUMxQixDQUFDLENBQUM7SUFFSCxPQUFPLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUM7QUFDeEQsQ0FBQyxDQUFDIn0=
|
package/Sql/index.d.ts
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import * as sql from '@pulumi/azure-native/sql';
|
|
2
2
|
import { Input } from '@pulumi/pulumi';
|
|
3
|
-
import { FullSqlDbPropsType } from '../Builder';
|
|
3
|
+
import { FullSqlDbPropsType, LoginBuilderProps } from '../Builder';
|
|
4
4
|
import { EnvRolesResults } from '../AzAd/EnvRoles';
|
|
5
5
|
import { BasicResourceArgs, KeyVaultInfo, NetworkPropsType, ResourceInfo, ResourceInfoWithInstance } from '../types';
|
|
6
6
|
type ElasticPoolCapacityProps = 50 | 100 | 200 | 300 | 400 | 800 | 1200;
|
|
7
|
-
export type SqlAuthType = {
|
|
7
|
+
export type SqlAuthType = LoginBuilderProps & {
|
|
8
8
|
envRoles?: EnvRolesResults;
|
|
9
9
|
azureAdOnlyAuthentication?: boolean;
|
|
10
|
-
|
|
11
|
-
password: Input<string>;
|
|
10
|
+
defaultLoginManagedId?: Input<string>;
|
|
12
11
|
};
|
|
13
12
|
export type SqlNetworkType = NetworkPropsType & {
|
|
14
13
|
acceptAllPublicConnect?: boolean;
|
package/Sql/index.js
CHANGED
|
@@ -62,12 +62,7 @@ maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? 'Standard' : 'Basic', capa
|
|
|
62
62
|
});
|
|
63
63
|
return { name: elasticName, group, id: ep.id, instance: ep };
|
|
64
64
|
};
|
|
65
|
-
exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, ignoreChanges = [
|
|
66
|
-
'administratorLogin',
|
|
67
|
-
'administrators',
|
|
68
|
-
'resourceGroupName',
|
|
69
|
-
'location',
|
|
70
|
-
], }) => {
|
|
65
|
+
exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, ignoreChanges = ['administratorLogin'], }) => {
|
|
71
66
|
const sqlName = (0, Common_1.getSqlServerName)(name);
|
|
72
67
|
const encryptKey = enableEncryption
|
|
73
68
|
? (0, Helper_1.getEncryptionKeyOutput)(name, vaultInfo)
|
|
@@ -89,7 +84,9 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
89
84
|
administratorType: adminGroup
|
|
90
85
|
? sql.AdministratorType.ActiveDirectory
|
|
91
86
|
: undefined,
|
|
92
|
-
azureADOnlyAuthentication:
|
|
87
|
+
azureADOnlyAuthentication: adminGroup
|
|
88
|
+
? auth.azureAdOnlyAuthentication ?? true
|
|
89
|
+
: false,
|
|
93
90
|
principalType: sql.PrincipalType.Group,
|
|
94
91
|
tenantId: AzureEnv_1.tenantId,
|
|
95
92
|
sid: adminGroup?.objectId,
|
|
@@ -130,9 +127,9 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
130
127
|
//Private Link
|
|
131
128
|
if (network?.privateLink) {
|
|
132
129
|
(0, PrivateEndpoint_1.default)({
|
|
130
|
+
...network.privateLink,
|
|
133
131
|
resourceInfo: { name, group, id: sqlServer.id },
|
|
134
132
|
privateDnsZoneName: 'privatelink.database.windows.net',
|
|
135
|
-
subnetIds: network.privateLink.subnetIds,
|
|
136
133
|
linkServiceGroupIds: network.privateLink.type
|
|
137
134
|
? [network.privateLink.type]
|
|
138
135
|
: ['sqlServer'],
|
|
@@ -250,9 +247,12 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
250
247
|
elasticPoolId: ep ? ep.id : undefined,
|
|
251
248
|
});
|
|
252
249
|
if (vaultInfo) {
|
|
250
|
+
//Refer here to build connection correctly: https://learn.microsoft.com/en-us/sql/connect/ado-net/sql/azure-active-directory-authentication?view=sql-server-ver16
|
|
253
251
|
const connectionString = auth?.azureAdOnlyAuthentication
|
|
254
|
-
?
|
|
255
|
-
|
|
252
|
+
? auth?.defaultLoginManagedId
|
|
253
|
+
? (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net; Initial Catalog=${d.name}; Authentication=Active Directory Managed Identity; User Id=${auth.defaultLoginManagedId}; MultipleActiveResultSets=False; Encrypt=True; TrustServerCertificate=True; Connection Timeout=120;`
|
|
254
|
+
: (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net; Initial Catalog=${d.name}; Authentication=Active Directory Default; MultipleActiveResultSets=False;Encrypt=True; TrustServerCertificate=True; Connection Timeout=120;`
|
|
255
|
+
: (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net; Initial Catalog=${d.name}; User Id=${auth.adminLogin}; Password=${auth.password}; MultipleActiveResultSets=False; Encrypt=True; TrustServerCertificate=True; Connection Timeout=120;`;
|
|
256
256
|
(0, CustomHelper_1.addCustomSecret)({
|
|
257
257
|
name: d.name,
|
|
258
258
|
value: connectionString,
|
|
@@ -282,4 +282,4 @@ exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases
|
|
|
282
282
|
databases: dbs,
|
|
283
283
|
};
|
|
284
284
|
};
|
|
285
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
|
285
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
package/Storage/Helper.d.ts
CHANGED
|
@@ -22,7 +22,7 @@ export declare const getStorageSecretsById: ({ storageId, vaultInfo, }: {
|
|
|
22
22
|
storageId: string;
|
|
23
23
|
vaultInfo: KeyVaultInfo;
|
|
24
24
|
}) => Promise<{
|
|
25
|
-
info: import("../Common
|
|
25
|
+
info: import("../Common").ParsedResourceInfo | undefined;
|
|
26
26
|
secrets: StorageConnectionInfo;
|
|
27
27
|
} | undefined>;
|
|
28
28
|
export declare const getAccountSAS: ({ group, name }: BasicResourceArgs) => Promise<storage.ListStorageAccountSASResult>;
|
package/Storage/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { KeyVaultSecret } from '@azure/keyvault-secrets';
|
|
2
2
|
import * as storage from '@pulumi/azure-native/storage';
|
|
3
|
-
import { BasicResourceArgs, KeyVaultInfo, ResourceInfo } from '../types';
|
|
3
|
+
import { BasicResourceArgs, KeyVaultInfo, PrivateLinkPropsType, ResourceInfo } from '../types';
|
|
4
4
|
import { Input } from '@pulumi/pulumi';
|
|
5
5
|
import { DefaultManagementRules, ManagementRules } from './ManagementRules';
|
|
6
6
|
export type ContainerProps = {
|
|
@@ -31,8 +31,7 @@ export type StorageNetworkType = {
|
|
|
31
31
|
subnetId?: Input<string>;
|
|
32
32
|
ipAddresses?: Array<string>;
|
|
33
33
|
}>;
|
|
34
|
-
privateEndpoint?: {
|
|
35
|
-
subnetIds: Input<string>[];
|
|
34
|
+
privateEndpoint?: Omit<PrivateLinkPropsType, 'type'> & {
|
|
36
35
|
type: 'blob' | 'table' | 'queue' | 'file' | 'web' | 'dfs';
|
|
37
36
|
};
|
|
38
37
|
};
|
package/Storage/index.js
CHANGED
|
@@ -115,8 +115,8 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
|
|
|
115
115
|
if (network?.privateEndpoint) {
|
|
116
116
|
//Create Private Endpoints
|
|
117
117
|
(0, PrivateEndpoint_1.default)({
|
|
118
|
+
...network.privateEndpoint,
|
|
118
119
|
resourceInfo: { name, group, id: stg.id },
|
|
119
|
-
subnetIds: network.privateEndpoint.subnetIds,
|
|
120
120
|
privateDnsZoneName: `privatelink.${network.privateEndpoint.type}.core.windows.net`,
|
|
121
121
|
linkServiceGroupIds: [network.privateEndpoint.type],
|
|
122
122
|
});
|
|
@@ -234,4 +234,4 @@ exports.default = ({ name, group, vaultInfo, containers = [], queues = [], fileS
|
|
|
234
234
|
: undefined,
|
|
235
235
|
};
|
|
236
236
|
};
|
|
237
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
237
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Input } from
|
|
2
|
-
import { FirewallPolicyRuleCollectionResults } from
|
|
1
|
+
import { Input } from '@pulumi/pulumi';
|
|
2
|
+
import { FirewallPolicyRuleCollectionResults } from '../types';
|
|
3
3
|
interface AzureFirewallPolicyProps {
|
|
4
4
|
priority: number;
|
|
5
5
|
subnetSpaces: Array<Input<string>>;
|