toolshed/abra
toolshed/abra
4
2
Fork 18
Code Issues 29 Pull Requests 3 Packages Releases 40 Activity

Post-deploy abra.sh hooks #292

Merged
moritz merged 5 commits from post_deploy_cmds into main 2023-04-14 14:12:33 +00:00
Conversation 2 Commits 5 Files Changed 6 +9 -5
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0845fcf78c - Show all commits

4
cli/app/upgrade.go
View File

@ -207,9 +207,9 @@ recipes.
postDeployCmds, ok := app.Env["POST_UPGRADE_CMDS"] postDeployCmds, ok := app.Env["POST_UPGRADE_CMDS"]
if ok && !internal.DontWaitConverge { if ok && !internal.DontWaitConverge {
logrus.Debugf("Run the following post-deploy commands: %s", postDeployCmds) logrus.Debugf("run the following post-deploy commands: %s", postDeployCmds)
moritz marked this conversation as resolved
decentral1se commented 2023-04-14 11:33:17 +00:00
Review
Copy Link

nitpick: Run -> run since the rest of the codebase uses lowercase

nitpick: `Run` -> `run` since the rest of the codebase uses lowercase
if err := internal.PostCmds(cl, app, postDeployCmds); err != nil { if err := internal.PostCmds(cl, app, postDeployCmds); err != nil {
logrus.Fatal(err) logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)
moritz marked this conversation as resolved
decentral1se commented 2023-04-14 11:32:53 +00:00
Review
Copy Link

logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)?

`logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)`?
} }
} }

1
cli/internal/command.go
View File

@ -20,6 +20,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
// RunCmdRemote executes an abra.sh command in the target service
moritz marked this conversation as resolved
decentral1se commented 2023-04-14 11:33:31 +00:00
Review
Copy Link

Missing docstring?

Missing docstring?
func RunCmdRemote(cl *dockerClient.Client, app config.App, abraSh, serviceName, cmdName, cmdArgs string) error { func RunCmdRemote(cl *dockerClient.Client, app config.App, abraSh, serviceName, cmdName, cmdArgs string) error {
filters := filters.NewArgs() filters := filters.NewArgs()
moritz marked this conversation as resolved
decentral1se commented 2023-04-14 11:34:59 +00:00
Review
Copy Link

I'd recommend using the app.Filters if possible due to the often bizarre handling of filters in the Docker API. You'd pass exactMatch = true which I think is more readable for our future selves.

I'd recommend using the `app.Filters` if possible due to the often bizarre handling of filters in the Docker API. You'd pass `exactMatch = true` which I think is more readable for our future selves.
moritz commented 2023-04-14 12:26:58 +00:00
Review
Copy Link

I just moved this function from cli/app/cmd.go without touching it.
I think app.Filters doesn't make sense here, because it filters for all services and in this case only a filter for serviceName is required.

I just moved this function from `cli/app/cmd.go` without touching it. I think `app.Filters` doesn't make sense here, because it filters for all services and in this case only a filter for `serviceName` is required.
👍 1
filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName)) filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))

9
cli/internal/deploy.go
View File

@ -167,15 +167,18 @@ func DeployAction(c *cli.Context) error {
postDeployCmds, ok := app.Env["POST_DEPLOY_CMDS"] postDeployCmds, ok := app.Env["POST_DEPLOY_CMDS"]
if ok && !DontWaitConverge { if ok && !DontWaitConverge {
logrus.Debugf("Run the following post-deploy commands: %s", postDeployCmds) logrus.Debugf("run the following post-deploy commands: %s", postDeployCmds)
moritz marked this conversation as resolved
decentral1se commented 2023-04-14 11:35:59 +00:00
Review
Copy Link

nitpick: Run -> run since the rest of the codebase uses lowercase

nitpick: Run -> run since the rest of the codebase uses lowercase
if err := PostCmds(cl, app, postDeployCmds); err != nil { if err := PostCmds(cl, app, postDeployCmds); err != nil {
logrus.Fatal(err) logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)
moritz marked this conversation as resolved
decentral1se commented 2023-04-14 11:36:25 +00:00
Review
Copy Link

logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)?

logrus.Fatalf("attempting to run post deploy commands, saw: %s", err)?
} }
} }
return nil return nil
} }
// PostCmds parses a string of commands and executes them inside of the respective services
moritz marked this conversation as resolved
decentral1se commented 2023-04-14 11:36:36 +00:00
Review
Copy Link

Missing doc string?

Missing doc string?
// the commands string must have the following format:
// "<service> <command> <arguments>|<service> <command> <arguments>|... "
func PostCmds(cl *dockerClient.Client, app config.App, commands string) error { func PostCmds(cl *dockerClient.Client, app config.App, commands string) error {
abraSh := path.Join(config.RECIPES_DIR, app.Recipe, "abra.sh") abraSh := path.Join(config.RECIPES_DIR, app.Recipe, "abra.sh")
if _, err := os.Stat(abraSh); err != nil { if _, err := os.Stat(abraSh); err != nil {
@ -196,7 +199,7 @@ func PostCmds(cl *dockerClient.Client, app config.App, commands string) error {
if len(commandParts) > 2 { if len(commandParts) > 2 {
moritz marked this conversation as resolved
decentral1se commented 2023-04-14 11:37:26 +00:00
Review
Copy Link

nitpick: Running -> running since the rest of the codebase uses lowercase

nitpick: Running -> running since the rest of the codebase uses lowercase
parsedCmdArgs = fmt.Sprintf("%s ", strings.Join(commandParts[2:], " ")) parsedCmdArgs = fmt.Sprintf("%s ", strings.Join(commandParts[2:], " "))
} }
logrus.Infof("Running post-command '%s %s' in container %s", cmdName, parsedCmdArgs, targetServiceName) logrus.Infof("running post-command '%s %s' in container %s", cmdName, parsedCmdArgs, targetServiceName)
if err := EnsureCommand(abraSh, app.Recipe, cmdName); err != nil { if err := EnsureCommand(abraSh, app.Recipe, cmdName); err != nil {
return err return err