fix golint errors

2017-01-05 10:31:11 +01:00
parent 502157a078
commit 4f176b847e
19 changed files with 159 additions and 114 deletions
@@ -186,11 +186,11 @@ func PrintList(objects []runtime.Object, opt kobject.ConvertOptions) error {
 		if err != nil {
 			return err
 		}
-		data, err := marshal(convertedList, opt.GenerateJson)
+		data, err := marshal(convertedList, opt.GenerateJSON)
 		if err != nil {
 			return fmt.Errorf("Error in marshalling the List: %v", err)
 		}
-		files = append(files, transformer.Print("", dirName, "", data, opt.ToStdout, opt.GenerateJson, f))
+		files = append(files, transformer.Print("", dirName, "", data, opt.ToStdout, opt.GenerateJSON, f))
 	} else {
 		var file string
 		// create a separate file for each provider
@@ -199,33 +199,33 @@ func PrintList(objects []runtime.Object, opt kobject.ConvertOptions) error {
 			if err != nil {
 				return err
 			}
-			data, err := marshal(versionedObject, opt.GenerateJson)
+			data, err := marshal(versionedObject, opt.GenerateJSON)
 			if err != nil {
 				return err
 			}
 			switch t := v.(type) {
 			case *api.ReplicationController:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *extensions.Deployment:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *extensions.DaemonSet:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *deployapi.DeploymentConfig:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *buildapi.BuildConfig:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *imageapi.ImageStream:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *api.Service:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *api.PersistentVolumeClaim:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *api.Pod:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *routeapi.Route:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)
 			case *extensions.Ingress:
-				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJson, f)
+				file = transformer.Print(t.Name, dirName, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateJSON, f)

 			}
 			files = append(files, file)
@@ -270,16 +270,17 @@ func convertToVersion(obj runtime.Object, groupVersion unversioned.GroupVersion)
 	return convertedObject, nil
 }

+// PortsExist checks if service has ports defined
 func (k *Kubernetes) PortsExist(name string, service kobject.ServiceConfig) bool {
 	if len(service.Port) == 0 {
 		logrus.Warningf("[%s] Service cannot be created because of missing port.", name)
 		return false
-	} else {
-		return true
 	}
+	return true
+
 }

-// create a k8s service
+// CreateService creates a k8s service
 func (k *Kubernetes) CreateService(name string, service kobject.ServiceConfig, objects []runtime.Object) *api.Service {
 	svc := k.InitSvc(name, service)

@@ -296,7 +297,7 @@ func (k *Kubernetes) CreateService(name string, service kobject.ServiceConfig, o
 	return svc
 }

-// load configurations to k8s objects
+// UpdateKubernetesObjects loads configurations to k8s objects
 func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.ServiceConfig, objects *[]runtime.Object) {
 	// Configure the environment variables.
 	envs := k.ConfigEnvs(name, service)
@@ -376,7 +377,7 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic
 	}
 }

