@drunk-pulumi/azure 1.0.24 → 1.0.25
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 +4 -6
- package/Aks/Helper.js +13 -18
- package/Aks/Identity.js +3 -3
- package/Aks/index.js +4 -7
- package/AzAd/EnvRoles/EnvRoles.Consts.d.ts +6 -0
- package/AzAd/EnvRoles/EnvRoles.Consts.js +178 -0
- package/AzAd/{EnvRoles.d.ts → EnvRoles/EnvRoles.d.ts} +1 -9
- package/AzAd/EnvRoles/EnvRoles.js +91 -0
- package/AzAd/EnvRoles/index.d.ts +2 -0
- package/AzAd/EnvRoles/index.js +19 -0
- package/AzAd/Group.d.ts +2 -2
- package/AzAd/Group.js +3 -3
- package/AzAd/Helper.js +6 -66
- package/AzAd/Identities/AzDevOpsIdentity.js +4 -5
- package/AzAd/Identities/AzDevOpsManagedIdentity.js +1 -1
- package/AzAd/Identities/AzUserAdRevertSync.js +3 -3
- package/AzAd/Identity.js +1 -2
- package/AzAd/RoleDefinitions/index.d.ts +1 -0
- package/AzAd/RoleDefinitions/index.js +18 -0
- package/AzAd/{GraphDefinition.js → Roles/GraphDefinition.js} +1 -1
- package/AzAd/Roles/Role.d.ts +16 -0
- package/AzAd/Roles/Role.js +31 -0
- package/AzAd/{RoleAssignment.d.ts → Roles/RoleAssignment.d.ts} +1 -1
- package/AzAd/{RoleAssignment.js → Roles/RoleAssignment.js} +2 -2
- package/AzAd/{RolesBuiltIn.js → Roles/RolesBuiltIn.js} +1 -1
- package/AzAd/Roles/index.d.ts +3 -0
- package/AzAd/Roles/index.js +22 -0
- package/AzAd/UserAssignedIdentity.js +1 -2
- package/AzAd/index.d.ts +6 -0
- package/AzAd/index.js +23 -0
- package/Builder/AksBuilder.js +3 -3
- package/Builder/ApimProductBuilder.js +1 -2
- package/Builder/DnsZoneBuilder.js +2 -3
- package/Builder/EnvRoleBuilder.d.ts +4 -23
- package/Builder/EnvRoleBuilder.js +8 -9
- package/Builder/PrivateDnsZoneBuilder.d.ts +1 -1
- package/Builder/PrivateDnsZoneBuilder.js +3 -3
- package/Builder/ResourceBuilder.js +3 -3
- package/Builder/types/envRoleBuilder.d.ts +1 -3
- package/Builder/types/resourceBuilder.d.ts +1 -3
- package/Cdn/index.d.ts +1 -1
- package/Cdn/index.js +2 -2
- package/Common/AzureEnv/AutoTags.js +27 -0
- package/Common/{AzureEnv.js → AzureEnv/index.js} +3 -3
- package/Common/{LocationBuiltIn.js → Location/LocationBuiltIn.js} +1 -1
- package/Common/Location/index.js +36 -0
- package/Common/{Naming/Rulers.d.ts → Naming.d.ts} +12 -3
- package/Common/Naming.js +392 -0
- package/Common/RsInfo/Helper.js +8 -6
- package/Common/index.d.ts +1 -4
- package/Common/index.js +7 -7
- package/Core/KeyGenerators.js +4 -5
- package/Core/Random.js +2 -3
- package/KeyVault/CustomHelper.d.ts +1 -3
- package/KeyVault/CustomHelper.js +27 -3
- package/KeyVault/Helper.d.ts +5 -8
- package/KeyVault/Helper.js +35 -61
- package/Logs/AppInsight.js +1 -2
- package/Logs/Helpers.js +1 -3
- package/Logs/LogAnalytics.js +1 -2
- package/README.md +37 -29
- package/Sql/index.js +3 -3
- package/Storage/Helper.js +5 -6
- package/Storage/index.js +7 -8
- package/VM/index.js +1 -2
- package/VNet/PrivateEndpoint.d.ts +40 -3
- package/VNet/PrivateEndpoint.js +62 -55
- package/VNet/index.d.ts +1 -11
- package/VNet/index.js +5 -17
- package/envHelper.d.ts +4 -0
- package/envHelper.js +62 -0
- package/package.json +1 -1
- package/types.d.ts +22 -8
- package/AzAd/ConditionalPolicies/index.d.ts +0 -0
- package/AzAd/ConditionalPolicies/index.js +0 -2
- package/AzAd/EnvRoles.Consts.d.ts +0 -22
- package/AzAd/EnvRoles.Consts.js +0 -173
- package/AzAd/EnvRoles.js +0 -94
- package/AzAd/Role.d.ts +0 -17
- package/AzAd/Role.js +0 -30
- package/Common/AutoTags.js +0 -27
- package/Common/GlobalEnv.d.ts +0 -3
- package/Common/GlobalEnv.js +0 -29
- package/Common/Location.js +0 -36
- package/Common/Naming/Rulers.js +0 -537
- package/Common/Naming/index.d.ts +0 -10
- package/Common/Naming/index.js +0 -112
- /package/AzAd/{GraphDefinition.d.ts → Roles/GraphDefinition.d.ts} +0 -0
- /package/AzAd/{RolesBuiltIn.d.ts → Roles/RolesBuiltIn.d.ts} +0 -0
- /package/Common/{AutoTags.d.ts → AzureEnv/AutoTags.d.ts} +0 -0
- /package/Common/{AzureEnv.d.ts → AzureEnv/index.d.ts} +0 -0
- /package/Common/{LocationBuiltIn.d.ts → Location/LocationBuiltIn.d.ts} +0 -0
- /package/Common/{Location.d.ts → Location/index.d.ts} +0 -0
package/KeyVault/CustomHelper.js
CHANGED
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
26
|
exports.addCustomSecrets = exports.addCustomSecret = exports.addVaultSecretFrom = void 0;
|
|
4
27
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
@@ -6,6 +29,7 @@ const Common_1 = require("../Common");
|
|
|
6
29
|
const VaultSecret_1 = require("@drunk-pulumi/azure-providers/VaultSecret");
|
|
7
30
|
const ConfigHelper_1 = require("../Common/ConfigHelper");
|
|
8
31
|
const Helper_1 = require("./Helper");
|
|
32
|
+
const env = __importStar(require("../envHelper"));
|
|
9
33
|
/**Add key vault secret from a value or from pulumi configuration secret. */
|
|
10
34
|
const addVaultSecretFrom = ({ name, value, vaultInfo, dependsOn, }) => {
|
|
11
35
|
if (!value)
|
|
@@ -22,8 +46,8 @@ const addVaultSecretFrom = ({ name, value, vaultInfo, dependsOn, }) => {
|
|
|
22
46
|
};
|
|
23
47
|
exports.addVaultSecretFrom = addVaultSecretFrom;
|
|
24
48
|
/** Add a secret to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
|
|
25
|
-
const addCustomSecret = ({ name,
|
|
26
|
-
const n =
|
|
49
|
+
const addCustomSecret = ({ name, vaultInfo, value, contentType, dependsOn, ...others }) => {
|
|
50
|
+
const n = env.DPA_VAULT_DISABLE_FORMAT_NAME ? name : (0, Helper_1.getVaultItemName)(name);
|
|
27
51
|
//This KeyVault Secret is not auto recovery the deleted one.
|
|
28
52
|
return new VaultSecret_1.VaultSecretResource((0, Common_1.replaceAll)(name, '.', '-'), {
|
|
29
53
|
name: n,
|
|
@@ -37,4 +61,4 @@ exports.addCustomSecret = addCustomSecret;
|
|
|
37
61
|
/** Add multi secrets to Key Vault. This will auto recover the deleted item and update with a new value if existed. */
|
|
38
62
|
const addCustomSecrets = ({ items, ...others }) => items.map((i) => (0, exports.addCustomSecret)({ ...i, ...others }));
|
|
39
63
|
exports.addCustomSecrets = addCustomSecrets;
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0N1c3RvbUhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUF5RDtBQUN6RCxzQ0FBdUM7QUFDdkMsMkVBQWdGO0FBRWhGLHlEQUFtRDtBQUNuRCxxQ0FBNEM7QUFDNUMsa0RBQW9DO0FBUXBDLDRFQUE0RTtBQUNyRSxNQUFNLGtCQUFrQixHQUFHLENBQUMsRUFDakMsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEVBQ1QsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksQ0FBQyxLQUFLO1FBQUUsS0FBSyxHQUFHLElBQUEsd0JBQVMsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUNwQyxJQUFJLENBQUMsS0FBSztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLElBQUksbUJBQW1CLENBQUMsQ0FBQztJQUV0RSxPQUFPLElBQUEsdUJBQWUsRUFBQztRQUNyQixJQUFJO1FBQ0osS0FBSztRQUNMLFNBQVM7UUFDVCxXQUFXLEVBQUUsa0JBQWtCO1FBQy9CLFNBQVM7S0FDVixDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFoQlcsUUFBQSxrQkFBa0Isc0JBZ0I3QjtBQVdGLGlIQUFpSDtBQUMxRyxNQUFNLGVBQWUsR0FBRyxDQUFDLEVBQzlCLElBQUksRUFDSixTQUFTLEVBQ1QsS0FBSyxFQUNMLFdBQVcsRUFDWCxTQUFTLEVBQ1QsR0FBRyxNQUFNLEVBQ0csRUFBRSxFQUFFO0lBQ2hCLE1BQU0sQ0FBQyxHQUFHLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLHlCQUFnQixFQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVFLDREQUE0RDtJQUM1RCxPQUFPLElBQUksaUNBQW1CLENBQzVCLElBQUEsbUJBQVUsRUFBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxFQUMxQjtRQUNFLElBQUksRUFBRSxDQUFDO1FBQ1AsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBQSxlQUFNLEVBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDdkQsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJO1FBQ3pCLFdBQVcsRUFBRSxXQUFXLElBQUksSUFBSTtRQUNoQyxHQUFHLE1BQU07S0FDVixFQUNELEVBQUUsU0FBUyxFQUFFLENBQ2QsQ0FBQztBQUNKLENBQUMsQ0FBQztBQXJCVyxRQUFBLGVBQWUsbUJBcUIxQjtBQU1GLHNIQUFzSDtBQUMvRyxNQUFNLGdCQUFnQixHQUFHLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxNQUFNLEVBQW9CLEVBQUUsRUFBRSxDQUN6RSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFBLHVCQUFlLEVBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztBQUQ1QyxRQUFBLGdCQUFnQixvQkFDNEIifQ==
|
package/KeyVault/Helper.d.ts
CHANGED
|
@@ -4,7 +4,6 @@ import { KeyVaultInfo, NamedWithVaultType, WithVaultInfo } from '../types';
|
|
|
4
4
|
export declare const getVaultItemName: (name: string, currentStack?: string) => string;
|
|
5
5
|
type GetVaultItemProps = Required<NamedWithVaultType> & {
|
|
6
6
|
version?: string;
|
|
7
|
-
nameFormatted?: boolean;
|
|
8
7
|
};
|
|
9
8
|
interface KeyVaultPropertiesResults {
|
|
10
9
|
keyName: Output<string>;
|
|
@@ -14,13 +13,11 @@ interface KeyVaultPropertiesResults {
|
|
|
14
13
|
keyVersion: Output<string>;
|
|
15
14
|
}
|
|
16
15
|
export declare const addEncryptKey: (name: string, vaultInfo: KeyVaultInfo, keySize?: 2048 | 3072 | 4096) => KeyVaultPropertiesResults;
|
|
17
|
-
/** Get Key */
|
|
18
|
-
/** Get or create encryption Key */
|
|
19
16
|
/** Get Secret */
|
|
20
|
-
export declare const getSecret: ({ name, version, vaultInfo,
|
|
21
|
-
export declare const
|
|
22
|
-
|
|
17
|
+
export declare const getSecret: ({ name, version, vaultInfo, }: GetVaultItemProps) => Promise<import("@azure/keyvault-secrets").KeyVaultSecret | undefined>;
|
|
18
|
+
export declare const getSecretOutput: (props: GetVaultItemProps) => Output<import("@pulumi/pulumi").UnwrappedObject<import("@azure/keyvault-secrets").KeyVaultSecret> | undefined>;
|
|
19
|
+
interface GetSecretsType<T extends Record<string, string>> extends Required<WithVaultInfo> {
|
|
23
20
|
names: T;
|
|
24
|
-
}
|
|
21
|
+
}
|
|
22
|
+
export declare const getSecrets: <T extends Record<string, string>>({ names, ...others }: GetSecretsType<T>) => Record<keyof T, Output<string>>;
|
|
25
23
|
export {};
|
|
26
|
-
/** Convert VaultId to VaultInfo */
|
package/KeyVault/Helper.js
CHANGED
|
@@ -1,13 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getSecrets = exports.getSecret = exports.addEncryptKey = exports.getVaultItemName = void 0;
|
|
29
|
+
exports.getSecrets = exports.getSecretOutput = exports.getSecret = exports.addEncryptKey = exports.getVaultItemName = void 0;
|
|
7
30
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
8
31
|
const KeyVaultBase_1 = __importDefault(require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase"));
|
|
9
32
|
const azure_providers_1 = require("@drunk-pulumi/azure-providers");
|
|
10
33
|
const Common_1 = require("../Common");
|
|
34
|
+
const env = __importStar(require("../envHelper"));
|
|
11
35
|
/** Get Vault Secret Name. Remove the stack name and replace all _ with - then lower cases. */
|
|
12
36
|
const getVaultItemName = (name, currentStack = Common_1.stack) => {
|
|
13
37
|
name = name
|
|
@@ -24,83 +48,33 @@ const addEncryptKey = (name, vaultInfo, keySize = 4096) => {
|
|
|
24
48
|
vaultName: vaultInfo.name,
|
|
25
49
|
key: { keySize },
|
|
26
50
|
}, { retainOnDelete: true });
|
|
51
|
+
const urlWithoutVersion = (0, pulumi_1.output)([key.version, key.id]).apply(([v, id]) => id.replace(`/${v}`, ''));
|
|
27
52
|
return {
|
|
28
53
|
keyName: key.name,
|
|
29
54
|
keyVaultUri: key.vaultUrl,
|
|
30
55
|
keyVersion: key.version,
|
|
31
56
|
url: key.id,
|
|
32
|
-
urlWithoutVersion
|
|
57
|
+
urlWithoutVersion,
|
|
33
58
|
};
|
|
34
59
|
};
|
|
35
60
|
exports.addEncryptKey = addEncryptKey;
|
|
36
|
-
/** Get Key */
|
|
37
|
-
// export const getKey = async ({
|
|
38
|
-
// name,
|
|
39
|
-
// version,
|
|
40
|
-
// vaultInfo,
|
|
41
|
-
// nameFormatted,
|
|
42
|
-
// }: GetVaultItemProps) => {
|
|
43
|
-
// const n = nameFormatted ? name : getSecretName(name);
|
|
44
|
-
// const client = getKeyVaultBase(vaultInfo.name);
|
|
45
|
-
// return client.getKey(n, version);
|
|
46
|
-
// };
|
|
47
|
-
// interface EncryptionPropertiesArgs {
|
|
48
|
-
// keySource: 'Microsoft.KeyVault';
|
|
49
|
-
// keyVaultProperties: Input<KeyVaultPropertiesResults>;
|
|
50
|
-
// }
|
|
51
|
-
/** Get or create encryption Key */
|
|
52
|
-
// const getEncryptionKey = async ({
|
|
53
|
-
// name,
|
|
54
|
-
// vaultInfo,
|
|
55
|
-
// }: Required<NamedWithVaultType>): Promise<KeyVaultPropertiesResults> => {
|
|
56
|
-
// const n = `${name}-encrypt-key`;
|
|
57
|
-
// const key = await getKeyVaultBase(vaultInfo.name).getOrCreateKey(n);
|
|
58
|
-
// return {
|
|
59
|
-
// keyName: key!.properties.name,
|
|
60
|
-
// keyVaultUri: key!.properties.vaultUrl,
|
|
61
|
-
// keyVersion: key!.properties.version,
|
|
62
|
-
// url: `${key!.properties.vaultUrl}/keys/${key!.properties.name}/${key!.properties.version}`,
|
|
63
|
-
// };
|
|
64
|
-
// };
|
|
65
|
-
// export const getEncryptionKeyOutput = ({
|
|
66
|
-
// name,
|
|
67
|
-
// vaultInfo,
|
|
68
|
-
// }: NamedWithVaultType): Output<KeyVaultPropertiesResults> | undefined => {
|
|
69
|
-
// if (!vaultInfo) return undefined;
|
|
70
|
-
// return output(getEncryptionKey({ name, vaultInfo }));
|
|
71
|
-
// };
|
|
72
61
|
/** Get Secret */
|
|
73
|
-
const getSecret = async ({ name, version, vaultInfo,
|
|
74
|
-
const n =
|
|
62
|
+
const getSecret = async ({ name, version, vaultInfo, }) => {
|
|
63
|
+
const n = env.DPA_VAULT_DISABLE_FORMAT_NAME ? name : (0, exports.getVaultItemName)(name);
|
|
75
64
|
const client = (0, KeyVaultBase_1.default)(vaultInfo.name);
|
|
76
65
|
return client.getSecret(n, version);
|
|
77
66
|
};
|
|
78
67
|
exports.getSecret = getSecret;
|
|
79
|
-
const
|
|
68
|
+
const getSecretOutput = (props) => (0, pulumi_1.output)((0, exports.getSecret)(props));
|
|
69
|
+
exports.getSecretOutput = getSecretOutput;
|
|
70
|
+
const getSecrets = ({ names, ...others }) => {
|
|
80
71
|
const rs = {};
|
|
81
72
|
Object.keys(names).forEach((k) => {
|
|
82
73
|
const name = names[k];
|
|
83
|
-
const item = (0, pulumi_1.output)((0, exports.getSecret)({ name,
|
|
84
|
-
rs[k] = item
|
|
74
|
+
const item = (0, pulumi_1.output)((0, exports.getSecret)({ name, ...others }));
|
|
75
|
+
rs[k] = item.apply((i) => i?.value ?? '');
|
|
85
76
|
});
|
|
86
77
|
return rs;
|
|
87
78
|
};
|
|
88
79
|
exports.getSecrets = getSecrets;
|
|
89
|
-
|
|
90
|
-
// name: string;
|
|
91
|
-
// /** The version may be empty if it is not found in the url */
|
|
92
|
-
// version: string;
|
|
93
|
-
// keyIdentityUrl: string;
|
|
94
|
-
// vaultUrl: string;
|
|
95
|
-
// }
|
|
96
|
-
/** Convert VaultId to VaultInfo */
|
|
97
|
-
// export const parseKeyUrl = (keyUrl: string): KeyResult => {
|
|
98
|
-
// const splits = keyUrl.split('/');
|
|
99
|
-
// return {
|
|
100
|
-
// keyIdentityUrl: keyUrl,
|
|
101
|
-
// name: splits[4],
|
|
102
|
-
// version: splits.length > 4 ? splits[5] : '',
|
|
103
|
-
// vaultUrl: `https://${splits[2]}`,
|
|
104
|
-
// };
|
|
105
|
-
// };
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwyQ0FBZ0Q7QUFFaEQscUdBQWdGO0FBQ2hGLG1FQUFpRTtBQUNqRSxzQ0FBZ0U7QUFFaEUsOEZBQThGO0FBQ3ZGLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsSUFBWSxFQUNaLGVBQXVCLGNBQUssRUFDNUIsRUFBRTtJQUNGLElBQUksR0FBRyxJQUFJO1NBQ1IsT0FBTyxDQUFDLElBQUksTUFBTSxDQUFDLFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxtREFBbUQ7U0FDOUYsT0FBTyxDQUFDLFVBQVUsRUFBRSxHQUFHLENBQUMsQ0FBQyx3Q0FBd0M7U0FDakUsT0FBTyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQyw2Q0FBNkM7U0FDakUsV0FBVyxFQUFFLENBQUMsQ0FBQyxrQ0FBa0M7SUFFcEQsT0FBTyxJQUFBLHFDQUE0QixFQUFDLElBQUksQ0FBQyxDQUFDO0FBQzVDLENBQUMsQ0FBQztBQVhXLFFBQUEsZ0JBQWdCLG9CQVczQjtBQXlCSyxNQUFNLGFBQWEsR0FBRyxDQUMzQixJQUFZLEVBQ1osU0FBdUIsRUFDdkIsVUFBOEIsSUFBSSxFQUNQLEVBQUU7SUFDN0IsTUFBTSxHQUFHLEdBQUcsSUFBSSxrQ0FBZ0IsQ0FDOUIsR0FBRyxJQUFJLGFBQWEsRUFDcEI7UUFDRSxJQUFJLEVBQUUsR0FBRyxJQUFJLGFBQWE7UUFDMUIsU0FBUyxFQUFFLFNBQVMsQ0FBQyxJQUFJO1FBQ3pCLEdBQUcsRUFBRSxFQUFFLE9BQU8sRUFBRTtLQUNqQixFQUNELEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxDQUN6QixDQUFDO0lBRUYsT0FBTztRQUNMLE9BQU8sRUFBRSxHQUFHLENBQUMsSUFBSTtRQUNqQixXQUFXLEVBQUUsR0FBRyxDQUFDLFFBQVE7UUFDekIs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
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUFnRDtBQUVoRCxxR0FBZ0Y7QUFDaEYsbUVBQWlFO0FBQ2pFLHNDQUFnRTtBQUNoRSxrREFBb0M7QUFFcEMsOEZBQThGO0FBQ3ZGLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxJQUFZLEVBQUUsZUFBdUIsY0FBSyxFQUFFLEVBQUU7SUFDN0UsSUFBSSxHQUFHLElBQUk7U0FDUixPQUFPLENBQUMsSUFBSSxNQUFNLENBQUMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLG1EQUFtRDtTQUM5RixPQUFPLENBQUMsVUFBVSxFQUFFLEdBQUcsQ0FBQyxDQUFDLHdDQUF3QztTQUNqRSxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLDZDQUE2QztTQUNqRSxXQUFXLEVBQUUsQ0FBQyxDQUFDLGtDQUFrQztJQUVwRCxPQUFPLElBQUEscUNBQTRCLEVBQUMsSUFBSSxDQUFDLENBQUM7QUFDNUMsQ0FBQyxDQUFDO0FBUlcsUUFBQSxnQkFBZ0Isb0JBUTNCO0FBY0ssTUFBTSxhQUFhLEdBQUcsQ0FDM0IsSUFBWSxFQUNaLFNBQXVCLEVBQ3ZCLFVBQThCLElBQUksRUFDUCxFQUFFO0lBQzdCLE1BQU0sR0FBRyxHQUFHLElBQUksa0NBQWdCLENBQzlCLEdBQUcsSUFBSSxhQUFhLEVBQ3BCO1FBQ0UsSUFBSSxFQUFFLEdBQUcsSUFBSSxhQUFhO1FBQzFCLFNBQVMsRUFBRSxTQUFTLENBQUMsSUFBSTtRQUN6QixHQUFHLEVBQUUsRUFBRSxPQUFPLEVBQUU7S0FDakIsRUFDRCxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FDekIsQ0FBQztJQUVGLE1BQU0saUJBQWlCLEdBQW1CLElBQUEsZUFBTSxFQUFDLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQzNFLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FDckMsQ0FBQztJQUVGLE9BQU87UUFDTCxPQUFPLEVBQUUsR0FBRyxDQUFDLElBQUk7UUFDakIsV0FBVyxFQUFFLEdBQUcsQ0FBQyxRQUFRO1FBQ3pCLFVBQVUsRUFBRSxHQUFHLENBQUMsT0FBTztRQUN2QixHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQUU7UUFDWCxpQkFBaUI7S0FDbEIsQ0FBQztBQUNKLENBQUMsQ0FBQztBQTFCVyxRQUFBLGFBQWEsaUJBMEJ4QjtBQUVGLGlCQUFpQjtBQUNWLE1BQU0sU0FBUyxHQUFHLEtBQUssRUFBRSxFQUM5QixJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsR0FDUyxFQUFFLEVBQUU7SUFDdEIsTUFBTSxDQUFDLEdBQUcsR0FBRyxDQUFDLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsd0JBQWdCLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDNUUsTUFBTSxNQUFNLEdBQUcsSUFBQSxzQkFBZSxFQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQyxPQUFPLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ3RDLENBQUMsQ0FBQztBQVJXLFFBQUEsU0FBUyxhQVFwQjtBQUVLLE1BQU0sZUFBZSxHQUFHLENBQUMsS0FBd0IsRUFBRSxFQUFFLENBQzFELElBQUEsZUFBTSxFQUFDLElBQUEsaUJBQVMsRUFBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO0FBRGQsUUFBQSxlQUFlLG1CQUNEO0FBT3BCLE1BQU0sVUFBVSxHQUFHLENBQW1DLEVBQzNELEtBQUssRUFDTCxHQUFHLE1BQU0sRUFDUyxFQUFtQyxFQUFFO0lBQ3ZELE1BQU0sRUFBRSxHQUFtQyxFQUFFLENBQUM7SUFFOUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUMvQixNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdEIsTUFBTSxJQUFJLEdBQUcsSUFBQSxlQUFNLEVBQUMsSUFBQSxpQkFBUyxFQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3BELEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQzVDLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxFQUFxQyxDQUFDO0FBQy9DLENBQUMsQ0FBQztBQWJXLFFBQUEsVUFBVSxjQWFyQiJ9
|
package/Logs/AppInsight.js
CHANGED
|
@@ -56,7 +56,6 @@ exports.default = ({ group, name, dailyCapGb = 0.023, immediatePurgeDataOn30Days
|
|
|
56
56
|
if (vaultInfo) {
|
|
57
57
|
(0, CustomHelper_1.addCustomSecret)({
|
|
58
58
|
name,
|
|
59
|
-
formattedName: true,
|
|
60
59
|
value: appInsight.instrumentationKey,
|
|
61
60
|
vaultInfo,
|
|
62
61
|
contentType: 'AppInsight',
|
|
@@ -73,4 +72,4 @@ const getAppInsightKey = async ({ resourceInfo, vaultInfo, }) => {
|
|
|
73
72
|
return key?.value ?? '';
|
|
74
73
|
};
|
|
75
74
|
exports.getAppInsightKey = getAppInsightKey;
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwSW5zaWdodC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0FwcEluc2lnaHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFNL0MsK0NBQStDO0FBQy9DLHNDQUFtQztBQUNuQywyREFBMkQ7QUFVM0Qsa0JBQWUsQ0FBQyxFQUNkLEtBQUssRUFDTCxJQUFJLEVBQ0osVUFBVSxHQUFHLEtBQUssRUFDbEIsMEJBQTBCLEdBQUcsSUFBSSxFQUNqQyxhQUFhLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsbUJBQW1CLEVBQ2pFLG1CQUFtQixFQUNuQixTQUFTLEdBQ0gsRUFBRSxFQUFFO0lBQ1YsSUFBSSxHQUFHLGVBQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV0QyxNQUFNLFVBQVUsR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRTtRQUNyRCxZQUFZLEVBQUUsSUFBSTtRQUNsQixHQUFHLEtBQUs7UUFFUixJQUFJLEVBQUUsS0FBSztRQUNYLGdCQUFnQixFQUFFLElBQUk7UUFDdEIsZUFBZSxFQUFFLEtBQUs7UUFDdEIsUUFBUSxFQUFFLFdBQVc7UUFFckIsdUNBQXVDO1FBQ3ZDLGVBQWUsRUFBRSxFQUFFO1FBRW5CLDBCQUEwQjtRQUMxQixhQUFhO1FBRWIsZ0JBQWdCLEVBQUUsSUFBSTtRQUN0QixtQkFBbUI7S0FDcEIsQ0FBQyxDQUFDO0lBRUgsSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLDhCQUE4QixDQUNoRCxHQUFHLElBQUksd0JBQXdCLEVBQy9CO1FBQ0Usc0JBQXNCLEVBQUUsQ0FBQyxPQUFPLENBQUMsRUFBRSxnREFBZ0Q7UUFDbkYsYUFBYSxFQUFFO1lBQ2IsR0FBRyxFQUFFLFVBQVU7WUFDZiw4QkFBOEIsRUFBRSxJQUFJO1NBQ3JDO1FBQ0QsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjtRQUMxQyxZQUFZLEVBQUUsVUFBVSxDQUFDLElBQUk7S0FDOUIsQ0FDRixDQUFDO0lBRUYsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLElBQUEsOEJBQWUsRUFBQztZQUNkLElBQUk7WUFDSixLQUFLLEVBQUUsVUFBVSxDQUFDLGtCQUFrQjtZQUNwQyxTQUFTO1lBQ1QsV0FBVyxFQUFFLFlBQVk7WUFDekIsU0FBUyxFQUFFLFVBQVU7U0FDdEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMsQ0FBQztBQUVLLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxFQUFFLEVBQ3JDLFlBQVksRUFDWixTQUFTLEdBSVYsRUFBbUIsRUFBRTtJQUNwQixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUEsa0JBQVMsRUFBQztRQUMxQixJQUFJLEVBQUUsWUFBWSxDQUFDLElBQUk7UUFDdkIsU0FBUztLQUNWLENBQUMsQ0FBQztJQUNILE9BQU8sR0FBRyxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDMUIsQ0FBQyxDQUFDO0FBWlcsUUFBQSxnQkFBZ0Isb0JBWTNCIn0=
|
package/Logs/Helpers.js
CHANGED
|
@@ -79,7 +79,6 @@ const getLogWpSecrets = ({ workspaceName, vaultInfo, }) => {
|
|
|
79
79
|
const primarySharedKey = `${workspaceName}-primary`;
|
|
80
80
|
const secondarySharedKey = `${workspaceName}-secondary`;
|
|
81
81
|
return (0, Helper_1.getSecrets)({
|
|
82
|
-
nameFormatted: true,
|
|
83
82
|
vaultInfo,
|
|
84
83
|
names: { workspaceId, primarySharedKey, secondarySharedKey },
|
|
85
84
|
});
|
|
@@ -93,7 +92,6 @@ const getLogWpInfo = ({ name, group, vaultInfo, }) => {
|
|
|
93
92
|
return { name: n, group, id, ...secrets };
|
|
94
93
|
};
|
|
95
94
|
const getAppInsightSecrets = ({ insightName, vaultInfo, }) => (0, Helper_1.getSecrets)({
|
|
96
|
-
nameFormatted: true,
|
|
97
95
|
vaultInfo,
|
|
98
96
|
names: { instrumentationKey: insightName },
|
|
99
97
|
});
|
|
@@ -126,4 +124,4 @@ const getLogInfo = (groupName, vaultInfo = undefined) => {
|
|
|
126
124
|
return { logWp, logStorage, appInsight };
|
|
127
125
|
};
|
|
128
126
|
exports.getLogInfo = getLogInfo;
|
|
129
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9Mb2dzL0hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2REFBK0M7QUFDL0MsMkNBQW9EO0FBQ3BELHNDQUttQjtBQUNuQiwrQ0FBZ0Q7QUFDaEQsOENBQW1EO0FBYTVDLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxFQUMvQixJQUFJLEVBQ0osZ0JBQWdCLEVBQ2hCLE9BQU8sRUFDUCxpQkFBaUIsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUNsQyxjQUFjLEVBQ2QsU0FBUyxHQUNPLEVBQUUsRUFBRTtJQUNwQiw0Q0FBNEM7SUFDNUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FDWCxtQkFBbUIsSUFBSSw0Q0FBNEMsQ0FDcEUsQ0FBQztRQUNGLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxrQ0FBa0M7SUFDbEMsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDdEIsT0FBTyxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsSUFBSSxzQkFBc0IsQ0FBQyxDQUFDO1FBQ2pFLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUMvQixNQUFNLENBQUMsR0FBRyxHQUFHLElBQUksT0FBTyxDQUFDO0lBQ3pCLE9BQU8sSUFBSSxNQUFNLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUMxQyxDQUFDLEVBQ0Q7UUFDRSxJQUFJLEVBQUUsQ0FBQztRQUNQLFdBQVcsRUFBRSxnQkFBZ0I7UUFDN0IsMkJBQTJCLEVBQUUsa0JBQWtCO1FBRS9DLFdBQVcsRUFBRSxJQUFJO1FBQ2pCLGdCQUFnQixFQUFFLElBQUksQ0FBQyxDQUFD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
|
package/Logs/LogAnalytics.js
CHANGED
|
@@ -59,7 +59,6 @@ exports.default = ({ name, group, sku = insights.WorkspaceSkuNameEnum.Free, dail
|
|
|
59
59
|
});
|
|
60
60
|
(0, CustomHelper_1.addCustomSecrets)({
|
|
61
61
|
contentType: 'Log Analytics',
|
|
62
|
-
formattedName: true,
|
|
63
62
|
vaultInfo,
|
|
64
63
|
items: [
|
|
65
64
|
{ name: workspaceIdKeyName, value: id },
|
|
@@ -77,4 +76,4 @@ exports.default = ({ name, group, sku = insights.WorkspaceSkuNameEnum.Free, dail
|
|
|
77
76
|
}
|
|
78
77
|
return log;
|
|
79
78
|
};
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nQW5hbHl0aWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0xvZ3MvTG9nQW5hbHl0aWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtRkFBcUU7QUFFckUsc0NBQW1DO0FBQ25DLDJEQUE0RDtBQU81RCxrQkFBZSxDQUFDLEVBQ2QsSUFBSSxFQUNKLEtBQUssRUFDTCxHQUFHLEdBQUcsUUFBUSxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFDeEMsWUFBWSxHQUFHLEtBQUssRUFDcEIsU0FBUyxFQUNULFNBQVMsRUFDVCxhQUFhLEVBQ2IsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLElBQUksR0FBRyxlQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pDLE1BQU0sa0JBQWtCLEdBQUcsR0FBRyxJQUFJLEtBQUssQ0FBQztJQUN4QyxNQUFNLGNBQWMsR0FBRyxHQUFHLElBQUksVUFBVSxDQUFDO0lBQ3pDLE1BQU0sZ0JBQWdCLEdBQUcsR0FBRyxJQUFJLFlBQVksQ0FBQztJQUU3QyxNQUFNLEdBQUcsR0FBRyxJQUFJLFFBQVEsQ0FBQyxTQUFTLENBQ2hDLElBQUksRUFDSjtRQUNFLGFBQWEsRUFBRSxJQUFJO1FBQ25CLEdBQUcsS0FBSztRQUVSLCtCQUErQixFQUFFLFNBQVM7UUFDMUMsMkJBQTJCLEVBQUUsU0FBUztRQUN0QyxRQUFRLEVBQUU7WUFDUiwyQ0FBMkM7WUFDM0MseUJBQXlCO1lBQ3pCLDBCQUEwQjtZQUMxQixzRUFBc0U7WUFDdEUsMEJBQTBCLEVBQUUsSUFBSTtTQUNqQztRQUNELGdCQUFnQixFQUNkLEdBQUcsS0FBSyxRQUFRLENBQUMsb0JBQW9CLENBQUMsSUFBSTtZQUN4QyxDQUFDLENBQUMsU0FBUztZQUNYLENBQUMsQ0FBQyxFQUFFLFlBQVksRUFBRSxFQUFFLGdDQUFnQztRQUV4RCxlQUFlLEVBQUUsR0FBRyxLQUFLLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLHFCQUFxQjtRQUMzRixHQUFHLEVBQUUsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFO0tBQ25CLEVBQ0QsRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLENBQzdCLENBQUM7SUFFRixJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2QsR0FBRyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxFQUFFO1lBQ2hDLElBQUksQ0FBQyxFQUFFO2dCQUFFLE9BQU87WUFFaEIsTUFBTSxJQUFJLEdBQUcsTUFBTSxRQUFRLENBQUMsYUFBYSxDQUFDO2dCQUN4QyxhQUFhLEVBQUUsSUFBSTtnQkFDbkIsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLGlCQUFpQjthQUMzQyxDQUFDLENBQUM7WUFFSCxJQUFBLCtCQUFnQixFQUFDO2dCQUNmLFdBQVcsRUFBRSxlQUFlO2dCQUM1QixTQUFTO2dCQUNULEtBQUssRUFBRTtvQkFDTCxFQUFFLElBQUksRUFBRSxrQkFBa0IsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO29CQUN2Qzt3QkFDRSxJQUFJLEVBQUUsY0FBYzt3QkFDcEIsS0FBSyxFQUFFLElBQUksQ0FBQyxnQkFBaUI7cUJBQzlCO29CQUNEO3dCQUNFLElBQUksRUFBRSxnQkFBZ0I7d0JBQ3RCLEtBQUssRUFBRSxJQUFJLENBQUMsa0JBQW1CO3FCQUNoQztpQkFDRjthQUNGLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQyxDQUFDIn0=
|
package/README.md
CHANGED
|
@@ -1,48 +1,56 @@
|
|
|
1
|
-
#
|
|
1
|
+
# [Drunk Pulumi Azure](https://baoduy.github.io/drunk-pulumi-azure/)
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
Welcome to the Drunk Pulumi Azure project! This project provides a set of tools and utilities to help you manage your Azure resources using Pulumi.
|
|
4
4
|
|
|
5
|
-
##
|
|
5
|
+
## Overview
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
2. Create a pulumi account and link to the environment.
|
|
9
|
-
3. Create a "\_Config" folder to store your custom configuration.
|
|
7
|
+
This project includes various modules and components to simplify the management of Azure resources. It leverages Pulumi to provide infrastructure as code, making it easier to define, deploy, and manage your cloud infrastructure.
|
|
10
8
|
|
|
11
|
-
##
|
|
9
|
+
## Usage
|
|
12
10
|
|
|
13
|
-
You
|
|
14
|
-
There are two ways to config your organization code.
|
|
11
|
+
You can use the modules and components provided in this project to manage your Azure resources. Here are some examples of what you can do:
|
|
15
12
|
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
- Create and manage Azure Virtual Machines
|
|
14
|
+
- Set up and configure Azure Key Vaults
|
|
15
|
+
- Manage Azure Storage Accounts
|
|
16
|
+
- Configure Azure Application Insights
|
|
17
|
+
- Set up Azure Active Directory identities and roles
|
|
18
18
|
|
|
19
|
-
|
|
19
|
+
For detailed documentation and examples, please visit the [Drunk Pulumi Azure Documentation](https://baoduy.github.io/drunk-pulumi-azure/).
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
## Modules
|
|
22
22
|
|
|
23
|
-
|
|
23
|
+
This project includes the following modules:
|
|
24
24
|
|
|
25
|
-
|
|
25
|
+
- **Common**: Common utilities and helpers for managing Azure resources.
|
|
26
|
+
- **VM**: Tools for managing Azure Virtual Machines.
|
|
27
|
+
- **KeyVault**: Utilities for managing Azure Key Vaults.
|
|
28
|
+
- **Storage**: Tools for managing Azure Storage Accounts.
|
|
29
|
+
- **Logs**: Utilities for managing Azure Application Insights and Log Analytics.
|
|
30
|
+
- **AzAd**: Tools for managing Azure Active Directory identities and roles.
|
|
31
|
+
- **Builder**: Builders for creating and managing various Azure resources.
|
|
26
32
|
|
|
27
|
-
## Upgrading Issues
|
|
28
33
|
|
|
29
|
-
|
|
34
|
+
## Environment Configuration
|
|
30
35
|
|
|
31
|
-
|
|
36
|
+
The project uses environment variables to configure various settings. Here are some of the key environment variables:
|
|
32
37
|
|
|
33
|
-
-
|
|
34
|
-
|
|
38
|
+
- `PULUMI_NODEJS_DRY_RUN`: Indicates if the Pulumi run is a dry run.
|
|
39
|
+
- `PULUMI_NODEJS_ORGANIZATION`: The Pulumi organization name.
|
|
40
|
+
- `PULUMI_NODEJS_PROJECT`: The Pulumi project name.
|
|
41
|
+
- `PULUMI_NODEJS_STACK`: The Pulumi stack name.
|
|
35
42
|
|
|
36
|
-
|
|
37
|
-
$ pulumi config set azure-native:clientSecret <clientSecret> --secret
|
|
38
|
-
$ pulumi config set azure-native:tenantId <tenantID>
|
|
39
|
-
$ pulumi config set azure-native:subscriptionId <subscriptionId>
|
|
43
|
+
## Contributing
|
|
40
44
|
|
|
41
|
-
|
|
45
|
+
We welcome contributions to this project! If you have any ideas, suggestions, or bug reports, please open an issue or submit a pull request.
|
|
42
46
|
|
|
43
|
-
|
|
47
|
+
## License
|
|
44
48
|
|
|
45
|
-
|
|
49
|
+
This project is licensed under the MIT License. See the [LICENSE](LICENSE) file for details.
|
|
46
50
|
|
|
47
|
-
|
|
48
|
-
|
|
51
|
+
## Acknowledgements
|
|
52
|
+
|
|
53
|
+
This project is maintained by the Drunk Pulumi Azure team. We would like to thank all the contributors and users who have helped make this project better.
|
|
54
|
+
|
|
55
|
+
For more information, please visit the [Drunk Pulumi Azure Documentation](https://baoduy.github.io/drunk-pulumi-azure/).
|
|
56
|
+
```
|
package/Sql/index.js
CHANGED
|
@@ -32,7 +32,7 @@ const Locker_1 = require("../Core/Locker");
|
|
|
32
32
|
const Helper_1 = require("../KeyVault/Helper");
|
|
33
33
|
const Common_1 = require("../Common");
|
|
34
34
|
const Helper_2 = require("../VNet/Helper");
|
|
35
|
-
const
|
|
35
|
+
const VNet_1 = require("../VNet");
|
|
36
36
|
const SqlDb_1 = __importDefault(require("./SqlDb"));
|
|
37
37
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
38
38
|
const createElasticPool = ({ group, name, sqlName,
|
|
@@ -137,7 +137,7 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, envUI
|
|
|
137
137
|
}
|
|
138
138
|
//Private Link
|
|
139
139
|
if (network?.privateLink) {
|
|
140
|
-
|
|
140
|
+
(0, VNet_1.SqlPrivateLink)({
|
|
141
141
|
...network.privateLink,
|
|
142
142
|
resourceInfo: { name: sqlName, group, id: sqlServer.id },
|
|
143
143
|
dependsOn: sqlServer,
|
|
@@ -290,4 +290,4 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, envUI
|
|
|
290
290
|
databases: dbs,
|
|
291
291
|
};
|
|
292
292
|
};
|
|
293
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
|
293
|
+
//# 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.js
CHANGED
|
@@ -5,12 +5,11 @@ const Common_1 = require("../Common");
|
|
|
5
5
|
const Helper_1 = require("../KeyVault/Helper");
|
|
6
6
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
7
7
|
const getStorageSecrets = ({ storageName, vaultInfo, }) => {
|
|
8
|
-
const primaryKey = `${
|
|
9
|
-
const secondaryKey = `${
|
|
10
|
-
const primaryConnection = `${
|
|
11
|
-
const secondaryConnection = `${
|
|
8
|
+
const primaryKey = `${storageName}-key-primary`;
|
|
9
|
+
const secondaryKey = `${storageName}-key-secondary`;
|
|
10
|
+
const primaryConnection = `${storageName}-conn-primary`;
|
|
11
|
+
const secondaryConnection = `${storageName}-conn-secondary`;
|
|
12
12
|
return (0, Helper_1.getSecrets)({
|
|
13
|
-
nameFormatted: true,
|
|
14
13
|
vaultInfo,
|
|
15
14
|
names: { primaryKey, secondaryKey, primaryConnection, secondaryConnection },
|
|
16
15
|
});
|
|
@@ -67,4 +66,4 @@ exports.getStorageInfo = getStorageInfo;
|
|
|
67
66
|
// sharedAccessExpiryTime: expireDate.toISOString(),
|
|
68
67
|
// });
|
|
69
68
|
// };
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1N0b3JhZ2UvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHNDQUErRDtBQUMvRCwrQ0FBZ0Q7QUFPaEQsMkNBQTZDO0FBRTdDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxFQUN6QixXQUFXLEVBQ1gsU0FBUyxHQUlWLEVBQXlCLEVBQUU7SUFDMUIsTUFBTSxVQUFVLEdBQUcsR0FBRyxXQUFXLGNBQWMsQ0FBQztJQUNoRCxNQUFNLFlBQVksR0FBRyxHQUFHLFdBQVcsZ0JBQWdCLENBQUM7SUFDcEQsTUFBTSxpQkFBaUIsR0FBRyxHQUFHLFdBQVcsZUFBZSxDQUFDO0lBQ3hELE1BQU0sbUJBQW1CLEdBQUcsR0FBRyxXQUFXLGlCQUFpQixDQUFDO0lBRTVELE9BQU8sSUFBQSxtQkFBVSxFQUFDO1FBQ2hCLFNBQVM7UUFDVCxLQUFLLEVBQUUsRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLGlCQUFpQixFQUFFLG1CQUFtQixFQUFFO0tBQzVFLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQztBQUVLLE1BQU0sY0FBYyxHQUFHLENBQUMsRUFDN0IsSUFBSSxFQUNKLEtBQUssRUFDTCxTQUFTLEdBQ2EsRUFBZSxFQUFFO0lBQ3ZDLElBQUksR0FBRyxlQUFNLENBQUMsY0FBYyxDQUFDLElBQUEsa0JBQVMsRUFBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQzlDLE1BQU0sT0FBTyxHQUFHLFNBQVM7UUFDdkIsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQztRQUNyRCxDQUFDLENBQUMsRUFBRSxDQUFDO0lBRVAsT0FBTztRQUNMLElBQUk7UUFDSixLQUFLO1FBQ0wsU0FBUyxFQUFFO1lBQ1QsSUFBSSxFQUFFLFdBQVcsSUFBSSx3QkFBd0I7WUFDN0MsSUFBSSxFQUFFLFdBQVcsSUFBSSx3QkFBd0I7WUFDN0MsS0FBSyxFQUFFLFdBQVcsSUFBSSx5QkFBeUI7U0FDaEQ7UUFDRCxHQUFHLE9BQU87UUFDVixFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLEdBQUcsd0JBQWUsbUJBQW1CLEtBQUssQ0FBQyxpQkFBaUIsZ0RBQWdELElBQUksRUFBRTtLQUNsSSxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBckJXLFFBQUEsY0FBYyxrQkFxQnpCO0FBRUYsZ0RBQWdEO0FBQ2hELGVBQWU7QUFDZixlQUFlO0FBQ2YsT0FBTztBQUNQLHVCQUF1QjtBQUN2Qiw2QkFBNkI7QUFDN0IsVUFBVTtBQUNWLDBEQUEwRDtBQUMxRCx5QkFBeUI7QUFDekIsa0NBQWtDO0FBQ2xDLDJCQUEyQjtBQUMzQiwrQkFBK0I7QUFDL0IscUJBQXFCO0FBQ3JCLFdBQVc7QUFDWCxtQkFBbUI7QUFDbkIsRUFBRTtBQUNGLG9EQUFvRDtBQUNwRCxLQUFLO0FBRUwseUVBQXlFO0FBQ3pFLDRCQUE0QjtBQUM1QixtQ0FBbUM7QUFDbkMsb0RBQW9EO0FBQ3BELEVBQUU7QUFDRiwyQ0FBMkM7QUFDM0MseUJBQXlCO0FBQ3pCLGdCQUFnQjtBQUNoQixvREFBb0Q7QUFDcEQsb0NBQW9DO0FBQ3BDLDBDQUEwQztBQUMxQyw2Q0FBNkM7QUFDN0MsZ0RBQWdEO0FBQ2hELHdEQUF3RDtBQUN4RCxRQUFRO0FBQ1IsS0FBSyJ9
|
package/Storage/index.js
CHANGED
|
@@ -28,7 +28,7 @@ const Helper_1 = require("../KeyVault/Helper");
|
|
|
28
28
|
const Common_1 = require("../Common");
|
|
29
29
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
30
30
|
const Locker_1 = require("../Core/Locker");
|
|
31
|
-
const
|
|
31
|
+
const VNet_1 = require("../VNet");
|
|
32
32
|
const ManagementRules_1 = require("./ManagementRules");
|
|
33
33
|
/** Storage Creator */
|
|
34
34
|
function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInfo, containers = [], queues = [], fileShares = [], network, features = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, dependsOn, ignoreChanges = [], }) {
|
|
@@ -141,7 +141,7 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInf
|
|
|
141
141
|
? network.privateEndpoint.type
|
|
142
142
|
: [network.privateEndpoint.type];
|
|
143
143
|
//Create Private Endpoints
|
|
144
|
-
linkTypes.map((type) => (0,
|
|
144
|
+
linkTypes.map((type) => (0, VNet_1.StoragePrivateLink)(type, {
|
|
145
145
|
...network.privateEndpoint,
|
|
146
146
|
resourceInfo: { name, group, id: stg.id },
|
|
147
147
|
dependsOn: stg,
|
|
@@ -223,10 +223,10 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInf
|
|
|
223
223
|
envRoles.addIdentity('readOnly', stg.identity);
|
|
224
224
|
//Add connection into Key vault
|
|
225
225
|
if (vaultInfo && allowSharedKeyAccess) {
|
|
226
|
-
const primaryKeyName = `${
|
|
227
|
-
const secondaryKeyName = `${
|
|
228
|
-
const primaryConnectionKeyName = `${
|
|
229
|
-
const secondConnectionKeyName = `${
|
|
226
|
+
const primaryKeyName = `${name}-key-primary`;
|
|
227
|
+
const secondaryKeyName = `${name}-key-secondary`;
|
|
228
|
+
const primaryConnectionKeyName = `${name}-conn-primary`;
|
|
229
|
+
const secondConnectionKeyName = `${name}-conn-secondary`;
|
|
230
230
|
const keys = (await storage.listStorageAccountKeys({
|
|
231
231
|
accountName: name,
|
|
232
232
|
resourceGroupName: group.resourceGroupName,
|
|
@@ -239,7 +239,6 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInf
|
|
|
239
239
|
(0, CustomHelper_1.addCustomSecrets)({
|
|
240
240
|
vaultInfo,
|
|
241
241
|
contentType: 'Storage',
|
|
242
|
-
formattedName: true,
|
|
243
242
|
items: [
|
|
244
243
|
{
|
|
245
244
|
name: primaryKeyName,
|
|
@@ -269,4 +268,4 @@ function Storage({ name, group, vaultInfo, enableEncryption, envRoles, envUIDInf
|
|
|
269
268
|
};
|
|
270
269
|
}
|
|
271
270
|
exports.default = Storage;
|
|
272
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
271
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
|