Fix and add more tests

Author: davidcollom

pkg/client/ghcr/ghcr_test.go

@@ -78,8 +78,7 @@ func TestClient_Tags(t *testing.T) {
 		tags, err := client.Tags(ctx, host, "test-user-owner", "test-repo")
 		assert.NoError(t, err)
 		assert.Len(t, tags, 2)
-		assert.Equal(t, "tag1", tags[0].Tag)
-		assert.Equal(t, "tag2", tags[1].Tag)
+		assert.ElementsMatch(t, []string{"tag1", "tag2"}, []string{tags[0].Tag, tags[1].Tag})
 	})
 
 	t.Run("failed to fetch owner type", func(t *testing.T) {

pkg/controller/checker/checker.go

@@ -153,7 +153,8 @@ func (c *Checker) isLatestSemver(ctx context.Context, imageURL, currentSHA strin
 		latestImage.SHA != "" {
 
 		isLatest = false
-		// latestImage.Tag = fmt.Sprintf("%s@%s", latestImage.Tag, latestImage.SHA)
+		// Add the SHA as a prefix to idenfity that it has been updated!
+		latestImage.Tag = fmt.Sprintf("%s@%s", latestImage.Tag, latestImage.SHA)
 	}
 
 	return latestImage, isLatest, nil

pkg/controller/checker/checker_test.go

@@ -8,6 +8,9 @@ import (
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/jetstack/version-checker/pkg/api"
 	"github.com/jetstack/version-checker/pkg/controller/internal/fake/search"
 	"github.com/jetstack/version-checker/pkg/version/semver"
@@ -58,6 +61,22 @@ func TestContainer(t *testing.T) {
 				IsLatest:       true,
 			},
 		},
+		"if v0.2.0 is latest version, but sha is in a child, then latest": {
+			statusSHA: "localhost:5000/version-checker@sha:123",
+			imageURL:  "localhost:5000/version-checker:v0.2.0",
+			opts:      new(api.Options),
+			searchResp: &api.ImageTag{
+				Tag:      "v0.2.0",
+				SHA:      "sha:abc1234",
+				Children: []*api.ImageTag{{SHA: "sha:123"}},
+			},
+			expResult: &Result{
+				CurrentVersion: "v0.2.0",
+				LatestVersion:  "v0.2.0",
+				ImageURL:       "localhost:5000/version-checker",
+				IsLatest:       true,
+			},
+		},
 		"if v0.2.0@sha:123 is wrong sha, then not latest": {
 			statusSHA: "localhost:5000/version-checker@sha:123",
 			imageURL:  "localhost:5000/version-checker:v0.2.0@sha:123",
@@ -280,14 +299,8 @@ func TestContainer(t *testing.T) {
 			}
 
 			result, err := checker.Container(context.TODO(), logrus.NewEntry(logrus.New()), pod, container, test.opts)
-			if err != nil {
-				t.Errorf("unexpected error: %s", err)
-			}
-
-			if !reflect.DeepEqual(test.expResult, result) {
-				t.Errorf("got unexpected result, exp=%#+v got=%#+v",
-					test.expResult, result)
-			}
+			require.NoError(t, err)
+			assert.Exactly(t, test.expResult, result)
 		})
 	}
 }