4194: refactor router wrapper into a separate file.

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index f30287a448e45b92c1ca135b927b673a51a0baa6..e50a9a31037a905ea89c711f22e16dbfa1fc732a 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -21,7 +21,6 @@ import (
        "strings"
        "testing"
        "time"
-       "git.curoverse.com/arvados.git/services/keep"
 )
 
 // A RequestTester represents the parameters for an HTTP request to
@@ -751,7 +750,7 @@ func IssueRequest(router *mux.Router, rt *RequestTester) *httptest.ResponseRecor
        if rt.api_token != "" {
                req.Header.Set("Authorization", "OAuth2 "+rt.api_token)
        }
-  routerWrapper := keep_utils.MakeRESTRouterWrapper(router)
+  routerWrapper := MakeRESTRouterWrapper(router)
   routerWrapper.ServeHTTP(response, req)
        return response
 }

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 6d149f79a288e579fecf0dbd11f7f1cef96fb7fb..9c608d5cc8033751c2f2d0201fc25cbeb25c177d 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -13,7 +13,6 @@ import (
        "strings"
        "syscall"
        "time"
-       "git.curoverse.com/arvados.git/services/keep"
 )
 
 // ======================
@@ -264,7 +263,7 @@ func main() {
        KeepVM = MakeRRVolumeManager(goodvols)
 
        // Tell the built-in HTTP server to direct all requests to the REST router.
-  routerWrapper := keep_utils.MakeRESTRouterWrapper(MakeRESTRouter())
+  routerWrapper := MakeRESTRouterWrapper(MakeRESTRouter())
   http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
     routerWrapper.ServeHTTP(resp, req)
   })

diff --git a/services/keep/keep_utils.go b/services/keepstore/router_wrapper.go
similarity index 98%
rename from services/keep/keep_utils.go
rename to services/keepstore/router_wrapper.go
index e9163c0b19075148cc02d009b68b3517bc8ff5a6..3e06f56f96970ba140474bbe32bcb2b28fc564ba 100644 (file)
--- a/services/keep/keep_utils.go
+++ b/services/keepstore/router_wrapper.go
@@ -1,4 +1,4 @@
-package keep_utils
+package main
 
 // RESTRouterWrapper
 // LoggingResponseWriter