Generate fake clientset for release_1_2

cmd/libs/go2idl/client-gen/args/args.go

@@ -0,0 +1,44 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package args
+
+import "k8s.io/kubernetes/pkg/api/unversioned"
+
+// ClientGenArgs is a wrapper for arguments to client-gen.
+type Args struct {
+	// TODO: we should make another type declaration of GroupVersion out of the
+	// unversioned package, which is part of our API. Tools like client-gen
+	// shouldn't depend on an API.
+	GroupVersions []unversioned.GroupVersion
+
+	// GroupVersionToInputPath is a map between GroupVersion and the path to
+	// the respective types.go. We still need GroupVersions in the struct because
+	// we need an order.
+	GroupVersionToInputPath map[unversioned.GroupVersion]string
+	// ClientsetName is the name of the clientset to be generated. It's
+	// populated from command-line arguments.
+	ClientsetName string
+	// ClientsetOutputPath is the path the clientset will be generated at. It's
+	// populated from command-line arguments.
+	ClientsetOutputPath string
+	// ClientsetOnly determines if we should generate the clients for groups and
+	// types along with the clientset. It's populated from command-line
+	// arguments.
+	ClientsetOnly bool
+	// FakeClient determines if client-gen generates the fake clients.
+	FakeClient bool
+}

cmd/libs/go2idl/client-gen/generators/client_generator.go

