Merge pull request exercism#786 from exercism/validate-usr-cfg

Extract user config validation helper
nywilken · Dec 26, 2018 · 69aa991 · 69aa991
2 parents c39243d + 483206e
commit 69aa991
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -1,5 +1,12 @@
 package cmd
 
+import (
+	"fmt"
+
+	"github.com/exercism/cli/config"
+	"github.com/spf13/viper"
+)
+
 const msgWelcomePleaseConfigure = `
 
     Welcome to Exercism!
@@ -33,3 +40,18 @@ const msgMissingMetadata = `
     Please see https://exercism.io/cli-v1-to-v2 for instructions on how to fix it.
 
 `
+
+// validateUserConfig validates the presense of required user config values
+func validateUserConfig(cfg *viper.Viper) error {
+	if cfg.GetString("token") == "" {
+		return fmt.Errorf(
+			msgWelcomePleaseConfigure,
+			config.SettingsURL(cfg.GetString("apibaseurl")),
+			BinaryName,
+		)
+	}
+	if cfg.GetString("workspace") == "" || cfg.GetString("apibaseurl") == "" {
+		return fmt.Errorf(msgRerunConfigure, BinaryName)
+	}
+	return nil
+}
diff --git a/cmd/download.go b/cmd/download.go
@@ -50,11 +50,8 @@ Download other people's solutions by providing the UUID.
 
 func runDownload(cfg config.Config, flags *pflag.FlagSet, args []string) error {
 	usrCfg := cfg.UserViperConfig
-	if usrCfg.GetString("token") == "" {
-		return fmt.Errorf(msgWelcomePleaseConfigure, config.SettingsURL(usrCfg.GetString("apibaseurl")), BinaryName)
-	}
-	if usrCfg.GetString("workspace") == "" || usrCfg.GetString("apibaseurl") == "" {
-		return fmt.Errorf(msgRerunConfigure, BinaryName)
+	if err := validateUserConfig(usrCfg); err != nil {
+		return err
 	}
 
 	uuid, err := flags.GetString("uuid")

diff --git a/cmd/submit.go b/cmd/submit.go
@@ -51,12 +51,8 @@ var submitCmd = &cobra.Command{
 func runSubmit(cfg config.Config, flags *pflag.FlagSet, args []string) error {
 	usrCfg := cfg.UserViperConfig
 
-	if usrCfg.GetString("token") == "" {
-		return fmt.Errorf(msgWelcomePleaseConfigure, config.SettingsURL(usrCfg.GetString("apibaseurl")), BinaryName)
-	}
-
-	if usrCfg.GetString("workspace") == "" {
-		return fmt.Errorf(msgRerunConfigure, BinaryName)
+	if err := validateUserConfig(usrCfg); err != nil {
+		return err
 	}
 
 	for i, arg := range args {

diff --git a/cmd/submit_test.go b/cmd/submit_test.go
@@ -54,6 +54,7 @@ func TestSubmitNonExistentFile(t *testing.T) {
 	v := viper.New()
 	v.Set("token", "abc123")
 	v.Set("workspace", tmpDir)
+	v.Set("apibaseurl", "http://api.example.com")
 
 	cfg := config.Config{
 		Persister:       config.InMemoryPersister{},
@@ -92,6 +93,7 @@ func TestSubmitExerciseWithoutMetadataFile(t *testing.T) {
 	v := viper.New()
 	v.Set("token", "abc123")
 	v.Set("workspace", tmpDir)
+	v.Set("apibaseurl", "http://api.example.com")
 
 	cfg := config.Config{
 		Persister:       config.InMemoryPersister{},
@@ -113,6 +115,7 @@ func TestSubmitFilesAndDir(t *testing.T) {
 	v := viper.New()
 	v.Set("token", "abc123")
 	v.Set("workspace", tmpDir)
+	v.Set("apibaseurl", "http://api.example.com")
 
 	cfg := config.Config{
 		Persister:       config.InMemoryPersister{},
@@ -426,6 +429,7 @@ func TestSubmitOnlyEmptyFile(t *testing.T) {
 	v := viper.New()
 	v.Set("token", "abc123")
 	v.Set("workspace", tmpDir)
+	v.Set("apibaseurl", "http://api.example.com")
 
 	cfg := config.Config{
 		Persister:       config.InMemoryPersister{},
@@ -465,6 +469,7 @@ func TestSubmitFilesFromDifferentSolutions(t *testing.T) {
 	v := viper.New()
 	v.Set("token", "abc123")
 	v.Set("workspace", tmpDir)
+	v.Set("apibaseurl", "http://api.example.com")
 
 	cfg := config.Config{
 		Persister:       config.InMemoryPersister{},