Merge pull request #251 from opencontrol/errcheck

ensure that errors are handled

circle.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - run:
           name: Install Git
-          command: apk add --no-cache bash git
+          command: apk add --no-cache bash gcc git musl-dev
       - checkout
 
       - run:
@@ -19,9 +19,13 @@ jobs:
           command: |
             go get \
               github.com/axw/gocov/gocov \
+              github.com/kisielk/errcheck \
               github.com/Masterminds/glide \
               github.com/mattn/goveralls \
               golang.org/x/tools/cmd/cover
       - run:
           name: Run tests
           command: ./circleci/coverage.sh
+      - run:
+          name: Check for unhandled errors
+          command: errcheck

lib/workspace.go

@@ -2,13 +2,14 @@ package lib
 
 import (
 	"errors"
-	"github.com/codegangsta/cli"
-	"github.com/opencontrol/compliance-masonry/lib/common"
-	"github.com/opencontrol/compliance-masonry/lib/result"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sync"
+
+	"github.com/codegangsta/cli"
+	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/lib/result"
 )
 
 // localWorkspace struct combines components, standards, and a certification data
@@ -56,10 +57,14 @@ func LoadData(openControlDir string, certificationPath string) (common.Workspace
 		certificationErr = ws.LoadCertification(certificationPath)
 	}(&wg)
 	wg.Wait()
+
 	var errs []error
-	// errs = append(errs, certificationErr)
+	if certificationErr != nil {
+		errs = append(errs, certificationErr)
+	}
 	errs = append(errs, componentsErrs...)
 	errs = append(errs, standardsErrs...)
+
 	return ws, errs
 }
 

masonry-go.go

@@ -134,5 +134,8 @@ func NewCLIApp() *cli.App {
 
 func main() {
 	app := NewCLIApp()
-	app.Run(os.Args)
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Fatalln(err)
+	}
 }

masonry-go_test.go

@@ -80,7 +80,7 @@ var _ = Describe("Masonry CLI", func() {
 			})
 		})
 		AfterEach(func() {
-			os.RemoveAll(exportTempDir)
+			_ = os.RemoveAll(exportTempDir)
 		})
 	})
 
@@ -115,8 +115,8 @@ func Masonry(args ...string) *Session {
 	stdin, err := cmd.StdinPipe()
 	Expect(err).ToNot(HaveOccurred())
 	buffer := bufio.NewWriter(stdin)
-	buffer.WriteString(strings.Join(args, " "))
-	buffer.Flush()
+	_, _ = buffer.WriteString(strings.Join(args, " "))
+	_ = buffer.Flush()
 	session, err := Start(cmd, GinkgoWriter, GinkgoWriter)
 	Expect(err).NotTo(HaveOccurred())
 	return session