fix: generate files to specified model package (#24)

fix: generate files to specific model package

Author: amyXia1994

pkg/swagger/generator/shared.go

@@ -36,11 +36,6 @@ import (
 
 //go:generate go-bindata -mode 420 -modtime 1482416923 -pkg=generator -ignore=.*\.sw? -ignore=.*\.md ./templates/...
 
-const (
-	// default generation targets structure
-	defaultModelsTarget = "models"
-)
-
 func init() {
 	// all initializations for the generator package
 	debugOptions()

pkg/swagger/generator/support.go

@@ -54,7 +54,7 @@ func newGenerator(opts *GenOpts) (*generator, error) {
 		Analyzed:      analyzed,
 		Models:        models,
 		Target:        opts.Target,
-		ModelsPackage: opts.LanguageOpts.ManglePackagePath("", defaultModelsTarget),
+		ModelsPackage: opts.LanguageOpts.ManglePackagePath("", opts.ModelPackage),
 		GenOpts:       opts,
 	}, nil
 }

pkg/swagger/generator/support_test.go

@@ -34,16 +34,18 @@ func TestGenerate_CRD2KCL(t *testing.T) {
 	utils.DoTestDirs(t, utils.KubeTestDirs, apiConvertModel, true)
 }
 
-func apiConvertModel(binaryPath string, sourceSpec string, outputDir string, crd bool) error {
+func apiConvertModel(integrationGenOpts utils.IntegrationGenOpts) error {
 	opts := new(GenOpts)
-	opts.Spec = sourceSpec
-	opts.Target = outputDir
+	opts.Spec = integrationGenOpts.SpecPath
+	opts.Target = integrationGenOpts.TargetDir
 	opts.KeepOrder = true
-	opts.ValidateSpec = !crd
+	opts.ValidateSpec = !integrationGenOpts.IsCrd
+	opts.ModelPackage = integrationGenOpts.ModelPackage
+
 	if err := opts.EnsureDefaults(); err != nil {
 		return fmt.Errorf("fill default options failed: %s", err.Error())
 	}
-	if crd {
+	if integrationGenOpts.IsCrd {
 		spec, err := crdGen.GetSpec(&crdGen.GenOpts{
 			Spec: opts.Spec,
 		})

pkg/utils/initegrate_gen.go

@@ -39,6 +39,14 @@ type TestCase struct {
 	GenPath  string
 }
 
+type IntegrationGenOpts struct {
+	BinaryPath   string
+	SpecPath     string
+	TargetDir    string
+	IsCrd        bool
+	ModelPackage string
+}
+
 func InitTestDirs(projectRoot string, buildBinary bool) error {
 	// calculate root dir of project/testdata/examples
 	ProjectRoot = projectRoot
@@ -80,7 +88,7 @@ func InitTestDirs(projectRoot string, buildBinary bool) error {
 	return nil
 }
 
-func DoTestDirs(t *testing.T, dirs []string, convertFunc func(binaryPath, specPath, targetDir string, isCrd bool) error, crd bool) {
+func DoTestDirs(t *testing.T, dirs []string, convertFunc func(opts IntegrationGenOpts) error, crd bool) {
 	for _, dir := range dirs {
 		testCases, err := FindCases(dir)
 		if err != nil {
@@ -97,23 +105,26 @@ func DoTestDirs(t *testing.T, dirs []string, convertFunc func(binaryPath, specPa
 	}
 }
 
-func DoTestConvert(testDir string, tCase TestCase, convertFunc func(binaryPath, specPath, targetDir string, isCrd bool) error, crd bool) error {
+func DoTestConvert(testDir string, tCase TestCase, convertFunc func(opts IntegrationGenOpts) error, crd bool) error {
 	var tmpPrefix string
+	var modelPackage string
 	if crd {
 		tmpPrefix = tmpCrdGen
+		modelPackage = "crd_models"
 	} else {
 		tmpPrefix = tmpOaiGen
+		modelPackage = "models"
 	}
 	tmpDir, err := os.MkdirTemp(testDir, fmt.Sprintf("%s_%s", tmpPrefix, tCase.Name))
 	if err != nil {
 		return fmt.Errorf("creat temp output dir failed: %v", err)
 	}
-	err = convertFunc(BinaryPath, tCase.SpecPath, tmpDir, crd)
+	err = convertFunc(IntegrationGenOpts{BinaryPath: BinaryPath, SpecPath: tCase.SpecPath, TargetDir: tmpDir, IsCrd: crd, ModelPackage: modelPackage})
 	if err != nil {
 		return err
 	}
 	// compare two dir
-	err = CompareDir(filepath.Join(tCase.GenPath, "models"), filepath.Join(tmpDir, "models"))
+	err = CompareDir(filepath.Join(tCase.GenPath, "models"), filepath.Join(tmpDir, modelPackage))
 	if err != nil {
 		return err
 	}
@@ -218,15 +229,18 @@ func readLines(path string) ([]string, error) {
 	return lines, scanner.Err()
 }
 
-func BinaryConvertModel(binaryPath string, sourceSpec string, outputDir string, crd bool) error {
+func BinaryConvertModel(integrationGenOpts IntegrationGenOpts) error {
 	convertArgs := []string{
 		"generate", "model", "-f",
 	}
-	convertArgs = append(convertArgs, sourceSpec, "-t", outputDir)
-	if crd {
+	convertArgs = append(convertArgs, integrationGenOpts.SpecPath, "-t", integrationGenOpts.TargetDir)
+	if integrationGenOpts.ModelPackage != "models" {
+		convertArgs = append(convertArgs, "-m", integrationGenOpts.ModelPackage)
+	}
+	if integrationGenOpts.IsCrd {
 		convertArgs = append(convertArgs, "--skip-validation", "--crd")
 	}
-	cmd := exec.Command(binaryPath, convertArgs...)
+	cmd := exec.Command(integrationGenOpts.BinaryPath, convertArgs...)
 	cmd.Env = os.Environ()
 	var stdout, stderr bytes.Buffer
 	cmd.Stdout = &stdout