Extract common validate user config

Fix test errors and non-checked nil error return vals
nywilken · Jan 2, 2019 · ff65f76 · ff65f76
1 parent e5c47fe
commit ff65f76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/cmd/submit.go b/cmd/submit.go
@@ -58,6 +58,10 @@ type submitContext struct {
 }
 
 func runSubmit(cfg config.Config, flags *pflag.FlagSet, args []string) error {
+	if err := validateUserConfig(cfg.UserViperConfig); err != nil {
+		return err
+	}
+
 	ctx, err := newSubmitContext(cfg.UserViperConfig, flags, args)
 	if err != nil {
 		return err
@@ -92,17 +96,6 @@ func runSubmit(cfg config.Config, flags *pflag.FlagSet, args []string) error {
 
 // newSubmitContext creates a submitContext, sanitizing given args.
 func newSubmitContext(usrCfg *viper.Viper, flags *pflag.FlagSet, args []string) (*submitContext, error) {
-	if usrCfg.GetString("token") == "" {
-		return nil, fmt.Errorf(
-			msgWelcomePleaseConfigure,
-			config.SettingsURL(usrCfg.GetString("apibaseurl")),
-			BinaryName,
-		)
-	}
-	if usrCfg.GetString("workspace") == "" {
-		return nil, fmt.Errorf(msgRerunConfigure, BinaryName)
-	}
-
 	ctx := &submitContext{usrCfg: usrCfg, flags: flags, args: args}
 	return ctx, ctx.sanitizeArgs()
 }

diff --git a/cmd/submit_test.go b/cmd/submit_test.go
@@ -134,6 +134,7 @@ func TestSubmitFilesAndDir(t *testing.T) {
 		tmpDir,
 		filepath.Join(tmpDir, "file-2.txt"),
 	}
+
 	err = runSubmit(cfg, pflag.NewFlagSet("fake", pflag.PanicOnError), files)
 	if assert.Error(t, err) {
 		assert.Regexp(t, "submitting a directory", err.Error())