Track deployment region (#1114)

* Add region to Deployment proto

Also use Provider enum instead of string

* Add region to Deployment proto

Also use Provider enum instead of string

Author: lionello

src/cmd/cli/command/commands_test.go

@@ -64,10 +64,10 @@ func (m *mockFabricService) CheckToS(context.Context, *connect.Request[emptypb.E
 
 func (m *mockFabricService) WhoAmI(context.Context, *connect.Request[emptypb.Empty]) (*connect.Response[defangv1.WhoAmIResponse], error) {
 	return connect.NewResponse(&defangv1.WhoAmIResponse{
-		Tenant:  "default",
-		Account: "default",
-		Region:  "us-west-2",
-		Tier:    defangv1.SubscriptionTier_HOBBY,
+		Tenant:            "default",
+		ProviderAccountId: "default",
+		Region:            "us-west-2",
+		Tier:              defangv1.SubscriptionTier_HOBBY,
 	}), nil
 }
 

src/pkg/cli/client/mock.go

@@ -124,8 +124,10 @@ func (m MockFabricClient) ListDeployments(ctx context.Context, req *defangv1.Lis
 			{
 				Id:                "a1b2c3",
 				Project:           "test",
-				Provider:          "aws",
+				Provider:          defangv1.Provider_AWS,
 				ProviderAccountId: "1234567890",
+				ProviderString:    "aws",
+				Region:            "us-test-2",
 				Timestamp:         timestamppb.Now(),
 			},
 		},

src/pkg/cli/composeDown.go

@@ -38,8 +38,10 @@ func ComposeDown(ctx context.Context, projectName string, c client.FabricClient,
 				Action:            defangv1.DeploymentAction_DEPLOYMENT_ACTION_DOWN,
 				Id:                etag,
 				Project:           projectName,
-				Provider:          string(accountInfo.Provider()),
+				Provider:          accountInfo.Provider().EnumValue(),
 				ProviderAccountId: accountInfo.AccountID(),
+				ProviderString:    string(accountInfo.Provider()),
+				Region:            accountInfo.Region(),
 				Timestamp:         timestamppb.New(time.Now()),
 			},
 		})

src/pkg/cli/composeUp.go

@@ -121,8 +121,10 @@ func ComposeUp(ctx context.Context, project *compose.Project, fabric client.Fabr
 				Action:            defangv1.DeploymentAction_DEPLOYMENT_ACTION_UP,
 				Id:                resp.Etag,
 				Project:           project.Name,
-				Provider:          string(accountInfo.Provider()),
+				Provider:          accountInfo.Provider().EnumValue(),
 				ProviderAccountId: accountInfo.AccountID(),
+				ProviderString:    string(accountInfo.Provider()),
+				Region:            accountInfo.Region(),
 				Timestamp:         timestamppb.New(timestamp),
 			},
 		})

src/pkg/cli/deploymentsList.go

@@ -13,6 +13,7 @@ type PrintDeployment struct {
 	Deployment string
 	Provider   string
 	DeployedAt string
+	Region     string
 }
 
 func DeploymentsList(ctx context.Context, projectName string, client client.GrpcClient) error {
@@ -34,10 +35,11 @@ func DeploymentsList(ctx context.Context, projectName string, client client.Grpc
 	for i, d := range response.Deployments {
 		deployments[i] = PrintDeployment{
 			Deployment: d.Id,
-			Provider:   d.Provider,
+			Provider:   d.ProviderString, // TODO: use Provider
 			DeployedAt: d.Timestamp.AsTime().Format(time.RFC3339),
+			Region:     d.Region,
 		}
 	}
 
-	return term.Table(deployments, []string{"Deployment", "Provider", "DeployedAt"})
+	return term.Table(deployments, []string{"Deployment", "Provider", "DeployedAt"}) // TODO: add region
 }

src/pkg/cli/deploymentsList_test.go

@@ -27,8 +27,10 @@ func (g *mockListDeploymentsHandler) ListDeployments(ctx context.Context, req *c
 			{
 				Id:                "a1b2c3",
 				Project:           "test",
-				Provider:          "playground",
+				Provider:          defangv1.Provider_DEFANG,
 				ProviderAccountId: "1234567890",
+				ProviderString:    "playground",
+				Region:            "us-test-2",
 				Timestamp:         timestamppb.Now(),
 			},
 		}

src/pkg/cli/whoami_test.go

@@ -19,10 +19,10 @@ type grpcWhoamiMockHandler struct {
 
 func (g *grpcWhoamiMockHandler) WhoAmI(context.Context, *connect.Request[emptypb.Empty]) (*connect.Response[defangv1.WhoAmIResponse], error) {
 	return connect.NewResponse(&defangv1.WhoAmIResponse{
-		Tenant:  "tenant-1",
-		Account: "playground",
-		Region:  "us-test-2",
-		Tier:    defangv1.SubscriptionTier_PRO,
+		Tenant:            "tenant-1",
+		ProviderAccountId: "playground",
+		Region:            "us-test-2",
+		Tier:              defangv1.SubscriptionTier_PRO,
 	}), nil
 }
 

src/protos/io/defang/v1/fabric.pb.go

@@ -367,12 +367,14 @@ enum DeploymentAction {
 }
 
 message Deployment {
-  string id = 1;
+  string id = 1; // aka etag
   string project = 2;
-  string provider = 3;
+  string provider_string = 3 [ deprecated = true ]; // was: provider
   string provider_account_id = 4;
   google.protobuf.Timestamp timestamp = 5;
   DeploymentAction action = 6;
+  string region = 7;
+  Provider provider = 8;
 }
 
 message PutDeploymentRequest { Deployment deployment = 1; }
@@ -660,7 +662,7 @@ message SetOptionsRequest {
 
 message WhoAmIResponse {
   string tenant = 1;
-  string account = 2;
+  string provider_account_id = 2;
   string region = 3;
   string user_id = 4;
   SubscriptionTier tier = 5;