fix: Collision with --global flags (#194)

Meroxa CLI used it before to specify the path of a configuration file, while connectors still use it the same as well.

cmd/meroxa/global/config.go

@@ -58,9 +58,9 @@ func getEnvVal(keys []string, defaultVal string) string {
 func readConfig() (*viper.Viper, error) {
 	cfg := viper.New()
 
-	if flagConfig != "" {
+	if flagCLIConfigFile != "" {
 		// Use config file from the flag.
-		cfg.SetConfigFile(flagConfig)
+		cfg.SetConfigFile(flagCLIConfigFile)
 	} else {
 		// Find home directory.
 		configDir, err := os.UserConfigDir()

cmd/meroxa/global/global.go

@@ -31,11 +31,11 @@ var (
 )
 
 var (
-	flagConfig  string
-	flagAPIURL  string
-	flagDebug   bool
-	flagTimeout time.Duration
-	flagJSON    bool
+	flagCLIConfigFile string
+	flagAPIURL        string
+	flagDebug         bool
+	flagTimeout       time.Duration
+	flagJSON          bool
 )
 
 func DeprecateV1Commands() bool {
@@ -44,14 +44,22 @@ func DeprecateV1Commands() bool {
 
 func RegisterGlobalFlags(cmd *cobra.Command) {
 	cmd.PersistentFlags().BoolVar(&flagJSON, "json", false, "output json")
-	cmd.PersistentFlags().StringVar(&flagConfig, "config", "", "config file")
+
+	// It stays around until we update our acceptance tests
+	cmd.PersistentFlags().StringVar(&flagCLIConfigFile, "config", "", "meroxa configuration file")
+
+	cmd.PersistentFlags().StringVar(&flagCLIConfigFile, "cli-config-file", "", "meroxa configuration file")
 	cmd.PersistentFlags().StringVar(&flagAPIURL, "api-url", "", "API url")
 	cmd.PersistentFlags().BoolVar(&flagDebug, "debug", false, "display any debugging information")
 	cmd.PersistentFlags().DurationVar(&flagTimeout, "timeout", time.Second*10, "set the duration of the client timeout in seconds (default 10s)") // nolint:gomnd,lll
 
 	if err := cmd.PersistentFlags().MarkHidden("api-url"); err != nil {
 		panic(fmt.Sprintf("could not mark flag as hidden: %v", err))
 	}
+
+	if err := cmd.PersistentFlags().MarkHidden("config"); err != nil {
+		panic(fmt.Sprintf("could not mark flag as hidden: %v", err))
+	}
 }
 
 func PersistentPreRunE(cmd *cobra.Command) error {

docs/cmd/md/meroxa.md

@@ -16,11 +16,11 @@ meroxa resources list --types
 ### Options
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-  -h, --help               help for meroxa
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+  -h, --help                     help for meroxa
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_api.md

@@ -23,10 +23,10 @@ meroxa api POST /v1/endpoints '{"protocol": "HTTP", "stream": "resource-2-499379
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_auth.md

@@ -11,10 +11,10 @@ Authentication commands for Meroxa
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_auth_login.md

@@ -15,10 +15,10 @@ meroxa auth login [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_auth_logout.md

@@ -15,10 +15,10 @@ meroxa auth logout [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_auth_whoami.md

@@ -22,10 +22,10 @@ meroxa whoami
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_billing.md

@@ -15,10 +15,10 @@ meroxa billing [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_completion.md

@@ -49,10 +49,10 @@ meroxa completion [bash|zsh|fish|powershell]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_config.md

@@ -15,10 +15,10 @@ meroxa config [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_config_describe.md

@@ -32,10 +32,10 @@ refresh_token: c337a0d...c0f928b
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_connect.md

@@ -35,10 +35,10 @@ meroxa connect --from RESOURCE-NAME --to RESOURCE-NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_connectors.md

@@ -11,10 +11,10 @@ Manage connectors on Meroxa
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_connectors_create.md

@@ -33,10 +33,10 @@ meroxa connectors create [NAME] --to pg2redshift --input orders --pipeline my-pi
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_connectors_describe.md

@@ -15,10 +15,10 @@ meroxa connectors describe [NAME] [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_connectors_list.md

@@ -17,10 +17,10 @@ meroxa connectors list [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_connectors_logs.md

@@ -15,10 +15,10 @@ meroxa connectors logs NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_connectors_remove.md

@@ -16,10 +16,10 @@ meroxa connectors remove NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_connectors_update.md

@@ -27,10 +27,10 @@ meroxa connector update connector-name --config '{"table.name.format":"public.co
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_endpoints.md

@@ -11,10 +11,10 @@ Manage endpoints on Meroxa
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_endpoints_create.md

@@ -27,10 +27,10 @@ meroxa endpoints create my-endpoint --protocol http --stream my-stream
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_endpoints_describe.md

@@ -15,10 +15,10 @@ meroxa endpoints describe [NAME] [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_endpoints_list.md

@@ -16,10 +16,10 @@ meroxa endpoints list [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO

docs/cmd/md/meroxa_endpoints_remove.md

@@ -16,10 +16,10 @@ meroxa endpoints remove NAME [flags]
 ### Options inherited from parent commands
 
 ```
-      --config string      config file
-      --debug              display any debugging information
-      --json               output json
-      --timeout duration   set the duration of the client timeout in seconds (default 10s) (default 10s)
+      --cli-config-file string   meroxa configuration file
+      --debug                    display any debugging information
+      --json                     output json
+      --timeout duration         set the duration of the client timeout in seconds (default 10s) (default 10s)
 ```
 
 ### SEE ALSO