Cherry-pick #4668 #4688 (#4689)

* feat(ECS): enable selection of listener rules (#4668) * feat(ECS): enable selection of listener rules Signed-off-by: moko-poi <mokopoi44@gmail.com> * Update pkg/app/piped/platformprovider/ecs/client.go Signed-off-by: moko-poi <mokopoi44@gmail.com> * Make actions plan preview handle timeout option (#4648) * Format and make tests pass in tool/actions-plan-preview Signed-off-by: mi11km <mi11km.program@gmail.com> * Use --piped-handle-timeout to make the timeout arg activate Signed-off-by: mi11km <mi11km.program@gmail.com> * Add tests to model/notificationevent (#4631) * Add tests to model/notificationevent Signed-off-by: Kenta Kozuka <kenta.kozuka@gmail.com> * Add Parallel() Signed-off-by: Kenta Kozuka <kenta.kozuka@gmail.com> --------- Signed-off-by: Kenta Kozuka <kenta.kozuka@gmail.com> Signed-off-by: mi11km <mi11km.program@gmail.com> * add piped-handle-timeout(input args) Signed-off-by: mi11km <mi11km.program@gmail.com> --------- Signed-off-by: mi11km <mi11km.program@gmail.com> Signed-off-by: Kenta Kozuka <kenta.kozuka@gmail.com> Co-authored-by: Kenta Kozuka <kenta.kozuka@gmail.com> Co-authored-by: Khanh Tran <32532742+khanhtc1202@users.noreply.github.com> Signed-off-by: moko-poi <mokopoi44@gmail.com> * Increase limit of stale action operations (#4671) Signed-off-by: moko-poi <mokopoi44@gmail.com> * Add docs for k8s annotations (#4673) Signed-off-by: Yoshiki Fujikane <ffjlabo@gmail.com> Signed-off-by: moko-poi <mokopoi44@gmail.com> * feat: add modifylisner and modifyrule Signed-off-by: moko-poi <mokopoi44@gmail.com> * fix: ModifyRules Signed-off-by: moko-poi <mokopoi44@gmail.com> * fix: rollback Signed-off-by: moko-poi <mokopoi44@gmail.com> * fix: routing Signed-off-by: moko-poi <mokopoi44@gmail.com> * fix: action.Type == elbtypes.ActionTypeEnumForward Signed-off-by: moko-poi <mokopoi44@gmail.com> * fix: Update ModifyListeners and ModifyRules for Selective Action Modification Signed-off-by: moko-poi <mokopoi44@gmail.com> --------- Signed-off-by: moko-poi <mokopoi44@gmail.com> Signed-off-by: mi11km <mi11km.program@gmail.com> Signed-off-by: Kenta Kozuka <kenta.kozuka@gmail.com> Signed-off-by: Yoshiki Fujikane <ffjlabo@gmail.com> Co-authored-by: Khanh Tran <32532742+khanhtc1202@users.noreply.github.com> Co-authored-by: Masafumi Ikeyama <54844746+mi11km@users.noreply.github.com> Co-authored-by: Kenta Kozuka <kenta.kozuka@gmail.com> Co-authored-by: Yoshiki Fujikane <40124947+ffjlabo@users.noreply.github.com> * Remove ModifyRules interface (#4688) --------- Signed-off-by: moko-poi <mokopoi44@gmail.com> Signed-off-by: mi11km <mi11km.program@gmail.com> Signed-off-by: Kenta Kozuka <kenta.kozuka@gmail.com> Signed-off-by: Yoshiki Fujikane <ffjlabo@gmail.com> Co-authored-by: Shun Takahashi <mokopoi44@gmail.com> Co-authored-by: Masafumi Ikeyama <54844746+mi11km@users.noreply.github.com> Co-authored-by: Kenta Kozuka <kenta.kozuka@gmail.com> Co-authored-by: Yoshiki Fujikane <40124947+ffjlabo@users.noreply.github.com>
pipe-cd · Nov 28, 2023 · 2c94824 · 2c94824
1 parent e2e214b
commit 2c94824
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/pkg/app/piped/executor/ecs/rollback.go b/pkg/app/piped/executor/ecs/rollback.go
@@ -159,7 +159,7 @@ func rollback(ctx context.Context, in *executor.Input, platformProviderName stri
 		}
 
 		if err := client.ModifyListeners(ctx, currListenerArns, routingTrafficCfg); err != nil {
-			in.LogPersister.Errorf("Failed to routing traffic to PRIMARY variant: %v", err)
+			in.LogPersister.Errorf("Failed to routing traffic to PRIMARY/CANARY variants: %v", err)
 			return false
 		}
 	}

