[envsec] Add (hidden) envsec init command

devbox.json

@@ -26,6 +26,7 @@
       ],
       "code":            "code .",
       "lint":            "golangci-lint run --timeout 5m && scripts/gofumpt.sh",
+      "fmt":             "scripts/gofumpt.sh",
       "test":            "go test -race -cover ./...",
       "update-examples": "devbox run build && go run testscripts/testrunner/updater/main.go"
     }

internal/boxcli/envsec.go

@@ -0,0 +1,58 @@
+// Copyright 2023 Jetpack Technologies Inc and contributors. All rights reserved.
+// Use of this source code is governed by the license in the LICENSE file.
+
+package boxcli
+
+import (
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	"go.jetpack.io/devbox"
+	"go.jetpack.io/devbox/internal/impl/devopt"
+	"go.jetpack.io/devbox/internal/integrations/envsec"
+)
+
+type envsecInitCmdFlags struct {
+	config configFlags
+}
+
+func envsecCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "envsec",
+		Short: "envsec commands",
+	}
+	cmd.AddCommand(envsecInitCmd())
+	cmd.Hidden = true
+	return cmd
+}
+
+func envsecInitCmd() *cobra.Command {
+	flags := envsecInitCmdFlags{}
+	cmd := &cobra.Command{
+		Use:   "init",
+		Short: "initialize envsec integration",
+		Args:  cobra.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return envsecInitFunc(cmd, flags)
+		},
+	}
+
+	flags.config.register(cmd)
+
+	return cmd
+}
+
+func envsecInitFunc(cmd *cobra.Command, flags envsecInitCmdFlags) error {
+	box, err := devbox.Open(&devopt.Opts{
+		Dir:    flags.config.path,
+		Stderr: cmd.ErrOrStderr(),
+	})
+	if err != nil {
+		return errors.WithStack(err)
+	}
+	if err := envsec.EnsureInitialized(
+		cmd.Context(), box.ProjectDir()); err == nil {
+		return nil
+	}
+	box.Config().SetStringField("EnvFrom", "envsec")
+	return box.Config().SaveTo(box.ProjectDir())
+}

internal/boxcli/root.go

@@ -61,6 +61,7 @@ func RootCmd() *cobra.Command {
 		command.AddCommand(authCmd())
 	}
 	command.AddCommand(createCmd())
+	command.AddCommand(envsecCmd())
 	command.AddCommand(generateCmd())
 	command.AddCommand(globalCmd())
 	command.AddCommand(infoCmd())

internal/devconfig/env.go

@@ -2,11 +2,11 @@ package devconfig
 
 import (
 	"context"
-	"fmt"
 	"os"
 
 	"go.jetpack.io/devbox/internal/boxcli/usererr"
 	"go.jetpack.io/devbox/internal/integrations/envsec"
+	"go.jetpack.io/devbox/internal/ux"
 )
 
 func (c *Config) ComputedEnv(
@@ -18,7 +18,8 @@ func (c *Config) ComputedEnv(
 	if c.IsEnvsecEnabled() {
 		env, err = envsec.Env(ctx, projectDir)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "Error reading secrets from envsec: %s\n\n", err)
+			ux.Fwarning(os.Stderr, "Error reading secrets from envsec: %s\n\n", err)
+			env = map[string]string{}
 		}
 	} else if c.EnvFrom != "" {
 		return nil, usererr.New("unknown from_env value: %s", c.EnvFrom)

internal/devconfig/field.go

@@ -0,0 +1,56 @@
+package devconfig
+
+import (
+	"reflect"
+	"strings"
+
+	"github.com/tailscale/hujson"
+)
+
+func (c *Config) SetStringField(fieldName, val string) {
+	valueOfStruct := reflect.ValueOf(c).Elem()
+
+	field := valueOfStruct.FieldByName(fieldName)
+	field.SetString(val)
+
+	c.ast.setStringField(c.jsonNameOfField(fieldName), val)
+}
+
+func (c *Config) jsonNameOfField(fieldName string) string {
+	valueOfStruct := reflect.ValueOf(c).Elem()
+
+	var name string
+	for i := 0; i < valueOfStruct.NumField(); i++ {
+		field := valueOfStruct.Type().Field(i)
+		if field.Name != fieldName {
+			continue
+		}
+
+		name = field.Name
+		jsonTag := field.Tag.Get("json")
+		parts := strings.Split(jsonTag, ",")
+		if len(parts) > 0 && parts[0] != "" && parts[0] != "-" {
+			name = parts[0]
+		}
+
+		break
+	}
+	return name
+}
+
+func (c *configAST) setStringField(key, val string) {
+	rootObject := c.root.Value.(*hujson.Object)
+	i := c.memberIndex(rootObject, key)
+	if i == -1 {
+		rootObject.Members = append(rootObject.Members, hujson.ObjectMember{
+			Name:  hujson.Value{Value: hujson.String(key)},
+			Value: hujson.Value{Value: hujson.String(val)},
+		})
+	} else if val != "" {
+		rootObject.Members[i].Value = hujson.Value{Value: hujson.String(val)}
+	} else {
+		rootObject.Members = append(rootObject.Members[:i], rootObject.Members[i+1:]...)
+	}
+
+	c.root.Format()
+}

internal/integrations/envsec/envsec.go

@@ -25,7 +25,7 @@ func Env(ctx context.Context, projectDir string) (map[string]string, error) {
 		return envCache, nil
 	}
 
-	if err := ensureInitialized(ctx, projectDir); err != nil {
+	if err := EnsureInitialized(ctx, projectDir); err != nil {
 		return nil, err
 	}
 
@@ -58,7 +58,7 @@ func EnsureInstalled(ctx context.Context) (string, error) {
 	return binPathCache, nil
 }
 
-func ensureInitialized(ctx context.Context, projectDir string) error {
+func EnsureInitialized(ctx context.Context, projectDir string) error {
 	binPath, err := EnsureInstalled(ctx)
 	if err != nil {
 		return err