From: Tom Clegg <tom@curoverse.com>
Date: Mon, 5 Dec 2016 20:40:25 +0000 (-0500)
Subject: 8460: golint fixes.
X-Git-Tag: 1.1.0~538^2~15
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/83ec78f608d67622ccc87b67cc16276a48a0430a

8460: golint fixes.
---

diff --git a/services/ws/config.go b/services/ws/config.go
index e2d69d0c68..0faa863d82 100644
--- a/services/ws/config.go
+++ b/services/ws/config.go
@@ -6,7 +6,7 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 )
 
-type Config struct {
+type wsConfig struct {
 	Client    arvados.Client
 	Postgres  pgConfig
 	Listen    string
@@ -18,8 +18,8 @@ type Config struct {
 	ServerEventQueue int
 }
 
-func DefaultConfig() Config {
-	return Config{
+func defaultConfig() wsConfig {
+	return wsConfig{
 		Client: arvados.Client{
 			APIHost: "localhost:443",
 		},
diff --git a/services/ws/event_source.go b/services/ws/event_source.go
index bb323745d5..ea90ec7242 100644
--- a/services/ws/event_source.go
+++ b/services/ws/event_source.go
@@ -44,7 +44,7 @@ type pgEventSource struct {
 	eventsOut  uint64
 }
 
-var _ DebugStatuser = (*pgEventSource)(nil)
+var _ debugStatuser = (*pgEventSource)(nil)
 
 func (ps *pgEventSource) setup() {
 	ps.shutdown = make(chan error, 1)
diff --git a/services/ws/log.go b/services/ws/log.go
index ddfbb9e4f1..1fbfbad648 100644
--- a/services/ws/log.go
+++ b/services/ws/log.go
@@ -32,7 +32,7 @@ func logger(ctx context.Context) *logrus.Entry {
 }
 
 // loggerConfig sets up logging to behave as configured.
-func loggerConfig(cfg Config) {
+func loggerConfig(cfg wsConfig) {
 	lvl, err := logrus.ParseLevel(cfg.LogLevel)
 	if err != nil {
 		logrus.Fatal(err)
diff --git a/services/ws/main.go b/services/ws/main.go
index 650a2494c3..77ebf9ee4a 100644
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -15,7 +15,7 @@ func main() {
 
 	configPath := flag.String("config", "/etc/arvados/ws/ws.yml", "`path` to config file")
 	dumpConfig := flag.Bool("dump-config", false, "show current configuration and exit")
-	cfg := DefaultConfig()
+	cfg := defaultConfig()
 	flag.Parse()
 
 	err := config.LoadFile(&cfg, *configPath)
@@ -47,7 +47,7 @@ func main() {
 		Handler: &router{
 			Config:         &cfg,
 			eventSource:    eventSource,
-			newPermChecker: func() permChecker { return NewPermChecker(cfg.Client) },
+			newPermChecker: func() permChecker { return newPermChecker(cfg.Client) },
 		},
 	}
 	// Bootstrap the eventSource by attaching a dummy subscriber
diff --git a/services/ws/permission.go b/services/ws/permission.go
index 42f7b37433..e467e06720 100644
--- a/services/ws/permission.go
+++ b/services/ws/permission.go
@@ -18,7 +18,7 @@ type permChecker interface {
 	Check(uuid string) (bool, error)
 }
 
-func NewPermChecker(ac arvados.Client) permChecker {
+func newPermChecker(ac arvados.Client) permChecker {
 	ac.AuthToken = ""
 	return &cachingPermChecker{
 		Client:     &ac,
diff --git a/services/ws/router.go b/services/ws/router.go
index 3f9800f04c..13c5ac3db1 100644
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -22,7 +22,7 @@ type wsConn interface {
 }
 
 type router struct {
-	Config         *Config
+	Config         *wsConfig
 	eventSource    eventSource
 	newPermChecker func() permChecker
 
@@ -41,7 +41,7 @@ type routerDebugStatus struct {
 	ReqsActive   int64
 }
 
-type DebugStatuser interface {
+type debugStatuser interface {
 	DebugStatus() interface{}
 }
 
@@ -53,8 +53,8 @@ func (rtr *router) setup() {
 		QueueSize:   rtr.Config.ClientEventQueue,
 	}
 	rtr.mux = http.NewServeMux()
-	rtr.mux.Handle("/websocket", rtr.makeServer(NewSessionV0))
-	rtr.mux.Handle("/arvados/v1/events.ws", rtr.makeServer(NewSessionV1))
+	rtr.mux.Handle("/websocket", rtr.makeServer(newSessionV0))
+	rtr.mux.Handle("/arvados/v1/events.ws", rtr.makeServer(newSessionV1))
 	rtr.mux.HandleFunc("/debug.json", jsonHandler(rtr.DebugStatus))
 	rtr.mux.HandleFunc("/status.json", jsonHandler(rtr.Status))
 }
@@ -98,7 +98,7 @@ func (rtr *router) DebugStatus() interface{} {
 		"HTTP":     rtr.status,
 		"Outgoing": rtr.handler.DebugStatus(),
 	}
-	if es, ok := rtr.eventSource.(DebugStatuser); ok {
+	if es, ok := rtr.eventSource.(debugStatuser); ok {
 		s["EventSource"] = es.DebugStatus()
 	}
 	return s
diff --git a/services/ws/session_v0.go b/services/ws/session_v0.go
index 9a9707bb64..1cb302170b 100644
--- a/services/ws/session_v0.go
+++ b/services/ws/session_v0.go
@@ -33,7 +33,7 @@ type v0session struct {
 	setupOnce     sync.Once
 }
 
-func NewSessionV0(ws wsConn, sendq chan<- interface{}, db *sql.DB, pc permChecker) (session, error) {
+func newSessionV0(ws wsConn, sendq chan<- interface{}, db *sql.DB, pc permChecker) (session, error) {
 	sess := &v0session{
 		sendq:       sendq,
 		ws:          ws,
diff --git a/services/ws/session_v1.go b/services/ws/session_v1.go
index 763fe59b28..701dce0edf 100644
--- a/services/ws/session_v1.go
+++ b/services/ws/session_v1.go
@@ -5,6 +5,6 @@ import (
 	"errors"
 )
 
-func NewSessionV1(ws wsConn, sendq chan<- interface{}, db *sql.DB, pc permChecker) (session, error) {
+func newSessionV1(ws wsConn, sendq chan<- interface{}, db *sql.DB, pc permChecker) (session, error) {
 	return nil, errors.New("Not implemented")
 }