github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

add keys to unkeyed literals

Browse Source
This commit is contained in:
Billie Cleek 2018-04-11 09:12:06 -07:00
parent 99e77a76be
commit f61630ea27
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
staging/src/k8s.io/code-generator/cmd/client-gen/args/gvpackages_test.go
View File

@ -45,12 +45,12 @@ func TestGVPackageFlag(t *testing.T) {
args: []string{"foo/bar/v1", "foo/bar/v2", "foo/bar/", "foo/v1"},
expectedGroups: []types.GroupVersions{
{PackageName: "bar", Group: types.Group("bar"), Versions: []types.PackageVersion{
{"v1", "foo/bar/v1"},
{"v2", "foo/bar/v2"},
{"", "foo/bar"},
{Version: "v1", Package: "foo/bar/v1"},
{Version: "v2", Package: "foo/bar/v2"},
{Version: "", Package: "foo/bar"},
}},
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
{"v1", "foo/v1"},
{Version: "v1", Package: "foo/v1"},
}},
},
},
@ -59,12 +59,12 @@ func TestGVPackageFlag(t *testing.T) {
def: []string{"foo/bar/v1alpha1", "foo/v1"},
expectedGroups: []types.GroupVersions{
{PackageName: "bar", Group: types.Group("bar"), Versions: []types.PackageVersion{
{"v1", "foo/bar/v1"},
{"v2", "foo/bar/v2"},
{"", "foo/bar"},
{Version: "v1", Package: "foo/bar/v1"},
{Version: "v2", Package: "foo/bar/v2"},
{Version: "", Package: "foo/bar"},
}},
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
{"v1", "foo/v1"},
{Version: "v1", Package: "foo/v1"},
}},
},
},
@ -72,8 +72,8 @@ func TestGVPackageFlag(t *testing.T) {
args: []string{"api/v1", "api"},
expectedGroups: []types.GroupVersions{
{PackageName: "core", Group: types.Group("api"), Versions: []types.PackageVersion{
{"v1", "core/v1"},
{"", "core"},
{Version: "v1", Package: "core/v1"},
{Version: "", Package: "core"},
}},
},
},
@ -82,7 +82,7 @@ func TestGVPackageFlag(t *testing.T) {
importBasePath: "k8s.io/api",
expectedGroups: []types.GroupVersions{
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
{"v1", "k8s.io/api/foo/v1"},
{Version: "v1", Package: "k8s.io/api/foo/v1"},
}},
},
},

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
View File

@ -63,7 +63,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
groupClientPackage := filepath.Join(g.fakeClientsetPackage, "typed", group.PackageName, version.NonEmpty())
fakeGroupClientPackage := filepath.Join(groupClientPackage, "fake")
groupAlias := strings.ToLower(g.groupGoNames[clientgentypes.GroupVersion{group.Group, version.Version}])
groupAlias := strings.ToLower(g.groupGoNames[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}])
imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", groupAlias, version.NonEmpty(), groupClientPackage)))
imports = append(imports, strings.ToLower(fmt.Sprintf("fake%s%s \"%s\"", groupAlias, version.NonEmpty(), fakeGroupClientPackage)))
}

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go
View File

@ -59,7 +59,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
for _, group := range g.groups {
for _, version := range group.Versions {
typedClientPath := filepath.Join(g.clientsetPackage, "typed", group.PackageName, version.NonEmpty())
groupAlias := strings.ToLower(g.groupGoNames[clientgentypes.GroupVersion{group.Group, version.Version}])
groupAlias := strings.ToLower(g.groupGoNames[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}])
imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", groupAlias, version.NonEmpty(), typedClientPath)))
}
}

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go
View File

@ -62,7 +62,7 @@ func (g *GenScheme) Imports(c *generator.Context) (imports []string) {
for _, group := range g.Groups {
for _, version := range group.Versions {
packagePath := g.InputPackages[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}]
groupAlias := strings.ToLower(g.GroupGoNames[clientgentypes.GroupVersion{group.Group, version.Version}])
groupAlias := strings.ToLower(g.GroupGoNames[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}])
if g.CreateRegistry {
// import the install package for internal clientsets instead of the type package with register.go
if version.Version != "" {