Fix path assumption

Signed-off-by: Hidde Beydals <hello@hidde.co>
fluxcd · May 3, 2022 · 6f9850f · 6f9850f
1 parent ca77155
commit 6f9850f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/manifestgen/install/manifests.go b/pkg/manifestgen/install/manifests.go
@@ -126,8 +126,8 @@ func build(base, output string) error {
 		return err
 	}
 
-	parent := path.Dir(base)
-	fs, err := filesys.MakeFsOnDiskSecureBuild(parent)
+	outputBase := filepath.Dir(strings.TrimSuffix(output, string(filepath.Separator)))
+	fs, err := filesys.MakeFsOnDiskSecure(outputBase)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/manifestgen/kustomization/kustomization.go b/pkg/manifestgen/kustomization/kustomization.go
@@ -19,8 +19,8 @@ package kustomization
 import (
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
+	"strings"
 	"sync"
 
 	"sigs.k8s.io/kustomize/api/konfig"
@@ -143,7 +143,7 @@ func Build(base string) ([]byte, error) {
 	kustomizeBuildMutex.Lock()
 	defer kustomizeBuildMutex.Unlock()
 
-	parent := path.Dir(base)
+	parent := filepath.Dir(strings.TrimSuffix(base, string(filepath.Separator)))
 	fs, err := filesys.MakeFsOnDiskSecureBuild(parent)
 	if err != nil {
 		return nil, err