@aws-solutions-constructs/aws-cloudfront-s3 2.79.1 → 2.80.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 (94) hide show
  1. package/.jsii +5 -44
  2. package/lib/index.js +1 -1
  3. package/package.json +8 -8
  4. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca/cfn-response.js +1 -0
  5. package/test/{integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e → integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca}/outbound.js +1 -1
  6. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca/util.js +1 -0
  7. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cdk.out +1 -1
  8. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.assets.json +6 -6
  9. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.template.json +15 -5
  10. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/cfts3bucketencryptedwithcmkprovidedasexistingbucketIntegDefaultTestDeployAssertF6031114.assets.json +1 -1
  11. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/integ.json +1 -1
  12. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/manifest.json +435 -4
  13. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/tree.json +380 -73
  14. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cdk.out +1 -1
  15. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.assets.json +3 -3
  16. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.template.json +4 -4
  17. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/cfts3bucketencryptedwithmanagedkeyprovidedasexistingbucketIntegDefaultTestDeployAssert03A82C16.assets.json +1 -1
  18. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/integ.json +1 -1
  19. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/manifest.json +152 -4
  20. package/test/integ.cfts3-bucket-encrypted-with-managed-key-provided-as-existingbucket.js.snapshot/tree.json +153 -45
  21. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca/cfn-response.js +1 -0
  22. package/test/{integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e → integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca}/outbound.js +1 -1
  23. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca/util.js +1 -0
  24. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cdk.out +1 -1
  25. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cfts3-cmk-provided-as-bucket-prop.assets.json +6 -6
  26. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cfts3-cmk-provided-as-bucket-prop.template.json +15 -5
  27. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/cfts3cmkprovidedasbucketpropIntegDefaultTestDeployAssert38E63D55.assets.json +1 -1
  28. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/integ.json +1 -1
  29. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/manifest.json +428 -4
  30. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/tree.json +374 -71
  31. package/test/integ.cfts3-custom-headers.js.snapshot/cdk.out +1 -1
  32. package/test/integ.cfts3-custom-headers.js.snapshot/cfts3-custom-headers.assets.json +3 -3
  33. package/test/integ.cfts3-custom-headers.js.snapshot/cfts3-custom-headers.template.json +4 -4
  34. package/test/integ.cfts3-custom-headers.js.snapshot/cfts3customheadersIntegDefaultTestDeployAssert6EEC9973.assets.json +1 -1
  35. package/test/integ.cfts3-custom-headers.js.snapshot/integ.json +1 -1
  36. package/test/integ.cfts3-custom-headers.js.snapshot/manifest.json +175 -4
  37. package/test/integ.cfts3-custom-headers.js.snapshot/tree.json +174 -49
  38. package/test/integ.cfts3-custom-originPath.js.snapshot/cdk.out +1 -1
  39. package/test/integ.cfts3-custom-originPath.js.snapshot/cfts3-custom-originPath.assets.json +3 -3
  40. package/test/integ.cfts3-custom-originPath.js.snapshot/cfts3-custom-originPath.template.json +4 -4
  41. package/test/integ.cfts3-custom-originPath.js.snapshot/cfts3customoriginPathIntegDefaultTestDeployAssert61F499B2.assets.json +1 -1
  42. package/test/integ.cfts3-custom-originPath.js.snapshot/integ.json +1 -1
  43. package/test/integ.cfts3-custom-originPath.js.snapshot/manifest.json +167 -4
  44. package/test/integ.cfts3-custom-originPath.js.snapshot/tree.json +167 -47
  45. package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cdk.out +1 -1
  46. package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cfts3-customLoggingBuckets.assets.json +3 -3
  47. package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cfts3-customLoggingBuckets.template.json +4 -4
  48. package/test/integ.cfts3-customLoggingBuckets.js.snapshot/cfts3customLoggingBucketsIntegDefaultTestDeployAssert4D171F9F.assets.json +1 -1
  49. package/test/integ.cfts3-customLoggingBuckets.js.snapshot/integ.json +1 -1
  50. package/test/integ.cfts3-customLoggingBuckets.js.snapshot/manifest.json +205 -4
  51. package/test/integ.cfts3-customLoggingBuckets.js.snapshot/tree.json +199 -47
  52. package/test/integ.cfts3-existing-bucket.js.snapshot/cdk.out +1 -1
  53. package/test/integ.cfts3-existing-bucket.js.snapshot/cfts3-existing-bucket.assets.json +3 -3
  54. package/test/integ.cfts3-existing-bucket.js.snapshot/cfts3-existing-bucket.template.json +4 -4
  55. package/test/integ.cfts3-existing-bucket.js.snapshot/cfts3existingbucketIntegDefaultTestDeployAssertA6D4EB49.assets.json +1 -1
  56. package/test/integ.cfts3-existing-bucket.js.snapshot/integ.json +1 -1
  57. package/test/integ.cfts3-existing-bucket.js.snapshot/manifest.json +169 -4
  58. package/test/integ.cfts3-existing-bucket.js.snapshot/tree.json +168 -52
  59. package/test/integ.cfts3-no-arguments.js.snapshot/cdk.out +1 -1
  60. package/test/integ.cfts3-no-arguments.js.snapshot/cfts3-no-arguments.assets.json +3 -3
  61. package/test/integ.cfts3-no-arguments.js.snapshot/cfts3-no-arguments.template.json +4 -4
  62. package/test/integ.cfts3-no-arguments.js.snapshot/cfts3noargumentsIntegDefaultTestDeployAssertBA5AFA25.assets.json +1 -1
  63. package/test/integ.cfts3-no-arguments.js.snapshot/integ.json +1 -1
  64. package/test/integ.cfts3-no-arguments.js.snapshot/manifest.json +167 -4
  65. package/test/integ.cfts3-no-arguments.js.snapshot/tree.json +167 -47
  66. package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/cdk.out +1 -1
  67. package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/cfts3-no-cloudfront-s3-access-logs.assets.json +3 -3
  68. package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/cfts3-no-cloudfront-s3-access-logs.template.json +4 -4
  69. package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/cfts3nocloudfronts3accesslogsIntegDefaultTestDeployAssertAD28C87A.assets.json +1 -1
  70. package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/integ.json +1 -1
  71. package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/manifest.json +111 -4
  72. package/test/integ.cfts3-no-cloudfront-s3-access-logs.js.snapshot/tree.json +117 -35
  73. package/test/integ.cfts3-no-logging.js.snapshot/cdk.out +1 -1
  74. package/test/integ.cfts3-no-logging.js.snapshot/cfts3-no-logging.assets.json +3 -3
  75. package/test/integ.cfts3-no-logging.js.snapshot/cfts3-no-logging.template.json +4 -4
  76. package/test/integ.cfts3-no-logging.js.snapshot/cfts3nologgingIntegDefaultTestDeployAssert18393DDB.assets.json +1 -1
  77. package/test/integ.cfts3-no-logging.js.snapshot/integ.json +1 -1
  78. package/test/integ.cfts3-no-logging.js.snapshot/manifest.json +83 -4
  79. package/test/integ.cfts3-no-logging.js.snapshot/tree.json +92 -29
  80. package/test/integ.cfts3-no-security-headers.js.snapshot/cdk.out +1 -1
  81. package/test/integ.cfts3-no-security-headers.js.snapshot/cfts3-no-security-headers.assets.json +3 -3
  82. package/test/integ.cfts3-no-security-headers.js.snapshot/cfts3-no-security-headers.template.json +4 -4
  83. package/test/integ.cfts3-no-security-headers.js.snapshot/cfts3nosecurityheadersIntegDefaultTestDeployAssert38FE05BE.assets.json +1 -1
  84. package/test/integ.cfts3-no-security-headers.js.snapshot/integ.json +1 -1
  85. package/test/integ.cfts3-no-security-headers.js.snapshot/manifest.json +152 -4
  86. package/test/integ.cfts3-no-security-headers.js.snapshot/tree.json +153 -45
  87. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e/cfn-response.js +0 -1
  88. package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e/util.js +0 -1
  89. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e/cfn-response.js +0 -1
  90. package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e/util.js +0 -1
  91. /package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/{asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e → asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca}/consts.js +0 -0
  92. /package/test/integ.cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.js.snapshot/{asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e → asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca}/framework.js +0 -0
  93. /package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/{asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e → asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca}/consts.js +0 -0
  94. /package/test/integ.cfts3-cmk-provided-as-bucket-prop.js.snapshot/{asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e → asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca}/framework.js +0 -0
