fix integration test

aws · Jun 5, 2023 · 70f89c1 · 70f89c1
1 parent 3bfd38e
commit 70f89c1
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 24 deletions.
diff --git a/...teg.distributed-map.js.snapshot/DistributedMapDefaultTestDeployAssertFD6CBCC4.assets.json b/...teg.distributed-map.js.snapshot/DistributedMapDefaultTestDeployAssertFD6CBCC4.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "88e0b6bd92c7f3bd26960156a5478f278744f20c286a27139a49fa64f95b8ba9": {
+    "428d45d78cd60f636093f2f73d8319337004afea0fa854410fdacdcce602d3fc": {
       "source": {
         "path": "DistributedMapDefaultTestDeployAssertFD6CBCC4.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "88e0b6bd92c7f3bd26960156a5478f278744f20c286a27139a49fa64f95b8ba9.json",
+          "objectKey": "428d45d78cd60f636093f2f73d8319337004afea0fa854410fdacdcce602d3fc.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...g.distributed-map.js.snapshot/DistributedMapDefaultTestDeployAssertFD6CBCC4.template.json b/...g.distributed-map.js.snapshot/DistributedMapDefaultTestDeployAssertFD6CBCC4.template.json
@@ -18,7 +18,7 @@
      }
     },
     "flattenResponse": "false",
-    "salt": "1683221356524"
+    "salt": "1684365613545"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -130,7 +130,7 @@
      "Body": "a,b,c\n1,2,3\n4,5,6"
     },
     "flattenResponse": "false",
-    "salt": "1683221356524"
+    "salt": "1684365613545"
    },
    "UpdateReplacePolicy": "Delete",
    "DeletionPolicy": "Delete"
@@ -152,7 +152,7 @@
      }
     },
     "flattenResponse": "true",
-    "salt": "1683221356524"
+    "salt": "1684365613545"
    },
    "DependsOn": [
     "AwsApiCallS3putObject9f7ed865afc47100b3c2a9fea2cf51ee"
@@ -181,7 +181,7 @@
      }
     },
     "flattenResponse": "false",
