8460: golint fixes.

diff --git a/services/ws/config.go b/services/ws/config.go
index e2d69d0c68a2586b64a830b1baaabc56137c6604..0faa863d82e361ccf8f61ed70dfb2c12a292a978 100644 (file)
--- 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 bb323745d50f56a79c8ce968644710adaae30a73..ea90ec72424c28ca23a40e86722e6219045e362d 100644 (file)
--- 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 ddfbb9e4f14eef36daf815eafca018dee20e9b14..1fbfbad648c5c084e6fd58fe87be20253b025dea 100644 (file)
--- 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 650a2494c329789350ffa137f60140e5e73a82f7..77ebf9ee4a8aed2e6b85454f0a3a77570df11bab 100644 (file)
--- 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 42f7b374331e60d46e7b4aeae56cbfe5abac265b..e467e067205a765ef9bd097c5d95ceda65037abb 100644 (file)
--- 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 3f9800f04ceca866dc4df12965227ae0af07a3f2..13c5ac3db106b508dd79f3108fa8049fd8a899f5 100644 (file)
--- 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 9a9707bb64e6d89a32833486a4c6c445e4ea8db3..1cb302170b9f68dcff48f50e435c750a2c50adc5 100644 (file)
--- 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 763fe59b283a2b243d91bcb8300e77a280368648..701dce0edfe928162e999d4a98181e959b18e9b4 100644 (file)
--- 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")
 }