@drunk-pulumi/azure 0.0.23 → 0.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/AzAd/EnvRoles.d.ts +2 -2
- package/AzAd/EnvRoles.js +19 -21
- package/AzAd/Role.d.ts +2 -3
- package/AzAd/Role.js +5 -7
- package/KeyVault/Helper.d.ts +4 -3
- package/KeyVault/Helper.js +18 -12
- package/KeyVault/VaultAccess.d.ts +0 -1
- package/KeyVault/VaultAccess.js +1 -24
- package/KeyVault/index.js +2 -12
- package/Sql/index.d.ts +11 -10
- package/Sql/index.js +77 -50
- package/Storage/index.d.ts +3 -3
- package/Storage/index.js +19 -25
- package/package.json +1 -1
package/AzAd/EnvRoles.d.ts
CHANGED
|
@@ -7,6 +7,6 @@ declare const envRoleConfig: {
|
|
|
7
7
|
export type EnvRoleNamesType = {
|
|
8
8
|
[k in keyof typeof envRoleConfig]: string;
|
|
9
9
|
};
|
|
10
|
-
export declare const getEnvRoleNames: (
|
|
11
|
-
declare const _default: (
|
|
10
|
+
export declare const getEnvRoleNames: () => EnvRoleNamesType;
|
|
11
|
+
declare const _default: () => EnvRoleNamesType;
|
|
12
12
|
export default _default;
|
package/AzAd/EnvRoles.js
CHANGED
|
@@ -22,33 +22,31 @@ const envRoleConfig = {
|
|
|
22
22
|
appName: 'Azure',
|
|
23
23
|
},
|
|
24
24
|
};
|
|
25
|
-
const getEnvRoleNames = (
|
|
26
|
-
readOnly: (0, Role_1.getRoleName)({ ...envRoleConfig.readOnly,
|
|
25
|
+
const getEnvRoleNames = () => ({
|
|
26
|
+
readOnly: (0, Role_1.getRoleName)({ ...envRoleConfig.readOnly, }),
|
|
27
27
|
contributor: (0, Role_1.getRoleName)({
|
|
28
|
-
...envRoleConfig.contributor
|
|
29
|
-
includeOrganization,
|
|
28
|
+
...envRoleConfig.contributor
|
|
30
29
|
}),
|
|
31
|
-
admin: (0, Role_1.getRoleName)({ ...envRoleConfig.admin,
|
|
30
|
+
admin: (0, Role_1.getRoleName)({ ...envRoleConfig.admin, }),
|
|
32
31
|
});
|
|
33
32
|
exports.getEnvRoleNames = getEnvRoleNames;
|
|
34
|
-
exports.default = (
|
|
35
|
-
//
|
|
36
|
-
(0, Role_1.default)({
|
|
37
|
-
...envRoleConfig.
|
|
38
|
-
|
|
39
|
-
permissions: [{ roleName: 'Reader', scope: AzureEnv_1.defaultScope }],
|
|
33
|
+
exports.default = () => {
|
|
34
|
+
//Admin
|
|
35
|
+
const adminGroup = (0, Role_1.default)({
|
|
36
|
+
...envRoleConfig.admin,
|
|
37
|
+
//permissions: [{ roleName: 'Reader', scope: defaultScope }],
|
|
40
38
|
});
|
|
41
39
|
//Contributor
|
|
42
|
-
(0, Role_1.default)({
|
|
40
|
+
const contributor = (0, Role_1.default)({
|
|
43
41
|
...envRoleConfig.contributor,
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
//permissions: [{ roleName: 'Reader', scope: defaultScope }],
|
|
43
|
+
members: [adminGroup.objectId],
|
|
46
44
|
});
|
|
47
|
-
//
|
|
48
|
-
|
|
49
|
-
...envRoleConfig.
|
|
50
|
-
|
|
51
|
-
|
|
45
|
+
//ReadOnly
|
|
46
|
+
(0, Role_1.default)({
|
|
47
|
+
...envRoleConfig.readOnly,
|
|
48
|
+
//permissions: [{ roleName: 'Reader', scope: defaultScope }],
|
|
49
|
+
members: [contributor.objectId],
|
|
52
50
|
});
|
|
53
51
|
//Add Global ADO Identity as Admin
|
|
54
52
|
const ado = (0, AzDevOps_1.getAdoIdentity)();
|
|
@@ -57,6 +55,6 @@ exports.default = (includeOrganization = true) => {
|
|
|
57
55
|
groupObjectId: adminGroup.objectId,
|
|
58
56
|
objectId: ado.principal.objectId,
|
|
59
57
|
});
|
|
60
|
-
return (0, exports.getEnvRoleNames)(
|
|
58
|
+
return (0, exports.getEnvRoleNames)();
|
|
61
59
|
};
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRW52Um9sZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXpBZC9FbnZSb2xlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxpREFBZ0Q7QUFDaEQsaUNBQXlEO0FBQ3pELG9EQUF1RDtBQUN2RCxtQ0FBeUM7QUFFekMsTUFBTSxhQUFhLEdBQUc7SUFDcEIsUUFBUSxFQUFFO1FBQ1IsR0FBRyxFQUFFLHFCQUFVO1FBQ2YsUUFBUSxFQUFFLFVBQVU7UUFDcEIsT0FBTyxFQUFFLE9BQU87S0FDRDtJQUNqQixXQUFXLEVBQUU7UUFDWCxHQUFHLEVBQUUscUJBQVU7UUFDZixRQUFRLEVBQUUsYUFBYTtRQUN2QixPQUFPLEVBQUUsT0FBTztLQUNEO0lBQ2pCLEtBQUssRUFBRTtRQUNMLEdBQUcsRUFBRSxxQkFBVTtRQUNmLFFBQVEsRUFBRSxPQUFPO1FBQ2pCLE9BQU8sRUFBRSxPQUFPO0tBQ0Q7Q0FDbEIsQ0FBQztBQUlLLE1BQU0sZUFBZSxHQUFHLEdBQ1gsRUFBRSxDQUFDLENBQUM7SUFDdEIsUUFBUSxFQUFFLElBQUEsa0JBQVcsRUFBQyxFQUFFLEdBQUcsYUFBYSxDQUFDLFFBQVEsR0FBSSxDQUFDO0lBQ3RELFdBQVcsRUFBRSxJQUFBLGtCQUFXLEVBQUM7UUFDdkIsR0FBRyxhQUFhLENBQUMsV0FBVztLQUM3QixDQUFDO0lBQ0YsS0FBSyxFQUFFLElBQUEsa0JBQVcsRUFBQyxFQUFFLEdBQUcsYUFBYSxDQUFDLEtBQUssR0FBSSxDQUFDO0NBQ2pELENBQUMsQ0FBQztBQVBVLFFBQUEsZUFBZSxtQkFPekI7QUFFSCxrQkFBZSxHQUFHLEVBQUU7SUFDbEIsT0FBTztJQUNQLE1BQU0sVUFBVSxHQUFJLElBQUEsY0FBSSxFQUFDO1FBQ3ZCLEdBQUcsYUFBYSxDQUFDLEtBQUs7UUFDdEIsNkRBQTZEO0tBQzlELENBQUMsQ0FBQztJQUVILGFBQWE7SUFDZCxNQUFNLFdBQVcsR0FBRSxJQUFBLGNBQUksRUFBQztRQUNyQixHQUFHLGFBQWEsQ0FBQyxXQUFXO1FBQzVCLDZEQUE2RDtRQUM3RCxPQUFPLEVBQUMsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDO0tBQzlCLENBQUMsQ0FBQztJQUVILFVBQVU7SUFDVCxJQUFBLGNBQUksRUFBQztRQUNKLEdBQUcsYUFBYSxDQUFDLFFBQVE7UUFDekIsNkRBQTZEO1FBQzVELE9BQU8sRUFBQyxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUM7S0FDaEMsQ0FBQyxDQUFDO0lBRUgsa0NBQWtDO0lBQ2xDLE1BQU0sR0FBRyxHQUFHLElBQUEseUJBQWMsR0FBRSxDQUFDO0lBQzdCLElBQUEsc0JBQWMsRUFBQztRQUNiLElBQUksRUFBRSxnQkFBZ0I7UUFDdEIsYUFBYSxFQUFFLFVBQVUsQ0FBQyxRQUFRO1FBQ2xDLFFBQVEsRUFBRSxHQUFHLENBQUMsU0FBUyxDQUFDLFFBQVE7S0FDakMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxJQUFBLHVCQUFlLEdBQUUsQ0FBQztBQUMzQixDQUFDLENBQUMifQ==
|
package/AzAd/Role.d.ts
CHANGED
|
@@ -11,9 +11,8 @@ interface RoleProps {
|
|
|
11
11
|
members?: Input<string>[];
|
|
12
12
|
owners?: Input<Input<string>[]>;
|
|
13
13
|
permissions?: Array<GroupPermissionProps>;
|
|
14
|
-
includeOrganization?: boolean;
|
|
15
14
|
}
|
|
16
|
-
export type RoleNameType = Pick<RoleProps, 'env' | 'location' | 'appName' | 'moduleName' | 'roleName'
|
|
17
|
-
export declare const getRoleName: ({ env, location, appName, moduleName, roleName
|
|
15
|
+
export type RoleNameType = Pick<RoleProps, 'env' | 'location' | 'appName' | 'moduleName' | 'roleName'>;
|
|
16
|
+
export declare const getRoleName: ({ env, location, appName, moduleName, roleName }: RoleNameType) => string;
|
|
18
17
|
declare const _default: ({ members, owners, permissions, ...others }: RoleProps) => import("@pulumi/pulumi").Output<import("@pulumi/azuread/group").Group>;
|
|
19
18
|
export default _default;
|
package/AzAd/Role.js
CHANGED
|
@@ -2,15 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getRoleName = void 0;
|
|
4
4
|
const Group_1 = require("./Group");
|
|
5
|
-
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
6
5
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
7
6
|
const StackEnv_1 = require("../Common/StackEnv");
|
|
8
|
-
const getRoleName = ({ env, location = 'GLB', appName, moduleName, roleName
|
|
9
|
-
const prefix =
|
|
10
|
-
const e = env === AzureEnv_1.Environments.Prd ? 'prod' : 'staging';
|
|
7
|
+
const getRoleName = ({ env, location = 'GLB', appName, moduleName, roleName }) => {
|
|
8
|
+
const prefix = `${StackEnv_1.organization} ROL`;
|
|
11
9
|
return moduleName
|
|
12
|
-
? `${prefix} ${
|
|
13
|
-
: `${prefix} ${
|
|
10
|
+
? `${prefix} ${env} ${location} ${appName}.${moduleName} ${roleName}`.toUpperCase()
|
|
11
|
+
: `${prefix} ${env} ${location} ${appName} ${roleName}`.toUpperCase();
|
|
14
12
|
};
|
|
15
13
|
exports.getRoleName = getRoleName;
|
|
16
14
|
exports.default = ({ members, owners, permissions, ...others }) => {
|
|
@@ -22,4 +20,4 @@ exports.default = ({ members, owners, permissions, ...others }) => {
|
|
|
22
20
|
permissions,
|
|
23
21
|
}));
|
|
24
22
|
};
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm9sZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9BekFkL1JvbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbUNBQStEO0FBRS9ELDJDQUErQztBQUMvQyxpREFBa0Q7QUF1QjNDLE1BQU0sV0FBVyxHQUFHLENBQUMsRUFDMUIsR0FBRyxFQUNILFFBQVEsR0FBRyxLQUFLLEVBQ2hCLE9BQU8sRUFDUCxVQUFVLEVBQ1YsUUFBUSxFQUNLLEVBQUUsRUFBRTtJQUNqQixNQUFNLE1BQU0sR0FBRyxHQUFHLHVCQUFZLE1BQU0sQ0FBQztJQUVyQyxPQUFPLFVBQVU7UUFDZixDQUFDLENBQUMsR0FBRyxNQUFNLElBQUksR0FBRyxJQUFJLFFBQVEsSUFBSSxPQUFPLElBQUksVUFBVSxJQUFJLFFBQVEsRUFBRSxDQUFDLFdBQVcsRUFBRTtRQUNuRixDQUFDLENBQUMsR0FBRyxNQUFNLElBQUksR0FBRyxJQUFJLFFBQVEsSUFBSSxPQUFPLElBQUksUUFBUSxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBWlcsUUFBQSxXQUFXLGVBWXRCO0FBRUYsa0JBQWUsQ0FBQyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEdBQUcsTUFBTSxFQUFhLEVBQUUsRUFBRTtJQUN4RSxNQUFNLElBQUksR0FBRyxJQUFBLG1CQUFXLEVBQUMsTUFBTSxDQUFDLENBQUM7SUFDakMsT0FBTyxJQUFBLGVBQU0sRUFDWCxJQUFBLGVBQWMsRUFBQztRQUNiLElBQUk7UUFDSixPQUFPO1FBQ1AsTUFBTTtRQUNOLFdBQVc7S0FDWixDQUFDLENBQ0gsQ0FBQztBQUNKLENBQUMsQ0FBQyJ9
|
package/KeyVault/Helper.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Input, Resource } from
|
|
2
|
-
import { KeyVaultInfo } from
|
|
1
|
+
import { Input, Resource } from "@pulumi/pulumi";
|
|
2
|
+
import { KeyVaultInfo } from "../types";
|
|
3
3
|
type SecretProps = {
|
|
4
4
|
name: string;
|
|
5
5
|
value: Input<string>;
|
|
@@ -16,9 +16,10 @@ type GetVaultItemProps = {
|
|
|
16
16
|
vaultInfo: KeyVaultInfo;
|
|
17
17
|
nameFormatted?: boolean;
|
|
18
18
|
};
|
|
19
|
-
export declare const addKey: ({ name, vaultInfo, tags, dependsOn, }: Omit<SecretProps,
|
|
19
|
+
export declare const addKey: ({ name, vaultInfo, tags, dependsOn, }: Omit<SecretProps, "value" | "contentType">) => import("@pulumi/azure-native/keyvault/key").Key;
|
|
20
20
|
/** Get Key */
|
|
21
21
|
export declare const getKey: ({ name, version, vaultInfo, nameFormatted, }: GetVaultItemProps) => Promise<import("@azure/keyvault-keys").KeyVaultKey | undefined>;
|
|
22
|
+
export declare const getEncryptionKey: (name: string, vaultInfo: KeyVaultInfo) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("@azure/keyvault-keys").KeyVaultKey> | undefined>;
|
|
22
23
|
/** Get Secret */
|
|
23
24
|
export declare const getSecret: ({ name, version, vaultInfo, nameFormatted, }: GetVaultItemProps) => Promise<import("@azure/keyvault-secrets").KeyVaultSecret | undefined>;
|
|
24
25
|
interface KeyResult {
|
package/KeyVault/Helper.js
CHANGED
|
@@ -1,27 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseKeyUrl = exports.getSecret = exports.getKey = exports.addKey = void 0;
|
|
3
|
+
exports.parseKeyUrl = exports.getSecret = exports.getEncryptionKey = exports.getKey = exports.addKey = void 0;
|
|
4
4
|
const keyvault = require("@pulumi/azure-native/keyvault");
|
|
5
|
+
const pulumi_1 = require("@pulumi/pulumi");
|
|
5
6
|
const Naming_1 = require("../Common/Naming");
|
|
6
7
|
const Helpers_1 = require("../Common/Helpers");
|
|
7
8
|
const KeyVaultBase_1 = require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase");
|
|
8
9
|
const addKey = ({ name, vaultInfo, tags, dependsOn, }) => {
|
|
9
10
|
const n = (0, Naming_1.getSecretName)(name);
|
|
10
|
-
return new keyvault.Key((0, Helpers_1.replaceAll)(name,
|
|
11
|
+
return new keyvault.Key((0, Helpers_1.replaceAll)(name, ".", "-"), {
|
|
11
12
|
keyName: n,
|
|
12
13
|
vaultName: vaultInfo.name,
|
|
13
14
|
...vaultInfo.group,
|
|
14
15
|
//https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.keyvault.webkey?view=azure-dotnet-legacy
|
|
15
16
|
properties: {
|
|
16
17
|
keySize: 2048,
|
|
17
|
-
kty:
|
|
18
|
+
kty: "RSA",
|
|
18
19
|
keyOps: [
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
20
|
+
"decrypt",
|
|
21
|
+
"encrypt",
|
|
22
|
+
"sign",
|
|
23
|
+
"verify",
|
|
24
|
+
"wrapKey",
|
|
25
|
+
"unwrapKey",
|
|
25
26
|
],
|
|
26
27
|
//curveName: 'P512',
|
|
27
28
|
attributes: { enabled: true },
|
|
@@ -37,6 +38,11 @@ const getKey = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
|
37
38
|
return client.getKey(n, version);
|
|
38
39
|
};
|
|
39
40
|
exports.getKey = getKey;
|
|
41
|
+
const getEncryptionKey = (name, vaultInfo) => {
|
|
42
|
+
const n = `${name}-encrypt-key`;
|
|
43
|
+
return (0, pulumi_1.output)((0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name).getOrCreateKey(n));
|
|
44
|
+
};
|
|
45
|
+
exports.getEncryptionKey = getEncryptionKey;
|
|
40
46
|
/** Get Secret */
|
|
41
47
|
const getSecret = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
42
48
|
const n = nameFormatted ? name : (0, Naming_1.getSecretName)(name);
|
|
@@ -46,13 +52,13 @@ const getSecret = async ({ name, version, vaultInfo, nameFormatted, }) => {
|
|
|
46
52
|
exports.getSecret = getSecret;
|
|
47
53
|
/** Convert VaultId to VaultInfo */
|
|
48
54
|
const parseKeyUrl = (keyUrl) => {
|
|
49
|
-
const splits = keyUrl.split(
|
|
55
|
+
const splits = keyUrl.split("/");
|
|
50
56
|
return {
|
|
51
57
|
keyIdentityUrl: keyUrl,
|
|
52
58
|
name: splits[4],
|
|
53
|
-
version: splits.length > 4 ? splits[5] :
|
|
59
|
+
version: splits.length > 4 ? splits[5] : "",
|
|
54
60
|
vaultUrl: `https://${splits[2]}`,
|
|
55
61
|
};
|
|
56
62
|
};
|
|
57
63
|
exports.parseKeyUrl = parseKeyUrl;
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0tleVZhdWx0L0hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwwREFBMEQ7QUFDMUQsMkNBQXlEO0FBR3pELDZDQUFpRDtBQUNqRCwrQ0FBK0M7QUFFL0Msb0ZBQW9GO0FBd0I3RSxNQUFNLE1BQU0sR0FBRyxDQUFDLEVBQ3JCLElBQUksRUFDSixTQUFTLEVBQ1QsSUFBSSxFQUNKLFNBQVMsR0FDa0MsRUFBRSxFQUFFO0lBQy9DLE1BQU0sQ0FBQyxHQUFHLElBQUEsc0JBQWEsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUU5QixPQUFPLElBQUksUUFBUSxDQUFDLEdBQUcsQ0FDckIsSUFBQSxvQkFBVSxFQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLEVBQzFCO1FBQ0UsT0FBTyxFQUFFLENBQUM7UUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUk7UUFDekIsR0FBRyxTQUFTLENBQUMsS0FBSztRQUNsQixzR0FBc0c7UUFDdEcsVUFBVSxFQUFFO1lBQ1YsT0FBTyxFQUFFLElBQUk7WUFDYixHQUFHLEVBQUUsS0FBSztZQUNWLE1BQU0sRUFBRTtnQkFDTixTQUFTO2dCQUNULFNBQVM7Z0JBQ1QsTUFBTTtnQkFDTixRQUFRO2dCQUNSLFNBQVM7Z0JBQ1QsV0FBVzthQUNaO1lBQ0Qsb0JBQW9CO1lBQ3BCLFVBQVUsRUFBRSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUU7U0FDOUI7UUFDRCxJQUFJO0tBQ0wsRUFDRCxFQUFFLFNBQVMsRUFBRSxDQUNkLENBQUM7QUFDSixDQUFDLENBQUM7QUFqQ1csUUFBQSxNQUFNLFVBaUNqQjtBQUVGLGNBQWM7QUFDUCxNQUFNLE1BQU0sR0FBRyxLQUFLLEVBQUUsRUFDM0IsSUFBSSxFQUNKLE9BQU8sRUFDUCxTQUFTLEVBQ1QsYUFBYSxHQUNLLEVBQUUsRUFBRTtJQUN0QixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxzQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUEsOEJBQWUsRUFBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUNuQyxDQUFDLENBQUM7QUFUVyxRQUFBLE1BQU0sVUFTakI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQUMsSUFBWSxFQUFFLFNBQXVCLEVBQUUsRUFBRTtJQUN4RSxNQUFNLENBQUMsR0FBRyxHQUFHLElBQUksY0FBYyxDQUFDO0lBQ2hDLE9BQU8sSUFBQSxlQUFNLEVBQUMsSUFBQSw4QkFBZSxFQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNuRSxDQUFDLENBQUM7QUFIVyxRQUFBLGdCQUFnQixvQkFHM0I7QUFFRixpQkFBaUI7QUFDVixNQUFNLFNBQVMsR0FBRyxLQUFLLEVBQUUsRUFDOUIsSUFBSSxFQUNKLE9BQU8sRUFDUCxTQUFTLEVBQ1QsYUFBYSxHQUNLLEVBQUUsRUFBRTtJQUN0QixNQUFNLENBQUMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxzQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3JELE1BQU0sTUFBTSxHQUFHLElBQUEsOEJBQWUsRUFBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsT0FBTyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUN0QyxDQUFDLENBQUM7QUFUVyxRQUFBLFNBQVMsYUFTcEI7QUFVRixtQ0FBbUM7QUFDNUIsTUFBTSxXQUFXLEdBQUcsQ0FBQyxNQUFjLEVBQWEsRUFBRTtJQUN2RCxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2pDLE9BQU87UUFDTCxjQUFjLEVBQUUsTUFBTTtRQUN0QixJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNmLE9BQU8sRUFBRSxNQUFNLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQzNDLFFBQVEsRUFBRSxXQUFXLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRTtLQUNqQyxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBUlcsUUFBQSxXQUFXLGVBUXRCIn0=
|
package/KeyVault/VaultAccess.js
CHANGED
|
@@ -11,7 +11,6 @@ exports.default = ({ name, auth }) => {
|
|
|
11
11
|
env: AzureEnv_1.currentEnv,
|
|
12
12
|
appName: `${name}-vault`,
|
|
13
13
|
roleName: 'ReadOnly',
|
|
14
|
-
includeOrganization: auth.includeOrganization,
|
|
15
14
|
});
|
|
16
15
|
const adminGroup = auth.envRoleNames
|
|
17
16
|
? (0, Group_1.getAdGroup)(auth.envRoleNames.contributor)
|
|
@@ -19,29 +18,7 @@ exports.default = ({ name, auth }) => {
|
|
|
19
18
|
env: AzureEnv_1.currentEnv,
|
|
20
19
|
appName: `${name}-vault`,
|
|
21
20
|
roleName: 'Admin',
|
|
22
|
-
includeOrganization: auth.includeOrganization,
|
|
23
21
|
});
|
|
24
|
-
//Add current service principal in
|
|
25
|
-
// if (auth.permissions == undefined) {
|
|
26
|
-
// auth.permissions = [
|
|
27
|
-
// // {
|
|
28
|
-
// // objectId: currentServicePrincipal,
|
|
29
|
-
// // permission: 'ReadWrite',
|
|
30
|
-
// // },
|
|
31
|
-
// ];
|
|
32
|
-
// }
|
|
33
|
-
//Add Permission to Groups
|
|
34
|
-
// auth.permissions.forEach(
|
|
35
|
-
// ({ objectId, applicationId, permission, ...others }, index) =>
|
|
36
|
-
// new azuread.GroupMember(`${name}-${permission}-${index}`, {
|
|
37
|
-
// groupObjectId:
|
|
38
|
-
// permission === 'ReadOnly'
|
|
39
|
-
// ? readOnlyGroup.objectId
|
|
40
|
-
// : adminGroup.objectId,
|
|
41
|
-
// memberObjectId: objectId ?? applicationId,
|
|
42
|
-
// ...others,
|
|
43
|
-
// })
|
|
44
|
-
// );
|
|
45
22
|
return { readOnlyGroup, adminGroup };
|
|
46
23
|
};
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVmF1bHRBY2Nlc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvVmF1bHRBY2Nlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSx1Q0FBcUM7QUFDckMsaURBQWdEO0FBQ2hELHlDQUEyQztBQWEzQyxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBUyxFQUFFLEVBQUU7SUFDdkMsbUJBQW1CO0lBQ25CLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxZQUFZO1FBQ3JDLENBQUMsQ0FBQyxJQUFBLGtCQUFVLEVBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUM7UUFDeEMsQ0FBQyxDQUFDLElBQUEsY0FBUyxFQUFDO1lBQ1IsR0FBRyxFQUFFLHFCQUFVO1lBQ2YsT0FBTyxFQUFFLEdBQUcsSUFBSSxRQUFRO1lBQ3hCLFFBQVEsRUFBRSxVQUFVO1NBQ3JCLENBQUMsQ0FBQztJQUVQLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxZQUFZO1FBQ2xDLENBQUMsQ0FBQyxJQUFBLGtCQUFVLEVBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxXQUFXLENBQUM7UUFDM0MsQ0FBQyxDQUFDLElBQUEsY0FBUyxFQUFDO1lBQ1IsR0FBRyxFQUFFLHFCQUFVO1lBQ2YsT0FBTyxFQUFFLEdBQUcsSUFBSSxRQUFRO1lBQ3hCLFFBQVEsRUFBRSxPQUFPO1NBQ2xCLENBQUMsQ0FBQztJQUVQLE9BQU8sRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLENBQUM7QUFDdkMsQ0FBQyxDQUFDIn0=
|
package/KeyVault/index.js
CHANGED
|
@@ -9,13 +9,9 @@ const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
|
|
|
9
9
|
const CustomHelper_1 = require("./CustomHelper");
|
|
10
10
|
const VaultPermissions_1 = require("./VaultPermissions");
|
|
11
11
|
const VaultAccess_1 = require("./VaultAccess");
|
|
12
|
-
const Group_1 = require("../AzAd/Group");
|
|
13
12
|
exports.default = ({ name,
|
|
14
13
|
//nameConvention,
|
|
15
|
-
group, auth = {
|
|
16
|
-
includeOrganization: true,
|
|
17
|
-
//permissions: new Array<PermissionProps>(),
|
|
18
|
-
}, createDefaultValues, network, ...others }) => {
|
|
14
|
+
group, auth = {}, createDefaultValues, network, ...others }) => {
|
|
19
15
|
const vaultName = (0, Naming_1.getKeyVaultName)(name);
|
|
20
16
|
const { readOnlyGroup, adminGroup } = (0, VaultAccess_1.default)({ name, auth });
|
|
21
17
|
// const accessPolicies =
|
|
@@ -80,12 +76,6 @@ group, auth = {
|
|
|
80
76
|
permission: "ReadWrite",
|
|
81
77
|
principalType: "Group",
|
|
82
78
|
});
|
|
83
|
-
//Add current principal to the admin group
|
|
84
|
-
(0, Group_1.addUserToGroup)({
|
|
85
|
-
name: `${name}-current-principal-as-admin`,
|
|
86
|
-
objectId: AzureEnv_1.currentPrincipal,
|
|
87
|
-
groupObjectId: adminGroup.objectId,
|
|
88
|
-
});
|
|
89
79
|
//To Vault Info
|
|
90
80
|
const toVaultInfo = () => ({ name: vaultName, group, id: resource.id });
|
|
91
81
|
//Add Diagnostic
|
|
@@ -131,4 +121,4 @@ group, auth = {
|
|
|
131
121
|
createPrivateLink,
|
|
132
122
|
};
|
|
133
123
|
};
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvS2V5VmF1bHQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBK0M7QUFDL0Msc0RBQW1EO0FBRW5ELGlEQUc0QjtBQUM1Qiw2Q0FBMkU7QUFDM0UsNkNBQW1EO0FBRW5ELDZEQUFzRDtBQUV0RCxpREFBaUQ7QUFDakQseURBQThEO0FBQzlELCtDQUE2RDtBQWdCN0Qsa0JBQWUsQ0FBQyxFQUNkLElBQUk7QUFDSixpQkFBaUI7QUFDakIsS0FBSyxFQUNMLElBQUksR0FBQyxFQUFFLEVBQ1AsbUJBQW1CLEVBQ25CLE9BQU8sRUFDUCxHQUFHLE1BQU0sRUFDSCxFQUFFLEVBQUU7SUFDVixNQUFNLFNBQVMsR0FBRyxJQUFBLHdCQUFlLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFFeEMsTUFBTSxFQUFFLGFBQWEsRUFBRSxVQUFVLEVBQUUsR0FBRyxJQUFBLHFCQUFXLEVBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUVsRSx5QkFBeUI7SUFDekIsb0VBQW9FO0lBRXBFLHlCQUF5QjtJQUN6QiwyQkFBMkI7SUFDM0IsMEJBQTBCO0lBQzFCLHdDQUF3QztJQUN4QyxnQkFBZ0I7SUFDaEIsMkNBQTJDO0lBQzNDLFFBQVE7SUFDUiwwQkFBMEI7SUFDMUIscUNBQXFDO0lBQ3JDLGdCQUFnQjtJQUNoQix3Q0FBd0M7SUFDeEMsUUFBUTtJQUNSLElBQUk7SUFFSixNQUFNLFFBQVEsR0FBRyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtRQUNwRCxTQUFTO1FBQ1QsR0FBRyxLQUFLO1FBQ1IsR0FBRyxNQUFNO1FBRVQsVUFBVSxFQUFFO1lBQ1YsUUFBUSxFQUFSLG1CQUFRO1lBQ1IsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFO1lBQ3RDLFVBQVUsRUFB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
|
package/Sql/index.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { Input, Output } from
|
|
2
|
-
import { EnvRoleNamesType } from
|
|
3
|
-
import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, PrivateLinkProps } from
|
|
4
|
-
import { SqlDbProps } from
|
|
1
|
+
import { Input, Output } from "@pulumi/pulumi";
|
|
2
|
+
import { EnvRoleNamesType } from "../AzAd/EnvRoles";
|
|
3
|
+
import { BasicResourceArgs, BasicResourceResultProps, KeyVaultInfo, PrivateLinkProps } from "../types";
|
|
4
|
+
import { SqlDbProps } from "./SqlDb";
|
|
5
5
|
type ElasticPoolCapacityProps = 50 | 100 | 200 | 300 | 400 | 800 | 1200;
|
|
6
6
|
interface Props extends BasicResourceArgs {
|
|
7
|
-
vaultInfo
|
|
7
|
+
vaultInfo: KeyVaultInfo;
|
|
8
|
+
enableEncryption?: boolean;
|
|
8
9
|
/** if Auth is not provided it will be auto generated */
|
|
9
10
|
auth: {
|
|
10
11
|
envRoleNames?: EnvRoleNamesType;
|
|
@@ -15,16 +16,16 @@ interface Props extends BasicResourceArgs {
|
|
|
15
16
|
password: Input<string>;
|
|
16
17
|
};
|
|
17
18
|
elasticPool?: {
|
|
18
|
-
name:
|
|
19
|
+
name: "Standard" | "Basic";
|
|
19
20
|
capacity: ElasticPoolCapacityProps;
|
|
20
21
|
};
|
|
21
|
-
databases: Array<Omit<SqlDbProps,
|
|
22
|
+
databases: Array<Omit<SqlDbProps, "sqlServerName" | "group" | "elasticPoolId" | "dependsOn">>;
|
|
22
23
|
network?: {
|
|
23
24
|
acceptAllInternetConnect?: boolean;
|
|
24
25
|
subnetId?: Input<string>;
|
|
25
26
|
ipAddresses?: Input<string>[];
|
|
26
27
|
/** To enable Private Link need to ensure the subnetId is provided. */
|
|
27
|
-
privateLink?: Omit<PrivateLinkProps,
|
|
28
|
+
privateLink?: Omit<PrivateLinkProps, "subnetId">;
|
|
28
29
|
};
|
|
29
30
|
vulnerabilityAssessment?: {
|
|
30
31
|
alertEmails: Array<string>;
|
|
@@ -34,11 +35,11 @@ interface Props extends BasicResourceArgs {
|
|
|
34
35
|
};
|
|
35
36
|
lock?: boolean;
|
|
36
37
|
}
|
|
37
|
-
declare const _default: ({ name, auth, group, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, lock, }: Props) => {
|
|
38
|
+
declare const _default: ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, lock, }: Props) => {
|
|
38
39
|
name: string;
|
|
39
40
|
resource: import("@pulumi/azure-native/sql/server").Server;
|
|
40
41
|
elasticPool: BasicResourceResultProps<import("@pulumi/azure-native/sql/elasticPool").ElasticPool> | undefined;
|
|
41
|
-
databases: BasicResourceResultProps<import("@pulumi/azure-native/sql/database").Database>[]
|
|
42
|
+
databases: BasicResourceResultProps<import("@pulumi/azure-native/sql/database").Database>[];
|
|
42
43
|
adminGroup: Output<import("@pulumi/pulumi").UnwrappedObject<import("@pulumi/azuread").GetGroupResult>> | Output<import("@pulumi/azuread/group").Group> | undefined;
|
|
43
44
|
};
|
|
44
45
|
export default _default;
|
package/Sql/index.js
CHANGED
|
@@ -2,19 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const sql = require("@pulumi/azure-native/sql");
|
|
4
4
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
5
|
+
const Helper_1 = require("../KeyVault/Helper");
|
|
5
6
|
const Group_1 = require("../AzAd/Group");
|
|
6
7
|
const RoleAssignment_1 = require("../AzAd/RoleAssignment");
|
|
7
8
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
8
9
|
const Naming_1 = require("../Common/Naming");
|
|
9
10
|
const Locker_1 = require("../Core/Locker");
|
|
10
|
-
const
|
|
11
|
+
const Helper_2 = require("../VNet/Helper");
|
|
11
12
|
const PrivateEndpoint_1 = require("../VNet/PrivateEndpoint");
|
|
12
13
|
const SqlDb_1 = require("./SqlDb");
|
|
13
14
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
14
15
|
const Role_1 = require("../AzAd/Role");
|
|
15
16
|
const createElasticPool = ({ group, name, sqlName,
|
|
16
17
|
//Minimum is 50 GD
|
|
17
|
-
maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ?
|
|
18
|
+
maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? "Standard" : "Basic", capacity: 50 }, lock = true, }) => {
|
|
18
19
|
//Create Sql Elastic
|
|
19
20
|
const elasticName = (0, Naming_1.getElasticPoolName)(name);
|
|
20
21
|
const ep = new sql.ElasticPool(elasticName, {
|
|
@@ -29,8 +30,9 @@ maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? 'Standard' : 'Basic', capa
|
|
|
29
30
|
},
|
|
30
31
|
perDatabaseSettings: {
|
|
31
32
|
minCapacity: 0,
|
|
32
|
-
maxCapacity: sku.name ===
|
|
33
|
+
maxCapacity: sku.name === "Basic" ? 5 : sku.capacity,
|
|
33
34
|
},
|
|
35
|
+
zoneRedundant: AzureEnv_1.isPrd,
|
|
34
36
|
//licenseType: sql.ElasticPoolLicenseType.BasePrice,
|
|
35
37
|
//zoneRedundant: isPrd,
|
|
36
38
|
});
|
|
@@ -39,8 +41,11 @@ maxSizeBytesGb = 50, sku = { name: AzureEnv_1.isPrd ? 'Standard' : 'Basic', capa
|
|
|
39
41
|
}
|
|
40
42
|
return { name: elasticName, resource: ep };
|
|
41
43
|
};
|
|
42
|
-
exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, lock = true, }) => {
|
|
44
|
+
exports.default = ({ name, auth, group, enableEncryption, elasticPool, databases, vaultInfo, network, vulnerabilityAssessment, lock = true, }) => {
|
|
43
45
|
const sqlName = (0, Naming_1.getSqlServerName)(name);
|
|
46
|
+
const encryptKey = enableEncryption
|
|
47
|
+
? (0, Helper_1.getEncryptionKey)(name, vaultInfo)
|
|
48
|
+
: undefined;
|
|
44
49
|
// if (vaultInfo && !auth) {
|
|
45
50
|
// const login = await randomLogin({ name, loginPrefix: 'sql', vaultInfo });
|
|
46
51
|
// auth = {
|
|
@@ -52,17 +57,17 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, netwo
|
|
|
52
57
|
const adminGroup = auth?.enableAdAdministrator
|
|
53
58
|
? auth.envRoleNames
|
|
54
59
|
? (0, Group_1.getAdGroup)(auth.envRoleNames.admin)
|
|
55
|
-
: (0, Role_1.default)({ env: AzureEnv_1.currentEnv, roleName:
|
|
60
|
+
: (0, Role_1.default)({ env: AzureEnv_1.currentEnv, roleName: "ADMIN", appName: "SQL" })
|
|
56
61
|
: undefined;
|
|
57
|
-
const ignoreChanges = [
|
|
62
|
+
const ignoreChanges = ["administratorLogin", "administrators"];
|
|
58
63
|
if (auth.azureAdOnlyAuthentication)
|
|
59
|
-
ignoreChanges.push(
|
|
64
|
+
ignoreChanges.push("administratorLoginPassword");
|
|
60
65
|
const sqlServer = new sql.Server(sqlName, {
|
|
61
66
|
serverName: sqlName,
|
|
62
67
|
...group,
|
|
63
|
-
version:
|
|
64
|
-
minimalTlsVersion:
|
|
65
|
-
identity: { type:
|
|
68
|
+
version: "12.0",
|
|
69
|
+
minimalTlsVersion: "1.2",
|
|
70
|
+
identity: { type: "SystemAssigned" },
|
|
66
71
|
administratorLogin: auth?.adminLogin,
|
|
67
72
|
administratorLoginPassword: auth.azureAdOnlyAuthentication
|
|
68
73
|
? undefined
|
|
@@ -101,10 +106,10 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, netwo
|
|
|
101
106
|
group,
|
|
102
107
|
name,
|
|
103
108
|
resourceId: sqlServer.id,
|
|
104
|
-
privateDnsZoneName:
|
|
109
|
+
privateDnsZoneName: "privatelink.database.windows.net",
|
|
105
110
|
...network.privateLink,
|
|
106
111
|
subnetId: network.subnetId,
|
|
107
|
-
linkServiceGroupIds: [
|
|
112
|
+
linkServiceGroupIds: ["sqlServer"],
|
|
108
113
|
});
|
|
109
114
|
}
|
|
110
115
|
else {
|
|
@@ -120,16 +125,16 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, netwo
|
|
|
120
125
|
}
|
|
121
126
|
//Allow Public Ip Accessing
|
|
122
127
|
if (network?.acceptAllInternetConnect) {
|
|
123
|
-
new sql.FirewallRule(
|
|
124
|
-
firewallRuleName:
|
|
128
|
+
new sql.FirewallRule("accept-all-connection", {
|
|
129
|
+
firewallRuleName: "accept-all-connection",
|
|
125
130
|
serverName: sqlServer.name,
|
|
126
131
|
...group,
|
|
127
|
-
startIpAddress:
|
|
128
|
-
endIpAddress:
|
|
132
|
+
startIpAddress: "0.0.0.0",
|
|
133
|
+
endIpAddress: "255.255.255.255",
|
|
129
134
|
});
|
|
130
135
|
}
|
|
131
136
|
else if (network?.ipAddresses) {
|
|
132
|
-
(0, pulumi_1.all)(network.ipAddresses).apply((ips) => (0,
|
|
137
|
+
(0, pulumi_1.all)(network.ipAddresses).apply((ips) => (0, Helper_2.convertToIpRange)(ips).map((ip, i) => {
|
|
133
138
|
const n = `${sqlName}-fwRule-${i}`;
|
|
134
139
|
return new sql.FirewallRule(n, {
|
|
135
140
|
firewallRuleName: n,
|
|
@@ -145,28 +150,28 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, netwo
|
|
|
145
150
|
if (vulnerabilityAssessment.logStorageId) {
|
|
146
151
|
(0, RoleAssignment_1.roleAssignment)({
|
|
147
152
|
name,
|
|
148
|
-
principalId: sqlServer.identity.apply((i) => i?.principalId ||
|
|
149
|
-
principalType:
|
|
150
|
-
roleName:
|
|
153
|
+
principalId: sqlServer.identity.apply((i) => i?.principalId || ""),
|
|
154
|
+
principalType: "ServicePrincipal",
|
|
155
|
+
roleName: "Storage Blob Data Contributor",
|
|
151
156
|
scope: vulnerabilityAssessment.logStorageId,
|
|
152
157
|
});
|
|
153
158
|
}
|
|
154
159
|
//Server Audit
|
|
155
160
|
new sql.ExtendedServerBlobAuditingPolicy(name, {
|
|
156
161
|
auditActionsAndGroups: [
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
162
|
+
"SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP",
|
|
163
|
+
"FAILED_DATABASE_AUTHENTICATION_GROUP",
|
|
164
|
+
"BATCH_COMPLETED_GROUP",
|
|
160
165
|
],
|
|
161
166
|
serverName: sqlServer.name,
|
|
162
167
|
...group,
|
|
163
|
-
blobAuditingPolicyName:
|
|
168
|
+
blobAuditingPolicyName: "default",
|
|
164
169
|
isAzureMonitorTargetEnabled: true,
|
|
165
170
|
isStorageSecondaryKeyInUse: false,
|
|
166
171
|
predicateExpression: "object_name = 'SensitiveData'",
|
|
167
172
|
queueDelayMs: 4000,
|
|
168
173
|
retentionDays: AzureEnv_1.isPrd ? 30 : 6,
|
|
169
|
-
state:
|
|
174
|
+
state: "Enabled",
|
|
170
175
|
isDevopsAuditEnabled: true,
|
|
171
176
|
storageAccountAccessKey: vulnerabilityAssessment.storageAccessKey,
|
|
172
177
|
storageAccountSubscriptionId: AzureEnv_1.subscriptionId,
|
|
@@ -182,7 +187,7 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, netwo
|
|
|
182
187
|
retentionDays: 7,
|
|
183
188
|
storageAccountAccessKey: vulnerabilityAssessment.storageAccessKey,
|
|
184
189
|
storageEndpoint: vulnerabilityAssessment.storageEndpoint,
|
|
185
|
-
state:
|
|
190
|
+
state: "Enabled",
|
|
186
191
|
});
|
|
187
192
|
//ServerVulnerabilityAssessment
|
|
188
193
|
new sql.ServerVulnerabilityAssessment(name, {
|
|
@@ -198,31 +203,53 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, netwo
|
|
|
198
203
|
storageAccountAccessKey: vulnerabilityAssessment.storageAccessKey,
|
|
199
204
|
});
|
|
200
205
|
}
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
(0, CustomHelper_1.addCustomSecret)({
|
|
216
|
-
name: d.name,
|
|
217
|
-
value: connectionString,
|
|
218
|
-
vaultInfo,
|
|
219
|
-
contentType: `Sql ${d.name} Connection String`,
|
|
220
|
-
dependsOn: d.resource,
|
|
221
|
-
});
|
|
222
|
-
}
|
|
223
|
-
return d;
|
|
206
|
+
if (encryptKey) {
|
|
207
|
+
// Enable a server key in the SQL Server with reference to the Key Vault Key
|
|
208
|
+
new sql.ServerKey(`${sqlName}-serverKey`, {
|
|
209
|
+
resourceGroupName: group.resourceGroupName,
|
|
210
|
+
serverName: sqlName,
|
|
211
|
+
serverKeyType: "AzureKeyVault",
|
|
212
|
+
keyName: encryptKey.apply((c) => c.name),
|
|
213
|
+
uri: encryptKey.apply((c) => `${c.properties.vaultUrl}/keys/${c.name}`),
|
|
214
|
+
});
|
|
215
|
+
new sql.EncryptionProtector(`${sqlName}-encryptionProtector`, {
|
|
216
|
+
resourceGroupName: group.resourceGroupName,
|
|
217
|
+
serverName: sqlName,
|
|
218
|
+
serverKeyType: "AzureKeyVault",
|
|
219
|
+
autoRotationEnabled: true,
|
|
224
220
|
});
|
|
225
221
|
}
|
|
222
|
+
const dbs = databases?.map((db) => {
|
|
223
|
+
const d = (0, SqlDb_1.default)({
|
|
224
|
+
...db,
|
|
225
|
+
group,
|
|
226
|
+
sqlServerName: sqlName,
|
|
227
|
+
dependsOn: sqlServer,
|
|
228
|
+
elasticPoolId: ep ? ep.resource.id : undefined,
|
|
229
|
+
});
|
|
230
|
+
if (encryptKey) {
|
|
231
|
+
//Enable TransparentDataEncryption for each database
|
|
232
|
+
new sql.TransparentDataEncryption(`${sqlName}-${db.name}`, {
|
|
233
|
+
serverName: sqlName,
|
|
234
|
+
databaseName: db.name,
|
|
235
|
+
resourceGroupName: group.resourceGroupName,
|
|
236
|
+
state: "Enabled",
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
if (vaultInfo) {
|
|
240
|
+
const connectionString = auth?.adminLogin
|
|
241
|
+
? (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=False;Connection Timeout=120;`
|
|
242
|
+
: (0, pulumi_1.interpolate) `Data Source=${sqlName}.database.windows.net;Initial Catalog=${d.name};Authentication=Active Directory Integrated;;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=120;`;
|
|
243
|
+
(0, CustomHelper_1.addCustomSecret)({
|
|
244
|
+
name: d.name,
|
|
245
|
+
value: connectionString,
|
|
246
|
+
vaultInfo,
|
|
247
|
+
contentType: `Sql ${d.name} Connection String`,
|
|
248
|
+
dependsOn: d.resource,
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
return d;
|
|
252
|
+
});
|
|
226
253
|
return {
|
|
227
254
|
name: sqlName,
|
|
228
255
|
resource: sqlServer,
|
|
@@ -231,4 +258,4 @@ exports.default = ({ name, auth, group, elasticPool, databases, vaultInfo, netwo
|
|
|
231
258
|
adminGroup,
|
|
232
259
|
};
|
|
233
260
|
};
|
|
234
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
|
261
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Sql/index.ts"],"names":[],"mappings":"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"}
|
package/Storage/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { KeyVaultInfo, BasicResourceArgs } from
|
|
2
|
-
import { Input } from
|
|
3
|
-
import { DefaultManagementRules, ManagementRules } from
|
|
1
|
+
import { KeyVaultInfo, BasicResourceArgs } from "../types";
|
|
2
|
+
import { Input } from "@pulumi/pulumi";
|
|
3
|
+
import { DefaultManagementRules, ManagementRules } from "./ManagementRules";
|
|
4
4
|
type ContainerProps = {
|
|
5
5
|
name: string;
|
|
6
6
|
public?: boolean;
|
package/Storage/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const storage = require("@pulumi/azure-native/storage");
|
|
4
|
-
const pulumi_1 = require("@pulumi/pulumi");
|
|
5
4
|
const Helpers_1 = require("../Logs/Helpers");
|
|
6
5
|
const Helper_1 = require("../KeyVault/Helper");
|
|
7
6
|
const AzureEnv_1 = require("../Common/AzureEnv");
|
|
@@ -10,22 +9,17 @@ const Naming_1 = require("../Common/Naming");
|
|
|
10
9
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
11
10
|
const Locker_1 = require("../Core/Locker");
|
|
12
11
|
const ManagementRules_1 = require("./ManagementRules");
|
|
13
|
-
const KeyVaultBase_1 = require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase");
|
|
14
|
-
const getEncryptionKey = (name, vaultInfo) => {
|
|
15
|
-
const n = `${name}-encrypt-key`;
|
|
16
|
-
return (0, pulumi_1.output)((0, KeyVaultBase_1.getKeyVaultBase)(vaultInfo.name).getOrCreateKey(n));
|
|
17
|
-
};
|
|
18
12
|
/** Storage Creator */
|
|
19
13
|
exports.default = ({ name, group, customDomain, allowsCors, vaultInfo, defaultManagementRules, containers = [], queues = [], fileShares = [],
|
|
20
14
|
//appInsight,
|
|
21
15
|
network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock = true, }) => {
|
|
22
16
|
name = (0, Naming_1.getStorageName)(name);
|
|
23
|
-
const primaryKeyName = (0, Naming_1.getKeyName)(name,
|
|
24
|
-
const secondaryKeyName = (0, Naming_1.getKeyName)(name,
|
|
25
|
-
const primaryConnectionKeyName = (0, Naming_1.getConnectionName)(name,
|
|
26
|
-
const secondConnectionKeyName = (0, Naming_1.getConnectionName)(name,
|
|
17
|
+
const primaryKeyName = (0, Naming_1.getKeyName)(name, "primary");
|
|
18
|
+
const secondaryKeyName = (0, Naming_1.getKeyName)(name, "secondary");
|
|
19
|
+
const primaryConnectionKeyName = (0, Naming_1.getConnectionName)(name, "primary");
|
|
20
|
+
const secondConnectionKeyName = (0, Naming_1.getConnectionName)(name, "secondary");
|
|
27
21
|
const encryptionKey = featureFlags.enableKeyVaultEncryption
|
|
28
|
-
? getEncryptionKey(name, vaultInfo)
|
|
22
|
+
? (0, Helper_1.getEncryptionKey)(name, vaultInfo)
|
|
29
23
|
: undefined;
|
|
30
24
|
//To fix identity issue then using this approach https://github.com/pulumi/pulumi-azure-native/blob/master/examples/keyvault/index.ts
|
|
31
25
|
const stg = new storage.StorageAccount(name, {
|
|
@@ -37,13 +31,13 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
|
|
|
37
31
|
? storage.SkuName.Standard_ZRS //Zone redundant in PRD
|
|
38
32
|
: storage.SkuName.Standard_LRS,
|
|
39
33
|
},
|
|
40
|
-
accessTier:
|
|
34
|
+
accessTier: "Hot",
|
|
41
35
|
isHnsEnabled: true,
|
|
42
36
|
enableHttpsTrafficOnly: true,
|
|
43
37
|
allowBlobPublicAccess: policies?.allowBlobPublicAccess,
|
|
44
38
|
allowSharedKeyAccess: featureFlags.allowSharedKeyAccess,
|
|
45
|
-
identity: { type:
|
|
46
|
-
minimumTlsVersion:
|
|
39
|
+
identity: { type: "SystemAssigned" },
|
|
40
|
+
minimumTlsVersion: "TLS1_2",
|
|
47
41
|
//1 Year Months
|
|
48
42
|
keyPolicy: {
|
|
49
43
|
keyExpirationPeriodInDays: policies.keyExpirationPeriodInDays || 365,
|
|
@@ -69,7 +63,7 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
|
|
|
69
63
|
: undefined,
|
|
70
64
|
sasPolicy: {
|
|
71
65
|
expirationAction: storage.ExpirationAction.Log,
|
|
72
|
-
sasExpirationPeriod:
|
|
66
|
+
sasExpirationPeriod: "00.00:30:00",
|
|
73
67
|
},
|
|
74
68
|
customDomain: customDomain && !featureFlags.enableStaticWebsite
|
|
75
69
|
? { name: customDomain, useSubDomainName: true }
|
|
@@ -83,19 +77,19 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
|
|
|
83
77
|
// },
|
|
84
78
|
networkRuleSet: network
|
|
85
79
|
? {
|
|
86
|
-
bypass:
|
|
87
|
-
defaultAction:
|
|
80
|
+
bypass: "Logging, Metrics",
|
|
81
|
+
defaultAction: "Allow",
|
|
88
82
|
virtualNetworkRules: network.subnetId
|
|
89
83
|
? [{ virtualNetworkResourceId: network.subnetId }]
|
|
90
84
|
: undefined,
|
|
91
85
|
ipRules: network.ipAddresses
|
|
92
86
|
? network.ipAddresses.map((i) => ({
|
|
93
87
|
iPAddressOrRange: i,
|
|
94
|
-
action:
|
|
88
|
+
action: "Allow",
|
|
95
89
|
}))
|
|
96
90
|
: undefined,
|
|
97
91
|
}
|
|
98
|
-
: { defaultAction:
|
|
92
|
+
: { defaultAction: "Allow" },
|
|
99
93
|
});
|
|
100
94
|
//Soft Delete
|
|
101
95
|
if (policies) {
|
|
@@ -149,8 +143,8 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
|
|
|
149
143
|
new storage.StorageAccountStaticWebsite(name, {
|
|
150
144
|
accountName: stg.name,
|
|
151
145
|
...group,
|
|
152
|
-
indexDocument:
|
|
153
|
-
error404Document:
|
|
146
|
+
indexDocument: "index.html",
|
|
147
|
+
error404Document: "index.html",
|
|
154
148
|
}, { dependsOn: stg });
|
|
155
149
|
// if (appInsight && customDomain) {
|
|
156
150
|
// addInsightMonitor({ name, appInsight, url: customDomain });
|
|
@@ -178,7 +172,7 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
|
|
|
178
172
|
...group,
|
|
179
173
|
accountName: stg.name,
|
|
180
174
|
//denyEncryptionScopeOverride: true,
|
|
181
|
-
publicAccess: c.public ?
|
|
175
|
+
publicAccess: c.public ? "Blob" : "None",
|
|
182
176
|
});
|
|
183
177
|
if (c.managementRules) {
|
|
184
178
|
(0, ManagementRules_1.createManagementRules)({
|
|
@@ -211,7 +205,7 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
|
|
|
211
205
|
stg.id.apply(async (id) => {
|
|
212
206
|
if (!id)
|
|
213
207
|
return;
|
|
214
|
-
stg.identity.apply((i) => console.log(
|
|
208
|
+
stg.identity.apply((i) => console.log("Add this ID into Key Vault ReadOnly Group to allows custom key encryption:", i.principalId));
|
|
215
209
|
const keys = (await storage.listStorageAccountKeys({
|
|
216
210
|
accountName: name,
|
|
217
211
|
resourceGroupName: group.resourceGroupName,
|
|
@@ -224,7 +218,7 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
|
|
|
224
218
|
//Keys
|
|
225
219
|
(0, CustomHelper_1.addCustomSecrets)({
|
|
226
220
|
vaultInfo,
|
|
227
|
-
contentType:
|
|
221
|
+
contentType: "Storage",
|
|
228
222
|
formattedName: true,
|
|
229
223
|
items: [
|
|
230
224
|
{
|
|
@@ -260,4 +254,4 @@ network, featureFlags = {}, policies = { keyExpirationPeriodInDays: 365 }, lock
|
|
|
260
254
|
: undefined,
|
|
261
255
|
};
|
|
262
256
|
};
|
|
263
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
257
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Storage/index.ts"],"names":[],"mappings":"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"}
|