Merge pull request kubernetes#21325 from caesarxuchao/coding-conventions

Auto commit by PR queue bot
Telmo · Feb 16, 2016 · 8081956 · 8081956
2 parents a0489cb + 97aecd0
commit 8081956
Show file tree

Hide file tree

Showing 30 changed files with 105 additions and 105 deletions.
diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go
@@ -40,7 +40,7 @@ import (
 	"k8s.io/kubernetes/pkg/client/chaosclient"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/record"
-	unversioned_core "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
+	unversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth"
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
@@ -586,7 +586,7 @@ func RunKubelet(kcfg *KubeletConfig) error {
 	eventBroadcaster.StartLogging(glog.V(3).Infof)
 	if kcfg.EventClient != nil {
 		glog.V(4).Infof("Sending events to api server.")
-		eventBroadcaster.StartRecordingToSink(&unversioned_core.EventSinkImpl{kcfg.EventClient.Events("")})
+		eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{kcfg.EventClient.Events("")})
 	} else {
 		glog.Warning("No api server defined - no events will be sent to API server.")
 	}

diff --git a/...client-gen/generators/client-generator.go → ...client-gen/generators/client_generator.go b/...client-gen/generators/client-generator.go → ...client-gen/generators/client_generator.go
diff --git a/.../generators/fake/fake-client-generator.go → .../generators/fake/fake_client_generator.go b/.../generators/fake/fake-client-generator.go → .../generators/fake/fake_client_generator.go
diff --git a/...tors/fake/generator-fake-for-clientset.go → ...tors/fake/generator_fake_for_clientset.go b/...tors/fake/generator-fake-for-clientset.go → ...tors/fake/generator_fake_for_clientset.go
@@ -59,9 +59,9 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
 		group := normalization.Group(gv.Group)
 		version := normalization.Version(gv.Version)
 		typedClientPath := filepath.Join(g.typedClientPath, group, version)
-		imports = append(imports, fmt.Sprintf("%s_%s \"%s\"", group, version, typedClientPath))
+		imports = append(imports, fmt.Sprintf("%s%s \"%s\"", version, group, typedClientPath))
 		fakeTypedClientPath := filepath.Join(typedClientPath, "fake")
-		imports = append(imports, fmt.Sprintf("%s_%s_fake \"%s\"", group, version, fakeTypedClientPath))
+		imports = append(imports, fmt.Sprintf("fake%s%s \"%s\"", version, group, fakeTypedClientPath))
 	}
 	return
 }
@@ -79,7 +79,7 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr
 	for _, gv := range g.groupVersions {
 		group := normalization.Group(gv.Group)
 		version := normalization.Version(gv.Version)
-		allGroups = append(allGroups, arg{namer.IC(group), group + "_" + version})
+		allGroups = append(allGroups, arg{namer.IC(group), version + group})
 	}
 
 	for _, g := range allGroups {
@@ -92,6 +92,6 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr
 var clientsetInterfaceImplTemplate = `
 // $.Group$ retrieves the $.Group$Client
 func (c *Clientset) $.Group$() $.PackageName$.$.Group$Interface {
-	return &$.PackageName$_fake.Fake$.Group${&c.Fake}
+	return &fake$.PackageName$.Fake$.Group${&c.Fake}
 }
 `
diff --git a/...nerators/fake/generator-fake-for-group.go → ...nerators/fake/generator_fake_for_group.go b/...nerators/fake/generator-fake-for-group.go → ...nerators/fake/generator_fake_for_group.go
diff --git a/...enerators/fake/generator-fake-for-type.go → ...enerators/fake/generator_fake_for_type.go b/...enerators/fake/generator-fake-for-type.go → ...enerators/fake/generator_fake_for_type.go
diff --git a/...gen/generators/generator-for-clientset.go → ...gen/generators/generator_for_clientset.go b/...gen/generators/generator-for-clientset.go → ...gen/generators/generator_for_clientset.go
@@ -59,7 +59,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
 		group := normalization.Group(gv.Group)
 		version := normalization.Version(gv.Version)
 		typedClientPath := filepath.Join(g.typedClientPath, group, version)
-		imports = append(imports, fmt.Sprintf("%s_%s \"%s\"", group, version, typedClientPath))
+		imports = append(imports, fmt.Sprintf("%s%s \"%s\"", version, group, typedClientPath))
 		imports = append(imports, "github.com/golang/glog")
 	}
 	return