package/.jsii CHANGED
@@ -8,9 +8,9 @@
8
8
  "url": "https://aws.amazon.com"
9
9
  },
10
10
  "dependencies": {
11
- "@aws-solutions-constructs/core": "2.79.1",
12
- "@aws-solutions-constructs/resources": "2.79.1",
13
- "aws-cdk-lib": "^2.177.0",
11
+ "@aws-solutions-constructs/core": "2.80.0",
12
+ "@aws-solutions-constructs/resources": "2.80.0",
13
+ "aws-cdk-lib": "^2.179.0",
14
14
  "constructs": "^10.0.0"
15
15
  },
16
16
  "dependencyClosure": {
@@ -40,32 +40,6 @@
40
40
  }
41
41
  }
42
42
  },
43
- "@aws-cdk/asset-kubectl-v20": {
44
- "targets": {
45
- "dotnet": {
46
- "namespace": "Amazon.CDK.Asset.KubectlV20",
47
- "packageId": "Amazon.CDK.Asset.KubectlV20"
48
- },
49
- "go": {
50
- "moduleName": "github.com/cdklabs/awscdk-asset-kubectl-go",
51
- "packageName": "kubectlv20"
52
- },
53
- "java": {
54
- "maven": {
55
- "artifactId": "cdk-asset-kubectl-v20",
56
- "groupId": "software.amazon.awscdk"
57
- },
58
- "package": "software.amazon.awscdk.cdk.asset.kubectl.v20"
59
- },
60
- "js": {
61
- "npm": "@aws-cdk/asset-kubectl-v20"
62
- },
63
- "python": {
64
- "distName": "aws-cdk.asset-kubectl-v20",
65
- "module": "aws_cdk.asset_kubectl_v20"
66
- }
67
- }
68
- },
69
43
  "@aws-cdk/asset-node-proxy-agent-v6": {
70
44
  "targets": {
71
45
  "dotnet": {
@@ -3866,19 +3840,6 @@
3866
3840
  }
3867
3841
  }
3868
3842
  },
