cmd: init now only allows API key auth for ESS users (#189)

The ecctl init command disables the option to configure user/pass authentication for 
ESS and ESSP.

ECE auth configuration stays the same.

Author: karencfv

pkg/ecctl/init.go

@@ -299,18 +299,14 @@ func InitConfig(params InitConfigParams) error {
 	// endpoints with self-signed certificates.
 	cfg.Insecure = true
 
-	if err := askInfraSelection(&cfg, scanner, params.Writer, params.ErrWriter); err != nil {
+	if err := askInfraSelection(&cfg, scanner, params.Writer, params.ErrWriter, params.PasswordReadFunc); err != nil {
 		return err
 	}
 
 	if err := askOutputFormat(&cfg, scanner, params.Writer, params.ErrWriter); err != nil {
 		return err
 	}
 
-	if err := askAuthMechanism(&cfg, scanner, params.Writer, params.PasswordReadFunc); err != nil {
-		return err
-	}
-
 	if err := validateAuth(cfg, params.Writer); err != nil {
 		return err
 	}
@@ -358,7 +354,7 @@ func printConfig(writer io.Writer, v *viper.Viper) error {
 	return enc.Encode(c)
 }
 
-func askInfraSelection(cfg *Config, scanner *input.Scanner, writer, errWriter io.Writer) error {
+func askInfraSelection(cfg *Config, scanner *input.Scanner, writer, errWriter io.Writer, passFunc PassFunc) error {
 	infraChoiceRaw := scanner.Scan(hostChoiceMsg)
 	fmt.Fprintln(writer)
 	infraChoice, err := strconv.Atoi(infraChoiceRaw)
@@ -373,10 +369,19 @@ func askInfraSelection(cfg *Config, scanner *input.Scanner, writer, errWriter io
 		if err := askRegionSelection(cfg, scanner, writer, essRegions); err != nil {
 			return err
 		}
+		if err := askAPIKey(cfg, writer, passFunc); err != nil {
+			return err
+		}
 	case eceInfraChoice:
 		cfg.Host = scanner.Scan(eceHostMsg)
+		if err := askAuthMechanism(cfg, scanner, writer, passFunc); err != nil {
+			return err
+		}
 	case esspInfraChoice:
 		cfg.Host = scanner.Scan(esspHostMsg)
+		if err := askAPIKey(cfg, writer, passFunc); err != nil {
+			return err
+		}
 		// For the time being the only available region for ESSP is us-west-2. Once more
 		// regions have been added, this should be set in a similar way to essInfraChoice
 		cfg.Region = "us-west-2"
@@ -422,6 +427,7 @@ func askOutputFormat(cfg *Config, scanner *input.Scanner, writer, errWriter io.W
 		fmt.Fprintln(errWriter, "invalid choice, defaulting to \"text\"")
 	}
 
+	fmt.Fprintln(writer)
 	return nil
 }
 
@@ -437,12 +443,9 @@ func askAuthMechanism(cfg *Config, scanner *input.Scanner, writer io.Writer, pas
 	default:
 		return errors.New("invalid authentication choice")
 	case apiKeyChoice:
-		apikey, err := ReadSecret(writer, passFunc, apiKeyMsg)
-		if err != nil {
+		if err := askAPIKey(cfg, writer, passFunc); err != nil {
 			return err
 		}
-		cfg.APIKey = string(apikey)
-		cfg.User, cfg.Pass = "", ""
 	case userPassChoice:
 		cfg.User = scanner.Scan(userMsg)
 
@@ -454,7 +457,18 @@ func askAuthMechanism(cfg *Config, scanner *input.Scanner, writer io.Writer, pas
 		cfg.APIKey = ""
 	}
 
-	fmt.Fprintln(writer)
+	return nil
+}
+
+func askAPIKey(cfg *Config, writer io.Writer, passFunc PassFunc) error {
+	apikey, err := ReadSecret(writer, passFunc, apiKeyMsg)
+	if err != nil {
+		return err
+	}
+
+	cfg.APIKey = string(apikey)
+	cfg.User, cfg.Pass = "", ""
+
 	return nil
 }
 

pkg/ecctl/init_test.go

@@ -244,8 +244,8 @@ func TestInitConfig(t *testing.T) {
 					strings.NewReader("1\n"),
 					strings.NewReader("1\n"),
 					strings.NewReader("1\n"),
-					strings.NewReader("1\n"),
 					strings.NewReader("anapikey\n"),
+					strings.NewReader("1\n"),
 				),
 				Writer:    new(bytes.Buffer),
 				ErrWriter: new(bytes.Buffer),
@@ -265,8 +265,8 @@ func TestInitConfig(t *testing.T) {
 			},
 			wantOutput: disclaimer + missingConfigMsg + hostChoiceMsg + "\n" +
 				fmt.Sprintf(essChoiceMsg, essHostAddress) + regionChoiceMsg + "\n" +
-				formatChoiceMsg + "\n" + authChoiceMsg + "\n" + apiKeyMsg + "\n" +
-				"\n" + fmt.Sprintf(validCredentialsMsg, "anacleto") + finalMsg + "\n",
+				apiKeyMsg + "\n" + formatChoiceMsg + "\n" + "\n" +
+				fmt.Sprintf(validCredentialsMsg, "anacleto") + finalMsg + "\n",
 		},
 		{
 			name: "doesn't find a config file and user creates a new one with user/pass",
@@ -277,9 +277,9 @@ func TestInitConfig(t *testing.T) {
 					strings.NewReader("y\n"),
 					strings.NewReader("2\n"),
 					strings.NewReader("https://ahost\n"),
-					strings.NewReader("1\n"),
 					strings.NewReader("2\n"),
 					strings.NewReader("auser\n"),
+					strings.NewReader("1\n"),
 				),
 				Writer:    new(bytes.Buffer),
 				ErrWriter: new(bytes.Buffer),
@@ -303,7 +303,7 @@ func TestInitConfig(t *testing.T) {
 				"user":     "auser",
 			},
 			wantOutput: disclaimer + missingConfigMsg + hostChoiceMsg + "\n" + eceHostMsg +
-				formatChoiceMsg + "\n" + authChoiceMsg + "\n" + userMsg + passMsg +
+				authChoiceMsg + "\n" + userMsg + passMsg + "\n" + formatChoiceMsg +
 				"\n" + "\n" + fmt.Sprintf(validCredentialsMsg, "auser") + finalMsg + "\n",
 		},
 		{
@@ -316,8 +316,8 @@ func TestInitConfig(t *testing.T) {
 					strings.NewReader("3\n"),
 					strings.NewReader("https://ahost\n"),
 					strings.NewReader("1\n"),
-					strings.NewReader("1\n"),
 					strings.NewReader("anapikey\n"),
+					strings.NewReader("1\n"),
 				),
 				Writer:    new(bytes.Buffer),
 				ErrWriter: new(bytes.Buffer),
@@ -338,7 +338,7 @@ func TestInitConfig(t *testing.T) {
 			wantOutput: disclaimer +
 				fmt.Sprintf(settingsPathMsg, "test_files/userpassmodif.yaml") +
 				userPassConfigToModifyContents + "\n" + existingConfigMsg + hostChoiceMsg +
-				"\n" + esspHostMsg + formatChoiceMsg + "\n" + authChoiceMsg + "\n" + apiKeyMsg +
+				"\n" + esspHostMsg + apiKeyMsg + "\n" + formatChoiceMsg +
 				"\n" + "\n" + fmt.Sprintf(validCredentialsMsg, "anacleto") + finalMsg + "\n",
 		},
 		{
@@ -350,9 +350,9 @@ func TestInitConfig(t *testing.T) {
 					strings.NewReader("y\n"),
 					strings.NewReader("2\n"),
 					strings.NewReader("https://ahost\n"),
-					strings.NewReader("1\n"),
 					strings.NewReader("2\n"),
 					strings.NewReader("auser\n"),
+					strings.NewReader("1\n"),
 				),
 				Writer:    new(bytes.Buffer),
 				ErrWriter: new(bytes.Buffer),
@@ -378,8 +378,8 @@ func TestInitConfig(t *testing.T) {
 			wantOutput: disclaimer +
 				fmt.Sprintf(settingsPathMsg, "test_files/apikeymodif.yaml") +
 				apiKeyConfigToModifyContents + "\n" + existingConfigMsg + hostChoiceMsg +
-				"\n" + eceHostMsg + formatChoiceMsg + "\n" + authChoiceMsg + "\n" + userMsg +
-				passMsg + "\n" + "\n" + fmt.Sprintf(validCredentialsMsg, "auser") + finalMsg + "\n",
+				"\n" + eceHostMsg + authChoiceMsg + "\n" + userMsg +
+				passMsg + "\n" + formatChoiceMsg + "\n" + "\n" + fmt.Sprintf(validCredentialsMsg, "auser") + finalMsg + "\n",
 		},
 	}
 	for _, tt := range tests {