-    "salt": "1683221356525"
+    "salt": "1684365613546"
    },
    "DependsOn": [
     "AwsApiCallStepFunctionsstartExecutionc5cc0786542148808c24d8ebf111c7aa"

diff --git a/...pfunctions/test/integ.distributed-map.js.snapshot/aws-stepfunctions-map-integ.assets.json b/...pfunctions/test/integ.distributed-map.js.snapshot/aws-stepfunctions-map-integ.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "264530499a6bef07bb444b5daefdb7f588e992a6aa9716cb7baa8cce19c6f5ab": {
+    "4fbdcd6affb0ed41775b9cb185de0d7d06acc3cfaec80dd6555ba3dc25c5d930": {
       "source": {
         "path": "aws-stepfunctions-map-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "264530499a6bef07bb444b5daefdb7f588e992a6aa9716cb7baa8cce19c6f5ab.json",
+          "objectKey": "4fbdcd6affb0ed41775b9cb185de0d7d06acc3cfaec80dd6555ba3dc25c5d930.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...unctions/test/integ.distributed-map.js.snapshot/aws-stepfunctions-map-integ.template.json b/...unctions/test/integ.distributed-map.js.snapshot/aws-stepfunctions-map-integ.template.json
@@ -175,7 +175,11 @@
         "Fn::Join": [
          "",
          [
-          "arn:aws:s3:::",
+          "arn:",
+          {
+           "Ref": "AWS::Partition"
+          },
+          ":s3:::",
           {
            "Ref": "Bucket83908E77"
           },
@@ -208,11 +212,19 @@
      "Fn::Join": [
       "",
       [
-       "{\"StartAt\":\"DistributedMap\",\"States\":{\"DistributedMap\":{\"Type\":\"Map\",\"End\":true,\"ItemProcessor\":{\"ProcessorConfig\":{\"Mode\":\"DISTRIBUTED\",\"ExecutionType\":\"STANDARD\"},\"StartAt\":\"Pass\",\"States\":{\"Pass\":{\"Type\":\"Pass\",\"End\":true}}},\"ItemReader\":{\"Resource\":\"arn:aws:states:::s3:getObject\",\"ReaderConfig\":{\"InputType\":\"CSV\",\"CSVHeaderLocation\":\"FIRST_ROW\"},\"Parameters\":{\"Bucket\":\"",
+       "{\"StartAt\":\"DistributedMap\",\"States\":{\"DistributedMap\":{\"Type\":\"Map\",\"End\":true,\"ItemProcessor\":{\"ProcessorConfig\":{\"Mode\":\"DISTRIBUTED\",\"ExecutionType\":\"STANDARD\"},\"StartAt\":\"Pass\",\"States\":{\"Pass\":{\"Type\":\"Pass\",\"End\":true}}},\"ItemReader\":{\"Resource\":\"arn:",
+       {
+        "Ref": "AWS::Partition"
+       },
+       ":states:::s3:getObject\",\"ReaderConfig\":{\"InputType\":\"CSV\",\"CSVHeaderLocation\":\"FIRST_ROW\"},\"Parameters\":{\"Bucket\":\"",
        {
         "Ref": "Bucket83908E77"
        },
-       "\",\"Key\":\"my-key.csv\"}},\"ResultWriter\":{\"Resource\":\"arn:aws:states:::s3:putObject\",\"Parameters\":{\"Bucket\":\"",
+       "\",\"Key\":\"my-key.csv\"}},\"ResultWriter\":{\"Resource\":\"arn:",
+       {
+        "Ref": "AWS::Partition"
+       },
+       ":states:::s3:putObject\",\"Parameters\":{\"Bucket\":\"",
        {
         "Ref": "Bucket83908E77"
        },

diff --git a/...amework-integ/test/aws-stepfunctions/test/integ.distributed-map.js.snapshot/manifest.json b/...amework-integ/test/aws-stepfunctions/test/integ.distributed-map.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}/264530499a6bef07bb444b5daefdb7f588e992a6aa9716cb7baa8cce19c6f5ab.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4fbdcd6affb0ed41775b9cb185de0d7d06acc3cfaec80dd6555ba3dc25c5d930.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -136,7 +136,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}/88e0b6bd92c7f3bd26960156a5478f278744f20c286a27139a49fa64f95b8ba9.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/428d45d78cd60f636093f2f73d8319337004afea0fa854410fdacdcce602d3fc.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...g/framework-integ/test/aws-stepfunctions/test/integ.distributed-map.js.snapshot/tree.json b/...g/framework-integ/test/aws-stepfunctions/test/integ.distributed-map.js.snapshot/tree.json
@@ -247,7 +247,11 @@
                                     "Fn::Join": [
                                       "",
                                       [
-                                        "arn:aws:s3:::",
+                                        "arn:",
+                                        {
+                                          "Ref": "AWS::Partition"
+                                        },
+                                        ":s3:::",
                                         {
                                           "Ref": "Bucket83908E77"
                                         },
@@ -300,11 +304,19 @@
                       "Fn::Join": [
                         "",
                         [
-                          "{\"StartAt\":\"DistributedMap\",\"States\":{\"DistributedMap\":{\"Type\":\"Map\",\"End\":true,\"ItemProcessor\":{\"ProcessorConfig\":{\"Mode\":\"DISTRIBUTED\",\"ExecutionType\":\"STANDARD\"},\"StartAt\":\"Pass\",\"States\":{\"Pass\":{\"Type\":\"Pass\",\"End\":true}}},\"ItemReader\":{\"Resource\":\"arn:aws:states:::s3:getObject\",\"ReaderConfig\":{\"InputType\":\"CSV\",\"CSVHeaderLocation\":\"FIRST_ROW\"},\"Parameters\":{\"Bucket\":\"",
+                          "{\"StartAt\":\"DistributedMap\",\"States\":{\"DistributedMap\":{\"Type\":\"Map\",\"End\":true,\"ItemProcessor\":{\"ProcessorConfig\":{\"Mode\":\"DISTRIBUTED\",\"ExecutionType\":\"STANDARD\"},\"StartAt\":\"Pass\",\"States\":{\"Pass\":{\"Type\":\"Pass\",\"End\":true}}},\"ItemReader\":{\"Resource\":\"arn:",
+                          {
+                            "Ref": "AWS::Partition"
+                          },
+                          ":states:::s3:getObject\",\"ReaderConfig\":{\"InputType\":\"CSV\",\"CSVHeaderLocation\":\"FIRST_ROW\"},\"Parameters\":{\"Bucket\":\"",
                           {
                             "Ref": "Bucket83908E77"
                           },
-                          "\",\"Key\":\"my-key.csv\"}},\"ResultWriter\":{\"Resource\":\"arn:aws:states:::s3:putObject\",\"Parameters\":{\"Bucket\":\"",
+                          "\",\"Key\":\"my-key.csv\"}},\"ResultWriter\":{\"Resource\":\"arn:",
+                          {
+                            "Ref": "AWS::Partition"
+                          },
+                          ":states:::s3:putObject\",\"Parameters\":{\"Bucket\":\"",
                           {
                             "Ref": "Bucket83908E77"
                           },
@@ -407,7 +419,7 @@
             },
             "constructInfo": {
               "fqn": "constructs.Construct",
-              "version": "10.2.9"
+              "version": "10.2.26"
             }
           },
           "BootstrapVersion": {
@@ -445,7 +457,7 @@
                 "path": "DistributedMap/DefaultTest/Default",
                 "constructInfo": {
                   "fqn": "constructs.Construct",
-                  "version": "10.2.9"
+                  "version": "10.2.26"
                 }
               },
               "DeployAssert": {
@@ -465,7 +477,7 @@
                             "path": "DistributedMap/DefaultTest/DeployAssert/AwsApiCallStepFunctionsdescribeStateMachinec5cc0786542148808c24d8ebf111c7aa/SdkProvider/AssertionsProvider",
                             "constructInfo": {
                               "fqn": "constructs.Construct",
-                              "version": "10.2.9"
+                              "version": "10.2.26"
                             }
                           }
                         },
@@ -537,7 +549,7 @@
                     },
                     "constructInfo": {
                       "fqn": "constructs.Construct",
-                      "version": "10.2.9"
+                      "version": "10.2.26"
                     }
                   },
                   "AwsApiCallS3putObject9f7ed865afc47100b3c2a9fea2cf51ee": {
@@ -553,7 +565,7 @@
                             "path": "DistributedMap/DefaultTest/DeployAssert/AwsApiCallS3putObject9f7ed865afc47100b3c2a9fea2cf51ee/SdkProvider/AssertionsProvider",
                             "constructInfo": {
                               "fqn": "constructs.Construct",
-                              "version": "10.2.9"
+                              "version": "10.2.26"
                             }
                           }
                         },
@@ -599,7 +611,7 @@
                             "path": "DistributedMap/DefaultTest/DeployAssert/AwsApiCallStepFunctionsstartExecutionc5cc0786542148808c24d8ebf111c7aa/SdkProvider/AssertionsProvider",
                             "constructInfo": {
                               "fqn": "constructs.Construct",
-                              "version": "10.2.9"
+                              "version": "10.2.26"
                             }
                           }
                         },
@@ -645,7 +657,7 @@
                             "path": "DistributedMap/DefaultTest/DeployAssert/AwsApiCallStepFunctionsdescribeExecution7e7cfa5e3c60aef760b5fbff9448d868/SdkProvider/AssertionsProvider",
                             "constructInfo": {
                               "fqn": "constructs.Construct",
-                              "version": "10.2.9"
+                              "version": "10.2.26"
                             }
                           }
                         },
@@ -725,7 +737,7 @@
         "path": "Tree",
         "constructInfo": {
           "fqn": "constructs.Construct",
-          "version": "10.2.9"
+          "version": "10.2.26"
         }
       }
     },