[secrets] Renamed config value and small fixes (#1718)

Author: mikeland73

internal/boxcli/secrets.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/cobra"
 	"go.jetpack.io/devbox/internal/devbox"
 	"go.jetpack.io/devbox/internal/devbox/devopt"
+	"go.jetpack.io/devbox/internal/ux"
 	"go.jetpack.io/envsec/pkg/envsec"
 )
 
@@ -204,9 +205,18 @@ func secretsInitFunc(
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	if err := secrets.NewProject(ctx, flags.force); err != nil {
+
+	if _, err := secrets.ProjectConfig(); err == nil &&
+		box.Config().EnvFrom != "jetpack-cloud" {
+		// Handle edge case where directory is already set up, but devbox.json is
+		// not configured to use jetpack-cloud.
+		ux.Finfo(
+			cmd.ErrOrStderr(),
+			"Secrets already initialized. Adding to devbox config.\n",
+		)
+	} else if err := secrets.NewProject(ctx, flags.force); err != nil {
 		return errors.WithStack(err)
 	}
-	box.Config().SetStringField("EnvFrom", "envsec")
+	box.Config().SetStringField("EnvFrom", "jetpack-cloud")
 	return box.Config().SaveTo(box.ProjectDir())
 }

internal/devbox/devbox.go

@@ -1104,6 +1104,7 @@ func (d *Devbox) configEnvs(
 	ctx context.Context,
 	existingEnv map[string]string,
 ) (map[string]string, error) {
+	defer debug.FunctionTimer().End()
 	env := map[string]string{}
 	if d.cfg.IsEnvsecEnabled() {
 		secrets, err := d.Secrets(ctx)
@@ -1129,7 +1130,10 @@ func (d *Devbox) configEnvs(
 		}
 	} else if d.cfg.EnvFrom != "" {
 		return nil, usererr.New(
-			"unknown from_env value: %s. Supported value is: envsec.", d.cfg.EnvFrom)
+			"unknown from_env value: %s. Supported value is: %q.",
+			d.cfg.EnvFrom,
+			"jetpack-cloud",
+		)
 	}
 	for k, v := range d.cfg.Env {
 		env[k] = v

internal/devconfig/env.go

@@ -1,5 +1,6 @@
 package devconfig
 
 func (c *Config) IsEnvsecEnabled() bool {
-	return c.EnvFrom == "envsec"
+	// envsec for legacy.
+	return c.EnvFrom == "envsec" || c.EnvFrom == "jetpack-cloud"
 }