3869
- "aws-cdk-lib.lambda_layer_kubectl": {
3870
- "targets": {
3871
- "dotnet": {
3872
- "namespace": "Amazon.CDK.LambdaLayer.Kubectl"
3873
- },
3874
- "java": {
3875
- "package": "software.amazon.awscdk.lambdalayer.kubectl"
3876
- },
3877
- "python": {
3878
- "module": "aws_cdk.lambda_layer_kubectl"
3879
- }
3880
- }
3881
- },
3882
3843
  "aws-cdk-lib.lambda_layer_node_proxy_agent": {
3883
3844
  "targets": {
3884
3845
  "dotnet": {
@@ -4398,6 +4359,6 @@
4398
4359
  "symbolId": "lib/index:CloudFrontToS3Props"
4399
4360
  }
4400
4361
  },
4401
- "version": "2.79.1",
4402
- "fingerprint": "Tm+/jNmqnDqWMtUb8bj8kWLpL02jgnal6Uv9lCpFLJQ="
4362
+ "version": "2.80.0",
4363
+ "fingerprint": "XfGU1v8sLmurwEN8mclvmjjN4jgRuIRlZ5HkXrhMa1s="
4403
4364
  }
package/lib/index.js CHANGED
@@ -111,5 +111,5 @@ class CloudFrontToS3 extends constructs_1.Construct {
111
111
  }
112
112
  exports.CloudFrontToS3 = CloudFrontToS3;
113
113
  _a = JSII_RTTI_SYMBOL_1;
