review

Signed-off-by: Michael Gasch <15986659+embano1@users.noreply.github.com>
ko-build · Jan 19, 2023 · aa0e185 · aa0e185
1 parent c512f73
commit aa0e185
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 182 deletions.
diff --git a/pkg/build/cache.go b/pkg/build/cache.go
@@ -201,10 +201,7 @@ func (c *layerCache) readBuildToDiff(file string) (buildIDToDiffID, error) {
 }
 
 func getBuildID(ctx context.Context, file string) (string, error) {
-	gobin := defaultGoBin
-	if env := os.Getenv(goBinPathEnv); env != "" {
-		gobin = env
-	}
+	gobin := getGoBinary()
 
 	cmd := exec.CommandContext(ctx, gobin, "tool", "buildid", file)
 	var output bytes.Buffer

diff --git a/pkg/build/gobuild.go b/pkg/build/gobuild.go
@@ -247,6 +247,13 @@ func getGoarm(platform v1.Platform) (string, error) {
 	return "", nil
 }
 
+func getGoBinary() string {
+	if env := os.Getenv(goBinPathEnv); env != "" {
+		return env
+	}
+	return defaultGoBin
+}
+
 func build(ctx context.Context, ip string, dir string, platform v1.Platform, config Config) (string, error) {
 	buildArgs, err := createBuildArgs(config)
 	if err != nil {
@@ -289,10 +296,7 @@ func build(ctx context.Context, ip string, dir string, platform v1.Platform, con
 	args = append(args, "-o", file)
 	args = append(args, ip)
 
-	gobin := defaultGoBin
-	if bin := os.Getenv(goBinPathEnv); bin != "" {
-		gobin = bin
-	}
+	gobin := getGoBinary()
 	cmd := exec.CommandContext(ctx, gobin, args...)
 	cmd.Dir = dir
 	cmd.Env = env
@@ -313,10 +317,7 @@ func build(ctx context.Context, ip string, dir string, platform v1.Platform, con
 }
 
 func goversionm(ctx context.Context, file string, appPath string, appFileName string, se oci.SignedEntity, dir string) ([]byte, types.MediaType, error) {
-	gobin := defaultGoBin
-	if env := os.Getenv(goBinPathEnv); env != "" {
-		gobin = env
-	}
+	gobin := getGoBinary()
 
 	switch se.(type) {
 	case oci.SignedImage:

diff --git a/pkg/commands/deps.go b/pkg/commands/deps.go