Always clean Dir for packages.Load

cpanato · Dec 19, 2021 · 73a4629 · 73a4629
1 parent 8135bf2
commit 73a4629
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pkg/build/gobuild.go b/pkg/build/gobuild.go
@@ -161,8 +161,8 @@ func NewGo(ctx context.Context, dir string, options ...Option) (Interface, error
 }
 
 func (g *gobuild) qualifyLocalImport(importpath string) (string, error) {
-	dir := g.dir
-	if filepath.Clean(g.dir) == "." {
+	dir := filepath.Clean(g.dir)
+	if dir == "." {
 		dir = ""
 	}
 	cfg := &packages.Config{
@@ -203,8 +203,8 @@ func (g *gobuild) IsSupportedReference(s string) error {
 	if !ref.IsStrict() {
 		return errors.New("importpath does not start with ko://")
 	}
-	dir := g.dir
-	if filepath.Clean(g.dir) == "." {
+	dir := filepath.Clean(g.dir)
+	if dir == "." {
 		dir = ""
 	}
 	pkgs, err := packages.Load(&packages.Config{Dir: dir, Mode: packages.NeedName}, ref.Path())
@@ -446,8 +446,8 @@ func tarBinary(name, binary string, platform *v1.Platform) (*bytes.Buffer, error
 }
 
 func (g *gobuild) kodataPath(ref reference) (string, error) {
-	dir := g.dir
-	if filepath.Clean(g.dir) == "." {
+	dir := filepath.Clean(g.dir)
+	if dir == "." {
 		dir = ""
 	}
 	pkgs, err := packages.Load(&packages.Config{Dir: dir, Mode: packages.NeedFiles}, ref.Path())

diff --git a/pkg/commands/options/build.go b/pkg/commands/options/build.go
@@ -180,8 +180,8 @@ func createBuildConfigMap(workingDirectory string, configs []build.Config) (map[
 		// local import paths, therefore add a "./" equivalent as a prefix to
 		// the constructured import path
 		localImportPath := fmt.Sprint(".", string(filepath.Separator), path)
-		dir := baseDir
-		if filepath.Clean(dir) == "." {
+		dir := filepath.Clean(baseDir)
+		if dir == "." {
 			dir = ""
 		}
 		pkgs, err := packages.Load(&packages.Config{Mode: packages.NeedName, Dir: dir}, localImportPath)