Add hooks for some Platform.sh commands (#75)

fabpot · web-flow · commit e72b102d0841 · 2022-01-31T11:59:34.000+01:00
diff --git a/commands/local_var_expose.go b/commands/local_var_expose.go
@@ -53,7 +53,7 @@ var localVariableExposeFromTunnelCmd = &console.Command{
 		tunnel := envs.Tunnel{Project: project}
 
 		if c.Bool("off") {
-			terminal.Eprintln("Stop exposing tunnel service environment variables ")
+			terminal.Eprintln("Stop exposing tunnel service environment variables")
 			return tunnel.Expose(false)
 		}
 
diff --git a/commands/platformsh.go b/commands/platformsh.go
@@ -58,6 +58,10 @@ func NewPlatformShCLI() (*platformshCLI, error) {
 			&console.BoolFlag{Name: "no", Aliases: []string{"n"}},
 			&console.BoolFlag{Name: "yes", Aliases: []string{"y"}},
 		)
+		if _, ok := platformshBeforeHooks[command.FullName()]; !ok {
+			// do not parse flags if we don't have hooks
+			command.FlagParsing = console.FlagParsingSkipped
+		}
 		p.Commands = append(p.Commands, command)
 	}
 	return p, nil
@@ -98,6 +102,12 @@ func (p *platformshCLI) proxyPSHCmd(commandName string) console.ActionFunc {
 				}
 			}
 
+			if hook, ok := platformshBeforeHooks[commandName]; ok {
+				if err := hook(c); err != nil {
+					return err
+				}
+			}
+
 			args := os.Args[1:]
 			for i := range args {
 				if args[i] == c.Command.UserName {
diff --git a/commands/platformsh_hooks.go b/commands/platformsh_hooks.go
@@ -0,0 +1,44 @@
+package commands
+
+import (
+	"github.com/symfony-cli/console"
+	"github.com/symfony-cli/symfony-cli/envs"
+	"github.com/symfony-cli/symfony-cli/local/platformsh"
+	"github.com/symfony-cli/terminal"
+)
+
+var platformshBeforeHooks = map[string]console.BeforeFunc{
+	"tunnel:close": func(c *console.Context) error {
+		terminal.Eprintln("Stop exposing tunnel service environment variables")
+
+		app := c.String("app")
+		env := c.String("environment")
+		var project *platformsh.Project
+		projectID := c.String("project")
+		if projectID == "" {
+			projectDir, err := getProjectDir(c.String("dir"))
+			if err != nil {
+				return err
+			}
+			project, err = platformsh.ProjectFromDir(projectDir, false)
+			if err != nil {
+				return err
+			}
+			if app != "" {
+				project.App = app
+			}
+			if env != "" {
+				project.Env = env
+			}
+		} else {
+			project = &platformsh.Project{
+				ID:  projectID,
+				App: app,
+				Env: env,
+			}
+		}
+
+		tunnel := envs.Tunnel{Project: project}
+		return tunnel.Expose(false)
+	},
+}

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ var localVariableExposeFromTunnelCmd = &console.Command{`
`53`	`53`	`tunnel := envs.Tunnel{Project: project}`
`54`	`54`
`55`	`55`	`if c.Bool("off") {`
`56`		`- terminal.Eprintln("Stop exposing tunnel service environment variables ")`
	`56`	`+ terminal.Eprintln("Stop exposing tunnel service environment variables")`
`57`	`57`	`return tunnel.Expose(false)`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ func NewPlatformShCLI() (*platformshCLI, error) {`
`58`	`58`	`&console.BoolFlag{Name: "no", Aliases: []string{"n"}},`
`59`	`59`	`&console.BoolFlag{Name: "yes", Aliases: []string{"y"}},`
`60`	`60`	`)`
	`61`	`+ if _, ok := platformshBeforeHooks[command.FullName()]; !ok {`
	`62`	`+ // do not parse flags if we don't have hooks`
	`63`	`+ command.FlagParsing = console.FlagParsingSkipped`
	`64`	`+ }`
`61`	`65`	`p.Commands = append(p.Commands, command)`
`62`	`66`	`}`
`63`	`67`	`return p, nil`
`@@ -98,6 +102,12 @@ func (p *platformshCLI) proxyPSHCmd(commandName string) console.ActionFunc {`
`98`	`102`	`}`
`99`	`103`	`}`
`100`	`104`
	`105`	`+ if hook, ok := platformshBeforeHooks[commandName]; ok {`
	`106`	`+ if err := hook(c); err != nil {`
	`107`	`+ return err`
	`108`	`+ }`
	`109`	`+ }`
	`110`	`+`
`101`	`111`	`args := os.Args[1:]`
`102`	`112`	`for i := range args {`
`103`	`113`	`if args[i] == c.Command.UserName {`