diff --git a/pkg/app/piped/platformprovider/ecs/client.go b/pkg/app/piped/platformprovider/ecs/client.go
@@ -437,11 +437,21 @@ func (c *client) ModifyListeners(ctx context.Context, listenerArns []string, rou
 		return fmt.Errorf("invalid listener configuration: requires 2 target groups")
 	}
 
-	modifyListener := func(ctx context.Context, listenerArn string) error {
-		input := &elasticloadbalancingv2.ModifyListenerInput{
-			ListenerArn: aws.String(listenerArn),
-			DefaultActions: []elbtypes.Action{
-				{
+	for _, listenerArn := range listenerArns {
+		// Describe the listener to get the current actions
+		describeListenersOutput, err := c.elbClient.DescribeListeners(ctx, &elasticloadbalancingv2.DescribeListenersInput{
+			ListenerArns: []string{listenerArn},
+		})
+		if err != nil {
+			return fmt.Errorf("error describing listener %s: %w", listenerArn, err)
+		}
+
+		// Prepare the actions to be modified
+		var modifiedActions []elbtypes.Action
+		for _, action := range describeListenersOutput.Listeners[0].DefaultActions {
+			if action.Type == elbtypes.ActionTypeEnumForward {
+				// Modify only the forward action
+				modifiedAction := elbtypes.Action{
 					Type: elbtypes.ActionTypeEnumForward,
 					ForwardConfig: &elbtypes.ForwardActionConfig{
 						TargetGroups: []elbtypes.TargetGroupTuple{
@@ -455,16 +465,21 @@ func (c *client) ModifyListeners(ctx context.Context, listenerArns []string, rou
 							},
 						},
 					},
-				},
-			},
+				}
+				modifiedActions = append(modifiedActions, modifiedAction)
+			} else {
+				// Keep other actions unchanged
+				modifiedActions = append(modifiedActions, action)
+			}
 		}
-		_, err := c.elbClient.ModifyListener(ctx, input)
-		return err
-	}
 
-	for _, listener := range listenerArns {
-		if err := modifyListener(ctx, listener); err != nil {
-			return err
+		// Modify the listener
+		_, err = c.elbClient.ModifyListener(ctx, &elasticloadbalancingv2.ModifyListenerInput{
+			ListenerArn:    aws.String(listenerArn),
+			DefaultActions: modifiedActions,
+		})
+		if err != nil {
+			return fmt.Errorf("error modifying listener %s: %w", listenerArn, err)
 		}
 	}
 	return nil

diff --git a/pkg/app/piped/platformprovider/ecs/ecs.go b/pkg/app/piped/platformprovider/ecs/ecs.go
@@ -57,6 +57,8 @@ type ECS interface {
 
 type ELB interface {
 	GetListenerArns(ctx context.Context, targetGroup types.LoadBalancer) ([]string, error)
+	// ModifyListeners modifies the actions of type ActionTypeEnumForward to perform routing traffic
+	// to the given target groups. Other actions won't be modified.
 	ModifyListeners(ctx context.Context, listenerArns []string, routingTrafficCfg RoutingTrafficConfig) error
 }