Revert added error handling

- This linting task is separate from TESv1.1 compliance and could use it's own PR/issue for discussion
ohsu-comp-bio · Jul 29, 2023 · a3fa7ac · a3fa7ac
1 parent 9249ce0
commit a3fa7ac
Show file tree

Hide file tree

Showing 67 changed files with 293 additions and 823 deletions.
diff --git a/cmd/aws/batch/createall.go b/cmd/aws/batch/createall.go
@@ -44,10 +44,7 @@ var createCmd = &cobra.Command{
 
 		if funnelConfigFile != "" {
 			funnelConf := config.Config{}
-			err := config.ParseFile(funnelConfigFile, &funnelConf)
-			if err != nil {
-				return err
-			}
+			config.ParseFile(funnelConfigFile, &funnelConf)
 			conf.Funnel = funnelConf
 		}
 

diff --git a/cmd/aws/batch/createjobdef.go b/cmd/aws/batch/createjobdef.go
@@ -38,10 +38,7 @@ var jobDefCmd = &cobra.Command{
 
 		if funnelConfigFile != "" {
 			funnelConf := config.Config{}
-			err := config.ParseFile(funnelConfigFile, &funnelConf)
-			if err != nil {
-				return err
-			}
+			config.ParseFile(funnelConfigFile, &funnelConf)
 			conf.Funnel = funnelConf
 		}
 

diff --git a/cmd/completion.go b/cmd/completion.go
@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"log"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -18,10 +17,7 @@ var bash = &cobra.Command{
 	Long: `This command generates bash CLI completion code.
 Add "source <(funnel completion bash)" to your bash profile.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		err := RootCmd.GenBashCompletion(os.Stdout)
-		if err != nil {
-			log.Fatalf("Error generating bash completion: %v", err)
-		}
+		RootCmd.GenBashCompletion(os.Stdout)
 	},
 }
 

diff --git a/cmd/node/run.go b/cmd/node/run.go
@@ -25,10 +25,7 @@ func Run(ctx context.Context, conf config.Config, log *logger.Logger) error {
 		if err != nil {
 			return err
 		}
-		err = w.Run(ctx)
-		if err != nil {
-			return err
-		}
+		w.Run(ctx)
 		return nil
 	}
 
@@ -37,8 +34,8 @@ func Run(ctx context.Context, conf config.Config, log *logger.Logger) error {
 		return err
 	}
 
-	_, cancel := context.WithCancel(context.Background())
-	runctx := util.SignalContext(ctx, time.Nanosecond, syscall.SIGINT, syscall.SIGTERM)
+	runctx, cancel := context.WithCancel(context.Background())
+	runctx = util.SignalContext(ctx, time.Nanosecond, syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
 
 	hupsig := make(chan os.Signal, 1)
@@ -54,10 +51,7 @@ func Run(ctx context.Context, conf config.Config, log *logger.Logger) error {
 	}()
 	signal.Notify(hupsig, syscall.SIGHUP)
 
-	err = n.Run(runctx)
-	if err != nil {
-		return err
-	}
+	n.Run(runctx)
 
 	return nil
 }
diff --git a/cmd/run/cmd.go b/cmd/run/cmd.go
@@ -22,7 +22,7 @@ var Cmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		err := Run(args)
 		if err != nil {
-			err := cmd.Usage()
+			cmd.Usage()
 			return err
 		}
 		return err

diff --git a/cmd/run/flags.go b/cmd/run/flags.go
@@ -172,10 +172,7 @@ func parseTopLevelArgs(vals *flagVals, args []string) error {
 
 func parseTaskArgs(vals *flagVals, args []string) {
 	fl := newFlags(vals)
-	err := fl.Parse(args)
-	if err != nil {
-		return
-	}
+	fl.Parse(args)
 	buildExecs(fl, vals, args)
 }
 
@@ -188,7 +185,7 @@ func parseTaskArgs(vals *flagVals, args []string) {
 func buildExecs(flags *pflag.FlagSet, vals *flagVals, args []string) {
 	vals.execs = nil
 	var exec *executor
-	err := flags.ParseAll(args, func(f *pflag.Flag, value string) error {
+	flags.ParseAll(args, func(f *pflag.Flag, value string) error {
 		switch f.Name {
 		case "sh", "exec":
 			if exec != nil {
@@ -210,9 +207,6 @@ func buildExecs(flags *pflag.FlagSet, vals *flagVals, args []string) {
 		}
 		return nil
 	})
-	if err != nil {
-		return
-	}
 	if exec != nil {
 		vals.execs = append(vals.execs, *exec)
 	}

diff --git a/cmd/run/task_group.go b/cmd/run/task_group.go
@@ -56,10 +56,7 @@ func (tg *taskGroup) _run(task *tes.Task, wait bool, waitFor []string) error {
 
 	if len(waitFor) > 0 {
 		for _, tid := range waitFor {
-			err := tg.client.WaitForTask(context.Background(), tid)
-			if err != nil {
-				return err
-			}
+			tg.client.WaitForTask(context.Background(), tid)
 		}
 	}
 

diff --git a/cmd/task/create.go b/cmd/task/create.go
@@ -22,10 +22,10 @@ func Create(server string, files []string, reader io.Reader, writer io.Writer) e
 
 	for _, taskFile := range files {
 		f, err := os.Open(taskFile)
+		defer f.Close()
 		if err != nil {
 			return err
 		}
-		defer f.Close()
 		reader = io.MultiReader(reader, f)
 	}
 

diff --git a/cmd/task/task_test.go b/cmd/task/task_test.go
@@ -20,10 +20,7 @@ func TestGet(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"get", "--view", "MINIMAL", "1", "2"})
-	err := cmd.Execute()
-	if err != nil {
-		t.Error(err)
-	}
+	cmd.Execute()
 }
 
 // "get" command should have default view of FULL
@@ -38,10 +35,7 @@ func TestGetDefaultView(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"get", "1", "2"})
-	err := cmd.Execute()
-	if err != nil {
-		t.Error(err)
-	}
+	cmd.Execute()
 }
 
 func TestList(t *testing.T) {
@@ -55,10 +49,7 @@ func TestList(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"list", "--view", "FULL"})
-	err := cmd.Execute()
-	if err != nil {
-		t.Error(err)
-	}
+	cmd.Execute()
 }
 
 // Test that the server URL defaults to localhost:8000
@@ -97,34 +88,19 @@ func TestServerDefault(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"create", "foo.json"})
-	err := cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"list"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"get", "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"cancel", "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"wait", "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 }
 
 // Test that the server URL may be set via a FUNNEL_SERVER environment
@@ -166,34 +142,19 @@ func TestServerEnv(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"create", "foo.json"})
-	err := cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"list"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"get", "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"cancel", "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"wait", "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 }
 
 // Test that the server flag overrides the FUNNEL_SERVER env var
@@ -235,32 +196,17 @@ func TestServerFlagOverride(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"create", "-S", srv, "foo.json"})
-	err := cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"list", "-S", srv})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"get", "-S", srv, "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"cancel", "-S", srv, "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 
 	cmd.SetArgs([]string{"wait", "-S", srv, "1"})
-	err = cmd.Execute()
-	if err != nil {
-		t.Errorf("%s", err)
-	}
+	cmd.Execute()
 }
diff --git a/cmd/worker/worker_test.go b/cmd/worker/worker_test.go
@@ -65,10 +65,7 @@ func TestTaskFileOption(t *testing.T) {
 	}
 
 	c.SetArgs([]string{"run", "--taskFile", "test.task.json"})
-	err := c.Execute()
-	if err != nil {
-		t.Fatal(err)
-	}
+	c.Execute()
 
 	h.Run = func(ctx context.Context, conf config.Config, log *logger.Logger, opts *Options) error {
 		if opts.TaskFile != "test.task.json" {
@@ -78,10 +75,7 @@ func TestTaskFileOption(t *testing.T) {
 	}
 
 	c.SetArgs([]string{"run", "-f", "test.task.json"})
-	err = c.Execute()
-	if err != nil {
-		t.Fatal(err)
-	}
+	c.Execute()
 
 	h.Run = func(ctx context.Context, conf config.Config, log *logger.Logger, opts *Options) error {
 		if opts.TaskBase64 != "abcd" {
@@ -91,10 +85,7 @@ func TestTaskFileOption(t *testing.T) {
 	}
 
 	c.SetArgs([]string{"run", "--taskBase64", "abcd"})
-	err = c.Execute()
-	if err != nil {
-		t.Fatal(err)
-	}
+	c.Execute()
 
 	h.Run = func(ctx context.Context, conf config.Config, log *logger.Logger, opts *Options) error {
 		if opts.TaskBase64 != "abcd" {
@@ -104,8 +95,5 @@ func TestTaskFileOption(t *testing.T) {
 	}
 
 	c.SetArgs([]string{"run", "-b", "abcd"})
-	err = c.Execute()
-	if err != nil {
-		t.Fatal(err)
-	}
+	c.Execute()
 }