feat: Manage profiles & workspaces (#52)

* feat: Update CLI authentication to user scope

* feat: Manage workspace commands

* feat: Remove legacy profile

* feat: Manage keys in profile with the same schema as legacy profile

* fix: Change relevant team field in config when switching workspace

* feat: Manage profiles

* fix: Use new CLI auth for listen command

* fix: Logout cmd

* fix: Interactive login

* refactor: Error handling

* fix: Guest mode login

* refactor: Change local config file flag variable name

* fix: Change command descriptions

* chore: Remove commented code

* refactor: Change team and workspace nomenclature

* feat: Remove profile management commands

* feat: Remove team ID reference in workspace commands

* docs: Add workspace management command docs in README

Author: alexluong

README.md

@@ -219,6 +219,30 @@ Inventory Service forwarding to /webhooks/shopify/inventory
 
 ```
 
+### Manage active workspace
+
+If you are a part of many workspaces, you can switch between them using our workspace management commands.
+
+```sh-session
+$ hookdeck workspace list
+My Workspace (current)
+Another Workspace
+Yet Another One
+
+$ hookdeck workspace use
+Use the arrow keys to navigate: ↓ ↑ → ←
+? Select Workspace:
+    My Workspace
+    Another Workspace
+  ▸ Yet Another One
+
+Selecting workspace Yet Another One
+
+$ hookdeck whoami
+Using profile default
+Logged in as Me in workspace Yet Another One
+```
+
 ## Developing
 
 Build from source by running:

go.mod

@@ -22,6 +22,7 @@ require (
 )
 
 require (
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
 	github.com/creack/pty v1.1.9 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.9.0 // indirect
@@ -34,6 +35,7 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/magefile/mage v1.10.0 // indirect
 	github.com/magiconair/properties v1.8.3 // indirect
+	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect

go.sum

@@ -32,6 +32,10 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
 github.com/briandowns/spinner v1.11.1 h1:OixPqDEcX3juo5AjQZAnFPbeUA0jvkp2qzB5gOZJ/L0=
 github.com/briandowns/spinner v1.11.1/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -160,6 +164,8 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.3 h1:kJSsc6EXkBLgr3SphHk9w5mtjn0bjlR4JYEXKrJ45rQ=
 github.com/magiconair/properties v1.8.3/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
+github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -338,6 +344,7 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

pkg/cmd/root.go

@@ -89,13 +89,13 @@ func Execute() {
 func init() {
 	cobra.OnInitialize(Config.InitConfig)
 
+	rootCmd.PersistentFlags().StringVarP(&Config.Profile.Name, "profile", "p", "", fmt.Sprintf("profile name (default \"%s\")", hookdeck.DefaultProfileName))
 	rootCmd.PersistentFlags().StringVar(&Config.Profile.APIKey, "cli-key", "", "Your CLI key to use for the command")
 	rootCmd.PersistentFlags().StringVar(&Config.Color, "color", "", "turn on/off color output (on, off, auto)")
-	rootCmd.PersistentFlags().StringVar(&Config.ProfilesFile, "config", "", "config file (default is $HOME/.config/hookdeck/config.toml)")
-	rootCmd.PersistentFlags().StringVar(&Config.Profile.DeviceName, "device-name", "", "device name")
+	rootCmd.PersistentFlags().StringVar(&Config.LocalConfigFile, "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")
-	rootCmd.PersistentFlags().StringVarP(&Config.Profile.ProfileName, "project-name", "p", "", fmt.Sprintf("the project name to read from for config (default \"%s\")", hookdeck.DefaultProfileName))
 
 	// Hidden configuration flags, useful for dev/debugging
 	rootCmd.PersistentFlags().StringVar(&Config.APIBaseURL, "api-base", "", fmt.Sprintf("Sets the API base URL (default \"%s\")", hookdeck.DefaultAPIBaseURL))
@@ -111,4 +111,5 @@ func init() {
 	rootCmd.AddCommand(newListenCmd().cmd)
 	rootCmd.AddCommand(newCompletionCmd().cmd)
 	rootCmd.AddCommand(newWhoamiCmd().cmd)
+	rootCmd.AddCommand(newWorkspaceCmd().cmd)
 }

pkg/cmd/whoami.go

@@ -29,17 +29,15 @@ func newWhoamiCmd() *whoamiCmd {
 }
 
 func (lc *whoamiCmd) runWhoamiCmd(cmd *cobra.Command, args []string) error {
-	key, err := Config.Profile.GetAPIKey()
-	if err != nil {
-		return err
-	}
-	response, err := login.ValidateKey(Config.APIBaseURL, key)
+	color := ansi.Color(os.Stdout)
+
+	fmt.Printf( "Using profile %s\n", color.Bold(Config.Profile.Name))
+
+	response, err := login.ValidateKey(Config.APIBaseURL, Config.Profile.APIKey, Config.Profile.TeamID)
 	if err != nil {
 		return err
 	}
 
-	color := ansi.Color(os.Stdout)
-
 	fmt.Printf(
 		"Logged in as %s in workspace %s\n",
 		color.Bold(response.UserName),

pkg/cmd/workspace.go

@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/hookdeck/hookdeck-cli/pkg/validators"
+)
+
+type workspaceCmd struct {
+	cmd *cobra.Command
+}
+
+func newWorkspaceCmd() *workspaceCmd {
+	lc := &workspaceCmd{}
+
+	lc.cmd = &cobra.Command{
+		Use:   "workspace",
+		Args:  validators.NoArgs,
+		Short: "Manage your workspaces",
+	}
+
+	lc.cmd.AddCommand(newWorkspaceListCmd().cmd)
+	lc.cmd.AddCommand(newWorkspaceUseCmd().cmd)
+
+	return lc
+}

pkg/cmd/workspace_list.go

@@ -0,0 +1,50 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+
+	"github.com/hookdeck/hookdeck-cli/pkg/ansi"
+	"github.com/hookdeck/hookdeck-cli/pkg/validators"
+	"github.com/hookdeck/hookdeck-cli/pkg/workspace"
+)
+
+type workspaceListCmd struct {
+	cmd *cobra.Command
+}
+
+func newWorkspaceListCmd() *workspaceListCmd {
+	lc := &workspaceListCmd{}
+
+	lc.cmd = &cobra.Command{
+		Use:   "list",
+		Args:  validators.NoArgs,
+		Short: "List your workspaces",
+		RunE:  lc.runWorkspaceListCmd,
+	}
+
+	return lc
+}
+
+func (lc *workspaceListCmd) runWorkspaceListCmd(cmd *cobra.Command, args []string) error {	
+	// TODO: validate API key ??
+
+	workspaces, err := workspace.ListWorkspaces(&Config)
+	if err != nil {
+		return err
+	}
+
+	color := ansi.Color(os.Stdout)
+
+	for _, workspace := range workspaces {
+		if workspace.Id == Config.Profile.TeamID {
+			fmt.Printf("%s (current)\n", color.Green(workspace.Name))
+		} else {
+			fmt.Printf("%s\n", workspace.Name)
+		}
+	}
+
+	return nil
+}

pkg/cmd/workspace_use.go

@@ -0,0 +1,54 @@
+package cmd
+
+import (
+	"github.com/manifoldco/promptui"
+	"github.com/spf13/cobra"
+
+	"github.com/hookdeck/hookdeck-cli/pkg/validators"
+	"github.com/hookdeck/hookdeck-cli/pkg/workspace"
+)
+
+type workspaceUseCmd struct {
+	cmd *cobra.Command
+}
+
+func newWorkspaceUseCmd() *workspaceUseCmd {
+	lc := &workspaceUseCmd{}
+
+	lc.cmd = &cobra.Command{
+		Use:   "use",
+		Args:  validators.MaximumNArgs(1),
+		Short: "Select your active workspace for future commands",
+		RunE:  lc.runWorkspaceUseCmd,
+	}
+
+	return lc
+}
+
+// TODO: handle case where workspace name is not unique
+func (lc *workspaceUseCmd) runWorkspaceUseCmd(cmd *cobra.Command, args []string) error {	
+	workspaces, err := workspace.ListWorkspaces(&Config)
+	if err != nil {
+		return err
+	}
+
+	templates := &promptui.SelectTemplates{
+		Active:   "▸ {{ .Name | green }}",
+		Inactive: "  {{ .Name }}",
+		Selected: "Selecting workspace {{ .Name | green }}",
+	}
+
+	prompt := promptui.Select{
+		Label: "Select Workspace",
+		Items: workspaces,
+		Templates: templates,
+	}
+
+	i, _, err := prompt.Run()
+	if err != nil {
+		return err
+	}
+
+	workspace := workspaces[i]
+	return Config.UseWorkspace(workspace.Id, workspace.Mode)
+}