deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #933 from hangyan/refactor-const-strings

Browse Source 
Refactor package app to use const rather than raw string
This commit is contained in:
Charlie Drage 2018-02-13 09:27:07 -05:00 committed by GitHub
commit e8e32c137f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/app/app.go
View File

@ -44,8 +44,13 @@ import (
const ( const (
// DefaultComposeFile name of the file that kompose will use if no file is explicitly set // DefaultComposeFile name of the file that kompose will use if no file is explicitly set
DefaultComposeFile = "docker-compose.yml" DefaultComposeFile = "docker-compose.yml"
)
const (
ProviderKubernetes = "kubernetes"
ProviderOpenshift = "openshift"
// DefaultProvider - provider that will be used if there is no provider was explicitly set // DefaultProvider - provider that will be used if there is no provider was explicitly set
DefaultProvider = "kubernetes" DefaultProvider = ProviderKubernetes
) )
var inputFormat = "compose" var inputFormat = "compose"
@ -82,7 +87,7 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec
// Check validations against provider flags // Check validations against provider flags
switch { switch {
case provider == "openshift": case provider == ProviderOpenshift:
if chart { if chart {
log.Fatalf("--chart, -c is a Kubernetes only flag") log.Fatalf("--chart, -c is a Kubernetes only flag")
} }
@ -98,7 +103,7 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec
if controller == "daemonset" || controller == "replicationcontroller" || controller == "deployment" { if controller == "daemonset" || controller == "replicationcontroller" || controller == "deployment" {
log.Fatalf("--controller= daemonset, replicationcontroller or deployment is a Kubernetes only flag") log.Fatalf("--controller= daemonset, replicationcontroller or deployment is a Kubernetes only flag")
} }
case provider == "kubernetes": case provider == ProviderKubernetes:
if deploymentConfig { if deploymentConfig {
log.Fatalf("--deployment-config is an OpenShift only flag") log.Fatalf("--deployment-config is an OpenShift only flag")
} }
@ -153,10 +158,10 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec
func ValidateComposeFile(opt *kobject.ConvertOptions) { func ValidateComposeFile(opt *kobject.ConvertOptions) {
if len(opt.InputFiles) == 0 { if len(opt.InputFiles) == 0 {
// Here docker-compose is the input // Here docker-compose is the input
opt.InputFiles = []string{"docker-compose.yml"} opt.InputFiles = []string{DefaultComposeFile}
_, err := os.Stat("docker-compose.yml") _, err := os.Stat(DefaultComposeFile)
if err != nil { if err != nil {
log.Debugf("'docker-compose.yml' not found: %v", err) log.Debugf("'%s' not found: %v", DefaultComposeFile, err)
opt.InputFiles = []string{"docker-compose.yaml"} opt.InputFiles = []string{"docker-compose.yaml"}
_, err = os.Stat("docker-compose.yaml") _, err = os.Stat("docker-compose.yaml")
if err != nil { if err != nil {
@ -169,7 +174,7 @@ func ValidateComposeFile(opt *kobject.ConvertOptions) {
func validateControllers(opt *kobject.ConvertOptions) { func validateControllers(opt *kobject.ConvertOptions) {
singleOutput := len(opt.OutFile) != 0 || opt.OutFile == "-" || opt.ToStdout singleOutput := len(opt.OutFile) != 0 || opt.OutFile == "-" || opt.ToStdout
if opt.Provider == "kubernetes" { if opt.Provider == ProviderKubernetes {
// create deployment by default if no controller has been set // create deployment by default if no controller has been set
if !opt.CreateD && !opt.CreateDS && !opt.CreateRC && opt.Controller == "" { if !opt.CreateD && !opt.CreateDS && !opt.CreateRC && opt.Controller == "" {
opt.CreateD = true opt.CreateD = true
@ -190,7 +195,7 @@ func validateControllers(opt *kobject.ConvertOptions) {
} }
} }
} else if opt.Provider == "openshift" { } else if opt.Provider == ProviderOpenshift {
// create deploymentconfig by default if no controller has been set // create deploymentconfig by default if no controller has been set
if !opt.CreateDeploymentConfig { if !opt.CreateDeploymentConfig {
opt.CreateDeploymentConfig = true opt.CreateDeploymentConfig = true
@ -311,7 +316,7 @@ func Down(opt kobject.ConvertOptions) {
// what provider we are using. // what provider we are using.
func getTransformer(opt kobject.ConvertOptions) transformer.Transformer { func getTransformer(opt kobject.ConvertOptions) transformer.Transformer {
var t transformer.Transformer var t transformer.Transformer
if opt.Provider == "kubernetes" { if opt.Provider == DefaultProvider {
// Create/Init new Kubernetes object with CLI opts // Create/Init new Kubernetes object with CLI opts
t = &kubernetes.Kubernetes{Opt: opt} t = &kubernetes.Kubernetes{Opt: opt}
} else { } else {