add cluster region

aws · Feb 29, 2024 · 6d4f84d · 6d4f84d
1 parent 519bc82
commit 6d4f84d
Show file tree

Hide file tree

Showing 21 changed files with 76 additions and 28 deletions.
diff --git a/...-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/aws-ecs-integ-ecs.assets.json b/...-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/aws-ecs-integ-ecs.assets.json
diff --git a/...cs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/aws-ecs-integ-ecs.template.json b/...cs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/aws-ecs-integ-ecs.template.json
@@ -918,7 +918,11 @@
         "Fn::Join": [
          "",
          [
-          "arn:aws:ecs:*:*:task/",
+          "arn:aws:ecs:",
+          {
+           "Ref": "AWS::Region"
+          },
+          ":*:task/",
           {
            "Ref": "EcsCluster97242B84"
           },

diff --git a/...k-integ/test/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/manifest.json b/...k-integ/test/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/manifest.json
diff --git a/...ework-integ/test/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/tree.json b/...ework-integ/test/aws-ecs-patterns/test/ec2/integ.scheduled-ecs-task.js.snapshot/tree.json
diff --git a/...m-application-load-balanced-fargate-service.js.snapshot/aws-ecs-runtime-integ.assets.json b/...m-application-load-balanced-fargate-service.js.snapshot/aws-ecs-runtime-integ.assets.json
diff --git a/...application-load-balanced-fargate-service.js.snapshot/aws-ecs-runtime-integ.template.json b/...application-load-balanced-fargate-service.js.snapshot/aws-ecs-runtime-integ.template.json
@@ -468,7 +468,11 @@
         "Fn::Join": [
          "",
          [
-          "arn:aws:ecs:*:*:task/",
+          "arn:aws:ecs:",
+          {
+           "Ref": "AWS::Region"
+          },
+          ":*:task/",
           {
            "Ref": "FargateCluster7CCD5F93"
           },

diff --git a/...nteg.runtime-platform-application-load-balanced-fargate-service.js.snapshot/manifest.json b/...nteg.runtime-platform-application-load-balanced-fargate-service.js.snapshot/manifest.json
diff --git a/...te/integ.runtime-platform-application-load-balanced-fargate-service.js.snapshot/tree.json b/...te/integ.runtime-platform-application-load-balanced-fargate-service.js.snapshot/tree.json
diff --git a/...terns/test/fargate/integ.scheduled-fargate-task.js.snapshot/aws-fargate-integ.assets.json b/...terns/test/fargate/integ.scheduled-fargate-task.js.snapshot/aws-fargate-integ.assets.json
diff --git a/...rns/test/fargate/integ.scheduled-fargate-task.js.snapshot/aws-fargate-integ.template.json b/...rns/test/fargate/integ.scheduled-fargate-task.js.snapshot/aws-fargate-integ.template.json
@@ -475,7 +475,11 @@
         "Fn::Join": [
          "",
          [
-          "arn:aws:ecs:*:*:task/",
+          "arn:aws:ecs:",
+          {
+           "Ref": "AWS::Region"
+          },
+          ":*:task/",
           {
            "Ref": "FargateCluster7CCD5F93"
           },

diff --git a/...test/aws-ecs-patterns/test/fargate/integ.scheduled-fargate-task.js.snapshot/manifest.json b/...test/aws-ecs-patterns/test/fargate/integ.scheduled-fargate-task.js.snapshot/manifest.json
diff --git a/...teg/test/aws-ecs-patterns/test/fargate/integ.scheduled-fargate-task.js.snapshot/tree.json b/...teg/test/aws-ecs-patterns/test/fargate/integ.scheduled-fargate-task.js.snapshot/tree.json
diff --git a/...ws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/aws-ecs-integ-ecs.assets.json b/...ws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/aws-ecs-integ-ecs.assets.json
diff --git a/...-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/aws-ecs-integ-ecs.template.json b/...-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/aws-ecs-integ-ecs.template.json
@@ -955,7 +955,11 @@
         "Fn::Join": [
          "",
          [
-          "arn:aws:ecs:*:*:task/",
+          "arn:aws:ecs:",
+          {
+           "Ref": "AWS::Region"
+          },
+          ":*:task/",
           {
            "Ref": "EcsCluster97242B84"
           },

diff --git a/...ork-integ/test/aws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/manifest.json b/...ork-integ/test/aws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/manifest.json
diff --git a/...amework-integ/test/aws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/tree.json b/...amework-integ/test/aws-events-targets/test/ecs/integ.event-ec2-task.js.snapshot/tree.json
diff --git a/...s-targets/test/ecs/integ.event-fargate-task.js.snapshot/aws-ecs-integ-fargate.assets.json b/...s-targets/test/ecs/integ.event-fargate-task.js.snapshot/aws-ecs-integ-fargate.assets.json
diff --git a/...targets/test/ecs/integ.event-fargate-task.js.snapshot/aws-ecs-integ-fargate.template.json b/...targets/test/ecs/integ.event-fargate-task.js.snapshot/aws-ecs-integ-fargate.template.json
@@ -456,7 +456,11 @@
         "Fn::Join": [
          "",
          [
-          "arn:aws:ecs:*:*:task/",
+          "arn:aws:ecs:",
+          {
+           "Ref": "AWS::Region"
+          },
+          ":*:task/",
           {
            "Ref": "EcsCluster97242B84"
           },
@@ -706,7 +710,11 @@
         "Fn::Join": [
          "",
          [
-          "arn:aws:ecs:*:*:task/",
+          "arn:aws:ecs:",
+          {
+           "Ref": "AWS::Region"
+          },
+          ":*:task/",
           {
            "Ref": "EcsCluster97242B84"
           },

diff --git a/...integ/test/aws-events-targets/test/ecs/integ.event-fargate-task.js.snapshot/manifest.json b/...integ/test/aws-events-targets/test/ecs/integ.event-fargate-task.js.snapshot/manifest.json
diff --git a/...ork-integ/test/aws-events-targets/test/ecs/integ.event-fargate-task.js.snapshot/tree.json b/...ork-integ/test/aws-events-targets/test/ecs/integ.event-fargate-task.js.snapshot/tree.json
diff --git a/packages/aws-cdk-lib/aws-events-targets/lib/ecs-task.ts b/packages/aws-cdk-lib/aws-events-targets/lib/ecs-task.ts
@@ -288,7 +288,7 @@ export class EcsTask implements events.IRuleTarget {
       new iam.PolicyStatement({
         actions: ['ecs:TagResource'],
         // eslint-disable-next-line @aws-cdk/no-literal-partition
-        resources: [`arn:aws:ecs:*:*:task/${this.cluster.clusterName}/*`],
+        resources: [`arn:aws:ecs:${this.cluster.env.region}:*:task/${this.cluster.clusterName}/*`],
       }),
     ];