Merge pull request #808 from cdrage/remove-redundant-strings-lower

Remove redundant strings.ToLower()
kubernetes · Sep 11, 2017 · cf7d0d1 · cf7d0d1
2 parents 8fddec9 + a930ce2
commit cf7d0d1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/cmd/convert.go b/cmd/convert.go
@@ -17,8 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"strings"
-
 	log "github.com/Sirupsen/logrus"
 	"github.com/kubernetes/kompose/pkg/app"
 	"github.com/kubernetes/kompose/pkg/kobject"
@@ -47,17 +45,13 @@ var (
 	ConvertOpt                   kobject.ConvertOptions
 )
 
-// ConvertProvider TODO: comment
-var ConvertProvider = GlobalProvider
-
 var convertCmd = &cobra.Command{
 	Use:   "convert [file]",
 	Short: "Convert a Docker Compose file",
 	PreRun: func(cmd *cobra.Command, args []string) {
 
 		// Check that build-config wasn't passed in with --provider=kubernetes
-		provider := strings.ToLower(GlobalProvider)
-		if provider == "kubernetes" && UpBuild == "build-config" {
+		if GlobalProvider == "kubernetes" && UpBuild == "build-config" {
 			log.Fatalf("build-config is not a valid --build parameter with provider Kubernetes")
 		}
 
@@ -70,7 +64,7 @@ var convertCmd = &cobra.Command{
 			Replicas:                    ConvertReplicas,
 			InputFiles:                  GlobalFiles,
 			OutFile:                     ConvertOut,
-			Provider:                    strings.ToLower(GlobalProvider),
+			Provider:                    GlobalProvider,
 			CreateD:                     ConvertDeployment,
 			CreateDS:                    ConvertDaemonSet,
 			CreateRC:                    ConvertReplicationController,

diff --git a/cmd/down.go b/cmd/down.go
@@ -17,8 +17,6 @@ limitations under the License.
 package cmd
 
 import (
-	"strings"
-
 	"github.com/kubernetes/kompose/pkg/app"
 	"github.com/kubernetes/kompose/pkg/kobject"
 	"github.com/spf13/cobra"
@@ -39,7 +37,7 @@ var downCmd = &cobra.Command{
 		// Create the Convert options.
 		DownOpt = kobject.ConvertOptions{
 			InputFiles:      GlobalFiles,
-			Provider:        strings.ToLower(GlobalProvider),
+			Provider:        GlobalProvider,
 			Namespace:       DownNamespace,
 			IsNamespaceFlag: cmd.Flags().Lookup("namespace").Changed,
 		}

diff --git a/cmd/up.go b/cmd/up.go
@@ -18,7 +18,6 @@ package cmd
 
 import (
 	log "github.com/Sirupsen/logrus"
-	"strings"
 
 	"github.com/kubernetes/kompose/pkg/app"
 	"github.com/kubernetes/kompose/pkg/kobject"
@@ -43,8 +42,7 @@ var upCmd = &cobra.Command{
 	PreRun: func(cmd *cobra.Command, args []string) {
 
 		// Check that build-config wasn't passed in with --provider=kubernetes
-		provider := strings.ToLower(GlobalProvider)
-		if provider == "kubernetes" && UpBuild == "build-config" {
+		if GlobalProvider == "kubernetes" && UpBuild == "build-config" {
 			log.Fatalf("build-config is not a valid --build parameter with provider Kubernetes")
 		}
 
@@ -53,7 +51,7 @@ var upCmd = &cobra.Command{
 			Build:              UpBuild,
 			Replicas:           UpReplicas,
 			InputFiles:         GlobalFiles,
-			Provider:           strings.ToLower(GlobalProvider),
+			Provider:           GlobalProvider,
 			EmptyVols:          UpEmptyVols,
 			Volumes:            UpVolumes,
 			Namespace:          UpNamespace,