@aws-solutions-constructs/core 1.146.0 → 1.147.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.
Files changed (20) hide show
  1. package/.jsii +59 -59
  2. package/lib/alb-helper.js +9 -27
  3. package/lib/apigateway-helper.js +8 -25
  4. package/lib/cloudfront-distribution-helper.js +4 -9
  5. package/lib/cloudwatch-log-group-helper.js +2 -7
  6. package/lib/cognito-helper.js +4 -16
  7. package/lib/dynamodb-table-helper.js +6 -17
  8. package/lib/elasticsearch-helper.js +2 -4
  9. package/lib/kinesis-streams-helper.js +3 -9
  10. package/lib/kms-helper.js +3 -9
  11. package/lib/lambda-event-source-mapping-defaults.js +4 -19
  12. package/lib/mediastore-helper.js +2 -7
  13. package/lib/sagemaker-helper.js +5 -17
  14. package/lib/secretsmanager-helper.js +2 -7
  15. package/lib/sns-helper.js +2 -10
  16. package/lib/vpc-helper.js +2 -7
  17. package/lib/waf-helper.js +2 -7
  18. package/package.json +70 -70
  19. package/test/test-helper.d.ts +1 -0
  20. package/test/test-helper.js +13 -2
package/lib/cloudfront-distribution-helper.js CHANGED
@@ -54,7 +54,7 @@ function CloudFrontDistributionForApiGateway(scope, apiEndPoint, cloudFrontDistr
54
54
  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);
55
55
  const loggingBucket = getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps);
56
56
  const defaultprops = cloudfront_distribution_defaults_1.DefaultCloudFrontWebDistributionForApiGatewayProps(apiEndPoint, loggingBucket, httpSecurityHeaders, cloudfrontFunction);
57
- const cfprops = cloudFrontDistributionProps ? utils_1.overrideProps(defaultprops, cloudFrontDistributionProps, false) : defaultprops;
57
+ const cfprops = utils_1.consolidateProps(defaultprops, cloudFrontDistributionProps);
58
58
  // Create the Cloudfront Distribution
59
59
  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);
60
60
  updateSecurityPolicy(cfDistribution);
@@ -65,7 +65,7 @@ function CloudFrontDistributionForS3(scope, sourceBucket, cloudFrontDistribution
65
65
  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);
66
66
  const loggingBucket = getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingBucketProps);
67
67
  const defaultprops = cloudfront_distribution_defaults_1.DefaultCloudFrontWebDistributionForS3Props(sourceBucket, loggingBucket, httpSecurityHeaders, originPath, cloudfrontFunction);
68
- const cfprops = cloudFrontDistributionProps ? utils_1.overrideProps(defaultprops, cloudFrontDistributionProps, false) : defaultprops;
68
+ const cfprops = utils_1.consolidateProps(defaultprops, cloudFrontDistributionProps);
69
69
  // Create the Cloudfront Distribution
70
70
  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);
71
71
  updateSecurityPolicy(cfDistribution);
