Merge pull request #179 from alexeldeib/ace/windows

🐛 fix windows filepath compatibility

Author: k8s-ci-robot

pkg/crd/generator/generator.go

@@ -21,6 +21,7 @@ import (
 	"log"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/ghodss/yaml"
@@ -95,7 +96,7 @@ func (c *Generator) ValidateAndInitFields() error {
 
 	// Init output directory
 	if c.OutputDir == "" {
-		c.OutputDir = path.Join(c.RootPath, "config/crds")
+		c.OutputDir = filepath.Join(c.RootPath, "config/crds")
 	}
 
 	return nil
@@ -148,7 +149,7 @@ func (c *Generator) writeCRDs(crds map[string][]byte) error {
 	}
 
 	for file, crd := range crds {
-		outFile := path.Join(c.OutputDir, file)
+		outFile := filepath.Join(c.OutputDir, file)
 		if err := (&util.FileWriter{Fs: c.OutFs}).WriteFile(outFile, crd); err != nil {
 			return err
 		}
@@ -206,7 +207,7 @@ func (c *Generator) setAPIsPkg() error {
 	c.apisPkg = c.APIsPkg
 	if c.apisPkg == "" {
 		// Validate apis directory exists under working path
-		apisPath := path.Join(c.RootPath, c.APIsPath)
+		apisPath := filepath.Join(c.RootPath, c.APIsPath)
 		if _, err := os.Stat(apisPath); err != nil {
 			return fmt.Errorf("error validating apis path %s: %v", apisPath, err)
 		}

pkg/crd/util/util.go

@@ -22,15 +22,14 @@ import (
 	gobuild "go/build"
 	"log"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 )
 
 // IsGoSrcPath validate if given path is of path $GOPATH/src.
 func IsGoSrcPath(filePath string) bool {
 	for _, gopath := range getGoPaths() {
-		goSrc := path.Join(gopath, "src")
+		goSrc := filepath.Join(gopath, "src")
 		if filePath == goSrc {
 			return true
 		}
@@ -42,7 +41,7 @@ func IsGoSrcPath(filePath string) bool {
 // IsUnderGoSrcPath validate if given path is under path $GOPATH/src.
 func IsUnderGoSrcPath(filePath string) bool {
 	for _, gopath := range getGoPaths() {
-		goSrc := path.Join(gopath, "src")
+		goSrc := filepath.Join(gopath, "src")
 		if strings.HasPrefix(filepath.Dir(filePath), goSrc) {
 			return true
 		}
@@ -57,7 +56,7 @@ func IsUnderGoSrcPath(filePath string) bool {
 func DirToGoPkg(dir string) (pkg string, err error) {
 	goPaths := getGoPaths()
 	for _, gopath := range goPaths {
-		goSrc := path.Join(gopath, "src")
+		goSrc := filepath.Join(gopath, "src")
 		if !strings.HasPrefix(dir, goSrc) {
 			continue
 		}
@@ -80,7 +79,7 @@ func getGoPaths() []string {
 
 // PathHasProjectFile validate if PROJECT file exists under the path.
 func PathHasProjectFile(filePath string) bool {
-	if _, err := os.Stat(path.Join(filePath, "PROJECT")); os.IsNotExist(err) {
+	if _, err := os.Stat(filepath.Join(filePath, "PROJECT")); os.IsNotExist(err) {
 		return false
 	}
 
@@ -101,7 +100,7 @@ func GetRepoFromProject(rootPath string) string {
 func GetFieldFromProject(fieldKey string, rootPath string) string {
 	var fieldVal string
 
-	file, err := os.Open(path.Join(rootPath, "PROJECT"))
+	file, err := os.Open(filepath.Join(rootPath, "PROJECT"))
 	if err != nil {
 		log.Fatal(err)
 	}

pkg/webhook/generator.go

@@ -22,7 +22,7 @@ import (
 	"log"
 	"net"
 	"net/url"
-	"path"
+	"path/filepath"
 	"sort"
 	"strconv"
 
@@ -87,7 +87,7 @@ func (o *generatorOptions) setDefaults() {
 		o.port = 443
 	}
 	if len(o.certDir) == 0 {
-		o.certDir = path.Join("/tmp", "k8s-webhook-server", "serving-certs")
+		o.certDir = filepath.Join("/tmp", "k8s-webhook-server", "serving-certs")
 	}
 
 	if len(o.mutatingWebhookConfigName) == 0 {

pkg/webhook/manifests.go

@@ -19,7 +19,7 @@ package webhook
 import (
 	"bytes"
 	"fmt"
-	"path"
+	"path/filepath"
 	"strings"
 	"text/template"
 
@@ -121,7 +121,7 @@ spec:
 	if err := temp.Execute(buf, p); err != nil {
 		return err
 	}
-	return afero.WriteFile(o.outFs, path.Join(o.PatchOutputDir, "manager_patch.yaml"), buf.Bytes(), 0644)
+	return afero.WriteFile(o.outFs, filepath.Join(o.PatchOutputDir, "manager_patch.yaml"), buf.Bytes(), 0644)
 }
 
 func toYAML(m map[string]string) (string, error) {

pkg/webhook/writer.go

@@ -3,7 +3,6 @@ package webhook
 import (
 	"bytes"
 	"fmt"
-	"path"
 	"path/filepath"
 
 	"github.com/ghodss/yaml"
@@ -84,7 +83,7 @@ func (o *WriterOptions) WriteObjectsToDisk(objects ...runtime.Object) error {
 		}
 		isFirstObject = false
 	}
-	err = afero.WriteFile(o.outFs, path.Join(o.OutputDir, "webhookmanifests.yaml"), buf.Bytes(), 0644)
+	err = afero.WriteFile(o.outFs, filepath.Join(o.OutputDir, "webhookmanifests.yaml"), buf.Bytes(), 0644)
 	if err != nil {
 		return err
 	}