From 49a49464b70e1197e687b54ea06c1695f1ef3a2f Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Fri, 9 Nov 2018 10:07:22 -0700 Subject: [PATCH] rename field to privateTypes --- generator/default.go | 4 ++-- generator/generator.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generator/default.go b/generator/default.go index 6da459a2..e13c43d5 100644 --- a/generator/default.go +++ b/generator/default.go @@ -14,7 +14,7 @@ var ( baseK8s = "apis" ) -func DefaultGenerate(schemas *types.Schemas, pkgPath string, publicAPI bool, foreignTypes map[string]bool) error { +func DefaultGenerate(schemas *types.Schemas, pkgPath string, publicAPI bool, privateTypes map[string]bool) error { version := getVersion(schemas) group := strings.Split(version.Group, ".")[0] @@ -24,7 +24,7 @@ func DefaultGenerate(schemas *types.Schemas, pkgPath string, publicAPI bool, for } k8sOutputPackage := path.Join(pkgPath, baseK8s, version.Group, version.Version) - if err := Generate(schemas, foreignTypes, cattleOutputPackage, k8sOutputPackage); err != nil { + if err := Generate(schemas, privateTypes, cattleOutputPackage, k8sOutputPackage); err != nil { return err } diff --git a/generator/generator.go b/generator/generator.go index 8d5c3f1c..a4813235 100644 --- a/generator/generator.go +++ b/generator/generator.go @@ -361,7 +361,7 @@ func GenerateControllerForTypes(version *types.APIVersion, k8sOutputPackage stri return gofmt(baseDir, k8sOutputPackage) } -func Generate(schemas *types.Schemas, foreignTypes map[string]bool, cattleOutputPackage, k8sOutputPackage string) error { +func Generate(schemas *types.Schemas, privateTypes map[string]bool, cattleOutputPackage, k8sOutputPackage string) error { baseDir := args.DefaultSourceTree() cattleDir := path.Join(baseDir, cattleOutputPackage) k8sDir := path.Join(baseDir, k8sOutputPackage) @@ -382,7 +382,7 @@ func Generate(schemas *types.Schemas, foreignTypes map[string]bool, cattleOutput continue } - _, backendType := foreignTypes[schema.ID] + _, privateType := privateTypes[schema.ID] if cattleDir != "" { if err := generateType(cattleDir, schema, schemas); err != nil { @@ -390,7 +390,7 @@ func Generate(schemas *types.Schemas, foreignTypes map[string]bool, cattleOutput } } - if backendType || + if privateType || (contains(schema.CollectionMethods, http.MethodGet) && !strings.HasPrefix(schema.PkgName, "k8s.io") && !strings.Contains(schema.PkgName, "/vendor/")) { @@ -403,7 +403,7 @@ func Generate(schemas *types.Schemas, foreignTypes map[string]bool, cattleOutput } } - if !backendType { + if !privateType { cattleClientTypes = append(cattleClientTypes, schema) } }