From 0bad1674b54fbea8e72a2ba4399d24f1e8cda562 Mon Sep 17 00:00:00 2001 From: Tuna Date: Fri, 2 Sep 2016 23:55:31 +0700 Subject: [PATCH 1/4] make --file as global flag --- cli/app/app.go | 6 +++--- cli/command/command.go | 27 ++++++++------------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/cli/app/app.go b/cli/app/app.go index e4880b3e..e76ab48d 100644 --- a/cli/app/app.go +++ b/cli/app/app.go @@ -88,7 +88,7 @@ func validateFlags(opt kobject.ConvertOptions, singleOutput bool, dabFile, input // Convert transforms docker compose or dab file to k8s objects func Convert(c *cli.Context) { - inputFile := c.String("file") + inputFile := c.GlobalString("file") dabFile := c.String("bundle") outFile := c.String("out") generateYaml := c.BoolT("yaml") @@ -170,7 +170,7 @@ func Up(c *cli.Context) { } client := client.NewOrDie(clientConfig) - inputFile := c.String("file") + inputFile := c.GlobalString("file") dabFile := c.String("bundle") komposeObject := kobject.KomposeObject{ @@ -220,7 +220,7 @@ func Down(c *cli.Context) { } client := client.NewOrDie(clientConfig) - inputFile := c.String("file") + inputFile := c.GlobalString("file") dabFile := c.String("bundle") komposeObject := kobject.KomposeObject{ diff --git a/cli/command/command.go b/cli/command/command.go index 88b497e1..e5d3f1ed 100644 --- a/cli/command/command.go +++ b/cli/command/command.go @@ -32,12 +32,6 @@ func ConvertCommand() cli.Command { app.Convert(c) }, Flags: []cli.Flag{ - cli.StringFlag{ - Name: "file,f", - Usage: fmt.Sprintf("Specify an alternate compose file (default: %s)", app.DefaultComposeFile), - Value: app.DefaultComposeFile, - EnvVar: "COMPOSE_FILE", - }, cli.StringFlag{ Name: "bundle,dab", Usage: "Specify a Distributed Application Bundle (DAB) file", @@ -94,12 +88,6 @@ func UpCommand() cli.Command { app.Up(c) }, Flags: []cli.Flag{ - cli.StringFlag{ - Name: "file,f", - Usage: fmt.Sprintf("Specify an alternative compose file (default: %s)", app.DefaultComposeFile), - Value: app.DefaultComposeFile, - EnvVar: "COMPOSE_FILE", - }, cli.StringFlag{ Name: "bundle,dab", Usage: "Specify a Distributed Application Bundle (DAB) file", @@ -118,12 +106,6 @@ func DownCommand() cli.Command { app.Down(c) }, Flags: []cli.Flag{ - cli.StringFlag{ - Name: "file,f", - Usage: fmt.Sprintf("Specify an alternative compose file (default: %s)", app.DefaultComposeFile), - Value: app.DefaultComposeFile, - EnvVar: "COMPOSE_FILE", - }, cli.StringFlag{ Name: "bundle,dab", Usage: "Specify a Distributed Application Bundle (DAB) file", @@ -135,5 +117,12 @@ func DownCommand() cli.Command { // CommonFlags defines the flags that are in common for all subcommands. func CommonFlags() []cli.Flag { - return []cli.Flag{} + return []cli.Flag{ + cli.StringFlag{ + Name: "file,f", + Usage: fmt.Sprintf("Specify an alternative compose file (default: %s)", app.DefaultComposeFile), + Value: app.DefaultComposeFile, + EnvVar: "COMPOSE_FILE", + }, + } } From a9cafc32d53031c31921a3c2442f3fd9e0589dd9 Mon Sep 17 00:00:00 2001 From: Tuna Date: Sat, 3 Sep 2016 00:29:00 +0700 Subject: [PATCH 2/4] update tests properly --- script/test/cmd/tests.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index 0d4bbc06..c108348a 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -5,34 +5,34 @@ source $KOMPOSE_ROOT/script/test/cmd/lib.sh ####### # Tests related to docker-compose file in /script/test/fixtures/etherpad -convert::expect_failure "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose.yml" +convert::expect_failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose.yml convert --stdout" # commenting this test case out until image handling is fixed -#convert::expect_failure "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose-no-image.yml" -convert::expect_warning "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose-no-ports.yml" "Service cannot be created because of missing port." +#convert::expect_failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose-no-image.yml convert --stdout" +convert::expect_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose-no-ports.yml convert --stdout" "Service cannot be created because of missing port." export $(cat $KOMPOSE_ROOT/script/test/fixtures/etherpad/envs) # kubernetes test -convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/etherpad/output-k8s.json" "Unsupported key depends_on - ignoring" +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose.yml convert --stdout" "$KOMPOSE_ROOT/script/test/fixtures/etherpad/output-k8s.json" "Unsupported key depends_on - ignoring" # openshift test -convert::expect_success_and_warning "kompose convert --stdout --dc -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/etherpad/output-os.json" "Unsupported key depends_on - ignoring" +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose.yml convert --stdout --dc" "$KOMPOSE_ROOT/script/test/fixtures/etherpad/output-os.json" "Unsupported key depends_on - ignoring" unset $(cat $KOMPOSE_ROOT/script/test/fixtures/etherpad/envs | cut -d'=' -f1) ###### # Tests related to docker-compose file in /script/test/fixtures/gitlab -convert::expect_failure "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml" +convert::expect_failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml convert --stdout" export $(cat $KOMPOSE_ROOT/script/test/fixtures/gitlab/envs) # kubernetes test -convert::expect_success "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/gitlab/output-k8s.json" +convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml convert --stdout" "$KOMPOSE_ROOT/script/test/fixtures/gitlab/output-k8s.json" # openshift test -convert::expect_success "kompose convert --stdout --dc -f $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/gitlab/output-os.json" +convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/gitlab/docker-compose.yml convert --stdout --dc" "$KOMPOSE_ROOT/script/test/fixtures/gitlab/output-os.json" unset $(cat $KOMPOSE_ROOT/script/test/fixtures/gitlab/envs | cut -d'=' -f1) ###### # Tests related to docker-compose file in /script/test/fixtures/ngnix-node-redis # kubernetes test -convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-k8s.json" "Unsupported key build - ignoring" +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml convert --stdout" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-k8s.json" "Unsupported key build - ignoring" # openshift test -convert::expect_success_and_warning "kompose convert --stdout --dc -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-os.json" "Unsupported key build - ignoring" +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml convert --stdout --dc" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-os.json" "Unsupported key build - ignoring" ###### From eec01c92ca8381c4b48a2341bf26cd09af71ead8 Mon Sep 17 00:00:00 2001 From: Tuna Date: Sat, 3 Sep 2016 12:18:59 +0700 Subject: [PATCH 3/4] update doc properly --- docs/user-guide.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/user-guide.md b/docs/user-guide.md index ebb5694c..84902fee 100644 --- a/docs/user-guide.md +++ b/docs/user-guide.md @@ -201,3 +201,4 @@ WARN[0000] Unsupported key build - ignoring WARN[0000] Unsupported key cap_add - ignoring WARN[0000] Unsupported key dockerfile - ignoring ``` + From 338520fb75416075676dcebca5714da42be2a2e2 Mon Sep 17 00:00:00 2001 From: Tuna Date: Tue, 6 Sep 2016 22:48:11 +0700 Subject: [PATCH 4/4] rebase master, update tests --- script/test/cmd/tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index c108348a..e8fdb273 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -38,9 +38,9 @@ convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtur ###### # Tests related to docker-compose file in /script/test/fixtures/entrypoint-command # kubernetes test -convert::expect_success_and_warning "kompose convert --stdout -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-k8s.json" "Service cannot be created because of missing port." +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml convert --stdout" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-k8s.json" "Service cannot be created because of missing port." # openshift test -convert::expect_success_and_warning "kompose convert --stdout --dc -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-os.json" "Service cannot be created because of missing port." +convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/docker-compose.yml convert --stdout --dc" "$KOMPOSE_ROOT/script/test/fixtures/entrypoint-command/output-os.json" "Service cannot be created because of missing port." exit $EXIT_STATUS