Fix errcheck warnings

Signed-off-by: Anton Weiss <[email protected]>
meshery · Feb 26, 2020 · 63368c3 · 63368c3
1 parent 8ad839f
commit 63368c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       uses: actions/setup-go@v1
       with:
         go-version: ${{ secrets.GO_VERSION }}
-    - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u github.com/kisielk/errcheck; /home/runner/go/bin/errcheck ./...
+    - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u github.com/kisielk/errcheck; /home/runner/go/bin/errcheck -exclude errcheck_excludes.txt ./...
   static_check:
     name: Static check
     runs-on: ubuntu-latest

diff --git a/errcheck_excludes.txt b/errcheck_excludes.txt
@@ -0,0 +1,3 @@
+(io.Closer).Close
+(*os.File).Close
+(*github.com/layer5io/meshery-linkerd/linkerd.YAMLDecoder).Close
diff --git a/linkerd/install.go b/linkerd/install.go
@@ -204,13 +204,12 @@ func (iClient *Client) execute(command ...string) (string, string, error) {
 	var outb, errb bytes.Buffer
 	cmd.Stdout = &outb
 	cmd.Stderr = &errb
-	// err = cmd.Run()
-	cmd.Run()
-	// if err != nil {
-	// 	err = errors.Wrapf(err, "error while executing requested command")
-	// 	logrus.Error(err)
-	// 	return "", "", err
-	// }
+
+	err = cmd.Run()
+	if err != nil {
+		err = errors.Wrapf(err, "error while executing requested command")
+		logrus.Error(err)
+	}
 	logrus.Debugf("Received output: %s", outb.String())
 	logrus.Debugf("Received error: %s", errb.String())
 	return outb.String(), errb.String(), nil