X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7407f41105f8000bb3908d41a31daaf3a30d9440..91f7e961f18c0ef8ae584d1c8a53d322b617efee:/lib/controller/fed_containers.go

diff --git a/lib/controller/fed_containers.go b/lib/controller/fed_containers.go
index c62cea1168..fd4f0521bc 100644
--- a/lib/controller/fed_containers.go
+++ b/lib/controller/fed_containers.go
@@ -19,7 +19,7 @@ import (
 func remoteContainerRequestCreate(
 	h *genericFederatedRequestHandler,
 	effectiveMethod string,
-	clusterId *string,
+	clusterID *string,
 	uuid string,
 	remainder string,
 	w http.ResponseWriter,
@@ -42,7 +42,7 @@ func remoteContainerRequestCreate(
 		return true
 	}
 
-	if *clusterId == "" || *clusterId == h.handler.Cluster.ClusterID {
+	if *clusterID == "" || *clusterID == h.handler.Cluster.ClusterID {
 		// Submitting container request to local cluster. No
 		// need to set a runtime_token (rails api will create
 		// one when the container runs) or do a remote cluster
@@ -66,14 +66,14 @@ func remoteContainerRequestCreate(
 
 	crString, ok := request["container_request"].(string)
 	if ok {
-		var crJson map[string]interface{}
-		err := json.Unmarshal([]byte(crString), &crJson)
+		var crJSON map[string]interface{}
+		err := json.Unmarshal([]byte(crString), &crJSON)
 		if err != nil {
 			httpserver.Error(w, err.Error(), http.StatusBadRequest)
 			return true
 		}
 
-		request["container_request"] = crJson
+		request["container_request"] = crJSON
 	}
 
 	containerRequest, ok := request["container_request"].(map[string]interface{})
@@ -117,7 +117,7 @@ func remoteContainerRequestCreate(
 	req.ContentLength = int64(buf.Len())
 	req.Header.Set("Content-Length", fmt.Sprintf("%v", buf.Len()))
 
-	resp, err := h.handler.remoteClusterRequest(*clusterId, req)
+	resp, err := h.handler.remoteClusterRequest(*clusterID, req)
 	h.handler.proxy.ForwardResponse(w, resp, err)
 	return true
 }