feat: add restart command

fixes #48

Author: lionello

src/cmd/cli/main.go

@@ -377,7 +377,7 @@ var composeCmd = &cobra.Command{
 	Use:     "compose",
 	Aliases: []string{"stack"},
 	Args:    cobra.NoArgs,
-	Short:   "Work with local docker-compose.yml files",
+	Short:   "Work with local Compose files",
 }
 
 func printEndpoints(serviceInfos []*defangv1.ServiceInfo) {
@@ -399,7 +399,7 @@ func printEndpoints(serviceInfos []*defangv1.ServiceInfo) {
 var composeUpCmd = &cobra.Command{
 	Use:         "up",
 	Annotations: authNeededAnnotation,
-	Args:        cobra.NoArgs,
+	Args:        cobra.NoArgs, // TODO: takes optional list of service names
 	Short:       "Like 'start' but immediately tracks the progress of the deployment",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		var filePath, _ = cmd.InheritedFlags().GetString("file")
@@ -428,8 +428,8 @@ var composeStartCmd = &cobra.Command{
 	Use:         "start",
 	Aliases:     []string{"deploy"},
 	Annotations: authNeededAnnotation,
-	Args:        cobra.NoArgs,
-	Short:       "Reads a docker-compose.yml file and deploys services to the cluster",
+	Args:        cobra.NoArgs, // TODO: takes optional list of service names
+	Short:       "Reads a Compose file and deploys services to the cluster",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		var filePath, _ = cmd.InheritedFlags().GetString("file")
 		var force, _ = cmd.Flags().GetBool("force")
@@ -450,12 +450,28 @@ var composeStartCmd = &cobra.Command{
 	},
 }
 
+var composeRestartCmd = &cobra.Command{
+	Use:         "restart",
+	Annotations: authNeededAnnotation,
+	Args:        cobra.NoArgs, // TODO: takes optional list of service names
+	Short:       "Reads a Compose file and restarts its services",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		var filePath, _ = cmd.InheritedFlags().GetString("file")
+
+		_, err := cli.ComposeRestart(cmd.Context(), client, filePath, string(tenantId))
+		if err != nil {
+			return err
+		}
+		return nil
+	},
+}
+
 var composeDownCmd = &cobra.Command{
 	Use:         "down",
 	Aliases:     []string{"stop", "rm"},
 	Annotations: authNeededAnnotation,
-	Args:        cobra.NoArgs,
-	Short:       "Reads a docker-compose.yml file and deletes services from the cluster",
+	Args:        cobra.NoArgs, // TODO: takes optional list of service names
+	Short:       "Reads a Compose file and deletes services from the cluster",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		var filePath, _ = cmd.InheritedFlags().GetString("file")
 		var tail, _ = cmd.Flags().GetBool("tail")
@@ -485,8 +501,8 @@ var composeDownCmd = &cobra.Command{
 
 var composeConfigCmd = &cobra.Command{
 	Use:   "config",
-	Args:  cobra.NoArgs,
-	Short: "Reads a docker-compose.yml file and shows the generated config",
+	Args:  cobra.NoArgs, // TODO: takes optional list of service names
+	Short: "Reads a Compose file and shows the generated config",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		var filePath, _ = cmd.InheritedFlags().GetString("file")
 
@@ -529,6 +545,20 @@ var deleteCmd = &cobra.Command{
 	},
 }
 
+var restartCmd = &cobra.Command{
+	Use:         "restart",
+	Annotations: authNeededAnnotation,
+	Args:        cobra.MinimumNArgs(1),
+	Short:       "Restart one or more services",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		_, err := cli.Restart(cmd.Context(), client, args...)
+		if err != nil {
+			return err
+		}
+		return nil
+	},
+}
+
 var sendCmd = &cobra.Command{
 	Use:         "send",
 	Hidden:      true, // not available in private beta
@@ -624,6 +654,7 @@ func main() {
 	secretsCmd.AddCommand(secretsListCmd)
 
 	rootCmd.AddCommand(secretsCmd)
+	rootCmd.AddCommand(restartCmd)
 
 	// Compose Command
 	composeCmd.PersistentFlags().StringP("file", "f", "*compose.y*ml", `Compose file path`)
@@ -643,6 +674,7 @@ func main() {
 	composeStartCmd.Flags().Bool("force", false, "Force a build of the image even if nothing has changed")
 	composeCmd.AddCommand(composeStartCmd)
 	rootCmd.AddCommand(composeCmd)
+	composeCmd.AddCommand(composeRestartCmd)
 
 	// Tail Command
 	tailCmd.Flags().StringP("name", "n", "", "Name of the service")

src/pkg/cli/composeDown.go

@@ -14,7 +14,7 @@ func ComposeDown(ctx context.Context, client defangv1connect.FabricControllerCli
 
 	names := make([]string, 0, len(project.Services))
 	for _, service := range project.Services {
-		names = append(names, service.Name)
+		names = append(names, NormalizeServiceName(service.Name))
 	}
 
 	return Delete(ctx, client, names...)

src/pkg/cli/composeRestart.go

@@ -0,0 +1,22 @@
+package cli
+
+import (
+	"context"
+
+	pb "github.com/defang-io/defang/src/protos/io/defang/v1"
+	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
+)
+
+func ComposeRestart(ctx context.Context, client defangv1connect.FabricControllerClient, filePath, projectName string) ([]*pb.ServiceInfo, error) {
+	project, err := loadDockerCompose(filePath, projectName)
+	if err != nil {
+		return nil, err
+	}
+
+	names := make([]string, 0, len(project.Services))
+	for _, service := range project.Services {
+		names = append(names, NormalizeServiceName(service.Name))
+	}
+
+	return Restart(ctx, client, names...)
+}

src/pkg/cli/composeStart.go

@@ -243,6 +243,7 @@ func ComposeStart(ctx context.Context, client defangv1connect.FabricControllerCl
 		var deploy *pb.Deploy
 		if svccfg.Deploy != nil {
 			deploy = &pb.Deploy{}
+			deploy.Replicas = 1 // default to one replica per service
 			if svccfg.Deploy.Replicas != nil {
 				deploy.Replicas = uint32(*svccfg.Deploy.Replicas)
 			}

src/pkg/cli/delete.go

@@ -8,17 +8,14 @@ import (
 	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
 )
 
-func Delete(ctx context.Context, client defangv1connect.FabricControllerClient, name ...string) (string, error) {
-	Debug(" - Deleting service", name)
+func Delete(ctx context.Context, client defangv1connect.FabricControllerClient, names ...string) (string, error) {
+	Debug(" - Deleting service", names)
 
 	if DoDryRun {
 		return "", nil
 	}
 
-	for i, n := range name {
-		name[i] = NormalizeServiceName(n)
-	}
-	resp, err := client.Delete(ctx, connect.NewRequest(&pb.DeleteRequest{Names: name}))
+	resp, err := client.Delete(ctx, connect.NewRequest(&pb.DeleteRequest{Names: names}))
 	if err != nil {
 		return "", err
 	}

src/pkg/cli/restart.go

@@ -0,0 +1,37 @@
+package cli
+
+import (
+	"context"
+
+	"github.com/bufbuild/connect-go"
+	pb "github.com/defang-io/defang/src/protos/io/defang/v1"
+	"github.com/defang-io/defang/src/protos/io/defang/v1/defangv1connect"
+)
+
+func Restart(ctx context.Context, client defangv1connect.FabricControllerClient, names ...string) ([]*pb.ServiceInfo, error) {
+	Debug(" - Restarting service", names)
+	if DoDryRun {
+		return nil, nil
+	}
+
+	serviceInfos := make([]*pb.ServiceInfo, 0, len(names))
+	for _, name := range names {
+		Info(" * Restarting service", name)
+		serviceInfo, err := client.Get(ctx, connect.NewRequest(&pb.ServiceID{Name: name}))
+		if err != nil {
+			Warn(" ! Failed to get service", name, err)
+			continue
+		}
+		serviceInfo, err = client.Update(ctx, connect.NewRequest(serviceInfo.Msg.Service))
+		if err != nil {
+			// Abort all? TODO: restart should probably be atomic, all or nothing
+			if len(serviceInfos) == 0 {
+				return nil, err
+			}
+			Warn(" ! Failed to restart service", name, err)
+			continue
+		}
+		serviceInfos = append(serviceInfos, serviceInfo.Msg)
+	}
+	return serviceInfos, nil
+}