Merge pull request #7 from rhd-gitops-example/add-lint-to-travis

Add ci-linter to the Travis setup

Author: bigkevmcd

.travis.yml

@@ -1,6 +1,11 @@
 language: go
 go: 1.14
 sudo: false
+before_script:
+ - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh
 cache:
   directories:
     - $GOPATH/pkg/mod
+script:
+- ./bin/golangci-lint run
+- go test -race ./...

pkg/health/health.go

@@ -2,6 +2,7 @@ package health
 
 import (
 	"encoding/json"
+	"log"
 	"net/http"
 )
 
@@ -10,7 +11,9 @@ var GitRevision = "unknown"
 // Handler returns the value of GitRevision in simple struct.
 func Handler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
-	json.NewEncoder(w).Encode(struct {
+	if err := json.NewEncoder(w).Encode(struct {
 		Version string `json:"version"`
-	}{Version: GitRevision})
+	}{Version: GitRevision}); err != nil {
+		log.Printf("failed to encode Health response: %s", err)
+	}
 }

pkg/httpapi/api.go

@@ -209,5 +209,7 @@ func refFromQuery(v url.Values) string {
 func marshalResponse(w http.ResponseWriter, v interface{}) {
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Set("Access-Control-Allow-Origin", "*")
-	json.NewEncoder(w).Encode(v)
+	if err := json.NewEncoder(w).Encode(v); err != nil {
+		log.Printf("failed to encode response: %s", err)
+	}
 }

pkg/httpapi/authorization.go

@@ -7,18 +7,19 @@ import (
 )
 
 const (
-	authHeader      = "Authorization"
-	authTokenCtxKey = "auth-token"
+	authHeader = "Authorization"
 )
 
+type authTokenCtxKey struct{}
+
 // AuthToken gets the auth token from the context.
 func AuthToken(ctx context.Context) string {
-	return ctx.Value(authTokenCtxKey).(string)
+	return ctx.Value(authTokenCtxKey{}).(string)
 }
 
 // WithAuthToken sets the auth token into the context.
 func WithAuthToken(ctx context.Context, t string) context.Context {
-	return context.WithValue(ctx, authTokenCtxKey, t)
+	return context.WithValue(ctx, authTokenCtxKey{}, t)
 }
 
 // AuthenticationMiddleware wraps an http.Handler and checks for the presence of

pkg/parser/parser.go

@@ -13,11 +13,6 @@ import (
 	"github.com/rhd-gitops-example/gitops-backend/pkg/gitfs"
 )
 
-const (
-	serviceLabel = "app.kubernetes.io/name"
-	appLabel     = "app.kubernetes.io/part-of"
-)
-
 // ParseFromGit takes a go-git CloneOptions struct and a filepath, and extracts
 // the service configuration from there.
 func ParseFromGit(path string, opts *git.CloneOptions) ([]*Resource, error) {