fix: rollback

Signed-off-by: moko-poi <[email protected]>
pipe-cd · Nov 1, 2023 · 0122ebb · 0122ebb
1 parent 70e1a1c
commit 0122ebb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/pkg/app/piped/executor/ecs/ecs.go b/pkg/app/piped/executor/ecs/ecs.go
@@ -448,7 +448,7 @@ func routing(ctx context.Context, in *executor.Input, platformProviderName strin
 
 	currListenerRuleArns, err := client.GetListenerRuleArns(ctx, currListenerArns)
 	if err != nil {
-		in.LogPersister.Errorf("Failed to get current active listeners: %v", err)
+		in.LogPersister.Errorf("Failed to get current active listener rule: %v", err)
 		return false
 	}
 

diff --git a/pkg/app/piped/executor/ecs/rollback.go b/pkg/app/piped/executor/ecs/rollback.go
@@ -158,8 +158,14 @@ func rollback(ctx context.Context, in *executor.Input, platformProviderName stri
 			return false
 		}
 
-		if err := client.ModifyListeners(ctx, currListenerArns, routingTrafficCfg); err != nil {
-			in.LogPersister.Errorf("Failed to routing traffic to PRIMARY variant: %v", err)
+		currListenerRuleArns, err := client.GetListenerRuleArns(ctx, currListenerArns)
+		if err != nil {
+			in.LogPersister.Errorf("Failed to get current active listener rule: %v", err)
+			return false
+		}
+
+		if err := client.ModifyListenerOrRule(ctx, currListenerArns, currListenerRuleArns, routingTrafficCfg); err != nil {
+			in.LogPersister.Errorf("Failed to routing traffic to PRIMARY/CANARY variants: %v", err)
 			return false
 		}
 	}