test: add unit test

aws · Dec 15, 2023 · d1d7629 · d1d7629
1 parent bc719de
commit d1d7629
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/packages/aws-cdk-lib/aws-ecs/lib/cluster.ts b/packages/aws-cdk-lib/aws-ecs/lib/cluster.ts
@@ -590,7 +590,7 @@ export class Cluster extends Resource implements ICluster {
    * @param keyPattern Task id pattern
    */
   public arnForTasks(keyPattern: string): string {
-    return this.clusterArn.replace(/cluster\/(.*)$/, `task/$1/${keyPattern}`);
+    return `arn:${Stack.of(this).partition}:ecs:${Stack.of(this).region}:${Stack.of(this).account}:task/${this.clusterName}/${keyPattern}`;
   }
 
   private configureWindowsAutoScalingGroup(autoScalingGroup: autoscaling.AutoScalingGroup, options: AddAutoScalingGroupCapacityOptions = {}) {

diff --git a/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts b/packages/aws-cdk-lib/aws-ecs/test/cluster.test.ts
@@ -2,6 +2,7 @@ import { testDeprecated } from '@aws-cdk/cdk-build-tools';
 import { Match, Template } from '../../assertions';
 import * as autoscaling from '../../aws-autoscaling';
 import * as ec2 from '../../aws-ec2';
+import * as iam from '../../aws-iam';
 import * as kms from '../../aws-kms';
 import * as logs from '../../aws-logs';
 import * as s3 from '../../aws-s3';
@@ -1092,10 +1093,34 @@ describe('cluster', () => {
     const taskIdPattern = '*';
 
     // WHEN
-    const taskArn = cluster.arnForTasks(taskIdPattern);
+    const policyStatement = new iam.PolicyStatement({
+      resources: [cluster.arnForTasks(taskIdPattern)],
+      actions: ['ecs:RunTask'],
+      principals: [new iam.ServicePrincipal('ecs.amazonaws.com')],
+    });
 
     // THEN
-    expect(taskArn).toEqual(`arn:${stack.partition}:ecs:${stack.region}:${stack.account}:task/${cluster.clusterName}/${taskIdPattern}`);
+    expect(stack.resolve(policyStatement.toStatementJson())).toEqual({
+      Action: 'ecs:RunTask',
+      Effect: 'Allow',
+      Principal: { Service: 'ecs.amazonaws.com' },
+      Resource: {
+        'Fn::Join': [
+          '',
+          [
+            'arn:',
+            { Ref: 'AWS::Partition' },
+            ':ecs:',
+            { Ref: 'AWS::Region' },
+            ':',
+            { Ref: 'AWS::AccountId' },
+            ':task/',
+            { Ref: 'EcsCluster97242B84' },
+            `/${taskIdPattern}`,
+          ],
+        ],
+      },
+    });
   });
 
   /*