Fix/lint

.github/workflows/tests.yaml

@@ -16,7 +16,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: latest
-          args: --timeout 3m --verbose
+          args: --timeout 3m --verbose --disable unused --exclude "deprecated"
 
   build:
     runs-on: ubuntu-latest
@@ -49,37 +49,3 @@ jobs:
       uses: actions/checkout@v2
     - name: Unit Tests
       run: make test
-
-  mongoTest:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - name: Check out code
-      uses: actions/checkout@v2
-
-    - name: Download funnel bin
-      uses: actions/download-artifact@v2
-      with:
-        name: funnelBin
-    - name: MongoTest
-      run: |
-        chmod +x funnel
-        make start-mongodb
-        sleep 10
-        make test-mongodb
-
-  badgerTest:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-    - name: Check out code
-      uses: actions/checkout@v2
-
-    - name: Download funnel bin
-      uses: actions/download-artifact@v2
-      with:
-        name: funnelBin
-    - name: Badger Test
-      run: |
-        chmod +x funnel
-        make test-badger

cmd/aws/batch/createall.go

@@ -44,7 +44,10 @@ var createCmd = &cobra.Command{
 
 		if funnelConfigFile != "" {
 			funnelConf := config.Config{}
-			config.ParseFile(funnelConfigFile, &funnelConf)
+			err := config.ParseFile(funnelConfigFile, &funnelConf)
+			if err != nil {
+				return err
+			}
 			conf.Funnel = funnelConf
 		}
 

cmd/aws/batch/createjobdef.go

@@ -38,7 +38,10 @@ var jobDefCmd = &cobra.Command{
 
 		if funnelConfigFile != "" {
 			funnelConf := config.Config{}
-			config.ParseFile(funnelConfigFile, &funnelConf)
+			err := config.ParseFile(funnelConfigFile, &funnelConf)
+			if err != nil {
+				return err
+			}
 			conf.Funnel = funnelConf
 		}
 

cmd/completion.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"log"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -17,7 +18,10 @@ 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) {
-		RootCmd.GenBashCompletion(os.Stdout)
+		err := RootCmd.GenBashCompletion(os.Stdout)
+		if err != nil {
+			log.Fatalf("Error generating bash completion: %v", err)
+		}
 	},
 }
 

cmd/node/run.go

@@ -25,7 +25,10 @@ func Run(ctx context.Context, conf config.Config, log *logger.Logger) error {
 		if err != nil {
 			return err
 		}
-		w.Run(ctx)
+		err = w.Run(ctx)
+		if err != nil {
+			return err
+		}
 		return nil
 	}
 
@@ -34,8 +37,8 @@ func Run(ctx context.Context, conf config.Config, log *logger.Logger) error {
 		return err
 	}
 
-	runctx, cancel := context.WithCancel(context.Background())
-	runctx = util.SignalContext(ctx, time.Nanosecond, syscall.SIGINT, syscall.SIGTERM)
+	_, cancel := context.WithCancel(context.Background())
+	runctx := util.SignalContext(ctx, time.Nanosecond, syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
 
 	hupsig := make(chan os.Signal, 1)
@@ -51,7 +54,10 @@ func Run(ctx context.Context, conf config.Config, log *logger.Logger) error {
 	}()
 	signal.Notify(hupsig, syscall.SIGHUP)
 
-	n.Run(runctx)
+	err = n.Run(runctx)
+	if err != nil {
+		return err
+	}
 
 	return nil
 }

cmd/run/cmd.go

@@ -22,7 +22,8 @@ var Cmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		err := Run(args)
 		if err != nil {
-			//cmd.Usage()
+			err := cmd.Usage()
+			return err
 		}
 		return err
 	},

cmd/run/flags.go

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

cmd/run/task_group.go

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

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)
 	}
 

cmd/task/list.go

@@ -13,7 +13,6 @@ import (
 // calls ListTasks() and requests the given task view.
 // Output is written to the given writer.
 func List(server, taskView, pageToken, stateFilter string, tagsFilter []string, namePrefix string, pageSize int32, all bool, writer io.Writer) error {
-	fmt.Println("DEBUG List()")
 	cli, err := tes.NewClient(server)
 	if err != nil {
 		return err
@@ -44,12 +43,12 @@ func List(server, taskView, pageToken, stateFilter string, tagsFilter []string,
 
 	for {
 		req := &tes.ListTasksRequest{
-			View:      taskView,
-			PageToken: pageToken,
-			PageSize:  pageSize,
-			State:     state,
-			TagKey:    tagKeys,
-			TagValue:  tagVals,
+			View:       taskView,
+			PageToken:  pageToken,
+			PageSize:   pageSize,
+			State:      state,
+			TagKey:     tagKeys,
+			TagValue:   tagVals,
 			NamePrefix: namePrefix,
 		}
 

cmd/task/task_test.go

@@ -20,7 +20,10 @@ func TestGet(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"get", "--view", "MINIMAL", "1", "2"})
-	cmd.Execute()
+	err := cmd.Execute()
+	if err != nil {
+		t.Error(err)
+	}
 }
 
 // "get" command should have default view of FULL
@@ -35,7 +38,10 @@ func TestGetDefaultView(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"get", "1", "2"})
-	cmd.Execute()
+	err := cmd.Execute()
+	if err != nil {
+		t.Error(err)
+	}
 }
 
 func TestList(t *testing.T) {
@@ -49,7 +55,10 @@ func TestList(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"list", "--view", "FULL"})
-	cmd.Execute()
+	err := cmd.Execute()
+	if err != nil {
+		t.Error(err)
+	}
 }
 
 // Test that the server URL defaults to localhost:8000
@@ -88,19 +97,34 @@ func TestServerDefault(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"create", "foo.json"})
-	cmd.Execute()
+	err := cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"list"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"get", "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"cancel", "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"wait", "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 }
 
 // Test that the server URL may be set via a FUNNEL_SERVER environment
@@ -142,19 +166,34 @@ func TestServerEnv(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"create", "foo.json"})
-	cmd.Execute()
+	err := cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"list"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"get", "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"cancel", "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"wait", "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 }
 
 // Test that the server flag overrides the FUNNEL_SERVER env var
@@ -196,17 +235,32 @@ func TestServerFlagOverride(t *testing.T) {
 	}
 
 	cmd.SetArgs([]string{"create", "-S", srv, "foo.json"})
-	cmd.Execute()
+	err := cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"list", "-S", srv})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"get", "-S", srv, "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"cancel", "-S", srv, "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 
 	cmd.SetArgs([]string{"wait", "-S", srv, "1"})
-	cmd.Execute()
+	err = cmd.Execute()
+	if err != nil {
+		t.Errorf("%s", err)
+	}
 }

cmd/termdash/compact/grid.go

@@ -61,7 +61,5 @@ func (cg *Grid) Buffer() ui.Buffer {
 }
 
 func (cg *Grid) AddRows(rows ...ui.GridBufferer) {
-	for _, r := range rows {
-		cg.Rows = append(cg.Rows, r)
-	}
+	cg.Rows = append(cg.Rows, rows...)
 }

cmd/termdash/config/main.go

@@ -9,10 +9,6 @@ var (
 )
 
 func Init() {
-	for _, p := range params {
-		GlobalParams = append(GlobalParams, p)
-	}
-	for _, s := range switches {
-		GlobalSwitches = append(GlobalSwitches, s)
-	}
+	GlobalParams = append(GlobalParams, params...)
+	GlobalSwitches = append(GlobalSwitches, switches...)
 }