Merge pull request #5 from garethjevans/fix-for-sha

chore: fix client when querying for sha

Author: garethjevans

pkg/inspect/client.go

@@ -2,11 +2,11 @@ package inspect
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
-	"strings"
 
 	"github.com/sirupsen/logrus"
 )
@@ -30,6 +30,7 @@ func (i *Client) token(repo string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	logrus.Debugf("got status code %d", resp.StatusCode)
 
 	tokenResponse := TokenResponse{}
 
@@ -56,57 +57,63 @@ func (i *Client) Labels(repo string, version string) (map[string]string, error)
 
 	var digest string
 
-	if strings.HasPrefix(version, "sha256:") {
-		digest = version
-	} else {
-		req, err := http.NewRequest("GET", fmt.Sprintf("https://registry-1.docker.io/v2/%s/manifests/%s", repo, version), nil)
-		if err != nil {
-			return nil, err
-		}
-
-		req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
-		req.Header.Add("Accept", "application/vnd.docker.distribution.manifest.v2+json")
-
-		resp, err := i.Client.Do(req)
-		if err != nil {
-			return nil, err
-		}
-
-		body, err := ioutil.ReadAll(io.LimitReader(resp.Body, 10000000))
-		if err != nil {
-			return nil, err
-		}
-
-		logrus.Debugf("body> %s", string(body))
-
-		manifestResponse := ManifestResponse{}
-		err = json.Unmarshal(body, &manifestResponse)
-		if err != nil {
-			return nil, err
-		}
-
-		logrus.Debugf("got digest %s", manifestResponse.Config.Digest)
-		digest = manifestResponse.Config.Digest
-	}
-
-	req, err := http.NewRequest("GET", fmt.Sprintf("https://registry-1.docker.io/v2/%s/blobs/%s", repo, digest), nil)
+	req, err := http.NewRequest("GET", fmt.Sprintf("https://registry-1.docker.io/v2/%s/manifests/%s", repo, version), nil)
 	if err != nil {
 		return nil, err
 	}
+
 	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
+	req.Header.Add("Accept", "application/vnd.docker.distribution.manifest.v2+json")
 
 	resp, err := i.Client.Do(req)
 	if err != nil {
 		return nil, err
 	}
 
+	logrus.Debugf("got status code %d", resp.StatusCode)
+
+	if resp.StatusCode != 200 {
+		return nil, errors.New("unable to find manifest " + version + ", " + resp.Status)
+	}
+
 	body, err := ioutil.ReadAll(io.LimitReader(resp.Body, 10000000))
 	if err != nil {
 		return nil, err
 	}
 
 	logrus.Debugf("body> %s", string(body))
 
+	manifestResponse := ManifestResponse{}
+	err = json.Unmarshal(body, &manifestResponse)
+	if err != nil {
+		return nil, err
+	}
+
+	logrus.Debugf("got digest %s", manifestResponse.Config.Digest)
+	digest = manifestResponse.Config.Digest
+
+	req, err = http.NewRequest("GET", fmt.Sprintf("https://registry-1.docker.io/v2/%s/blobs/%s", repo, digest), nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
+
+	resp, err = i.Client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	logrus.Debugf("got status code %d", resp.StatusCode)
+	if resp.StatusCode != 200 {
+		return nil, errors.New("unable to find blob " + digest + ", " + resp.Status)
+	}
+
+	body, err = ioutil.ReadAll(io.LimitReader(resp.Body, 10000000))
+	if err != nil {
+		return nil, err
+	}
+
+	logrus.Debugf("body> %s", string(body))
+
 	blobResponse := BlobResponse{}
 	err = json.Unmarshal(body, &blobResponse)
 	if err != nil {

pkg/inspect/client_test.go

@@ -14,9 +14,12 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+var (
+	repo = "jenkinsciinfra/terraform"
+)
+
 func TestCanQueryDockerManifest(t *testing.T) {
 	// get token
-	repo := "jenkinsciinfra/terraform"
 	tag := "latest"
 
 	mock := &mocks.MockClient{}
@@ -25,9 +28,9 @@ func TestCanQueryDockerManifest(t *testing.T) {
 		Client: mock,
 	}
 
-	stubWithFixture(t, mock, "token.json")
-	stubWithFixture(t, mock, "manifest.json")
-	stubWithFixture(t, mock, "blobs.json")
+	stubWithFixture(t, mock, 200, "token.json")
+	stubWithFixture(t, mock, 200, "manifest.json")
+	stubWithFixture(t, mock, 200, "blobs.json")
 
 	l, err := client.Labels(repo, tag)
 	assert.NoError(t, err)
@@ -47,7 +50,6 @@ func TestCanQueryDockerManifest(t *testing.T) {
 
 func TestCanQueryDockerManifest_UsingSha(t *testing.T) {
 	// get token
-	repo := "jenkinsciinfra/terraform"
 	tag := "sha256:71e99d70bef50da077f0595044f3330b074e2d0417e486a12144d67cb5dd5603"
 
 	mock := &mocks.MockClient{}
@@ -56,8 +58,9 @@ func TestCanQueryDockerManifest_UsingSha(t *testing.T) {
 		Client: mock,
 	}
 
-	stubWithFixture(t, mock, "token.json")
-	stubWithFixture(t, mock, "blobs.json")
+	stubWithFixture(t, mock, 200, "token.json")
+	stubWithFixture(t, mock, 200, "manifest.json")
+	stubWithFixture(t, mock, 200, "blobs.json")
 
 	l, err := client.Labels(repo, tag)
 	assert.NoError(t, err)
@@ -75,12 +78,30 @@ func TestCanQueryDockerManifest_UsingSha(t *testing.T) {
 	assert.Equal(t, "https://github.com/jenkins-infra/docker-terraform/tree/d25f040", fullGitURL)
 }
 
-func stubWithFixture(t *testing.T, mock *mocks.MockClient, file string) {
+func TestCanQueryDockerManifest_UsingUnknownSha(t *testing.T) {
+	// get token
+	tag := "sha256:71e99d70bef50da077f0595044f3330b074e2d0417e486a12144d67cb5dd5603XXX"
+
+	mock := &mocks.MockClient{}
+
+	client := inspect.Client{
+		Client: mock,
+	}
+
+	stubWithFixture(t, mock, 200, "token.json")
+	stubWithFixture(t, mock, 200, "manifest.json")
+	stubWithFixture(t, mock, 404, "unknown-blob.json")
+
+	_, err := client.Labels(repo, tag)
+	assert.Error(t, err)
+}
+
+func stubWithFixture(t *testing.T, mock *mocks.MockClient, responseCode int, file string) {
 	data, err := ioutil.ReadFile(path.Join("testdata", file))
 	assert.NoError(t, err)
 
 	// create a new reader with that JSON
 	r := ioutil.NopCloser(bytes.NewReader(data))
 
-	mock.StubResponse(200, r)
+	mock.StubResponse(responseCode, r)
 }

pkg/inspect/testdata/unknown-blob.json

@@ -0,0 +1 @@
+{"errors":[{"code":"BLOB_UNKNOWN","message":"blob unknown to registry","detail":"sha256:795a31b4c2e0884e469ee9fd1ff7c81bd59404bc95944fa0767cf912a80be79a"}]}