fix(codepipeline-actions): use IBaseService instead of BaseService in EcsDeployActionProps

packages/@aws-cdk/aws-codepipeline-actions/lib/ecs/deploy-action.ts

@@ -39,7 +39,7 @@ export interface EcsDeployActionProps extends codepipeline.CommonAwsActionProps
   /**
    * The ECS Service to deploy.
    */
-  readonly service: ecs.BaseService;
+  readonly service: ecs.IService;
 }
 
 /**
@@ -94,7 +94,7 @@ export class EcsDeployAction extends Action {
 
     return {
       configuration: {
-        ClusterName: this.props.service.cluster.clusterName,
+        ClusterName: this.props.service.clusterName,
         ServiceName: this.props.service.serviceName,
         FileName: this.props.imageFile && this.props.imageFile.fileName,
       },

packages/@aws-cdk/aws-codepipeline-actions/test/ecs/test.ecs-deploy-action.ts

@@ -80,6 +80,21 @@ export = {
 
       test.done();
     },
+
+    'can be created just by serviceArn'(test: Test) {
+      const service = anyIService();
+      const artifact = new codepipeline.Artifact('Artifact');
+
+      test.doesNotThrow(() => {
+        new cpactions.EcsDeployAction({
+          actionName: 'ECS',
+          service,
+          imageFile: artifact.atPath('imageFile.json'),
+        });
+      });
+
+      test.done();
+    },
   },
 };
 
@@ -98,3 +113,11 @@ function anyEcsService(): ecs.FargateService {
     taskDefinition,
   });
 }
+
+function anyIService(): ecs.IService {
+  const stack = new cdk.Stack();
+  return ecs.FargateService.fromFargateServiceAttributes(stack, 'FargateService', {
+    serviceName: 'serviceName',
+    clusterName: 'clusterName',
+  });
+}

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

@@ -17,11 +17,15 @@ import { ScalableTaskCount } from './scalable-task-count';
  */
 export interface IService extends IResource {
   /**
-   * The Amazon Resource Name (ARN) of the service.
+   * The name of the cluster that hosts the service.
+   */
+  readonly clusterName: string;
+  /**
+   * The name of the service.
    *
    * @attribute
    */
-  readonly serviceArn: string;
+  readonly serviceName: string;
 }
 
 /**
@@ -258,6 +262,8 @@ export abstract class BaseService extends Resource
 
   /**
    * The Amazon Resource Name (ARN) of the service.
+   *
+   * @attribute
    */
   public readonly serviceArn: string;
 
@@ -277,6 +283,10 @@ export abstract class BaseService extends Resource
    * The cluster that hosts the service.
    */
   public readonly cluster: ICluster;
+  /**
+   * The cluster name that hosts the service.
+   */
+  public readonly clusterName: string;
 
   /**
    * The details of the AWS Cloud Map service.
@@ -345,6 +355,7 @@ export abstract class BaseService extends Resource
     this.serviceName = this.getResourceNameAttribute(this.resource.attrName);
 
     this.cluster = props.cluster;
+    this.clusterName = props.cluster.clusterName;
 
     if (props.cloudMapOptions) {
       this.enableCloudMap(props.cloudMapOptions);

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

@@ -87,6 +87,20 @@ export interface IEc2Service extends IService {
 
 }
 
+/**
+ * The properties to import from the service using the EC2 launch type.
+ */
+export interface Ec2ServiceAttributes {
+  /**
+   * The name of the cluster that hosts the service.
+   */
+  readonly clusterName: string;
+  /**
+   * The name of the service.
+   */
+  readonly serviceName: string;
+}
+
 /**
  * This creates a service using the EC2 launch type on an ECS cluster.
  *
@@ -95,11 +109,12 @@ export interface IEc2Service extends IService {
 export class Ec2Service extends BaseService implements IEc2Service {
 
   /**
-   * Imports from the specified service ARN.
+   * Imports from the specified service attrributes.
    */
-  public static fromEc2ServiceArn(scope: Construct, id: string, ec2ServiceArn: string): IEc2Service {
+  public static fromEc2ServiceAttributes(scope: Construct, id: string, attrs: Ec2ServiceAttributes): IEc2Service {
     class Import extends Resource implements IEc2Service {
-      public readonly serviceArn = ec2ServiceArn;
+      public readonly serviceName = attrs.serviceName;
+      public readonly clusterName = attrs.clusterName;
     }
     return new Import(scope, id);
   }

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

@@ -65,6 +65,20 @@ export interface IFargateService extends IService {
 
 }
 
+/**
+ * The properties to import from the service using the Fargate launch type.
+ */
+export interface FargateServiceAttributes {
+  /**
+   * The name of the cluster that hosts the service.
+   */
+  readonly clusterName: string;
+  /**
+   * The name of the service.
+   */
+  readonly serviceName: string;
+}
+
 /**
  * This creates a service using the Fargate launch type on an ECS cluster.
  *
@@ -73,11 +87,12 @@ export interface IFargateService extends IService {
 export class FargateService extends BaseService implements IFargateService {
 
   /**
-   * Import a task definition from the specified task definition ARN.
+   * Imports from the specified service attrributes.
    */
-  public static fromFargateServiceArn(scope: cdk.Construct, id: string, fargateServiceArn: string): IFargateService {
+  public static fromFargateServiceAttributes(scope: cdk.Construct, id: string, attrs: FargateServiceAttributes): IFargateService {
     class Import extends cdk.Resource implements IFargateService {
-      public readonly serviceArn = fargateServiceArn;
+      public readonly serviceName = attrs.serviceName;
+      public readonly clusterName = attrs.clusterName;
     }
     return new Import(scope, id);
   }