Skip to content

Commit ead8e5f

Browse files
committed
address CR feedback
1 parent f20aeef commit ead8e5f

File tree

4 files changed

+9
-16
lines changed

4 files changed

+9
-16
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-ecs/test/base/integ.blue-green-deployment-strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ const target = service.loadBalancerTarget({
131131
containerName: 'nginx',
132132
containerPort: 80,
133133
protocol: ecs.Protocol.TCP,
134-
}, new ecs.AlternateTarget({
134+
}, new ecs.AlternateTarget('LBAlternateOptions', {
135135
alternateTargetGroup: greenTargetGroup,
136136
productionListener: ecs.ListenerRuleConfiguration.applicationListenerRule(prodListenerRule),
137137
}));

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ export interface AlternateTargetOptions {
108108
* Properties for AlternateTarget configuration
109109
*/
110110
export interface AlternateTargetProps extends AlternateTargetOptions {
111-
/**
112-
* Id for alternate target options
113-
* @default - none
114-
*/
115-
readonly id?: string;
116-
117111
/**
118112
* The alternate target group
119113
*/
@@ -129,7 +123,7 @@ export interface AlternateTargetProps extends AlternateTargetOptions {
129123
* Configuration for alternate target groups used in blue/green deployments with load balancers
130124
*/
131125
export class AlternateTarget implements IAlternateTarget {
132-
constructor(private readonly props: AlternateTargetProps) {}
126+
constructor(private readonly id: string, private readonly props: AlternateTargetProps) { }
133127

134128
/**
135129
* Bind this configuration to a service
@@ -144,7 +138,7 @@ export class AlternateTarget implements IAlternateTarget {
144138
resources.push(this.props.testListener._listenerArn);
145139
}
146140

147-
const roleId = this.props.id? `${this.props.id}Role`: 'LBAlternateOptionsRole';
141+
const roleId = `${this.id}Role`;
148142
const role = this.props.role ?? new iam.Role(scope, roleId, {
149143
assumedBy: new iam.ServicePrincipal('ecs.amazonaws.com'),
150144
managedPolicies: [

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,14 +1285,13 @@ export abstract class BaseService extends Resource
12851285
const self = this;
12861286
const target = this.taskDefinition._validateTarget(options);
12871287
const connections = self.connections;
1288-
const alternateOption = alternateOptions;
12891288
return {
12901289
attachToApplicationTargetGroup(targetGroup: elbv2.ApplicationTargetGroup): elbv2.LoadBalancerTargetProps {
12911290
targetGroup.registerConnectable(self, self.taskDefinition._portRangeFromPortMapping(target.portMapping));
1292-
return self.attachToELBv2(targetGroup, target.containerName, target.portMapping.containerPort!, alternateOption);
1291+
return self.attachToELBv2(targetGroup, target.containerName, target.portMapping.containerPort!, alternateOptions);
12931292
},
12941293
attachToNetworkTargetGroup(targetGroup: elbv2.NetworkTargetGroup): elbv2.LoadBalancerTargetProps {
1295-
return self.attachToELBv2(targetGroup, target.containerName, target.portMapping.containerPort!, alternateOption);
1294+
return self.attachToELBv2(targetGroup, target.containerName, target.portMapping.containerPort!, alternateOptions);
12961295
},
12971296
connections,
12981297
attachToClassicLB(loadBalancer: elb.LoadBalancer): void {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('AlternateTarget', () => {
6969
});
7070

7171
// WHEN
72-
const alternateTarget = new ecs.AlternateTarget({
72+
const alternateTarget = new ecs.AlternateTarget('GreenTG', {
7373
alternateTargetGroup: greenTargetGroup,
7474
productionListener: ecs.ListenerRuleConfiguration.applicationListenerRule(prodRule),
7575
});
@@ -111,7 +111,7 @@ describe('AlternateTarget', () => {
111111
});
112112

113113
// WHEN
114-
const alternateTarget = new ecs.AlternateTarget({
114+
const alternateTarget = new ecs.AlternateTarget('GreenTG', {
115115
alternateTargetGroup: greenTargetGroup,
116116
productionListener: ecs.ListenerRuleConfiguration.applicationListenerRule(prodRule),
117117
testListener: ecs.ListenerRuleConfiguration.applicationListenerRule(testRule),
@@ -163,7 +163,7 @@ describe('AlternateTarget', () => {
163163
});
164164

165165
// WHEN
166-
const alternateTarget = new ecs.AlternateTarget({
166+
const alternateTarget = new ecs.AlternateTarget('GreenTG', {
167167
alternateTargetGroup: greenTargetGroup,
168168
productionListener: ecs.ListenerRuleConfiguration.applicationListenerRule(prodRule),
169169
role: customRole,
@@ -230,7 +230,7 @@ describe('AlternateTarget', () => {
230230
});
231231

232232
// WHEN
233-
const alternateTarget = new ecs.AlternateTarget({
233+
const alternateTarget = new ecs.AlternateTarget('GreenTG', {
234234
alternateTargetGroup: nlbGreenTargetGroup,
235235
productionListener: ecs.ListenerRuleConfiguration.networkListener(nlbListener),
236236
});

0 commit comments

Comments
 (0)