From b968f6c4e3cccbe8ddc84674ed9855663afccad0 Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Tue, 17 Mar 2026 15:54:11 -0700
Subject: [PATCH] chore: rename Region in 'cd ls' to CdRegion

because might not be the same as stack region
---
 src/pkg/cli/cd.go                      | 11 ++---------
 src/pkg/cli/client/byoc/aws/list.go    |  2 +-
 src/pkg/cli/client/byoc/do/byoc.go     |  2 +-
 src/pkg/cli/client/byoc/gcp/byoc.go    |  2 +-
 src/pkg/cli/client/byoc/state/state.go |  2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/pkg/cli/cd.go b/src/pkg/cli/cd.go
index b6e9799b9..73e671c78 100644
--- a/src/pkg/cli/cd.go
+++ b/src/pkg/cli/cd.go
@@ -12,7 +12,6 @@ import (
 	"connectrpc.com/connect"
 	"github.com/DefangLabs/defang/src/pkg"
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
-	"github.com/DefangLabs/defang/src/pkg/cli/client/byoc/state"
 	"github.com/DefangLabs/defang/src/pkg/dryrun"
 	"github.com/DefangLabs/defang/src/pkg/logs"
 	"github.com/DefangLabs/defang/src/pkg/term"
@@ -145,13 +144,7 @@ func CdListFromStorage(ctx context.Context, provider client.Provider, allRegions
 		return err
 	}
 
-	stacks := slices.Collect(func(yield func(state.Info) bool) {
-		for stackInfo := range stacksIter {
-			if !yield(stackInfo) {
-				return
-			}
-		}
-	})
+	stacks := slices.Collect(stacksIter)
 
 	if len(stacks) == 0 {
 		accountInfo, err := provider.AccountInfo(ctx)
@@ -164,7 +157,7 @@ func CdListFromStorage(ctx context.Context, provider client.Provider, allRegions
 		term.Printf("No projects found in %v\n", accountInfo)
 	}
 
-	return term.Table(stacks, "Project", "Stack", "Workspace", "Region")
+	return term.Table(stacks, "Project", "Stack", "Workspace", "CdRegion")
 }
 
 func GetStatesAndEventsUploadUrls(ctx context.Context, projectName string, provider client.Provider, fabric client.FabricClient) (statesUrl string, eventsUrl string, err error) {
diff --git a/src/pkg/cli/client/byoc/aws/list.go b/src/pkg/cli/client/byoc/aws/list.go
index bdf0d556d..d521c813c 100644
--- a/src/pkg/cli/client/byoc/aws/list.go
+++ b/src/pkg/cli/client/byoc/aws/list.go
@@ -33,7 +33,7 @@ func (b *ByocAws) listPulumiStacksInBucket(ctx context.Context, region aws.Regio
 				Project:   st.Project,
 				Stack:     st.Name,
 				Workspace: string(st.Workspace),
-				Region:    string(region),
+				CdRegion:  string(region),
 			}
 			if !yield(info) {
 				break
diff --git a/src/pkg/cli/client/byoc/do/byoc.go b/src/pkg/cli/client/byoc/do/byoc.go
index c5f8748d2..7a8fe1fd8 100644
--- a/src/pkg/cli/client/byoc/do/byoc.go
+++ b/src/pkg/cli/client/byoc/do/byoc.go
@@ -277,7 +277,7 @@ func (b *ByocDo) CdList(ctx context.Context, _allRegions bool) (iter.Seq[state.I
 				Project:   st.Project,
 				Stack:     st.Name,
 				Workspace: string(st.Workspace),
-				Region:    string(b.driver.Region),
+				CdRegion:  string(b.driver.Region),
 			}
 			if !yield(info) {
 				break
diff --git a/src/pkg/cli/client/byoc/gcp/byoc.go b/src/pkg/cli/client/byoc/gcp/byoc.go
index 449573284..df11c99f6 100644
--- a/src/pkg/cli/client/byoc/gcp/byoc.go
+++ b/src/pkg/cli/client/byoc/gcp/byoc.go
@@ -334,7 +334,7 @@ func (b *ByocGcp) CdList(ctx context.Context, _allRegions bool) (iter.Seq[state.
 				Stack:     st.Name,
 				Project:   st.Project,
 				Workspace: string(st.Workspace),
-				Region:    b.driver.GetRegion(),
+				CdRegion:  b.driver.GetRegion(),
 			}
 			if !yield(stack) {
 				break
diff --git a/src/pkg/cli/client/byoc/state/state.go b/src/pkg/cli/client/byoc/state/state.go
index f4116a5fb..ae181110b 100644
--- a/src/pkg/cli/client/byoc/state/state.go
+++ b/src/pkg/cli/client/byoc/state/state.go
@@ -4,5 +4,5 @@ type Info struct {
 	Project   string
 	Stack     string
 	Workspace string
-	Region    string
+	CdRegion  string // not necessarily the stack region
 }