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

app ls --status shows more detailles about the deployment state #280

Merged
moritz merged 8 commits from detailed_app_list into main 2023-03-07 12:32:19 +00:00
Conversation 1 Commits 8 Files Changed 5 +13 -12
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5428ebf43b - Show all commits

4
cli/app/rollback.go
View File

@ -183,7 +183,7 @@ recipes.
config.ExposeAllEnv(stackName, compose, app.Env) config.ExposeAllEnv(stackName, compose, app.Env)
config.SetRecipeLabel(compose, stackName, app.Recipe) config.SetRecipeLabel(compose, stackName, app.Recipe)
config.SetChaosLabel(compose, stackName, internal.Chaos) config.SetChaosLabel(compose, stackName, internal.Chaos)
config.SetChaosVersionLabel(compose, app.StackName(), chosenDowngrade) config.SetChaosVersionLabel(compose, stackName, chosenDowngrade)
moritz marked this conversation as resolved Outdated
decentral1se commented 2023-03-05 10:23:07 +00:00
Outdated
Review
Copy Link

app.StackName() -> stackName

`app.StackName()` -> `stackName`
config.SetUpdateLabel(compose, stackName, app.Env) config.SetUpdateLabel(compose, stackName, app.Env)
if !internal.Force { if !internal.Force {
@ -192,7 +192,7 @@ recipes.
} }
} }
if err := stack.RunDeploy(cl, deployOpts, compose, app.StackName(), internal.DontWaitConverge); err != nil { if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }

4
cli/app/upgrade.go
View File

@ -194,14 +194,14 @@ recipes.
config.ExposeAllEnv(stackName, compose, app.Env) config.ExposeAllEnv(stackName, compose, app.Env)
config.SetRecipeLabel(compose, stackName, app.Recipe) config.SetRecipeLabel(compose, stackName, app.Recipe)
config.SetChaosLabel(compose, stackName, internal.Chaos) config.SetChaosLabel(compose, stackName, internal.Chaos)
config.SetChaosVersionLabel(compose, app.StackName(), chosenUpgrade) config.SetChaosVersionLabel(compose, stackName, chosenUpgrade)
moritz marked this conversation as resolved Outdated
decentral1se commented 2023-03-05 10:23:23 +00:00
Outdated
Review
Copy Link

app.StackName() -> stackName

`app.StackName()` -> `stackName`
config.SetUpdateLabel(compose, stackName, app.Env) config.SetUpdateLabel(compose, stackName, app.Env)
if err := internal.NewVersionOverview(app, deployedVersion, chosenUpgrade, releaseNotes); err != nil { if err := internal.NewVersionOverview(app, deployedVersion, chosenUpgrade, releaseNotes); err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
if err := stack.RunDeploy(cl, deployOpts, compose, app.StackName(), internal.DontWaitConverge); err != nil { if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }

17
cli/internal/deploy.go
View File

@ -25,6 +25,7 @@ import (
// DeployAction is the main command-line action for this package // DeployAction is the main command-line action for this package
func DeployAction(c *cli.Context) error { func DeployAction(c *cli.Context) error {
app := ValidateApp(c) app := ValidateApp(c)
stackName := app.StackName()
conf := runtime.New() conf := runtime.New()
cl, err := client.New(app.Server) cl, err := client.New(app.Server)
@ -47,9 +48,9 @@ func DeployAction(c *cli.Context) error {
logrus.Fatal(err) logrus.Fatal(err)
} }
logrus.Debugf("checking whether %s is already deployed", app.StackName()) logrus.Debugf("checking whether %s is already deployed", stackName)
isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, app.StackName()) isDeployed, deployedVersion, err := stack.IsDeployed(context.Background(), cl, stackName)
if err != nil { if err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
@ -128,7 +129,7 @@ func DeployAction(c *cli.Context) error {
} }
deployOpts := stack.Deploy{ deployOpts := stack.Deploy{
Composefiles: composeFiles, Composefiles: composeFiles,
Namespace: app.StackName(), Namespace: stackName,
Prune: false, Prune: false,
ResolveImage: stack.ResolveImageAlways, ResolveImage: stack.ResolveImageAlways,
} }
@ -136,11 +137,11 @@ func DeployAction(c *cli.Context) error {
if err != nil { if err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
config.ExposeAllEnv(app.StackName(), compose, app.Env) config.ExposeAllEnv(stackName, compose, app.Env)
config.SetRecipeLabel(compose, app.StackName(), app.Recipe) config.SetRecipeLabel(compose, stackName, app.Recipe)
config.SetChaosLabel(compose, app.StackName(), Chaos) config.SetChaosLabel(compose, stackName, Chaos)
moritz marked this conversation as resolved Outdated
decentral1se commented 2023-03-05 10:23:55 +00:00
Outdated
Review
Copy Link

Oops, can we make all the app.StackName() calls one stackName too? To avoid computing this several times...

Oops, can we make all the `app.StackName()` calls one `stackName` too? To avoid computing this several times...
config.SetChaosVersionLabel(compose, app.StackName(), version) config.SetChaosVersionLabel(compose, stackName, version)
config.SetUpdateLabel(compose, app.StackName(), app.Env) config.SetUpdateLabel(compose, stackName, app.Env)
if err := DeployOverview(app, version, "continue with deployment?"); err != nil { if err := DeployOverview(app, version, "continue with deployment?"); err != nil {
logrus.Fatal(err) logrus.Fatal(err)