Merge branch 'main' into main

aws · Jul 10, 2023 · 3924e46 · 3924e46
2 parents c5ea3a2 + f9a1192
commit 3924e46
Show file tree

Hide file tree

Showing 48 changed files with 872 additions and 172 deletions.
diff --git a/...ing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/manifest.json b/...ing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...work-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.assets.json b/...work-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "32.0.0",
   "files": {
-    "22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391": {
+    "7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db": {
       "source": {
         "path": "mesh-stack.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "22240821b1bd2dffca97a9e0b581bf2d1a2dc32765da9872c066c10f315cd391.json",
+          "objectKey": "7eca470b64972db3f33a642114983901fa5e45a5c40d071fe328451294b6f3db.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...rk-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.template.json b/...rk-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/mesh-stack.template.json
@@ -468,6 +468,7 @@
       "Action": {
        "WeightedTargets": [
         {
+         "Port": 1234,
          "VirtualNode": {
           "Fn::GetAtt": [
            "meshgrpcnode5DE90B75",

diff --git a/...testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/tree.json b/...testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.js.snapshot/tree.json
@@ -807,7 +807,8 @@
                                           "VirtualNodeName"
                                         ]
                                       },
-                                      "weight": 1
+                                      "weight": 1,
+                                      "port": 1234
                                     }
                                   ]
                                 },
@@ -1264,7 +1265,7 @@
                 "path": "appmesh-routes-port-matchers/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.26"
+                  "version": "10.2.55"
                 }
               },
               "DeployAssert": {
@@ -1310,7 +1311,7 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.2.26"
+          "version": "10.2.55"
         }
       }
     },

diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-appmesh/test/integ.mesh-port-match.ts
@@ -65,7 +65,7 @@ httpRouter.addRoute('http-route', {
 
 grpcRouter.addRoute('grpc-route', {
   routeSpec: appmesh.RouteSpec.grpc({
-    weightedTargets: [{ virtualNode: grpcNode }],
+    weightedTargets: [{ virtualNode: grpcNode, port: 1234 }],
     match: {
       port: 1234,
     },

diff --git a/...ront/test/integ.distribution-policies.js.snapshot/integ-distribution-policies.assets.json b/...ront/test/integ.distribution-policies.js.snapshot/integ-distribution-policies.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "32.0.0",
   "files": {
-    "01042f10dd3272da413b201384cdf825a7467030c0db8a2d5bcfe10b45a30ced": {
+    "17ab10021b77a5b225de54b10a02740bc6d638269786a643726871c66180f980": {
       "source": {
         "path": "integ-distribution-policies.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "01042f10dd3272da413b201384cdf825a7467030c0db8a2d5bcfe10b45a30ced.json",
+          "objectKey": "17ab10021b77a5b225de54b10a02740bc6d638269786a643726871c66180f980.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...nt/test/integ.distribution-policies.js.snapshot/integ-distribution-policies.template.json b/...nt/test/integ.distribution-policies.js.snapshot/integ-distribution-policies.template.json
@@ -69,7 +69,10 @@
    "Properties": {
     "OriginRequestPolicyConfig": {
      "CookiesConfig": {
-      "CookieBehavior": "none"
+      "CookieBehavior": "whitelist",
+      "Cookies": [
+       "cookie1"
+      ]
      },
      "HeadersConfig": {
       "HeaderBehavior": "allViewerAndWhitelistCloudFront",
@@ -79,7 +82,10 @@
      },
      "Name": "ACustomOriginRequestPolicy",
      "QueryStringsConfig": {
-      "QueryStringBehavior": "none"
+      "QueryStringBehavior": "allExcept",
+      "QueryStrings": [
+       "querystringparam"
+      ]
      }
     }
    }

diff --git a/...work-integ/test/aws-cloudfront/test/integ.distribution-policies.js.snapshot/manifest.json b/...work-integ/test/aws-cloudfront/test/integ.distribution-policies.js.snapshot/manifest.json
@@ -17,7 +17,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/01042f10dd3272da413b201384cdf825a7467030c0db8a2d5bcfe10b45a30ced.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/17ab10021b77a5b225de54b10a02740bc6d638269786a643726871c66180f980.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...ramework-integ/test/aws-cloudfront/test/integ.distribution-policies.js.snapshot/tree.json b/...ramework-integ/test/aws-cloudfront/test/integ.distribution-policies.js.snapshot/tree.json
@@ -145,7 +145,10 @@
                     "originRequestPolicyConfig": {
                       "name": "ACustomOriginRequestPolicy",
                       "cookiesConfig": {
-                        "cookieBehavior": "none"
+                        "cookieBehavior": "whitelist",
+                        "cookies": [
+                          "cookie1"
+                        ]
                       },
                       "headersConfig": {
                         "headerBehavior": "allViewerAndWhitelistCloudFront",
@@ -154,7 +157,10 @@
                         ]
                       },
                       "queryStringsConfig": {
-                        "queryStringBehavior": "none"
+                        "queryStringBehavior": "allExcept",
+                        "queryStrings": [
+                          "querystringparam"
+                        ]
                       }
                     }
                   }
@@ -244,7 +250,7 @@
                 "path": "integ-distribution-policies/Dist/Origin1",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.26"
+                  "version": "10.2.52"
                 }
               },
               "Resource": {
@@ -304,7 +310,7 @@
                 "path": "integ-distribution-policies/Dist-2/Origin1",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.26"
+                  "version": "10.2.52"
                 }
               },
               "Resource": {
@@ -388,7 +394,7 @@
                 "path": "DistributionPolicies/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.26"
+                  "version": "10.2.52"
                 }
               },
               "DeployAssert": {
@@ -434,7 +440,7 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.2.26"
+          "version": "10.2.52"
         }
       }
     },

diff --git a/.../@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-policies.ts b/.../@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-policies.ts
@@ -31,7 +31,9 @@ const cachePolicyWithRef = new cloudfront.CachePolicy(stack, 'CachePolicyWithRef
 
 const originRequestPolicy = new cloudfront.OriginRequestPolicy(stack, 'OriginRequestPolicy', {
   originRequestPolicyName: 'ACustomOriginRequestPolicy',
+  cookieBehavior: cloudfront.OriginRequestCookieBehavior.allowList('cookie1'),
   headerBehavior: cloudfront.OriginRequestHeaderBehavior.all('CloudFront-Forwarded-Proto'),
+  queryStringBehavior: cloudfront.OriginRequestQueryStringBehavior.denyList('querystringparam'),
 });
 
 const responseHeadersPolicy = new cloudfront.ResponseHeadersPolicy(stack, 'ResponseHeadersPolicy', {

diff --git a/...t-and-dashboard.js.snapshot/aws-cdk-cloudwatch-singlevaluewidget-period-integ.assets.json b/...t-and-dashboard.js.snapshot/aws-cdk-cloudwatch-singlevaluewidget-period-integ.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "d4dda261a18b29095c14be79773ff2c9cee39ed1fa347c6b46432c448eb55bfe": {
+      "source": {
+        "path": "aws-cdk-cloudwatch-singlevaluewidget-period-integ.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "d4dda261a18b29095c14be79773ff2c9cee39ed1fa347c6b46432c448eb55bfe.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...and-dashboard.js.snapshot/aws-cdk-cloudwatch-singlevaluewidget-period-integ.template.json b/...and-dashboard.js.snapshot/aws-cdk-cloudwatch-singlevaluewidget-period-integ.template.json
@@ -0,0 +1,55 @@
+{
+ "Resources": {
+  "Dashboard9E4231ED": {
+   "Type": "AWS::CloudWatch::Dashboard",
+   "Properties": {
+    "DashboardBody": {
+     "Fn::Join": [
+      "",
+      [
+       "{\"widgets\":[{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":0,\"properties\":{\"view\":\"singleValue\",\"region\":\"",
+       {
+        "Ref": "AWS::Region"
+       },
+       "\",\"metrics\":[[\"CDK/Test\",\"Metric\"]],\"period\":600}}]}"
+      ]
+     ]
+    }
+   }
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/...test/aws-cloudwatch/test/integ.period-singlevaluewidget-and-dashboard.js.snapshot/cdk.out b/...test/aws-cloudwatch/test/integ.period-singlevaluewidget-and-dashboard.js.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"32.0.0"}
diff --git a/...t/aws-cloudwatch/test/integ.period-singlevaluewidget-and-dashboard.js.snapshot/integ.json b/...t/aws-cloudwatch/test/integ.period-singlevaluewidget-and-dashboard.js.snapshot/integ.json
@@ -0,0 +1,12 @@
+{
+  "version": "32.0.0",
+  "testCases": {
+    "singlevaluewidget-with-period/DefaultTest": {
+      "stacks": [
+        "aws-cdk-cloudwatch-singlevaluewidget-period-integ"
+      ],
+      "assertionStack": "singlevaluewidget-with-period/DefaultTest/DeployAssert",
+      "assertionStackName": "singlevaluewidgetwithperiodDefaultTestDeployAssert48DEBCE0"
+    }
+  }
+}