fix(controller): simplify exec of kargo edit set image command (akuit…

…y#1481) Signed-off-by: Kent Rancourt <kent.rancourt@gmail.com>
krancour · Feb 16, 2024 · 09a6f6c · 09a6f6c
1 parent 50d238b
commit 09a6f6c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/internal/controller/promotion/kustomize.go b/internal/controller/promotion/kustomize.go
@@ -41,7 +41,7 @@ func selectKustomizeUpdates(updates []kargoapi.GitRepoUpdate) []kargoapi.GitRepo
 // kustomizer is a helper struct whose sole purpose is to close over several
 // other functions that are used in the implementation of the apply() function.
 type kustomizer struct {
-	setImageFn func(dir, image, fqImageRef string) error
+	setImageFn func(dir, fqImageRef string) error
 }
 
 // apply uses Kustomize to carry out the provided update in the specified
@@ -70,7 +70,7 @@ func (k *kustomizer) apply(
 			continue
 		}
 		dir := filepath.Join(workingDir, imgUpdate.Path)
-		if err := k.setImageFn(dir, imgUpdate.Image, fqImageRef); err != nil {
+		if err := k.setImageFn(dir, fqImageRef); err != nil {
 			return nil, errors.Wrapf(
 				err,
 				"error updating image %q to %q using Kustomize",

diff --git a/internal/controller/promotion/kustomize_test.go b/internal/controller/promotion/kustomize_test.go
@@ -85,7 +85,7 @@ func TestKustomizerApply(t *testing.T) {
 				},
 			},
 			kustomizer: &kustomizer{
-				setImageFn: func(string, string, string) error {
+				setImageFn: func(string, string) error {
 					return errors.New("something went wrong")
 				},
 			},
@@ -108,7 +108,7 @@ func TestKustomizerApply(t *testing.T) {
 				},
 			},
 			kustomizer: &kustomizer{
-				setImageFn: func(string, string, string) error {
+				setImageFn: func(string, string) error {
 					return nil
 				},
 			},
@@ -137,7 +137,7 @@ func TestKustomizerApply(t *testing.T) {
 				},
 			},
 			kustomizer: &kustomizer{
-				setImageFn: func(string, string, string) error {
+				setImageFn: func(string, string) error {
 					return nil
 				},
 			},

diff --git a/internal/kustomize/kustomize.go b/internal/kustomize/kustomize.go
@@ -1,7 +1,6 @@
 package kustomize
 
 import (
-	"fmt"
 	"os/exec"
 
 	libExec "github.com/akuity/kargo/internal/exec"
@@ -10,18 +9,18 @@ import (
 // SetImage runs `kustomize edit set image ...` in the specified directory.
 // The specified directory must already exist and contain a kustomization.yaml
 // file.
-func SetImage(dir, repo, fqImageRef string) error {
-	_, err := libExec.Exec(buildSetImageCmd(dir, repo, fqImageRef))
+func SetImage(dir, fqImageRef string) error {
+	_, err := libExec.Exec(buildSetImageCmd(dir, fqImageRef))
 	return err
 }
 
-func buildSetImageCmd(dir, repo, fqImageRef string) *exec.Cmd {
+func buildSetImageCmd(dir, fqImageRef string) *exec.Cmd {
 	cmd := exec.Command( // nolint: gosec
 		"kustomize",
 		"edit",
 		"set",
 		"image",
-		fmt.Sprintf("%s=%s", repo, fqImageRef),
+		fqImageRef,
 	)
 	cmd.Dir = dir
 	return cmd

diff --git a/internal/kustomize/kustomize_test.go b/internal/kustomize/kustomize_test.go
@@ -1,7 +1,6 @@
 package kustomize
 
 import (
-	"fmt"
 	"strings"
 	"testing"
 
@@ -10,9 +9,8 @@ import (
 
 func TestBuildSetImageCmd(t *testing.T) {
 	const testDir = "/some-dir"
-	const testImage = "some-image"
 	const testImageRef = "some-image:some-tag"
-	cmd := buildSetImageCmd(testDir, testImage, testImageRef)
+	cmd := buildSetImageCmd(testDir, testImageRef)
 	require.NotNil(t, cmd)
 	require.True(t, strings.HasSuffix(cmd.Path, "kustomize"))
 	require.Equal(
@@ -22,7 +20,7 @@ func TestBuildSetImageCmd(t *testing.T) {
 			"edit",
 			"set",
 			"image",
-			fmt.Sprintf("%s=%s", testImage, testImageRef),
+			testImageRef,
 		},
 		cmd.Args,
 	)