[ARVADOS] updated: 1.2.0-35-g8858ba320
Git user
git at public.curoverse.com
Mon Sep 10 16:31:17 EDT 2018
Summary of changes:
lib/controller/federation.go | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
via 8858ba320e28c7c7cee294257f9e2232dfd41230 (commit)
from d69693c92dbd82cfe5e797f2dbffc6f32e0e2ff0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 8858ba320e28c7c7cee294257f9e2232dfd41230
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Mon Sep 10 16:20:32 2018 -0400
13993: Don't export internal types
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/lib/controller/federation.go b/lib/controller/federation.go
index c4ccb15d2..c9501d367 100644
--- a/lib/controller/federation.go
+++ b/lib/controller/federation.go
@@ -25,12 +25,12 @@ import (
var wfRe = regexp.MustCompile(`^/arvados/v1/workflows/([0-9a-z]{5})-[^/]+$`)
var collectionRe = regexp.MustCompile(`^/arvados/v1/collections/([0-9a-z]{5})-[^/]+$`)
-type GenericFederatedRequestHandler struct {
+type genericFederatedRequestHandler struct {
next http.Handler
handler *Handler
}
-type CollectionFederatedRequestHandler struct {
+type collectionFederatedRequestHandler struct {
next http.Handler
handler *Handler
}
@@ -64,7 +64,7 @@ func (h *Handler) remoteClusterRequest(remoteID string, w http.ResponseWriter, r
h.proxy.Do(w, req, urlOut, client, filter)
}
-func (h *GenericFederatedRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+func (h *genericFederatedRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
m := wfRe.FindStringSubmatch(req.URL.Path)
if len(m) < 2 || m[1] == h.handler.Cluster.ClusterID {
h.next.ServeHTTP(w, req)
@@ -132,7 +132,7 @@ func (clusterId rewriteSignaturesClusterId) rewriteSignatures(resp *http.Respons
return resp, nil
}
-func (h *CollectionFederatedRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+func (h *collectionFederatedRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
m := collectionRe.FindStringSubmatch(req.URL.Path)
if len(m) < 2 || m[1] == h.handler.Cluster.ClusterID {
h.next.ServeHTTP(w, req)
@@ -145,8 +145,8 @@ func (h *CollectionFederatedRequestHandler) ServeHTTP(w http.ResponseWriter, req
func (h *Handler) setupProxyRemoteCluster(next http.Handler) http.Handler {
mux := http.NewServeMux()
mux.Handle("/arvados/v1/workflows", next)
- mux.Handle("/arvados/v1/workflows/", &GenericFederatedRequestHandler{next, h})
- mux.Handle("/arvados/v1/collections/", &CollectionFederatedRequestHandler{next, h})
+ mux.Handle("/arvados/v1/workflows/", &genericFederatedRequestHandler{next, h})
+ mux.Handle("/arvados/v1/collections/", &collectionFederatedRequestHandler{next, h})
mux.Handle("/", next)
return mux
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list