TrueCloudLab/distribution
13
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #8423 from unclejack/lint_changes

Browse source 
lint changes part 1
This commit is contained in:
Tibor Vass 2014-10-21 12:15:58 -04:00
commit d81951fffa
5 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/auth.go
View file

@ -227,12 +227,11 @@ func Login(authConfig *AuthConfig, factory *utils.HTTPRequestFactory) (string, e
return "", fmt.Errorf("Login: Account is not Active. Please check your e-mail for a confirmation link.") return "", fmt.Errorf("Login: Account is not Active. Please check your e-mail for a confirmation link.")
} }
return "", fmt.Errorf("Login: Account is not Active. Please see the documentation of the registry %s for instructions how to activate it.", serverAddress) return "", fmt.Errorf("Login: Account is not Active. Please see the documentation of the registry %s for instructions how to activate it.", serverAddress)
} else { }
return "", fmt.Errorf("Login: %s (Code: %d; Headers: %s)", body, resp.StatusCode, resp.Header) return "", fmt.Errorf("Login: %s (Code: %d; Headers: %s)", body, resp.StatusCode, resp.Header)
} }
} else {
return "", fmt.Errorf("Registration: %s", reqBody) return "", fmt.Errorf("Registration: %s", reqBody)
}
} else if reqStatusCode == 401 { } else if reqStatusCode == 401 {
// This case would happen with private registries where /v1/users is // This case would happen with private registries where /v1/users is
// protected, so people can use `docker login` as an auth check. // protected, so people can use `docker login` as an auth check.

4
docs/endpoint.go
View file

@ -13,7 +13,7 @@ import (
) )
// scans string for api version in the URL path. returns the trimmed hostname, if version found, string and API version. // scans string for api version in the URL path. returns the trimmed hostname, if version found, string and API version.
func scanForApiVersion(hostname string) (string, APIVersion) { func scanForAPIVersion(hostname string) (string, APIVersion) {
var ( var (
chunks []string chunks []string
apiVersionStr string apiVersionStr string
@ -43,7 +43,7 @@ func NewEndpoint(hostname string) (*Endpoint, error) {
if !strings.HasPrefix(hostname, "http") { if !strings.HasPrefix(hostname, "http") {
hostname = "https://" + hostname hostname = "https://" + hostname
} }
trimmedHostname, endpoint.Version = scanForApiVersion(hostname) trimmedHostname, endpoint.Version = scanForAPIVersion(hostname)
endpoint.URL, err = url.Parse(trimmedHostname) endpoint.URL, err = url.Parse(trimmedHostname)
if err != nil { if err != nil {
return nil, err return nil, err

22
docs/registry_mock_test.go
View file

@ -19,7 +19,7 @@ import (
) )
var ( var (
testHttpServer *httptest.Server testHTTPServer *httptest.Server
testLayers = map[string]map[string]string{ testLayers = map[string]map[string]string{
"77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20": { "77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20": {
"json": `{"id":"77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20", "json": `{"id":"77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20",
@ -99,7 +99,7 @@ func init() {
// /v2/ // /v2/
r.HandleFunc("/v2/version", handlerGetPing).Methods("GET") r.HandleFunc("/v2/version", handlerGetPing).Methods("GET")
testHttpServer = httptest.NewServer(handlerAccessLog(r)) testHTTPServer = httptest.NewServer(handlerAccessLog(r))
} }
func handlerAccessLog(handler http.Handler) http.Handler { func handlerAccessLog(handler http.Handler) http.Handler {
@ -111,7 +111,7 @@ func handlerAccessLog(handler http.Handler) http.Handler {
} }
func makeURL(req string) string { func makeURL(req string) string {
return testHttpServer.URL + req return testHTTPServer.URL + req
} }
func writeHeaders(w http.ResponseWriter) { func writeHeaders(w http.ResponseWriter) {
@ -198,8 +198,8 @@ func handlerGetImage(w http.ResponseWriter, r *http.Request) {
return return
} }
writeHeaders(w) writeHeaders(w)
layer_size := len(layer["layer"]) layerSize := len(layer["layer"])
w.Header().Add("X-Docker-Size", strconv.Itoa(layer_size)) w.Header().Add("X-Docker-Size", strconv.Itoa(layerSize))
io.WriteString(w, layer[vars["action"]]) io.WriteString(w, layer[vars["action"]])
} }
@ -208,16 +208,16 @@ func handlerPutImage(w http.ResponseWriter, r *http.Request) {
return return
} }
vars := mux.Vars(r) vars := mux.Vars(r)
image_id := vars["image_id"] imageID := vars["image_id"]
action := vars["action"] action := vars["action"]
layer, exists := testLayers[image_id] layer, exists := testLayers[imageID]
if !exists { if !exists {
if action != "json" { if action != "json" {
http.NotFound(w, r) http.NotFound(w, r)
return return
} }
layer = make(map[string]string) layer = make(map[string]string)
testLayers[image_id] = layer testLayers[imageID] = layer
} }
if checksum := r.Header.Get("X-Docker-Checksum"); checksum != "" { if checksum := r.Header.Get("X-Docker-Checksum"); checksum != "" {
if checksum != layer["checksum_simple"] && checksum != layer["checksum_tarsum"] { if checksum != layer["checksum_simple"] && checksum != layer["checksum_tarsum"] {
@ -301,7 +301,7 @@ func handlerUsers(w http.ResponseWriter, r *http.Request) {
} }
func handlerImages(w http.ResponseWriter, r *http.Request) { func handlerImages(w http.ResponseWriter, r *http.Request) {
u, _ := url.Parse(testHttpServer.URL) u, _ := url.Parse(testHTTPServer.URL)
w.Header().Add("X-Docker-Endpoints", fmt.Sprintf("%s , %s ", u.Host, "test.example.com")) w.Header().Add("X-Docker-Endpoints", fmt.Sprintf("%s , %s ", u.Host, "test.example.com"))
w.Header().Add("X-Docker-Token", fmt.Sprintf("FAKE-SESSION-%d", time.Now().UnixNano())) w.Header().Add("X-Docker-Token", fmt.Sprintf("FAKE-SESSION-%d", time.Now().UnixNano()))
if r.Method == "PUT" { if r.Method == "PUT" {
@ -317,9 +317,9 @@ func handlerImages(w http.ResponseWriter, r *http.Request) {
return return
} }
images := []map[string]string{} images := []map[string]string{}
for image_id, layer := range testLayers { for imageID, layer := range testLayers {
image := make(map[string]string) image := make(map[string]string)
image["id"] = image_id image["id"] = imageID
image["checksum"] = layer["checksum_tarsum"] image["checksum"] = layer["checksum_tarsum"]
image["Tag"] = "latest" image["Tag"] = "latest"
images = append(images, image) images = append(images, image)

39
docs/registry_test.go
View file

@ -11,8 +11,11 @@ import (
) )
var ( var (
IMAGE_ID = "42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d" token = []string{"fake-token"}
TOKEN = []string{"fake-token"} )
const (
imageID = "42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d"
REPO = "foo42/bar" REPO = "foo42/bar"
) )
@ -43,27 +46,27 @@ func TestPingRegistryEndpoint(t *testing.T) {
func TestGetRemoteHistory(t *testing.T) { func TestGetRemoteHistory(t *testing.T) {
r := spawnTestRegistrySession(t) r := spawnTestRegistrySession(t)
hist, err := r.GetRemoteHistory(IMAGE_ID, makeURL("/v1/"), TOKEN) hist, err := r.GetRemoteHistory(imageID, makeURL("/v1/"), token)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
assertEqual(t, len(hist), 2, "Expected 2 images in history") assertEqual(t, len(hist), 2, "Expected 2 images in history")
assertEqual(t, hist[0], IMAGE_ID, "Expected "+IMAGE_ID+"as first ancestry") assertEqual(t, hist[0], imageID, "Expected "+imageID+"as first ancestry")
assertEqual(t, hist[1], "77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20", assertEqual(t, hist[1], "77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20",
"Unexpected second ancestry") "Unexpected second ancestry")
} }
func TestLookupRemoteImage(t *testing.T) { func TestLookupRemoteImage(t *testing.T) {
r := spawnTestRegistrySession(t) r := spawnTestRegistrySession(t)
found := r.LookupRemoteImage(IMAGE_ID, makeURL("/v1/"), TOKEN) found := r.LookupRemoteImage(imageID, makeURL("/v1/"), token)
assertEqual(t, found, true, "Expected remote lookup to succeed") assertEqual(t, found, true, "Expected remote lookup to succeed")
found = r.LookupRemoteImage("abcdef", makeURL("/v1/"), TOKEN) found = r.LookupRemoteImage("abcdef", makeURL("/v1/"), token)
assertEqual(t, found, false, "Expected remote lookup to fail") assertEqual(t, found, false, "Expected remote lookup to fail")
} }
func TestGetRemoteImageJSON(t *testing.T) { func TestGetRemoteImageJSON(t *testing.T) {
r := spawnTestRegistrySession(t) r := spawnTestRegistrySession(t)
json, size, err := r.GetRemoteImageJSON(IMAGE_ID, makeURL("/v1/"), TOKEN) json, size, err := r.GetRemoteImageJSON(imageID, makeURL("/v1/"), token)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -72,7 +75,7 @@ func TestGetRemoteImageJSON(t *testing.T) {
t.Fatal("Expected non-empty json") t.Fatal("Expected non-empty json")
} }
_, _, err = r.GetRemoteImageJSON("abcdef", makeURL("/v1/"), TOKEN) _, _, err = r.GetRemoteImageJSON("abcdef", makeURL("/v1/"), token)
if err == nil { if err == nil {
t.Fatal("Expected image not found error") t.Fatal("Expected image not found error")
} }
@ -80,7 +83,7 @@ func TestGetRemoteImageJSON(t *testing.T) {
func TestGetRemoteImageLayer(t *testing.T) { func TestGetRemoteImageLayer(t *testing.T) {
r := spawnTestRegistrySession(t) r := spawnTestRegistrySession(t)
data, err := r.GetRemoteImageLayer(IMAGE_ID, makeURL("/v1/"), TOKEN, 0) data, err := r.GetRemoteImageLayer(imageID, makeURL("/v1/"), token, 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -88,7 +91,7 @@ func TestGetRemoteImageLayer(t *testing.T) {
t.Fatal("Expected non-nil data result") t.Fatal("Expected non-nil data result")
} }
_, err = r.GetRemoteImageLayer("abcdef", makeURL("/v1/"), TOKEN, 0) _, err = r.GetRemoteImageLayer("abcdef", makeURL("/v1/"), token, 0)
if err == nil { if err == nil {
t.Fatal("Expected image not found error") t.Fatal("Expected image not found error")
} }
@ -96,14 +99,14 @@ func TestGetRemoteImageLayer(t *testing.T) {
func TestGetRemoteTags(t *testing.T) { func TestGetRemoteTags(t *testing.T) {
r := spawnTestRegistrySession(t) r := spawnTestRegistrySession(t)
tags, err := r.GetRemoteTags([]string{makeURL("/v1/")}, REPO, TOKEN) tags, err := r.GetRemoteTags([]string{makeURL("/v1/")}, REPO, token)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
assertEqual(t, len(tags), 1, "Expected one tag") assertEqual(t, len(tags), 1, "Expected one tag")
assertEqual(t, tags["latest"], IMAGE_ID, "Expected tag latest to map to "+IMAGE_ID) assertEqual(t, tags["latest"], imageID, "Expected tag latest to map to "+imageID)
_, err = r.GetRemoteTags([]string{makeURL("/v1/")}, "foo42/baz", TOKEN) _, err = r.GetRemoteTags([]string{makeURL("/v1/")}, "foo42/baz", token)
if err == nil { if err == nil {
t.Fatal("Expected error when fetching tags for bogus repo") t.Fatal("Expected error when fetching tags for bogus repo")
} }
@ -111,11 +114,11 @@ func TestGetRemoteTags(t *testing.T) {
func TestGetRepositoryData(t *testing.T) { func TestGetRepositoryData(t *testing.T) {
r := spawnTestRegistrySession(t) r := spawnTestRegistrySession(t)
parsedUrl, err := url.Parse(makeURL("/v1/")) parsedURL, err := url.Parse(makeURL("/v1/"))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
host := "http://" + parsedUrl.Host + "/v1/" host := "http://" + parsedURL.Host + "/v1/"
data, err := r.GetRepositoryData("foo42/bar") data, err := r.GetRepositoryData("foo42/bar")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -137,7 +140,7 @@ func TestPushImageJSONRegistry(t *testing.T) {
Checksum: "sha256:1ac330d56e05eef6d438586545ceff7550d3bdcb6b19961f12c5ba714ee1bb37", Checksum: "sha256:1ac330d56e05eef6d438586545ceff7550d3bdcb6b19961f12c5ba714ee1bb37",
} }
err := r.PushImageJSONRegistry(imgData, []byte{0x42, 0xdf, 0x0}, makeURL("/v1/"), TOKEN) err := r.PushImageJSONRegistry(imgData, []byte{0x42, 0xdf, 0x0}, makeURL("/v1/"), token)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -146,7 +149,7 @@ func TestPushImageJSONRegistry(t *testing.T) {
func TestPushImageLayerRegistry(t *testing.T) { func TestPushImageLayerRegistry(t *testing.T) {
r := spawnTestRegistrySession(t) r := spawnTestRegistrySession(t)
layer := strings.NewReader("") layer := strings.NewReader("")
_, _, err := r.PushImageLayerRegistry(IMAGE_ID, layer, makeURL("/v1/"), TOKEN, []byte{}) _, _, err := r.PushImageLayerRegistry(imageID, layer, makeURL("/v1/"), token, []byte{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -180,7 +183,7 @@ func TestResolveRepositoryName(t *testing.T) {
func TestPushRegistryTag(t *testing.T) { func TestPushRegistryTag(t *testing.T) {
r := spawnTestRegistrySession(t) r := spawnTestRegistrySession(t)
err := r.PushRegistryTag("foo42/bar", IMAGE_ID, "stable", makeURL("/v1/"), TOKEN) err := r.PushRegistryTag("foo42/bar", imageID, "stable", makeURL("/v1/"), token)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

5
docs/session.go
View file

@ -3,6 +3,7 @@ package registry
import ( import (
"bytes" "bytes"
"crypto/sha256" "crypto/sha256"
// this is required for some certificates
_ "crypto/sha512" _ "crypto/sha512"
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
@ -243,11 +244,11 @@ func (r *Session) GetRemoteTags(registries []string, repository string, token []
func buildEndpointsList(headers []string, indexEp string) ([]string, error) { func buildEndpointsList(headers []string, indexEp string) ([]string, error) {
var endpoints []string var endpoints []string
parsedUrl, err := url.Parse(indexEp) parsedURL, err := url.Parse(indexEp)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var urlScheme = parsedUrl.Scheme var urlScheme = parsedURL.Scheme
// The Registry's URL scheme has to match the Index' // The Registry's URL scheme has to match the Index'
for _, ep := range headers { for _, ep := range headers {
epList := strings.Split(ep, ",") epList := strings.Split(ep, ",")