Abstract renderRepositoryCredentials() func

aws · Mar 8, 2019 · 7877598 · 7877598
1 parent 6ede80e
commit 7877598
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/packages/@aws-cdk/aws-ecs/lib/container-definition.ts b/packages/@aws-cdk/aws-ecs/lib/container-definition.ts
@@ -379,7 +379,7 @@ export class ContainerDefinition extends cdk.Construct {
       portMappings: this.portMappings.map(renderPortMapping),
       privileged: this.props.privileged,
       readonlyRootFilesystem: this.props.readonlyRootFilesystem,
-      repositoryCredentials: this.props.image.credentials && this.props.image.renderRepositoryCredentials(),
+      repositoryCredentials: this.props.image.renderRepositoryCredentials(),
       ulimits: this.ulimits.map(renderUlimit),
       user: this.props.user,
       volumesFrom: this.volumesFrom.map(renderVolumeFrom),

diff --git a/packages/@aws-cdk/aws-ecs/lib/container-image.ts b/packages/@aws-cdk/aws-ecs/lib/container-image.ts
@@ -47,7 +47,7 @@ export abstract class ContainerImage {
   /**
    * Optional credentials for a private image registry
    */
-  public abstract readonly credentials?: RepositoryCreds;
+  protected abstract readonly credentials?: RepositoryCreds;
 
   /**
    * Called when the image is used by a ContainerDefinition
@@ -57,11 +57,7 @@ export abstract class ContainerImage {
   /**
    * Render the Repository credentials to the CloudFormation object
    */
-  public renderRepositoryCredentials(): CfnTaskDefinition.RepositoryCredentialsProperty {
-    return {
-        credentialsParameter: this.credentials ? this.credentials.secret.secretArn : ''
-    };
-  }
+  public abstract renderRepositoryCredentials(): CfnTaskDefinition.RepositoryCredentialsProperty | undefined;
 }
 
 import { AssetImage, AssetImageProps } from './images/asset-image';

diff --git a/packages/@aws-cdk/aws-ecs/lib/images/asset-image.ts b/packages/@aws-cdk/aws-ecs/lib/images/asset-image.ts
@@ -14,7 +14,7 @@ export interface AssetImageProps {
  * An image that will be built at synthesis time
  */
 export class AssetImage extends ContainerImage {
-  public readonly credentials?: RepositoryCreds;
+  protected readonly credentials?: RepositoryCreds;
   private readonly asset: DockerImageAsset;
 
   constructor(scope: cdk.Construct, id: string, props: AssetImageProps) {
@@ -26,6 +26,10 @@ export class AssetImage extends ContainerImage {
     this.asset.repository.grantPull(containerDefinition.taskDefinition.obtainExecutionRole());
   }
 
+  public renderRepositoryCredentials(): undefined {
+      return undefined;
+  }
+
   public get imageName() {
     return this.asset.imageUri;
   }

diff --git a/packages/@aws-cdk/aws-ecs/lib/images/ecr.ts b/packages/@aws-cdk/aws-ecs/lib/images/ecr.ts
@@ -7,7 +7,7 @@ import { ContainerImage, RepositoryCreds } from '../container-image';
  */
 export class EcrImage extends ContainerImage {
   public readonly imageName: string;
-  public readonly credentials?: RepositoryCreds;
+  protected readonly credentials?: RepositoryCreds;
   private readonly repository: ecr.IRepository;
 
   constructor(repository: ecr.IRepository, tag: string) {
@@ -19,4 +19,8 @@ export class EcrImage extends ContainerImage {
   public bind(containerDefinition: ContainerDefinition): void {
     this.repository.grantPull(containerDefinition.taskDefinition.obtainExecutionRole());
   }
+
+  public renderRepositoryCredentials(): undefined {
+    return undefined;
+  }
 }
diff --git a/packages/@aws-cdk/aws-ecs/lib/images/internet-hosted.ts b/packages/@aws-cdk/aws-ecs/lib/images/internet-hosted.ts
@@ -1,6 +1,7 @@
 import secretsmanager = require('@aws-cdk/aws-secretsmanager');
 import { ContainerDefinition } from "../container-definition";
 import { ContainerImage, RepositoryCreds } from "../container-image";
+import { CfnTaskDefinition } from '../ecs.generated';
 
 export interface InternetHostedImageProps {
     /**
@@ -14,7 +15,7 @@ export interface InternetHostedImageProps {
  */
 export class InternetHostedImage extends ContainerImage {
   public readonly imageName: string;
-  public readonly credentials?: RepositoryCreds;
+  protected readonly credentials?: RepositoryCreds;
 
   constructor(imageName: string, props: InternetHostedImageProps = {}) {
     super();
@@ -30,4 +31,11 @@ export class InternetHostedImage extends ContainerImage {
         this.credentials.secret.grantRead(containerDefinition.taskDefinition.obtainExecutionRole());
     }
   }
+
+  public renderRepositoryCredentials(): CfnTaskDefinition.RepositoryCredentialsProperty | undefined {
+    if (!this.credentials) { return undefined; }
+    return {
+        credentialsParameter: this.credentials.secret.secretArn
+    };
+  }
 }