114
- CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.79.1" };
114
+ CloudFrontToS3[_a] = { fqn: "@aws-solutions-constructs/aws-cloudfront-s3.CloudFrontToS3", version: "2.80.0" };
115
115
  //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 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 { Aws } from 'aws-cdk-lib';\nimport * as cloudfront from 'aws-cdk-lib/aws-cloudfront';\nimport * as iam from 'aws-cdk-lib/aws-iam';\nimport * as kms from 'aws-cdk-lib/aws-kms';\nimport * as s3 from 'aws-cdk-lib/aws-s3';\nimport * as defaults from '@aws-solutions-constructs/core';\nimport * as resources from '@aws-solutions-constructs/resources';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from 'constructs';\n\n/**\n * @summary The properties for the CloudFrontToS3 Construct\n */\nexport interface CloudFrontToS3Props {\n  /**\n   * Optional user provided props to override the default props\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontDistributionProps?: cloudfront.DistributionProps | any,\n  /**\n   * Optional user provided props to turn on/off the automatic injection of best practice HTTP\n   * security headers in all responses from cloudfront.\n   * Turning this on will inject default headers and is mutually exclusive with passing custom security headers\n   * via the responseHeadersPolicyProps parameter.\n   *\n   * @default - true\n   */\n  readonly insertHttpSecurityHeaders?: boolean;\n  /**\n   * Optional user provided configuration that cloudfront applies to all http responses.\n   * Can be used to pass a custom ResponseSecurityHeadersBehavior, ResponseCustomHeadersBehavior or\n   * ResponseHeadersCorsBehavior to the cloudfront distribution.\n   *\n   * Passing a custom ResponseSecurityHeadersBehavior is mutually exclusive with turning on the default security headers\n   * via `insertHttpSecurityHeaders` prop. Will throw an error if both `insertHttpSecurityHeaders` is set to `true`\n   * and ResponseSecurityHeadersBehavior is passed.\n   *\n   * @default - undefined\n   */\n  readonly responseHeadersPolicyProps?: cloudfront.ResponseHeadersPolicyProps\n  /**\n   * Optional user provided props to provide an originPath that CloudFront appends to the\n   * origin domain name when CloudFront requests content from the origin.\n   * The string should start with a `/`, for example `/production`.\n   * @default = '/'\n   */\n  readonly originPath?: string,\n\n  // =====================\n  // S3 Content Bucket\n  // =====================\n  /**\n   * Existing instance of S3 Content Bucket object, providing both this and `bucketProps` will cause an error.\n   *\n   * @default - None\n   */\n  readonly existingBucketObj?: s3.IBucket,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly bucketProps?: s3.BucketProps,\n\n  // =====================\n  // S3 Content Bucket Access Logs Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the S3 Content bucket\n   *\n   * @default - true\n   */\n  readonly logS3AccessLogs?: boolean,\n  /**\n   * Optional user provided props to override the default props for the S3 Content Bucket Access Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly loggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Log Bucket\n  // =====================\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket.\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketProps?: s3.BucketProps,\n\n  // =====================\n  // CloudFront Logs Bucket Access Log Bucket\n  // =====================\n  /**\n   * Optional - Whether to maintain access logs for the CloudFront Logging bucket. Specifying false for this\n   * while providing info about the log bucket will cause an error.\n   *\n   * @default - true\n   */\n  readonly logCloudFrontAccessLog?: boolean,\n  /**\n   * Optional user provided props to override the default props for the CloudFront Log Bucket Access Log bucket.\n   * Providing both this and `existingcloudFrontLoggingBucketAccessLogBucket` will cause an error\n   *\n   * @default - Default props are used\n   */\n  readonly cloudFrontLoggingBucketAccessLogBucketProps?: s3.BucketProps,\n}\n\nexport class CloudFrontToS3 extends Construct {\n  public readonly cloudFrontWebDistribution: cloudfront.Distribution;\n  public readonly cloudFrontFunction?: cloudfront.Function;\n  public readonly cloudFrontLoggingBucket?: s3.Bucket;\n  public readonly cloudFrontLoggingBucketAccessLogBucket?: s3.Bucket;\n  public readonly s3BucketInterface: s3.IBucket;\n  public readonly s3Bucket?: s3.Bucket;\n  public readonly s3LoggingBucket?: s3.Bucket;\n  public readonly originAccessControl?: cloudfront.CfnOriginAccessControl;\n\n  /**\n   * @summary Constructs a new instance of the CloudFrontToS3 class.\n   * @param {Construct} scope - represents the scope for all the resources.\n   * @param {string} id - this is a a scope-unique id.\n   * @param {CloudFrontToS3Props} props - user provided props for the construct\n   * @since 0.8.0\n   * @access public\n   */\n  constructor(scope: Construct, id: string, props: CloudFrontToS3Props) {\n    super(scope, id);\n\n    // All our tests are based upon this behavior being on, so we're setting\n    // context here rather than assuming the client will set it\n    this.node.setContext(\"@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy\", true);\n\n    defaults.CheckS3Props(props);\n    defaults.CheckCloudFrontProps(props);\n    defaults.CheckCloudfrontS3Props(props);\n\n    let originBucket: s3.IBucket;\n\n    if (!props.existingBucketObj) {\n      const buildS3BucketResponse = defaults.buildS3Bucket(this, {\n        bucketProps: props.bucketProps,\n        loggingBucketProps: props.loggingBucketProps,\n        logS3AccessLogs: props.logS3AccessLogs\n      });\n      this.s3Bucket = buildS3BucketResponse.bucket;\n      this.s3LoggingBucket = buildS3BucketResponse.loggingBucket;\n      originBucket = this.s3Bucket;\n    } else {\n      originBucket = props.existingBucketObj;\n    }\n\n    this.s3BucketInterface = originBucket;\n\n    // Define the CloudFront Distribution\n    const cloudFrontDistributionForS3Props: defaults.CreateCloudFrontDistributionForS3Props = {\n      sourceBucket: this.s3BucketInterface,\n      cloudFrontDistributionProps: props.cloudFrontDistributionProps,\n      httpSecurityHeaders: props.insertHttpSecurityHeaders,\n      cloudFrontLoggingBucketProps: props.cloudFrontLoggingBucketProps,\n      responseHeadersPolicyProps: props.responseHeadersPolicyProps,\n      cloudFrontLoggingBucketS3AccessLogBucketProps: props.cloudFrontLoggingBucketAccessLogBucketProps,\n      logCloudFrontAccessLog: props.logCloudFrontAccessLog\n    };\n    const cloudFrontDistributionForS3Response = defaults.createCloudFrontDistributionForS3(this, id, cloudFrontDistributionForS3Props);\n    this.cloudFrontWebDistribution = cloudFrontDistributionForS3Response.distribution;\n    this.cloudFrontFunction = cloudFrontDistributionForS3Response.cloudfrontFunction;\n    this.cloudFrontLoggingBucket = cloudFrontDistributionForS3Response.loggingBucket;\n    this.originAccessControl = cloudFrontDistributionForS3Response.originAccessControl;\n    this.cloudFrontLoggingBucketAccessLogBucket = cloudFrontDistributionForS3Response.loggingBucketS3AccesssLogBucket;\n\n    // Attach the OriginAccessControl to the CloudFront Distribution, and remove the OriginAccessIdentity\n    const l1CloudFrontDistribution = this.cloudFrontWebDistribution.node.defaultChild as cloudfront.CfnDistribution;\n    l1CloudFrontDistribution.addPropertyOverride('DistributionConfig.Origins.0.OriginAccessControlId', this.originAccessControl?.attrId);\n    if (props.originPath) {\n      l1CloudFrontDistribution.addPropertyOverride('DistributionConfig.Origins.0.OriginPath', props.originPath);\n    }\n\n    // Grant CloudFront permission to get the objects from the s3 bucket origin\n    originBucket.addToResourcePolicy(\n      new iam.PolicyStatement({\n        effect: iam.Effect.ALLOW,\n        actions: ['s3:GetObject'],\n        principals: [new iam.ServicePrincipal('cloudfront.amazonaws.com')],\n        resources: [originBucket.arnForObjects('*')],\n        conditions: {\n          StringEquals: {\n            'AWS:SourceArn': `arn:${Aws.PARTITION}:cloudfront::${Aws.ACCOUNT_ID}:distribution/${this.cloudFrontWebDistribution.distributionId}`\n          }\n        }\n      })\n    );\n\n    // We need to create a custom resource to introduce the indirection necessary to avoid\n    // a circular dependency when granting the CloudFront distribution access to use the\n    // KMS key to decrypt objects. Without this indirection, it is not possible to reference\n    // the CloudFront distribution ID in the KMS key policy because -\n    //   * The S3 bucket references the KMS key\n    //   * The CloudFront distribution references the bucket\n    //   * The KMS key references the CloudFront distribution\n    let encryptionKey: kms.IKey | undefined;\n    if (props.bucketProps && props.bucketProps.encryptionKey) {\n      encryptionKey = props.bucketProps.encryptionKey;\n    } else if (props.existingBucketObj && props.existingBucketObj.encryptionKey) {\n      encryptionKey = props.existingBucketObj.encryptionKey;\n    }\n\n    if (encryptionKey) {\n      resources.createKeyPolicyUpdaterCustomResource(this, id,  {\n        distribution: this.cloudFrontWebDistribution,\n        encryptionKey\n      });\n    }\n  }\n}"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-solutions-constructs/aws-cloudfront-s3",
