Add --config option for arbitrary config file

Author: fflorens

pkg/cli/cmd_help.go

@@ -44,6 +44,7 @@ Options:
  --sensitive=false            Show sensitive data in outputs, i.e. API Token/Organization
  -v, --version=false          Print version information and quit
  --region=par1                Change the default region (e.g. ams1)
+ -c, --config=<config path>   Option config file path (default to ~/.scwrc)
 
 Commands:
 {{range .}}{{if not .Hidden}}    {{.Name | printf "%-9s"}} {{.Description}}

pkg/cli/main.go

@@ -33,6 +33,7 @@ var (
 	flQuiet     = flag.Bool([]string{"q", "-quiet"}, false, "Enable quiet mode")
 	flSensitive = flag.Bool([]string{"-sensitive"}, false, "Show sensitive data in outputs, i.e. API Token/Organization")
 	flRegion    = flag.String([]string{"-region"}, "par1", "Change the default region (e.g. ams1)")
+	flConfig    = flag.String([]string{"c", "-config"}, "", "Optional config file path")
 )
 
 // Start is the entrypoint
@@ -47,6 +48,10 @@ func Start(rawArgs []string, streams *commands.Streams) (int, error) {
 	}
 	flag.CommandLine.Parse(rawArgs)
 
+	if *flConfig != "" {
+		os.Setenv("SCW_CONFIG_PATH", *flConfig)
+	}
+
 	config, cfgErr := config.GetConfig()
 	if cfgErr != nil && !os.IsNotExist(cfgErr) {
 		return 1, fmt.Errorf("unable to open .scwrc config file: %v", cfgErr)

pkg/config/config.go

@@ -83,6 +83,10 @@ func GetConfig() (*Config, error) {
 
 // GetConfigFilePath returns the path to the Scaleway CLI config file
 func GetConfigFilePath() (string, error) {
+	path := os.Getenv("SCW_CONFIG_PATH")
+	if path != "" {
+		return path, nil
+	}
 	path, err := GetHomeDir()
 	if err != nil {
 		return "", err

pkg/config/config_test.go

@@ -5,9 +5,13 @@
 package config
 
 import (
+	"os"
 	"strings"
 	"testing"
+	"strconv"
+	"math/rand"
 
+	"github.com/scaleway/scaleway-cli/pkg/scwversion"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -23,6 +27,49 @@ func TestGetConfigFilePath(t *testing.T) {
 	})
 }
 
+func TestGetConfigFilePathEnv(t *testing.T) {
+	Convey("Testing GetConfigFilePath() with env variable", t, func() {
+		os.Setenv("SCW_CONFIG_PATH", "./config_testdata1")
+		configPath, err := GetConfigFilePath()
+		So(err, ShouldBeNil)
+		So(configPath, ShouldEqual, "./config_testdata1")
+		os.Unsetenv("SCW_CONFIG_PATH")
+	})
+}
+
+func TestGetConfig(t *testing.T) {
+	Convey("Testing GetConfig() with env variable", t, func() {
+		os.Setenv("SCW_CONFIG_PATH", "./config_testdata1")
+		config, err := GetConfig()
+		So(err, ShouldBeNil)
+		So(config.Version, ShouldEqual, "test_version")
+		So(config.Organization, ShouldEqual, "test_orgID")
+		So(config.Token, ShouldEqual, "test_token")
+		os.Unsetenv("SCW_CONFIG_PATH")
+	})
+}
+
+func TestSave(t *testing.T) {
+	Convey("Testing SaveConfig() with env variable", t, func() {
+		os.Setenv("SCW_CONFIG_PATH", "./config_testdata2")
+		randOrg := strconv.FormatInt(rand.Int63(), 16)
+		randToken := strconv.FormatInt(rand.Int63(), 16)
+		cfg := &Config{
+			Organization: strings.Trim(randOrg, "\n"),
+			Token:        strings.Trim(randToken, "\n"),
+		}
+		err := cfg.Save()
+		So(err, ShouldBeNil)
+		So(cfg.Version, ShouldEqual, scwversion.VERSION)
+		So(cfg.Organization, ShouldEqual, randOrg)
+		So(cfg.Token, ShouldEqual, randToken)
+		os.Unsetenv("SCW_CONFIG_PATH")
+	})
+}
+
+
+
+
 func TestGetHomeDir(t *testing.T) {
 	Convey("Testing GetHomeDir()", t, func() {
 		homedir, err := GetHomeDir()

pkg/config/config_testdata1

@@ -0,0 +1 @@
+{"organization":"test_orgID","token":"test_token","version":"test_version"}

pkg/config/config_testdata2

@@ -0,0 +1 @@
+{"organization":"4d65822107fcfd52","token":"78629a0f5f3f164f","version":"v1.17+dev"}