Return InvalidUpgradeError

Signed-off-by: Daniel Weiße <[email protected]>

cli/internal/helm/actionfactory.go

@@ -80,9 +80,10 @@ func (a actionFactory) appendNewAction(release Release, configTargetVersion semv
 	if errors.Is(err, errReleaseNotFound) {
 		// Don't install a new release if the user's config specifies a different version than the CLI offers.
 		if !force && isCLIVersionedRelease(release.ReleaseName) && cliSupportsConfigVersion {
-			return fmt.Errorf(
-				"unable to install release %s at %s: this CLI only supports microservice version %s for upgrading",
-				release.ReleaseName, configTargetVersion, newVersion,
+			return compatibility.NewInvalidUpgradeError(
+				currentVersion.String(),
+				configTargetVersion.String(),
+				fmt.Errorf("this CLI only supports installing microservice version %s", newVersion),
 			)
 		}
 
@@ -107,9 +108,10 @@ func (a actionFactory) appendNewAction(release Release, configTargetVersion semv
 			// Target version is newer than current version, so we should perform an upgrade.
 			// Now make sure the target version is equal to the the CLI version.
 			if cliSupportsConfigVersion {
-				return fmt.Errorf(
-					"unable to upgrade release %s to %s: this CLI only supports microservice version %s for upgrading",
-					release.ReleaseName, configTargetVersion, newVersion,
+				return compatibility.NewInvalidUpgradeError(
+					currentVersion.String(),
+					configTargetVersion.String(),
+					fmt.Errorf("this CLI only supports upgrading to microservice version %s", newVersion),
 				)
 			}
 		} else {

cli/internal/helm/actionfactory_test.go

@@ -178,10 +178,7 @@ func TestAppendNewAction(t *testing.T) {
 			},
 			configTargetVersion: semver.NewFromInt(1, 1, 0, ""),
 			wantErr:             true,
-			assertErr: func(assert *assert.Assertions, err error) {
-				var invalidUpgrade *compatibility.InvalidUpgradeError
-				assert.False(errors.As(err, &invalidUpgrade))
-			},
+			assertErr:           assertUpgradeErr,
 		},
 		"config version matches CLI version on upgrade": {
 			lister: stubLister{version: semver.NewFromInt(1, 0, 0, "")},
@@ -220,6 +217,7 @@ func TestAppendNewAction(t *testing.T) {
 			},
 			configTargetVersion: semver.NewFromInt(1, 0, 0, ""),
 			wantErr:             true,
+			assertErr:           assertUpgradeErr,
 		},
 		"config - CLI version mismatch for new releases can be forced through": {
 			lister: stubLister{err: errReleaseNotFound},