From 6aff806fd0c18ee60099154f978ff6d1965a1489 Mon Sep 17 00:00:00 2001
From: Xia Zhao <xazhao@amazon.com>
Date: Thu, 18 Jul 2024 23:20:42 -0700
Subject: [PATCH] fix(ecs): fromServiceArnWithCluster not accepting value from
 SSM Parameter string

---
 .../aws-ecs/lib/base/base-service.ts          | 24 ++++++++++++-------
 .../aws-ecs/test/base-service.test.ts         |  7 +++++-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts b/packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts
index 2cbea1c5eb0b4..89fc0d7434f41 100644
--- a/packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts
+++ b/packages/aws-cdk-lib/aws-ecs/lib/base/base-service.ts
@@ -19,6 +19,8 @@ import {
   ArnFormat,
   FeatureFlags,
   Token,
+  Arn,
+  Fn,
 } from '../../../core';
 import * as cxapi from '../../../cx-api';
 import { RegionInfo } from '../../../region-info';
@@ -516,16 +518,20 @@ export abstract class BaseService extends Resource
   public static fromServiceArnWithCluster(scope: Construct, id: string, serviceArn: string): IBaseService {
     const stack = Stack.of(scope);
     const arn = stack.splitArn(serviceArn, ArnFormat.SLASH_RESOURCE_NAME);
-    const resourceName = arn.resourceName;
-    if (!resourceName) {
-      throw new Error(`Missing resource Name from service ARN: ${serviceArn}`);
-    }
-    const resourceNameParts = resourceName.split('/');
-    if (resourceNameParts.length !== 2) {
-      throw new Error(`resource name ${resourceName} from service ARN: ${serviceArn} is not using the ARN cluster format`);
+    const resourceName = Arn.extractResourceName(serviceArn, 'service');
+    let clusterName: string;
+    let serviceName: string;
+    if (Token.isUnresolved(resourceName)) {
+      clusterName = Fn.select(0, Fn.split('/', resourceName));
+      serviceName = Fn.select(1, Fn.split('/', resourceName));
+    } else {
+      const resourceNameParts = resourceName.split('/');
+      if (resourceNameParts.length !== 2) {
+        throw new Error(`resource name ${resourceName} from service ARN: ${serviceArn} is not using the ARN cluster format`);
+      }
+      clusterName = resourceNameParts[0];
+      serviceName = resourceNameParts[1];
     }
-    const clusterName = resourceNameParts[0];
-    const serviceName = resourceNameParts[1];
 
     const clusterArn = Stack.of(scope).formatArn({
       partition: arn.partition,
diff --git a/packages/aws-cdk-lib/aws-ecs/test/base-service.test.ts b/packages/aws-cdk-lib/aws-ecs/test/base-service.test.ts
index d670e8fbc8c32..9ef3b54a68c43 100644
--- a/packages/aws-cdk-lib/aws-ecs/test/base-service.test.ts
+++ b/packages/aws-cdk-lib/aws-ecs/test/base-service.test.ts
@@ -38,7 +38,7 @@ describe('When import an ECS Service', () => {
   test('throws an expection if no resourceName provided on fromServiceArnWithCluster', () => {
     expect(() => {
       ecs.BaseService.fromServiceArnWithCluster(stack, 'Service', 'arn:aws:ecs:service-region:service-account:service');
-    }).toThrowError(/Missing resource Name from service ARN/);
+    }).toThrowError(/Expected resource name in ARN, didn't find one: 'arn:aws:ecs:service-region:service-account:service'/);
   });
 
   test('throws an expection if not using cluster arn format on fromServiceArnWithCluster', () => {
@@ -47,6 +47,11 @@ describe('When import an ECS Service', () => {
     }).toThrowError(/is not using the ARN cluster format/);
   });
 
+  test('skip validation for tokenized values', () => {
+    expect(() => ecs.BaseService.fromServiceArnWithCluster(stack, 'Service',
+      cdk.Lazy.string({ produce: () => 'arn:aws:ecs:service-region:service-account:service' }))).not.toThrow();
+  });
+
   test('should add a dependency on task role', () => {
     // GIVEN
     const vpc = new ec2.Vpc(stack, 'Vpc');