rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-28 16:08:19 +00:00
Code Issues Releases Wiki Activity

rename field to privateTypes

Browse Source
This commit is contained in:
Darren Shepherd
2018-11-09 10:07:22 -07:00
parent d73bb5fd29
commit 49a49464b7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generator/default.go
View File

@@ -14,7 +14,7 @@ var (
baseK8s = "apis" 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) version := getVersion(schemas)
group := strings.Split(version.Group, ".")[0] 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) 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 return err
} }

8
generator/generator.go
View File

@@ -361,7 +361,7 @@ func GenerateControllerForTypes(version *types.APIVersion, k8sOutputPackage stri
return gofmt(baseDir, k8sOutputPackage) 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() baseDir := args.DefaultSourceTree()
cattleDir := path.Join(baseDir, cattleOutputPackage) cattleDir := path.Join(baseDir, cattleOutputPackage)
k8sDir := path.Join(baseDir, k8sOutputPackage) k8sDir := path.Join(baseDir, k8sOutputPackage)
@@ -382,7 +382,7 @@ func Generate(schemas *types.Schemas, foreignTypes map[string]bool, cattleOutput
continue continue
} }
_, backendType := foreignTypes[schema.ID] _, privateType := privateTypes[schema.ID]
if cattleDir != "" { if cattleDir != "" {
if err := generateType(cattleDir, schema, schemas); err != nil { 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) && (contains(schema.CollectionMethods, http.MethodGet) &&
!strings.HasPrefix(schema.PkgName, "k8s.io") && !strings.HasPrefix(schema.PkgName, "k8s.io") &&
!strings.Contains(schema.PkgName, "/vendor/")) { !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) cattleClientTypes = append(cattleClientTypes, schema)
} }
} }