Use path instead of filepath

Go package names always use '/', so does `path`
kubernetes · Feb 26, 2024 · df3ca11 · df3ca11
1 parent ee7ae60
commit df3ca11
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/pkg/generators/config.go b/pkg/generators/config.go
@@ -17,7 +17,7 @@ limitations under the License.
 package generators
 
 import (
-	"path/filepath"
+	"path"
 
 	"k8s.io/gengo/v2"
 	"k8s.io/gengo/v2/generator"
@@ -65,7 +65,7 @@ func GetTargets(context *generator.Context, args *args.Args) []generator.Target
 
 	return []generator.Target{
 		&generator.SimpleTarget{
-			PkgName:       filepath.Base(args.OutputPkg),
+			PkgName:       path.Base(args.OutputPkg), // `path` vs. `filepath` because packages use '/'
 			PkgPath:       args.OutputPkg,
 			PkgDir:        args.OutputDir,
 			HeaderComment: boilerplate,

diff --git a/pkg/generators/openapi.go b/pkg/generators/openapi.go
@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"path/filepath"
+	"path"
 	"reflect"
 	"regexp"
 	"sort"
@@ -297,7 +297,8 @@ func hasOpenAPIV3OneOfMethod(t *types.Type) bool {
 
 // typeShortName returns short package name (e.g. the name x appears in package x definition) dot type name.
 func typeShortName(t *types.Type) string {
-	return filepath.Base(t.Name.Package) + "." + t.Name.Name
+	// `path` vs. `filepath` because packages use '/'
+	return path.Base(t.Name.Package) + "." + t.Name.Name
 }
 
 func (g openAPITypeWriter) generateMembers(t *types.Type, required []string) ([]string, error) {

diff --git a/pkg/generators/openapi_test.go b/pkg/generators/openapi_test.go
@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"fmt"
 	"go/format"
-	"path/filepath"
+	"path"
 	"strings"
 	"testing"
 
@@ -47,8 +47,9 @@ func construct(t *testing.T, cfg *packages.Config, nameSystems namer.NameSystems
 
 func testOpenAPITypeWriter(t *testing.T, cfg *packages.Config) (error, error, *bytes.Buffer, *bytes.Buffer, []string) {
 	pkgBase := "example.com/base"
-	inputPkg := filepath.Join(pkgBase, "foo")
-	outputPkg := filepath.Join(pkgBase, "output")
+	// `path` vs. `filepath` because packages use '/'
+	inputPkg := path.Join(pkgBase, "foo")
+	outputPkg := path.Join(pkgBase, "output")
 	imports := generator.NewImportTrackerForPackage(outputPkg)
 	rawNamer := namer.NewRawNamer(outputPkg, imports)
 	namers := namer.NameSystems{

diff --git a/test/integration/integration_suite_test.go b/test/integration/integration_suite_test.go
@@ -19,6 +19,7 @@ package integration
 import (
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"testing"
 
@@ -51,15 +52,16 @@ var (
 	openAPIGenPath   string
 
 	inputDirs = []string{
-		filepath.Join(testPkgRoot, "listtype"),
-		filepath.Join(testPkgRoot, "maptype"),
-		filepath.Join(testPkgRoot, "structtype"),
-		filepath.Join(testPkgRoot, "dummytype"),
-		filepath.Join(testPkgRoot, "uniontype"),
-		filepath.Join(testPkgRoot, "enumtype"),
-		filepath.Join(testPkgRoot, "custom"),
-		filepath.Join(testPkgRoot, "valuevalidation"),
-		filepath.Join(testPkgRoot, "defaults"),
+		// `path` vs. `filepath` because packages use '/'
+		path.Join(testPkgRoot, "listtype"),
+		path.Join(testPkgRoot, "maptype"),
+		path.Join(testPkgRoot, "structtype"),
+		path.Join(testPkgRoot, "dummytype"),
+		path.Join(testPkgRoot, "uniontype"),
+		path.Join(testPkgRoot, "enumtype"),
+		path.Join(testPkgRoot, "custom"),
+		path.Join(testPkgRoot, "valuevalidation"),
+		path.Join(testPkgRoot, "defaults"),
 	}
 )