fix(ecs): new arn format not supported (under feature flag)

packages/@aws-cdk/aws-ecs/lib/base/from-service-attributes.ts

@@ -1,8 +1,12 @@
-import { ArnFormat, Resource, Stack } from '@aws-cdk/core';
-import { Construct } from 'constructs';
+import { ArnFormat, FeatureFlags, Fn, Resource, Stack, Token } from '@aws-cdk/core';
+import { ECS_ARN_FORMAT_INCLUDES_CLUSTER_NAME } from '@aws-cdk/cx-api';
 import { IBaseService } from '../base/base-service';
 import { ICluster } from '../cluster';
 
+// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
+// eslint-disable-next-line no-duplicate-imports, import/order
+import { Construct } from '@aws-cdk/core';
+
 /**
  * The properties to import from the service.
  */
@@ -32,22 +36,25 @@ export function fromServiceAtrributes(scope: Construct, id: string, attrs: Servi
     throw new Error('You can only specify either serviceArn or serviceName.');
   }
 
+  const newArnFormat = FeatureFlags.of(scope).isEnabled(ECS_ARN_FORMAT_INCLUDES_CLUSTER_NAME);
+
   const stack = Stack.of(scope);
   let name: string;
   let arn: string;
   if (attrs.serviceName) {
     name = attrs.serviceName as string;
+    const resourceName = newArnFormat ? `${attrs.cluster.clusterName}/${attrs.serviceName}` : attrs.serviceName as string;
     arn = stack.formatArn({
       partition: stack.partition,
       service: 'ecs',
       region: stack.region,
       account: stack.account,
       resource: 'service',
-      resourceName: name,
+      resourceName,
     });
   } else {
     arn = attrs.serviceArn as string;
-    name = stack.splitArn(arn, ArnFormat.SLASH_RESOURCE_NAME).resourceName as string;
+    name = extractServiceNameFromArn(scope, arn);
   }
   class Import extends Resource implements IBaseService {
     public readonly serviceArn = arn;
@@ -58,3 +65,22 @@ export function fromServiceAtrributes(scope: Construct, id: string, attrs: Servi
     environmentFromArn: arn,
   });
 }
+
+export function extractServiceNameFromArn(scope: Construct, arn: string): string {
+  const newArnFormat = FeatureFlags.of(scope).isEnabled(ECS_ARN_FORMAT_INCLUDES_CLUSTER_NAME);
+  const stack = Stack.of(scope);
+
+  if (Token.isUnresolved(arn)) {
+    if (newArnFormat) {
+      const components = Fn.split(':', arn);
+      const lastComponents = Fn.split('/', Fn.select(5, components));
+      return Fn.select(2, lastComponents);
+    } else {
+      return stack.splitArn(arn, ArnFormat.SLASH_RESOURCE_NAME).resourceName as string;
+    }
+  } else {
+    const resourceName = stack.splitArn(arn, ArnFormat.SLASH_RESOURCE_NAME).resourceName as string;
+    const resourceNameSplit = resourceName.split('/');
+    return resourceNameSplit.length === 1 ? resourceName : resourceNameSplit[1];
+  }
+}

packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts

@@ -1,8 +1,8 @@
 import * as ec2 from '@aws-cdk/aws-ec2';
-import { ArnFormat, Lazy, Resource, Stack } from '@aws-cdk/core';
+import { Lazy, Resource, Stack } from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import { BaseService, BaseServiceOptions, DeploymentControllerType, IBaseService, IService, LaunchType } from '../base/base-service';
-import { fromServiceAtrributes } from '../base/from-service-attributes';
+import { fromServiceAtrributes, extractServiceNameFromArn } from '../base/from-service-attributes';
 import { NetworkMode, TaskDefinition } from '../base/task-definition';
 import { ICluster } from '../cluster';
 import { CfnService } from '../ecs.generated';
@@ -128,7 +128,7 @@ export class Ec2Service extends BaseService implements IEc2Service {
   public static fromEc2ServiceArn(scope: Construct, id: string, ec2ServiceArn: string): IEc2Service {
     class Import extends Resource implements IEc2Service {
       public readonly serviceArn = ec2ServiceArn;
-      public readonly serviceName = Stack.of(scope).splitArn(ec2ServiceArn, ArnFormat.SLASH_RESOURCE_NAME).resourceName as string;
+      public readonly serviceName = extractServiceNameFromArn(this, ec2ServiceArn);
     }
     return new Import(scope, id);
   }

packages/@aws-cdk/aws-ecs/lib/fargate/fargate-service.ts

@@ -1,9 +1,8 @@
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as cdk from '@aws-cdk/core';
-import { ArnFormat } from '@aws-cdk/core';
 import { Construct } from 'constructs';
 import { BaseService, BaseServiceOptions, DeploymentControllerType, IBaseService, IService, LaunchType } from '../base/base-service';
-import { fromServiceAtrributes } from '../base/from-service-attributes';
+import { fromServiceAtrributes, extractServiceNameFromArn } from '../base/from-service-attributes';
 import { TaskDefinition } from '../base/task-definition';
 import { ICluster } from '../cluster';
 
@@ -105,7 +104,7 @@ export class FargateService extends BaseService implements IFargateService {
   public static fromFargateServiceArn(scope: Construct, id: string, fargateServiceArn: string): IFargateService {
     class Import extends cdk.Resource implements IFargateService {
       public readonly serviceArn = fargateServiceArn;
-      public readonly serviceName = cdk.Stack.of(scope).splitArn(fargateServiceArn, ArnFormat.SLASH_RESOURCE_NAME).resourceName as string;
+      public readonly serviceName = extractServiceNameFromArn(this, fargateServiceArn);
     }
     return new Import(scope, id);
   }