@@ -23,6 +23,7 @@ import (
 	"strings"
 
 	"k8s.io/kubernetes/cmd/libs/go2idl/args"
+	clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
 	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/fake"
 	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization"
 	"k8s.io/kubernetes/cmd/libs/go2idl/generator"
@@ -33,31 +34,6 @@ import (
 	"github.com/golang/glog"
 )
 
-// ClientGenArgs is a wrapper for arguments to client-gen.
-type ClientGenArgs struct {
-	// TODO: we should make another type declaration of GroupVersion out of the
-	// unversioned package, which is part of our API. Tools like client-gen
-	// shouldn't depend on an API.
-	GroupVersions []unversioned.GroupVersion
-
-	// GroupVersionToInputPath is a map between GroupVersion and the path to
-	// the respective types.go. We still need GroupVersions in the struct because
-	// we need an order.
-	GroupVersionToInputPath map[unversioned.GroupVersion]string
-	// ClientsetName is the name of the clientset to be generated. It's
-	// populated from command-line arguments.
-	ClientsetName string
-	// ClientsetOutputPath is the path the clientset will be generated at. It's
-	// populated from command-line arguments.
-	ClientsetOutputPath string
-	// ClientsetOnly determines if we should generate the clients for groups and
-	// types along with the clientset. It's populated from command-line
-	// arguments.
-	ClientsetOnly bool
-	// FakeClient determines if client-gen generates the fake clients.
-	FakeClient bool
-}
-
 // NameSystems returns the name system used by the generators in this package.
 func NameSystems() namer.NameSystems {
 	pluralExceptions := map[string]string{
@@ -138,7 +114,7 @@ func packageForGroup(gv unversioned.GroupVersion, typeList []*types.Type, packag
 	}
 }
 
-func packageForClientset(customArgs ClientGenArgs, typedClientBasePath string, boilerplate []byte) generator.Package {
+func packageForClientset(customArgs clientgenargs.Args, typedClientBasePath string, boilerplate []byte) generator.Package {
 	return &generator.DefaultPackage{
 		PackageName: customArgs.ClientsetName,
 		PackagePath: filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName),
@@ -172,9 +148,9 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 		glog.Fatalf("Failed loading boilerplate: %v", err)
 	}
 
-	customArgs, ok := arguments.CustomArgs.(ClientGenArgs)
+	customArgs, ok := arguments.CustomArgs.(clientgenargs.Args)
 	if !ok {
-		glog.Fatalf("cannot convert arguments.CustomArgs to ClientGenArgs")
+		glog.Fatalf("cannot convert arguments.CustomArgs to clientgenargs.Args")
 	}
 
 	gvToTypes := map[unversioned.GroupVersion][]*types.Type{}
@@ -195,7 +171,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 
 	packageList = append(packageList, packageForClientset(customArgs, arguments.OutputPackagePath, boilerplate))
 	if customArgs.FakeClient {
-		packageList = append(packageList, fake.PackageForClientset(arguments.OutputPackagePath, customArgs.GroupVersions, boilerplate))
+		packageList = append(packageList, fake.PackageForClientset(customArgs, arguments.OutputPackagePath, boilerplate))
 	}
 
 	// If --clientset-only=true, we don't regenerate the individual typed clients.

cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go

@@ -20,6 +20,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
 	"k8s.io/kubernetes/cmd/libs/go2idl/generator"
 	"k8s.io/kubernetes/cmd/libs/go2idl/types"
 	"k8s.io/kubernetes/pkg/api/unversioned"
@@ -75,12 +76,12 @@ func PackageForGroup(gv unversioned.GroupVersion, typeList []*types.Type, packag
 	}
 }
 
-func PackageForClientset(typedClientBasePath string, groupVersions []unversioned.GroupVersion, boilerplate []byte) generator.Package {
+func PackageForClientset(customArgs clientgenargs.Args, typedClientBasePath string, boilerplate []byte) generator.Package {
 	return &generator.DefaultPackage{
 		// TODO: we'll generate fake clientset for different release in the future.
 		// Package name and path are hard coded for now.
 		PackageName: "fake",
-		PackagePath: "k8s.io/kubernetes/pkg/client/testing/fake",
+		PackagePath: filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName, "fake"),
 		HeaderText:  boilerplate,
 		PackageDocumentation: []byte(
 			`// This package has the automatically generated fake clientset.
@@ -93,10 +94,11 @@ func PackageForClientset(typedClientBasePath string, groupVersions []unversioned
 					DefaultGen: generator.DefaultGen{
 						OptionalName: "clientset_generated",
 					},
-					groupVersions:   groupVersions,
+					groupVersions:   customArgs.GroupVersions,
 					typedClientPath: typedClientBasePath,
 					outputPackage:   "fake",
 					imports:         generator.NewImportTracker(),
+					clientsetPath:   filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName),
 				},
 			}
 			return generators

cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go

@@ -36,6 +36,8 @@ type genClientset struct {
 	outputPackage      string
 	imports            *generator.ImportTracker
 	clientsetGenerated bool
+	// the import path of the generated real clientset.
+	clientsetPath string
 }
 
 var _ generator.Generator = &genClientset{}
@@ -63,6 +65,17 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
 		fakeTypedClientPath := filepath.Join(typedClientPath, "fake")
 		imports = append(imports, fmt.Sprintf("fake%s%s \"%s\"", version, group, fakeTypedClientPath))
 	}
+	// the package that has the clientset Interface
+	imports = append(imports, fmt.Sprintf("clientset \"%s\"", g.clientsetPath))
+	// imports for the code in commonTemplate
+	imports = append(imports,
+		"k8s.io/kubernetes/pkg/api",
+		"k8s.io/kubernetes/pkg/client/testing/core",
+		"k8s.io/kubernetes/pkg/client/unversioned",
+		"k8s.io/kubernetes/pkg/runtime",
+		"k8s.io/kubernetes/pkg/watch",
+	)
+
 	return
 }
 
@@ -71,6 +84,10 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr
 	// perhaps we can adapt the go2ild framework to this kind of usage.
 	sw := generator.NewSnippetWriter(w, c, "$", "$")
 
+	sw.Do(common, nil)
+
+	sw.Do(checkImpl, nil)
+
 	type arg struct {
 		Group       string
 		PackageName string
@@ -89,6 +106,41 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr
 	return sw.Error()
 }
 
+// This part of code is version-independent, unchanging.
+var common = `
+// Clientset returns a clientset that will respond with the provided objects
+func NewSimpleClientset(objects ...runtime.Object) *Clientset {
+	o := core.NewObjects(api.Scheme, api.Codecs.UniversalDecoder())
+	for _, obj := range objects {
+		if err := o.Add(obj); err != nil {
+			panic(err)
+		}
+	}
+
+	fakePtr := core.Fake{}
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.RESTMapper))
+
+	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
+
+	return &Clientset{fakePtr}
+}
+
+// Clientset implements clientset.Interface. Meant to be embedded into a
+// struct to get a default implementation. This makes faking out just the method
+// you want to test easier.
+type Clientset struct {
+	core.Fake
+}
+
+func (c *Clientset) Discovery() unversioned.DiscoveryInterface {
+	return &FakeDiscovery{&c.Fake}
+}
+`
+
+var checkImpl = `
+var _ clientset.Interface = &Clientset{}
+`
+
 var clientsetInterfaceImplTemplate = `
 // $.Group$ retrieves the $.Group$Client
 func (c *Clientset) $.Group$() $.PackageName$.$.Group$Interface {

cmd/libs/go2idl/client-gen/main.go

@@ -22,6 +22,7 @@ import (
 	"path/filepath"
 
 	"k8s.io/kubernetes/cmd/libs/go2idl/args"
+	clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
 	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 
@@ -78,7 +79,6 @@ func main() {
 		"k8s.io/kubernetes/pkg/labels",
 		"k8s.io/kubernetes/pkg/watch",
 		"k8s.io/kubernetes/pkg/client/unversioned",
-		"k8s.io/kubernetes/pkg/client/testing/fake",
 		"k8s.io/kubernetes/pkg/apimachinery/registered",
 	}
 
@@ -88,7 +88,7 @@ func main() {
 		}...)
 		// We may change the output path later.
 		arguments.OutputPackagePath = "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput"
-		arguments.CustomArgs = generators.ClientGenArgs{
+		arguments.CustomArgs = clientgenargs.Args{
 			[]unversioned.GroupVersion{{"testgroup", ""}},
 			map[unversioned.GroupVersion]string{
 				unversioned.GroupVersion{"testgroup", ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup",
@@ -112,7 +112,7 @@ func main() {
 		// We may change the output path later.
 		arguments.OutputPackagePath = "k8s.io/kubernetes/pkg/client/typed/generated"
 
-		arguments.CustomArgs = generators.ClientGenArgs{
+		arguments.CustomArgs = clientgenargs.Args{
 			groupVersions,
 			gvToPath,
 			*clientsetName,

pkg/client/testing/fake/clientset.go → pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go

@@ -20,6 +20,10 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/testing/core"
+	unversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
+	fakeunversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned/fake"
+	unversionedextensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned"
+	fakeunversionedextensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned/fake"
 	"k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/watch"
@@ -49,8 +53,18 @@ type Clientset struct {
 	core.Fake
 }
 
-var _ clientset.Interface = &Clientset{}
-
 func (c *Clientset) Discovery() unversioned.DiscoveryInterface {
 	return &FakeDiscovery{&c.Fake}
 }
+
+var _ clientset.Interface = &Clientset{}
+
+// Core retrieves the CoreClient
+func (c *Clientset) Core() unversionedcore.CoreInterface {
+	return &fakeunversionedcore.FakeCore{&c.Fake}
+}
+
+// Extensions retrieves the ExtensionsClient
+func (c *Clientset) Extensions() unversionedextensions.ExtensionsInterface {
+	return &fakeunversionedextensions.FakeExtensions{&c.Fake}
+}

pkg/client/testing/fake/discovery.go → pkg/client/clientset_generated/internalclientset/fake/discovery.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// TODO: the fake discovery client should live in pkg/client/discovery/, rather
+// than being copied in every fake clientset.
 package fake
 
 import (

pkg/client/clientset_generated/release_1_2/fake/clientset_generated.go

@@ -0,0 +1,70 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fake
+
+import (
+	"k8s.io/kubernetes/pkg/api"
+	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
+	"k8s.io/kubernetes/pkg/client/testing/core"
+	v1core "k8s.io/kubernetes/pkg/client/typed/generated/core/v1"
+	fakev1core "k8s.io/kubernetes/pkg/client/typed/generated/core/v1/fake"
+	v1beta1extensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/v1beta1"
+	fakev1beta1extensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/v1beta1/fake"
+	"k8s.io/kubernetes/pkg/client/unversioned"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/watch"
+)
+
+// Clientset returns a clientset that will respond with the provided objects
+func NewSimpleClientset(objects ...runtime.Object) *Clientset {
+	o := core.NewObjects(api.Scheme, api.Codecs.UniversalDecoder())
+	for _, obj := range objects {
+		if err := o.Add(obj); err != nil {
+			panic(err)
+		}
+	}
+
+	fakePtr := core.Fake{}
+	fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.RESTMapper))
+
+	fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
+
+	return &Clientset{fakePtr}
+}
+
+// Clientset implements clientset.Interface. Meant to be embedded into a
+// struct to get a default implementation. This makes faking out just the method
+// you want to test easier.
+type Clientset struct {
+	core.Fake
+}
+
+func (c *Clientset) Discovery() unversioned.DiscoveryInterface {
+	return &FakeDiscovery{&c.Fake}
+}
+
+var _ clientset.Interface = &Clientset{}
+
+// Core retrieves the CoreClient
+func (c *Clientset) Core() v1core.CoreInterface {
+	return &fakev1core.FakeCore{&c.Fake}
+}
+
+// Extensions retrieves the ExtensionsClient
+func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface {
+	return &fakev1beta1extensions.FakeExtensions{&c.Fake}
+}