Merge branch 'main' into QustodioPablo/fix-stack-name-too-long

aws · Apr 11, 2023 · 729f23e · 729f23e
2 parents 5dd29bc + 0f92c7a
commit 729f23e
Show file tree

Hide file tree

Showing 14 changed files with 929 additions and 242 deletions.
diff --git a/...expression.js.snapshot/EvaluateExpressionIntegDefaultTestDeployAssert03097648.assets.json b/...expression.js.snapshot/EvaluateExpressionIntegDefaultTestDeployAssert03097648.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "31.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "EvaluateExpressionIntegDefaultTestDeployAssert03097648.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...pression.js.snapshot/EvaluateExpressionIntegDefaultTestDeployAssert03097648.template.json b/...pression.js.snapshot/EvaluateExpressionIntegDefaultTestDeployAssert03097648.template.json
@@ -0,0 +1,36 @@
+{
+ "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/...pshot/aws-stepfunctions-integ.assets.json → ...sfn-evaluate-expression-integ.assets.json b/...pshot/aws-stepfunctions-integ.assets.json → ...sfn-evaluate-expression-integ.assets.json
@@ -1,5 +1,5 @@
 {
-  "version": "30.0.0",
+  "version": "31.0.0",
   "files": {
     "4a61519d8f4df8206cfaff4e519462aa81beab9213c3642a1353cd679c697638": {
       "source": {
@@ -14,15 +14,15 @@
         }
       }
     },
-    "1b823cdecb2e1d73ee259ce6b882ed1b43165a43538d16179b9a70b5488e04d8": {
+    "da57437b12d804aeee84617a389b3a9d6f1067b93e2e4cccba4c3ef0974b21ca": {
       "source": {
-        "path": "aws-stepfunctions-integ.template.json",
+        "path": "cdk-sfn-evaluate-expression-integ.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "1b823cdecb2e1d73ee259ce6b882ed1b43165a43538d16179b9a70b5488e04d8.json",
+          "objectKey": "da57437b12d804aeee84617a389b3a9d6f1067b93e2e4cccba4c3ef0974b21ca.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...hot/aws-stepfunctions-integ.template.json → ...n-evaluate-expression-integ.template.json b/...hot/aws-stepfunctions-integ.template.json → ...n-evaluate-expression-integ.template.json
@@ -53,6 +53,112 @@
     "Evalda2d1181604e4a4586941a6abd7fe42dServiceRoleED144118"
    ]
   },
+  "Eval2a430b68eb4b40269232ee39b71c1db8ServiceRole2388DF3C": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "lambda.amazonaws.com"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "ManagedPolicyArns": [
+     {
+      "Fn::Join": [
+       "",
+       [
+        "arn:",
+        {
+         "Ref": "AWS::Partition"
+        },
+        ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "Eval2a430b68eb4b40269232ee39b71c1db8D6CA9948": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "S3Bucket": {
+      "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+     },
+     "S3Key": "4a61519d8f4df8206cfaff4e519462aa81beab9213c3642a1353cd679c697638.zip"
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "Eval2a430b68eb4b40269232ee39b71c1db8ServiceRole2388DF3C",
+      "Arn"
+     ]
+    },
+    "Handler": "index.handler",
+    "Runtime": "nodejs16.x"
+   },
+   "DependsOn": [
+    "Eval2a430b68eb4b40269232ee39b71c1db8ServiceRole2388DF3C"
+   ]
+  },
+  "Eval078d40d3fb4e4d5394a79c46fc11fe02ServiceRoleDD279E15": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "lambda.amazonaws.com"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "ManagedPolicyArns": [
+     {
+      "Fn::Join": [
+       "",
+       [
+        "arn:",
+        {
+         "Ref": "AWS::Partition"
+        },
+        ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "Eval078d40d3fb4e4d5394a79c46fc11fe029D0ED2B4": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "S3Bucket": {
+      "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+     },
+     "S3Key": "4a61519d8f4df8206cfaff4e519462aa81beab9213c3642a1353cd679c697638.zip"
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "Eval078d40d3fb4e4d5394a79c46fc11fe02ServiceRoleDD279E15",
+      "Arn"
+     ]
+    },
+    "Handler": "index.handler",
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "Eval078d40d3fb4e4d5394a79c46fc11fe02ServiceRoleDD279E15"
+   ]
+  },
   "StateMachineRoleB840431D": {
    "Type": "AWS::IAM::Role",
    "Properties": {
@@ -79,12 +185,52 @@
        "Action": "lambda:InvokeFunction",
        "Effect": "Allow",
        "Resource": [
+        {
+         "Fn::GetAtt": [
+          "Eval078d40d3fb4e4d5394a79c46fc11fe029D0ED2B4",
+          "Arn"
+         ]
+        },
+        {
+         "Fn::GetAtt": [
+          "Eval2a430b68eb4b40269232ee39b71c1db8D6CA9948",
+          "Arn"
+         ]
+        },
         {
          "Fn::GetAtt": [
           "Evalda2d1181604e4a4586941a6abd7fe42dF371675D",
           "Arn"
          ]
         },
+        {
+         "Fn::Join": [
+          "",
+          [
+           {
+            "Fn::GetAtt": [
+             "Eval078d40d3fb4e4d5394a79c46fc11fe029D0ED2B4",
+             "Arn"
+            ]
+           },
+           ":*"
+          ]
+         ]
+        },
+        {
+         "Fn::Join": [
+          "",
+          [
+           {
+            "Fn::GetAtt": [
+             "Eval2a430b68eb4b40269232ee39b71c1db8D6CA9948",
+             "Arn"
+            ]
+           },
+           ":*"
+          ]
+         ]
+        },
         {
          "Fn::Join": [
           "",
@@ -135,14 +281,14 @@
        "\",\"Parameters\":{\"expression\":\"$.a + $.b\",\"expressionAttributeValues\":{\"$.a.$\":\"$.a\",\"$.b.$\":\"$.b\"}}},\"Multiply\":{\"Next\":\"Wait\",\"Type\":\"Task\",\"ResultPath\":\"$.d\",\"Resource\":\"",
        {
         "Fn::GetAtt": [
-         "Evalda2d1181604e4a4586941a6abd7fe42dF371675D",
+         "Eval2a430b68eb4b40269232ee39b71c1db8D6CA9948",
          "Arn"
         ]
        },
        "\",\"Parameters\":{\"expression\":\"$.c * 2\",\"expressionAttributeValues\":{\"$.c.$\":\"$.c\"}}},\"Wait\":{\"Type\":\"Wait\",\"SecondsPath\":\"$.d\",\"Next\":\"Now\"},\"Now\":{\"End\":true,\"Type\":\"Task\",\"ResultPath\":\"$.now\",\"Resource\":\"",
        {
         "Fn::GetAtt": [
-         "Evalda2d1181604e4a4586941a6abd7fe42dF371675D",
+         "Eval078d40d3fb4e4d5394a79c46fc11fe029D0ED2B4",
          "Arn"
         ]
        },

diff --git a/...ork-integ/test/aws-stepfunctions-tasks/test/integ.evaluate-expression.js.snapshot/cdk.out b/...ork-integ/test/aws-stepfunctions-tasks/test/integ.evaluate-expression.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"30.0.0"}
+{"version":"31.0.0"}
diff --git a/...-integ/test/aws-stepfunctions-tasks/test/integ.evaluate-expression.js.snapshot/integ.json b/...-integ/test/aws-stepfunctions-tasks/test/integ.evaluate-expression.js.snapshot/integ.json
@@ -1,14 +1,12 @@
 {
-  "version": "30.0.0",
+  "version": "31.0.0",
   "testCases": {
-    "integ.evaluate-expression": {
+    "EvaluateExpressionInteg/DefaultTest": {
       "stacks": [
-        "aws-stepfunctions-integ"
+        "cdk-sfn-evaluate-expression-integ"
       ],
-      "diffAssets": false,
-      "stackUpdateWorkflow": true
+      "assertionStack": "EvaluateExpressionInteg/DefaultTest/DeployAssert",
+      "assertionStackName": "EvaluateExpressionIntegDefaultTestDeployAssert03097648"
     }
-  },
-  "synthContext": {},
-  "enableLookups": false
+  }
 }