Merge pull request #328 from concourse/issue/327-malform-check-version

Try to fix malform version for check command
concourse · Nov 18, 2022 · 7a84b20 · 7a84b20
2 parents 07859af + e66e93e
commit 7a84b20
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 500 deletions.
diff --git a/README.md b/README.md
@@ -581,7 +581,8 @@ Run the tests with the following commands for both `alpine` and `ubuntu` images:
 
 ```sh
 docker build -t registry-image-resource --target tests -f dockerfiles/alpine/Dockerfile .
-docker build -t registry-image-resource --target tests -f dockerfiles/ubuntu/Dockerfile .
+docker build -t registry-image-resource --target tests -f dockerfiles/ubuntu/Dockerfile --build-arg base_image=ubuntu:latest .
+
 ```
 
 #### Integration tests

diff --git a/check_test.go b/check_test.go
@@ -115,10 +115,6 @@ var _ = Describe("Check", func() {
 
 				BeforeEach(func() {
 					registry.AppendHandlers(
-						ghttp.CombineHandlers(
-							ghttp.VerifyRequest("GET", "/v2/"),
-							ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-						),
 						ghttp.CombineHandlers(
 							ghttp.VerifyRequest("GET", "/v2/"),
 							ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -129,10 +125,6 @@ var _ = Describe("Check", func() {
 								"Content-Length": LATEST_FAKE_HEADERS["Content-Length"],
 							}),
 						),
-						ghttp.CombineHandlers(
-							ghttp.VerifyRequest("GET", "/v2/"),
-							ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-						),
 						ghttp.CombineHandlers(
 							ghttp.VerifyRequest("GET", "/v2/fake-image/manifests/latest"),
 							ghttp.RespondWith(http.StatusOK, `{"fake":"manifest"}`, http.Header{
@@ -160,10 +152,6 @@ var _ = Describe("Check", func() {
 					registry = ghttp.NewTLSServer()
 
 					registry.AppendHandlers(
-						ghttp.CombineHandlers(
-							ghttp.VerifyRequest("GET", "/v2/"),
-							ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-						),
 						ghttp.CombineHandlers(
 							ghttp.VerifyRequest("GET", "/v2/"),
 							ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -230,10 +218,6 @@ var _ = Describe("Check", func() {
 						registry = ghttp.NewServer()
 
 						registry.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -264,10 +248,6 @@ var _ = Describe("Check", func() {
 				Context("which has the image", func() {
 					BeforeEach(func() {
 						mirror.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -293,10 +273,6 @@ var _ = Describe("Check", func() {
 				Context("which is missing the image", func() {
 					BeforeEach(func() {
 						mirror.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -404,10 +380,6 @@ var _ = Describe("Check", func() {
 				Context("which has the image", func() {
 					BeforeEach(func() {
 						mirror.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -438,10 +410,6 @@ var _ = Describe("Check", func() {
 				Context("which is missing the image", func() {
 					BeforeEach(func() {
 						mirror.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -544,10 +512,6 @@ var _ = Describe("Check", func() {
 				Context("which has the image", func() {
 					BeforeEach(func() {
 						mirror.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -556,10 +520,6 @@ var _ = Describe("Check", func() {
 								ghttp.VerifyRequest("HEAD", "/v2/library/fake-image/manifests/latest"),
 								ghttp.RespondWith(http.StatusOK, ``, LATEST_FAKE_HEADERS),
 							),
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("HEAD", "/v2/library/fake-image/manifests/"+OLDER_FAKE_DIGEST),
 								ghttp.RespondWith(http.StatusOK, ``, OLDER_FAKE_HEADERS),
@@ -584,10 +544,6 @@ var _ = Describe("Check", func() {
 				Context("which is missing the image", func() {
 					BeforeEach(func() {
 						mirror.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -680,10 +636,6 @@ var _ = Describe("Check", func() {
 				Context("which has the image", func() {
 					BeforeEach(func() {
 						mirror.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
@@ -692,10 +644,6 @@ var _ = Describe("Check", func() {
 								ghttp.VerifyRequest("HEAD", "/v2/library/fake-image/manifests/latest"),
 								ghttp.RespondWith(http.StatusOK, ``, LATEST_FAKE_HEADERS),
 							),
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("HEAD", "/v2/library/fake-image/manifests/"+req.Version.Digest),
 								ghttp.RespondWith(http.StatusNotFound, `{"errors":[{"code": "MANIFEST_UNKNOWN", "message": "ruh roh", "detail": "not here"}]}`),
@@ -717,10 +665,6 @@ var _ = Describe("Check", func() {
 				Context("which is missing the image", func() {
 					BeforeEach(func() {
 						mirror.AppendHandlers(
-							ghttp.CombineHandlers(
-								ghttp.VerifyRequest("GET", "/v2/"),
-								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),
-							),
 							ghttp.CombineHandlers(
 								ghttp.VerifyRequest("GET", "/v2/"),
 								ghttp.RespondWith(http.StatusOK, `welcome to zombocom`),

diff --git a/commands/check.go b/commands/check.go
@@ -331,9 +331,17 @@ func headOrGet(ref name.Reference, imageOpts ...remote.Option) (v1.Hash, bool, e
 			return v1.Hash{}, false, err
 		}
 
+		if (remoteDesc.Digest == v1.Hash{}) {
+			return v1.Hash{}, false, nil
+		}
+
 		return remoteDesc.Digest, true, nil
 	}
 
+	if (v1Desc.Digest == v1.Hash{}) {
+		return v1.Hash{}, false, nil
+	}
+
 	return v1Desc.Digest, true, nil
 }
 

diff --git a/go.mod b/go.mod
@@ -6,16 +6,13 @@ require (
 	github.com/aws/aws-sdk-go v1.44.5
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/concourse/go-archive v1.0.1
-	github.com/containerd/stargz-snapshotter/estargz v0.11.4 // indirect
 	github.com/fatih/color v1.13.0
 	github.com/go-sql-driver/mysql v1.5.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-containerregistry v0.9.0
+	github.com/google/go-containerregistry v0.12.1
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.19.0
 	github.com/simonshyu/notary-gcr v0.0.0-20220601090547-d99a631aa58b
-	github.com/sirupsen/logrus v1.8.1
-	github.com/theupdateframework/notary v0.6.1 // indirect
+	github.com/sirupsen/logrus v1.9.0
 	github.com/vbauerster/mpb v3.4.0+incompatible
 )