wip

Author: pahud

packages/aws-cdk-lib/aws-ecs/lib/alternate-target-configuration.ts

@@ -8,71 +8,42 @@ import * as iam from '../../aws-iam';
 export abstract class ListenerRuleConfiguration {
   /**
    * Use an Application Load Balancer listener rule
-   * @param rule The application listener rule
-   * @param testRule Optional test listener rule for blue/green deployments
    */
-  public static applicationListenerRule(
-    rule: elbv2.ApplicationListenerRule,
-    testRule?: elbv2.ApplicationListenerRule,
-  ): ListenerRuleConfiguration {
-    return new ApplicationListenerRuleConfiguration(rule, testRule);
+  public static applicationListenerRule(rule: elbv2.ApplicationListenerRule): ListenerRuleConfiguration {
+    return new ApplicationListenerRuleConfiguration(rule);
   }
 
   /**
    * Use a Network Load Balancer listener
-   * @param listener The network listener
-   * @param testListener Optional test listener for blue/green deployments
    */
-  public static networkListener(
-    listener: elbv2.NetworkListener,
-    testListener?: elbv2.NetworkListener,
-  ): ListenerRuleConfiguration {
-    return new NetworkListenerConfiguration(listener, testListener);
+  public static networkListener(listener: elbv2.NetworkListener): ListenerRuleConfiguration {
+    return new NetworkListenerConfiguration(listener);
   }
 
   /**
    * @internal
    */
   public abstract readonly _listenerArn: string;
-
-  /**
-   * @internal
-   */
-  public abstract readonly _testListenerArn?: string;
 }
 
 class ApplicationListenerRuleConfiguration extends ListenerRuleConfiguration {
-  constructor(
-    private readonly rule: elbv2.ApplicationListenerRule,
-    private readonly testRule?: elbv2.ApplicationListenerRule,
-  ) {
+  constructor(private readonly rule: elbv2.ApplicationListenerRule) {
     super();
   }
 
   public get _listenerArn(): string {
     return this.rule.listenerRuleArn;
   }
-
-  public get _testListenerArn(): string | undefined {
-    return this.testRule?.listenerRuleArn;
-  }
 }
 
 class NetworkListenerConfiguration extends ListenerRuleConfiguration {
-  constructor(
-    private readonly listener: elbv2.NetworkListener,
-    private readonly testListener?: elbv2.NetworkListener,
-  ) {
+  constructor(private readonly listener: elbv2.NetworkListener) {
     super();
   }
 
   public get _listenerArn(): string {
     return this.listener.listenerArn;
   }
-
-  public get _testListenerArn(): string | undefined {
-    return this.testListener?.listenerArn;
-  }
 }
 
 /**
@@ -125,6 +96,12 @@ export interface AlternateTargetOptions {
    * @default - a new role will be created
    */
   readonly role?: iam.IRole;
+
+  /**
+   * The test listener configuration
+   * @default - none
+   */
+  readonly testListener?: ListenerRuleConfiguration;
 }
 
 /**
@@ -157,8 +134,8 @@ export class AlternateTarget implements IAlternateTarget {
       this.props.productionListener._listenerArn,
     ];
 
-    if (this.props.productionListener._testListenerArn) {
-      resources.push(this.props.productionListener._testListenerArn);
+    if (this.props.testListener) {
+      resources.push(this.props.testListener._listenerArn);
     }
 
     const roleId = `${this.id}Role`;
@@ -173,7 +150,7 @@ export class AlternateTarget implements IAlternateTarget {
       alternateTargetGroupArn: this.props.alternateTargetGroup.targetGroupArn,
       roleArn: role.roleArn,
       productionListenerRule: this.props.productionListener._listenerArn,
-      testListenerRule: this.props.productionListener._testListenerArn,
+      testListenerRule: this.props.testListener?._listenerArn,
     };
 
     return config;