Merge pull request #26 from jimmidyson/fmt-vet-errors

Fix gofmt and vet errors

Author: simo5

options.go

@@ -22,7 +22,7 @@ type Options struct {
 	ProxyPrefix      string        `flag:"proxy-prefix" cfg:"proxy-prefix"`
 	HttpAddress      string        `flag:"http-address" cfg:"http_address"`
 	HttpsAddress     string        `flag:"https-address" cfg:"https_address"`
-	DebugAddress     string        `flag:"debug-address", cfg:"debug_address"`
+	DebugAddress     string        `flag:"debug-address" cfg:"debug_address"`
 	UpstreamFlush    time.Duration `flag:"upstream-flush" cfg:"upstream_flush"`
 	RedirectURL      string        `flag:"redirect-url" cfg:"redirect_url"`
 	ClientID         string        `flag:"client-id" cfg:"client_id" env:"OAUTH2_PROXY_CLIENT_ID"`

providers/session_state_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/openshift/oauth-proxy/cookie"
 	"github.com/bmizerany/assert"
+	"github.com/openshift/oauth-proxy/cookie"
 )
 
 const secret = "0123456789abcdefghijklmnopqrstuv"

test.sh

@@ -2,7 +2,7 @@
 set -e
 
 echo "gofmt"
-diff -u <(echo -n) <(gofmt -d $(find . -type f -name '*.go' -not -path "./.godeps/*"))
+diff -u <(echo -n) <(gofmt -d $(find . -type f -name '*.go' -not -path "./.godeps/*" -not -path "./vendor/*"))
 echo "go vet"
 go vet ./...
 echo "go test"