diff --git a/cli/app/deploy.go b/cli/app/deploy.go index 7a17fb8b..e3e6e2c7 100644 --- a/cli/app/deploy.go +++ b/cli/app/deploy.go @@ -59,6 +59,11 @@ EXAMPLE: log.Fatal("cannot use and --chaos together") } + if specificVersion != "" { + log.Debugf("overriding env file version (%s) with %s", app.Recipe.Version, specificVersion) + app.Recipe.Version = specificVersion + } + if specificVersion == "" && app.Recipe.Version != "" { log.Debugf("retrieved %s as version from env file", app.Recipe.Version) specificVersion = app.Recipe.Version diff --git a/cli/app/rollback.go b/cli/app/rollback.go index 5e41f9c9..879af6a0 100644 --- a/cli/app/rollback.go +++ b/cli/app/rollback.go @@ -53,6 +53,12 @@ EXAMPLE: app := internal.ValidateApp(c) stackName := app.StackName() + specificVersion := c.Args().Get(1) + if specificVersion != "" { + log.Debugf("overriding env file version (%s) with %s", app.Recipe.Version, specificVersion) + app.Recipe.Version = specificVersion + } + if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil { log.Fatal(err) } @@ -88,8 +94,6 @@ EXAMPLE: warnMessages = append(warnMessages, fmt.Sprintf("failed to determine deployed version of %s", app.Name)) } - specificVersion := c.Args().Get(1) - if specificVersion != "" { parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version) if err != nil { diff --git a/cli/app/upgrade.go b/cli/app/upgrade.go index 2e4ff78f..5e36b584 100644 --- a/cli/app/upgrade.go +++ b/cli/app/upgrade.go @@ -53,6 +53,12 @@ EXAMPLE: app := internal.ValidateApp(c) stackName := app.StackName() + specificVersion := c.Args().Get(1) + if specificVersion != "" { + log.Debugf("overriding env file version (%s) with %s", app.Recipe.Version, specificVersion) + app.Recipe.Version = specificVersion + } + if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil { log.Fatal(err) } @@ -88,7 +94,6 @@ EXAMPLE: warnMessages = append(warnMessages, fmt.Sprintf("failed to determine deployed version of %s", app.Name)) } - specificVersion := c.Args().Get(1) if specificVersion != "" { parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version) if err != nil {