@@ -116,12 +116,7 @@ function CloudFrontDistributionForMediaStore(scope, mediaStoreContainer, cloudFr
116
116
  const cloudfrontFunction = getCloudfrontFunction(httpSecurityHeaders, scope);
117
117
  const defaultprops = cloudfront_distribution_defaults_1.DefaultCloudFrontDisributionForMediaStoreProps(mediaStoreContainer, loggingBucket, originRequestPolicy, httpSecurityHeaders, cloudFrontDistributionProps === null || cloudFrontDistributionProps === void 0 ? void 0 : cloudFrontDistributionProps.customHeaders, cloudfrontFunction);
118
118
  let cfprops;
119
- if (cloudFrontDistributionProps) {
120
- cfprops = utils_1.overrideProps(defaultprops, cloudFrontDistributionProps, false);
121
- }
122
- else {
123
- cfprops = defaultprops;
124
- }
119
+ cfprops = utils_1.consolidateProps(defaultprops, cloudFrontDistributionProps);
125
120
  // Create the CloudFront Distribution
126
121
  const cfDistribution = new cloudfront.Distribution(scope, 'CloudFrontDistribution', cfprops);
127
122
  updateSecurityPolicy(cfDistribution);
@@ -147,4 +142,4 @@ function getLoggingBucket(cloudFrontDistributionProps, scope, cloudFrontLoggingB
147
142
  function getCloudfrontFunction(httpSecurityHeaders, scope) {
148
143
  return httpSecurityHeaders ? defaultCloudfrontFunction(scope) : undefined;
149
144
  }
150
- //# 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 } 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 = cloudFrontDistributionProps ? overrideProps(defaultprops, cloudFrontDistributionProps, false) : defaultprops;\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 = cloudFrontDistributionProps ? overrideProps(defaultprops, cloudFrontDistributionProps, false) : defaultprops;\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  if (cloudFrontDistributionProps) {\n    cfprops = overrideProps(defaultprops, cloudFrontDistributionProps, false);\n  } else {\n    cfprops = defaultprops;\n  }\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"]}
package/lib/cloudwatch-log-group-helper.js CHANGED
@@ -19,12 +19,7 @@ const utils_1 = require("./utils");
19
19
  function buildLogGroup(scope, logGroupId, logGroupProps) {
20
20
  let _logGroupProps;
21
21
  // Override user provided CW LogGroup props with the DefaultLogGroupProps
22
- if (logGroupProps !== undefined) {
23
- _logGroupProps = utils_1.overrideProps(cloudwatch_log_group_defaults_1.DefaultLogGroupProps(), logGroupProps);
24
- }
25
- else {
26
- _logGroupProps = cloudwatch_log_group_defaults_1.DefaultLogGroupProps();
27
- }
22
+ _logGroupProps = utils_1.consolidateProps(cloudwatch_log_group_defaults_1.DefaultLogGroupProps(), logGroupProps);
28
23
  // Set the LogGroup Id
29
24
  const _logGroupId = logGroupId ? logGroupId : 'CloudWatchLogGroup';
30
25
  // Create the CW Log Group
@@ -49,4 +44,4 @@ function buildLogGroup(scope, logGroupId, logGroupProps) {
49
44
  return logGroup;
50
45
  }
51
46
  exports.buildLogGroup = buildLogGroup;
52
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvdWR3YXRjaC1sb2ctZ3JvdXAtaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY2xvdWR3YXRjaC1sb2ctZ3JvdXAtaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7O0FBRUgsbUZBQXVFO0FBQ3ZFLDBDQUEwQztBQUMxQyxtQ0FBNkQ7QUFJN0QsU0FBZ0IsYUFBYSxDQUFDLEtBQWdCLEVBQUUsVUFBbUIsRUFBRSxhQUFrQztJQUNyRyxJQUFJLGNBQWtDLENBQUM7SUFFdkMseUVBQXlFO0lBQ3pFLElBQUksYUFBYSxLQUFLLFNBQVMsRUFBRTtRQUMvQixjQUFjLEdBQUcscUJBQWEsQ0FBQyxvREFBb0IsRUFBRSxFQUFFLGFBQWEsQ0FBQyxDQUFDO0tBQ3ZFO1NBQU07UUFDTCxjQUFjLEdBQUcsb0RBQW9CLEVBQUUsQ0FBQztLQUN6QztJQUVELHNCQUFzQjtJQUN0QixNQUFNLFdBQVcsR0FBRyxVQUFVLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsb0JBQW9CLENBQUM7SUFFbkUsMEJBQTBCO0lBQzFCLE1BQU0sUUFBUSxHQUFHLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBRXZFLDZDQUE2QztJQUM3QyxJQUFJLGNBQWMsQ0FBQyxTQUFTLEtBQUssSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUU7UUFDNUQsMkJBQW1CLENBQUUsUUFBUSxFQUFFO1lBQzdCO2dCQUNFLEVBQUUsRUFBRSxLQUFLO2dCQUNULE1BQU0sRUFBRSxrSEFBa0g7YUFDM0g7U0FDRixDQUFDLENBQUM7S0FDSjtJQUVELElBQUksQ0FBQyxjQUFjLENBQUMsYUFBYSxFQUFFO1FBQ2pDLDJCQUFtQixDQUFFLFFBQVEsRUFBRTtZQUM3QjtnQkFDRSxFQUFFLEVBQUUsS0FBSztnQkFDVCxNQUFNLEVBQUUsMkhBQTJIO2FBQ3BJO1NBQ0YsQ0FBQyxDQUFDO0tBQ0o7SUFFRCxPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDO0FBcENELHNDQW9DQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0IHsgRGVmYXVsdExvZ0dyb3VwUHJvcHMgfSBmcm9tICcuL2Nsb3Vkd2F0Y2gtbG9nLWdyb3VwLWRlZmF1bHRzJztcbmltcG9ydCAqIGFzIGxvZ3MgZnJvbSAnQGF3cy1jZGsvYXdzLWxvZ3MnO1xuaW1wb3J0IHsgb3ZlcnJpZGVQcm9wcywgYWRkQ2ZuU3VwcHJlc3NSdWxlcyB9IGZyb20gJy4vdXRpbHMnO1xuLy8gTm90ZTogVG8gZW5zdXJlIENES3YyIGNvbXBhdGliaWxpdHksIGtlZXAgdGhlIGltcG9ydCBzdGF0ZW1lbnQgZm9yIENvbnN0cnVjdCBzZXBhcmF0ZVxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSAnQGF3cy1jZGsvY29yZSc7XG5cbmV4cG9ydCBmdW5jdGlvbiBidWlsZExvZ0dyb3VwKHNjb3BlOiBDb25zdHJ1Y3QsIGxvZ0dyb3VwSWQ/OiBzdHJpbmcsIGxvZ0dyb3VwUHJvcHM/OiBsb2dzLkxvZ0dyb3VwUHJvcHMpOiBsb2dzLkxvZ0dyb3VwIHtcbiAgbGV0IF9sb2dHcm91cFByb3BzOiBsb2dzLkxvZ0dyb3VwUHJvcHM7XG5cbiAgLy8gT3ZlcnJpZGUgdXNlciBwcm92aWRlZCBDVyBMb2dHcm91cCBwcm9wcyB3aXRoIHRoZSBEZWZhdWx0TG9nR3JvdXBQcm9wc1xuICBpZiAobG9nR3JvdXBQcm9wcyAhPT0gdW5kZWZpbmVkKSB7XG4gICAgX2xvZ0dyb3VwUHJvcHMgPSBvdmVycmlkZVByb3BzKERlZmF1bHRMb2dHcm91cFByb3BzKCksIGxvZ0dyb3VwUHJvcHMpO1xuICB9IGVsc2Uge1xuICAgIF9sb2dHcm91cFByb3BzID0gRGVmYXVsdExvZ0dyb3VwUHJvcHMoKTtcbiAgfVxuXG4gIC8vIFNldCB0aGUgTG9nR3JvdXAgSWRcbiAgY29uc3QgX2xvZ0dyb3VwSWQgPSBsb2dHcm91cElkID8gbG9nR3JvdXBJZCA6ICdDbG91ZFdhdGNoTG9nR3JvdXAnO1xuXG4gIC8vIENyZWF0ZSB0aGUgQ1cgTG9nIEdyb3VwXG4gIGNvbnN0IGxvZ0dyb3VwID0gbmV3IGxvZ3MuTG9nR3JvdXAoc2NvcGUsIF9sb2dHcm91cElkLCBfbG9nR3JvdXBQcm9wcyk7XG5cbiAgLy8gSWYgcmVxdWlyZWQsIHN1cHByZXNzIHRoZSBDZm4gTmFnIFdBUk5JTkdTXG4gIGlmIChfbG9nR3JvdXBQcm9wcy5yZXRlbnRpb24gPT09IGxvZ3MuUmV0ZW50aW9uRGF5cy5JTkZJTklURSkge1xuICAgIGFkZENmblN1cHByZXNzUnVsZXMoIGxvZ0dyb3VwLCBbXG4gICAgICB7XG4gICAgICAgIGlkOiAnVzg2JyxcbiAgICAgICAgcmVhc29uOiAnUmV0ZW50aW9uIHBlcmlvZCBmb3IgQ2xvdWRXYXRjaExvZ3MgTG9nR3JvdXBzIGFyZSBzZXQgdG8gXFwnTmV2ZXIgRXhwaXJlXFwnIHRvIHByZXNlcnZlIGN1c3RvbWVyIGRhdGEgaW5kZWZpbml0ZWx5J1xuICAgICAgfVxuICAgIF0pO1xuICB9XG5cbiAgaWYgKCFfbG9nR3JvdXBQcm9wcy5lbmNyeXB0aW9uS2V5KSB7XG4gICAgYWRkQ2ZuU3VwcHJlc3NSdWxlcyggbG9nR3JvdXAsIFtcbiAgICAgIHtcbiAgICAgICAgaWQ6ICdXODQnLFxuICAgICAgICByZWFzb246ICdCeSBkZWZhdWx0IENsb3VkV2F0Y2hMb2dzIExvZ0dyb3VwcyBkYXRhIGlzIGVuY3J5cHRlZCB1c2luZyB0aGUgQ2xvdWRXYXRjaCBzZXJ2ZXItc2lkZSBlbmNyeXB0aW9uIGtleXMgKEFXUyBNYW5hZ2VkIEtleXMpJ1xuICAgICAgfVxuICAgIF0pO1xuICB9XG5cbiAgcmV0dXJuIGxvZ0dyb3VwO1xufSJdfQ==
47
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvdWR3YXRjaC1sb2ctZ3JvdXAtaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiY2xvdWR3YXRjaC1sb2ctZ3JvdXAtaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7O0FBRUgsbUZBQXVFO0FBQ3ZFLDBDQUEwQztBQUMxQyxtQ0FBZ0U7QUFJaEUsU0FBZ0IsYUFBYSxDQUFDLEtBQWdCLEVBQUUsVUFBbUIsRUFBRSxhQUFrQztJQUNyRyxJQUFJLGNBQWtDLENBQUM7SUFFdkMseUVBQXlFO0lBQ3pFLGNBQWMsR0FBRyx3QkFBZ0IsQ0FBQyxvREFBb0IsRUFBRSxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBRXpFLHNCQUFzQjtJQUN0QixNQUFNLFdBQVcsR0FBRyxVQUFVLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsb0JBQW9CLENBQUM7SUFFbkUsMEJBQTBCO0lBQzFCLE1BQU0sUUFBUSxHQUFHLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBRXZFLDZDQUE2QztJQUM3QyxJQUFJLGNBQWMsQ0FBQyxTQUFTLEtBQUssSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUU7UUFDNUQsMkJBQW1CLENBQUUsUUFBUSxFQUFFO1lBQzdCO2dCQUNFLEVBQUUsRUFBRSxLQUFLO2dCQUNULE1BQU0sRUFBRSxrSEFBa0g7YUFDM0g7U0FDRixDQUFDLENBQUM7S0FDSjtJQUVELElBQUksQ0FBQyxjQUFjLENBQUMsYUFBYSxFQUFFO1FBQ2pDLDJCQUFtQixDQUFFLFFBQVEsRUFBRTtZQUM3QjtnQkFDRSxFQUFFLEVBQUUsS0FBSztnQkFDVCxNQUFNLEVBQUUsMkhBQTJIO2FBQ3BJO1NBQ0YsQ0FBQyxDQUFDO0tBQ0o7SUFFRCxPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDO0FBaENELHNDQWdDQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0IHsgRGVmYXVsdExvZ0dyb3VwUHJvcHMgfSBmcm9tICcuL2Nsb3Vkd2F0Y2gtbG9nLWdyb3VwLWRlZmF1bHRzJztcbmltcG9ydCAqIGFzIGxvZ3MgZnJvbSAnQGF3cy1jZGsvYXdzLWxvZ3MnO1xuaW1wb3J0IHsgYWRkQ2ZuU3VwcHJlc3NSdWxlcywgY29uc29saWRhdGVQcm9wcyB9IGZyb20gJy4vdXRpbHMnO1xuLy8gTm90ZTogVG8gZW5zdXJlIENES3YyIGNvbXBhdGliaWxpdHksIGtlZXAgdGhlIGltcG9ydCBzdGF0ZW1lbnQgZm9yIENvbnN0cnVjdCBzZXBhcmF0ZVxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSAnQGF3cy1jZGsvY29yZSc7XG5cbmV4cG9ydCBmdW5jdGlvbiBidWlsZExvZ0dyb3VwKHNjb3BlOiBDb25zdHJ1Y3QsIGxvZ0dyb3VwSWQ/OiBzdHJpbmcsIGxvZ0dyb3VwUHJvcHM/OiBsb2dzLkxvZ0dyb3VwUHJvcHMpOiBsb2dzLkxvZ0dyb3VwIHtcbiAgbGV0IF9sb2dHcm91cFByb3BzOiBsb2dzLkxvZ0dyb3VwUHJvcHM7XG5cbiAgLy8gT3ZlcnJpZGUgdXNlciBwcm92aWRlZCBDVyBMb2dHcm91cCBwcm9wcyB3aXRoIHRoZSBEZWZhdWx0TG9nR3JvdXBQcm9wc1xuICBfbG9nR3JvdXBQcm9wcyA9IGNvbnNvbGlkYXRlUHJvcHMoRGVmYXVsdExvZ0dyb3VwUHJvcHMoKSwgbG9nR3JvdXBQcm9wcyk7XG5cbiAgLy8gU2V0IHRoZSBMb2dHcm91cCBJZFxuICBjb25zdCBfbG9nR3JvdXBJZCA9IGxvZ0dyb3VwSWQgPyBsb2dHcm91cElkIDogJ0Nsb3VkV2F0Y2hMb2dHcm91cCc7XG5cbiAgLy8gQ3JlYXRlIHRoZSBDVyBMb2cgR3JvdXBcbiAgY29uc3QgbG9nR3JvdXAgPSBuZXcgbG9ncy5Mb2dHcm91cChzY29wZSwgX2xvZ0dyb3VwSWQsIF9sb2dHcm91cFByb3BzKTtcblxuICAvLyBJZiByZXF1aXJlZCwgc3VwcHJlc3MgdGhlIENmbiBOYWcgV0FSTklOR1NcbiAgaWYgKF9sb2dHcm91cFByb3BzLnJldGVudGlvbiA9PT0gbG9ncy5SZXRlbnRpb25EYXlzLklORklOSVRFKSB7XG4gICAgYWRkQ2ZuU3VwcHJlc3NSdWxlcyggbG9nR3JvdXAsIFtcbiAgICAgIHtcbiAgICAgICAgaWQ6ICdXODYnLFxuICAgICAgICByZWFzb246ICdSZXRlbnRpb24gcGVyaW9kIGZvciBDbG91ZFdhdGNoTG9ncyBMb2dHcm91cHMgYXJlIHNldCB0byBcXCdOZXZlciBFeHBpcmVcXCcgdG8gcHJlc2VydmUgY3VzdG9tZXIgZGF0YSBpbmRlZmluaXRlbHknXG4gICAgICB9XG4gICAgXSk7XG4gIH1cblxuICBpZiAoIV9sb2dHcm91cFByb3BzLmVuY3J5cHRpb25LZXkpIHtcbiAgICBhZGRDZm5TdXBwcmVzc1J1bGVzKCBsb2dHcm91cCwgW1xuICAgICAge1xuICAgICAgICBpZDogJ1c4NCcsXG4gICAgICAgIHJlYXNvbjogJ0J5IGRlZmF1bHQgQ2xvdWRXYXRjaExvZ3MgTG9nR3JvdXBzIGRhdGEgaXMgZW5jcnlwdGVkIHVzaW5nIHRoZSBDbG91ZFdhdGNoIHNlcnZlci1zaWRlIGVuY3J5cHRpb24ga2V5cyAoQVdTIE1hbmFnZWQgS2V5cyknXG4gICAgICB9XG4gICAgXSk7XG4gIH1cblxuICByZXR1cm4gbG9nR3JvdXA7XG59Il19
package/lib/cognito-helper.js CHANGED
@@ -20,12 +20,7 @@ const utils_1 = require("./utils");
20
20
  const cognito_defaults_1 = require("./cognito-defaults");
21
21
  function buildUserPool(scope, userPoolProps) {
22
22
  let cognitoUserPoolProps;
23
- if (userPoolProps) {
24
- cognitoUserPoolProps = utils_1.overrideProps(cognito_defaults_1.DefaultUserPoolProps, userPoolProps);
25
- }
26
- else {
27
- cognitoUserPoolProps = cognito_defaults_1.DefaultUserPoolProps;
28
- }
23
+ cognitoUserPoolProps = utils_1.consolidateProps(cognito_defaults_1.DefaultUserPoolProps, userPoolProps);
29
24
  const userPool = new cognito.UserPool(scope, 'CognitoUserPool', cognitoUserPoolProps);
30
25
  // Set the advancedSecurityMode to ENFORCED
31
26
  const cfnUserPool = userPool.node.findChild('Resource');
@@ -47,20 +42,13 @@ function buildUserPool(scope, userPoolProps) {
47
42
  exports.buildUserPool = buildUserPool;
48
43
  function buildUserPoolClient(scope, userPool, cognitoUserPoolClientProps) {
49
44
  let userPoolClientProps;
50
- if (cognitoUserPoolClientProps) {
51
- userPoolClientProps = utils_1.overrideProps(cognito_defaults_1.DefaultUserPoolClientProps(userPool), cognitoUserPoolClientProps);
52
- }
53
- else {
54
- userPoolClientProps = cognito_defaults_1.DefaultUserPoolClientProps(userPool);
55
- }
45
+ userPoolClientProps = utils_1.consolidateProps(cognito_defaults_1.DefaultUserPoolClientProps(userPool), cognitoUserPoolClientProps);
56
46
  return new cognito.UserPoolClient(scope, 'CognitoUserPoolClient', userPoolClientProps);
57
47
  }
58
48
  exports.buildUserPoolClient = buildUserPoolClient;
59
49
  function buildIdentityPool(scope, userpool, userpoolclient, identityPoolProps) {
60
50
  let cognitoIdentityPoolProps = cognito_defaults_1.DefaultIdentityPoolProps(userpoolclient.userPoolClientId, userpool.userPoolProviderName);
61
- if (identityPoolProps) {
62
- cognitoIdentityPoolProps = utils_1.overrideProps(cognitoIdentityPoolProps, identityPoolProps);
63
- }
51
+ cognitoIdentityPoolProps = utils_1.consolidateProps(cognitoIdentityPoolProps, identityPoolProps);
64
52
  const idPool = new cognito.CfnIdentityPool(scope, 'CognitoIdentityPool', cognitoIdentityPoolProps);
65
53
  return idPool;
66
54
  }
@@ -101,4 +89,4 @@ function setupCognitoForElasticSearch(scope, domainName, options) {
101
89
  return cognitoAuthorizedRole;
102
90
  }
103
91
  exports.setupCognitoForElasticSearch = setupCognitoForElasticSearch;
104
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cognito-helper.js","sourceRoot":"","sources":["cognito-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 cognito from '@aws-cdk/aws-cognito';\nimport * as iam from '@aws-cdk/aws-iam';\nimport * as cdk from '@aws-cdk/core';\nimport { overrideProps, addCfnSuppressRules } from './utils';\nimport { DefaultUserPoolProps, DefaultUserPoolClientProps, DefaultIdentityPoolProps } from './cognito-defaults';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from '@aws-cdk/core';\n\nexport interface CognitoOptions {\n  readonly identitypool: cognito.CfnIdentityPool,\n  readonly userpool: cognito.UserPool,\n  readonly userpoolclient: cognito.UserPoolClient\n}\n\nexport function buildUserPool(scope: Construct, userPoolProps?: cognito.UserPoolProps): cognito.UserPool {\n  let cognitoUserPoolProps: cognito.UserPoolProps;\n\n  if (userPoolProps) {\n    cognitoUserPoolProps = overrideProps(DefaultUserPoolProps, userPoolProps);\n  } else {\n    cognitoUserPoolProps = DefaultUserPoolProps;\n  }\n\n  const userPool = new cognito.UserPool(scope, 'CognitoUserPool', cognitoUserPoolProps);\n\n  // Set the advancedSecurityMode to ENFORCED\n  const cfnUserPool = userPool.node.findChild('Resource') as cognito.CfnUserPool;\n\n  cfnUserPool.userPoolAddOns = {\n    advancedSecurityMode: 'ENFORCED'\n  };\n\n  // Add Cfn Nag suppress for the cognito SMS role policy\n  const userPoolSmsRole = userPool.node.tryFindChild('smsRole') as iam.Role;\n\n  if (userPoolSmsRole) {\n    addCfnSuppressRules(userPool, [\n      {\n        id: 'W11',\n        reason: `Allowing * resource on permissions policy since its used by Cognito to send SMS messages via sns:Publish`\n      }\n    ]);\n  }\n\n  return userPool;\n}\n\nexport function buildUserPoolClient(scope: Construct, userPool: cognito.UserPool,\n  cognitoUserPoolClientProps?: cognito.UserPoolClientProps): cognito.UserPoolClient {\n\n  let userPoolClientProps: cognito.UserPoolClientProps;\n\n  if (cognitoUserPoolClientProps) {\n    userPoolClientProps = overrideProps(DefaultUserPoolClientProps(userPool), cognitoUserPoolClientProps);\n  } else {\n    userPoolClientProps = DefaultUserPoolClientProps(userPool);\n  }\n\n  return new cognito.UserPoolClient(scope, 'CognitoUserPoolClient', userPoolClientProps);\n}\n\nexport function buildIdentityPool(scope: Construct, userpool: cognito.UserPool, userpoolclient: cognito.UserPoolClient,\n  identityPoolProps?: cognito.CfnIdentityPoolProps): cognito.CfnIdentityPool {\n\n  let cognitoIdentityPoolProps: cognito.CfnIdentityPoolProps = DefaultIdentityPoolProps(userpoolclient.userPoolClientId,\n    userpool.userPoolProviderName);\n\n  if (identityPoolProps) {\n    cognitoIdentityPoolProps = overrideProps(cognitoIdentityPoolProps, identityPoolProps);\n  }\n\n  const idPool = new cognito.CfnIdentityPool(scope, 'CognitoIdentityPool', cognitoIdentityPoolProps);\n\n  return idPool;\n}\n\nexport function setupCognitoForElasticSearch(scope: Construct, domainName: string, options: CognitoOptions): iam.Role {\n\n  // Create the domain for Cognito UserPool\n  const userpooldomain = new cognito.CfnUserPoolDomain(scope, 'UserPoolDomain', {\n    domain: domainName,\n    userPoolId: options.userpool.userPoolId\n  });\n  userpooldomain.addDependsOn(options.userpool.node.findChild('Resource') as cognito.CfnUserPool);\n\n  // Setup the IAM Role for Cognito Authorized Users\n  const cognitoPrincipal = new iam.FederatedPrincipal(\n    'cognito-identity.amazonaws.com',\n    {\n      'StringEquals': { 'cognito-identity.amazonaws.com:aud': options.identitypool.ref },\n      'ForAnyValue:StringLike': { 'cognito-identity.amazonaws.com:amr': 'authenticated' }\n    },\n    'sts:AssumeRoleWithWebIdentity');\n\n  const cognitoAuthorizedRole = new iam.Role(scope, 'CognitoAuthorizedRole', {\n    assumedBy: cognitoPrincipal,\n    inlinePolicies: {\n      CognitoAccessPolicy: new iam.PolicyDocument({\n        statements: [new iam.PolicyStatement({\n          actions: [\n            'es:ESHttp*'\n          ],\n          resources: [`arn:${cdk.Aws.PARTITION}:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/${domainName}/*`]\n        })\n        ]\n      })\n    }\n  });\n\n  // Attach the IAM Role for Cognito Authorized Users\n  new cognito.CfnIdentityPoolRoleAttachment(scope, 'IdentityPoolRoleMapping', {\n    identityPoolId: options.identitypool.ref,\n    roles: {\n      authenticated: cognitoAuthorizedRole.roleArn\n    }\n  });\n\n  return cognitoAuthorizedRole;\n}\n"]}
92
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cognito-helper.js","sourceRoot":"","sources":["cognito-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 cognito from '@aws-cdk/aws-cognito';\nimport * as iam from '@aws-cdk/aws-iam';\nimport * as cdk from '@aws-cdk/core';\nimport { addCfnSuppressRules, consolidateProps } from './utils';\nimport { DefaultUserPoolProps, DefaultUserPoolClientProps, DefaultIdentityPoolProps } from './cognito-defaults';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from '@aws-cdk/core';\n\nexport interface CognitoOptions {\n  readonly identitypool: cognito.CfnIdentityPool,\n  readonly userpool: cognito.UserPool,\n  readonly userpoolclient: cognito.UserPoolClient\n}\n\nexport function buildUserPool(scope: Construct, userPoolProps?: cognito.UserPoolProps): cognito.UserPool {\n  let cognitoUserPoolProps: cognito.UserPoolProps;\n\n  cognitoUserPoolProps = consolidateProps(DefaultUserPoolProps, userPoolProps);\n\n  const userPool = new cognito.UserPool(scope, 'CognitoUserPool', cognitoUserPoolProps);\n\n  // Set the advancedSecurityMode to ENFORCED\n  const cfnUserPool = userPool.node.findChild('Resource') as cognito.CfnUserPool;\n\n  cfnUserPool.userPoolAddOns = {\n    advancedSecurityMode: 'ENFORCED'\n  };\n\n  // Add Cfn Nag suppress for the cognito SMS role policy\n  const userPoolSmsRole = userPool.node.tryFindChild('smsRole') as iam.Role;\n\n  if (userPoolSmsRole) {\n    addCfnSuppressRules(userPool, [\n      {\n        id: 'W11',\n        reason: `Allowing * resource on permissions policy since its used by Cognito to send SMS messages via sns:Publish`\n      }\n    ]);\n  }\n\n  return userPool;\n}\n\nexport function buildUserPoolClient(scope: Construct, userPool: cognito.UserPool,\n  cognitoUserPoolClientProps?: cognito.UserPoolClientProps): cognito.UserPoolClient {\n\n  let userPoolClientProps: cognito.UserPoolClientProps;\n\n  userPoolClientProps = consolidateProps(DefaultUserPoolClientProps(userPool), cognitoUserPoolClientProps);\n\n  return new cognito.UserPoolClient(scope, 'CognitoUserPoolClient', userPoolClientProps);\n}\n\nexport function buildIdentityPool(scope: Construct, userpool: cognito.UserPool, userpoolclient: cognito.UserPoolClient,\n  identityPoolProps?: cognito.CfnIdentityPoolProps): cognito.CfnIdentityPool {\n\n  let cognitoIdentityPoolProps: cognito.CfnIdentityPoolProps = DefaultIdentityPoolProps(userpoolclient.userPoolClientId,\n    userpool.userPoolProviderName);\n\n  cognitoIdentityPoolProps = consolidateProps(cognitoIdentityPoolProps, identityPoolProps);\n\n  const idPool = new cognito.CfnIdentityPool(scope, 'CognitoIdentityPool', cognitoIdentityPoolProps);\n\n  return idPool;\n}\n\nexport function setupCognitoForElasticSearch(scope: Construct, domainName: string, options: CognitoOptions): iam.Role {\n\n  // Create the domain for Cognito UserPool\n  const userpooldomain = new cognito.CfnUserPoolDomain(scope, 'UserPoolDomain', {\n    domain: domainName,\n    userPoolId: options.userpool.userPoolId\n  });\n  userpooldomain.addDependsOn(options.userpool.node.findChild('Resource') as cognito.CfnUserPool);\n\n  // Setup the IAM Role for Cognito Authorized Users\n  const cognitoPrincipal = new iam.FederatedPrincipal(\n    'cognito-identity.amazonaws.com',\n    {\n      'StringEquals': { 'cognito-identity.amazonaws.com:aud': options.identitypool.ref },\n      'ForAnyValue:StringLike': { 'cognito-identity.amazonaws.com:amr': 'authenticated' }\n    },\n    'sts:AssumeRoleWithWebIdentity');\n\n  const cognitoAuthorizedRole = new iam.Role(scope, 'CognitoAuthorizedRole', {\n    assumedBy: cognitoPrincipal,\n    inlinePolicies: {\n      CognitoAccessPolicy: new iam.PolicyDocument({\n        statements: [new iam.PolicyStatement({\n          actions: [\n            'es:ESHttp*'\n          ],\n          resources: [`arn:${cdk.Aws.PARTITION}:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/${domainName}/*`]\n        })\n        ]\n      })\n    }\n  });\n\n  // Attach the IAM Role for Cognito Authorized Users\n  new cognito.CfnIdentityPoolRoleAttachment(scope, 'IdentityPoolRoleMapping', {\n    identityPoolId: options.identitypool.ref,\n    roles: {\n      authenticated: cognitoAuthorizedRole.roleArn\n    }\n  });\n\n  return cognitoAuthorizedRole;\n}\n"]}
package/lib/dynamodb-table-helper.js CHANGED
@@ -20,13 +20,8 @@ function buildDynamoDBTable(scope, props) {
20
20
  // Conditional DynamoDB Table creation
21
21
  if (!props.existingTableObj) {
22
22
  // Set the default props for DynamoDB table
23
- if (props.dynamoTableProps) {
24
- const dynamoTableProps = utils_1.overrideProps(dynamodb_table_defaults_1.DefaultTableProps, props.dynamoTableProps);
25
- return new dynamodb.Table(scope, 'DynamoTable', dynamoTableProps);
26
- }
27
- else {
28
- return new dynamodb.Table(scope, 'DynamoTable', dynamodb_table_defaults_1.DefaultTableProps);
29
- }
23
+ const dynamoTableProps = utils_1.consolidateProps(dynamodb_table_defaults_1.DefaultTableProps, props.dynamoTableProps);
24
+ return new dynamodb.Table(scope, 'DynamoTable', dynamoTableProps);
30
25
  }
31
26
  else {
32
27
  return props.existingTableObj;
@@ -37,15 +32,9 @@ function buildDynamoDBTableWithStream(scope, props) {
37
32
  // Conditional DynamoDB Table creation
38
33
  if (!props.existingTableInterface) {
39
34
  // Set the default props for DynamoDB table
40
- if (props.dynamoTableProps) {
41
- const dynamoTableProps = utils_1.overrideProps(dynamodb_table_defaults_1.DefaultTableWithStreamProps, props.dynamoTableProps);
42
- const dynamoTable = new dynamodb.Table(scope, 'DynamoTable', dynamoTableProps);
43
- return [dynamoTable, dynamoTable];
44
- }
45
- else {
46
- const dynamoTable = new dynamodb.Table(scope, 'DynamoTable', dynamodb_table_defaults_1.DefaultTableWithStreamProps);
47
- return [dynamoTable, dynamoTable];
48
- }
35
+ const dynamoTableProps = utils_1.consolidateProps(dynamodb_table_defaults_1.DefaultTableWithStreamProps, props.dynamoTableProps);
36
+ const dynamoTable = new dynamodb.Table(scope, 'DynamoTable', dynamoTableProps);
37
+ return [dynamoTable, dynamoTable];
49
38
  }
50
39
  else {
51
40
  return [props.existingTableInterface, undefined];
@@ -62,4 +51,4 @@ function getPartitionKeyNameFromTable(table) {
62
51
  return partitionKey.attributeName;
63
52
  }
64
53
  exports.getPartitionKeyNameFromTable = getPartitionKeyNameFromTable;
65
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHluYW1vZGItdGFibGUtaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZHluYW1vZGItdGFibGUtaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7O0FBRUgsa0RBQWtEO0FBQ2xELHVFQUEyRjtBQUMzRixtQ0FBd0M7QUFvQ3hDLFNBQWdCLGtCQUFrQixDQUFDLEtBQWdCLEVBQUUsS0FBOEI7SUFDakYsc0NBQXNDO0lBQ3RDLElBQUksQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUU7UUFDM0IsMkNBQTJDO1FBQzNDLElBQUksS0FBSyxDQUFDLGdCQUFnQixFQUFFO1lBQzFCLE1BQU0sZ0JBQWdCLEdBQUcscUJBQWEsQ0FBQywyQ0FBaUIsRUFBRSxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztZQUNsRixPQUFPLElBQUksUUFBUSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsYUFBYSxFQUFFLGdCQUFnQixDQUFDLENBQUM7U0FDbkU7YUFBTTtZQUNMLE9BQU8sSUFBSSxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxhQUFhLEVBQUUsMkNBQWlCLENBQUMsQ0FBQztTQUNwRTtLQUNGO1NBQU07UUFDTCxPQUFPLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQztLQUMvQjtBQUNILENBQUM7QUFiRCxnREFhQztBQUVELFNBQWdCLDRCQUE0QixDQUFDLEtBQWdCLEVBQUUsS0FBd0M7SUFDckcsc0NBQXNDO0lBQ3RDLElBQUksQ0FBQyxLQUFLLENBQUMsc0JBQXNCLEVBQUU7UUFDakMsMkNBQTJDO1FBQzNDLElBQUksS0FBSyxDQUFDLGdCQUFnQixFQUFFO1lBQzFCLE1BQU0sZ0JBQWdCLEdBQUcscUJBQWEsQ0FBQyxxREFBMkIsRUFBRSxLQUFLLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztZQUM1RixNQUFNLFdBQVcsR0FBbUIsSUFBSSxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztZQUMvRixPQUFPLENBQUMsV0FBOEIsRUFBRSxXQUFXLENBQUMsQ0FBQztTQUN0RDthQUFNO1lBQ0wsTUFBTSxXQUFXLEdBQW1CLElBQUksUUFBUSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsYUFBYSxFQUFFLHFEQUEyQixDQUFDLENBQUM7WUFDMUcsT0FBTyxDQUFDLFdBQThCLEVBQUUsV0FBVyxDQUFDLENBQUM7U0FDdEQ7S0FDRjtTQUFNO1FBQ0wsT0FBTyxDQUFDLEtBQUssQ0FBQyxzQkFBc0IsRUFBRSxTQUFTLENBQUMsQ0FBQztLQUNsRDtBQUNILENBQUM7QUFmRCxvRUFlQztBQUVELFNBQWdCLDRCQUE0QixDQUFDLEtBQXFCO0lBQ2hFLE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBc0IsQ0FBQztJQUN2RSxNQUFNLFNBQVMsR0FBRyxRQUFRLENBQUMsU0FBa0QsQ0FBQztJQUM5RSxNQUFNLFlBQVksR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFFLENBQUMsT0FBWSxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsT0FBTyxLQUFLLE1BQU0sQ0FBQyxDQUFDO0lBQ25GLElBQUksQ0FBQyxZQUFZLEVBQUU7UUFDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFDO0tBQ3hEO0lBQ0QsT0FBTyxZQUFZLENBQUMsYUFBYSxDQUFDO0FBQ3BDLENBQUM7QUFSRCxvRUFRQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0ICogYXMgZHluYW1vZGIgZnJvbSAnQGF3cy1jZGsvYXdzLWR5bmFtb2RiJztcbmltcG9ydCB7IERlZmF1bHRUYWJsZVByb3BzLCBEZWZhdWx0VGFibGVXaXRoU3RyZWFtUHJvcHMgfSBmcm9tICcuL2R5bmFtb2RiLXRhYmxlLWRlZmF1bHRzJztcbmltcG9ydCB7IG92ZXJyaWRlUHJvcHMgfSBmcm9tICcuL3V0aWxzJztcbi8vIE5vdGU6IFRvIGVuc3VyZSBDREt2MiBjb21wYXRpYmlsaXR5LCBrZWVwIHRoZSBpbXBvcnQgc3RhdGVtZW50IGZvciBDb25zdHJ1Y3Qgc2VwYXJhdGVcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuXG5leHBvcnQgaW50ZXJmYWNlIEJ1aWxkRHluYW1vREJUYWJsZVByb3BzIHtcbiAgLyoqXG4gICAqIE9wdGlvbmFsIHVzZXIgcHJvdmlkZWQgcHJvcHMgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQgcHJvcHNcbiAgICpcbiAgICogQGRlZmF1bHQgLSBEZWZhdWx0IHByb3BzIGFyZSB1c2VkXG4gICAqL1xuICByZWFkb25seSBkeW5hbW9UYWJsZVByb3BzPzogZHluYW1vZGIuVGFibGVQcm9wcyxcbiAgLyoqXG4gICAqIEV4aXN0aW5nIGluc3RhbmNlIG9mIGR5bmFtb2RiIHRhYmxlIG9iamVjdC5cbiAgICogUHJvdmlkaW5nIGJvdGggdGhpcyBhbmQgYGR5bmFtb1RhYmxlUHJvcHNgIHdpbGwgY2F1c2UgYW4gZXJyb3IuXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gTm9uZVxuICAgKi9cbiAgcmVhZG9ubHkgZXhpc3RpbmdUYWJsZU9iaj86IGR5bmFtb2RiLlRhYmxlXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQnVpbGREeW5hbW9EQlRhYmxlV2l0aFN0cmVhbVByb3BzIHtcbiAgLyoqXG4gICAqIE9wdGlvbmFsIHVzZXIgcHJvdmlkZWQgcHJvcHMgdG8gb3ZlcnJpZGUgdGhlIGRlZmF1bHQgcHJvcHNcbiAgICpcbiAgICogQGRlZmF1bHQgLSBEZWZhdWx0IHByb3BzIGFyZSB1c2VkXG4gICAqL1xuICByZWFkb25seSBkeW5hbW9UYWJsZVByb3BzPzogZHluYW1vZGIuVGFibGVQcm9wcyxcbiAgLyoqXG4gICAqIEV4aXN0aW5nIGluc3RhbmNlIG9mIGR5bmFtb2RiIHRhYmxlIG9iamVjdC5cbiAgICogUHJvdmlkaW5nIGJvdGggdGhpcyBhbmQgYGR5bmFtb1RhYmxlUHJvcHNgIHdpbGwgY2F1c2UgYW4gZXJyb3IuXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gTm9uZVxuICAgKi9cbiAgcmVhZG9ubHkgZXhpc3RpbmdUYWJsZUludGVyZmFjZT86IGR5bmFtb2RiLklUYWJsZVxufVxuXG5leHBvcnQgZnVuY3Rpb24gYnVpbGREeW5hbW9EQlRhYmxlKHNjb3BlOiBDb25zdHJ1Y3QsIHByb3BzOiBCdWlsZER5bmFtb0RCVGFibGVQcm9wcyk6IGR5bmFtb2RiLlRhYmxlIHtcbiAgLy8gQ29uZGl0aW9uYWwgRHluYW1vREIgVGFibGUgY3JlYXRpb25cbiAgaWYgKCFwcm9wcy5leGlzdGluZ1RhYmxlT2JqKSB7XG4gICAgLy8gU2V0IHRoZSBkZWZhdWx0IHByb3BzIGZvciBEeW5hbW9EQiB0YWJsZVxuICAgIGlmIChwcm9wcy5keW5hbW9UYWJsZVByb3BzKSB7XG4gICAgICBjb25zdCBkeW5hbW9UYWJsZVByb3BzID0gb3ZlcnJpZGVQcm9wcyhEZWZhdWx0VGFibGVQcm9wcywgcHJvcHMuZHluYW1vVGFibGVQcm9wcyk7XG4gICAgICByZXR1cm4gbmV3IGR5bmFtb2RiLlRhYmxlKHNjb3BlLCAnRHluYW1vVGFibGUnLCBkeW5hbW9UYWJsZVByb3BzKTtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIG5ldyBkeW5hbW9kYi5UYWJsZShzY29wZSwgJ0R5bmFtb1RhYmxlJywgRGVmYXVsdFRhYmxlUHJvcHMpO1xuICAgIH1cbiAgfSBlbHNlIHtcbiAgICByZXR1cm4gcHJvcHMuZXhpc3RpbmdUYWJsZU9iajtcbiAgfVxufVxuXG5leHBvcnQgZnVuY3Rpb24gYnVpbGREeW5hbW9EQlRhYmxlV2l0aFN0cmVhbShzY29wZTogQ29uc3RydWN0LCBwcm9wczogQnVpbGREeW5hbW9EQlRhYmxlV2l0aFN0cmVhbVByb3BzKTogW2R5bmFtb2RiLklUYWJsZSwgZHluYW1vZGIuVGFibGU/XSB7XG4gIC8vIENvbmRpdGlvbmFsIER5bmFtb0RCIFRhYmxlIGNyZWF0aW9uXG4gIGlmICghcHJvcHMuZXhpc3RpbmdUYWJsZUludGVyZmFjZSkge1xuICAgIC8vIFNldCB0aGUgZGVmYXVsdCBwcm9wcyBmb3IgRHluYW1vREIgdGFibGVcbiAgICBpZiAocHJvcHMuZHluYW1vVGFibGVQcm9wcykge1xuICAgICAgY29uc3QgZHluYW1vVGFibGVQcm9wcyA9IG92ZXJyaWRlUHJvcHMoRGVmYXVsdFRhYmxlV2l0aFN0cmVhbVByb3BzLCBwcm9wcy5keW5hbW9UYWJsZVByb3BzKTtcbiAgICAgIGNvbnN0IGR5bmFtb1RhYmxlOiBkeW5hbW9kYi5UYWJsZSA9IG5ldyBkeW5hbW9kYi5UYWJsZShzY29wZSwgJ0R5bmFtb1RhYmxlJywgZHluYW1vVGFibGVQcm9wcyk7XG4gICAgICByZXR1cm4gW2R5bmFtb1RhYmxlIGFzIGR5bmFtb2RiLklUYWJsZSwgZHluYW1vVGFibGVdO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBkeW5hbW9UYWJsZTogZHluYW1vZGIuVGFibGUgPSBuZXcgZHluYW1vZGIuVGFibGUoc2NvcGUsICdEeW5hbW9UYWJsZScsIERlZmF1bHRUYWJsZVdpdGhTdHJlYW1Qcm9wcyk7XG4gICAgICByZXR1cm4gW2R5bmFtb1RhYmxlIGFzIGR5bmFtb2RiLklUYWJsZSwgZHluYW1vVGFibGVdO1xuICAgIH1cbiAgfSBlbHNlIHtcbiAgICByZXR1cm4gW3Byb3BzLmV4aXN0aW5nVGFibGVJbnRlcmZhY2UsIHVuZGVmaW5lZF07XG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGdldFBhcnRpdGlvbktleU5hbWVGcm9tVGFibGUodGFibGU6IGR5bmFtb2RiLlRhYmxlKTogc3RyaW5nIHtcbiAgY29uc3QgY2ZuVGFibGUgPSB0YWJsZS5ub2RlLmZpbmRDaGlsZCgnUmVzb3VyY2UnKSBhcyBkeW5hbW9kYi5DZm5UYWJsZTtcbiAgY29uc3Qga2V5U2NoZW1hID0gY2ZuVGFibGUua2V5U2NoZW1hIGFzIGR5bmFtb2RiLkNmblRhYmxlLktleVNjaGVtYVByb3BlcnR5W107XG4gIGNvbnN0IHBhcnRpdGlvbktleSA9IGtleVNjaGVtYS5maW5kKCAoa2V5UGFydDogYW55KSA9PiBrZXlQYXJ0LmtleVR5cGUgPT09ICdIQVNIJyk7XG4gIGlmICghcGFydGl0aW9uS2V5KSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdQYXJ0aXRpb24ga2V5IGZvciB0YWJsZSBub3QgZGVmaW5lZCcpO1xuICB9XG4gIHJldHVybiBwYXJ0aXRpb25LZXkuYXR0cmlidXRlTmFtZTtcbn1cbiJdfQ==
54
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHluYW1vZGItdGFibGUtaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZHluYW1vZGItdGFibGUtaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7O0FBRUgsa0RBQWtEO0FBQ2xELHVFQUEyRjtBQUMzRixtQ0FBMkM7QUFvQzNDLFNBQWdCLGtCQUFrQixDQUFDLEtBQWdCLEVBQUUsS0FBOEI7SUFDakYsc0NBQXNDO0lBQ3RDLElBQUksQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUU7UUFDM0IsMkNBQTJDO1FBQzNDLE1BQU0sZ0JBQWdCLEdBQUcsd0JBQWdCLENBQUMsMkNBQWlCLEVBQUUsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDckYsT0FBTyxJQUFJLFFBQVEsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO0tBQ25FO1NBQU07UUFDTCxPQUFPLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQztLQUMvQjtBQUNILENBQUM7QUFURCxnREFTQztBQUVELFNBQWdCLDRCQUE0QixDQUFDLEtBQWdCLEVBQUUsS0FBd0M7SUFDckcsc0NBQXNDO0lBQ3RDLElBQUksQ0FBQyxLQUFLLENBQUMsc0JBQXNCLEVBQUU7UUFDakMsMkNBQTJDO1FBQzNDLE1BQU0sZ0JBQWdCLEdBQUcsd0JBQWdCLENBQUMscURBQTJCLEVBQUUsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDL0YsTUFBTSxXQUFXLEdBQW1CLElBQUksUUFBUSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsYUFBYSxFQUFFLGdCQUFnQixDQUFDLENBQUM7UUFDL0YsT0FBTyxDQUFDLFdBQThCLEVBQUUsV0FBVyxDQUFDLENBQUM7S0FDdEQ7U0FBTTtRQUNMLE9BQU8sQ0FBQyxLQUFLLENBQUMsc0JBQXNCLEVBQUUsU0FBUyxDQUFDLENBQUM7S0FDbEQ7QUFDSCxDQUFDO0FBVkQsb0VBVUM7QUFFRCxTQUFnQiw0QkFBNEIsQ0FBQyxLQUFxQjtJQUNoRSxNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQXNCLENBQUM7SUFDdkUsTUFBTSxTQUFTLEdBQUcsUUFBUSxDQUFDLFNBQWtELENBQUM7SUFDOUUsTUFBTSxZQUFZLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQVksRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLE9BQU8sS0FBSyxNQUFNLENBQUMsQ0FBQztJQUNsRixJQUFJLENBQUMsWUFBWSxFQUFFO1FBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztLQUN4RDtJQUNELE9BQU8sWUFBWSxDQUFDLGFBQWEsQ0FBQztBQUNwQyxDQUFDO0FBUkQsb0VBUUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbmltcG9ydCAqIGFzIGR5bmFtb2RiIGZyb20gJ0Bhd3MtY2RrL2F3cy1keW5hbW9kYic7XG5pbXBvcnQgeyBEZWZhdWx0VGFibGVQcm9wcywgRGVmYXVsdFRhYmxlV2l0aFN0cmVhbVByb3BzIH0gZnJvbSAnLi9keW5hbW9kYi10YWJsZS1kZWZhdWx0cyc7XG5pbXBvcnQgeyBjb25zb2xpZGF0ZVByb3BzIH0gZnJvbSAnLi91dGlscyc7XG4vLyBOb3RlOiBUbyBlbnN1cmUgQ0RLdjIgY29tcGF0aWJpbGl0eSwga2VlcCB0aGUgaW1wb3J0IHN0YXRlbWVudCBmb3IgQ29uc3RydWN0IHNlcGFyYXRlXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdAYXdzLWNkay9jb3JlJztcblxuZXhwb3J0IGludGVyZmFjZSBCdWlsZER5bmFtb0RCVGFibGVQcm9wcyB7XG4gIC8qKlxuICAgKiBPcHRpb25hbCB1c2VyIHByb3ZpZGVkIHByb3BzIHRvIG92ZXJyaWRlIHRoZSBkZWZhdWx0IHByb3BzXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gRGVmYXVsdCBwcm9wcyBhcmUgdXNlZFxuICAgKi9cbiAgcmVhZG9ubHkgZHluYW1vVGFibGVQcm9wcz86IGR5bmFtb2RiLlRhYmxlUHJvcHMsXG4gIC8qKlxuICAgKiBFeGlzdGluZyBpbnN0YW5jZSBvZiBkeW5hbW9kYiB0YWJsZSBvYmplY3QuXG4gICAqIFByb3ZpZGluZyBib3RoIHRoaXMgYW5kIGBkeW5hbW9UYWJsZVByb3BzYCB3aWxsIGNhdXNlIGFuIGVycm9yLlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIE5vbmVcbiAgICovXG4gIHJlYWRvbmx5IGV4aXN0aW5nVGFibGVPYmo/OiBkeW5hbW9kYi5UYWJsZVxufVxuXG5leHBvcnQgaW50ZXJmYWNlIEJ1aWxkRHluYW1vREJUYWJsZVdpdGhTdHJlYW1Qcm9wcyB7XG4gIC8qKlxuICAgKiBPcHRpb25hbCB1c2VyIHByb3ZpZGVkIHByb3BzIHRvIG92ZXJyaWRlIHRoZSBkZWZhdWx0IHByb3BzXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gRGVmYXVsdCBwcm9wcyBhcmUgdXNlZFxuICAgKi9cbiAgcmVhZG9ubHkgZHluYW1vVGFibGVQcm9wcz86IGR5bmFtb2RiLlRhYmxlUHJvcHMsXG4gIC8qKlxuICAgKiBFeGlzdGluZyBpbnN0YW5jZSBvZiBkeW5hbW9kYiB0YWJsZSBvYmplY3QuXG4gICAqIFByb3ZpZGluZyBib3RoIHRoaXMgYW5kIGBkeW5hbW9UYWJsZVByb3BzYCB3aWxsIGNhdXNlIGFuIGVycm9yLlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIE5vbmVcbiAgICovXG4gIHJlYWRvbmx5IGV4aXN0aW5nVGFibGVJbnRlcmZhY2U/OiBkeW5hbW9kYi5JVGFibGVcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkRHluYW1vREJUYWJsZShzY29wZTogQ29uc3RydWN0LCBwcm9wczogQnVpbGREeW5hbW9EQlRhYmxlUHJvcHMpOiBkeW5hbW9kYi5UYWJsZSB7XG4gIC8vIENvbmRpdGlvbmFsIER5bmFtb0RCIFRhYmxlIGNyZWF0aW9uXG4gIGlmICghcHJvcHMuZXhpc3RpbmdUYWJsZU9iaikge1xuICAgIC8vIFNldCB0aGUgZGVmYXVsdCBwcm9wcyBmb3IgRHluYW1vREIgdGFibGVcbiAgICBjb25zdCBkeW5hbW9UYWJsZVByb3BzID0gY29uc29saWRhdGVQcm9wcyhEZWZhdWx0VGFibGVQcm9wcywgcHJvcHMuZHluYW1vVGFibGVQcm9wcyk7XG4gICAgcmV0dXJuIG5ldyBkeW5hbW9kYi5UYWJsZShzY29wZSwgJ0R5bmFtb1RhYmxlJywgZHluYW1vVGFibGVQcm9wcyk7XG4gIH0gZWxzZSB7XG4gICAgcmV0dXJuIHByb3BzLmV4aXN0aW5nVGFibGVPYmo7XG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkRHluYW1vREJUYWJsZVdpdGhTdHJlYW0oc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IEJ1aWxkRHluYW1vREJUYWJsZVdpdGhTdHJlYW1Qcm9wcyk6IFtkeW5hbW9kYi5JVGFibGUsIGR5bmFtb2RiLlRhYmxlP10ge1xuICAvLyBDb25kaXRpb25hbCBEeW5hbW9EQiBUYWJsZSBjcmVhdGlvblxuICBpZiAoIXByb3BzLmV4aXN0aW5nVGFibGVJbnRlcmZhY2UpIHtcbiAgICAvLyBTZXQgdGhlIGRlZmF1bHQgcHJvcHMgZm9yIER5bmFtb0RCIHRhYmxlXG4gICAgY29uc3QgZHluYW1vVGFibGVQcm9wcyA9IGNvbnNvbGlkYXRlUHJvcHMoRGVmYXVsdFRhYmxlV2l0aFN0cmVhbVByb3BzLCBwcm9wcy5keW5hbW9UYWJsZVByb3BzKTtcbiAgICBjb25zdCBkeW5hbW9UYWJsZTogZHluYW1vZGIuVGFibGUgPSBuZXcgZHluYW1vZGIuVGFibGUoc2NvcGUsICdEeW5hbW9UYWJsZScsIGR5bmFtb1RhYmxlUHJvcHMpO1xuICAgIHJldHVybiBbZHluYW1vVGFibGUgYXMgZHluYW1vZGIuSVRhYmxlLCBkeW5hbW9UYWJsZV07XG4gIH0gZWxzZSB7XG4gICAgcmV0dXJuIFtwcm9wcy5leGlzdGluZ1RhYmxlSW50ZXJmYWNlLCB1bmRlZmluZWRdO1xuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRQYXJ0aXRpb25LZXlOYW1lRnJvbVRhYmxlKHRhYmxlOiBkeW5hbW9kYi5UYWJsZSk6IHN0cmluZyB7XG4gIGNvbnN0IGNmblRhYmxlID0gdGFibGUubm9kZS5maW5kQ2hpbGQoJ1Jlc291cmNlJykgYXMgZHluYW1vZGIuQ2ZuVGFibGU7XG4gIGNvbnN0IGtleVNjaGVtYSA9IGNmblRhYmxlLmtleVNjaGVtYSBhcyBkeW5hbW9kYi5DZm5UYWJsZS5LZXlTY2hlbWFQcm9wZXJ0eVtdO1xuICBjb25zdCBwYXJ0aXRpb25LZXkgPSBrZXlTY2hlbWEuZmluZCgoa2V5UGFydDogYW55KSA9PiBrZXlQYXJ0LmtleVR5cGUgPT09ICdIQVNIJyk7XG4gIGlmICghcGFydGl0aW9uS2V5KSB7XG4gICAgdGhyb3cgbmV3IEVycm9yKCdQYXJ0aXRpb24ga2V5IGZvciB0YWJsZSBub3QgZGVmaW5lZCcpO1xuICB9XG4gIHJldHVybiBwYXJ0aXRpb25LZXkuYXR0cmlidXRlTmFtZTtcbn1cbiJdfQ==
package/lib/elasticsearch-helper.js CHANGED
@@ -62,9 +62,7 @@ function buildElasticSearch(scope, domainName, options, cfnDomainProps) {
62
62
  });
63
63
  cognitoKibanaConfigureRolePolicy.attachToRole(cognitoKibanaConfigureRole);
64
64
  let _cfnDomainProps = elasticsearch_defaults_1.DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options);
65
- if (cfnDomainProps) {
66
- _cfnDomainProps = utils_1.overrideProps(_cfnDomainProps, cfnDomainProps);
67
- }
65
+ _cfnDomainProps = utils_1.consolidateProps(_cfnDomainProps, cfnDomainProps);
68
66
  const esDomain = new elasticsearch.CfnDomain(scope, "ElasticsearchDomain", _cfnDomainProps);
69
67
  utils_1.addCfnSuppressRules(esDomain, [
70
68
  {
@@ -202,4 +200,4 @@ function buildElasticSearchCWAlarms(scope) {
202
200
  return alarms;
203
201
  }
204
202
  exports.buildElasticSearchCWAlarms = buildElasticSearchCWAlarms;
205
- //# 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 { overrideProps, 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  if (cfnDomainProps) {\n    _cfnDomainProps = overrideProps(_cfnDomainProps, cfnDomainProps);\n  }\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"]}
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"]}
package/lib/kinesis-streams-helper.js CHANGED
@@ -25,14 +25,8 @@ function buildKinesisStream(scope, props) {
25
25
  }
26
26
  // Setup the stream properties
27
27
  let kinesisStreamProps;
28
- if (props.kinesisStreamProps) {
29
- // If property overrides have been provided, incorporate them and deploy
30
- kinesisStreamProps = utils_1.overrideProps(kinesis_streams_defaults_1.DefaultStreamProps, props.kinesisStreamProps);
31
- }
32
- else {
33
- // If no property overrides, deploy using the default configuration
34
- kinesisStreamProps = kinesis_streams_defaults_1.DefaultStreamProps;
35
- }
28
+ // If property overrides have been provided, incorporate them and deploy
29
+ kinesisStreamProps = utils_1.consolidateProps(kinesis_streams_defaults_1.DefaultStreamProps, props.kinesisStreamProps);
36
30
  // Create the stream and return
37
31
  return new kinesis.Stream(scope, 'KinesisStream', kinesisStreamProps);
38
32
  }
@@ -69,4 +63,4 @@ function buildKinesisStreamCWAlarms(scope) {
69
63
  return alarms;
70
64
  }
71
65
  exports.buildKinesisStreamCWAlarms = buildKinesisStreamCWAlarms;
72
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2luZXNpcy1zdHJlYW1zLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImtpbmVzaXMtc3RyZWFtcy1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOzs7QUFFSCxVQUFVO0FBQ1YsZ0RBQWdEO0FBQ2hELHlFQUFnRTtBQUNoRSxxQ0FBcUM7QUFDckMsbUNBQXdDO0FBQ3hDLHNEQUFzRDtBQW9CdEQsU0FBZ0Isa0JBQWtCLENBQUMsS0FBZ0IsRUFBRSxLQUE4QjtJQUVqRixJQUFJLEtBQUssQ0FBQyxpQkFBaUIsRUFBRTtRQUMzQixPQUFPLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQztLQUNoQztJQUVELDhCQUE4QjtJQUM5QixJQUFJLGtCQUFrQixDQUFDO0lBQ3ZCLElBQUksS0FBSyxDQUFDLGtCQUFrQixFQUFFO1FBQzVCLHdFQUF3RTtRQUN4RSxrQkFBa0IsR0FBRyxxQkFBYSxDQUFDLDZDQUFrQixFQUFFLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0tBQ2xGO1NBQU07UUFDTCxtRUFBbUU7UUFDbkUsa0JBQWtCLEdBQUcsNkNBQWtCLENBQUM7S0FDekM7SUFFRCwrQkFBK0I7SUFDL0IsT0FBTyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ3hFLENBQUM7QUFsQkQsZ0RBa0JDO0FBRUQsU0FBZ0IsMEJBQTBCLENBQUMsS0FBZ0I7SUFDekQsb0NBQW9DO0lBQ3BDLE1BQU0sTUFBTSxHQUF1QixJQUFJLEtBQUssRUFBRSxDQUFDO0lBRS9DLDRHQUE0RztJQUM1RyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUseUNBQXlDLEVBQUU7UUFDakYsTUFBTSxFQUFFLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQztZQUM1QixTQUFTLEVBQUUsYUFBYTtZQUN4QixVQUFVLEVBQUUsb0NBQW9DO1lBQ2hELFNBQVMsRUFBRSxTQUFTO1lBQ3BCLE1BQU0sRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7U0FDaEMsQ0FBQztRQUNGLFNBQVMsRUFBRSxPQUFPO1FBQ2xCLGlCQUFpQixFQUFFLENBQUM7UUFDcEIsa0JBQWtCLEVBQUUsVUFBVSxDQUFDLGtCQUFrQixDQUFDLGtDQUFrQztRQUNwRixnQkFBZ0IsRUFBRSxrR0FBa0c7S0FDckgsQ0FBQyxDQUFDLENBQUM7SUFFSix3REFBd0Q7SUFDeEQsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLHFEQUFxRCxFQUFFO1FBQzdGLE1BQU0sRUFBRSxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUM7WUFDNUIsU0FBUyxFQUFFLGFBQWE7WUFDeEIsVUFBVSxFQUFFLG1DQUFtQztZQUMvQyxTQUFTLEVBQUUsU0FBUztZQUNwQixNQUFNLEVBQUUsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1NBQ2hDLENBQUM7UUFDRixTQUFTLEVBQUUsQ0FBQztRQUNaLGlCQUFpQixFQUFFLENBQUM7UUFDcEIsa0JBQWtCLEVBQUUsVUFBVSxDQUFDLGtCQUFrQixDQUFDLHNCQUFzQjtRQUN4RSxnQkFBZ0IsRUFBRSxpRUFBaUU7S0FDcEYsQ0FBQyxDQUFDLENBQUM7SUFFSixPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBakNELGdFQWlDQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuLy8gSW1wb3J0c1xuaW1wb3J0ICogYXMga2luZXNpcyBmcm9tICdAYXdzLWNkay9hd3Mta2luZXNpcyc7XG5pbXBvcnQgeyBEZWZhdWx0U3RyZWFtUHJvcHMgfSBmcm9tICcuL2tpbmVzaXMtc3RyZWFtcy1kZWZhdWx0cyc7XG5pbXBvcnQgKiBhcyBjZGsgZnJvbSAnQGF3cy1jZGsvY29yZSc7XG5pbXBvcnQgeyBvdmVycmlkZVByb3BzIH0gZnJvbSAnLi91dGlscyc7XG5pbXBvcnQgKiBhcyBjbG91ZHdhdGNoIGZyb20gJ0Bhd3MtY2RrL2F3cy1jbG91ZHdhdGNoJztcbi8vIE5vdGU6IFRvIGVuc3VyZSBDREt2MiBjb21wYXRpYmlsaXR5LCBrZWVwIHRoZSBpbXBvcnQgc3RhdGVtZW50IGZvciBDb25zdHJ1Y3Qgc2VwYXJhdGVcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuXG5leHBvcnQgaW50ZXJmYWNlIEJ1aWxkS2luZXNpc1N0cmVhbVByb3BzIHtcbiAgLyoqXG4gICAqIEV4aXN0aW5nIGluc3RhbmNlIG9mIEtpbmVzaXMgU3RyZWFtLCBwcm92aWRpbmcgYm90aCB0aGlzIGFuZCBga2luZXNpc1N0cmVhbVByb3BzYCB3aWxsIGNhdXNlIGFuIGVycm9yLlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIE5vbmVcbiAgICovXG4gICAgcmVhZG9ubHkgZXhpc3RpbmdTdHJlYW1PYmo/OiBraW5lc2lzLlN0cmVhbTtcblxuICAvKipcbiAgICogT3B0aW9uYWwgdXNlciBwcm92aWRlZCBwcm9wcyB0byBvdmVycmlkZSB0aGUgZGVmYXVsdCBwcm9wcyBmb3IgdGhlIEtpbmVzaXMgc3RyZWFtLlxuICAgKlxuICAgKiBAZGVmYXVsdCAtIERlZmF1bHQgcHJvcHMgYXJlIHVzZWQuXG4gICAqL1xuICByZWFkb25seSBraW5lc2lzU3RyZWFtUHJvcHM/OiBraW5lc2lzLlN0cmVhbVByb3BzXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBidWlsZEtpbmVzaXNTdHJlYW0oc2NvcGU6IENvbnN0cnVjdCwgcHJvcHM6IEJ1aWxkS2luZXNpc1N0cmVhbVByb3BzKToga2luZXNpcy5TdHJlYW0ge1xuXG4gIGlmIChwcm9wcy5leGlzdGluZ1N0cmVhbU9iaikge1xuICAgIHJldHVybiBwcm9wcy5leGlzdGluZ1N0cmVhbU9iajtcbiAgfVxuXG4gIC8vIFNldHVwIHRoZSBzdHJlYW0gcHJvcGVydGllc1xuICBsZXQga2luZXNpc1N0cmVhbVByb3BzO1xuICBpZiAocHJvcHMua2luZXNpc1N0cmVhbVByb3BzKSB7XG4gICAgLy8gSWYgcHJvcGVydHkgb3ZlcnJpZGVzIGhhdmUgYmVlbiBwcm92aWRlZCwgaW5jb3Jwb3JhdGUgdGhlbSBhbmQgZGVwbG95XG4gICAga2luZXNpc1N0cmVhbVByb3BzID0gb3ZlcnJpZGVQcm9wcyhEZWZhdWx0U3RyZWFtUHJvcHMsIHByb3BzLmtpbmVzaXNTdHJlYW1Qcm9wcyk7XG4gIH0gZWxzZSB7XG4gICAgLy8gSWYgbm8gcHJvcGVydHkgb3ZlcnJpZGVzLCBkZXBsb3kgdXNpbmcgdGhlIGRlZmF1bHQgY29uZmlndXJhdGlvblxuICAgIGtpbmVzaXNTdHJlYW1Qcm9wcyA9IERlZmF1bHRTdHJlYW1Qcm9wcztcbiAgfVxuXG4gIC8vIENyZWF0ZSB0aGUgc3RyZWFtIGFuZCByZXR1cm5cbiAgcmV0dXJuIG5ldyBraW5lc2lzLlN0cmVhbShzY29wZSwgJ0tpbmVzaXNTdHJlYW0nLCBraW5lc2lzU3RyZWFtUHJvcHMpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gYnVpbGRLaW5lc2lzU3RyZWFtQ1dBbGFybXMoc2NvcGU6IENvbnN0cnVjdCk6IGNsb3Vkd2F0Y2guQWxhcm1bXSB7XG4gIC8vIFNldHVwIENXIEFsYXJtcyBmb3IgS2luZXNpc1N0cmVhbVxuICBjb25zdCBhbGFybXM6IGNsb3Vkd2F0Y2guQWxhcm1bXSA9IG5ldyBBcnJheSgpO1xuXG4gIC8vIEFsYXJtIGlmIE1heCAoR2V0UmVjb3Jkcy5JdGVyYXRvckFnZU1pbGxpc2Vjb25kcyk6ID49IDEyIGhvdXJzICg1MCUgb2YgMjQgaG91cnMgZGVmYXVsdCByZXRlbnRpb24gcGVyaW9kKVxuICBhbGFybXMucHVzaChuZXcgY2xvdWR3YXRjaC5BbGFybShzY29wZSwgJ0tpbmVzaXNTdHJlYW1HZXRSZWNvcmRzSXRlcmF0b3JBZ2VBbGFybScsIHtcbiAgICBtZXRyaWM6IG5ldyBjbG91ZHdhdGNoLk1ldHJpYyh7XG4gICAgICBuYW1lc3BhY2U6ICdBV1MvS2luZXNpcycsXG4gICAgICBtZXRyaWNOYW1lOiAnR2V0UmVjb3Jkcy5JdGVyYXRvckFnZU1pbGxpc2Vjb25kcycsXG4gICAgICBzdGF0aXN0aWM6ICdNYXhpbXVtJyxcbiAgICAgIHBlcmlvZDogY2RrLkR1cmF0aW9uLm1pbnV0ZXMoNSksXG4gICAgfSksXG4gICAgdGhyZXNob2xkOiAyNTkyMDAwLCAvLyAxMiBIb3VycyAoNTAlIG9mIDI0IGhvdXJzIC0gZGVmYXVsdCByZWNvcmQgcmV0ZW50aW9uIHBlcmlvZClcbiAgICBldmFsdWF0aW9uUGVyaW9kczogMSxcbiAgICBjb21wYXJpc29uT3BlcmF0b3I6IGNsb3Vkd2F0Y2guQ29tcGFyaXNvbk9wZXJhdG9yLkdSRUFURVJfVEhBTl9PUl9FUVVBTF9UT19USFJFU0hPTEQsXG4gICAgYWxhcm1EZXNjcmlwdGlvbjogJ0NvbnN1bWVyIFJlY29yZCBQcm9jZXNzaW5nIEZhbGxpbmcgQmVoaW5kLCB0aGVyZSBpcyByaXNrIGZvciBkYXRhIGxvc3MgZHVlIHRvIHJlY29yZCBleHBpcmF0aW9uLidcbiAgfSkpO1xuXG4gIC8vIEFsYXJtIGlmIEF2ZyAoUmVhZFByb3Zpc2lvbmVkVGhyb3VnaHB1dEV4Y2VlZGVkKTogPiAwXG4gIGFsYXJtcy5wdXNoKG5ldyBjbG91ZHdhdGNoLkFsYXJtKHNjb3BlLCAnS2luZXNpc1N0cmVhbVJlYWRQcm92aXNpb25lZFRocm91Z2hwdXRFeGNlZWRlZEFsYXJtJywge1xuICAgIG1ldHJpYzogbmV3IGNsb3Vkd2F0Y2guTWV0cmljKHtcbiAgICAgIG5hbWVzcGFjZTogJ0FXUy9LaW5lc2lzJyxcbiAgICAgIG1ldHJpY05hbWU6ICdSZWFkUHJvdmlzaW9uZWRUaHJvdWdocHV0RXhjZWVkZWQnLFxuICAgICAgc3RhdGlzdGljOiAnQXZlcmFnZScsXG4gICAgICBwZXJpb2Q6IGNkay5EdXJhdGlvbi5taW51dGVzKDUpLFxuICAgIH0pLFxuICAgIHRocmVzaG9sZDogMCxcbiAgICBldmFsdWF0aW9uUGVyaW9kczogMSxcbiAgICBjb21wYXJpc29uT3BlcmF0b3I6IGNsb3Vkd2F0Y2guQ29tcGFyaXNvbk9wZXJhdG9yLkdSRUFURVJfVEhBTl9USFJFU0hPTEQsXG4gICAgYWxhcm1EZXNjcmlwdGlvbjogJ0NvbnN1bWVyIEFwcGxpY2F0aW9uIGlzIFJlYWRpbmcgYXQgYSBTbG93ZXIgUmF0ZSBUaGFuIEV4cGVjdGVkLidcbiAgfSkpO1xuXG4gIHJldHVybiBhbGFybXM7XG59Il19
66
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2luZXNpcy1zdHJlYW1zLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImtpbmVzaXMtc3RyZWFtcy1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOzs7QUFFSCxVQUFVO0FBQ1YsZ0RBQWdEO0FBQ2hELHlFQUFnRTtBQUNoRSxxQ0FBcUM7QUFDckMsbUNBQTJDO0FBQzNDLHNEQUFzRDtBQW9CdEQsU0FBZ0Isa0JBQWtCLENBQUMsS0FBZ0IsRUFBRSxLQUE4QjtJQUVqRixJQUFJLEtBQUssQ0FBQyxpQkFBaUIsRUFBRTtRQUMzQixPQUFPLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQztLQUNoQztJQUVELDhCQUE4QjtJQUM5QixJQUFJLGtCQUFrQixDQUFDO0lBQ3ZCLHdFQUF3RTtJQUN4RSxrQkFBa0IsR0FBRyx3QkFBZ0IsQ0FBQyw2Q0FBa0IsRUFBRSxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUVwRiwrQkFBK0I7SUFDL0IsT0FBTyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ3hFLENBQUM7QUFiRCxnREFhQztBQUVELFNBQWdCLDBCQUEwQixDQUFDLEtBQWdCO0lBQ3pELG9DQUFvQztJQUNwQyxNQUFNLE1BQU0sR0FBdUIsSUFBSSxLQUFLLEVBQUUsQ0FBQztJQUUvQyw0R0FBNEc7SUFDNUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLHlDQUF5QyxFQUFFO1FBQ2pGLE1BQU0sRUFBRSxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUM7WUFDNUIsU0FBUyxFQUFFLGFBQWE7WUFDeEIsVUFBVSxFQUFFLG9DQUFvQztZQUNoRCxTQUFTLEVBQUUsU0FBUztZQUNwQixNQUFNLEVBQUUsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1NBQ2hDLENBQUM7UUFDRixTQUFTLEVBQUUsT0FBTztRQUNsQixpQkFBaUIsRUFBRSxDQUFDO1FBQ3BCLGtCQUFrQixFQUFFLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxrQ0FBa0M7UUFDcEYsZ0JBQWdCLEVBQUUsa0dBQWtHO0tBQ3JILENBQUMsQ0FBQyxDQUFDO0lBRUosd0RBQXdEO0lBQ3hELE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxxREFBcUQsRUFBRTtRQUM3RixNQUFNLEVBQUUsSUFBSSxVQUFVLENBQUMsTUFBTSxDQUFDO1lBQzVCLFNBQVMsRUFBRSxhQUFhO1lBQ3hCLFVBQVUsRUFBRSxtQ0FBbUM7WUFDL0MsU0FBUyxFQUFFLFNBQVM7WUFDcEIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUNoQyxDQUFDO1FBQ0YsU0FBUyxFQUFFLENBQUM7UUFDWixpQkFBaUIsRUFBRSxDQUFDO1FBQ3BCLGtCQUFrQixFQUFFLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxzQkFBc0I7UUFDeEUsZ0JBQWdCLEVBQUUsaUVBQWlFO0tBQ3BGLENBQUMsQ0FBQyxDQUFDO0lBRUosT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQWpDRCxnRUFpQ0MiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbi8vIEltcG9ydHNcbmltcG9ydCAqIGFzIGtpbmVzaXMgZnJvbSAnQGF3cy1jZGsvYXdzLWtpbmVzaXMnO1xuaW1wb3J0IHsgRGVmYXVsdFN0cmVhbVByb3BzIH0gZnJvbSAnLi9raW5lc2lzLXN0cmVhbXMtZGVmYXVsdHMnO1xuaW1wb3J0ICogYXMgY2RrIGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuaW1wb3J0IHsgY29uc29saWRhdGVQcm9wcyB9IGZyb20gJy4vdXRpbHMnO1xuaW1wb3J0ICogYXMgY2xvdWR3YXRjaCBmcm9tICdAYXdzLWNkay9hd3MtY2xvdWR3YXRjaCc7XG4vLyBOb3RlOiBUbyBlbnN1cmUgQ0RLdjIgY29tcGF0aWJpbGl0eSwga2VlcCB0aGUgaW1wb3J0IHN0YXRlbWVudCBmb3IgQ29uc3RydWN0IHNlcGFyYXRlXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdAYXdzLWNkay9jb3JlJztcblxuZXhwb3J0IGludGVyZmFjZSBCdWlsZEtpbmVzaXNTdHJlYW1Qcm9wcyB7XG4gIC8qKlxuICAgKiBFeGlzdGluZyBpbnN0YW5jZSBvZiBLaW5lc2lzIFN0cmVhbSwgcHJvdmlkaW5nIGJvdGggdGhpcyBhbmQgYGtpbmVzaXNTdHJlYW1Qcm9wc2Agd2lsbCBjYXVzZSBhbiBlcnJvci5cbiAgICpcbiAgICogQGRlZmF1bHQgLSBOb25lXG4gICAqL1xuICByZWFkb25seSBleGlzdGluZ1N0cmVhbU9iaj86IGtpbmVzaXMuU3RyZWFtO1xuXG4gIC8qKlxuICAgKiBPcHRpb25hbCB1c2VyIHByb3ZpZGVkIHByb3BzIHRvIG92ZXJyaWRlIHRoZSBkZWZhdWx0IHByb3BzIGZvciB0aGUgS2luZXNpcyBzdHJlYW0uXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gRGVmYXVsdCBwcm9wcyBhcmUgdXNlZC5cbiAgICovXG4gIHJlYWRvbmx5IGtpbmVzaXNTdHJlYW1Qcm9wcz86IGtpbmVzaXMuU3RyZWFtUHJvcHNcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkS2luZXNpc1N0cmVhbShzY29wZTogQ29uc3RydWN0LCBwcm9wczogQnVpbGRLaW5lc2lzU3RyZWFtUHJvcHMpOiBraW5lc2lzLlN0cmVhbSB7XG5cbiAgaWYgKHByb3BzLmV4aXN0aW5nU3RyZWFtT2JqKSB7XG4gICAgcmV0dXJuIHByb3BzLmV4aXN0aW5nU3RyZWFtT2JqO1xuICB9XG5cbiAgLy8gU2V0dXAgdGhlIHN0cmVhbSBwcm9wZXJ0aWVzXG4gIGxldCBraW5lc2lzU3RyZWFtUHJvcHM7XG4gIC8vIElmIHByb3BlcnR5IG92ZXJyaWRlcyBoYXZlIGJlZW4gcHJvdmlkZWQsIGluY29ycG9yYXRlIHRoZW0gYW5kIGRlcGxveVxuICBraW5lc2lzU3RyZWFtUHJvcHMgPSBjb25zb2xpZGF0ZVByb3BzKERlZmF1bHRTdHJlYW1Qcm9wcywgcHJvcHMua2luZXNpc1N0cmVhbVByb3BzKTtcblxuICAvLyBDcmVhdGUgdGhlIHN0cmVhbSBhbmQgcmV0dXJuXG4gIHJldHVybiBuZXcga2luZXNpcy5TdHJlYW0oc2NvcGUsICdLaW5lc2lzU3RyZWFtJywga2luZXNpc1N0cmVhbVByb3BzKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkS2luZXNpc1N0cmVhbUNXQWxhcm1zKHNjb3BlOiBDb25zdHJ1Y3QpOiBjbG91ZHdhdGNoLkFsYXJtW10ge1xuICAvLyBTZXR1cCBDVyBBbGFybXMgZm9yIEtpbmVzaXNTdHJlYW1cbiAgY29uc3QgYWxhcm1zOiBjbG91ZHdhdGNoLkFsYXJtW10gPSBuZXcgQXJyYXkoKTtcblxuICAvLyBBbGFybSBpZiBNYXggKEdldFJlY29yZHMuSXRlcmF0b3JBZ2VNaWxsaXNlY29uZHMpOiA+PSAxMiBob3VycyAoNTAlIG9mIDI0IGhvdXJzIGRlZmF1bHQgcmV0ZW50aW9uIHBlcmlvZClcbiAgYWxhcm1zLnB1c2gobmV3IGNsb3Vkd2F0Y2guQWxhcm0oc2NvcGUsICdLaW5lc2lzU3RyZWFtR2V0UmVjb3Jkc0l0ZXJhdG9yQWdlQWxhcm0nLCB7XG4gICAgbWV0cmljOiBuZXcgY2xvdWR3YXRjaC5NZXRyaWMoe1xuICAgICAgbmFtZXNwYWNlOiAnQVdTL0tpbmVzaXMnLFxuICAgICAgbWV0cmljTmFtZTogJ0dldFJlY29yZHMuSXRlcmF0b3JBZ2VNaWxsaXNlY29uZHMnLFxuICAgICAgc3RhdGlzdGljOiAnTWF4aW11bScsXG4gICAgICBwZXJpb2Q6IGNkay5EdXJhdGlvbi5taW51dGVzKDUpLFxuICAgIH0pLFxuICAgIHRocmVzaG9sZDogMjU5MjAwMCwgLy8gMTIgSG91cnMgKDUwJSBvZiAyNCBob3VycyAtIGRlZmF1bHQgcmVjb3JkIHJldGVudGlvbiBwZXJpb2QpXG4gICAgZXZhbHVhdGlvblBlcmlvZHM6IDEsXG4gICAgY29tcGFyaXNvbk9wZXJhdG9yOiBjbG91ZHdhdGNoLkNvbXBhcmlzb25PcGVyYXRvci5HUkVBVEVSX1RIQU5fT1JfRVFVQUxfVE9fVEhSRVNIT0xELFxuICAgIGFsYXJtRGVzY3JpcHRpb246ICdDb25zdW1lciBSZWNvcmQgUHJvY2Vzc2luZyBGYWxsaW5nIEJlaGluZCwgdGhlcmUgaXMgcmlzayBmb3IgZGF0YSBsb3NzIGR1ZSB0byByZWNvcmQgZXhwaXJhdGlvbi4nXG4gIH0pKTtcblxuICAvLyBBbGFybSBpZiBBdmcgKFJlYWRQcm92aXNpb25lZFRocm91Z2hwdXRFeGNlZWRlZCk6ID4gMFxuICBhbGFybXMucHVzaChuZXcgY2xvdWR3YXRjaC5BbGFybShzY29wZSwgJ0tpbmVzaXNTdHJlYW1SZWFkUHJvdmlzaW9uZWRUaHJvdWdocHV0RXhjZWVkZWRBbGFybScsIHtcbiAgICBtZXRyaWM6IG5ldyBjbG91ZHdhdGNoLk1ldHJpYyh7XG4gICAgICBuYW1lc3BhY2U6ICdBV1MvS2luZXNpcycsXG4gICAgICBtZXRyaWNOYW1lOiAnUmVhZFByb3Zpc2lvbmVkVGhyb3VnaHB1dEV4Y2VlZGVkJyxcbiAgICAgIHN0YXRpc3RpYzogJ0F2ZXJhZ2UnLFxuICAgICAgcGVyaW9kOiBjZGsuRHVyYXRpb24ubWludXRlcyg1KSxcbiAgICB9KSxcbiAgICB0aHJlc2hvbGQ6IDAsXG4gICAgZXZhbHVhdGlvblBlcmlvZHM6IDEsXG4gICAgY29tcGFyaXNvbk9wZXJhdG9yOiBjbG91ZHdhdGNoLkNvbXBhcmlzb25PcGVyYXRvci5HUkVBVEVSX1RIQU5fVEhSRVNIT0xELFxuICAgIGFsYXJtRGVzY3JpcHRpb246ICdDb25zdW1lciBBcHBsaWNhdGlvbiBpcyBSZWFkaW5nIGF0IGEgU2xvd2VyIFJhdGUgVGhhbiBFeHBlY3RlZC4nXG4gIH0pKTtcblxuICByZXR1cm4gYWxhcm1zO1xufSJdfQ==
package/lib/kms-helper.js CHANGED
@@ -19,16 +19,10 @@ const utils_1 = require("./utils");
19
19
  function buildEncryptionKey(scope, keyProps) {
20
20
  // Setup the key properties
21
21
  let encryptionKeyProps;
22
- if (keyProps) {
23
- // If property overrides have been provided, incorporate them and deploy
24
- encryptionKeyProps = utils_1.overrideProps(kms_defaults_1.DefaultEncryptionProps, keyProps);
25
- }
26
- else {
27
- // If no property overrides, deploy using the default configuration
28
- encryptionKeyProps = kms_defaults_1.DefaultEncryptionProps;
29
- }
22
+ // If property overrides have been provided, incorporate them and deploy
23
+ encryptionKeyProps = utils_1.consolidateProps(kms_defaults_1.DefaultEncryptionProps, keyProps);
30
24
  // Create the encryption key and return
31
25
  return new kms.Key(scope, 'EncryptionKey', encryptionKeyProps);
32
26
  }
33
27
  exports.buildEncryptionKey = buildEncryptionKey;
34
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImttcy1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOzs7QUFFSCx3Q0FBd0M7QUFDeEMsaURBQXdEO0FBQ3hELG1DQUF3QztBQUl4QyxTQUFnQixrQkFBa0IsQ0FBQyxLQUFnQixFQUFFLFFBQXVCO0lBQzFFLDJCQUEyQjtJQUMzQixJQUFJLGtCQUFrQixDQUFDO0lBQ3ZCLElBQUksUUFBUSxFQUFFO1FBQ1osd0VBQXdFO1FBQ3hFLGtCQUFrQixHQUFHLHFCQUFhLENBQUMscUNBQXNCLEVBQUUsUUFBUSxDQUFDLENBQUM7S0FDdEU7U0FBTTtRQUNMLG1FQUFtRTtRQUNuRSxrQkFBa0IsR0FBRyxxQ0FBc0IsQ0FBQztLQUM3QztJQUNELHVDQUF1QztJQUN2QyxPQUFPLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsZUFBZSxFQUFFLGtCQUFrQixDQUFDLENBQUM7QUFDakUsQ0FBQztBQVpELGdEQVlDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiAgQ29weXJpZ2h0IDIwMjIgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS4gWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZVxuICogIHdpdGggdGhlIExpY2Vuc2UuIEEgY29weSBvZiB0aGUgTGljZW5zZSBpcyBsb2NhdGVkIGF0XG4gKlxuICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiAgb3IgaW4gdGhlICdsaWNlbnNlJyBmaWxlIGFjY29tcGFueWluZyB0aGlzIGZpbGUuIFRoaXMgZmlsZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAnQVMgSVMnIEJBU0lTLCBXSVRIT1VUIFdBUlJBTlRJRVNcbiAqICBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9uc1xuICogIGFuZCBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5cbiAqL1xuXG5pbXBvcnQgKiBhcyBrbXMgZnJvbSAnQGF3cy1jZGsvYXdzLWttcyc7XG5pbXBvcnQgeyBEZWZhdWx0RW5jcnlwdGlvblByb3BzIH0gZnJvbSAnLi9rbXMtZGVmYXVsdHMnO1xuaW1wb3J0IHsgb3ZlcnJpZGVQcm9wcyB9IGZyb20gJy4vdXRpbHMnO1xuLy8gTm90ZTogVG8gZW5zdXJlIENES3YyIGNvbXBhdGliaWxpdHksIGtlZXAgdGhlIGltcG9ydCBzdGF0ZW1lbnQgZm9yIENvbnN0cnVjdCBzZXBhcmF0ZVxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSAnQGF3cy1jZGsvY29yZSc7XG5cbmV4cG9ydCBmdW5jdGlvbiBidWlsZEVuY3J5cHRpb25LZXkoc2NvcGU6IENvbnN0cnVjdCwga2V5UHJvcHM/OiBrbXMuS2V5UHJvcHMpOiBrbXMuS2V5IHtcbiAgLy8gU2V0dXAgdGhlIGtleSBwcm9wZXJ0aWVzXG4gIGxldCBlbmNyeXB0aW9uS2V5UHJvcHM7XG4gIGlmIChrZXlQcm9wcykge1xuICAgIC8vIElmIHByb3BlcnR5IG92ZXJyaWRlcyBoYXZlIGJlZW4gcHJvdmlkZWQsIGluY29ycG9yYXRlIHRoZW0gYW5kIGRlcGxveVxuICAgIGVuY3J5cHRpb25LZXlQcm9wcyA9IG92ZXJyaWRlUHJvcHMoRGVmYXVsdEVuY3J5cHRpb25Qcm9wcywga2V5UHJvcHMpO1xuICB9IGVsc2Uge1xuICAgIC8vIElmIG5vIHByb3BlcnR5IG92ZXJyaWRlcywgZGVwbG95IHVzaW5nIHRoZSBkZWZhdWx0IGNvbmZpZ3VyYXRpb25cbiAgICBlbmNyeXB0aW9uS2V5UHJvcHMgPSBEZWZhdWx0RW5jcnlwdGlvblByb3BzO1xuICB9XG4gIC8vIENyZWF0ZSB0aGUgZW5jcnlwdGlvbiBrZXkgYW5kIHJldHVyblxuICByZXR1cm4gbmV3IGttcy5LZXkoc2NvcGUsICdFbmNyeXB0aW9uS2V5JywgZW5jcnlwdGlvbktleVByb3BzKTtcbn0iXX0=
28
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImttcy1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOzs7QUFFSCx3Q0FBd0M7QUFDeEMsaURBQXdEO0FBQ3hELG1DQUEyQztBQUkzQyxTQUFnQixrQkFBa0IsQ0FBQyxLQUFnQixFQUFFLFFBQXVCO0lBQzFFLDJCQUEyQjtJQUMzQixJQUFJLGtCQUFrQixDQUFDO0lBRXZCLHdFQUF3RTtJQUN4RSxrQkFBa0IsR0FBRyx3QkFBZ0IsQ0FBQyxxQ0FBc0IsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUV4RSx1Q0FBdUM7SUFDdkMsT0FBTyxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ2pFLENBQUM7QUFURCxnREFTQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0ICogYXMga21zIGZyb20gJ0Bhd3MtY2RrL2F3cy1rbXMnO1xuaW1wb3J0IHsgRGVmYXVsdEVuY3J5cHRpb25Qcm9wcyB9IGZyb20gJy4va21zLWRlZmF1bHRzJztcbmltcG9ydCB7IGNvbnNvbGlkYXRlUHJvcHMgfSBmcm9tICcuL3V0aWxzJztcbi8vIE5vdGU6IFRvIGVuc3VyZSBDREt2MiBjb21wYXRpYmlsaXR5LCBrZWVwIHRoZSBpbXBvcnQgc3RhdGVtZW50IGZvciBDb25zdHJ1Y3Qgc2VwYXJhdGVcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuXG5leHBvcnQgZnVuY3Rpb24gYnVpbGRFbmNyeXB0aW9uS2V5KHNjb3BlOiBDb25zdHJ1Y3QsIGtleVByb3BzPzoga21zLktleVByb3BzKToga21zLktleSB7XG4gIC8vIFNldHVwIHRoZSBrZXkgcHJvcGVydGllc1xuICBsZXQgZW5jcnlwdGlvbktleVByb3BzO1xuXG4gIC8vIElmIHByb3BlcnR5IG92ZXJyaWRlcyBoYXZlIGJlZW4gcHJvdmlkZWQsIGluY29ycG9yYXRlIHRoZW0gYW5kIGRlcGxveVxuICBlbmNyeXB0aW9uS2V5UHJvcHMgPSBjb25zb2xpZGF0ZVByb3BzKERlZmF1bHRFbmNyeXB0aW9uUHJvcHMsIGtleVByb3BzKTtcblxuICAvLyBDcmVhdGUgdGhlIGVuY3J5cHRpb24ga2V5IGFuZCByZXR1cm5cbiAgcmV0dXJuIG5ldyBrbXMuS2V5KHNjb3BlLCAnRW5jcnlwdGlvbktleScsIGVuY3J5cHRpb25LZXlQcm9wcyk7XG59Il19
package/lib/lambda-event-source-mapping-defaults.js CHANGED
@@ -37,24 +37,14 @@ function DynamoEventSourceProps(scope, _dynamoEventSourceProps) {
37
37
  };
38
38
  }
39
39
  const defaultDynamoEventSourceProps = Object.assign(baseProps, extraProps);
40
- if (_dynamoEventSourceProps === null || _dynamoEventSourceProps === void 0 ? void 0 : _dynamoEventSourceProps.eventSourceProps) {
41
- return utils_1.overrideProps(defaultDynamoEventSourceProps, _dynamoEventSourceProps.eventSourceProps);
42
- }
43
- else {
44
- return defaultDynamoEventSourceProps;
45
- }
40
+ return utils_1.consolidateProps(defaultDynamoEventSourceProps, _dynamoEventSourceProps === null || _dynamoEventSourceProps === void 0 ? void 0 : _dynamoEventSourceProps.eventSourceProps);
46
41
  }
47
42
  exports.DynamoEventSourceProps = DynamoEventSourceProps;
48
43
  function S3EventSourceProps(_s3EventSourceProps) {
49
44
  const defaultS3EventSourceProps = {
50
45
  events: [s3.EventType.OBJECT_CREATED]
51
46
  };
52
- if (_s3EventSourceProps) {
53
- return utils_1.overrideProps(defaultS3EventSourceProps, _s3EventSourceProps, false);
54
- }
55
- else {
56
- return defaultS3EventSourceProps;
57
- }
47
+ return utils_1.consolidateProps(defaultS3EventSourceProps, _s3EventSourceProps);
58
48
  }
59
49
  exports.S3EventSourceProps = S3EventSourceProps;
60
50
  function KinesisEventSourceProps(scope, _kinesisEventSourceProps) {
@@ -75,12 +65,7 @@ function KinesisEventSourceProps(scope, _kinesisEventSourceProps) {
75
65
  };
76
66
  }
77
67
  const defaultKinesisEventSourceProps = Object.assign(baseProps, extraProps);
78
- if (_kinesisEventSourceProps === null || _kinesisEventSourceProps === void 0 ? void 0 : _kinesisEventSourceProps.eventSourceProps) {
79
- return utils_1.overrideProps(defaultKinesisEventSourceProps, _kinesisEventSourceProps.eventSourceProps);
80
- }
81
- else {
82
- return defaultKinesisEventSourceProps;
83
- }
68
+ return utils_1.consolidateProps(defaultKinesisEventSourceProps, _kinesisEventSourceProps === null || _kinesisEventSourceProps === void 0 ? void 0 : _kinesisEventSourceProps.eventSourceProps);
84
69
  }
85
70
  exports.KinesisEventSourceProps = KinesisEventSourceProps;
86
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGFtYmRhLWV2ZW50LXNvdXJjZS1tYXBwaW5nLWRlZmF1bHRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibGFtYmRhLWV2ZW50LXNvdXJjZS1tYXBwaW5nLWRlZmF1bHRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7O0FBRUgsOENBQThDO0FBQzlDLG1DQUF3QztBQUN4QyxnRkFBeUo7QUFDekosc0NBQXNDO0FBQ3RDLHdDQUFvRDtBQUVwRCw2Q0FBMEM7QUFRMUMsU0FBZ0Isc0JBQXNCLENBQUMsS0FBZ0IsRUFBRSx1QkFBMEM7SUFFakcsTUFBTSxTQUFTLEdBQTJCO1FBQ3hDLGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFZO1FBQ3RELGtCQUFrQixFQUFFLElBQUk7UUFDeEIsWUFBWSxFQUFFLGVBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ2hDLGFBQWEsRUFBRSxHQUFHO0tBQ25CLENBQUM7SUFFRixJQUFJLFVBQVUsR0FBRyxFQUFFLENBQUM7SUFFcEIsSUFBSSx1QkFBdUIsS0FBSyxTQUFTLElBQUksQ0FBQSx1QkFBdUIsYUFBdkIsdUJBQXVCLHVCQUF2Qix1QkFBdUIsQ0FBRSxpQkFBaUIsTUFBSyxTQUFTO1dBQzVGLHVCQUF1QixDQUFDLGlCQUFpQixFQUFHO1FBQ25ELE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyx1QkFBVSxDQUFDLEtBQUssRUFBRSxhQUFhLEVBQUU7WUFDbEQsVUFBVSxFQUFFLHVCQUF1QixhQUF2Qix1QkFBdUIsdUJBQXZCLHVCQUF1QixDQUFFLGdCQUFnQjtTQUN0RCxDQUFDLENBQUM7UUFFSCxVQUFVLEdBQUc7WUFDWCxTQUFTLEVBQUUsSUFBSSxpQ0FBTSxDQUFDLFFBQVEsQ0FBQztTQUNoQyxDQUFDO0tBQ0g7SUFFRCxNQUFNLDZCQUE2QixHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBRTNFLElBQUksdUJBQXVCLGFBQXZCLHVCQUF1Qix1QkFBdkIsdUJBQXVCLENBQUUsZ0JBQWdCLEVBQUU7UUFDN0MsT0FBTyxxQkFBYSxDQUFDLDZCQUE2QixFQUFFLHVCQUF1QixDQUFDLGdCQUEwQyxDQUFDLENBQUM7S0FDekg7U0FBTTtRQUNMLE9BQU8sNkJBQTZCLENBQUM7S0FDdEM7QUFDSCxDQUFDO0FBN0JELHdEQTZCQztBQUVELFNBQWdCLGtCQUFrQixDQUFDLG1CQUF3QztJQUV6RSxNQUFNLHlCQUF5QixHQUF1QjtRQUNwRCxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQztLQUN0QyxDQUFDO0lBRUYsSUFBSSxtQkFBbUIsRUFBRTtRQUN2QixPQUFPLHFCQUFhLENBQUMseUJBQXlCLEVBQUUsbUJBQW1CLEVBQUUsS0FBSyxDQUFDLENBQUM7S0FDN0U7U0FBTTtRQUNMLE9BQU8seUJBQXlCLENBQUM7S0FDbEM7QUFDSCxDQUFDO0FBWEQsZ0RBV0M7QUFFRCxTQUFnQix1QkFBdUIsQ0FBQyxLQUFnQixFQUFFLHdCQUEyQztJQUNuRyxNQUFNLFNBQVMsR0FBNEI7UUFDekMsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDLGdCQUFnQixDQUFDLFlBQVk7UUFDdEQsa0JBQWtCLEVBQUUsSUFBSTtRQUN4QixZQUFZLEVBQUUsZUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDaEMsYUFBYSxFQUFFLEdBQUc7S0FDbkIsQ0FBQztJQUVGLElBQUksVUFBVSxHQUFHLEVBQUUsQ0FBQztJQUVwQixJQUFJLHdCQUF3QixLQUFLLFNBQVMsSUFBSSxDQUFBLHdCQUF3QixhQUF4Qix3QkFBd0IsdUJBQXhCLHdCQUF3QixDQUFFLGlCQUFpQixNQUFLLFNBQVM7V0FDOUYsd0JBQXdCLENBQUMsaUJBQWlCLEVBQUc7UUFDcEQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFHLHVCQUFVLENBQUMsS0FBSyxFQUFFLGFBQWEsRUFBRTtZQUNsRCxVQUFVLEVBQUUsd0JBQXdCLGFBQXhCLHdCQUF3Qix1QkFBeEIsd0JBQXdCLENBQUUsZ0JBQWdCO1NBQ3ZELENBQUMsQ0FBQztRQUVILFVBQVUsR0FBRztZQUNYLFNBQVMsRUFBRSxJQUFJLGlDQUFNLENBQUMsUUFBUSxDQUFDO1NBQ2hDLENBQUM7S0FDSDtJQUVELE1BQU0sOEJBQThCLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFFNUUsSUFBSSx3QkFBd0IsYUFBeEIsd0JBQXdCLHVCQUF4Qix3QkFBd0IsQ0FBRSxnQkFBZ0IsRUFBRTtRQUM5QyxPQUFPLHFCQUFhLENBQUMsOEJBQThCLEVBQUUsd0JBQXdCLENBQUMsZ0JBQTJDLENBQUMsQ0FBQztLQUM1SDtTQUFNO1FBQ0wsT0FBTyw4QkFBOEIsQ0FBQztLQUN2QztBQUNILENBQUM7QUE1QkQsMERBNEJDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiAgQ29weXJpZ2h0IDIwMjIgQW1hem9uLmNvbSwgSW5jLiBvciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS4gWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZVxuICogIHdpdGggdGhlIExpY2Vuc2UuIEEgY29weSBvZiB0aGUgTGljZW5zZSBpcyBsb2NhdGVkIGF0XG4gKlxuICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiAgb3IgaW4gdGhlICdsaWNlbnNlJyBmaWxlIGFjY29tcGFueWluZyB0aGlzIGZpbGUuIFRoaXMgZmlsZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAnQVMgSVMnIEJBU0lTLCBXSVRIT1VUIFdBUlJBTlRJRVNcbiAqICBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9uc1xuICogIGFuZCBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS5cbiAqL1xuXG5pbXBvcnQgKiBhcyBsYW1iZGEgZnJvbSAnQGF3cy1jZGsvYXdzLWxhbWJkYSc7XG5pbXBvcnQgeyBvdmVycmlkZVByb3BzIH0gZnJvbSAnLi91dGlscyc7XG5pbXBvcnQgeyBEeW5hbW9FdmVudFNvdXJjZVByb3BzLCBTM0V2ZW50U291cmNlUHJvcHMsIEtpbmVzaXNFdmVudFNvdXJjZVByb3BzLCAgU3RyZWFtRXZlbnRTb3VyY2VQcm9wcywgU3FzRGxxIH0gZnJvbSAnQGF3cy1jZGsvYXdzLWxhbWJkYS1ldmVudC1zb3VyY2VzJztcbmltcG9ydCAqIGFzIHMzIGZyb20gJ0Bhd3MtY2RrL2F3cy1zMyc7XG5pbXBvcnQgeyBDb25zdHJ1Y3QsIER1cmF0aW9uIH0gZnJvbSAnQGF3cy1jZGsvY29yZSc7XG5pbXBvcnQgKiBhcyBzcXMgZnJvbSAnQGF3cy1jZGsvYXdzLXNxcyc7XG5pbXBvcnQgeyBidWlsZFF1ZXVlIH0gZnJvbSAnLi9zcXMtaGVscGVyJztcblxuZXhwb3J0IGludGVyZmFjZSBFdmVudFNvdXJjZVByb3BzIHtcbiAgICByZWFkb25seSBldmVudFNvdXJjZVByb3BzPzogU3RyZWFtRXZlbnRTb3VyY2VQcm9wcyxcbiAgICByZWFkb25seSBkZXBsb3lTcXNEbHFRdWV1ZT86IGJvb2xlYW4sXG4gICAgcmVhZG9ubHkgc3FzRGxxUXVldWVQcm9wcz86IHNxcy5RdWV1ZVByb3BzXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBEeW5hbW9FdmVudFNvdXJjZVByb3BzKHNjb3BlOiBDb25zdHJ1Y3QsIF9keW5hbW9FdmVudFNvdXJjZVByb3BzPzogRXZlbnRTb3VyY2VQcm9wcyk6IER5bmFtb0V2ZW50U291cmNlUHJvcHMge1xuXG4gIGNvbnN0IGJhc2VQcm9wczogRHluYW1vRXZlbnRTb3VyY2VQcm9wcyA9IHtcbiAgICBzdGFydGluZ1Bvc2l0aW9uOiBsYW1iZGEuU3RhcnRpbmdQb3NpdGlvbi5UUklNX0hPUklaT04sXG4gICAgYmlzZWN0QmF0Y2hPbkVycm9yOiB0cnVlLFxuICAgIG1heFJlY29yZEFnZTogRHVyYXRpb24uaG91cnMoMjQpLFxuICAgIHJldHJ5QXR0ZW1wdHM6IDUwMFxuICB9O1xuXG4gIGxldCBleHRyYVByb3BzID0ge307XG5cbiAgaWYgKF9keW5hbW9FdmVudFNvdXJjZVByb3BzID09PSB1bmRlZmluZWQgfHwgX2R5bmFtb0V2ZW50U291cmNlUHJvcHM/LmRlcGxveVNxc0RscVF1ZXVlID09PSB1bmRlZmluZWRcbiAgICAgICAgfHwgX2R5bmFtb0V2ZW50U291cmNlUHJvcHMuZGVwbG95U3FzRGxxUXVldWUgKSB7XG4gICAgY29uc3QgW3Nxc1F1ZXVlXSA9IGJ1aWxkUXVldWUoc2NvcGUsICdTcXNEbHFRdWV1ZScsIHtcbiAgICAgIHF1ZXVlUHJvcHM6IF9keW5hbW9FdmVudFNvdXJjZVByb3BzPy5zcXNEbHFRdWV1ZVByb3BzXG4gICAgfSk7XG5cbiAgICBleHRyYVByb3BzID0ge1xuICAgICAgb25GYWlsdXJlOiBuZXcgU3FzRGxxKHNxc1F1ZXVlKSxcbiAgICB9O1xuICB9XG5cbiAgY29uc3QgZGVmYXVsdER5bmFtb0V2ZW50U291cmNlUHJvcHMgPSBPYmplY3QuYXNzaWduKGJhc2VQcm9wcywgZXh0cmFQcm9wcyk7XG5cbiAgaWYgKF9keW5hbW9FdmVudFNvdXJjZVByb3BzPy5ldmVudFNvdXJjZVByb3BzKSB7XG4gICAgcmV0dXJuIG92ZXJyaWRlUHJvcHMoZGVmYXVsdER5bmFtb0V2ZW50U291cmNlUHJvcHMsIF9keW5hbW9FdmVudFNvdXJjZVByb3BzLmV2ZW50U291cmNlUHJvcHMgYXMgRHluYW1vRXZlbnRTb3VyY2VQcm9wcyk7XG4gIH0gZWxzZSB7XG4gICAgcmV0dXJuIGRlZmF1bHREeW5hbW9FdmVudFNvdXJjZVByb3BzO1xuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBTM0V2ZW50U291cmNlUHJvcHMoX3MzRXZlbnRTb3VyY2VQcm9wcz86IFMzRXZlbnRTb3VyY2VQcm9wcykge1xuXG4gIGNvbnN0IGRlZmF1bHRTM0V2ZW50U291cmNlUHJvcHM6IFMzRXZlbnRTb3VyY2VQcm9wcyA9IHtcbiAgICBldmVudHM6IFtzMy5FdmVudFR5cGUuT0JKRUNUX0NSRUFURURdXG4gIH07XG5cbiAgaWYgKF9zM0V2ZW50U291cmNlUHJvcHMpIHtcbiAgICByZXR1cm4gb3ZlcnJpZGVQcm9wcyhkZWZhdWx0UzNFdmVudFNvdXJjZVByb3BzLCBfczNFdmVudFNvdXJjZVByb3BzLCBmYWxzZSk7XG4gIH0gZWxzZSB7XG4gICAgcmV0dXJuIGRlZmF1bHRTM0V2ZW50U291cmNlUHJvcHM7XG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIEtpbmVzaXNFdmVudFNvdXJjZVByb3BzKHNjb3BlOiBDb25zdHJ1Y3QsIF9raW5lc2lzRXZlbnRTb3VyY2VQcm9wcz86IEV2ZW50U291cmNlUHJvcHMpOiBLaW5lc2lzRXZlbnRTb3VyY2VQcm9wcyB7XG4gIGNvbnN0IGJhc2VQcm9wczogS2luZXNpc0V2ZW50U291cmNlUHJvcHMgPSB7XG4gICAgc3RhcnRpbmdQb3NpdGlvbjogbGFtYmRhLlN0YXJ0aW5nUG9zaXRpb24uVFJJTV9IT1JJWk9OLFxuICAgIGJpc2VjdEJhdGNoT25FcnJvcjogdHJ1ZSxcbiAgICBtYXhSZWNvcmRBZ2U6IER1cmF0aW9uLmhvdXJzKDI0KSxcbiAgICByZXRyeUF0dGVtcHRzOiA1MDBcbiAgfTtcblxuICBsZXQgZXh0cmFQcm9wcyA9IHt9O1xuXG4gIGlmIChfa2luZXNpc0V2ZW50U291cmNlUHJvcHMgPT09IHVuZGVmaW5lZCB8fCBfa2luZXNpc0V2ZW50U291cmNlUHJvcHM/LmRlcGxveVNxc0RscVF1ZXVlID09PSB1bmRlZmluZWRcbiAgICAgICAgfHwgX2tpbmVzaXNFdmVudFNvdXJjZVByb3BzLmRlcGxveVNxc0RscVF1ZXVlICkge1xuICAgIGNvbnN0IFtzcXNRdWV1ZV0gPSBidWlsZFF1ZXVlKHNjb3BlLCAnU3FzRGxxUXVldWUnLCB7XG4gICAgICBxdWV1ZVByb3BzOiBfa2luZXNpc0V2ZW50U291cmNlUHJvcHM/LnNxc0RscVF1ZXVlUHJvcHNcbiAgICB9KTtcblxuICAgIGV4dHJhUHJvcHMgPSB7XG4gICAgICBvbkZhaWx1cmU6IG5ldyBTcXNEbHEoc3FzUXVldWUpLFxuICAgIH07XG4gIH1cblxuICBjb25zdCBkZWZhdWx0S2luZXNpc0V2ZW50U291cmNlUHJvcHMgPSBPYmplY3QuYXNzaWduKGJhc2VQcm9wcywgZXh0cmFQcm9wcyk7XG5cbiAgaWYgKF9raW5lc2lzRXZlbnRTb3VyY2VQcm9wcz8uZXZlbnRTb3VyY2VQcm9wcykge1xuICAgIHJldHVybiBvdmVycmlkZVByb3BzKGRlZmF1bHRLaW5lc2lzRXZlbnRTb3VyY2VQcm9wcywgX2tpbmVzaXNFdmVudFNvdXJjZVByb3BzLmV2ZW50U291cmNlUHJvcHMgYXMgS2luZXNpc0V2ZW50U291cmNlUHJvcHMpO1xuICB9IGVsc2Uge1xuICAgIHJldHVybiBkZWZhdWx0S2luZXNpc0V2ZW50U291cmNlUHJvcHM7XG4gIH1cbn1cbiJdfQ==
71
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGFtYmRhLWV2ZW50LXNvdXJjZS1tYXBwaW5nLWRlZmF1bHRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibGFtYmRhLWV2ZW50LXNvdXJjZS1tYXBwaW5nLWRlZmF1bHRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7O0FBRUgsOENBQThDO0FBQzlDLG1DQUEyQztBQUMzQyxnRkFBd0o7QUFDeEosc0NBQXNDO0FBQ3RDLHdDQUFvRDtBQUVwRCw2Q0FBMEM7QUFRMUMsU0FBZ0Isc0JBQXNCLENBQUMsS0FBZ0IsRUFBRSx1QkFBMEM7SUFFakcsTUFBTSxTQUFTLEdBQTJCO1FBQ3hDLGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFZO1FBQ3RELGtCQUFrQixFQUFFLElBQUk7UUFDeEIsWUFBWSxFQUFFLGVBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ2hDLGFBQWEsRUFBRSxHQUFHO0tBQ25CLENBQUM7SUFFRixJQUFJLFVBQVUsR0FBRyxFQUFFLENBQUM7SUFFcEIsSUFBSSx1QkFBdUIsS0FBSyxTQUFTLElBQUksQ0FBQSx1QkFBdUIsYUFBdkIsdUJBQXVCLHVCQUF2Qix1QkFBdUIsQ0FBRSxpQkFBaUIsTUFBSyxTQUFTO1dBQ2hHLHVCQUF1QixDQUFDLGlCQUFpQixFQUFFO1FBQzlDLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyx1QkFBVSxDQUFDLEtBQUssRUFBRSxhQUFhLEVBQUU7WUFDbEQsVUFBVSxFQUFFLHVCQUF1QixhQUF2Qix1QkFBdUIsdUJBQXZCLHVCQUF1QixDQUFFLGdCQUFnQjtTQUN0RCxDQUFDLENBQUM7UUFFSCxVQUFVLEdBQUc7WUFDWCxTQUFTLEVBQUUsSUFBSSxpQ0FBTSxDQUFDLFFBQVEsQ0FBQztTQUNoQyxDQUFDO0tBQ0g7SUFFRCxNQUFNLDZCQUE2QixHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBRTNFLE9BQU8sd0JBQWdCLENBQUMsNkJBQTZCLEVBQUUsdUJBQXVCLGFBQXZCLHVCQUF1Qix1QkFBdkIsdUJBQXVCLENBQUUsZ0JBQWdCLENBQUMsQ0FBQztBQUNwRyxDQUFDO0FBekJELHdEQXlCQztBQUVELFNBQWdCLGtCQUFrQixDQUFDLG1CQUF3QztJQUV6RSxNQUFNLHlCQUF5QixHQUF1QjtRQUNwRCxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQztLQUN0QyxDQUFDO0lBRUYsT0FBTyx3QkFBZ0IsQ0FBQyx5QkFBeUIsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0FBQzFFLENBQUM7QUFQRCxnREFPQztBQUVELFNBQWdCLHVCQUF1QixDQUFDLEtBQWdCLEVBQUUsd0JBQTJDO0lBQ25HLE1BQU0sU0FBUyxHQUE0QjtRQUN6QyxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsZ0JBQWdCLENBQUMsWUFBWTtRQUN0RCxrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLFlBQVksRUFBRSxlQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNoQyxhQUFhLEVBQUUsR0FBRztLQUNuQixDQUFDO0lBRUYsSUFBSSxVQUFVLEdBQUcsRUFBRSxDQUFDO0lBRXBCLElBQUksd0JBQXdCLEtBQUssU0FBUyxJQUFJLENBQUEsd0JBQXdCLGFBQXhCLHdCQUF3Qix1QkFBeEIsd0JBQXdCLENBQUUsaUJBQWlCLE1BQUssU0FBUztXQUNsRyx3QkFBd0IsQ0FBQyxpQkFBaUIsRUFBRTtRQUMvQyxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsdUJBQVUsQ0FBQyxLQUFLLEVBQUUsYUFBYSxFQUFFO1lBQ2xELFVBQVUsRUFBRSx3QkFBd0IsYUFBeEIsd0JBQXdCLHVCQUF4Qix3QkFBd0IsQ0FBRSxnQkFBZ0I7U0FDdkQsQ0FBQyxDQUFDO1FBRUgsVUFBVSxHQUFHO1lBQ1gsU0FBUyxFQUFFLElBQUksaUNBQU0sQ0FBQyxRQUFRLENBQUM7U0FDaEMsQ0FBQztLQUNIO0lBRUQsTUFBTSw4QkFBOEIsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUU1RSxPQUFPLHdCQUFnQixDQUFDLDhCQUE4QixFQUFFLHdCQUF3QixhQUF4Qix3QkFBd0IsdUJBQXhCLHdCQUF3QixDQUFFLGdCQUFnQixDQUFDLENBQUM7QUFDdEcsQ0FBQztBQXhCRCwwREF3QkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbmltcG9ydCAqIGFzIGxhbWJkYSBmcm9tICdAYXdzLWNkay9hd3MtbGFtYmRhJztcbmltcG9ydCB7IGNvbnNvbGlkYXRlUHJvcHMgfSBmcm9tICcuL3V0aWxzJztcbmltcG9ydCB7IER5bmFtb0V2ZW50U291cmNlUHJvcHMsIFMzRXZlbnRTb3VyY2VQcm9wcywgS2luZXNpc0V2ZW50U291cmNlUHJvcHMsIFN0cmVhbUV2ZW50U291cmNlUHJvcHMsIFNxc0RscSB9IGZyb20gJ0Bhd3MtY2RrL2F3cy1sYW1iZGEtZXZlbnQtc291cmNlcyc7XG5pbXBvcnQgKiBhcyBzMyBmcm9tICdAYXdzLWNkay9hd3MtczMnO1xuaW1wb3J0IHsgQ29uc3RydWN0LCBEdXJhdGlvbiB9IGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuaW1wb3J0ICogYXMgc3FzIGZyb20gJ0Bhd3MtY2RrL2F3cy1zcXMnO1xuaW1wb3J0IHsgYnVpbGRRdWV1ZSB9IGZyb20gJy4vc3FzLWhlbHBlcic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgRXZlbnRTb3VyY2VQcm9wcyB7XG4gIHJlYWRvbmx5IGV2ZW50U291cmNlUHJvcHM/OiBTdHJlYW1FdmVudFNvdXJjZVByb3BzLFxuICByZWFkb25seSBkZXBsb3lTcXNEbHFRdWV1ZT86IGJvb2xlYW4sXG4gIHJlYWRvbmx5IHNxc0RscVF1ZXVlUHJvcHM/OiBzcXMuUXVldWVQcm9wc1xufVxuXG5leHBvcnQgZnVuY3Rpb24gRHluYW1vRXZlbnRTb3VyY2VQcm9wcyhzY29wZTogQ29uc3RydWN0LCBfZHluYW1vRXZlbnRTb3VyY2VQcm9wcz86IEV2ZW50U291cmNlUHJvcHMpOiBEeW5hbW9FdmVudFNvdXJjZVByb3BzIHtcblxuICBjb25zdCBiYXNlUHJvcHM6IER5bmFtb0V2ZW50U291cmNlUHJvcHMgPSB7XG4gICAgc3RhcnRpbmdQb3NpdGlvbjogbGFtYmRhLlN0YXJ0aW5nUG9zaXRpb24uVFJJTV9IT1JJWk9OLFxuICAgIGJpc2VjdEJhdGNoT25FcnJvcjogdHJ1ZSxcbiAgICBtYXhSZWNvcmRBZ2U6IER1cmF0aW9uLmhvdXJzKDI0KSxcbiAgICByZXRyeUF0dGVtcHRzOiA1MDBcbiAgfTtcblxuICBsZXQgZXh0cmFQcm9wcyA9IHt9O1xuXG4gIGlmIChfZHluYW1vRXZlbnRTb3VyY2VQcm9wcyA9PT0gdW5kZWZpbmVkIHx8IF9keW5hbW9FdmVudFNvdXJjZVByb3BzPy5kZXBsb3lTcXNEbHFRdWV1ZSA9PT0gdW5kZWZpbmVkXG4gICAgfHwgX2R5bmFtb0V2ZW50U291cmNlUHJvcHMuZGVwbG95U3FzRGxxUXVldWUpIHtcbiAgICBjb25zdCBbc3FzUXVldWVdID0gYnVpbGRRdWV1ZShzY29wZSwgJ1Nxc0RscVF1ZXVlJywge1xuICAgICAgcXVldWVQcm9wczogX2R5bmFtb0V2ZW50U291cmNlUHJvcHM/LnNxc0RscVF1ZXVlUHJvcHNcbiAgICB9KTtcblxuICAgIGV4dHJhUHJvcHMgPSB7XG4gICAgICBvbkZhaWx1cmU6IG5ldyBTcXNEbHEoc3FzUXVldWUpLFxuICAgIH07XG4gIH1cblxuICBjb25zdCBkZWZhdWx0RHluYW1vRXZlbnRTb3VyY2VQcm9wcyA9IE9iamVjdC5hc3NpZ24oYmFzZVByb3BzLCBleHRyYVByb3BzKTtcblxuICByZXR1cm4gY29uc29saWRhdGVQcm9wcyhkZWZhdWx0RHluYW1vRXZlbnRTb3VyY2VQcm9wcywgX2R5bmFtb0V2ZW50U291cmNlUHJvcHM/LmV2ZW50U291cmNlUHJvcHMpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gUzNFdmVudFNvdXJjZVByb3BzKF9zM0V2ZW50U291cmNlUHJvcHM/OiBTM0V2ZW50U291cmNlUHJvcHMpIHtcblxuICBjb25zdCBkZWZhdWx0UzNFdmVudFNvdXJjZVByb3BzOiBTM0V2ZW50U291cmNlUHJvcHMgPSB7XG4gICAgZXZlbnRzOiBbczMuRXZlbnRUeXBlLk9CSkVDVF9DUkVBVEVEXVxuICB9O1xuXG4gIHJldHVybiBjb25zb2xpZGF0ZVByb3BzKGRlZmF1bHRTM0V2ZW50U291cmNlUHJvcHMsIF9zM0V2ZW50U291cmNlUHJvcHMpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gS2luZXNpc0V2ZW50U291cmNlUHJvcHMoc2NvcGU6IENvbnN0cnVjdCwgX2tpbmVzaXNFdmVudFNvdXJjZVByb3BzPzogRXZlbnRTb3VyY2VQcm9wcyk6IEtpbmVzaXNFdmVudFNvdXJjZVByb3BzIHtcbiAgY29uc3QgYmFzZVByb3BzOiBLaW5lc2lzRXZlbnRTb3VyY2VQcm9wcyA9IHtcbiAgICBzdGFydGluZ1Bvc2l0aW9uOiBsYW1iZGEuU3RhcnRpbmdQb3NpdGlvbi5UUklNX0hPUklaT04sXG4gICAgYmlzZWN0QmF0Y2hPbkVycm9yOiB0cnVlLFxuICAgIG1heFJlY29yZEFnZTogRHVyYXRpb24uaG91cnMoMjQpLFxuICAgIHJldHJ5QXR0ZW1wdHM6IDUwMFxuICB9O1xuXG4gIGxldCBleHRyYVByb3BzID0ge307XG5cbiAgaWYgKF9raW5lc2lzRXZlbnRTb3VyY2VQcm9wcyA9PT0gdW5kZWZpbmVkIHx8IF9raW5lc2lzRXZlbnRTb3VyY2VQcm9wcz8uZGVwbG95U3FzRGxxUXVldWUgPT09IHVuZGVmaW5lZFxuICAgIHx8IF9raW5lc2lzRXZlbnRTb3VyY2VQcm9wcy5kZXBsb3lTcXNEbHFRdWV1ZSkge1xuICAgIGNvbnN0IFtzcXNRdWV1ZV0gPSBidWlsZFF1ZXVlKHNjb3BlLCAnU3FzRGxxUXVldWUnLCB7XG4gICAgICBxdWV1ZVByb3BzOiBfa2luZXNpc0V2ZW50U291cmNlUHJvcHM/LnNxc0RscVF1ZXVlUHJvcHNcbiAgICB9KTtcblxuICAgIGV4dHJhUHJvcHMgPSB7XG4gICAgICBvbkZhaWx1cmU6IG5ldyBTcXNEbHEoc3FzUXVldWUpLFxuICAgIH07XG4gIH1cblxuICBjb25zdCBkZWZhdWx0S2luZXNpc0V2ZW50U291cmNlUHJvcHMgPSBPYmplY3QuYXNzaWduKGJhc2VQcm9wcywgZXh0cmFQcm9wcyk7XG5cbiAgcmV0dXJuIGNvbnNvbGlkYXRlUHJvcHMoZGVmYXVsdEtpbmVzaXNFdmVudFNvdXJjZVByb3BzLCBfa2luZXNpc0V2ZW50U291cmNlUHJvcHM/LmV2ZW50U291cmNlUHJvcHMpO1xufVxuIl19