parent
09d85aed56
commit
389b56616f
|
@ -119,6 +119,19 @@ recipes.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(versions) == 0 {
|
||||||
|
logrus.Warn("no published versions in catalogue, trying local recipe repository")
|
||||||
|
recipeVersions, err := recipe.GetRecipeVersions(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
for _, recipeVersion := range recipeVersions {
|
||||||
|
for version := range recipeVersion {
|
||||||
|
versions = append(versions, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if len(versions) > 0 {
|
if len(versions) > 0 {
|
||||||
version = versions[len(versions)-1]
|
version = versions[len(versions)-1]
|
||||||
logrus.Debugf("choosing %s as version to deploy", version)
|
logrus.Debugf("choosing %s as version to deploy", version)
|
||||||
|
|
|
@ -22,7 +22,7 @@ var appRollbackCommand = cli.Command{
|
||||||
Name: "rollback",
|
Name: "rollback",
|
||||||
Aliases: []string{"rl"},
|
Aliases: []string{"rl"},
|
||||||
Usage: "Roll an app back to a previous version",
|
Usage: "Roll an app back to a previous version",
|
||||||
ArgsUsage: "<domain>",
|
ArgsUsage: "<domain> [<version>]",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
|
@ -106,17 +106,42 @@ recipes.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(versions) == 0 && !internal.Chaos {
|
if len(versions) == 0 {
|
||||||
logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Recipe)
|
logrus.Warn("no published versions in catalogue, trying local recipe repository")
|
||||||
|
recipeVersions, err := recipe.GetRecipeVersions(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
for _, recipeVersion := range recipeVersions {
|
||||||
|
for version := range recipeVersion {
|
||||||
|
versions = append(versions, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var availableDowngrades []string
|
var availableDowngrades []string
|
||||||
if deployedVersion == "unknown" {
|
if deployedVersion == "unknown" {
|
||||||
availableDowngrades = versions
|
availableDowngrades = versions
|
||||||
logrus.Warnf("failed to determine version of deployed %s", app.Name)
|
logrus.Warnf("failed to determine deployed version of %s", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if deployedVersion != "unknown" && !internal.Chaos {
|
specificVersion := c.Args().Get(1)
|
||||||
|
if specificVersion != "" {
|
||||||
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if parsedSpecificVersion.IsGreaterThan(parsedDeployedVersion) || parsedSpecificVersion.Equals(parsedDeployedVersion) {
|
||||||
|
logrus.Fatalf("%s is not a downgrade for %s?", deployedVersion, specificVersion)
|
||||||
|
}
|
||||||
|
availableDowngrades = append(availableDowngrades, specificVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
if deployedVersion != "unknown" && !internal.Chaos && specificVersion == "" {
|
||||||
for _, version := range versions {
|
for _, version := range versions {
|
||||||
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -126,12 +151,12 @@ recipes.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if parsedVersion != parsedDeployedVersion && parsedVersion.IsLessThan(parsedDeployedVersion) {
|
if parsedVersion.IsLessThan(parsedDeployedVersion) && !(parsedVersion.Equals(parsedDeployedVersion)) {
|
||||||
availableDowngrades = append(availableDowngrades, version)
|
availableDowngrades = append(availableDowngrades, version)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(availableDowngrades) == 0 {
|
if len(availableDowngrades) == 0 && !internal.Force {
|
||||||
logrus.Info("no available downgrades, you're on oldest ✌️")
|
logrus.Info("no available downgrades, you're on oldest ✌️")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -139,7 +164,7 @@ recipes.
|
||||||
|
|
||||||
var chosenDowngrade string
|
var chosenDowngrade string
|
||||||
if len(availableDowngrades) > 0 && !internal.Chaos {
|
if len(availableDowngrades) > 0 && !internal.Chaos {
|
||||||
if internal.Force || internal.NoInput {
|
if internal.Force || internal.NoInput || specificVersion != "" {
|
||||||
chosenDowngrade = availableDowngrades[len(availableDowngrades)-1]
|
chosenDowngrade = availableDowngrades[len(availableDowngrades)-1]
|
||||||
logrus.Debugf("choosing %s as version to downgrade to (--force/--no-input)", chosenDowngrade)
|
logrus.Debugf("choosing %s as version to downgrade to (--force/--no-input)", chosenDowngrade)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -22,7 +22,7 @@ var appUpgradeCommand = cli.Command{
|
||||||
Name: "upgrade",
|
Name: "upgrade",
|
||||||
Aliases: []string{"up"},
|
Aliases: []string{"up"},
|
||||||
Usage: "Upgrade an app",
|
Usage: "Upgrade an app",
|
||||||
ArgsUsage: "<domain>",
|
ArgsUsage: "<domain> [<version>]",
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
internal.DebugFlag,
|
internal.DebugFlag,
|
||||||
internal.NoInputFlag,
|
internal.NoInputFlag,
|
||||||
|
@ -107,17 +107,42 @@ recipes.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(versions) == 0 && !internal.Chaos {
|
if len(versions) == 0 {
|
||||||
logrus.Fatalf("no published releases for %s in the recipe catalogue?", app.Recipe)
|
logrus.Warn("no published versions in catalogue, trying local recipe repository")
|
||||||
|
recipeVersions, err := recipePkg.GetRecipeVersions(app.Recipe, internal.Offline)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
for _, recipeVersion := range recipeVersions {
|
||||||
|
for version := range recipeVersion {
|
||||||
|
versions = append(versions, version)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var availableUpgrades []string
|
var availableUpgrades []string
|
||||||
if deployedVersion == "unknown" {
|
if deployedVersion == "unknown" {
|
||||||
availableUpgrades = versions
|
availableUpgrades = versions
|
||||||
logrus.Warnf("failed to determine version of deployed %s", app.Name)
|
logrus.Warnf("failed to determine deployed version of %s", app.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
if deployedVersion != "unknown" && !internal.Chaos {
|
specificVersion := c.Args().Get(1)
|
||||||
|
if specificVersion != "" {
|
||||||
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if parsedSpecificVersion.IsLessThan(parsedDeployedVersion) || parsedSpecificVersion.Equals(parsedDeployedVersion) {
|
||||||
|
logrus.Fatalf("%s is not an upgrade for %s?", deployedVersion, specificVersion)
|
||||||
|
}
|
||||||
|
availableUpgrades = append(availableUpgrades, specificVersion)
|
||||||
|
}
|
||||||
|
|
||||||
|
if deployedVersion != "unknown" && !internal.Chaos && specificVersion == "" {
|
||||||
for _, version := range versions {
|
for _, version := range versions {
|
||||||
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
parsedDeployedVersion, err := tagcmp.Parse(deployedVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -127,7 +152,7 @@ recipes.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if parsedVersion.IsGreaterThan(parsedDeployedVersion) {
|
if parsedVersion.IsGreaterThan(parsedDeployedVersion) && !(parsedVersion.Equals(parsedDeployedVersion)) {
|
||||||
availableUpgrades = append(availableUpgrades, version)
|
availableUpgrades = append(availableUpgrades, version)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -140,7 +165,7 @@ recipes.
|
||||||
|
|
||||||
var chosenUpgrade string
|
var chosenUpgrade string
|
||||||
if len(availableUpgrades) > 0 && !internal.Chaos {
|
if len(availableUpgrades) > 0 && !internal.Chaos {
|
||||||
if internal.Force || internal.NoInput {
|
if internal.Force || internal.NoInput || specificVersion != "" {
|
||||||
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
||||||
logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
|
logrus.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue