enhancement(4811): updated the errors returned from check upgrade and… (#7453) (#8563)

* enhancement(4811): updated the errors returned from check upgrade and updated the test function name

* enhancement(4811): added changelog

* remove issue reference

---------


(cherry picked from commit 0a63787)

Co-authored-by: Kaan Yalti <[email protected]>
Co-authored-by: Eric Beahan <[email protected]>

Author: 3 people

changelog/fragments/1742318642-fips-to-fips-upgrade-error-reword.yaml

@@ -0,0 +1,29 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: enhancement
+
+# Change summary; a 80ish characters long description of the change.
+summary: Updated the error messages returned for fips upgrades
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: "elastic-agent"
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+pr: https://github.com/elastic/elastic-agent/pull/7453
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.

internal/pkg/agent/application/upgrade/upgrade.go

@@ -55,9 +55,10 @@ var agentArtifact = artifact.Artifact{
 }
 
 var (
-	ErrWatcherNotStarted     = errors.New("watcher did not start in time")
-	ErrUpgradeSameVersion    = errors.New("upgrade did not occur because it is the same version")
-	ErrFipsNotUpgradedToFips = errors.New("cannot upgrade from a fips compliant agent to a non-compliant one")
+	ErrWatcherNotStarted  = errors.New("watcher did not start in time")
+	ErrUpgradeSameVersion = errors.New("upgrade did not occur because it is the same version")
+	ErrNonFipsToFips      = errors.New("cannot switch to fips mode when upgrading")
+	ErrFipsToNonFips      = errors.New("cannot switch to non-fips mode when upgrading")
 )
 
 // Upgrader performs an upgrade
@@ -172,15 +173,15 @@ func checkUpgrade(log *logger.Logger, currentVersion, newVersion agentVersion, m
 		return ErrUpgradeSameVersion
 	}
 
-	if currentVersion.fips && metadata.manifest.Package.Fips {
-		return nil
+	if currentVersion.fips && !metadata.manifest.Package.Fips {
+		return ErrFipsToNonFips
 	}
 
-	if !currentVersion.fips && !metadata.manifest.Package.Fips {
-		return nil
+	if !currentVersion.fips && metadata.manifest.Package.Fips {
+		return ErrNonFipsToFips
 	}
 
-	return ErrFipsNotUpgradedToFips
+	return nil
 }
 
 // Upgrade upgrades running agent, function returns shutdown callback that must be called by reexec.

internal/pkg/agent/application/upgrade/upgrade_test.go

@@ -804,7 +804,7 @@ func TestExtractVersion(t *testing.T) {
 	}
 }
 
-func TestIsSameVersion(t *testing.T) {
+func TestCheckUpgrade(t *testing.T) {
 	type args struct {
 		current    agentVersion
 		newVersion agentVersion
@@ -850,7 +850,7 @@ func TestIsSameVersion(t *testing.T) {
 				},
 			},
 			want: want{
-				err: ErrFipsNotUpgradedToFips,
+				err: ErrFipsToNonFips,
 			},
 		},
 		{
@@ -867,7 +867,7 @@ func TestIsSameVersion(t *testing.T) {
 				},
 			},
 			want: want{
-				err: ErrFipsNotUpgradedToFips,
+				err: ErrNonFipsToFips,
 			},
 		},
 		{