3
- "version": "2.79.1",
3
+ "version": "2.80.0",
4
4
  "description": "CDK Constructs for AWS Cloudfront to AWS S3 integration.",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -54,15 +54,15 @@
54
54
  }
55
55
  },
56
56
  "dependencies": {
57
- "@aws-solutions-constructs/core": "2.79.1",
58
- "@aws-solutions-constructs/resources": "2.79.1",
57
+ "@aws-solutions-constructs/core": "2.80.0",
58
+ "@aws-solutions-constructs/resources": "2.80.0",
59
59
  "constructs": "^10.0.0"
60
60
  },
61
61
  "devDependencies": {
62
- "@aws-cdk/integ-tests-alpha": "2.177.0-alpha.0",
62
+ "@aws-cdk/integ-tests-alpha": "2.179.0-alpha.0",
63
63
  "@types/node": "^10.3.0",
64
64
  "constructs": "^10.0.0",
65
- "aws-cdk-lib": "2.177.0"
65
+ "aws-cdk-lib": "2.179.0"
66
66
  },
67
67
  "jest": {
68
68
  "moduleFileExtensions": [
@@ -79,10 +79,10 @@
79
79
  ]
80
80
  },
81
81
  "peerDependencies": {
82
- "@aws-solutions-constructs/core": "2.79.1",
83
- "@aws-solutions-constructs/resources": "2.79.1",
82
+ "@aws-solutions-constructs/core": "2.80.0",
83
+ "@aws-solutions-constructs/resources": "2.80.0",
84
84
  "constructs": "^10.0.0",
85
- "aws-cdk-lib": "^2.177.0"
85
+ "aws-cdk-lib": "^2.179.0"
86
86
  },
