fix codeclimate issues

Author: gentele

main.go

@@ -5,6 +5,8 @@ import (
 
 	"github.com/covexo/devspace/cmd"
 	"github.com/covexo/devspace/pkg/devspace/upgrade"
+
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
 var version string

pkg/devspace/clients/kubectl/client.go

@@ -17,7 +17,6 @@ import (
 	k8sv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/portforward"
@@ -215,17 +214,16 @@ func GetClientConfig() (*rest.Config, error) {
 
 	if (config.Cluster.UseKubeConfig != nil && *config.Cluster.UseKubeConfig) || config.Cluster.APIServer == nil {
 		return clientcmd.BuildConfigFromFlags("", filepath.Join(fsutil.GetHomeDir(), ".kube", "config"))
-	} else {
-		return &rest.Config{
-			Host:     *config.Cluster.APIServer,
-			Username: *config.Cluster.User.Username,
-			TLSClientConfig: rest.TLSClientConfig{
-				CAData:   []byte(*config.Cluster.CaCert),
-				CertData: []byte(*config.Cluster.User.ClientCert),
-				KeyData:  []byte(*config.Cluster.User.ClientKey),
-			},
-		}, nil
 	}
+	return &rest.Config{
+		Host:     *config.Cluster.APIServer,
+		Username: *config.Cluster.User.Username,
+		TLSClientConfig: rest.TLSClientConfig{
+			CAData:   []byte(*config.Cluster.CaCert),
+			CertData: []byte(*config.Cluster.User.ClientCert),
+			KeyData:  []byte(*config.Cluster.User.ClientKey),
+		},
+	}, nil
 }
 
 // ForwardPorts forwards the specified ports from the cluster to the local machine