From e104bc2fa599afa31f31478a88ce53438d935300 Mon Sep 17 00:00:00 2001
From: Tomasz Zaremba <tomasz.zaremba@nearform.com>
Date: Wed, 27 Sep 2023 09:05:07 +0200
Subject: [PATCH] fix: pass manifest digest to ensure new docker image download

---
 src/cli/deploy.go                   |  6 ++++++
 src/cli/onbranch.go                 |  1 +
 src/services/docker/docker-image.go | 15 ++++++++++-----
 src/services/docker/docker.go       | 21 +++++++++++++++++++++
 src/services/docker/docker_test.go  | 25 +++++++++++++++++++++++++
 src/services/k8s/knative_test.go    |  9 +++++----
 6 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/cli/deploy.go b/src/cli/deploy.go
index 134ad05..7e3e6d5 100644
--- a/src/cli/deploy.go
+++ b/src/cli/deploy.go
@@ -20,6 +20,12 @@ func (c *icli) Deploy(cCtx *cli.Context) error {
 		return err
 	}
 
+	manifestDigest, err := c.DockerService.GetManifestDigest()
+	if err != nil {
+		return err
+	}
+	c.dockerImage.ManifestDigest = manifestDigest
+
 	return knative.Apply(cCtx.String(namespaceFlag), config, project, c.dockerImage)
 }
 
diff --git a/src/cli/onbranch.go b/src/cli/onbranch.go
index 67ea444..5ca82e7 100644
--- a/src/cli/onbranch.go
+++ b/src/cli/onbranch.go
@@ -29,6 +29,7 @@ func (c icli) buildPushDeploy(cCtx *cli.Context) error {
 	if cCtx.Bool(stopOnPushFlag) {
 		return err
 	}
+
 	return c.Deploy(cCtx)
 }
 
diff --git a/src/services/docker/docker-image.go b/src/services/docker/docker-image.go
index 407e1a6..c913470 100644
--- a/src/services/docker/docker-image.go
+++ b/src/services/docker/docker-image.go
@@ -6,14 +6,19 @@ import (
 )
 
 type DockerImage struct {
-	Registry  string
-	Name      string
-	Directory string
-	Tag       string
+	Registry       string
+	Name           string
+	Directory      string
+	Tag            string
+	ManifestDigest string
 }
 
 func (dockerImage DockerImage) RemoteTag() string {
-	return fmt.Sprintf("%s/%s:%s", strings.ToLower(dockerImage.Registry), dockerImage.Name, dockerImage.Tag)
+	if dockerImage.ManifestDigest != "" {
+		return fmt.Sprintf("%s/%s:%s@%s", strings.ToLower(dockerImage.Registry), dockerImage.Name, dockerImage.Tag, dockerImage.ManifestDigest)
+	} else {
+		return fmt.Sprintf("%s/%s:%s", strings.ToLower(dockerImage.Registry), dockerImage.Name, dockerImage.Tag)
+	}
 }
 
 func (dockerImage DockerImage) LocalTag() string {
diff --git a/src/services/docker/docker.go b/src/services/docker/docker.go
index 7af5280..4da5bec 100644
--- a/src/services/docker/docker.go
+++ b/src/services/docker/docker.go
@@ -183,3 +183,24 @@ func (ds DockerService) Push() error {
 
 	return logger.PrintStream(pushResponse)
 }
+
+func (ds DockerService) GetManifestDigest() (string, error) {
+	logger.PrintInfo("Getting manifest digest for " + ds.dockerImage.RemoteTag())
+	logger.PrintInfo("User: " + ds.AuthConfig.Username)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*120)
+	defer cancel()
+
+	encodedJSON, err := json.Marshal(ds.AuthConfig)
+	if err != nil {
+		return "", err
+	}
+
+	encodedRegistryAuth := base64.URLEncoding.EncodeToString(encodedJSON)
+	distributionInspect, err := ds.Client.DistributionInspect(ctx, ds.dockerImage.RemoteTag(), encodedRegistryAuth)
+	if err != nil {
+		return "", err
+	}
+
+	digest := distributionInspect.Descriptor.Digest
+	return fmt.Sprintf("%s", digest), nil
+}
diff --git a/src/services/docker/docker_test.go b/src/services/docker/docker_test.go
index 2439d18..8b64489 100644
--- a/src/services/docker/docker_test.go
+++ b/src/services/docker/docker_test.go
@@ -30,6 +30,31 @@ func TestLocalTag(t *testing.T) {
 }
 
 func TestRemoteTag(t *testing.T) {
+	dockerImage := DockerImage{
+		Registry:       "example.org",
+		Directory:      defaults.ProjectDirectory,
+		Name:           "test",
+		Tag:            "v1.1.0",
+		ManifestDigest: "sha256:3556949350924148437d1c40a2bfd74335fcd045da8b298e4ec4b6d5c53b4dc8",
+	}
+
+	ds := DockerService{
+		project: project.Project{
+			Directory: defaults.ProjectDirectory,
+			Name:      "test",
+			Version:   "v1.1.0",
+		},
+		dockerImage: dockerImage,
+	}
+
+	remoteTag := ds.dockerImage.RemoteTag()
+	expected := "example.org/test:v1.1.0@sha256:3556949350924148437d1c40a2bfd74335fcd045da8b298e4ec4b6d5c53b4dc8"
+	if remoteTag != expected {
+		t.Fatalf("Expected '%s' got %s", expected, remoteTag)
+	}
+}
+
+func TestRemoteTagMissingDigest(t *testing.T) {
 	dockerImage := DockerImage{
 		Registry:  "example.org",
 		Directory: defaults.ProjectDirectory,
diff --git a/src/services/k8s/knative_test.go b/src/services/k8s/knative_test.go
index 8ba5320..21b6ab8 100644
--- a/src/services/k8s/knative_test.go
+++ b/src/services/k8s/knative_test.go
@@ -60,10 +60,11 @@ func TestLoadManifest(t *testing.T) {
 	}
 
 	docker_image := docker.DockerImage{
-		Registry:  "example.com",
-		Directory: ".",
-		Name:      "test",
-		Tag:       "v1.1.0",
+		Registry:       "example.com",
+		Directory:      ".",
+		Name:           "test",
+		Tag:            "v1.1.0",
+		ManifestDigest: "sha256:3556949350924148437d1c40a2bfd74335fcd045da8b298e4ec4b6d5c53b4dc8",
 	}
 
 	_, err := loadManifest(proj_knative, docker_image)