Add expires_at to GetServices (#870)

So we can show Playgrouhd project expiry.
Also renamed ListServicesResponse to follow gRPC naming.

Author: lionello

src/cmd/cli/command/commands.go

@@ -199,7 +199,7 @@ func SetupCommands(ctx context.Context, version string) {
 	RootCmd.AddCommand(newCmd)
 
 	// Get Services Command
-	lsCommand := makeComposeLsCmd()
+	lsCommand := makeComposePsCmd()
 	lsCommand.Use = "services"
 	// TODO: when we add multi-project support to the playground, differentiate
 	// between ls and ps

src/cmd/cli/command/compose.go

@@ -326,7 +326,7 @@ func makeComposeConfigCmd() *cobra.Command {
 	}
 }
 
-func makeComposeLsCmd() *cobra.Command {
+func makeComposePsCmd() *cobra.Command {
 	getServicesCmd := &cobra.Command{
 		Use:         "ps",
 		Annotations: authNeededAnnotation,
@@ -464,7 +464,7 @@ services:
 	composeCmd.AddCommand(makeComposeUpCmd())
 	composeCmd.AddCommand(makeComposeConfigCmd())
 	composeCmd.AddCommand(makeComposeDownCmd())
-	composeCmd.AddCommand(makeComposeLsCmd())
+	composeCmd.AddCommand(makeComposePsCmd())
 	composeCmd.AddCommand(makeComposeLogsCmd())
 
 	// deprecated, will be removed in future releases

src/pkg/cli/client/byoc/aws/byoc.go

@@ -611,13 +611,13 @@ func (b *ByocAws) getProjectUpdate(ctx context.Context, projectName string) (*de
 	return &projUpdate, nil
 }
 
-func (b *ByocAws) GetServices(ctx context.Context, req *defangv1.GetServicesRequest) (*defangv1.ListServicesResponse, error) {
+func (b *ByocAws) GetServices(ctx context.Context, req *defangv1.GetServicesRequest) (*defangv1.GetServicesResponse, error) {
 	projUpdate, err := b.getProjectUpdate(ctx, req.Project)
 	if err != nil {
 		return nil, err
 	}
 
-	listServiceResp := defangv1.ListServicesResponse{}
+	listServiceResp := defangv1.GetServicesResponse{}
 	if projUpdate != nil {
 		listServiceResp.Services = projUpdate.Services
 		listServiceResp.Project = projUpdate.Project

src/pkg/cli/client/byoc/do/byoc.go

@@ -350,8 +350,8 @@ func (b *ByocDo) getProjectInfo(ctx context.Context, services *[]*defangv1.Servi
 	return app, nil
 }
 
-func (b *ByocDo) GetServices(ctx context.Context, req *defangv1.GetServicesRequest) (*defangv1.ListServicesResponse, error) {
-	resp := defangv1.ListServicesResponse{}
+func (b *ByocDo) GetServices(ctx context.Context, req *defangv1.GetServicesRequest) (*defangv1.GetServicesResponse, error) {
+	resp := defangv1.GetServicesResponse{}
 	_, err := b.getProjectInfo(ctx, &resp.Services, req.Project)
 	if err != nil {
 		return nil, err

src/pkg/cli/client/playground.go

@@ -32,7 +32,7 @@ func (g *PlaygroundProvider) Delete(ctx context.Context, req *defangv1.DeleteReq
 	return getMsg(g.client.Delete(ctx, connect.NewRequest(req)))
 }
 
-func (g *PlaygroundProvider) GetServices(ctx context.Context, req *defangv1.GetServicesRequest) (*defangv1.ListServicesResponse, error) {
+func (g *PlaygroundProvider) GetServices(ctx context.Context, req *defangv1.GetServicesRequest) (*defangv1.GetServicesResponse, error) {
 	return getMsg(g.client.GetServices(ctx, connect.NewRequest(req)))
 }
 

src/pkg/cli/client/provider.go

@@ -122,7 +122,7 @@ type Provider interface {
 	Destroy(context.Context, *defangv1.DestroyRequest) (types.ETag, error)
 	Follow(context.Context, *defangv1.TailRequest) (ServerStream[defangv1.TailResponse], error)
 	GetService(context.Context, *defangv1.GetRequest) (*defangv1.ServiceInfo, error)
-	GetServices(context.Context, *defangv1.GetServicesRequest) (*defangv1.ListServicesResponse, error)
+	GetServices(context.Context, *defangv1.GetServicesRequest) (*defangv1.GetServicesResponse, error)
 	ListConfig(context.Context, *defangv1.ListConfigsRequest) (*defangv1.Secrets, error)
 	Query(context.Context, *defangv1.DebugRequest) error
 	Preview(context.Context, *defangv1.DeployRequest) (*defangv1.DeployResponse, error)

src/pkg/cli/destroy_test.go

@@ -22,8 +22,8 @@ func (g *grpcDestroyMockHandler) Delete(context.Context, *connect.Request[defang
 	}), nil
 }
 
-func (g *grpcDestroyMockHandler) GetServices(context.Context, *connect.Request[defangv1.GetServicesRequest]) (*connect.Response[defangv1.ListServicesResponse], error) {
-	return connect.NewResponse(&defangv1.ListServicesResponse{
+func (g *grpcDestroyMockHandler) GetServices(context.Context, *connect.Request[defangv1.GetServicesRequest]) (*connect.Response[defangv1.GetServicesResponse], error) {
+	return connect.NewResponse(&defangv1.GetServicesResponse{
 		Project: "tenantx",
 		Services: []*defangv1.ServiceInfo{
 			{

src/pkg/cli/getServices.go

@@ -23,21 +23,21 @@ func GetServices(ctx context.Context, loader client.Loader, provider client.Prov
 	}
 	term.Debugf("Listing services in project %q", projectName)
 
-	serviceList, err := provider.GetServices(ctx, &defangv1.GetServicesRequest{Project: projectName})
+	servicesResponse, err := provider.GetServices(ctx, &defangv1.GetServicesRequest{Project: projectName})
 	if err != nil {
 		return err
 	}
 
-	if len(serviceList.Services) == 0 {
+	if len(servicesResponse.Services) == 0 {
 		return ErrNoServices{ProjectName: projectName}
 	}
 
 	if !long {
-		for _, si := range serviceList.Services {
+		for _, si := range servicesResponse.Services {
 			*si = defangv1.ServiceInfo{Service: &defangv1.Service{Name: si.Service.Name}}
 		}
 	}
 
-	PrintObject("", serviceList)
+	PrintObject("", servicesResponse)
 	return nil
 }

src/pkg/cli/getServices_test.go

@@ -18,8 +18,8 @@ func (mockGetServicesProvider) LoadProjectName(ctx context.Context) (string, err
 	return "TestGetServices", nil
 }
 
-func (mockGetServicesProvider) GetServices(ctx context.Context, req *defangv1.GetServicesRequest) (*defangv1.ListServicesResponse, error) {
-	return &defangv1.ListServicesResponse{}, nil
+func (mockGetServicesProvider) GetServices(ctx context.Context, req *defangv1.GetServicesRequest) (*defangv1.GetServicesResponse, error) {
+	return &defangv1.GetServicesResponse{}, nil
 }
 
 func TestGetServices(t *testing.T) {