[init] init config should return error if already exists

Author: mikeland73

internal/boxcli/global.go

@@ -5,6 +5,7 @@ package boxcli
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -63,8 +64,8 @@ func ensureGlobalConfig() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	err = devbox.InitConfig(globalConfigPath)
-	if err != nil {
+	err = devbox.EnsureConfig(globalConfigPath)
+	if err != nil && !errors.Is(err, os.ErrExist) {
 		return "", err
 	}
 	return globalConfigPath, nil

internal/boxcli/init.go

@@ -5,10 +5,12 @@ package boxcli
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
+	"go.jetpack.io/devbox/internal/boxcli/usererr"
 	"go.jetpack.io/devbox/internal/devbox"
 	"go.jetpack.io/devbox/pkg/autodetect"
 )
@@ -28,7 +30,15 @@ func initCmd() *cobra.Command {
 			"You can then add packages using `devbox add`",
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runInitCmd(cmd, args, flags)
+			err := runInitCmd(cmd, args, flags)
+			if errors.Is(err, os.ErrExist) {
+				path := pathArg(args)
+				if path == "" || path == "." {
+					path, _ = os.Getwd()
+				}
+				return usererr.New("devbox.json already exists in %q.", path)
+			}
+			return err
 		},
 	}
 

internal/devbox/devbox.go

@@ -76,6 +76,14 @@ func InitConfig(dir string) error {
 	return err
 }
 
+func EnsureConfig(dir string) error {
+	err := InitConfig(dir)
+	if err != nil && !errors.Is(err, os.ErrExist) {
+		return err
+	}
+	return nil
+}
+
 func Open(opts *devopt.Opts) (*Devbox, error) {
 	var cfg *devconfig.Config
 	var err error

internal/devbox/util.go

@@ -55,7 +55,7 @@ func ensureDevboxUtilityConfig() (string, error) {
 		return "", err
 	}
 
-	err = InitConfig(path)
+	err = EnsureConfig(path)
 	if err != nil {
 		return "", err
 	}

internal/devconfig/init.go

@@ -4,7 +4,6 @@
 package devconfig
 
 import (
-	"errors"
 	"os"
 	"path/filepath"
 
@@ -17,11 +16,6 @@ func Init(dir string) (*Config, error) {
 		os.O_RDWR|os.O_CREATE|os.O_EXCL,
 		0o644,
 	)
-	if errors.Is(err, os.ErrExist) {
-		// TODO: Should we return an error here?
-		// If we do, it breaks a bunch of tests, but it's likely the correct behavior
-		return nil, nil
-	}
 	if err != nil {
 		return nil, err
 	}

testscripts/add/add.test.txt

@@ -20,12 +20,6 @@ exec rg --version
 exec vim --version
 json.superset devbox.json expected_devbox2.json
 
--- devbox.json --
-{
-  "packages": [
-  ]
-}
-
 -- expected_devbox1.json --
 {
   "packages": [

testscripts/add/add_outputs.test.txt

@@ -15,12 +15,6 @@ exec devbox run -- prometheus --version
 
 
 
--- devbox.json --
-{
-  "packages": [
-  ]
-}
-
 -- expected_devbox.json --
 {
   "packages": {

testscripts/add/add_replace.test.txt

@@ -1,7 +1,5 @@
 # Testscript for exercising adding packages
 
-exec devbox init
-
 exec devbox add [email protected]
 devboxjson.packages.contains devbox.json [email protected]
 ! devboxjson.packages.contains devbox.json [email protected]

testscripts/add/global_add.test.txt

@@ -8,9 +8,3 @@ exec devbox global shellenv --recompute
 source.path
 exec rg --version
 exec vim --version
-
--- devbox.json --
-{
-  "packages": [
-  ]
-}

testscripts/info/info.test.txt

@@ -2,10 +2,8 @@ exec devbox init
 exec devbox info hello
 stdout 'hello '
 
-exec devbox init
 exec devbox info hello@latest
 stdout 'hello '
 
-exec devbox init
 ! exec devbox info notapackage
 stderr 'Package "notapackage" not found'