87
87
  "keywords": [
88
88
  "aws",
@@ -0,0 +1 @@
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.Retry=exports.includeStackTraces=exports.MISSING_PHYSICAL_ID_MARKER=exports.CREATE_FAILED_PHYSICAL_ID_MARKER=void 0,exports.submitResponse=submitResponse,exports.safeHandler=safeHandler,exports.redactDataFromPayload=redactDataFromPayload;const url=require("url"),outbound_1=require("./outbound"),util_1=require("./util");exports.CREATE_FAILED_PHYSICAL_ID_MARKER="AWSCDK::CustomResourceProviderFramework::CREATE_FAILED",exports.MISSING_PHYSICAL_ID_MARKER="AWSCDK::CustomResourceProviderFramework::MISSING_PHYSICAL_ID";async function submitResponse(status,event,options={}){const json={Status:status,Reason:options.reason||status,StackId:event.StackId,RequestId:event.RequestId,PhysicalResourceId:event.PhysicalResourceId||exports.MISSING_PHYSICAL_ID_MARKER,LogicalResourceId:event.LogicalResourceId,NoEcho:options.noEcho,Data:event.Data},responseBody=JSON.stringify(json),parsedUrl=url.parse(event.ResponseURL),loggingSafeUrl=`${parsedUrl.protocol}//${parsedUrl.hostname}/${parsedUrl.pathname}?***`;options?.noEcho?(0,util_1.log)("submit redacted response to cloudformation",loggingSafeUrl,redactDataFromPayload(json)):(0,util_1.log)("submit response to cloudformation",loggingSafeUrl,json);const retryOptions={attempts:5,sleep:1e3};await(0,util_1.withRetries)(retryOptions,outbound_1.httpRequest)({hostname:parsedUrl.hostname,path:parsedUrl.path,method:"PUT",headers:{"content-type":"","content-length":Buffer.byteLength(responseBody,"utf8")}},responseBody)}exports.includeStackTraces=!0;function safeHandler(block){return async event=>{if(event.RequestType==="Delete"&&event.PhysicalResourceId===exports.CREATE_FAILED_PHYSICAL_ID_MARKER){(0,util_1.log)("ignoring DELETE event caused by a failed CREATE event"),await submitResponse("SUCCESS",event);return}try{await block(event)}catch(e){if(e instanceof Retry)throw(0,util_1.log)("retry requested by handler"),e;event.PhysicalResourceId||(event.RequestType==="Create"?((0,util_1.log)("CREATE failed, responding with a marker physical resource id so that the subsequent DELETE will be ignored"),event.PhysicalResourceId=exports.CREATE_FAILED_PHYSICAL_ID_MARKER):(0,util_1.log)(`ERROR: Malformed event. "PhysicalResourceId" is required: ${JSON.stringify({...event,ResponseURL:"..."})}`)),await submitResponse("FAILED",event,{reason:exports.includeStackTraces?e.stack:e.message})}}}function redactDataFromPayload(payload){const redactedPayload=JSON.parse(JSON.stringify(payload));if(redactedPayload.Data){const keys=Object.keys(redactedPayload.Data);for(const key of keys)redactedPayload.Data[key]="*****"}return redactedPayload}class Retry extends Error{}exports.Retry=Retry;
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.httpRequest=exports.invokeFunction=exports.startExecution=void 0;const https=require("https"),client_lambda_1=require("@aws-sdk/client-lambda"),client_sfn_1=require("@aws-sdk/client-sfn"),FRAMEWORK_HANDLER_TIMEOUT=9e5,awsSdkConfig={httpOptions:{timeout:FRAMEWORK_HANDLER_TIMEOUT}};async function defaultHttpRequest(options,requestBody){return new Promise((resolve,reject)=>{try{const request=https.request(options,response=>{response.resume(),!response.statusCode||response.statusCode>=400?reject(new Error(`Unsuccessful HTTP response: ${response.statusCode}`)):resolve()});request.on("error",reject),request.write(requestBody),request.end()}catch(e){reject(e)}})}let sfn,lambda;async function defaultStartExecution(req){return sfn||(sfn=new client_sfn_1.SFN(awsSdkConfig)),sfn.startExecution(req)}async function defaultInvokeFunction(req){lambda||(lambda=new client_lambda_1.Lambda(awsSdkConfig));try{return await lambda.invoke(req)}catch{return await(0,client_lambda_1.waitUntilFunctionActiveV2)({client:lambda,maxWaitTime:300},{FunctionName:req.FunctionName}),await lambda.invoke(req)}}exports.startExecution=defaultStartExecution,exports.invokeFunction=defaultInvokeFunction,exports.httpRequest=defaultHttpRequest;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.httpRequest=exports.invokeFunction=exports.startExecution=void 0;const https=require("https"),client_lambda_1=require("@aws-sdk/client-lambda"),client_sfn_1=require("@aws-sdk/client-sfn"),FRAMEWORK_HANDLER_TIMEOUT=9e5,awsSdkConfig={httpOptions:{timeout:FRAMEWORK_HANDLER_TIMEOUT}};async function defaultHttpRequest(options,requestBody){return new Promise((resolve,reject)=>{try{const request=https.request(options,response=>{response.resume(),!response.statusCode||response.statusCode>=400?reject(new Error(`Unsuccessful HTTP response: ${response.statusCode}`)):resolve()});request.on("error",reject),request.write(requestBody),request.end()}catch(e){reject(e)}})}let sfn,lambda;async function defaultStartExecution(req){return sfn||(sfn=new client_sfn_1.SFN(awsSdkConfig)),sfn.startExecution(req)}async function defaultInvokeFunction(req){lambda||(lambda=new client_lambda_1.Lambda(awsSdkConfig));try{return await lambda.invoke(req)}catch{return await(0,client_lambda_1.waitUntilFunctionActiveV2)({client:lambda,maxWaitTime:300},{FunctionName:req.FunctionName}),lambda.invoke(req)}}exports.startExecution=defaultStartExecution,exports.invokeFunction=defaultInvokeFunction,exports.httpRequest=defaultHttpRequest;
@@ -0,0 +1 @@
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getEnv=getEnv,exports.log=log,exports.withRetries=withRetries,exports.parseJsonPayload=parseJsonPayload;function getEnv(name){const value=process.env[name];if(!value)throw new Error(`The environment variable "${name}" is not defined`);return value}function log(title,...args){console.log("[provider-framework]",title,...args.map(x=>typeof x=="object"?JSON.stringify(x,void 0,2):x))}function withRetries(options,fn){return async(...xs)=>{let attempts=options.attempts,ms=options.sleep;for(;;)try{return await fn(...xs)}catch(e){if(attempts--<=0)throw e;await sleep(Math.floor(Math.random()*ms)),ms*=2}}}async function sleep(ms){return new Promise(ok=>setTimeout(ok,ms))}function parseJsonPayload(payload){const text=new TextDecoder().decode(Buffer.from(payload??""));if(!text)return{};try{return JSON.parse(text)}catch{throw new Error(`return values from user-handlers must be JSON objects. got: "${text}"`)}}
@@ -1 +1 @@
1
- {"version":"38.0.1"}
1
+ {"version":"39.0.0"}
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "38.0.1",
2
+ "version": "39.0.0",
3
3
  "files": {
4
4
  "faa95a81ae7d7373f3e1f242268f904eb748d8d0fdd306e8a6fe515a1905a7d6": {
5
5
  "source": {
@@ -27,20 +27,20 @@
27
27
  }
28
28
  }
29
29
  },
30
- "4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e": {
30
+ "bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca": {
31
31
  "source": {
32
- "path": "asset.4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e",
32
+ "path": "asset.bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca",
33
33
  "packaging": "zip"
34
34
  },
35
35
  "destinations": {
36
36
  "current_account-current_region": {
37
37
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
38
- "objectKey": "4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e.zip",
38
+ "objectKey": "bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca.zip",
39
39
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
40
40
  }
41
41
  }
42
42
  },
43
- "1cc201d973b7f73bd9be614c5da0115efe0f1773ec57534801d543cf2f3c6a51": {
43
+ "11f6842c17d2442387117bf1e4811f326dafd17b8708d4c3b1304d3240314900": {
44
44
  "source": {
45
45
  "path": "cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket.template.json",
46
46
  "packaging": "file"
@@ -48,7 +48,7 @@
48
48
  "destinations": {
49
49
  "current_account-current_region": {
50
50
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
51
- "objectKey": "1cc201d973b7f73bd9be614c5da0115efe0f1773ec57534801d543cf2f3c6a51.json",
51
+ "objectKey": "11f6842c17d2442387117bf1e4811f326dafd17b8708d4c3b1304d3240314900.json",
52
52
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
53
53
  }
54
54
  }
@@ -1172,6 +1172,16 @@
1172
1172
  ]
1173
1173
  }
1174
1174
  ]
1175
+ },
1176
+ {
1177
+ "Action": "lambda:GetFunction",
1178
+ "Effect": "Allow",
1179
+ "Resource": {
1180
+ "Fn::GetAtt": [
1181
+ "testcloudfronts3cmkencryptionkeyLambdaFunction4DCD662E",
1182
+ "Arn"
1183
+ ]
1184
+ }
1175
1185
  }
1176
1186
  ],
