Merge pull request #78 from ivanilves/more-work-on-structure

Refactor to make code stop smelling like shit!

.travis.yml

@@ -16,7 +16,6 @@ before_script:
   - git remote set-url --push origin https://${GITHUB_TOKEN}@github.com/ivanilves/lstags.git
 
 script:
-  - make unit-test
   - make package-test
   - make integration-test
   - make shell-test

Makefile

@@ -8,10 +8,7 @@ prepare:
 dep:
 	dep ensure -v
 
-test: unit-test package-test
-
-unit-test:
-	go test -v
+test: package-test integration-test
 
 package-test:
 	@find \
@@ -20,7 +17,7 @@ package-test:
 		| xargs -i sh -c "pushd {}; go test -v || exit 1; popd"
 
 integration-test:
-	go test -integration -v
+	go test -v
 
 env:
 	env

auth/auth.go

@@ -18,6 +18,7 @@ type TokenResponse interface {
 	Method() string
 	Token() string
 	ExpiresIn() int
+	AuthHeader() string
 }
 
 func parseAuthHeader(headers http.Header) (string, string, error) {

auth/basic/basic.go

@@ -26,6 +26,11 @@ func (tr TokenResponse) ExpiresIn() int {
 	return 0
 }
 
+// AuthHeader returns contents of the Authorization HTTP header
+func (tr TokenResponse) AuthHeader() string {
+	return tr.Method() + " " + tr.Token()
+}
+
 func getTokenFromHeader(header string) string {
 	fields := strings.Split(header, " ")
 

auth/bearer/bearer.go

@@ -28,6 +28,11 @@ func (tr TokenResponse) ExpiresIn() int {
 	return tr.E
 }
 
+// AuthHeader returns contents of the Authorization HTTP header
+func (tr TokenResponse) AuthHeader() string {
+	return tr.Method() + " " + tr.Token()
+}
+
 func decodeTokenResponse(data io.ReadCloser) (*TokenResponse, error) {
 	tr := TokenResponse{}
 

auth/none/none.go

@@ -19,6 +19,11 @@ func (tr TokenResponse) ExpiresIn() int {
 	return 0
 }
 
+// AuthHeader returns contents of the Authorization HTTP header
+func (tr TokenResponse) AuthHeader() string {
+	return tr.Method() + " " + tr.Token()
+}
+
 // RequestToken does pretty little here...
 func RequestToken() (*TokenResponse, error) {
 	return &TokenResponse{}, nil

docker/docker.go

@@ -34,3 +34,33 @@ func isHostname(s string) bool {
 
 	return false
 }
+
+// GetRepoName gets full repository name
+func GetRepoName(repository, registry string) string {
+	if registry == "registry.hub.docker.com" {
+		if strings.HasPrefix(repository, "library/") {
+			return strings.Replace(repository, "library/", "", 1)
+		}
+
+		return repository
+	}
+
+	if strings.HasPrefix(repository, registry) {
+		return repository
+	}
+
+	return registry + "/" + repository
+}
+
+// GetRepoPath gets repository path
+func GetRepoPath(repository, registry string) string {
+	if !strings.Contains(repository, "/") {
+		return "library/" + repository
+	}
+
+	if strings.HasPrefix(repository, registry) {
+		return strings.Replace(repository, registry+"/", "", 1)
+	}
+
+	return repository
+}

docker/docker_test.go

@@ -30,3 +30,68 @@ func TestGetRegistry(t *testing.T) {
 		}
 	}
 }
+
+func TestGetRepoNameForDockerHub(t *testing.T) {
+	examples := map[string]string{
+		"library/nginx": "nginx",
+		"hype/cube":     "hype/cube",
+	}
+
+	for input, expected := range examples {
+		output := GetRepoName(input, "registry.hub.docker.com")
+
+		if output != expected {
+			t.Fatalf(
+				"Got unexpected repo name: %s => %s\n* Expected: %s",
+				input,
+				output,
+				expected,
+			)
+		}
+	}
+}
+
+func TestGetRepoNameForPrivateRegistry(t *testing.T) {
+	const registry = "registry.nerd.io"
+
+	examples := map[string]string{
+		"empollon/nginx":             registry + "/empollon/nginx",
+		"registry.nerd.io/hype/cube": registry + "/hype/cube",
+	}
+
+	for input, expected := range examples {
+		output := GetRepoName(input, registry)
+
+		if output != expected {
+			t.Fatalf(
+				"Got unexpected repo name: %s => %s\n* Expected: %s",
+				input,
+				output,
+				expected,
+			)
+		}
+	}
+}
+
+func TestGetRepoPath(t *testing.T) {
+	const registry = "registry.nerd.io"
+
+	examples := map[string]string{
+		"nginx": "library/nginx",
+		"registry.nerd.io/hype/cube": "hype/cube",
+		"observability/metrix":       "observability/metrix",
+	}
+
+	for input, expected := range examples {
+		output := GetRepoPath(input, registry)
+
+		if output != expected {
+			t.Fatalf(
+				"Got unexpected repo path: %s => %s\n* Expected: %s",
+				input,
+				output,
+				expected,
+			)
+		}
+	}
+}