Replaced checks with checks.sh from volplugin + addressed issues found by deadcode and misspell

Signed-off-by: Bill Robinson <[email protected]>

Author: dseevr

Makefile

@@ -18,11 +18,16 @@ stop:
 test: start build
 	vagrant ssh node1 -c 'cd /opt/gopath/src/github.com/contiv/objdb && make host-test'
 
+# build compiles and installs the code after running code quality checks
 host-build:
-	./checks "./*.go ./modeldb"
+	./checks.sh 
 	go get github.com/tools/godep
-	godep go install ./ ./modeldb
+	go install ./ ./modeldb
 
 host-test:
-	godep go test -v ./ ./modeldb
-	godep go test -bench=. -run "Benchmark"
+	go test -v ./ ./modeldb
+	go test -bench=. -run "Benchmark"
+
+# godep updates Godeps/Godeps.json
+godep:
+	godep save ./...

checks

@@ -0,0 +1,78 @@
+#!/bin/sh
+
+set -e
+
+dirs=$(go list ./... | sed -e 's!github.com/contiv/objdb!.!g' | grep -v ./vendor)
+files=$(find . -type f -name '*.go' | grep -v ./vendor)
+
+echo "Running gofmt..."
+set +e
+out=$(gofmt -s -l ${files})
+set -e
+# gofmt can include empty lines in its output
+if [ "$(echo $out | sed '/^$/d' | wc -l)" -gt 0 ]; then
+	echo 1>&2 "gofmt errors in:"
+	echo 1>&2 "${out}"
+	exit 1
+fi
+
+echo "Running ineffassign..."
+[ -n "$(which ineffassign)" ] || go get github.com/gordonklaus/ineffassign
+for i in ${dirs}; do
+	ineffassign $i
+done
+
+echo "Running golint..."
+[ -n "$(which golint)" ] || go get github.com/golang/lint/golint
+set +e
+out=$(golint ./... | grep -vE '^vendor')
+set -e
+if [ "$(echo $out | sed '/^$/d' | wc -l)" -gt 0 ]; then
+	echo 1>&2 "golint errors in:"
+	echo 1>&2 "${out}"
+	exit 1
+fi
+
+echo "Running govet..."
+set +e
+out=$(go tool vet -composites=false ${dirs} 2>&1 | grep -v vendor)
+set -e
+
+if [ "$(echo $out | sed '/^$/d' | wc -l)" -gt 0 ]; then
+	echo 1>&2 "go vet errors in:"
+	echo 1>&2 "${out}"
+	exit 1
+fi
+
+echo "Running gocyclo..."
+[ -n "$(which gocyclo)" ] || go get github.com/fzipp/gocyclo
+set +e
+out=$(gocyclo -over 20 . | grep -v vendor)
+set -e
+if [ "$(echo $out | sed '/^$/d' | wc -l)" -gt 0 ]; then
+	echo 1>&2 "gocycle errors in:"
+	echo 1>&2 "${out}"
+	exit 1
+fi
+
+echo "Running misspell..."
+[ -n "$(which misspell)" ] || go get github.com/client9/misspell/...
+set +e
+out=$(misspell -locale US -error -i exportfs ${files})
+set -e
+if [ "$(echo $out | sed '/^$/d' | wc -l)" -gt 0 ]; then
+	echo 1>&2 "misspell errors in:"
+	echo 1>&2 "${out}"
+	exit 1
+fi
+
+echo "Running deadcode..."
+[ -n "$(which deadcode)" ] || go get github.com/remyoudompheng/go-misc/deadcode/...
+set +e
+out=$(deadcode ${dirs} 2>&1)
+set -e
+if [ "$(echo $out | sed '/^$/d' | wc -l)" -gt 0 ]; then
+	echo 1>&2 "deadcode errors in:"
+	echo 1>&2 "${out}"
+	exit 1
+fi

checks.sh

@@ -258,7 +258,7 @@ func (cp *ConsulClient) DeregisterService(serviceInfo ServiceInfo) error {
 	return nil
 }
 
-//--------------------- Internal funcitons -------------------
+//--------------------- Internal functions -------------------
 func (cp *ConsulClient) renewService(keyName, ttl, sessionID string, jsonVal []byte, stopChan chan struct{}) {
 	for {
 		err := cp.client.Session().RenewPeriodic(ttl, sessionID, nil, stopChan)

consulService.go

@@ -18,8 +18,6 @@ package objdb
 import (
 	"encoding/json"
 	"errors"
-	"io/ioutil"
-	"net/http"
 	"sync"
 	"time"
 
@@ -41,15 +39,6 @@ type EtcdClient struct {
 	serviceDb map[string]*etcdServiceState
 }
 
-type member struct {
-	Name       string   `json:"name"`
-	ClientURLs []string `json:"clientURLs"`
-}
-
-type memData struct {
-	Members []member `json:"members"`
-}
-
 // Max retry count
 const maxEtcdRetries = 10
 
@@ -253,26 +242,3 @@ func (ep *EtcdClient) DelObj(key string) error {
 
 	return nil
 }
-
-// Get JSON output from a http request
-func httpGetJSON(url string, data interface{}) (interface{}, error) {
-	res, err := http.Get(url)
-	if err != nil {
-		log.Errorf("Error during http get. Err: %v", err)
-		return nil, err
-	}
-	body, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		log.Errorf("Error during ioutil readall. Err: %v", err)
-		return nil, err
-	}
-
-	if err := json.Unmarshal(body, data); err != nil {
-		log.Errorf("Error during json unmarshall. Err: %v", err)
-		return nil, err
-	}
-
-	log.Debugf("Results for (%s): %+v\n", url, data)
-
-	return data, nil
-}