1177
1187
  "Version": "2012-10-17"
@@ -1191,7 +1201,7 @@
1191
1201
  "S3Bucket": {
1192
1202
  "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
1193
1203
  },
1194
- "S3Key": "4dc48ffba382f93077a1e6824599bbd4ceb6f91eb3d9442eca3b85bdb1a20b1e.zip"
1204
+ "S3Key": "bdc104ed9cab1b5b6421713c8155f0b753380595356f710400609664d3635eca.zip"
1195
1205
  },
1196
1206
  "Description": "AWS CDK resource provider framework - onEvent (cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket/test-cloudfront-s3-cmk-encryption-key/KmsKeyPolicyUpdateProvider)",
1197
1207
  "Environment": {
@@ -1316,10 +1326,10 @@
1316
1326
  "value": "nodejs20.x"
1317
1327
  },
1318
1328
  "cn-north-1": {
1319
- "value": "nodejs18.x"
1329
+ "value": "nodejs20.x"
1320
1330
  },
1321
1331
  "cn-northwest-1": {
1322
- "value": "nodejs18.x"
1332
+ "value": "nodejs20.x"
1323
1333
  },
1324
1334
  "eu-central-1": {
1325
1335
  "value": "nodejs20.x"
@@ -1370,10 +1380,10 @@
1370
1380
  "value": "nodejs20.x"
1371
1381
  },
1372
1382
  "us-gov-east-1": {
1373
- "value": "nodejs18.x"
1383
+ "value": "nodejs20.x"
1374
1384
  },
1375
1385
  "us-gov-west-1": {
1376
- "value": "nodejs18.x"
1386
+ "value": "nodejs20.x"
1377
1387
  },
1378
1388
  "us-iso-east-1": {
1379
1389
  "value": "nodejs18.x"
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "38.0.1",
2
+ "version": "39.0.0",
3
3
  "files": {
4
4
  "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
5
5
  "source": {
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "38.0.1",
2
+ "version": "39.0.0",
3
3
  "testCases": {
4
4
  "cfts3-bucket-encrypted-with-cmk-provided-as-existingbucket/Integ/DefaultTest": {
5
5
  "stacks": [