@@ -80,7 +80,7 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr
 	for _, gv := range g.groupVersions {
 		group := normalization.Group(gv.Group)
 		version := normalization.Version(gv.Version)
-		allGroups = append(allGroups, arg{namer.IC(group), group + "_" + version})
+		allGroups = append(allGroups, arg{namer.IC(group), version + group})
 	}
 
 	m := map[string]interface{}{

diff --git a/...gen/generators/generator-for-expansion.go → ...gen/generators/generator_for_expansion.go b/...gen/generators/generator-for-expansion.go → ...gen/generators/generator_for_expansion.go
diff --git a/...ent-gen/generators/generator-for-group.go → ...ent-gen/generators/generator_for_group.go b/...ent-gen/generators/generator-for-group.go → ...ent-gen/generators/generator_for_group.go
diff --git a/...ient-gen/generators/generator-for-type.go → ...ient-gen/generators/generator_for_type.go b/...ient-gen/generators/generator-for-type.go → ...ient-gen/generators/generator_for_type.go
diff --git a/...libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go b/...libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go
@@ -18,24 +18,24 @@ package test_internalclientset
 
 import (
 	"github.com/golang/glog"
-	testgroup_unversioned "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned"
+	unversionedtestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned"
 	unversioned "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
 type Interface interface {
 	Discovery() unversioned.DiscoveryInterface
-	Testgroup() testgroup_unversioned.TestgroupInterface
+	Testgroup() unversionedtestgroup.TestgroupInterface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
 // version included in a Clientset.
 type Clientset struct {
 	*unversioned.DiscoveryClient
-	*testgroup_unversioned.TestgroupClient
+	*unversionedtestgroup.TestgroupClient
 }
 
 // Testgroup retrieves the TestgroupClient
-func (c *Clientset) Testgroup() testgroup_unversioned.TestgroupInterface {
+func (c *Clientset) Testgroup() unversionedtestgroup.TestgroupInterface {
 	return c.TestgroupClient
 }
 
@@ -48,7 +48,7 @@ func (c *Clientset) Discovery() unversioned.DiscoveryInterface {
 func NewForConfig(c *unversioned.Config) (*Clientset, error) {
 	var clientset Clientset
 	var err error
-	clientset.TestgroupClient, err = testgroup_unversioned.NewForConfig(c)
+	clientset.TestgroupClient, err = unversionedtestgroup.NewForConfig(c)
 	if err != nil {
 		return &clientset, err
 	}
@@ -64,7 +64,7 @@ func NewForConfig(c *unversioned.Config) (*Clientset, error) {
 // panics if there is an error in the config.
 func NewForConfigOrDie(c *unversioned.Config) *Clientset {
 	var clientset Clientset
-	clientset.TestgroupClient = testgroup_unversioned.NewForConfigOrDie(c)
+	clientset.TestgroupClient = unversionedtestgroup.NewForConfigOrDie(c)
 
 	clientset.DiscoveryClient = unversioned.NewDiscoveryClientForConfigOrDie(c)
 	return &clientset
@@ -73,7 +73,7 @@ func NewForConfigOrDie(c *unversioned.Config) *Clientset {
 // New creates a new Clientset for the given RESTClient.
 func New(c *unversioned.RESTClient) *Clientset {
 	var clientset Clientset
-	clientset.TestgroupClient = testgroup_unversioned.New(c)
+	clientset.TestgroupClient = unversionedtestgroup.New(c)
 
 	clientset.DiscoveryClient = unversioned.NewDiscoveryClient(c)
 	return &clientset

diff --git a/contrib/mesos/pkg/executor/apis.go b/contrib/mesos/pkg/executor/apis.go
@@ -19,7 +19,7 @@ package executor
 import (
 	"k8s.io/kubernetes/contrib/mesos/pkg/node"
 	"k8s.io/kubernetes/pkg/api"
-	core_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
+	unversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
 )
 
 type kubeAPI interface {
@@ -33,7 +33,7 @@ type nodeAPI interface {
 // clientAPIWrapper implements kubeAPI and node API, which serve to isolate external dependencies
 // such that they're easier to mock in unit test.
 type clientAPIWrapper struct {
-	client core_unversioned.CoreInterface
+	client unversionedcore.CoreInterface
 }
 
 func (cw *clientAPIWrapper) killPod(ns, name string) error {

diff --git a/contrib/mesos/pkg/node/node.go b/contrib/mesos/pkg/node/node.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"time"
 
-	core_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
+	unversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
 
 	log "github.com/golang/glog"
 	mesos "github.com/mesos/mesos-go/mesosproto"
@@ -42,7 +42,7 @@ const (
 // Create creates a new node api object with the given hostname,
 // slave attribute labels and annotations
 func Create(
-	client core_unversioned.NodesGetter,
+	client unversionedcore.NodesGetter,
 	hostName string,
 	slaveAttrLabels,
 	annotations map[string]string,
@@ -88,7 +88,7 @@ func Create(
 // The updated node merges the given slave attribute labels
 // and annotations with the found api object.
 func Update(
-	client core_unversioned.NodesGetter,
+	client unversionedcore.NodesGetter,
 	hostname string,
 	slaveAttrLabels,
 	annotations map[string]string,
@@ -123,7 +123,7 @@ func Update(
 
 // CreateOrUpdate creates a node api object or updates an existing one
 func CreateOrUpdate(
-	client core_unversioned.NodesGetter,
+	client unversionedcore.NodesGetter,
 	hostname string,
 	slaveAttrLabels,
 	annotations map[string]string,

diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go
@@ -73,7 +73,7 @@ import (
 	"k8s.io/kubernetes/pkg/client/cache"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/record"
-	unversioned_core "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
+	unversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/mesos"
@@ -795,7 +795,7 @@ func (s *SchedulerServer) bootstrap(hks hyperkube.Interface, sc *schedcfg.Config
 	broadcaster := record.NewBroadcaster()
 	recorder := broadcaster.NewRecorder(api.EventSource{Component: api.DefaultSchedulerName})
 	broadcaster.StartLogging(log.Infof)
-	broadcaster.StartRecordingToSink(&unversioned_core.EventSinkImpl{eventsClient.Events("")})
+	broadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{eventsClient.Events("")})
 
 	lw := cache.NewListWatchFromClient(s.client.CoreClient, "pods", api.NamespaceAll, fields.Everything())
 

diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go
@@ -18,32 +18,32 @@ package internalclientset
 
 import (
 	"github.com/golang/glog"
-	core_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
-	extensions_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned"
+	unversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
+	unversionedextensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned"
 	unversioned "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
 type Interface interface {
 	Discovery() unversioned.DiscoveryInterface
-	Core() core_unversioned.CoreInterface
-	Extensions() extensions_unversioned.ExtensionsInterface
+	Core() unversionedcore.CoreInterface
+	Extensions() unversionedextensions.ExtensionsInterface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
 // version included in a Clientset.
 type Clientset struct {
 	*unversioned.DiscoveryClient
-	*core_unversioned.CoreClient
-	*extensions_unversioned.ExtensionsClient
+	*unversionedcore.CoreClient
+	*unversionedextensions.ExtensionsClient
 }
 
 // Core retrieves the CoreClient
-func (c *Clientset) Core() core_unversioned.CoreInterface {
+func (c *Clientset) Core() unversionedcore.CoreInterface {
 	return c.CoreClient
 }
 
 // Extensions retrieves the ExtensionsClient
-func (c *Clientset) Extensions() extensions_unversioned.ExtensionsInterface {
+func (c *Clientset) Extensions() unversionedextensions.ExtensionsInterface {
 	return c.ExtensionsClient
 }
 
@@ -56,11 +56,11 @@ func (c *Clientset) Discovery() unversioned.DiscoveryInterface {
 func NewForConfig(c *unversioned.Config) (*Clientset, error) {
 	var clientset Clientset
 	var err error
-	clientset.CoreClient, err = core_unversioned.NewForConfig(c)
+	clientset.CoreClient, err = unversionedcore.NewForConfig(c)
 	if err != nil {
 		return &clientset, err
 	}
-	clientset.ExtensionsClient, err = extensions_unversioned.NewForConfig(c)
+	clientset.ExtensionsClient, err = unversionedextensions.NewForConfig(c)
 	if err != nil {
 		return &clientset, err
 	}
@@ -76,8 +76,8 @@ func NewForConfig(c *unversioned.Config) (*Clientset, error) {
 // panics if there is an error in the config.
 func NewForConfigOrDie(c *unversioned.Config) *Clientset {
 	var clientset Clientset
-	clientset.CoreClient = core_unversioned.NewForConfigOrDie(c)
-	clientset.ExtensionsClient = extensions_unversioned.NewForConfigOrDie(c)
+	clientset.CoreClient = unversionedcore.NewForConfigOrDie(c)
+	clientset.ExtensionsClient = unversionedextensions.NewForConfigOrDie(c)
 
 	clientset.DiscoveryClient = unversioned.NewDiscoveryClientForConfigOrDie(c)
 	return &clientset
@@ -86,8 +86,8 @@ func NewForConfigOrDie(c *unversioned.Config) *Clientset {
 // New creates a new Clientset for the given RESTClient.
 func New(c *unversioned.RESTClient) *Clientset {
 	var clientset Clientset
-	clientset.CoreClient = core_unversioned.New(c)
-	clientset.ExtensionsClient = extensions_unversioned.New(c)
+	clientset.CoreClient = unversionedcore.New(c)
+	clientset.ExtensionsClient = unversionedextensions.New(c)
 
 	clientset.DiscoveryClient = unversioned.NewDiscoveryClient(c)
 	return &clientset

diff --git a/pkg/client/clientset_generated/internalclientset/clientset_adaption.go b/pkg/client/clientset_generated/internalclientset/clientset_adaption.go
@@ -17,8 +17,8 @@ limitations under the License.
 package internalclientset
 
 import (
-	core_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
-	extensions_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned"
+	unversionedcore "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned"
+	unversionedextensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned"
 )
 
@@ -28,14 +28,14 @@ import (
 func FromUnversionedClient(c *unversioned.Client) *Clientset {
 	var clientset Clientset
 	if c != nil {
-		clientset.CoreClient = core_unversioned.New(c.RESTClient)
+		clientset.CoreClient = unversionedcore.New(c.RESTClient)
 	} else {
-		clientset.CoreClient = core_unversioned.New(nil)
+		clientset.CoreClient = unversionedcore.New(nil)
 	}
 	if c != nil && c.ExtensionsClient != nil {
-		clientset.ExtensionsClient = extensions_unversioned.New(c.ExtensionsClient.RESTClient)
+		clientset.ExtensionsClient = unversionedextensions.New(c.ExtensionsClient.RESTClient)
 	} else {
-		clientset.ExtensionsClient = extensions_unversioned.New(nil)
+		clientset.ExtensionsClient = unversionedextensions.New(nil)
 	}
 
 	return &clientset

diff --git a/pkg/client/clientset_generated/release_1_2/clientset.go b/pkg/client/clientset_generated/release_1_2/clientset.go
@@ -18,32 +18,32 @@ package release_1_2
 
 import (
 	"github.com/golang/glog"
-	core_v1 "k8s.io/kubernetes/pkg/client/typed/generated/core/v1"
-	extensions_v1beta1 "k8s.io/kubernetes/pkg/client/typed/generated/extensions/v1beta1"
+	v1core "k8s.io/kubernetes/pkg/client/typed/generated/core/v1"
+	v1beta1extensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/v1beta1"
 	unversioned "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
 type Interface interface {
 	Discovery() unversioned.DiscoveryInterface
-	Core() core_v1.CoreInterface
-	Extensions() extensions_v1beta1.ExtensionsInterface
+	Core() v1core.CoreInterface
+	Extensions() v1beta1extensions.ExtensionsInterface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
 // version included in a Clientset.
 type Clientset struct {
 	*unversioned.DiscoveryClient
-	*core_v1.CoreClient
-	*extensions_v1beta1.ExtensionsClient
+	*v1core.CoreClient
+	*v1beta1extensions.ExtensionsClient
 }
 
 // Core retrieves the CoreClient
-func (c *Clientset) Core() core_v1.CoreInterface {
+func (c *Clientset) Core() v1core.CoreInterface {
 	return c.CoreClient
 }
 
 // Extensions retrieves the ExtensionsClient
-func (c *Clientset) Extensions() extensions_v1beta1.ExtensionsInterface {
+func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface {
 	return c.ExtensionsClient
 }
 
@@ -56,11 +56,11 @@ func (c *Clientset) Discovery() unversioned.DiscoveryInterface {
 func NewForConfig(c *unversioned.Config) (*Clientset, error) {
 	var clientset Clientset
 	var err error
-	clientset.CoreClient, err = core_v1.NewForConfig(c)
+	clientset.CoreClient, err = v1core.NewForConfig(c)
 	if err != nil {
 		return &clientset, err
 	}
-	clientset.ExtensionsClient, err = extensions_v1beta1.NewForConfig(c)
+	clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(c)
 	if err != nil {
 		return &clientset, err
 	}
@@ -76,8 +76,8 @@ func NewForConfig(c *unversioned.Config) (*Clientset, error) {
 // panics if there is an error in the config.
 func NewForConfigOrDie(c *unversioned.Config) *Clientset {
 	var clientset Clientset
-	clientset.CoreClient = core_v1.NewForConfigOrDie(c)
-	clientset.ExtensionsClient = extensions_v1beta1.NewForConfigOrDie(c)
+	clientset.CoreClient = v1core.NewForConfigOrDie(c)
+	clientset.ExtensionsClient = v1beta1extensions.NewForConfigOrDie(c)
 
 	clientset.DiscoveryClient = unversioned.NewDiscoveryClientForConfigOrDie(c)
 	return &clientset
@@ -86,8 +86,8 @@ func NewForConfigOrDie(c *unversioned.Config) *Clientset {
 // New creates a new Clientset for the given RESTClient.
 func New(c *unversioned.RESTClient) *Clientset {
 	var clientset Clientset
-	clientset.CoreClient = core_v1.New(c)
-	clientset.ExtensionsClient = extensions_v1beta1.New(c)
+	clientset.CoreClient = v1core.New(c)
+	clientset.ExtensionsClient = v1beta1extensions.New(c)
 
 	clientset.DiscoveryClient = unversioned.NewDiscoveryClient(c)
 	return &clientset