Support for optional service names on down (#660)

Author: lionello

src/cmd/cli/command/compose.go

@@ -249,16 +249,15 @@ func makeComposeStopCmd() *cobra.Command {
 
 func makeComposeDownCmd() *cobra.Command {
 	composeDownCmd := &cobra.Command{
-		Use:         "down",
-		Aliases:     []string{"rm"},
+		Use:         "down [SERVICE...]",
+		Aliases:     []string{"rm", "remove"}, // like docker stack
 		Annotations: authNeededAnnotation,
-		Args:        cobra.NoArgs, // TODO: takes optional list of service names
 		Short:       "Reads a Compose file and deprovisions its services",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var detach, _ = cmd.Flags().GetBool("detach")
 
 			since := time.Now()
-			etag, err := cli.ComposeDown(cmd.Context(), client)
+			etag, err := cli.ComposeDown(cmd.Context(), client, args...)
 			if err != nil {
 				if connect.CodeOf(err) == connect.CodeNotFound {
 					// Show a warning (not an error) if the service was not found

src/pkg/cli/client/client.go

@@ -42,7 +42,6 @@ type Client interface {
 	BootstrapCommand(context.Context, string) (types.ETag, error)
 	BootstrapList(context.Context) ([]string, error)
 	CreateUploadURL(context.Context, *defangv1.UploadURLRequest) (*defangv1.UploadURLResponse, error)
-	// Deprecated: Use Deploy or Destroy instead.
 	Delete(context.Context, *defangv1.DeleteRequest) (*defangv1.DeleteResponse, error)
 	DeleteConfig(context.Context, *defangv1.Secrets) error
 	Deploy(context.Context, *defangv1.DeployRequest) (*defangv1.DeployResponse, error)

src/pkg/cli/composeDown.go

@@ -6,18 +6,29 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/term"
 	"github.com/DefangLabs/defang/src/pkg/types"
+	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
 
-func ComposeDown(ctx context.Context, client client.Client) (types.ETag, error) {
+func ComposeDown(ctx context.Context, client client.Client, names ...string) (types.ETag, error) {
 	projectName, err := client.LoadProjectName(ctx)
 	if err != nil {
 		return "", err
 	}
-	term.Debugf("Destroying project %q", projectName)
+
+	term.Debugf("Destroying project %q %q", projectName, names)
 
 	if DoDryRun {
 		return "", ErrDryRun
 	}
 
-	return client.Destroy(ctx)
+	if len(names) == 0 {
+		// If no names are provided, destroy the entire project
+		return client.Destroy(ctx)
+	}
+
+	resp, err := client.Delete(ctx, &defangv1.DeleteRequest{Names: names})
+	if err != nil {
+		return "", err
+	}
+	return resp.Etag, nil
 }

src/pkg/cli/composeRestart.go

@@ -8,6 +8,7 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/types"
 )
 
+// Deprecated: this doesn't do the right thing right now
 func ComposeRestart(ctx context.Context, client client.Client) (types.ETag, error) {
 	project, err := client.LoadProject(ctx)
 	if err != nil {

src/pkg/cli/composeStop.go

@@ -8,6 +8,7 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/types"
 )
 
+// Deprecated: this doesn't do the right thing right now
 func ComposeStop(ctx context.Context, client client.Client) (types.ETag, error) {
 	project, err := client.LoadProject(ctx)
 	if err != nil {

src/pkg/cli/delete.go

@@ -9,7 +9,6 @@ import (
 	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
 )
 
-// Deprecated: Use ComposeStop instead.
 func Delete(ctx context.Context, client client.Client, names ...string) (types.ETag, error) {
 	term.Debug("Deleting service", names)
 

src/pkg/cli/restart.go

@@ -8,6 +8,7 @@ import (
 	"github.com/DefangLabs/defang/src/pkg/types"
 )
 
+// Deprecated: this doesn't do the right thing right now
 func Restart(ctx context.Context, client client.Client, names ...string) (types.ETag, error) {
 	term.Debug("Restarting service", names)