github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 06:15:45 +00:00
Code Issues Projects Releases Wiki Activity

add imports of internal apigroup

Browse Source
This commit is contained in:
Mike Danese 2016-11-01 15:12:28 -07:00
parent edab99bf87
commit 667c5cc007
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/libs/go2idl/lister-gen/generators/lister.go
View File

@ -97,6 +97,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
} }
var gv clientgentypes.GroupVersion var gv clientgentypes.GroupVersion
var internalGVPkg string
if isInternal(objectMeta) { if isInternal(objectMeta) {
lastSlash := strings.LastIndex(p.Path, "/") lastSlash := strings.LastIndex(p.Path, "/")
@ -104,10 +105,13 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
glog.Fatalf("error constructing internal group version for package %q", p.Path) glog.Fatalf("error constructing internal group version for package %q", p.Path)
} }
gv.Group = clientgentypes.Group(p.Path[lastSlash+1:]) gv.Group = clientgentypes.Group(p.Path[lastSlash+1:])
internalGVPkg = p.Path
} else { } else {
parts := strings.Split(p.Path, "/") parts := strings.Split(p.Path, "/")
gv.Group = clientgentypes.Group(parts[len(parts)-2]) gv.Group = clientgentypes.Group(parts[len(parts)-2])
gv.Version = clientgentypes.Version(parts[len(parts)-1]) gv.Version = clientgentypes.Version(parts[len(parts)-1])
internalGVPkg = strings.Join(parts[0:len(parts)-1], "/")
} }
packageList = append(packageList, &generator.DefaultPackage{ packageList = append(packageList, &generator.DefaultPackage{
@ -126,6 +130,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
}, },
outputPackage: arguments.OutputPackagePath, outputPackage: arguments.OutputPackagePath,
groupVersion: gv, groupVersion: gv,
internalGVPkg: internalGVPkg,
typeToGenerate: t, typeToGenerate: t,
imports: generator.NewImportTracker(), imports: generator.NewImportTracker(),
objectMeta: objectMeta, objectMeta: objectMeta,
@ -175,6 +180,7 @@ type listerGenerator struct {
generator.DefaultGen generator.DefaultGen
outputPackage string outputPackage string
groupVersion clientgentypes.GroupVersion groupVersion clientgentypes.GroupVersion
internalGVPkg string
typeToGenerate *types.Type typeToGenerate *types.Type
imports namer.ImportTracker imports namer.ImportTracker
objectMeta *types.Type objectMeta *types.Type
@ -206,7 +212,7 @@ func (g *listerGenerator) GenerateType(c *generator.Context, t *types.Type, w io
glog.V(5).Infof("processing type %v", t) glog.V(5).Infof("processing type %v", t)
m := map[string]interface{}{ m := map[string]interface{}{
"group": g.groupVersion.Group.String(), "Resource": c.Universe.Function(types.Name{Package: g.internalGVPkg, Name: "Resource"}),
"type": t, "type": t,
"objectMeta": g.objectMeta, "objectMeta": g.objectMeta,
} }
@ -295,7 +301,7 @@ func (s *$.type|private$Lister) Get(name string) (*$.type|raw$, error) {
return nil, err return nil, err
} }
if !exists { if !exists {
return nil, errors.NewNotFound($.group$.Resource("$.type|lowercaseSingular$"), name) return nil, errors.NewNotFound($.Resource|raw$("$.type|lowercaseSingular$"), name)
} }
return obj.(*$.type|raw$), nil return obj.(*$.type|raw$), nil
} }
@ -338,7 +344,7 @@ func (s $.type|private$NamespaceLister) Get(name string) (*$.type|raw$, error) {
return nil, err return nil, err
} }
if !exists { if !exists {
return nil, errors.NewNotFound($.group$.Resource("$.type|lowercaseSingular$"), name) return nil, errors.NewNotFound($.Resource|raw$("$.type|lowercaseSingular$"), name)
} }
return obj.(*$.type|raw$), nil return obj.(*$.type|raw$), nil
} }