-// the objects that we get can be in any order this keeps services first
+// SortServicesFirst - the objects that we get can be in any order this keeps services first
 // according to best practice kubernetes services should be created first
 // http://kubernetes.io/docs/user-guide/config-best-practices/
 func (k *Kubernetes) SortServicesFirst(objs *[]runtime.Object) {
@@ -408,8 +409,8 @@ func (k *Kubernetes) findDependentVolumes(svcname string, komposeObject kobject.
 	return
 }

+// VolumesFrom creates volums and volumeMounts for volumes_from
 func (k *Kubernetes) VolumesFrom(objects *[]runtime.Object, komposeObject kobject.KomposeObject) {
-
 	for _, obj := range *objects {
 		switch t := obj.(type) {
 		case *api.ReplicationController:
@@ -20,11 +20,12 @@ import (
 	"strconv"
 	"testing"

+	"os"
+	"path/filepath"
+
 	"github.com/kubernetes-incubator/kompose/pkg/kobject"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/extensions"
-	"os"
-	"path/filepath"
 )

 /*
@@ -57,11 +58,11 @@ func TestCreateService(t *testing.T) {
 	}

 	// An example object generated via k8s runtime.Objects()
-	kompose_object := kobject.KomposeObject{
+	komposeObject := kobject.KomposeObject{
 		ServiceConfigs: map[string]kobject.ServiceConfig{"app": service},
 	}
 	k := Kubernetes{}
-	objects := k.Transform(kompose_object, kobject.ConvertOptions{CreateD: true, Replicas: 3})
+	objects := k.Transform(komposeObject, kobject.ConvertOptions{CreateD: true, Replicas: 3})

 	// Test the creation of the service
 	svc := k.CreateService("foo", service, objects)
@@ -31,12 +31,14 @@ import (
 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	// install kubernetes api
-	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
+
+	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/extensions"
-	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
+
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/kubectl"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -46,12 +48,13 @@ import (
 	//"k8s.io/kubernetes/pkg/controller/daemon"
 )

+// Kubernetes implements Transformer interface and represents Kubernetes transformer
 type Kubernetes struct {
 	// the user provided options from the command line
 	Opt kobject.ConvertOptions
 }

-// timeout is how long we'll wait for the termination of kubernetes resource to be successful
+// TIMEOUT is how long we'll wait for the termination of kubernetes resource to be successful
 // used when undeploying resources from kubernetes
 const TIMEOUT = 300

@@ -64,7 +67,7 @@ var unsupportedKey = map[string]bool{
 	"Build": false,
 }

-// checkUnsupportedKey checks if given komposeObject contains
+// CheckUnsupportedKey checks if given komposeObject contains
 // keys that are not supported by this tranfomer.
 // list of all unsupported keys are stored in unsupportedKey variable
 // returns list of TODO: ....
@@ -101,7 +104,7 @@ func (k *Kubernetes) CheckUnsupportedKey(komposeObject *kobject.KomposeObject, u
 	return keysFound
 }

-// Init RC object
+// InitRC initializes Kubernetes ReplicationController object
 func (k *Kubernetes) InitRC(name string, service kobject.ServiceConfig, replicas int) *api.ReplicationController {
 	rc := &api.ReplicationController{
 		TypeMeta: unversioned.TypeMeta{
@@ -131,7 +134,7 @@ func (k *Kubernetes) InitRC(name string, service kobject.ServiceConfig, replicas
 	return rc
 }

-// Init Svc object
+// InitSvc initializes Kubernets Service object
 func (k *Kubernetes) InitSvc(name string, service kobject.ServiceConfig) *api.Service {
 	svc := &api.Service{
 		TypeMeta: unversioned.TypeMeta{
@@ -149,7 +152,7 @@ func (k *Kubernetes) InitSvc(name string, service kobject.ServiceConfig) *api.Se
 	return svc
 }

-// Init Deployment
+// InitD initializes Kubernetes Deployment object
 func (k *Kubernetes) InitD(name string, service kobject.ServiceConfig, replicas int) *extensions.Deployment {
 	dc := &extensions.Deployment{
 		TypeMeta: unversioned.TypeMeta{
@@ -176,7 +179,7 @@ func (k *Kubernetes) InitD(name string, service kobject.ServiceConfig, replicas
 	return dc
 }

-// Init DS object
+// InitDS initializes Kubernetes DaemonSet object
 func (k *Kubernetes) InitDS(name string, service kobject.ServiceConfig) *extensions.DaemonSet {
 	ds := &extensions.DaemonSet{
 		TypeMeta: unversioned.TypeMeta{
@@ -241,7 +244,7 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por
 	return ingress
 }

-// Initialize PersistentVolumeClaim
+// CreatePVC initializes PersistentVolumeClaim
 func (k *Kubernetes) CreatePVC(name string, mode string) *api.PersistentVolumeClaim {
 	size, err := resource.ParseQuantity("100Mi")
 	if err != nil {
@@ -273,7 +276,7 @@ func (k *Kubernetes) CreatePVC(name string, mode string) *api.PersistentVolumeCl
 	return pvc
 }

-// Configure the container ports.
+// ConfigPorts configures the container ports.
 func (k *Kubernetes) ConfigPorts(name string, service kobject.ServiceConfig) []api.ContainerPort {
 	ports := []api.ContainerPort{}
 	for _, port := range service.Port {
@@ -286,7 +289,7 @@ func (k *Kubernetes) ConfigPorts(name string, service kobject.ServiceConfig) []a
 	return ports
 }

-// Configure the container service ports.
+// ConfigServicePorts configure the container service ports.
 func (k *Kubernetes) ConfigServicePorts(name string, service kobject.ServiceConfig) []api.ServicePort {
 	servicePorts := []api.ServicePort{}
 	for _, port := range service.Port {
@@ -306,7 +309,7 @@ func (k *Kubernetes) ConfigServicePorts(name string, service kobject.ServiceConf
 	return servicePorts
 }

-// Configure the container volumes.
+// ConfigVolumes configure the container volumes.
 func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) ([]api.VolumeMount, []api.Volume, []*api.PersistentVolumeClaim) {
 	volumeMounts := []api.VolumeMount{}
 	volumes := []api.Volume{}
@@ -368,14 +371,14 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
 	return volumeMounts, volumes, PVCs
 }

-// helper function to create an EmptyDir api.VolumeSource
+// ConfigEmptyVolumeSource is helper function to create an EmptyDir api.VolumeSource
 func (k *Kubernetes) ConfigEmptyVolumeSource() *api.VolumeSource {
 	return &api.VolumeSource{
 		EmptyDir: &api.EmptyDirVolumeSource{},
 	}
 }

-// helper function to create an api.VolumeSource with a PVC
+// ConfigPVCVolumeSource is helper function to create an api.VolumeSource with a PVC
 func (k *Kubernetes) ConfigPVCVolumeSource(name string, readonly bool) *api.VolumeSource {
 	return &api.VolumeSource{
 		PersistentVolumeClaim: &api.PersistentVolumeClaimVolumeSource{
@@ -385,7 +388,7 @@ func (k *Kubernetes) ConfigPVCVolumeSource(name string, readonly bool) *api.Volu
 	}
 }

-// Configure the environment variables.
+// ConfigEnvs configures the environment variables.
 func (k *Kubernetes) ConfigEnvs(name string, service kobject.ServiceConfig) []api.EnvVar {
 	envs := []api.EnvVar{}
 	for _, v := range service.Environment {
@@ -398,7 +401,7 @@ func (k *Kubernetes) ConfigEnvs(name string, service kobject.ServiceConfig) []ap
 	return envs
 }

-// Generate a Kubernetes artifact for each input type service
+// CreateKubernetesObjects generates a Kubernetes artifact for each input type service
 func (k *Kubernetes) CreateKubernetesObjects(name string, service kobject.ServiceConfig, opt kobject.ConvertOptions) []runtime.Object {
 	var objects []runtime.Object

@@ -415,6 +418,7 @@ func (k *Kubernetes) CreateKubernetesObjects(name string, service kobject.Servic
 	return objects
 }

+// InitPod initializes Kubernetes Pod object
 func (k *Kubernetes) InitPod(name string, service kobject.ServiceConfig) *api.Pod {
 	pod := api.Pod{
 		TypeMeta: unversioned.TypeMeta{
@@ -450,7 +454,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.

 	// Need to ensure the kubernetes objects are in a consistent order
 	var sortedKeys []string
-	for name, _ := range komposeObject.ServiceConfigs {
+	for name := range komposeObject.ServiceConfigs {
 		sortedKeys = append(sortedKeys, name)
 	}
 	sort.Strings(sortedKeys)
@@ -487,7 +491,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
 	return allobjects
 }

-// Updates the given object with the given pod template update function and ObjectMeta update function
+// UpdateController updates the given object with the given pod template update function and ObjectMeta update function
 func (k *Kubernetes) UpdateController(obj runtime.Object, updateTemplate func(*api.PodTemplateSpec), updateMeta func(meta *api.ObjectMeta)) {
 	switch t := obj.(type) {
 	case *api.ReplicationController:
@@ -518,8 +522,8 @@ func (k *Kubernetes) UpdateController(obj runtime.Object, updateTemplate func(*a
 	}
 }

-// Creates the k8s Client, returns k8s client and namespace
-func (o *Kubernetes) GetKubernetesClient() (*client.Client, string, error) {
+// GetKubernetesClient creates the k8s Client, returns k8s client and namespace
+func (k *Kubernetes) GetKubernetesClient() (*client.Client, string, error) {
 	// initialize Kubernetes client
 	factory := cmdutil.NewFactory(nil)
 	clientConfig, err := factory.ClientConfig()
@@ -536,7 +540,7 @@ func (o *Kubernetes) GetKubernetesClient() (*client.Client, string, error) {
 	return client, namespace, nil
 }

-// Submit deployment and svc to k8s endpoint
+// Deploy submits deployment and svc to k8s endpoint
 func (k *Kubernetes) Deploy(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) error {
 	//Convert komposeObject
 	objects := k.Transform(komposeObject, opt)
@@ -592,6 +596,7 @@ func (k *Kubernetes) Deploy(komposeObject kobject.KomposeObject, opt kobject.Con
 	return nil
 }

+// Undeploy deletes deployed objects from Kubernetes cluster
 func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) error {
 	//Convert komposeObject
 	objects := k.Transform(komposeObject, opt)
@@ -613,9 +618,9 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
 			err = rpDeployment.Stop(namespace, t.Name, TIMEOUT*time.Second, nil)
 			if err != nil {
 				return err
-			} else {
-				logrus.Infof("Successfully deleted Deployment: %s", t.Name)
 			}
+			logrus.Infof("Successfully deleted Deployment: %s", t.Name)
+
 		case *api.Service:
 			//delete svc
 			rpService, err := kubectl.ReaperFor(api.Kind("Service"), client)
@@ -626,17 +631,17 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
 			err = rpService.Stop(namespace, t.Name, TIMEOUT*time.Second, nil)
 			if err != nil {
 				return err
-			} else {
-				logrus.Infof("Successfully deleted Service: %s", t.Name)
 			}
+			logrus.Infof("Successfully deleted Service: %s", t.Name)
+
 		case *api.PersistentVolumeClaim:
 			// delete pvc
 			err = client.PersistentVolumeClaims(namespace).Delete(t.Name)
 			if err != nil {
 				return err
-			} else {
-				logrus.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
 			}
+			logrus.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
+
 		case *extensions.Ingress:
 			// delete ingress
 			ingDeleteOptions := &api.DeleteOptions{
@@ -648,9 +653,9 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
 			err = client.Ingress(namespace).Delete(t.Name, ingDeleteOptions)
 			if err != nil {
 				return err
-			} else {
-				logrus.Infof("Successfully deleted Ingress: %s", t.Name)
 			}
+			logrus.Infof("Successfully deleted Ingress: %s", t.Name)
+
 		}
 	}
 	return nil
@@ -76,14 +76,14 @@ func equalStringSlice(s1, s2 []string) bool {
 	return true
 }

-func equalEnv(kEnvs []kobject.EnvVar, k8sEnvs []api.EnvVar) bool {
-	if len(kEnvs) != len(k8sEnvs) {
+func equalEnv(kobjectEnvs []kobject.EnvVar, k8sEnvs []api.EnvVar) bool {
+	if len(kobjectEnvs) != len(k8sEnvs) {
 		return false
 	}
-	for _, kEnv := range kEnvs {
+	for _, env := range kobjectEnvs {
 		found := false
 		for _, k8sEnv := range k8sEnvs {
-			if kEnv.Name == k8sEnv.Name && kEnv.Value == k8sEnv.Value {
+			if env.Name == k8sEnv.Name && env.Value == k8sEnv.Value {
 				found = true
 			}
 		}
@@ -94,16 +94,16 @@ func equalEnv(kEnvs []kobject.EnvVar, k8sEnvs []api.EnvVar) bool {
 	return true
 }

-func equalPorts(kPorts []kobject.Ports, k8sPorts []api.ContainerPort) bool {
-	if len(kPorts) != len(k8sPorts) {
+func equalPorts(kobjectPorts []kobject.Ports, k8sPorts []api.ContainerPort) bool {
+	if len(kobjectPorts) != len(k8sPorts) {
 		return false
 	}
-	for _, kPort := range kPorts {
+	for _, port := range kobjectPorts {
 		found := false
 		for _, k8sPort := range k8sPorts {
 			// FIXME: HostPort should be copied to container port
-			//if kPort.HostPort == k8sPort.HostPort && kPort.Protocol == k8sPort.Protocol && kPort.ContainerPort == k8sPort.ContainerPort {
-			if kPort.Protocol == k8sPort.Protocol && kPort.ContainerPort == k8sPort.ContainerPort {
+			//if port.HostPort == k8sPort.HostPort && port.Protocol == k8sPort.Protocol && port.ContainerPort == k8sPort.ContainerPort {
+			if port.Protocol == k8sPort.Protocol && port.ContainerPort == k8sPort.ContainerPort {
 				found = true
 			}
 			// Name and HostIp shouldn't be set