Rename behavior to mode (#639)

Author: lionello

src/cmd/cli/command/behavior.go

@@ -38,7 +38,7 @@ func GetUnreferencedManagedResources(serviceInfos []*defangv1.ServiceInfo) []str
 }
 
 func makeComposeUpCmd() *cobra.Command {
-	behavior := Behavior(defangv1.Behavior_DEVELOPMENT)
+	mode := Mode(defangv1.DeploymentMode_DEVELOPMENT)
 	composeUpCmd := &cobra.Command{
 		Use:         "up",
 		Annotations: authNeededAnnotation,
@@ -49,7 +49,7 @@ func makeComposeUpCmd() *cobra.Command {
 			var detach, _ = cmd.Flags().GetBool("detach")
 
 			since := time.Now()
-			deploy, project, err := cli.ComposeUp(cmd.Context(), client, force, behavior.Value())
+			deploy, project, err := cli.ComposeUp(cmd.Context(), client, force, mode.Value())
 			if err != nil {
 				if !errors.Is(err, types.ErrComposeFileNotFound) {
 					return err
@@ -178,7 +178,7 @@ func makeComposeUpCmd() *cobra.Command {
 	composeUpCmd.Flags().BoolP("detach", "d", false, "run in detached mode")
 	composeUpCmd.Flags().Bool("force", false, "force a build of the image even if nothing has changed")
 	composeUpCmd.Flags().Bool("tail", false, "tail the service logs after updating") // obsolete, but keep for backwards compatibility
-	composeUpCmd.Flags().VarP(&behavior, "behavior", "b", "behavior for the deployment, possible values: "+strings.Join(allBehaviors(), ", "))
+	composeUpCmd.Flags().VarP(&mode, "mode", "m", "deployment mode, possible values: "+strings.Join(allModes(), ", "))
 	_ = composeUpCmd.Flags().MarkHidden("tail")
 	return composeUpCmd
 }
@@ -193,7 +193,7 @@ func makeComposeStartCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			var force, _ = cmd.Flags().GetBool("force")
 
-			deploy, _, err := cli.ComposeUp(cmd.Context(), client, force, defangv1.Behavior_UNSPECIFIED_BEHAVIOR)
+			deploy, _, err := cli.ComposeUp(cmd.Context(), client, force, defangv1.DeploymentMode_UNSPECIFIED_MODE)
 			if err != nil {
 				return err
 			}
@@ -311,7 +311,7 @@ func makeComposeConfigCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cli.DoDryRun = true // config is like start in a dry run
 			// force=false to calculate the digest
-			if _, _, err := cli.ComposeUp(cmd.Context(), client, false, defangv1.Behavior_UNSPECIFIED_BEHAVIOR); !errors.Is(err, cli.ErrDryRun) {
+			if _, _, err := cli.ComposeUp(cmd.Context(), client, false, defangv1.DeploymentMode_UNSPECIFIED_MODE); !errors.Is(err, cli.ErrDryRun) {
 				return err
 			}
 			return nil

src/cmd/cli/command/compose.go

@@ -0,0 +1,40 @@
+package command
+
+import (
+	"fmt"
+	"strings"
+
+	defangv1 "github.com/DefangLabs/defang/src/protos/io/defang/v1"
+)
+
+type Mode defangv1.DeploymentMode
+
+func (b Mode) String() string {
+	return strings.ToLower(defangv1.DeploymentMode_name[int32(b)])
+}
+func (b *Mode) Set(s string) error {
+	mode, ok := defangv1.DeploymentMode_value[strings.ToUpper(s)]
+	if !ok {
+		return fmt.Errorf("invalid mode: %s, valid values are: %v", s, strings.Join(allModes(), ", "))
+	}
+	*b = Mode(mode)
+	return nil
+}
+func (b Mode) Type() string {
+	return "mode"
+}
+
+func (b Mode) Value() defangv1.DeploymentMode {
+	return defangv1.DeploymentMode(b)
+}
+
+func allModes() []string {
+	modes := make([]string, 0, len(defangv1.DeploymentMode_name)-1)
+	for i, mode := range defangv1.DeploymentMode_name {
+		if i == 0 {
+			continue
+		}
+		modes = append(modes, strings.ToLower(mode))
+	}
+	return modes
+}

src/cmd/cli/command/mode.go

@@ -181,7 +181,7 @@ func (b *ByocAws) Deploy(ctx context.Context, req *defangv1.DeployRequest) (*def
 			return nil, err
 		}
 	}
-	taskArn, err := b.runCdCommand(ctx, req.Behavior, "up", payloadString)
+	taskArn, err := b.runCdCommand(ctx, req.Mode, "up", payloadString)
 	if err != nil {
 		return nil, err
 	}
@@ -329,9 +329,9 @@ func (b *ByocAws) environment() map[string]string {
 	}
 }
 
-func (b *ByocAws) runCdCommand(ctx context.Context, behavior defangv1.Behavior, cmd ...string) (ecs.TaskArn, error) {
+func (b *ByocAws) runCdCommand(ctx context.Context, mode defangv1.DeploymentMode, cmd ...string) (ecs.TaskArn, error) {
 	env := b.environment()
-	env["DEFANG_BEHAVIOR"] = strings.ToLower(behavior.String())
+	env["DEFANG_MODE"] = strings.ToLower(mode.String())
 	if term.DoDebug() {
 		debugEnv := fmt.Sprintf("AWS_REGION=%q", b.driver.Region)
 		if awsProfile := os.Getenv("AWS_PROFILE"); awsProfile != "" {
@@ -350,7 +350,7 @@ func (b *ByocAws) Delete(ctx context.Context, req *defangv1.DeleteRequest) (*def
 		return nil, err
 	}
 	// FIXME: this should only delete the services that are specified in the request, not all
-	taskArn, err := b.runCdCommand(ctx, defangv1.Behavior_UNSPECIFIED_BEHAVIOR, "up", "")
+	taskArn, err := b.runCdCommand(ctx, defangv1.DeploymentMode_UNSPECIFIED_MODE, "up", "")
 	if err != nil {
 		return nil, annotateAwsError(err)
 	}
@@ -648,7 +648,7 @@ func (b *ByocAws) BootstrapCommand(ctx context.Context, command string) (string,
 	if err := b.setUp(ctx); err != nil {
 		return "", err
 	}
-	cdTaskArn, err := b.runCdCommand(ctx, defangv1.Behavior_UNSPECIFIED_BEHAVIOR, command)
+	cdTaskArn, err := b.runCdCommand(ctx, defangv1.DeploymentMode_UNSPECIFIED_MODE, command)
 	if err != nil || cdTaskArn == nil {
 		return "", annotateAwsError(err)
 	}

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

@@ -30,7 +30,7 @@ func buildContext(force bool) compose.BuildContext {
 }
 
 // ComposeUp validates a compose project and uploads the services using the client
-func ComposeUp(ctx context.Context, c client.Client, force bool, behavior defangv1.Behavior) (*defangv1.DeployResponse, *types.Project, error) {
+func ComposeUp(ctx context.Context, c client.Client, force bool, mode defangv1.DeploymentMode) (*defangv1.DeployResponse, *types.Project, error) {
 	project, err := c.LoadProject(ctx)
 	if err != nil {
 		return nil, project, err
@@ -62,7 +62,7 @@ func ComposeUp(ctx context.Context, c client.Client, force bool, behavior defang
 	}
 
 	resp, err := c.Deploy(ctx, &defangv1.DeployRequest{
-		Behavior: behavior,
+		Mode:     mode,
 		Project:  project.Name,
 		Services: services,
 	})

src/pkg/cli/composeUp.go

@@ -27,7 +27,7 @@ func TestComposeUp(t *testing.T) {
 	}))
 	defer server.Close()
 
-	_, project, err := ComposeUp(context.Background(), client.MockClient{UploadUrl: server.URL + "/", Project: proj}, false, defangv1.Behavior_DEVELOPMENT)
+	_, project, err := ComposeUp(context.Background(), client.MockClient{UploadUrl: server.URL + "/", Project: proj}, false, defangv1.DeploymentMode_DEVELOPMENT)
 	if !errors.Is(err, ErrDryRun) {
 		t.Fatalf("ComposeUp() failed: %v", err)
 	}