Fixing up the failing integ tests

aws · Aug 28, 2023 · 82d8c3e · 82d8c3e
1 parent 7b20472
commit 82d8c3e
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 57 deletions.
diff --git a/...elegation.js.snapshot/Route53CrossAccountIntegDefaultTestDeployAssertF1D808C9.assets.json b/...elegation.js.snapshot/Route53CrossAccountIntegDefaultTestDeployAssertF1D808C9.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "33.0.0",
+  "version": "34.0.0",
   "files": {
     "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
       "source": {

diff --git a/...cross-account-zone-delegation.js.snapshot/aws-cdk-route53-cross-account-integ.assets.json b/...cross-account-zone-delegation.js.snapshot/aws-cdk-route53-cross-account-integ.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "33.0.0",
+  "version": "34.0.0",
   "files": {
     "ab0afc2f801b8ac11473bad4d9f22578919d8959b5f1bcd21b05c4ac895dbcab": {
       "source": {
@@ -14,15 +14,15 @@
         }
       }
     },
-    "52da24cb67101152630cedcc08830f183f595580f8a7f6fcef1e0aac216c7198": {
+    "acd818c0f9df9049fee65004b94b63e82b1dccf7da7b7c747b7b363c40ae4bdc": {
       "source": {
         "path": "aws-cdk-route53-cross-account-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "52da24cb67101152630cedcc08830f183f595580f8a7f6fcef1e0aac216c7198.json",
+          "objectKey": "acd818c0f9df9049fee65004b94b63e82b1dccf7da7b7c747b7b363c40ae4bdc.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...oss-account-zone-delegation.js.snapshot/aws-cdk-route53-cross-account-integ.template.json b/...oss-account-zone-delegation.js.snapshot/aws-cdk-route53-cross-account-integ.template.json
@@ -356,40 +356,40 @@
        "Effect": "Allow",
        "Resource": [
         {
-          "Fn::Join": [
-            "",
-            [
-              "arn:",
-              {
-              "Ref": "AWS::Partition"
-              },
-              ":route53:::hostedzone/imported-private-zone-id"
-            ]
+         "Fn::Join": [
+          "",
+          [
+           "arn:",
+           {
+            "Ref": "AWS::Partition"
+           },
+           ":route53:::hostedzone/imported-private-zone-id"
           ]
+         ]
         },
         {
-          "Fn::Join": [
-            "",
-            [
-              "arn:",
-              {
-              "Ref": "AWS::Partition"
-              },
-              ":route53:::hostedzone/imported-public-zone-id"
-            ]
+         "Fn::Join": [
+          "",
+          [
+           "arn:",
+           {
+            "Ref": "AWS::Partition"
+           },
+           ":route53:::hostedzone/imported-public-zone-id"
           ]
+         ]
         },
         {
-          "Fn::Join": [
-            "",
-            [
-              "arn:",
-              {
-              "Ref": "AWS::Partition"
-              },
-              ":route53:::hostedzone/imported-zone-id"
-            ]
+         "Fn::Join": [
+          "",
+          [
+           "arn:",
+           {
+            "Ref": "AWS::Partition"
+           },
+           ":route53:::hostedzone/imported-zone-id"
           ]
+         ]
         }
        ]
       },

diff --git a/...ework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/cdk.out b/...ework-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"33.0.0"}
+{"version":"34.0.0"}
diff --git a/...rk-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/integ.json b/...rk-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
-  "version": "33.0.0",
+  "version": "34.0.0",
   "testCases": {
     "Route53CrossAccountInteg/DefaultTest": {
       "stacks": [

diff --git a/...integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/manifest.json b/...integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "33.0.0",
+  "version": "34.0.0",
   "artifacts": {
     "aws-cdk-route53-cross-account-integ.assets": {
       "type": "cdk:asset-manifest",
@@ -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}/52da24cb67101152630cedcc08830f183f595580f8a7f6fcef1e0aac216c7198.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/acd818c0f9df9049fee65004b94b63e82b1dccf7da7b7c747b7b363c40ae4bdc.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...ork-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/tree.json b/...ork-integ/test/aws-route53/test/integ.cross-account-zone-delegation.js.snapshot/tree.json
@@ -505,18 +505,44 @@
                                 }
                               },
                               "Effect": "Allow",
-                              "Resource": {
-                                "Fn::Join": [
-                                  "",
-                                  [
-                                    "arn:",
-                                    {
-                                      "Ref": "AWS::Partition"
-                                    },
-                                    ":route53:::hostedzone/imported-public-zone-id"
+                              "Resource": [
+                                {
+                                  "Fn::Join": [
+                                    "",
+                                    [
+                                      "arn:",
+                                      {
+                                        "Ref": "AWS::Partition"
+                                      },
+                                      ":route53:::hostedzone/imported-private-zone-id"
+                                    ]
                                   ]
-                                ]
-                              }
+                                },
+                                {
+                                  "Fn::Join": [
+                                    "",
+                                    [
+                                      "arn:",
+                                      {
+                                        "Ref": "AWS::Partition"
+                                      },
+                                      ":route53:::hostedzone/imported-public-zone-id"
+                                    ]
+                                  ]
+                                },
+                                {
+                                  "Fn::Join": [
+                                    "",
+                                    [
+                                      "arn:",
+                                      {
+                                        "Ref": "AWS::Partition"
+                                      },
+                                      ":route53:::hostedzone/imported-zone-id"
+                                    ]
+                                  ]
+                                }
+                              ]
                             },
                             {
                               "Action": "route53:ListHostedZonesByName",
@@ -551,6 +577,14 @@
               "version": "0.0.0"
             }
           },
+          "ImportedZone": {
+            "id": "ImportedZone",
+            "path": "aws-cdk-route53-cross-account-integ/ImportedZone",
+            "constructInfo": {
+              "fqn": "aws-cdk-lib.Resource",
+              "version": "0.0.0"
+            }
+          },
           "ImportedPublicZone": {
             "id": "ImportedPublicZone",
             "path": "aws-cdk-route53-cross-account-integ/ImportedPublicZone",
@@ -559,6 +593,14 @@
               "version": "0.0.0"
             }
           },
+          "ImportedPrivateZone": {
+            "id": "ImportedPrivateZone",
+            "path": "aws-cdk-route53-cross-account-integ/ImportedPrivateZone",
+            "constructInfo": {
+              "fqn": "aws-cdk-lib.Resource",
+              "version": "0.0.0"
+            }
+          },
           "BootstrapVersion": {
             "id": "BootstrapVersion",
             "path": "aws-cdk-route53-cross-account-integ/BootstrapVersion",

diff --git a/...-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/tree.json b/...-testing/framework-integ/test/aws-servicecatalog/test/integ.product.js.snapshot/tree.json
@@ -895,21 +895,21 @@
             "id": "TestProduct",
             "path": "integ-servicecatalog-product/TestProduct",
             "children": {
-              "Templatecfae0edd2da0": {
-                "id": "Templatecfae0edd2da0",
-                "path": "integ-servicecatalog-product/TestProduct/Templatecfae0edd2da0",
+              "Template8d7b116c5383": {
+                "id": "Template8d7b116c5383",
+                "path": "integ-servicecatalog-product/TestProduct/Template8d7b116c5383",
                 "children": {
                   "Stage": {
                     "id": "Stage",
-                    "path": "integ-servicecatalog-product/TestProduct/Templatecfae0edd2da0/Stage",
+                    "path": "integ-servicecatalog-product/TestProduct/Template8d7b116c5383/Stage",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.AssetStaging",
                       "version": "0.0.0"
                     }
                   },
                   "AssetBucket": {
                     "id": "AssetBucket",
-                    "path": "integ-servicecatalog-product/TestProduct/Templatecfae0edd2da0/AssetBucket",
+                    "path": "integ-servicecatalog-product/TestProduct/Template8d7b116c5383/AssetBucket",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.aws_s3.BucketBase",
                       "version": "0.0.0"
@@ -921,21 +921,21 @@
                   "version": "0.0.0"
                 }
               },
-              "Template15761d1255cb": {
-                "id": "Template15761d1255cb",
-                "path": "integ-servicecatalog-product/TestProduct/Template15761d1255cb",
+              "Template609ad9987517": {
+                "id": "Template609ad9987517",
+                "path": "integ-servicecatalog-product/TestProduct/Template609ad9987517",
                 "children": {
                   "Stage": {
                     "id": "Stage",
-                    "path": "integ-servicecatalog-product/TestProduct/Template15761d1255cb/Stage",
+                    "path": "integ-servicecatalog-product/TestProduct/Template609ad9987517/Stage",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.AssetStaging",
                       "version": "0.0.0"
                     }
                   },
                   "AssetBucket": {
                     "id": "AssetBucket",
-                    "path": "integ-servicecatalog-product/TestProduct/Template15761d1255cb/AssetBucket",
+                    "path": "integ-servicecatalog-product/TestProduct/Template609ad9987517/AssetBucket",
                     "constructInfo": {
                       "fqn": "aws-cdk-lib.aws_s3.BucketBase",
                       "version": "0.0.0"

diff --git a/packages/@aws-cdk/aws-synthetics-alpha/test/integ.canary.js.snapshot/manifest.json b/packages/@aws-cdk/aws-synthetics-alpha/test/integ.canary.js.snapshot/manifest.json
@@ -377,7 +377,7 @@
         "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}/ee64e9ee2cf92fe92da44a1ed590ce7b7584da339a45d6326092584a79ff1349.json",
-        "requiresBootstrapStackVersion": 6,
+         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
           "IntegCanaryTestDefaultTestDeployAssert3AD5A094.assets"