Fix linter errors

Signed-off-by: Silvin Lubecki <[email protected]>

cli/command/stack/kubernetes/check.go

@@ -11,45 +11,46 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-type KubernetesStackVersion string
+// StackVersion represents the detected Compose Component on Kubernetes side.
+type StackVersion string
 
 const (
-	// KubernetesStackNotFound is returned when no stack api at all is detected on kubernetes.
-	KubernetesStackNotFound = "notFound"
-	// KubernetesStackAPIV1Beta1 is returned if it's the most recent version available.
-	KubernetesStackAPIV1Beta1 = "v1beta1"
-	// KubernetesStackAPIV1Beta2 is returned if it's the most recent version available.
-	KubernetesStackAPIV1Beta2 = "v1beta2"
+	// StackNotFound is returned when no stack api at all is detected on kubernetes.
+	StackNotFound = "notFound"
+	// StackAPIV1Beta1 is returned if it's the most recent version available.
+	StackAPIV1Beta1 = "v1beta1"
+	// StackAPIV1Beta2 is returned if it's the most recent version available.
+	StackAPIV1Beta2 = "v1beta2"
 )
 
 // GetAPIVersion returns the most recent stack API installed.
-func (c *KubeCli) GetAPIVersion() (KubernetesStackVersion, error) {
+func (c *KubeCli) GetAPIVersion() (StackVersion, error) {
 	log.Debugf("retrieve most recent stack API present at %s", c.KubeConfig.Host)
 	clients, err := kubernetes.NewForConfig(c.KubeConfig)
 	if err != nil {
-		return KubernetesStackNotFound, err
+		return StackNotFound, err
 	}
 
 	groups, err := clients.Discovery().ServerGroups()
 	if err != nil {
-		return KubernetesStackNotFound, err
+		return StackNotFound, err
 	}
 
 	switch {
 	case findVersion(apiv1beta2.SchemeGroupVersion, groups.Groups):
-		return KubernetesStackAPIV1Beta2, nil
+		return StackAPIV1Beta2, nil
 	case findVersion(apiv1beta1.SchemeGroupVersion, groups.Groups):
-		return KubernetesStackAPIV1Beta1, nil
+		return StackAPIV1Beta1, nil
 	default:
-		return KubernetesStackNotFound, fmt.Errorf("could not find %s api. Install it on your cluster first", apiv1beta1.SchemeGroupVersion.Group)
+		return StackNotFound, fmt.Errorf("could not find %s api. Install it on your cluster first", apiv1beta1.SchemeGroupVersion.Group)
 	}
 }
 
-func findVersion(stackApi schema.GroupVersion, groups []apimachinerymetav1.APIGroup) bool {
+func findVersion(stackAPI schema.GroupVersion, groups []apimachinerymetav1.APIGroup) bool {
 	for _, group := range groups {
-		if group.Name == stackApi.Group {
+		if group.Name == stackAPI.Group {
 			for _, version := range group.Versions {
-				if version.Version == stackApi.Version {
+				if version.Version == stackAPI.Version {
 					return true
 				}
 			}

cli/command/stack/kubernetes/cli.go

@@ -67,9 +67,9 @@ func (c *KubeCli) stacks() (stackClient, error) {
 	}
 
 	switch version {
-	case KubernetesStackAPIV1Beta1:
+	case StackAPIV1Beta1:
 		return c.newStackV1Beta1()
-	case KubernetesStackAPIV1Beta2:
+	case StackAPIV1Beta2:
 		return c.newStackV1Beta2()
 	default:
 		return nil, fmt.Errorf("could not find matching Stack API version")

cli/command/stack/kubernetes/stack.go

@@ -22,7 +22,7 @@ type stackClient interface {
 	IsColliding(servicesClient corev1.ServiceInterface, name string, services []string) error
 }
 
-// stack is the main type used by stack commands so they remain independant from kubernetes compose component version.
+// stack is the main type used by stack commands so they remain independent from kubernetes compose component version.
 type stack struct {
 	name        string
 	composeFile string

kubernetes/client/clientset/clientset.go

@@ -9,6 +9,8 @@ import (
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
 )
 
+// Interface defines the methods a compose kube client should have
+// FIXME(vdemeester) is it required ?
 type Interface interface {
 	Discovery() discovery.DiscoveryInterface
 	ComposeV1beta2() composev1beta2.ComposeV1beta2Interface
@@ -41,8 +43,8 @@ func (c *Clientset) ComposeV1beta1() composev1beta1.ComposeV1beta1Interface {
 	return c.ComposeV1beta1Client
 }
 
-// Deprecated: Compose retrieves the default version of ComposeClient.
-// Please explicitly pick a version.
+// Compose retrieves the default version of ComposeClient.
+// deprecated: please explicitly pick a version.
 func (c *Clientset) Compose() composev1beta1.ComposeV1beta1Interface {
 	if c == nil {
 		return nil

kubernetes/client/clientset/scheme/register.go

@@ -9,9 +9,12 @@ import (
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 )
 
-var Scheme = runtime.NewScheme()
-var Codecs = serializer.NewCodecFactory(Scheme)
-var ParameterCodec = runtime.NewParameterCodec(Scheme)
+// Variables required for registration
+var (
+	Scheme         = runtime.NewScheme()
+	Codecs         = serializer.NewCodecFactory(Scheme)
+	ParameterCodec = runtime.NewParameterCodec(Scheme)
+)
 
 func init() {
 	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})

kubernetes/client/clientset/typed/compose/v1beta1/compose_client.go

@@ -7,6 +7,7 @@ import (
 	rest "k8s.io/client-go/rest"
 )
 
+// ComposeV1beta1Interface defines the methods a compose v1beta1 client has
 type ComposeV1beta1Interface interface {
 	RESTClient() rest.Interface
 	StacksGetter
@@ -17,6 +18,7 @@ type ComposeV1beta1Client struct {
 	restClient rest.Interface
 }
 
+// Stacks returns a stack client
 func (c *ComposeV1beta1Client) Stacks(namespace string) StackInterface {
 	return newStacks(c, namespace)
 }

kubernetes/client/clientset/typed/compose/v1beta1/stack.go

@@ -25,7 +25,7 @@ type StackInterface interface {
 	Get(name string, options v1.GetOptions) (*v1beta1.Stack, error)
 	List(opts v1.ListOptions) (*v1beta1.StackList, error)
 	Watch(opts v1.ListOptions) (watch.Interface, error)
-	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Stack, err error)
+	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (*v1beta1.Stack, error)
 }
 
 var _ StackInterface = &stacks{}
@@ -45,44 +45,44 @@ func newStacks(c *ComposeV1beta1Client, namespace string) *stacks {
 }
 
 // Create takes the representation of a stack and creates it.  Returns the server's representation of the stack, and an error, if there is any.
-func (c *stacks) Create(stack *v1beta1.Stack) (result *v1beta1.Stack, err error) {
-	result = &v1beta1.Stack{}
-	err = c.client.Post().
+func (c *stacks) Create(stack *v1beta1.Stack) (*v1beta1.Stack, error) {
+	result := &v1beta1.Stack{}
+	err := c.client.Post().
 		Namespace(c.ns).
 		Resource("stacks").
 		Body(stack).
 		Do().
 		Into(result)
-	return
+	return result, err
 }
 
 // Update takes the representation of a stack and updates it. Returns the server's representation of the stack, and an error, if there is any.
-func (c *stacks) Update(stack *v1beta1.Stack) (result *v1beta1.Stack, err error) {
-	result = &v1beta1.Stack{}
-	err = c.client.Put().
+func (c *stacks) Update(stack *v1beta1.Stack) (*v1beta1.Stack, error) {
+	result := &v1beta1.Stack{}
+	err := c.client.Put().
 		Namespace(c.ns).
 		Resource("stacks").
 		Name(stack.Name).
 		Body(stack).
 		Do().
 		Into(result)
-	return
+	return result, err
 }
 
 // UpdateStatus was generated because the type contains a Status member.
 // Add a +genclientstatus=false comment above the type to avoid generating UpdateStatus().
 
-func (c *stacks) UpdateStatus(stack *v1beta1.Stack) (result *v1beta1.Stack, err error) {
-	result = &v1beta1.Stack{}
-	err = c.client.Put().
+func (c *stacks) UpdateStatus(stack *v1beta1.Stack) (*v1beta1.Stack, error) {
+	result := &v1beta1.Stack{}
+	err := c.client.Put().
 		Namespace(c.ns).
 		Resource("stacks").
 		Name(stack.Name).
 		SubResource("status").
 		Body(stack).
 		Do().
 		Into(result)
-	return
+	return result, err
 }
 
 // Delete takes name of the stack and deletes it. Returns an error if one occurs.
@@ -108,28 +108,28 @@ func (c *stacks) DeleteCollection(options *v1.DeleteOptions, listOptions v1.List
 }
 
 // Get takes name of the stack, and returns the corresponding stack object, and an error if there is any.
-func (c *stacks) Get(name string, options v1.GetOptions) (result *v1beta1.Stack, err error) {
-	result = &v1beta1.Stack{}
-	err = c.client.Get().
+func (c *stacks) Get(name string, options v1.GetOptions) (*v1beta1.Stack, error) {
+	result := &v1beta1.Stack{}
+	err := c.client.Get().
 		Namespace(c.ns).
 		Resource("stacks").
 		Name(name).
 		VersionedParams(&options, scheme.ParameterCodec).
 		Do().
 		Into(result)
-	return
+	return result, err
 }
 
 // List takes label and field selectors, and returns the list of Stacks that match those selectors.
-func (c *stacks) List(opts v1.ListOptions) (result *v1beta1.StackList, err error) {
-	result = &v1beta1.StackList{}
-	err = c.client.Get().
+func (c *stacks) List(opts v1.ListOptions) (*v1beta1.StackList, error) {
+	result := &v1beta1.StackList{}
+	err := c.client.Get().
 		Namespace(c.ns).
 		Resource("stacks").
 		VersionedParams(&opts, scheme.ParameterCodec).
 		Do().
 		Into(result)
-	return
+	return result, err
 }
 
 // Watch returns a watch.Interface that watches the requested stacks.
@@ -143,15 +143,15 @@ func (c *stacks) Watch(opts v1.ListOptions) (watch.Interface, error) {
 }
 
 // Patch applies the patch and returns the patched stack.
-func (c *stacks) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.Stack, err error) {
-	result = &v1beta1.Stack{}
-	err = c.client.Patch(pt).
+func (c *stacks) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (*v1beta1.Stack, error) {
+	result := &v1beta1.Stack{}
+	err := c.client.Patch(pt).
 		Namespace(c.ns).
 		Resource("stacks").
 		SubResource(subresources...).
 		Name(name).
 		Body(data).
 		Do().
 		Into(result)
-	return
+	return result, err
 }

kubernetes/client/clientset/typed/compose/v1beta2/compose_client.go

@@ -7,6 +7,7 @@ import (
 	rest "k8s.io/client-go/rest"
 )
 
+// ComposeV1beta2Interface defines the methods a compose v1beta2 client has
 type ComposeV1beta2Interface interface {
 	RESTClient() rest.Interface
 	StacksGetter
@@ -17,6 +18,7 @@ type ComposeV1beta2Client struct {
 	restClient rest.Interface
 }
 
+// Stacks returns a stack client
 func (c *ComposeV1beta2Client) Stacks(namespace string) StackInterface {
 	return newStacks(c, namespace)
 }