From ced217e69946722abb2a62e5b50f5ce9875ff0ad Mon Sep 17 00:00:00 2001
From: Calvin Leung Huang <cleung2010@gmail.com>
Date: Thu, 7 Sep 2017 16:30:00 -0400
Subject: [PATCH] Fix flag parsing on database plugins, exit on parse error
 (#3305)

* Change FlagSet error handling to flag.ExitOnError

* Ignore os.Args[0] (the command itself) when parsing flags

* Revert to using flag.ContinueOnError
---
 plugins/database/cassandra/cassandra-database-plugin/main.go   | 2 +-
 plugins/database/hana/hana-database-plugin/main.go             | 2 +-
 plugins/database/mongodb/mongodb-database-plugin/main.go       | 2 +-
 plugins/database/mssql/mssql-database-plugin/main.go           | 2 +-
 plugins/database/mysql/mysql-database-plugin/main.go           | 2 +-
 plugins/database/mysql/mysql-legacy-database-plugin/main.go    | 2 +-
 plugins/database/postgresql/postgresql-database-plugin/main.go | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/database/cassandra/cassandra-database-plugin/main.go b/plugins/database/cassandra/cassandra-database-plugin/main.go
index c70997897e..f9bfdeb05b 100644
--- a/plugins/database/cassandra/cassandra-database-plugin/main.go
+++ b/plugins/database/cassandra/cassandra-database-plugin/main.go
@@ -11,7 +11,7 @@ import (
 func main() {
 	apiClientMeta := &pluginutil.APIClientMeta{}
 	flags := apiClientMeta.FlagSet()
-	flags.Parse(os.Args)
+	flags.Parse(os.Args[1:])
 
 	err := cassandra.Run(apiClientMeta.GetTLSConfig())
 	if err != nil {
diff --git a/plugins/database/hana/hana-database-plugin/main.go b/plugins/database/hana/hana-database-plugin/main.go
index a76d49c9e3..f995fe001d 100644
--- a/plugins/database/hana/hana-database-plugin/main.go
+++ b/plugins/database/hana/hana-database-plugin/main.go
@@ -11,7 +11,7 @@ import (
 func main() {
 	apiClientMeta := &pluginutil.APIClientMeta{}
 	flags := apiClientMeta.FlagSet()
-	flags.Parse(os.Args)
+	flags.Parse(os.Args[1:])
 
 	err := hana.Run(apiClientMeta.GetTLSConfig())
 	if err != nil {
diff --git a/plugins/database/mongodb/mongodb-database-plugin/main.go b/plugins/database/mongodb/mongodb-database-plugin/main.go
index 30db69a12e..eedb0d0214 100644
--- a/plugins/database/mongodb/mongodb-database-plugin/main.go
+++ b/plugins/database/mongodb/mongodb-database-plugin/main.go
@@ -11,7 +11,7 @@ import (
 func main() {
 	apiClientMeta := &pluginutil.APIClientMeta{}
 	flags := apiClientMeta.FlagSet()
-	flags.Parse(os.Args)
+	flags.Parse(os.Args[1:])
 
 	err := mongodb.Run(apiClientMeta.GetTLSConfig())
 	if err != nil {
diff --git a/plugins/database/mssql/mssql-database-plugin/main.go b/plugins/database/mssql/mssql-database-plugin/main.go
index 5f05c5dffa..9201b4843d 100644
--- a/plugins/database/mssql/mssql-database-plugin/main.go
+++ b/plugins/database/mssql/mssql-database-plugin/main.go
@@ -11,7 +11,7 @@ import (
 func main() {
 	apiClientMeta := &pluginutil.APIClientMeta{}
 	flags := apiClientMeta.FlagSet()
-	flags.Parse(os.Args)
+	flags.Parse(os.Args[1:])
 
 	err := mssql.Run(apiClientMeta.GetTLSConfig())
 	if err != nil {
diff --git a/plugins/database/mysql/mysql-database-plugin/main.go b/plugins/database/mysql/mysql-database-plugin/main.go
index 249e5afeef..917f1b3caf 100644
--- a/plugins/database/mysql/mysql-database-plugin/main.go
+++ b/plugins/database/mysql/mysql-database-plugin/main.go
@@ -11,7 +11,7 @@ import (
 func main() {
 	apiClientMeta := &pluginutil.APIClientMeta{}
 	flags := apiClientMeta.FlagSet()
-	flags.Parse(os.Args)
+	flags.Parse(os.Args[1:])
 
 	err := mysql.Run(apiClientMeta.GetTLSConfig())
 	if err != nil {
diff --git a/plugins/database/mysql/mysql-legacy-database-plugin/main.go b/plugins/database/mysql/mysql-legacy-database-plugin/main.go
index 04f00cd013..2b950e0a39 100644
--- a/plugins/database/mysql/mysql-legacy-database-plugin/main.go
+++ b/plugins/database/mysql/mysql-legacy-database-plugin/main.go
@@ -11,7 +11,7 @@ import (
 func main() {
 	apiClientMeta := &pluginutil.APIClientMeta{}
 	flags := apiClientMeta.FlagSet()
-	flags.Parse(os.Args)
+	flags.Parse(os.Args[1:])
 
 	err := mysql.RunLegacy(apiClientMeta.GetTLSConfig())
 	if err != nil {
diff --git a/plugins/database/postgresql/postgresql-database-plugin/main.go b/plugins/database/postgresql/postgresql-database-plugin/main.go
index ac3cf95a75..a3b178969a 100644
--- a/plugins/database/postgresql/postgresql-database-plugin/main.go
+++ b/plugins/database/postgresql/postgresql-database-plugin/main.go
@@ -11,7 +11,7 @@ import (
 func main() {
 	apiClientMeta := &pluginutil.APIClientMeta{}
 	flags := apiClientMeta.FlagSet()
-	flags.Parse(os.Args)
+	flags.Parse(os.Args[1:])
 
 	err := postgresql.Run(apiClientMeta.GetTLSConfig())
 	if err != nil {