Merge pull request #103 from hookdeck/refactor-config

refactor: Config parsing & precedence

Author: leggetter

README.md

@@ -133,6 +133,29 @@ Inventory Service forwarding to /webhooks/shopify/inventory
 Orders Service forwarding to /webhooks/shopify/orders
 
 
+⣾ Getting ready...
+
+```
+
+#### Listen to multiple sources
+
+`source-alias` can be a comma-separated list of source names (for example, `stripe,shopify,twilio`) or `'*'` (with quotes) to listen to all sources.
+
+```sh-session
+$ hookdeck listen 3000 '*'
+
+👉  Inspect and replay events: https://dashboard.hookdeck.com/cli/events
+
+Sources
+🔌 stripe URL: https://events.hookdeck.com/e/src_DAjaFWyyZXsFdZrTOKpuHn01
+🔌 shopify URL: https://events.hookdeck.com/e/src_DAjaFWyyZXsFdZrTOKpuHn02
+🔌 twilio URL: https://events.hookdeck.com/e/src_DAjaFWyyZXsFdZrTOKpuHn03
+
+Connections
+stripe -> cli-stripe forwarding to /webhooks/stripe
+shopify -> cli-shopify forwarding to /webhooks/shopify
+twilio -> cli-twilio forwarding to /webhooks/twilio
+
 ⣾ Getting ready...
 
 ```

pkg/cmd/listen.go

@@ -38,7 +38,6 @@ func normalizeCliPathFlag(f *pflag.FlagSet, name string) pflag.NormalizedName {
 	switch name {
 	case "cli-path":
 		name = "path"
-		break
 	}
 	return pflag.NormalizedName(name)
 }

pkg/cmd/project_use.go

@@ -5,13 +5,13 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hookdeck/hookdeck-cli/pkg/hookdeck"
-	"github.com/hookdeck/hookdeck-cli/pkg/validators"
 	"github.com/hookdeck/hookdeck-cli/pkg/project"
+	"github.com/hookdeck/hookdeck-cli/pkg/validators"
 )
 
 type projectUseCmd struct {
-	cmd   *cobra.Command
-	local bool
+	cmd *cobra.Command
+	// local bool
 }
 
 func newProjectUseCmd() *projectUseCmd {
@@ -23,7 +23,10 @@ func newProjectUseCmd() *projectUseCmd {
 		Short: "Select your active project for future commands",
 		RunE:  lc.runProjectUseCmd,
 	}
-	lc.cmd.Flags().BoolVar(&lc.local, "local", false, "Pin active project to the current directory")
+
+	// With the change in config management (either local or global, not both), this flag is no longer needed
+	// TODO: consider remove / deprecate
+	// lc.cmd.Flags().BoolVar(&lc.local, "local", false, "Pin active project to the current directory")
 
 	return lc
 }
@@ -74,5 +77,5 @@ func (lc *projectUseCmd) runProjectUseCmd(cmd *cobra.Command, args []string) err
 		}
 	}
 
-	return Config.UseProject(lc.local, project.Id, project.Mode)
+	return Config.UseProject(project.Id, project.Mode)
 }

pkg/cmd/root.go

@@ -91,7 +91,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&Config.Profile.APIKey, "cli-key", "", "(deprecated) Your API key to use for the command")
 	rootCmd.PersistentFlags().StringVar(&Config.Profile.APIKey, "api-key", "", "Your API key to use for the command")
 	rootCmd.PersistentFlags().StringVar(&Config.Color, "color", "", "turn on/off color output (on, off, auto)")
-	rootCmd.PersistentFlags().StringVar(&Config.LocalConfigFile, "config", "", "config file (default is $HOME/.config/hookdeck/config.toml)")
+	rootCmd.PersistentFlags().StringVar(&Config.ConfigFileFlag, "config", "", "config file (default is $HOME/.config/hookdeck/config.toml)")
 	rootCmd.PersistentFlags().StringVar(&Config.DeviceName, "device-name", "", "device name")
 	rootCmd.PersistentFlags().StringVar(&Config.LogLevel, "log-level", "info", "log level (debug, info, warn, error)")
 	rootCmd.PersistentFlags().BoolVar(&Config.Insecure, "insecure", false, "Allow invalid TLS certificates")