@aws-solutions-constructs/core 2.9.0 → 2.12.0
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/.jsii +137 -68
- package/lib/elasticsearch-defaults.d.ts +2 -8
- package/lib/elasticsearch-defaults.js +7 -16
- package/lib/elasticsearch-helper.d.ts +13 -2
- package/lib/elasticsearch-helper.js +100 -45
- package/lib/lambda-helper.d.ts +1 -0
- package/lib/lambda-helper.js +8 -2
- package/lib/vpc-defaults.js +6 -1
- package/package.json +4 -4
- package/test/elasticsearch-helper.test.js +131 -11
- package/test/lambda-helper.test.js +17 -1
- package/test/test-helper.d.ts +1 -1
- package/test/test-helper.js +3 -2
package/.jsii
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"npmlog": "^4.1.2"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"aws-cdk-lib": "^2.
|
|
16
|
+
"aws-cdk-lib": "^2.25.0",
|
|
17
17
|
"constructs": "^10.0.0"
|
|
18
18
|
},
|
|
19
19
|
"dependencyClosure": {
|
|
@@ -2724,6 +2724,19 @@
|
|
|
2724
2724
|
}
|
|
2725
2725
|
}
|
|
2726
2726
|
},
|
|
2727
|
+
"aws-cdk-lib.aws_voiceid": {
|
|
2728
|
+
"targets": {
|
|
2729
|
+
"dotnet": {
|
|
2730
|
+
"namespace": "Amazon.CDK.AWS.VoiceID"
|
|
2731
|
+
},
|
|
2732
|
+
"java": {
|
|
2733
|
+
"package": "software.amazon.awscdk.services.voiceid"
|
|
2734
|
+
},
|
|
2735
|
+
"python": {
|
|
2736
|
+
"module": "aws_cdk.aws_voiceid"
|
|
2737
|
+
}
|
|
2738
|
+
}
|
|
2739
|
+
},
|
|
2727
2740
|
"aws-cdk-lib.aws_waf": {
|
|
2728
2741
|
"targets": {
|
|
2729
2742
|
"dotnet": {
|
|
@@ -2987,7 +3000,7 @@
|
|
|
2987
3000
|
},
|
|
2988
3001
|
"description": "Core CDK Construct for patterns library",
|
|
2989
3002
|
"homepage": "https://github.com/awslabs/aws-solutions-constructs.git",
|
|
2990
|
-
"jsiiVersion": "1.
|
|
3003
|
+
"jsiiVersion": "1.62.0 (build 293ac17)",
|
|
2991
3004
|
"license": "Apache-2.0",
|
|
2992
3005
|
"metadata": {
|
|
2993
3006
|
"jsii": {
|
|
@@ -3397,6 +3410,125 @@
|
|
|
3397
3410
|
],
|
|
3398
3411
|
"symbolId": "lib/dynamodb-table-helper:BuildDynamoDBTableWithStreamProps"
|
|
3399
3412
|
},
|
|
3413
|
+
"@aws-solutions-constructs/core.BuildElasticSearchProps": {
|
|
3414
|
+
"assembly": "@aws-solutions-constructs/core",
|
|
3415
|
+
"datatype": true,
|
|
3416
|
+
"fqn": "@aws-solutions-constructs/core.BuildElasticSearchProps",
|
|
3417
|
+
"kind": "interface",
|
|
3418
|
+
"locationInModule": {
|
|
3419
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3420
|
+
"line": 27
|
|
3421
|
+
},
|
|
3422
|
+
"name": "BuildElasticSearchProps",
|
|
3423
|
+
"properties": [
|
|
3424
|
+
{
|
|
3425
|
+
"abstract": true,
|
|
3426
|
+
"immutable": true,
|
|
3427
|
+
"locationInModule": {
|
|
3428
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3429
|
+
"line": 30
|
|
3430
|
+
},
|
|
3431
|
+
"name": "cognitoAuthorizedRoleARN",
|
|
3432
|
+
"type": {
|
|
3433
|
+
"primitive": "string"
|
|
3434
|
+
}
|
|
3435
|
+
},
|
|
3436
|
+
{
|
|
3437
|
+
"abstract": true,
|
|
3438
|
+
"immutable": true,
|
|
3439
|
+
"locationInModule": {
|
|
3440
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3441
|
+
"line": 33
|
|
3442
|
+
},
|
|
3443
|
+
"name": "domainName",
|
|
3444
|
+
"type": {
|
|
3445
|
+
"primitive": "string"
|
|
3446
|
+
}
|
|
3447
|
+
},
|
|
3448
|
+
{
|
|
3449
|
+
"abstract": true,
|
|
3450
|
+
"immutable": true,
|
|
3451
|
+
"locationInModule": {
|
|
3452
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3453
|
+
"line": 28
|
|
3454
|
+
},
|
|
3455
|
+
"name": "identitypool",
|
|
3456
|
+
"type": {
|
|
3457
|
+
"fqn": "aws-cdk-lib.aws_cognito.CfnIdentityPool"
|
|
3458
|
+
}
|
|
3459
|
+
},
|
|
3460
|
+
{
|
|
3461
|
+
"abstract": true,
|
|
3462
|
+
"immutable": true,
|
|
3463
|
+
"locationInModule": {
|
|
3464
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3465
|
+
"line": 29
|
|
3466
|
+
},
|
|
3467
|
+
"name": "userpool",
|
|
3468
|
+
"type": {
|
|
3469
|
+
"fqn": "aws-cdk-lib.aws_cognito.UserPool"
|
|
3470
|
+
}
|
|
3471
|
+
},
|
|
3472
|
+
{
|
|
3473
|
+
"abstract": true,
|
|
3474
|
+
"immutable": true,
|
|
3475
|
+
"locationInModule": {
|
|
3476
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3477
|
+
"line": 34
|
|
3478
|
+
},
|
|
3479
|
+
"name": "clientDomainProps",
|
|
3480
|
+
"optional": true,
|
|
3481
|
+
"type": {
|
|
3482
|
+
"fqn": "aws-cdk-lib.aws_elasticsearch.CfnDomainProps"
|
|
3483
|
+
}
|
|
3484
|
+
},
|
|
3485
|
+
{
|
|
3486
|
+
"abstract": true,
|
|
3487
|
+
"immutable": true,
|
|
3488
|
+
"locationInModule": {
|
|
3489
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3490
|
+
"line": 35
|
|
3491
|
+
},
|
|
3492
|
+
"name": "securityGroupIds",
|
|
3493
|
+
"optional": true,
|
|
3494
|
+
"type": {
|
|
3495
|
+
"collection": {
|
|
3496
|
+
"elementtype": {
|
|
3497
|
+
"primitive": "string"
|
|
3498
|
+
},
|
|
3499
|
+
"kind": "array"
|
|
3500
|
+
}
|
|
3501
|
+
}
|
|
3502
|
+
},
|
|
3503
|
+
{
|
|
3504
|
+
"abstract": true,
|
|
3505
|
+
"immutable": true,
|
|
3506
|
+
"locationInModule": {
|
|
3507
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3508
|
+
"line": 31
|
|
3509
|
+
},
|
|
3510
|
+
"name": "serviceRoleARN",
|
|
3511
|
+
"optional": true,
|
|
3512
|
+
"type": {
|
|
3513
|
+
"primitive": "string"
|
|
3514
|
+
}
|
|
3515
|
+
},
|
|
3516
|
+
{
|
|
3517
|
+
"abstract": true,
|
|
3518
|
+
"immutable": true,
|
|
3519
|
+
"locationInModule": {
|
|
3520
|
+
"filename": "lib/elasticsearch-helper.ts",
|
|
3521
|
+
"line": 32
|
|
3522
|
+
},
|
|
3523
|
+
"name": "vpc",
|
|
3524
|
+
"optional": true,
|
|
3525
|
+
"type": {
|
|
3526
|
+
"fqn": "aws-cdk-lib.aws_ec2.IVpc"
|
|
3527
|
+
}
|
|
3528
|
+
}
|
|
3529
|
+
],
|
|
3530
|
+
"symbolId": "lib/elasticsearch-helper:BuildElasticSearchProps"
|
|
3531
|
+
},
|
|
3400
3532
|
"@aws-solutions-constructs/core.BuildEventBusProps": {
|
|
3401
3533
|
"assembly": "@aws-solutions-constructs/core",
|
|
3402
3534
|
"datatype": true,
|
|
@@ -4301,69 +4433,6 @@
|
|
|
4301
4433
|
],
|
|
4302
4434
|
"symbolId": "lib/waf-helper:BuildWebaclProps"
|
|
4303
4435
|
},
|
|
4304
|
-
"@aws-solutions-constructs/core.CfnDomainOptions": {
|
|
4305
|
-
"assembly": "@aws-solutions-constructs/core",
|
|
4306
|
-
"datatype": true,
|
|
4307
|
-
"fqn": "@aws-solutions-constructs/core.CfnDomainOptions",
|
|
4308
|
-
"kind": "interface",
|
|
4309
|
-
"locationInModule": {
|
|
4310
|
-
"filename": "lib/elasticsearch-defaults.ts",
|
|
4311
|
-
"line": 19
|
|
4312
|
-
},
|
|
4313
|
-
"name": "CfnDomainOptions",
|
|
4314
|
-
"properties": [
|
|
4315
|
-
{
|
|
4316
|
-
"abstract": true,
|
|
4317
|
-
"immutable": true,
|
|
4318
|
-
"locationInModule": {
|
|
4319
|
-
"filename": "lib/elasticsearch-defaults.ts",
|
|
4320
|
-
"line": 22
|
|
4321
|
-
},
|
|
4322
|
-
"name": "cognitoAuthorizedRoleARN",
|
|
4323
|
-
"type": {
|
|
4324
|
-
"primitive": "string"
|
|
4325
|
-
}
|
|
4326
|
-
},
|
|
4327
|
-
{
|
|
4328
|
-
"abstract": true,
|
|
4329
|
-
"immutable": true,
|
|
4330
|
-
"locationInModule": {
|
|
4331
|
-
"filename": "lib/elasticsearch-defaults.ts",
|
|
4332
|
-
"line": 20
|
|
4333
|
-
},
|
|
4334
|
-
"name": "identitypool",
|
|
4335
|
-
"type": {
|
|
4336
|
-
"fqn": "aws-cdk-lib.aws_cognito.CfnIdentityPool"
|
|
4337
|
-
}
|
|
4338
|
-
},
|
|
4339
|
-
{
|
|
4340
|
-
"abstract": true,
|
|
4341
|
-
"immutable": true,
|
|
4342
|
-
"locationInModule": {
|
|
4343
|
-
"filename": "lib/elasticsearch-defaults.ts",
|
|
4344
|
-
"line": 21
|
|
4345
|
-
},
|
|
4346
|
-
"name": "userpool",
|
|
4347
|
-
"type": {
|
|
4348
|
-
"fqn": "aws-cdk-lib.aws_cognito.UserPool"
|
|
4349
|
-
}
|
|
4350
|
-
},
|
|
4351
|
-
{
|
|
4352
|
-
"abstract": true,
|
|
4353
|
-
"immutable": true,
|
|
4354
|
-
"locationInModule": {
|
|
4355
|
-
"filename": "lib/elasticsearch-defaults.ts",
|
|
4356
|
-
"line": 23
|
|
4357
|
-
},
|
|
4358
|
-
"name": "serviceRoleARN",
|
|
4359
|
-
"optional": true,
|
|
4360
|
-
"type": {
|
|
4361
|
-
"primitive": "string"
|
|
4362
|
-
}
|
|
4363
|
-
}
|
|
4364
|
-
],
|
|
4365
|
-
"symbolId": "lib/elasticsearch-defaults:CfnDomainOptions"
|
|
4366
|
-
},
|
|
4367
4436
|
"@aws-solutions-constructs/core.CfnNagSuppressRule": {
|
|
4368
4437
|
"assembly": "@aws-solutions-constructs/core",
|
|
4369
4438
|
"datatype": true,
|
|
@@ -5268,6 +5337,6 @@
|
|
|
5268
5337
|
"symbolId": "lib/input-validation:VerifiedProps"
|
|
5269
5338
|
}
|
|
5270
5339
|
},
|
|
5271
|
-
"version": "2.
|
|
5272
|
-
"fingerprint": "
|
|
5273
|
-
}
|
|
5340
|
+
"version": "2.12.0",
|
|
5341
|
+
"fingerprint": "YewLfZPkAwy3JFk6uid1ZLeWdqnXdRu4SPV8lvwVDhw="
|
|
5342
|
+
}
|
|
@@ -11,12 +11,6 @@
|
|
|
11
11
|
* and limitations under the License.
|
|
12
12
|
*/
|
|
13
13
|
import * as elasticsearch from 'aws-cdk-lib/aws-elasticsearch';
|
|
14
|
-
import * as cognito from 'aws-cdk-lib/aws-cognito';
|
|
15
14
|
import * as iam from 'aws-cdk-lib/aws-iam';
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
readonly userpool: cognito.UserPool;
|
|
19
|
-
readonly cognitoAuthorizedRoleARN: string;
|
|
20
|
-
readonly serviceRoleARN?: string;
|
|
21
|
-
}
|
|
22
|
-
export declare function DefaultCfnDomainProps(domainName: string, cognitoKibanaConfigureRole: iam.Role, options: CfnDomainOptions): elasticsearch.CfnDomainProps;
|
|
15
|
+
import { BuildElasticSearchProps } from './elasticsearch-helper';
|
|
16
|
+
export declare function DefaultCfnDomainProps(domainName: string, cognitoKibanaConfigureRole: iam.Role, props: BuildElasticSearchProps): elasticsearch.CfnDomainProps;
|
|
@@ -15,11 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.DefaultCfnDomainProps = void 0;
|
|
16
16
|
const iam = require("aws-cdk-lib/aws-iam");
|
|
17
17
|
const cdk = require("aws-cdk-lib");
|
|
18
|
-
function DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole,
|
|
18
|
+
function DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, props) {
|
|
19
19
|
const roleARNs = [];
|
|
20
|
-
roleARNs.push(new iam.ArnPrincipal(
|
|
21
|
-
if (
|
|
22
|
-
roleARNs.push(new iam.ArnPrincipal(
|
|
20
|
+
roleARNs.push(new iam.ArnPrincipal(props.cognitoAuthorizedRoleARN));
|
|
21
|
+
if (props.serviceRoleARN) {
|
|
22
|
+
roleARNs.push(new iam.ArnPrincipal(props.serviceRoleARN));
|
|
23
23
|
}
|
|
24
24
|
return {
|
|
25
25
|
domainName,
|
|
@@ -30,15 +30,6 @@ function DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options)
|
|
|
30
30
|
nodeToNodeEncryptionOptions: {
|
|
31
31
|
enabled: true
|
|
32
32
|
},
|
|
33
|
-
elasticsearchClusterConfig: {
|
|
34
|
-
dedicatedMasterEnabled: true,
|
|
35
|
-
dedicatedMasterCount: 3,
|
|
36
|
-
instanceCount: 3,
|
|
37
|
-
zoneAwarenessEnabled: true,
|
|
38
|
-
zoneAwarenessConfig: {
|
|
39
|
-
availabilityZoneCount: 3
|
|
40
|
-
}
|
|
41
|
-
},
|
|
42
33
|
snapshotOptions: {
|
|
43
34
|
automatedSnapshotStartHour: 1
|
|
44
35
|
},
|
|
@@ -48,8 +39,8 @@ function DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options)
|
|
|
48
39
|
},
|
|
49
40
|
cognitoOptions: {
|
|
50
41
|
enabled: true,
|
|
51
|
-
identityPoolId:
|
|
52
|
-
userPoolId:
|
|
42
|
+
identityPoolId: props.identitypool.ref,
|
|
43
|
+
userPoolId: props.userpool.userPoolId,
|
|
53
44
|
roleArn: cognitoKibanaConfigureRole.roleArn
|
|
54
45
|
},
|
|
55
46
|
accessPolicies: new iam.PolicyDocument({
|
|
@@ -68,4 +59,4 @@ function DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options)
|
|
|
68
59
|
};
|
|
69
60
|
}
|
|
70
61
|
exports.DefaultCfnDomainProps = DefaultCfnDomainProps;
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxhc3RpY3NlYXJjaC1kZWZhdWx0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImVsYXN0aWNzZWFyY2gtZGVmYXVsdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOzs7QUFHSCwyQ0FBMkM7QUFDM0MsbUNBQW1DO0FBR25DLFNBQWdCLHFCQUFxQixDQUFDLFVBQWtCLEVBQUUsMEJBQW9DLEVBQUUsS0FBOEI7SUFFNUgsTUFBTSxRQUFRLEdBQXFCLEVBQUUsQ0FBQztJQUV0QyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQyxDQUFDO0lBRXBFLElBQUksS0FBSyxDQUFDLGNBQWMsRUFBRTtRQUN4QixRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztLQUMzRDtJQUVELE9BQU87UUFDTCxVQUFVO1FBQ1Ysb0JBQW9CLEVBQUUsS0FBSztRQUMzQix1QkFBdUIsRUFBRTtZQUN2QixPQUFPLEVBQUUsSUFBSTtTQUNkO1FBQ0QsMkJBQTJCLEVBQUU7WUFDM0IsT0FBTyxFQUFFLElBQUk7U0FDZDtRQUNELGVBQWUsRUFBRTtZQUNmLDBCQUEwQixFQUFFLENBQUM7U0FDOUI7UUFDRCxVQUFVLEVBQUU7WUFDVixVQUFVLEVBQUUsSUFBSTtZQUNoQixVQUFVLEVBQUUsRUFBRTtTQUNmO1FBQ0QsY0FBYyxFQUFFO1lBQ2QsT0FBTyxFQUFFLElBQUk7WUFDYixjQUFjLEVBQUUsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHO1lBQ3RDLFVBQVUsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFVBQVU7WUFDckMsT0FBTyxFQUFFLDBCQUEwQixDQUFDLE9BQU87U0FDNUM7UUFDRCxjQUFjLEVBQUUsSUFBSSxHQUFHLENBQUMsY0FBYyxDQUFDO1lBQ3JDLFVBQVUsRUFBRTtnQkFDVixJQUFJLEdBQUcsQ0FBQyxlQUFlLENBQUM7b0JBQ3RCLFVBQVUsRUFBRSxRQUFRO29CQUNwQixPQUFPLEVBQUU7d0JBQ1AsWUFBWTtxQkFDYjtvQkFDRCxTQUFTLEVBQUU7d0JBQ1QsY0FBYyxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsV0FBVyxVQUFVLElBQUk7cUJBQzVFO2lCQUNGLENBQUM7YUFDSDtTQUNGLENBQUM7S0FDNkIsQ0FBQztBQUNwQyxDQUFDO0FBOUNELHNEQThDQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0ICogYXMgZWxhc3RpY3NlYXJjaCBmcm9tICdhd3MtY2RrLWxpYi9hd3MtZWxhc3RpY3NlYXJjaCc7XG5pbXBvcnQgKiBhcyBpYW0gZnJvbSAnYXdzLWNkay1saWIvYXdzLWlhbSc7XG5pbXBvcnQgKiBhcyBjZGsgZnJvbSAnYXdzLWNkay1saWInO1xuaW1wb3J0IHsgQnVpbGRFbGFzdGljU2VhcmNoUHJvcHMgfSBmcm9tICcuL2VsYXN0aWNzZWFyY2gtaGVscGVyJztcblxuZXhwb3J0IGZ1bmN0aW9uIERlZmF1bHRDZm5Eb21haW5Qcm9wcyhkb21haW5OYW1lOiBzdHJpbmcsIGNvZ25pdG9LaWJhbmFDb25maWd1cmVSb2xlOiBpYW0uUm9sZSwgcHJvcHM6IEJ1aWxkRWxhc3RpY1NlYXJjaFByb3BzKTpcbiAgZWxhc3RpY3NlYXJjaC5DZm5Eb21haW5Qcm9wcyB7XG4gIGNvbnN0IHJvbGVBUk5zOiBpYW0uSVByaW5jaXBhbFtdID0gW107XG5cbiAgcm9sZUFSTnMucHVzaChuZXcgaWFtLkFyblByaW5jaXBhbChwcm9wcy5jb2duaXRvQXV0aG9yaXplZFJvbGVBUk4pKTtcblxuICBpZiAocHJvcHMuc2VydmljZVJvbGVBUk4pIHtcbiAgICByb2xlQVJOcy5wdXNoKG5ldyBpYW0uQXJuUHJpbmNpcGFsKHByb3BzLnNlcnZpY2VSb2xlQVJOKSk7XG4gIH1cblxuICByZXR1cm4ge1xuICAgIGRvbWFpbk5hbWUsXG4gICAgZWxhc3RpY3NlYXJjaFZlcnNpb246ICc2LjMnLFxuICAgIGVuY3J5cHRpb25BdFJlc3RPcHRpb25zOiB7XG4gICAgICBlbmFibGVkOiB0cnVlXG4gICAgfSxcbiAgICBub2RlVG9Ob2RlRW5jcnlwdGlvbk9wdGlvbnM6IHtcbiAgICAgIGVuYWJsZWQ6IHRydWVcbiAgICB9LFxuICAgIHNuYXBzaG90T3B0aW9uczoge1xuICAgICAgYXV0b21hdGVkU25hcHNob3RTdGFydEhvdXI6IDFcbiAgICB9LFxuICAgIGVic09wdGlvbnM6IHtcbiAgICAgIGVic0VuYWJsZWQ6IHRydWUsXG4gICAgICB2b2x1bWVTaXplOiAxMFxuICAgIH0sXG4gICAgY29nbml0b09wdGlvbnM6IHtcbiAgICAgIGVuYWJsZWQ6IHRydWUsXG4gICAgICBpZGVudGl0eVBvb2xJZDogcHJvcHMuaWRlbnRpdHlwb29sLnJlZixcbiAgICAgIHVzZXJQb29sSWQ6IHByb3BzLnVzZXJwb29sLnVzZXJQb29sSWQsXG4gICAgICByb2xlQXJuOiBjb2duaXRvS2liYW5hQ29uZmlndXJlUm9sZS5yb2xlQXJuXG4gICAgfSxcbiAgICBhY2Nlc3NQb2xpY2llczogbmV3IGlhbS5Qb2xpY3lEb2N1bWVudCh7XG4gICAgICBzdGF0ZW1lbnRzOiBbXG4gICAgICAgIG5ldyBpYW0uUG9saWN5U3RhdGVtZW50KHtcbiAgICAgICAgICBwcmluY2lwYWxzOiByb2xlQVJOcyxcbiAgICAgICAgICBhY3Rpb25zOiBbXG4gICAgICAgICAgICAnZXM6RVNIdHRwKidcbiAgICAgICAgICBdLFxuICAgICAgICAgIHJlc291cmNlczogW1xuICAgICAgICAgICAgYGFybjphd3M6ZXM6JHtjZGsuQXdzLlJFR0lPTn06JHtjZGsuQXdzLkFDQ09VTlRfSUR9OmRvbWFpbi8ke2RvbWFpbk5hbWV9LypgXG4gICAgICAgICAgXVxuICAgICAgICB9KVxuICAgICAgXVxuICAgIH0pXG4gIH0gYXMgZWxhc3RpY3NlYXJjaC5DZm5Eb21haW5Qcm9wcztcbn0iXX0=
|
|
@@ -11,9 +11,20 @@
|
|
|
11
11
|
* and limitations under the License.
|
|
12
12
|
*/
|
|
13
13
|
import * as elasticsearch from 'aws-cdk-lib/aws-elasticsearch';
|
|
14
|
-
import { CfnDomainOptions } from './elasticsearch-defaults';
|
|
15
14
|
import * as iam from 'aws-cdk-lib/aws-iam';
|
|
16
15
|
import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch';
|
|
16
|
+
import * as cognito from 'aws-cdk-lib/aws-cognito';
|
|
17
|
+
import * as ec2 from 'aws-cdk-lib/aws-ec2';
|
|
17
18
|
import { Construct } from 'constructs';
|
|
18
|
-
export
|
|
19
|
+
export interface BuildElasticSearchProps {
|
|
20
|
+
readonly identitypool: cognito.CfnIdentityPool;
|
|
21
|
+
readonly userpool: cognito.UserPool;
|
|
22
|
+
readonly cognitoAuthorizedRoleARN: string;
|
|
23
|
+
readonly serviceRoleARN?: string;
|
|
24
|
+
readonly vpc?: ec2.IVpc;
|
|
25
|
+
readonly domainName: string;
|
|
26
|
+
readonly clientDomainProps?: elasticsearch.CfnDomainProps;
|
|
27
|
+
readonly securityGroupIds?: string[];
|
|
28
|
+
}
|
|
29
|
+
export declare function buildElasticSearch(scope: Construct, props: BuildElasticSearchProps): [elasticsearch.CfnDomain, iam.Role];
|
|
19
30
|
export declare function buildElasticSearchCWAlarms(scope: Construct): cloudwatch.Alarm[];
|
|
@@ -19,51 +19,36 @@ const utils_1 = require("./utils");
|
|
|
19
19
|
const iam = require("aws-cdk-lib/aws-iam");
|
|
20
20
|
const cdk = require("aws-cdk-lib");
|
|
21
21
|
const cloudwatch = require("aws-cdk-lib/aws-cloudwatch");
|
|
22
|
-
|
|
22
|
+
const ec2 = require("aws-cdk-lib/aws-ec2");
|
|
23
|
+
const MaximumAzsInElasticsearchDomain = 3;
|
|
24
|
+
function buildElasticSearch(scope, props) {
|
|
25
|
+
let subnetIds = [];
|
|
26
|
+
const constructDrivenProps = {};
|
|
23
27
|
// Setup the IAM Role & policy for ES to configure Cognito User pool and Identity pool
|
|
24
|
-
const cognitoKibanaConfigureRole =
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
]
|
|
49
|
-
}),
|
|
50
|
-
new iam.PolicyStatement({
|
|
51
|
-
actions: [
|
|
52
|
-
"iam:PassRole"
|
|
53
|
-
],
|
|
54
|
-
conditions: {
|
|
55
|
-
StringLike: { 'iam:PassedToService': 'cognito-identity.amazonaws.com' }
|
|
56
|
-
},
|
|
57
|
-
resources: [
|
|
58
|
-
cognitoKibanaConfigureRole.roleArn
|
|
59
|
-
]
|
|
60
|
-
})
|
|
61
|
-
]
|
|
62
|
-
});
|
|
63
|
-
cognitoKibanaConfigureRolePolicy.attachToRole(cognitoKibanaConfigureRole);
|
|
64
|
-
let _cfnDomainProps = elasticsearch_defaults_1.DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options);
|
|
65
|
-
_cfnDomainProps = utils_1.consolidateProps(_cfnDomainProps, cfnDomainProps);
|
|
66
|
-
const esDomain = new elasticsearch.CfnDomain(scope, "ElasticsearchDomain", _cfnDomainProps);
|
|
28
|
+
const cognitoKibanaConfigureRole = createKibanaCognitoRole(scope, props.userpool, props.identitypool, props.domainName);
|
|
29
|
+
if (props.vpc) {
|
|
30
|
+
subnetIds = retrievePrivateSubnetIds(props.vpc);
|
|
31
|
+
if (subnetIds.length > MaximumAzsInElasticsearchDomain) {
|
|
32
|
+
subnetIds = subnetIds.slice(0, MaximumAzsInElasticsearchDomain);
|
|
33
|
+
}
|
|
34
|
+
constructDrivenProps.vpcOptions = {
|
|
35
|
+
subnetIds,
|
|
36
|
+
securityGroupIds: props.securityGroupIds
|
|
37
|
+
};
|
|
38
|
+
// If the client did not submit a ClusterConfig, then we will create one
|
|
39
|
+
if (!props.clientDomainProps?.elasticsearchClusterConfig) {
|
|
40
|
+
constructDrivenProps.elasticsearchClusterConfig = createClusterConfiguration(subnetIds.length);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
else { // No VPC
|
|
44
|
+
// If the client did not submit a ClusterConfig, then we will create one based on the Region
|
|
45
|
+
if (!props.clientDomainProps?.elasticsearchClusterConfig) {
|
|
46
|
+
constructDrivenProps.elasticsearchClusterConfig = createClusterConfiguration(cdk.Stack.of(scope).availabilityZones.length);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
const defaultCfnDomainProps = elasticsearch_defaults_1.DefaultCfnDomainProps(props.domainName, cognitoKibanaConfigureRole, props);
|
|
50
|
+
const finalCfnDomainProps = utils_1.consolidateProps(defaultCfnDomainProps, props.clientDomainProps, constructDrivenProps);
|
|
51
|
+
const esDomain = new elasticsearch.CfnDomain(scope, `ElasticsearchDomain`, finalCfnDomainProps);
|
|
67
52
|
utils_1.addCfnSuppressRules(esDomain, [
|
|
68
53
|
{
|
|
69
54
|
id: "W28",
|
|
@@ -200,4 +185,74 @@ function buildElasticSearchCWAlarms(scope) {
|
|
|
200
185
|
return alarms;
|
|
201
186
|
}
|
|
202
187
|
exports.buildElasticSearchCWAlarms = buildElasticSearchCWAlarms;
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"elasticsearch-helper.js","sourceRoot":"","sources":["elasticsearch-helper.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport * as elasticsearch from 'aws-cdk-lib/aws-elasticsearch';\nimport { CfnDomainOptions, DefaultCfnDomainProps } from './elasticsearch-defaults';\nimport { consolidateProps, addCfnSuppressRules } from './utils';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as cdk from 'aws-cdk-lib';\nimport * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from 'constructs';\n\nexport function buildElasticSearch(scope: Construct, domainName: string,\n  options: CfnDomainOptions, cfnDomainProps?: elasticsearch.CfnDomainProps): [elasticsearch.CfnDomain, iam.Role] {\n\n  // Setup the IAM Role & policy for ES to configure Cognito User pool and Identity pool\n  const cognitoKibanaConfigureRole = new iam.Role(scope, 'CognitoKibanaConfigureRole', {\n    assumedBy: new iam.ServicePrincipal('es.amazonaws.com')\n  });\n\n  const cognitoKibanaConfigureRolePolicy = new iam.Policy(scope, 'CognitoKibanaConfigureRolePolicy', {\n    statements: [\n      new iam.PolicyStatement({\n        actions: [\n          \"cognito-idp:DescribeUserPool\",\n          \"cognito-idp:CreateUserPoolClient\",\n          \"cognito-idp:DeleteUserPoolClient\",\n          \"cognito-idp:DescribeUserPoolClient\",\n          \"cognito-idp:AdminInitiateAuth\",\n          \"cognito-idp:AdminUserGlobalSignOut\",\n          \"cognito-idp:ListUserPoolClients\",\n          \"cognito-identity:DescribeIdentityPool\",\n          \"cognito-identity:UpdateIdentityPool\",\n          \"cognito-identity:SetIdentityPoolRoles\",\n          \"cognito-identity:GetIdentityPoolRoles\",\n          \"es:UpdateElasticsearchDomainConfig\"\n        ],\n        resources: [\n          options.userpool.userPoolArn,\n          `arn:aws:cognito-identity:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:identitypool/${options.identitypool.ref}`,\n          `arn:aws:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/${domainName}`\n        ]\n      }),\n      new iam.PolicyStatement({\n        actions: [\n          \"iam:PassRole\"\n        ],\n        conditions: {\n          StringLike: { 'iam:PassedToService': 'cognito-identity.amazonaws.com' }\n        },\n        resources: [\n          cognitoKibanaConfigureRole.roleArn\n        ]\n      })\n    ]\n  });\n  cognitoKibanaConfigureRolePolicy.attachToRole(cognitoKibanaConfigureRole);\n\n  let _cfnDomainProps = DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options);\n\n  _cfnDomainProps = consolidateProps(_cfnDomainProps, cfnDomainProps);\n\n  const esDomain = new elasticsearch.CfnDomain(scope, \"ElasticsearchDomain\", _cfnDomainProps);\n  addCfnSuppressRules(esDomain, [\n    {\n      id: \"W28\",\n      reason: `The ES Domain is passed dynamically as as parameter and explicitly specified to ensure that IAM policies are configured to lockdown access to this specific ES instance only`,\n    },\n    {\n      id: \"W90\",\n      reason: `This is not a rule for the general case, just for specific use cases/industries`,\n    },\n  ]);\n\n  return [esDomain, cognitoKibanaConfigureRole];\n}\n\nexport function buildElasticSearchCWAlarms(scope: Construct): cloudwatch.Alarm[] {\n  // Setup CW Alarms for ES\n  const alarms: cloudwatch.Alarm[] = new Array();\n\n  // ClusterStatus.red maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'StatusRedAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterStatus.red',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'At least one primary shard and its replicas are not allocated to a node. '\n  }));\n\n  // ClusterStatus.yellow maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'StatusYellowAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterStatus.yellow',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'At least one replica shard is not allocated to a node.'\n  }));\n\n  // FreeStorageSpace minimum is <= 20480 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'FreeStorageSpaceTooLowAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'FreeStorageSpace',\n      statistic: 'Minimum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 20000,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'A node in your cluster is down to 20 GiB of free storage space.'\n  }));\n\n  // ClusterIndexWritesBlocked is >= 1 for 5 minutes, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'IndexWritesBlockedTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterIndexWritesBlocked',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(300),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Your cluster is blocking write requests.'\n  }));\n\n  // AutomatedSnapshotFailure maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'AutomatedSnapshotFailureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'AutomatedSnapshotFailure',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'An automated snapshot failed. This failure is often the result of a red cluster health status.'\n  }));\n\n  // CPUUtilization maximum is >= 80% for 15 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'CPUUtilizationTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'CPUUtilization',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 80,\n    evaluationPeriods: 3,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: '100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.'\n  }));\n\n  // JVMMemoryPressure maximum is >= 80% for 5 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'JVMMemoryPressureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'JVMMemoryPressure',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 80,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.'\n  }));\n\n  // MasterCPUUtilization maximum is >= 50% for 15 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'MasterCPUUtilizationTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'MasterCPUUtilization',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 50,\n    evaluationPeriods: 3,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.'\n  }));\n\n  // MasterJVMMemoryPressure maximum is >= 80% for 15 minutes, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'MasterJVMMemoryPressureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'MasterJVMMemoryPressure',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 50,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.'\n  }));\n\n  return alarms;\n}\n"]}
|
|
188
|
+
function retrievePrivateSubnetIds(vpc) {
|
|
189
|
+
let targetSubnetType;
|
|
190
|
+
if (vpc.isolatedSubnets.length) {
|
|
191
|
+
targetSubnetType = ec2.SubnetType.PRIVATE_ISOLATED;
|
|
192
|
+
}
|
|
193
|
+
else if (vpc.privateSubnets.length) {
|
|
194
|
+
targetSubnetType = ec2.SubnetType.PRIVATE_WITH_NAT;
|
|
195
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
throw new Error('Error - ElasticSearch Domains can only be deployed in Isolated or Private subnets');
|
|
198
|
+
}
|
|
199
|
+
const subnetSelector = {
|
|
200
|
+
onePerAz: true,
|
|
201
|
+
subnetType: targetSubnetType
|
|
202
|
+
};
|
|
203
|
+
return vpc.selectSubnets(subnetSelector).subnetIds;
|
|
204
|
+
}
|
|
205
|
+
function createClusterConfiguration(numberOfAzs) {
|
|
206
|
+
return {
|
|
207
|
+
dedicatedMasterEnabled: true,
|
|
208
|
+
dedicatedMasterCount: 3,
|
|
209
|
+
zoneAwarenessEnabled: true,
|
|
210
|
+
zoneAwarenessConfig: {
|
|
211
|
+
availabilityZoneCount: numberOfAzs
|
|
212
|
+
},
|
|
213
|
+
instanceCount: numberOfAzs,
|
|
214
|
+
};
|
|
215
|
+
}
|
|
216
|
+
function createKibanaCognitoRole(scope, userPool, identitypool, domainName) {
|
|
217
|
+
// Setup the IAM Role & policy for ES to configure Cognito User pool and Identity pool
|
|
218
|
+
const cognitoKibanaConfigureRole = new iam.Role(scope, "CognitoKibanaConfigureRole", {
|
|
219
|
+
assumedBy: new iam.ServicePrincipal("es.amazonaws.com"),
|
|
220
|
+
});
|
|
221
|
+
const cognitoKibanaConfigureRolePolicy = new iam.Policy(scope, "CognitoKibanaConfigureRolePolicy", {
|
|
222
|
+
statements: [
|
|
223
|
+
new iam.PolicyStatement({
|
|
224
|
+
actions: [
|
|
225
|
+
"cognito-idp:DescribeUserPool",
|
|
226
|
+
"cognito-idp:CreateUserPoolClient",
|
|
227
|
+
"cognito-idp:DeleteUserPoolClient",
|
|
228
|
+
"cognito-idp:DescribeUserPoolClient",
|
|
229
|
+
"cognito-idp:AdminInitiateAuth",
|
|
230
|
+
"cognito-idp:AdminUserGlobalSignOut",
|
|
231
|
+
"cognito-idp:ListUserPoolClients",
|
|
232
|
+
"cognito-identity:DescribeIdentityPool",
|
|
233
|
+
"cognito-identity:UpdateIdentityPool",
|
|
234
|
+
"cognito-identity:SetIdentityPoolRoles",
|
|
235
|
+
"cognito-identity:GetIdentityPoolRoles",
|
|
236
|
+
"es:UpdateElasticsearchDomainConfig",
|
|
237
|
+
],
|
|
238
|
+
resources: [
|
|
239
|
+
userPool.userPoolArn,
|
|
240
|
+
`arn:aws:cognito-identity:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:identitypool/${identitypool.ref}`,
|
|
241
|
+
`arn:aws:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/${domainName}`,
|
|
242
|
+
],
|
|
243
|
+
}),
|
|
244
|
+
new iam.PolicyStatement({
|
|
245
|
+
actions: ["iam:PassRole"],
|
|
246
|
+
conditions: {
|
|
247
|
+
StringLike: {
|
|
248
|
+
"iam:PassedToService": "cognito-identity.amazonaws.com",
|
|
249
|
+
},
|
|
250
|
+
},
|
|
251
|
+
resources: [cognitoKibanaConfigureRole.roleArn],
|
|
252
|
+
}),
|
|
253
|
+
],
|
|
254
|
+
});
|
|
255
|
+
cognitoKibanaConfigureRolePolicy.attachToRole(cognitoKibanaConfigureRole);
|
|
256
|
+
return cognitoKibanaConfigureRole;
|
|
257
|
+
}
|
|
258
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"elasticsearch-helper.js","sourceRoot":"","sources":["elasticsearch-helper.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport * as elasticsearch from 'aws-cdk-lib/aws-elasticsearch';\nimport { DefaultCfnDomainProps } from './elasticsearch-defaults';\nimport { consolidateProps, addCfnSuppressRules } from './utils';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as cdk from 'aws-cdk-lib';\nimport * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch';\nimport * as cognito from 'aws-cdk-lib/aws-cognito';\nimport * as ec2 from 'aws-cdk-lib/aws-ec2';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from 'constructs';\n\nconst MaximumAzsInElasticsearchDomain = 3;\n\nexport interface BuildElasticSearchProps {\n  readonly identitypool: cognito.CfnIdentityPool;\n  readonly userpool: cognito.UserPool;\n  readonly cognitoAuthorizedRoleARN: string;\n  readonly serviceRoleARN?: string;\n  readonly vpc?: ec2.IVpc;\n  readonly domainName: string;\n  readonly clientDomainProps?: elasticsearch.CfnDomainProps,\n  readonly securityGroupIds?: string[]\n}\n\nexport function buildElasticSearch(scope: Construct, props: BuildElasticSearchProps): [elasticsearch.CfnDomain, iam.Role] {\n\n  let subnetIds: string[] = [];\n  const constructDrivenProps: any = {};\n\n  // Setup the IAM Role & policy for ES to configure Cognito User pool and Identity pool\n  const cognitoKibanaConfigureRole = createKibanaCognitoRole(scope, props.userpool, props.identitypool, props.domainName);\n\n  if (props.vpc) {\n    subnetIds = retrievePrivateSubnetIds(props.vpc);\n\n    if (subnetIds.length > MaximumAzsInElasticsearchDomain) {\n      subnetIds = subnetIds.slice(0, MaximumAzsInElasticsearchDomain);\n    }\n\n    constructDrivenProps.vpcOptions = {\n      subnetIds,\n      securityGroupIds: props.securityGroupIds\n    };\n\n    // If the client did not submit a ClusterConfig, then we will create one\n    if (!props.clientDomainProps?.elasticsearchClusterConfig) {\n      constructDrivenProps.elasticsearchClusterConfig = createClusterConfiguration(subnetIds.length);\n    }\n  } else { // No VPC\n    // If the client did not submit a ClusterConfig, then we will create one based on the Region\n    if (!props.clientDomainProps?.elasticsearchClusterConfig) {\n      constructDrivenProps.elasticsearchClusterConfig = createClusterConfiguration(cdk.Stack.of(scope).availabilityZones.length);\n    }\n  }\n\n  const defaultCfnDomainProps = DefaultCfnDomainProps(props.domainName, cognitoKibanaConfigureRole, props);\n  const finalCfnDomainProps = consolidateProps(defaultCfnDomainProps, props.clientDomainProps, constructDrivenProps);\n\n  const esDomain = new elasticsearch.CfnDomain(scope, `ElasticsearchDomain`, finalCfnDomainProps);\n\n  addCfnSuppressRules(esDomain, [\n    {\n      id: \"W28\",\n      reason: `The ES Domain is passed dynamically as as parameter and explicitly specified to ensure that IAM policies are configured to lockdown access to this specific ES instance only`,\n    },\n    {\n      id: \"W90\",\n      reason: `This is not a rule for the general case, just for specific use cases/industries`,\n    },\n  ]);\n\n  return [esDomain, cognitoKibanaConfigureRole];\n}\n\nexport function buildElasticSearchCWAlarms(scope: Construct): cloudwatch.Alarm[] {\n  // Setup CW Alarms for ES\n  const alarms: cloudwatch.Alarm[] = new Array();\n\n  // ClusterStatus.red maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'StatusRedAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterStatus.red',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'At least one primary shard and its replicas are not allocated to a node. '\n  }));\n\n  // ClusterStatus.yellow maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'StatusYellowAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterStatus.yellow',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'At least one replica shard is not allocated to a node.'\n  }));\n\n  // FreeStorageSpace minimum is <= 20480 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'FreeStorageSpaceTooLowAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'FreeStorageSpace',\n      statistic: 'Minimum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 20000,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'A node in your cluster is down to 20 GiB of free storage space.'\n  }));\n\n  // ClusterIndexWritesBlocked is >= 1 for 5 minutes, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'IndexWritesBlockedTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterIndexWritesBlocked',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(300),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Your cluster is blocking write requests.'\n  }));\n\n  // AutomatedSnapshotFailure maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'AutomatedSnapshotFailureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'AutomatedSnapshotFailure',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'An automated snapshot failed. This failure is often the result of a red cluster health status.'\n  }));\n\n  // CPUUtilization maximum is >= 80% for 15 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'CPUUtilizationTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'CPUUtilization',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 80,\n    evaluationPeriods: 3,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: '100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.'\n  }));\n\n  // JVMMemoryPressure maximum is >= 80% for 5 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'JVMMemoryPressureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'JVMMemoryPressure',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 80,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.'\n  }));\n\n  // MasterCPUUtilization maximum is >= 50% for 15 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'MasterCPUUtilizationTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'MasterCPUUtilization',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 50,\n    evaluationPeriods: 3,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.'\n  }));\n\n  // MasterJVMMemoryPressure maximum is >= 80% for 15 minutes, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'MasterJVMMemoryPressureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'MasterJVMMemoryPressure',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 50,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.'\n  }));\n\n  return alarms;\n}\n\nfunction retrievePrivateSubnetIds(vpc: ec2.IVpc) {\n  let targetSubnetType;\n\n  if (vpc.isolatedSubnets.length) {\n    targetSubnetType = ec2.SubnetType.PRIVATE_ISOLATED;\n  } else if (vpc.privateSubnets.length) {\n    targetSubnetType = ec2.SubnetType.PRIVATE_WITH_NAT;\n  } else {\n    throw new Error('Error - ElasticSearch Domains can only be deployed in Isolated or Private subnets');\n  }\n\n  const subnetSelector = {\n    onePerAz: true,\n    subnetType: targetSubnetType\n  };\n\n  return vpc.selectSubnets(subnetSelector).subnetIds;\n}\n\nfunction createClusterConfiguration(numberOfAzs?: number): elasticsearch.CfnDomain.ElasticsearchClusterConfigProperty {\n  return {\n    dedicatedMasterEnabled: true,\n    dedicatedMasterCount: 3,\n    zoneAwarenessEnabled: true,\n    zoneAwarenessConfig: {\n      availabilityZoneCount: numberOfAzs\n    },\n    instanceCount: numberOfAzs,\n  };\n}\n\nfunction createKibanaCognitoRole(\n  scope: Construct,\n  userPool: cognito.UserPool,\n  identitypool: cognito.CfnIdentityPool,\n  domainName: string\n): iam.Role {\n  // Setup the IAM Role & policy for ES to configure Cognito User pool and Identity pool\n  const cognitoKibanaConfigureRole = new iam.Role(\n    scope,\n    \"CognitoKibanaConfigureRole\",\n    {\n      assumedBy: new iam.ServicePrincipal(\"es.amazonaws.com\"),\n    }\n  );\n\n  const cognitoKibanaConfigureRolePolicy = new iam.Policy(\n    scope,\n    \"CognitoKibanaConfigureRolePolicy\",\n    {\n      statements: [\n        new iam.PolicyStatement({\n          actions: [\n            \"cognito-idp:DescribeUserPool\",\n            \"cognito-idp:CreateUserPoolClient\",\n            \"cognito-idp:DeleteUserPoolClient\",\n            \"cognito-idp:DescribeUserPoolClient\",\n            \"cognito-idp:AdminInitiateAuth\",\n            \"cognito-idp:AdminUserGlobalSignOut\",\n            \"cognito-idp:ListUserPoolClients\",\n            \"cognito-identity:DescribeIdentityPool\",\n            \"cognito-identity:UpdateIdentityPool\",\n            \"cognito-identity:SetIdentityPoolRoles\",\n            \"cognito-identity:GetIdentityPoolRoles\",\n            \"es:UpdateElasticsearchDomainConfig\",\n          ],\n          resources: [\n            userPool.userPoolArn,\n            `arn:aws:cognito-identity:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:identitypool/${identitypool.ref}`,\n            `arn:aws:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/${domainName}`,\n          ],\n        }),\n        new iam.PolicyStatement({\n          actions: [\"iam:PassRole\"],\n          conditions: {\n            StringLike: {\n              \"iam:PassedToService\": \"cognito-identity.amazonaws.com\",\n            },\n          },\n          resources: [cognitoKibanaConfigureRole.roleArn],\n        }),\n      ],\n    }\n  );\n\n  cognitoKibanaConfigureRolePolicy.attachToRole(cognitoKibanaConfigureRole);\n  return cognitoKibanaConfigureRole;\n}\n"]}
|
package/lib/lambda-helper.d.ts
CHANGED
|
@@ -36,3 +36,4 @@ export interface BuildLambdaFunctionProps {
|
|
|
36
36
|
export declare function buildLambdaFunction(scope: Construct, props: BuildLambdaFunctionProps): lambda.Function;
|
|
37
37
|
export declare function deployLambdaFunction(scope: Construct, lambdaFunctionProps: lambda.FunctionProps, functionId?: string, vpc?: ec2.IVpc): lambda.Function;
|
|
38
38
|
export declare function addPermission(targetFunction: lambda.Function, name: string, permission: lambda.Permission): any;
|
|
39
|
+
export declare function getLambdaVpcSecurityGroupIds(lambdaFunction: lambda.Function): string[];
|