Merge pull request #967 from hangyan/fix-golint-warnings

Fix golint warnings

pkg/app/app.go

@@ -47,8 +47,10 @@ const (
 )
 
 const (
+	// ProviderKubernetes is provider kubernetes
 	ProviderKubernetes = "kubernetes"
-	ProviderOpenshift  = "openshift"
+	// ProviderOpenshift is provider openshift
+	ProviderOpenshift = "openshift"
 	// DefaultProvider - provider that will be used if there is no provider was explicitly set
 	DefaultProvider = ProviderKubernetes
 )

pkg/loader/compose/v1v2.go

@@ -294,7 +294,7 @@ func libComposeToKomposeMapping(composeObject *project.Project) (kobject.Kompose
 
 // This function will retrieve volumes for each service, as well as it will parse volume information and store it in Volumes struct
 func handleVolume(komposeObject *kobject.KomposeObject) {
-	for name, _ := range komposeObject.ServiceConfigs {
+	for name := range komposeObject.ServiceConfigs {
 		// retrieve volumes of service
 		vols, err := retrieveVolume(name, *komposeObject)
 		if err != nil {
@@ -379,6 +379,7 @@ func checkVolDependent(dv kobject.Volumes, volume []kobject.Volumes) bool {
 
 }
 
+// ParseVols parse volumes
 func ParseVols(volNames []string, svcName string) ([]kobject.Volumes, error) {
 	var volumes []kobject.Volumes
 	var err error

pkg/transformer/kubernetes/k8sutils.go

@@ -581,6 +581,7 @@ func DurationStrToSecondsInt(s string) (*int64, error) {
 	return &r, nil
 }
 
+// GetEnvsFromFile get env vars from env_file
 func GetEnvsFromFile(file string, opt kobject.ConvertOptions) (map[string]string, error) {
 	// Get the correct file context / directory
 	composeDir, err := transformer.GetComposeFileDir(opt.InputFiles)
@@ -598,6 +599,7 @@ func GetEnvsFromFile(file string, opt kobject.ConvertOptions) (map[string]string
 	return envLoad, nil
 }
 
+// FormatEnvName format env name
 func FormatEnvName(name string) string {
 	envName := strings.Trim(name, "./")
 	envName = strings.Replace(envName, ".", "-", -1)

pkg/transformer/kubernetes/kubernetes.go

@@ -579,7 +579,7 @@ func (k *Kubernetes) ConfigEnvs(name string, service kobject.ServiceConfig, opt
 			}
 
 			// Add configMapKeyRef to each environment variable
-			for k, _ := range envLoad {
+			for k := range envLoad {
 				envs = append(envs, api.EnvVar{
 					Name: k,
 					ValueFrom: &api.EnvVarSource{

pkg/transformer/openshift/utils.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-// getImageTag get tag name from image name
+// GetImageTag get tag name from image name
 // if no tag is specified return 'latest'
 func GetImageTag(image string) string {
 	// format:      registry_host:registry_port/repo_name/image_name:image_tag
@@ -31,7 +31,7 @@ func GetImageTag(image string) string {
 
 }
 
-// getAbsBuildContext returns build context relative to project root dir
+// GetAbsBuildContext returns build context relative to project root dir
 func GetAbsBuildContext(context string) (string, error) {
 	cmd := exec.Command("git", "rev-parse", "--show-prefix")
 	cmd.Dir = context

pkg/transformer/utils.go

@@ -224,7 +224,7 @@ func BuildDockerImage(service kobject.ServiceConfig, name string, relativePath s
 	}
 
 	// Connect to the Docker client
-	client, err := docker.DockerClient()
+	client, err := docker.Client()
 	if err != nil {
 		return err
 	}
@@ -251,20 +251,19 @@ func PushDockerImage(service kobject.ServiceConfig, serviceName string) error {
 	if service.Image == "" {
 		log.Warnf("No image name has been passed for service %s, skipping pushing to repository", serviceName)
 		return nil
-	} else {
+	}
 
-		// Connect to the Docker client
+	// Connect to the Docker client
-		client, err := docker.DockerClient()
+	client, err := docker.Client()
-		if err != nil {
+	if err != nil {
-			return err
+		return err
-		}
+	}
 
-		push := docker.Push{Client: *client}
+	push := docker.Push{Client: *client}
-		err = push.PushImage(service.Image)
+	err = push.PushImage(service.Image)
 
-		if err != nil {
+	if err != nil {
-			return err
+		return err
-		}
 	}
 
 	return nil

pkg/utils/docker/client.go

@@ -21,8 +21,8 @@ import (
 	"os"
 )
 
-// DockerClient connects to Docker client on host
+// Client connects to Docker client on host
-func DockerClient() (*docker.Client, error) {
+func Client() (*docker.Client, error) {
 
 	var (
 		err    error