@aws-solutions-constructs/core 1.156.0 → 1.158.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 +160 -104
- package/lib/alb-helper.js +5 -7
- package/lib/apigateway-helper.js +8 -11
- package/lib/cloudfront-distribution-helper.js +5 -5
- package/lib/elasticache-helper.js +3 -4
- 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/fargate-helper.js +9 -10
- package/lib/input-validation.js +6 -7
- package/lib/lambda-event-source-mapping-defaults.js +7 -7
- package/lib/lambda-helper.d.ts +1 -0
- package/lib/lambda-helper.js +11 -7
- package/lib/override-warning-service.js +5 -8
- package/lib/s3-bucket-helper.js +4 -5
- package/lib/sagemaker-helper.js +10 -11
- package/lib/step-function-helper.js +4 -5
- package/lib/utils.js +3 -4
- package/lib/vpc-defaults.js +6 -1
- package/lib/vpc-helper.js +6 -7
- package/package.json +71 -71
- package/test/elasticsearch-helper.test.js +131 -11
- package/test/glue-job-helper.test.js +3 -4
- package/test/lambda-helper.test.js +17 -1
- package/test/sagemaker-helper.test.js +3 -3
- package/test/sqs-helper.test.js +2 -2
- package/test/test-helper.d.ts +1 -1
- package/test/test-helper.js +4 -3
|
@@ -114,7 +114,7 @@ function CloudFrontDistributionForMediaStore(scope, mediaStoreContainer, cloudFr
|
|
|
114
114
|
originRequestPolicy = new cloudfront.OriginRequestPolicy(scope, 'CloudfrontOriginRequestPolicy', originRequestPolicyProps);
|
|
115
115
|
}
|
|
116
116
|
const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);
|
|
117
|
-
const defaultprops = cloudfront_distribution_defaults_1.DefaultCloudFrontDisributionForMediaStoreProps(mediaStoreContainer, loggingBucket, originRequestPolicy, httpSecurityHeaders, cloudFrontDistributionProps
|
|
117
|
+
const defaultprops = cloudfront_distribution_defaults_1.DefaultCloudFrontDisributionForMediaStoreProps(mediaStoreContainer, loggingBucket, originRequestPolicy, httpSecurityHeaders, cloudFrontDistributionProps?.customHeaders, cloudfrontFunction);
|
|
118
118
|
let cfprops;
|
|
119
119
|
cfprops = utils_1.consolidateProps(defaultprops, cloudFrontDistributionProps);
|
|
120
120
|
// Create the CloudFront Distribution
|
|
@@ -130,16 +130,16 @@ function CloudFrontOriginAccessIdentity(scope, comment) {
|
|
|
130
130
|
}
|
|
131
131
|
exports.CloudFrontOriginAccessIdentity = CloudFrontOriginAccessIdentity;
|
|
132
132
|
function getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps) {
|
|
133
|
-
const isLoggingDisabled =
|
|
134
|
-
const userSuppliedLogBucket = cloudFrontDistributionProps
|
|
133
|
+
const isLoggingDisabled = cloudFrontDistributionProps?.enableLogging === false;
|
|
134
|
+
const userSuppliedLogBucket = cloudFrontDistributionProps?.logBucket;
|
|
135
135
|
if (userSuppliedLogBucket && cloudFrontLoggingBucketProps) {
|
|
136
136
|
throw Error('Either cloudFrontDistributionProps.logBucket or cloudFrontLoggingBucketProps can be set.');
|
|
137
137
|
}
|
|
138
138
|
return isLoggingDisabled
|
|
139
139
|
? undefined
|
|
140
|
-
: userSuppliedLogBucket
|
|
140
|
+
: userSuppliedLogBucket ?? s3_bucket_helper_1.createLoggingBucket(scope, 'CloudfrontLoggingBucket', cloudFrontLoggingBucketProps ? utils_1.overrideProps(s3_bucket_defaults_1.DefaultS3Props(), cloudFrontLoggingBucketProps) : s3_bucket_defaults_1.DefaultS3Props());
|
|
141
141
|
}
|
|
142
142
|
function getCloudfrontFunction(httpSecurityHeaders, scope) {
|
|
143
143
|
return httpSecurityHeaders ? defaultCloudfrontFunction(scope) : undefined;
|
|
144
144
|
}
|
|
145
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cloudfront-distribution-helper.js","sourceRoot":"","sources":["cloudfront-distribution-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 cloudfront from '@aws-cdk/aws-cloudfront';\nimport * as s3 from '@aws-cdk/aws-s3';\nimport * as cdk from '@aws-cdk/core';\nimport * as api from '@aws-cdk/aws-apigateway';\nimport * as mediastore from '@aws-cdk/aws-mediastore';\nimport {\n  DefaultCloudFrontWebDistributionForS3Props,\n  DefaultCloudFrontWebDistributionForApiGatewayProps,\n  DefaultCloudFrontDisributionForMediaStoreProps\n} from './cloudfront-distribution-defaults';\nimport { overrideProps, addCfnSuppressRules, consolidateProps } from './utils';\nimport { createLoggingBucket } from './s3-bucket-helper';\nimport { DefaultS3Props } from './s3-bucket-defaults';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from '@aws-cdk/core';\n\n// Override Cfn_Nag rule: Cloudfront TLS-1.2 rule (https://github.com/stelligent/cfn_nag/issues/384)\nfunction updateSecurityPolicy(cfDistribution: cloudfront.Distribution) {\n  addCfnSuppressRules(cfDistribution, [\n    {\n      id: 'W70',\n      reason: `Since the distribution uses the CloudFront domain name, CloudFront automatically sets the security policy to TLSv1 regardless of the value of MinimumProtocolVersion`\n    }\n  ]);\n\n  return cfDistribution;\n}\n\n// Cloudfront function to insert the HTTP Security Headers into the response coming from the origin servers\n// and before it is sent to the client\nfunction defaultCloudfrontFunction(scope: Construct): cloudfront.Function {\n  // generate a stable unique id for the cloudfront function and use it\n  // both for the function name and the logical id of the function so if\n  // it is changed the function will be recreated.\n  // see https://github.com/aws/aws-cdk/issues/15523\n  const functionId = `SetHttpSecurityHeaders${scope.node.addr}`;\n\n  return new cloudfront.Function(scope, \"SetHttpSecurityHeaders\", {\n    functionName: functionId,\n    code: cloudfront.FunctionCode.fromInline(\"function handler(event) { var response = event.response; \\\n      var headers = response.headers; \\\n      headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; \\\n      headers['content-security-policy'] = { value: \\\"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\\\"}; \\\n      headers['x-content-type-options'] = { value: 'nosniff'}; \\\n      headers['x-frame-options'] = {value: 'DENY'}; \\\n      headers['x-xss-protection'] = {value: '1; mode=block'}; \\\n      return response; \\\n    }\")\n  });\n}\n\nexport function CloudFrontDistributionForApiGateway(scope: Construct,\n  apiEndPoint: api.RestApi,\n  cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  httpSecurityHeaders: boolean = true,\n  cloudFrontLoggingBucketProps?: s3.BucketProps\n): [cloudfront.Distribution, cloudfront.Function?, s3.Bucket?] {\n\n  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);\n\n  const loggingBucket = getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps);\n\n  const defaultprops = DefaultCloudFrontWebDistributionForApiGatewayProps(apiEndPoint, loggingBucket, httpSecurityHeaders, cloudfrontFunction);\n\n  const cfprops = consolidateProps(defaultprops, cloudFrontDistributionProps);\n  // Create the Cloudfront Distribution\n  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);\n  updateSecurityPolicy(cfDistribution);\n\n  return [cfDistribution, cloudfrontFunction, loggingBucket];\n}\n\nexport function CloudFrontDistributionForS3(scope: Construct,\n  sourceBucket: s3.IBucket,\n  cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  httpSecurityHeaders: boolean = true,\n  originPath?: string,\n  cloudFrontLoggingBucketProps?: s3.BucketProps): [cloudfront.Distribution,\n    cloudfront.Function?, s3.Bucket?] {\n\n  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);\n\n  const loggingBucket = getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps);\n\n  const defaultprops = DefaultCloudFrontWebDistributionForS3Props(sourceBucket, loggingBucket, httpSecurityHeaders, originPath, cloudfrontFunction);\n\n  const cfprops = consolidateProps(defaultprops, cloudFrontDistributionProps);\n  // Create the Cloudfront Distribution\n  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);\n  updateSecurityPolicy(cfDistribution);\n\n  // Extract the CfnBucketPolicy from the sourceBucket\n  const bucketPolicy = sourceBucket.policy as s3.BucketPolicy;\n  // the lack of a bucketPolicy means the bucket was imported from outside the stack so the lack of cfn_nag suppression is not an issue\n  if (bucketPolicy) {\n    addCfnSuppressRules(bucketPolicy, [\n      {\n        id: 'F16',\n        reason: `Public website bucket policy requires a wildcard principal`\n      }\n    ]);\n  }\n  return [cfDistribution, cloudfrontFunction, loggingBucket];\n}\n\nexport function CloudFrontDistributionForMediaStore(scope: Construct,\n  mediaStoreContainer: mediastore.CfnContainer,\n  cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  httpSecurityHeaders: boolean = true,\n  cloudFrontLoggingBucketProps?: s3.BucketProps): [cloudfront.Distribution,\n    s3.Bucket | undefined, cloudfront.OriginRequestPolicy, cloudfront.Function?] {\n\n  let originRequestPolicy: cloudfront.OriginRequestPolicy;\n\n  const loggingBucket = getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps);\n\n  if (cloudFrontDistributionProps\n    && cloudFrontDistributionProps.defaultBehavior\n    && cloudFrontDistributionProps.defaultBehavior.originRequestPolicy) {\n    originRequestPolicy = cloudFrontDistributionProps.defaultBehavior.originRequestPolicy;\n  } else {\n    const originRequestPolicyProps: cloudfront.OriginRequestPolicyProps = {\n      headerBehavior: {\n        behavior: 'whitelist',\n        headers: [\n          'Access-Control-Allow-Origin',\n          'Access-Control-Request-Method',\n          'Access-Control-Request-Header',\n          'Origin'\n        ]\n      },\n      queryStringBehavior: {\n        behavior: 'all'\n      },\n      cookieBehavior: {\n        behavior: 'none'\n      },\n      comment: 'Policy for Constructs CloudFrontDistributionForMediaStore',\n      originRequestPolicyName: `${cdk.Aws.STACK_NAME}-${cdk.Aws.REGION}-CloudFrontDistributionForMediaStore`\n    };\n\n    originRequestPolicy = new cloudfront.OriginRequestPolicy(scope, 'CloudfrontOriginRequestPolicy', originRequestPolicyProps);\n  }\n\n  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);\n\n  const defaultprops = DefaultCloudFrontDisributionForMediaStoreProps(\n    mediaStoreContainer,\n    loggingBucket,\n    originRequestPolicy,\n    httpSecurityHeaders,\n    cloudFrontDistributionProps?.customHeaders,\n    cloudfrontFunction\n  );\n\n  let cfprops: cloudfront.DistributionProps;\n\n  cfprops = consolidateProps(defaultprops, cloudFrontDistributionProps);\n\n  // Create the CloudFront Distribution\n  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);\n  updateSecurityPolicy(cfDistribution);\n\n  return [cfDistribution, loggingBucket, originRequestPolicy, cloudfrontFunction];\n}\n\nexport function CloudFrontOriginAccessIdentity(scope: Construct, comment?: string) {\n  return new cloudfront.OriginAccessIdentity(scope, 'CloudFrontOriginAccessIdentity', {\n    comment: comment ? comment : `access-identity-${cdk.Aws.REGION}-${cdk.Aws.STACK_NAME}`\n  });\n}\n\nfunction getLoggingBucket(\n  cloudFrontDistributionProps: cloudfront.DistributionProps | any, scope: Construct,\n  cloudFrontLoggingBucketProps?: s3.BucketProps\n): s3.Bucket | undefined {\n  const isLoggingDisabled = cloudFrontDistributionProps?.enableLogging === false;\n  const userSuppliedLogBucket = cloudFrontDistributionProps?.logBucket;\n\n  if (userSuppliedLogBucket && cloudFrontLoggingBucketProps) {\n    throw Error('Either cloudFrontDistributionProps.logBucket or cloudFrontLoggingBucketProps can be set.');\n  }\n\n  return isLoggingDisabled\n    ? undefined\n    : userSuppliedLogBucket ?? createLoggingBucket(\n      scope,\n      'CloudfrontLoggingBucket',\n      cloudFrontLoggingBucketProps ? overrideProps(DefaultS3Props(), cloudFrontLoggingBucketProps) : DefaultS3Props());\n}\n\nfunction getCloudfrontFunction(httpSecurityHeaders: boolean, scope: Construct) {\n  return httpSecurityHeaders ? defaultCloudfrontFunction(scope) : undefined;\n}\n"]}
|
|
145
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cloudfront-distribution-helper.js","sourceRoot":"","sources":["cloudfront-distribution-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 cloudfront from '@aws-cdk/aws-cloudfront';\nimport * as s3 from '@aws-cdk/aws-s3';\nimport * as cdk from '@aws-cdk/core';\nimport * as api from '@aws-cdk/aws-apigateway';\nimport * as mediastore from '@aws-cdk/aws-mediastore';\nimport {\n  DefaultCloudFrontWebDistributionForS3Props,\n  DefaultCloudFrontWebDistributionForApiGatewayProps,\n  DefaultCloudFrontDisributionForMediaStoreProps\n} from './cloudfront-distribution-defaults';\nimport { overrideProps, addCfnSuppressRules, consolidateProps } from './utils';\nimport { createLoggingBucket } from './s3-bucket-helper';\nimport { DefaultS3Props } from './s3-bucket-defaults';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from '@aws-cdk/core';\n\n// Override Cfn_Nag rule: Cloudfront TLS-1.2 rule (https://github.com/stelligent/cfn_nag/issues/384)\nfunction updateSecurityPolicy(cfDistribution: cloudfront.Distribution) {\n  addCfnSuppressRules(cfDistribution, [\n    {\n      id: 'W70',\n      reason: `Since the distribution uses the CloudFront domain name, CloudFront automatically sets the security policy to TLSv1 regardless of the value of MinimumProtocolVersion`\n    }\n  ]);\n\n  return cfDistribution;\n}\n\n// Cloudfront function to insert the HTTP Security Headers into the response coming from the origin servers\n// and before it is sent to the client\nfunction defaultCloudfrontFunction(scope: Construct): cloudfront.Function {\n  // generate a stable unique id for the cloudfront function and use it\n  // both for the function name and the logical id of the function so if\n  // it is changed the function will be recreated.\n  // see https://github.com/aws/aws-cdk/issues/15523\n  const functionId = `SetHttpSecurityHeaders${scope.node.addr}`;\n\n  return new cloudfront.Function(scope, \"SetHttpSecurityHeaders\", {\n    functionName: functionId,\n    code: cloudfront.FunctionCode.fromInline(\"function handler(event) { var response = event.response; \\\n      var headers = response.headers; \\\n      headers['strict-transport-security'] = { value: 'max-age=63072000; includeSubdomains; preload'}; \\\n      headers['content-security-policy'] = { value: \\\"default-src 'none'; img-src 'self'; script-src 'self'; style-src 'self'; object-src 'none'\\\"}; \\\n      headers['x-content-type-options'] = { value: 'nosniff'}; \\\n      headers['x-frame-options'] = {value: 'DENY'}; \\\n      headers['x-xss-protection'] = {value: '1; mode=block'}; \\\n      return response; \\\n    }\")\n  });\n}\n\nexport function CloudFrontDistributionForApiGateway(scope: Construct,\n  apiEndPoint: api.RestApi,\n  cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  httpSecurityHeaders: boolean = true,\n  cloudFrontLoggingBucketProps?: s3.BucketProps\n): [cloudfront.Distribution, cloudfront.Function?, s3.Bucket?] {\n\n  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);\n\n  const loggingBucket = getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps);\n\n  const defaultprops = DefaultCloudFrontWebDistributionForApiGatewayProps(apiEndPoint, loggingBucket, httpSecurityHeaders, cloudfrontFunction);\n\n  const cfprops = consolidateProps(defaultprops, cloudFrontDistributionProps);\n  // Create the Cloudfront Distribution\n  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);\n  updateSecurityPolicy(cfDistribution);\n\n  return [cfDistribution, cloudfrontFunction, loggingBucket];\n}\n\nexport function CloudFrontDistributionForS3(scope: Construct,\n  sourceBucket: s3.IBucket,\n  cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  httpSecurityHeaders: boolean = true,\n  originPath?: string,\n  cloudFrontLoggingBucketProps?: s3.BucketProps): [cloudfront.Distribution,\n    cloudfront.Function?, s3.Bucket?] {\n\n  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);\n\n  const loggingBucket = getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps);\n\n  const defaultprops = DefaultCloudFrontWebDistributionForS3Props(sourceBucket, loggingBucket, httpSecurityHeaders, originPath, cloudfrontFunction);\n\n  const cfprops = consolidateProps(defaultprops, cloudFrontDistributionProps);\n  // Create the Cloudfront Distribution\n  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);\n  updateSecurityPolicy(cfDistribution);\n\n  // Extract the CfnBucketPolicy from the sourceBucket\n  const bucketPolicy = sourceBucket.policy as s3.BucketPolicy;\n  // the lack of a bucketPolicy means the bucket was imported from outside the stack so the lack of cfn_nag suppression is not an issue\n  if (bucketPolicy) {\n    addCfnSuppressRules(bucketPolicy, [\n      {\n        id: 'F16',\n        reason: `Public website bucket policy requires a wildcard principal`\n      }\n    ]);\n  }\n  return [cfDistribution, cloudfrontFunction, loggingBucket];\n}\n\nexport function CloudFrontDistributionForMediaStore(scope: Construct,\n  mediaStoreContainer: mediastore.CfnContainer,\n  cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  httpSecurityHeaders: boolean = true,\n  cloudFrontLoggingBucketProps?: s3.BucketProps): [cloudfront.Distribution,\n    s3.Bucket | undefined, cloudfront.OriginRequestPolicy, cloudfront.Function?] {\n\n  let originRequestPolicy: cloudfront.OriginRequestPolicy;\n\n  const loggingBucket = getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps);\n\n  if (cloudFrontDistributionProps\n    && cloudFrontDistributionProps.defaultBehavior\n    && cloudFrontDistributionProps.defaultBehavior.originRequestPolicy) {\n    originRequestPolicy = cloudFrontDistributionProps.defaultBehavior.originRequestPolicy;\n  } else {\n    const originRequestPolicyProps: cloudfront.OriginRequestPolicyProps = {\n      headerBehavior: {\n        behavior: 'whitelist',\n        headers: [\n          'Access-Control-Allow-Origin',\n          'Access-Control-Request-Method',\n          'Access-Control-Request-Header',\n          'Origin'\n        ]\n      },\n      queryStringBehavior: {\n        behavior: 'all'\n      },\n      cookieBehavior: {\n        behavior: 'none'\n      },\n      comment: 'Policy for Constructs CloudFrontDistributionForMediaStore',\n      originRequestPolicyName: `${cdk.Aws.STACK_NAME}-${cdk.Aws.REGION}-CloudFrontDistributionForMediaStore`\n    };\n\n    originRequestPolicy = new cloudfront.OriginRequestPolicy(scope, 'CloudfrontOriginRequestPolicy', originRequestPolicyProps);\n  }\n\n  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);\n\n  const defaultprops = DefaultCloudFrontDisributionForMediaStoreProps(\n    mediaStoreContainer,\n    loggingBucket,\n    originRequestPolicy,\n    httpSecurityHeaders,\n    cloudFrontDistributionProps?.customHeaders,\n    cloudfrontFunction\n  );\n\n  let cfprops: cloudfront.DistributionProps;\n\n  cfprops = consolidateProps(defaultprops, cloudFrontDistributionProps);\n\n  // Create the CloudFront Distribution\n  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);\n  updateSecurityPolicy(cfDistribution);\n\n  return [cfDistribution, loggingBucket, originRequestPolicy, cloudfrontFunction];\n}\n\nexport function CloudFrontOriginAccessIdentity(scope: Construct, comment?: string) {\n  return new cloudfront.OriginAccessIdentity(scope, 'CloudFrontOriginAccessIdentity', {\n    comment: comment ? comment : `access-identity-${cdk.Aws.REGION}-${cdk.Aws.STACK_NAME}`\n  });\n}\n\nfunction getLoggingBucket(\n  cloudFrontDistributionProps: cloudfront.DistributionProps | any, scope: Construct,\n  cloudFrontLoggingBucketProps?: s3.BucketProps\n): s3.Bucket | undefined {\n  const isLoggingDisabled = cloudFrontDistributionProps?.enableLogging === false;\n  const userSuppliedLogBucket = cloudFrontDistributionProps?.logBucket;\n\n  if (userSuppliedLogBucket && cloudFrontLoggingBucketProps) {\n    throw Error('Either cloudFrontDistributionProps.logBucket or cloudFrontLoggingBucketProps can be set.');\n  }\n\n  return isLoggingDisabled\n    ? undefined\n    : userSuppliedLogBucket ?? createLoggingBucket(\n      scope,\n      'CloudfrontLoggingBucket',\n      cloudFrontLoggingBucketProps ? overrideProps(DefaultS3Props(), cloudFrontLoggingBucketProps) : DefaultS3Props());\n}\n\nfunction getCloudfrontFunction(httpSecurityHeaders: boolean, scope: Construct) {\n  return httpSecurityHeaders ? defaultCloudfrontFunction(scope) : undefined;\n}\n"]}
|
|
@@ -17,9 +17,8 @@ const cache = require("@aws-cdk/aws-elasticache");
|
|
|
17
17
|
const elasticache_defaults_1 = require("./elasticache-defaults");
|
|
18
18
|
const utils_1 = require("./utils");
|
|
19
19
|
function obtainMemcachedCluster(scope, id, props) {
|
|
20
|
-
var _a;
|
|
21
20
|
if (props.existingCache) {
|
|
22
|
-
|
|
21
|
+
props.existingCache.vpcSecurityGroupIds?.push(props.cacheSecurityGroupId);
|
|
23
22
|
return props.existingCache;
|
|
24
23
|
}
|
|
25
24
|
else {
|
|
@@ -59,7 +58,7 @@ function getCachePort(clientCacheProps, existingCache) {
|
|
|
59
58
|
if (existingCache) {
|
|
60
59
|
return existingCache.attrConfigurationEndpointPort;
|
|
61
60
|
}
|
|
62
|
-
else if (clientCacheProps
|
|
61
|
+
else if (clientCacheProps?.port) {
|
|
63
62
|
return clientCacheProps.port;
|
|
64
63
|
}
|
|
65
64
|
else {
|
|
@@ -67,4 +66,4 @@ function getCachePort(clientCacheProps, existingCache) {
|
|
|
67
66
|
}
|
|
68
67
|
}
|
|
69
68
|
exports.getCachePort = getCachePort;
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxhc3RpY2FjaGUtaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZWxhc3RpY2FjaGUtaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7O0FBR0gsa0RBQWtEO0FBRWxELGlFQUFtRjtBQUNuRixtQ0FBMkM7QUFVM0MsU0FBZ0Isc0JBQXNCLENBQ3BDLEtBQWdCLEVBQ2hCLEVBQVUsRUFDVixLQUFrQztJQUdsQyxJQUFJLEtBQUssQ0FBQyxhQUFhLEVBQUU7UUFDdkIsS0FBSyxDQUFDLGFBQWEsQ0FBQyxtQkFBbUIsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFDMUUsT0FBTyxLQUFLLENBQUMsYUFBYSxDQUFDO0tBQzVCO1NBQU07UUFDTCxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtZQUNwQixNQUFNLEtBQUssQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1NBQ3hEO1FBRUQsbUVBQW1FO1FBQ25FLE1BQU0sV0FBVyxHQUFHLHNCQUFzQixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsR0FBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWxFLE1BQU0sWUFBWSxHQUFHLDJDQUFvQixDQUFDLEVBQUUsRUFBRSxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDL0QsTUFBTSxzQkFBc0IsR0FBRztZQUM3QixtQkFBbUIsRUFBRSxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQztZQUNqRCxvQkFBb0IsRUFBRSxXQUFXLENBQUMsb0JBQW9CO1NBQ3ZELENBQUM7UUFDRixNQUFNLGlCQUFpQixHQUFHLHdCQUFnQixDQUN4QyxZQUFZLEVBQ1osS0FBSyxDQUFDLFVBQVUsRUFDaEIsc0JBQXNCLEVBQ3RCLElBQUksQ0FDTCxDQUFDO1FBRUYsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLENBQUMsZUFBZSxDQUN4QyxLQUFLLEVBQ0wsR0FBRyxFQUFFLFVBQVUsRUFDZixpQkFBaUIsQ0FDbEIsQ0FBQztRQUNGLFFBQVEsQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDbkMsT0FBTyxRQUFRLENBQUM7S0FDakI7QUFFSCxDQUFDO0FBdENELHdEQXNDQztBQUVELFNBQWdCLHNCQUFzQixDQUNwQyxTQUFvQixFQUNwQixHQUFhLEVBQ2IsRUFBVTtJQUdWLCtDQUErQztJQUMvQyxpREFBaUQ7SUFDakQsc0NBQXNDO0lBQ3RDLE1BQU0sU0FBUyxHQUFhLEVBQUUsQ0FBQztJQUMvQixHQUFHLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO1FBQ3JDLFNBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xDLENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxJQUFJLEtBQUssQ0FBQyxjQUFjLENBQUMsU0FBUyxFQUFFLGtCQUFrQixFQUFFLEVBQUUsRUFBRTtRQUNqRSxXQUFXLEVBQUUsbURBQW1EO1FBQ2hFLFNBQVM7UUFDVCxvQkFBb0IsRUFBRSxHQUFHLEVBQUUsZUFBZTtLQUMzQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBbkJELHdEQW1CQztBQUVELFNBQWdCLFlBQVksQ0FDMUIsZ0JBQW1ELEVBQ25ELGFBQXFDO0lBRXJDLElBQUksYUFBYSxFQUFFO1FBQ2pCLE9BQU8sYUFBYSxDQUFDLDZCQUE4QixDQUFDO0tBQ3JEO1NBQU0sSUFBSSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUU7UUFDakMsT0FBTyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUM7S0FDOUI7U0FBTTtRQUNMLE9BQU8sMENBQW1CLEVBQUUsQ0FBQztLQUM5QjtBQUNILENBQUM7QUFYRCxvQ0FXQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0ICogYXMgZWMyIGZyb20gXCJAYXdzLWNkay9hd3MtZWMyXCI7XG5pbXBvcnQgKiBhcyBjYWNoZSBmcm9tIFwiQGF3cy1jZGsvYXdzLWVsYXN0aWNhY2hlXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiQGF3cy1jZGsvY29yZVwiO1xuaW1wb3J0IHsgR2V0RGVmYXVsdENhY2hlUG9ydCwgR2V0TWVtY2FjaGVkRGVmYXVsdHMgfSBmcm9tICcuL2VsYXN0aWNhY2hlLWRlZmF1bHRzJztcbmltcG9ydCB7IGNvbnNvbGlkYXRlUHJvcHMgfSBmcm9tICcuL3V0aWxzJztcblxuZXhwb3J0IGludGVyZmFjZSBPYnRhaW5NZW1jYWNoZWRDbHVzdGVyUHJvcHMge1xuICByZWFkb25seSBjYWNoZVBvcnQ/OiBhbnksXG4gIHJlYWRvbmx5IGNhY2hlU2VjdXJpdHlHcm91cElkOiBzdHJpbmcsXG4gIHJlYWRvbmx5IGNhY2hlUHJvcHM/OiBjYWNoZS5DZm5DYWNoZUNsdXN0ZXJQcm9wcyB8IGFueSxcbiAgcmVhZG9ubHkgZXhpc3RpbmdDYWNoZT86IGNhY2hlLkNmbkNhY2hlQ2x1c3RlcixcbiAgcmVhZG9ubHkgdnBjPzogZWMyLklWcGMsXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBvYnRhaW5NZW1jYWNoZWRDbHVzdGVyKFxuICBzY29wZTogQ29uc3RydWN0LFxuICBpZDogc3RyaW5nLFxuICBwcm9wczogT2J0YWluTWVtY2FjaGVkQ2x1c3RlclByb3BzXG4pIHtcblxuICBpZiAocHJvcHMuZXhpc3RpbmdDYWNoZSkge1xuICAgIHByb3BzLmV4aXN0aW5nQ2FjaGUudnBjU2VjdXJpdHlHcm91cElkcz8ucHVzaChwcm9wcy5jYWNoZVNlY3VyaXR5R3JvdXBJZCk7XG4gICAgcmV0dXJuIHByb3BzLmV4aXN0aW5nQ2FjaGU7XG4gIH0gZWxzZSB7XG4gICAgaWYgKCFwcm9wcy5jYWNoZVBvcnQpIHtcbiAgICAgIHRocm93IEVycm9yKCdwcm9wcy5jYWNoZVBvcnQgcmVxdWlyZWQgZm9yIG5ldyBjYWNoZXMnKTtcbiAgICB9XG5cbiAgICAvLyBDcmVhdGUgdGhlIHN1Ym5ldCBncm91cCBmcm9tIGFsbCB0aGUgaXNvbGF0ZWQgc3VibmV0cyBpbiB0aGUgVlBDXG4gICAgY29uc3Qgc3VibmV0R3JvdXAgPSBjcmVhdGVDYWNoZVN1Ym5ldEdyb3VwKHNjb3BlLCBwcm9wcy52cGMhLCBpZCk7XG5cbiAgICBjb25zdCBkZWZhdWx0UHJvcHMgPSBHZXRNZW1jYWNoZWREZWZhdWx0cyhpZCwgcHJvcHMuY2FjaGVQb3J0KTtcbiAgICBjb25zdCByZXF1aXJlZENvbnN0cnVjdFByb3BzID0ge1xuICAgICAgdnBjU2VjdXJpdHlHcm91cElkczogW3Byb3BzLmNhY2hlU2VjdXJpdHlHcm91cElkXSxcbiAgICAgIGNhY2hlU3VibmV0R3JvdXBOYW1lOiBzdWJuZXRHcm91cC5jYWNoZVN1Ym5ldEdyb3VwTmFtZSxcbiAgICB9O1xuICAgIGNvbnN0IGNvbnNvbGlkYXRlZFByb3BzID0gY29uc29saWRhdGVQcm9wcyhcbiAgICAgIGRlZmF1bHRQcm9wcyxcbiAgICAgIHByb3BzLmNhY2hlUHJvcHMsXG4gICAgICByZXF1aXJlZENvbnN0cnVjdFByb3BzLFxuICAgICAgdHJ1ZVxuICAgICk7XG5cbiAgICBjb25zdCBuZXdDYWNoZSA9IG5ldyBjYWNoZS5DZm5DYWNoZUNsdXN0ZXIoXG4gICAgICBzY29wZSxcbiAgICAgIGAke2lkfS1jbHVzdGVyYCxcbiAgICAgIGNvbnNvbGlkYXRlZFByb3BzXG4gICAgKTtcbiAgICBuZXdDYWNoZS5hZGREZXBlbmRzT24oc3VibmV0R3JvdXApO1xuICAgIHJldHVybiBuZXdDYWNoZTtcbiAgfVxuXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjcmVhdGVDYWNoZVN1Ym5ldEdyb3VwKFxuICBjb25zdHJ1Y3Q6IENvbnN0cnVjdCxcbiAgdnBjOiBlYzIuSVZwYyxcbiAgaWQ6IHN0cmluZ1xuKTogY2FjaGUuQ2ZuU3VibmV0R3JvdXAge1xuXG4gIC8vIE1lbWNhY2hlZCBoYXMgbm8gYXV0aCwgYWxsIGFjY2VzcyBjb250cm9sIGlzXG4gIC8vIG5ldHdvcmsgYmFzZWQsIHNvLCBhdCBsZWFzdCBpbml0aWFsbHksIHdlIHdpbGxcbiAgLy8gb25seSBsYXVuY2ggaXQgaW4gaXNvbGF0ZWQgc3VibmV0cy5cbiAgY29uc3Qgc3VibmV0SWRzOiBzdHJpbmdbXSA9IFtdO1xuICB2cGMuaXNvbGF0ZWRTdWJuZXRzLmZvckVhY2goKHN1Ym5ldCkgPT4ge1xuICAgIHN1Ym5ldElkcy5wdXNoKHN1Ym5ldC5zdWJuZXRJZCk7XG4gIH0pO1xuXG4gIHJldHVybiBuZXcgY2FjaGUuQ2ZuU3VibmV0R3JvdXAoY29uc3RydWN0LCBgZWMtc3VibmV0Z3JvdXAtJHtpZH1gLCB7XG4gICAgZGVzY3JpcHRpb246IFwiU29sdXRpb25zIENvbnN0cnVjdHMgZ2VuZXJhdGVkIENhY2hlIFN1Ym5ldCBHcm91cFwiLFxuICAgIHN1Ym5ldElkcyxcbiAgICBjYWNoZVN1Ym5ldEdyb3VwTmFtZTogYCR7aWR9LXN1Ym5ldC1ncm91cGAsXG4gIH0pO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZ2V0Q2FjaGVQb3J0KFxuICBjbGllbnRDYWNoZVByb3BzPzogY2FjaGUuQ2ZuQ2FjaGVDbHVzdGVyUHJvcHMgfCBhbnksXG4gIGV4aXN0aW5nQ2FjaGU/OiBjYWNoZS5DZm5DYWNoZUNsdXN0ZXJcbik6IGFueSB7XG4gIGlmIChleGlzdGluZ0NhY2hlKSB7XG4gICAgcmV0dXJuIGV4aXN0aW5nQ2FjaGUuYXR0ckNvbmZpZ3VyYXRpb25FbmRwb2ludFBvcnQhO1xuICB9IGVsc2UgaWYgKGNsaWVudENhY2hlUHJvcHM/LnBvcnQpIHtcbiAgICByZXR1cm4gY2xpZW50Q2FjaGVQcm9wcy5wb3J0O1xuICB9IGVsc2Uge1xuICAgIHJldHVybiBHZXREZWZhdWx0Q2FjaGVQb3J0KCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -11,12 +11,6 @@
|
|
|
11
11
|
* and limitations under the License.
|
|
12
12
|
*/
|
|
13
13
|
import * as elasticsearch from '@aws-cdk/aws-elasticsearch';
|
|
14
|
-
import * as cognito from '@aws-cdk/aws-cognito';
|
|
15
14
|
import * as iam from '@aws-cdk/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/aws-iam");
|
|
17
17
|
const cdk = require("@aws-cdk/core");
|
|
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZWxhc3RpY3NlYXJjaC1kZWZhdWx0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImVsYXN0aWNzZWFyY2gtZGVmYXVsdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOzs7QUFHSCx3Q0FBd0M7QUFDeEMscUNBQXFDO0FBR3JDLFNBQWdCLHFCQUFxQixDQUFDLFVBQWtCLEVBQUUsMEJBQW9DLEVBQUUsS0FBOEI7SUFFNUgsTUFBTSxRQUFRLEdBQXFCLEVBQUUsQ0FBQztJQUV0QyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsd0JBQXdCLENBQUMsQ0FBQyxDQUFDO0lBRXBFLElBQUksS0FBSyxDQUFDLGNBQWMsRUFBRTtRQUN4QixRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztLQUMzRDtJQUVELE9BQU87UUFDTCxVQUFVO1FBQ1Ysb0JBQW9CLEVBQUUsS0FBSztRQUMzQix1QkFBdUIsRUFBRTtZQUN2QixPQUFPLEVBQUUsSUFBSTtTQUNkO1FBQ0QsMkJBQTJCLEVBQUU7WUFDM0IsT0FBTyxFQUFFLElBQUk7U0FDZDtRQUNELGVBQWUsRUFBRTtZQUNmLDBCQUEwQixFQUFFLENBQUM7U0FDOUI7UUFDRCxVQUFVLEVBQUU7WUFDVixVQUFVLEVBQUUsSUFBSTtZQUNoQixVQUFVLEVBQUUsRUFBRTtTQUNmO1FBQ0QsY0FBYyxFQUFFO1lBQ2QsT0FBTyxFQUFFLElBQUk7WUFDYixjQUFjLEVBQUUsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHO1lBQ3RDLFVBQVUsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFVBQVU7WUFDckMsT0FBTyxFQUFFLDBCQUEwQixDQUFDLE9BQU87U0FDNUM7UUFDRCxjQUFjLEVBQUUsSUFBSSxHQUFHLENBQUMsY0FBYyxDQUFDO1lBQ3JDLFVBQVUsRUFBRTtnQkFDVixJQUFJLEdBQUcsQ0FBQyxlQUFlLENBQUM7b0JBQ3RCLFVBQVUsRUFBRSxRQUFRO29CQUNwQixPQUFPLEVBQUU7d0JBQ1AsWUFBWTtxQkFDYjtvQkFDRCxTQUFTLEVBQUU7d0JBQ1QsY0FBYyxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsV0FBVyxVQUFVLElBQUk7cUJBQzVFO2lCQUNGLENBQUM7YUFDSDtTQUNGLENBQUM7S0FDNkIsQ0FBQztBQUNwQyxDQUFDO0FBOUNELHNEQThDQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0ICogYXMgZWxhc3RpY3NlYXJjaCBmcm9tICdAYXdzLWNkay9hd3MtZWxhc3RpY3NlYXJjaCc7XG5pbXBvcnQgKiBhcyBpYW0gZnJvbSAnQGF3cy1jZGsvYXdzLWlhbSc7XG5pbXBvcnQgKiBhcyBjZGsgZnJvbSAnQGF3cy1jZGsvY29yZSc7XG5pbXBvcnQgeyBCdWlsZEVsYXN0aWNTZWFyY2hQcm9wcyB9IGZyb20gJy4vZWxhc3RpY3NlYXJjaC1oZWxwZXInO1xuXG5leHBvcnQgZnVuY3Rpb24gRGVmYXVsdENmbkRvbWFpblByb3BzKGRvbWFpbk5hbWU6IHN0cmluZywgY29nbml0b0tpYmFuYUNvbmZpZ3VyZVJvbGU6IGlhbS5Sb2xlLCBwcm9wczogQnVpbGRFbGFzdGljU2VhcmNoUHJvcHMpOlxuICBlbGFzdGljc2VhcmNoLkNmbkRvbWFpblByb3BzIHtcbiAgY29uc3Qgcm9sZUFSTnM6IGlhbS5JUHJpbmNpcGFsW10gPSBbXTtcblxuICByb2xlQVJOcy5wdXNoKG5ldyBpYW0uQXJuUHJpbmNpcGFsKHByb3BzLmNvZ25pdG9BdXRob3JpemVkUm9sZUFSTikpO1xuXG4gIGlmIChwcm9wcy5zZXJ2aWNlUm9sZUFSTikge1xuICAgIHJvbGVBUk5zLnB1c2gobmV3IGlhbS5Bcm5QcmluY2lwYWwocHJvcHMuc2VydmljZVJvbGVBUk4pKTtcbiAgfVxuXG4gIHJldHVybiB7XG4gICAgZG9tYWluTmFtZSxcbiAgICBlbGFzdGljc2VhcmNoVmVyc2lvbjogJzYuMycsXG4gICAgZW5jcnlwdGlvbkF0UmVzdE9wdGlvbnM6IHtcbiAgICAgIGVuYWJsZWQ6IHRydWVcbiAgICB9LFxuICAgIG5vZGVUb05vZGVFbmNyeXB0aW9uT3B0aW9uczoge1xuICAgICAgZW5hYmxlZDogdHJ1ZVxuICAgIH0sXG4gICAgc25hcHNob3RPcHRpb25zOiB7XG4gICAgICBhdXRvbWF0ZWRTbmFwc2hvdFN0YXJ0SG91cjogMVxuICAgIH0sXG4gICAgZWJzT3B0aW9uczoge1xuICAgICAgZWJzRW5hYmxlZDogdHJ1ZSxcbiAgICAgIHZvbHVtZVNpemU6IDEwXG4gICAgfSxcbiAgICBjb2duaXRvT3B0aW9uczoge1xuICAgICAgZW5hYmxlZDogdHJ1ZSxcbiAgICAgIGlkZW50aXR5UG9vbElkOiBwcm9wcy5pZGVudGl0eXBvb2wucmVmLFxuICAgICAgdXNlclBvb2xJZDogcHJvcHMudXNlcnBvb2wudXNlclBvb2xJZCxcbiAgICAgIHJvbGVBcm46IGNvZ25pdG9LaWJhbmFDb25maWd1cmVSb2xlLnJvbGVBcm5cbiAgICB9LFxuICAgIGFjY2Vzc1BvbGljaWVzOiBuZXcgaWFtLlBvbGljeURvY3VtZW50KHtcbiAgICAgIHN0YXRlbWVudHM6IFtcbiAgICAgICAgbmV3IGlhbS5Qb2xpY3lTdGF0ZW1lbnQoe1xuICAgICAgICAgIHByaW5jaXBhbHM6IHJvbGVBUk5zLFxuICAgICAgICAgIGFjdGlvbnM6IFtcbiAgICAgICAgICAgICdlczpFU0h0dHAqJ1xuICAgICAgICAgIF0sXG4gICAgICAgICAgcmVzb3VyY2VzOiBbXG4gICAgICAgICAgICBgYXJuOmF3czplczoke2Nkay5Bd3MuUkVHSU9OfToke2Nkay5Bd3MuQUNDT1VOVF9JRH06ZG9tYWluLyR7ZG9tYWluTmFtZX0vKmBcbiAgICAgICAgICBdXG4gICAgICAgIH0pXG4gICAgICBdXG4gICAgfSlcbiAgfSBhcyBlbGFzdGljc2VhcmNoLkNmbkRvbWFpblByb3BzO1xufSJdfQ==
|
|
@@ -11,9 +11,20 @@
|
|
|
11
11
|
* and limitations under the License.
|
|
12
12
|
*/
|
|
13
13
|
import * as elasticsearch from '@aws-cdk/aws-elasticsearch';
|
|
14
|
-
import { CfnDomainOptions } from './elasticsearch-defaults';
|
|
15
14
|
import * as iam from '@aws-cdk/aws-iam';
|
|
16
15
|
import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
|
|
16
|
+
import * as cognito from '@aws-cdk/aws-cognito';
|
|
17
|
+
import * as ec2 from '@aws-cdk/aws-ec2';
|
|
17
18
|
import { Construct } from '@aws-cdk/core';
|
|
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/aws-iam");
|
|
20
20
|
const cdk = require("@aws-cdk/core");
|
|
21
21
|
const cloudwatch = require("@aws-cdk/aws-cloudwatch");
|
|
22
|
-
|
|
22
|
+
const ec2 = require("@aws-cdk/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/aws-elasticsearch';\nimport { CfnDomainOptions, DefaultCfnDomainProps } from './elasticsearch-defaults';\nimport { consolidateProps, addCfnSuppressRules } from './utils';\nimport * as iam from '@aws-cdk/aws-iam';\nimport * as cdk from '@aws-cdk/core';\nimport * as cloudwatch from '@aws-cdk/aws-cloudwatch';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from '@aws-cdk/core';\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":";AAAA;;;;;;;;;;;GAWG;;;AAEH,4DAA4D;AAC5D,qEAAiE;AACjE,mCAAgE;AAChE,wCAAwC;AACxC,qCAAqC;AACrC,sDAAsD;AAEtD,wCAAwC;AAIxC,MAAM,+BAA+B,GAAG,CAAC,CAAC;AAa1C,SAAgB,kBAAkB,CAAC,KAAgB,EAAE,KAA8B;IAEjF,IAAI,SAAS,GAAa,EAAE,CAAC;IAC7B,MAAM,oBAAoB,GAAQ,EAAE,CAAC;IAErC,sFAAsF;IACtF,MAAM,0BAA0B,GAAG,uBAAuB,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAExH,IAAI,KAAK,CAAC,GAAG,EAAE;QACb,SAAS,GAAG,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEhD,IAAI,SAAS,CAAC,MAAM,GAAG,+BAA+B,EAAE;YACtD,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,+BAA+B,CAAC,CAAC;SACjE;QAED,oBAAoB,CAAC,UAAU,GAAG;YAChC,SAAS;YACT,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;SACzC,CAAC;QAEF,wEAAwE;QACxE,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,0BAA0B,EAAE;YACxD,oBAAoB,CAAC,0BAA0B,GAAG,0BAA0B,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAChG;KACF;SAAM,EAAE,SAAS;QAChB,4FAA4F;QAC5F,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,0BAA0B,EAAE;YACxD,oBAAoB,CAAC,0BAA0B,GAAG,0BAA0B,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;SAC5H;KACF;IAED,MAAM,qBAAqB,GAAG,8CAAqB,CAAC,KAAK,CAAC,UAAU,EAAE,0BAA0B,EAAE,KAAK,CAAC,CAAC;IACzG,MAAM,mBAAmB,GAAG,wBAAgB,CAAC,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;IAEnH,MAAM,QAAQ,GAAG,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,CAAC;IAEhG,2BAAmB,CAAC,QAAQ,EAAE;QAC5B;YACE,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,8KAA8K;SACvL;QACD;YACE,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,iFAAiF;SAC1F;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,EAAE,0BAA0B,CAAC,CAAC;AAChD,CAAC;AAhDD,gDAgDC;AAED,SAAgB,0BAA0B,CAAC,KAAgB;IACzD,yBAAyB;IACzB,MAAM,MAAM,GAAuB,IAAI,KAAK,EAAE,CAAC;IAE/C,qEAAqE;IACrE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,gBAAgB,EAAE;QACxD,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,mBAAmB;YAC/B,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QACF,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,2EAA2E;KAC9F,CAAC,CAAC,CAAC;IAEJ,wEAAwE;IACxE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,mBAAmB,EAAE;QAC3D,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,sBAAsB;YAClC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QACF,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,wDAAwD;KAC3E,CAAC,CAAC,CAAC;IAEJ,wEAAwE;IACxE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,6BAA6B,EAAE;QACrE,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,kBAAkB;YAC9B,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QACF,SAAS,EAAE,KAAK;QAChB,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,+BAA+B;QACjF,gBAAgB,EAAE,iEAAiE;KACpF,CAAC,CAAC,CAAC;IAEJ,sEAAsE;IACtE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,gCAAgC,EAAE;QACxE,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,2BAA2B;YACvC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,0CAA0C;KAC7D,CAAC,CAAC,CAAC;IAEJ,4EAA4E;IAC5E,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,sCAAsC,EAAE;QAC9E,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,0BAA0B;YACtC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QACF,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,gGAAgG;KACnH,CAAC,CAAC,CAAC;IAEJ,uEAAuE;IACvE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,4BAA4B,EAAE;QACpE,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,gBAAgB;YAC5B,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,EAAE;QACb,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,0IAA0I;KAC7J,CAAC,CAAC,CAAC;IAEJ,yEAAyE;IACzE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,+BAA+B,EAAE;QACvE,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,mBAAmB;YAC/B,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,EAAE;QACb,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,yFAAyF;KAC5G,CAAC,CAAC,CAAC;IAEJ,6EAA6E;IAC7E,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,kCAAkC,EAAE;QAC1E,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,sBAAsB;YAClC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,EAAE;QACb,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,8HAA8H;KACjJ,CAAC,CAAC,CAAC;IAEJ,+EAA+E;IAC/E,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,qCAAqC,EAAE;QAC7E,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,yBAAyB;YACrC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,EAAE;QACb,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,yFAAyF;KAC5G,CAAC,CAAC,CAAC;IAEJ,OAAO,MAAM,CAAC;AAChB,CAAC;AAnID,gEAmIC;AAED,SAAS,wBAAwB,CAAC,GAAa;IAC7C,IAAI,gBAAgB,CAAC;IAErB,IAAI,GAAG,CAAC,eAAe,CAAC,MAAM,EAAE;QAC9B,gBAAgB,GAAG,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC;KACpD;SAAM,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,EAAE;QACpC,gBAAgB,GAAG,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC;KACpD;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,mFAAmF,CAAC,CAAC;KACtG;IAED,MAAM,cAAc,GAAG;QACrB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,gBAAgB;KAC7B,CAAC;IAEF,OAAO,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC;AACrD,CAAC;AAED,SAAS,0BAA0B,CAAC,WAAoB;IACtD,OAAO;QACL,sBAAsB,EAAE,IAAI;QAC5B,oBAAoB,EAAE,CAAC;QACvB,oBAAoB,EAAE,IAAI;QAC1B,mBAAmB,EAAE;YACnB,qBAAqB,EAAE,WAAW;SACnC;QACD,aAAa,EAAE,WAAW;KAC3B,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAC9B,KAAgB,EAChB,QAA0B,EAC1B,YAAqC,EACrC,UAAkB;IAElB,sFAAsF;IACtF,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,IAAI,CAC7C,KAAK,EACL,4BAA4B,EAC5B;QACE,SAAS,EAAE,IAAI,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC;KACxD,CACF,CAAC;IAEF,MAAM,gCAAgC,GAAG,IAAI,GAAG,CAAC,MAAM,CACrD,KAAK,EACL,kCAAkC,EAClC;QACE,UAAU,EAAE;YACV,IAAI,GAAG,CAAC,eAAe,CAAC;gBACtB,OAAO,EAAE;oBACP,8BAA8B;oBAC9B,kCAAkC;oBAClC,kCAAkC;oBAClC,oCAAoC;oBACpC,+BAA+B;oBAC/B,oCAAoC;oBACpC,iCAAiC;oBACjC,uCAAuC;oBACvC,qCAAqC;oBACrC,uCAAuC;oBACvC,uCAAuC;oBACvC,oCAAoC;iBACrC;gBACD,SAAS,EAAE;oBACT,QAAQ,CAAC,WAAW;oBACpB,4BAA4B,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,iBAAiB,YAAY,CAAC,GAAG,EAAE;oBACnG,cAAc,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,WAAW,UAAU,EAAE;iBAC1E;aACF,CAAC;YACF,IAAI,GAAG,CAAC,eAAe,CAAC;gBACtB,OAAO,EAAE,CAAC,cAAc,CAAC;gBACzB,UAAU,EAAE;oBACV,UAAU,EAAE;wBACV,qBAAqB,EAAE,gCAAgC;qBACxD;iBACF;gBACD,SAAS,EAAE,CAAC,0BAA0B,CAAC,OAAO,CAAC;aAChD,CAAC;SACH;KACF,CACF,CAAC;IAEF,gCAAgC,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAAC;IAC1E,OAAO,0BAA0B,CAAC;AACpC,CAAC","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/aws-elasticsearch';\nimport { DefaultCfnDomainProps } from './elasticsearch-defaults';\nimport { consolidateProps, addCfnSuppressRules } from './utils';\nimport * as iam from '@aws-cdk/aws-iam';\nimport * as cdk from '@aws-cdk/core';\nimport * as cloudwatch from '@aws-cdk/aws-cloudwatch';\nimport * as cognito from '@aws-cdk/aws-cognito';\nimport * as ec2 from '@aws-cdk/aws-ec2';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from '@aws-cdk/core';\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"]}
|