rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-25 07:18:25 +00:00
Code Issues Releases Wiki Activity

update norman dependency

Browse Source
This commit is contained in:
Craig Jellick 2018-06-19 09:45:41 -07:00 committed by Alena Prokharchyk
parent d4f2cbed6b
commit aa4b48988f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -7,4 +7,4 @@ golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6
github.com/rancher/norman d70f95a3d6fc13a9f4554e74b838771ea7c928b2
github.com/rancher/norman df1aea6651585bc249927e5c42a9bad3082f9be5

19
vendor/github.com/rancher/norman/generator/generator.go generated vendored
View File

@ -360,7 +360,7 @@ func GenerateControllerForTypes(version *types.APIVersion, k8sOutputPackage stri
return gofmt(baseDir, k8sOutputPackage)
}
func Generate(schemas *types.Schemas, cattleOutputPackage, k8sOutputPackage string) error {
func Generate(schemas *types.Schemas, backendTypes map[string]bool, cattleOutputPackage, k8sOutputPackage string) error {
baseDir := args.DefaultSourceTree()
cattleDir := path.Join(baseDir, cattleOutputPackage)
k8sDir := path.Join(baseDir, k8sOutputPackage)
@ -371,19 +371,22 @@ func Generate(schemas *types.Schemas, cattleOutputPackage, k8sOutputPackage stri
controllers := []*types.Schema{}
generated := []*types.Schema{}
cattleClientTypes := []*types.Schema{}
for _, schema := range schemas.Schemas() {
if blackListTypes[schema.ID] {
continue
}
_, backendType := backendTypes[schema.ID]
if err := generateType(cattleDir, schema, schemas); err != nil {
return err
}
if contains(schema.CollectionMethods, http.MethodGet) &&
!strings.HasPrefix(schema.PkgName, "k8s.io") &&
!strings.Contains(schema.PkgName, "/vendor/") {
if backendType ||
(contains(schema.CollectionMethods, http.MethodGet) &&
!strings.HasPrefix(schema.PkgName, "k8s.io") &&
!strings.Contains(schema.PkgName, "/vendor/")) {
controllers = append(controllers, schema)
if err := generateController(false, k8sDir, schema, schemas); err != nil {
return err
@ -393,10 +396,12 @@ func Generate(schemas *types.Schemas, cattleOutputPackage, k8sOutputPackage stri
}
}
generated = append(generated, schema)
if !backendType {
cattleClientTypes = append(cattleClientTypes, schema)
}
}
if err := generateClient(cattleDir, generated); err != nil {
if err := generateClient(cattleDir, cattleClientTypes); err != nil {
return err
}