From f979194ea7b6faa3b3ea38bdd00bd5f1dd8842a2 Mon Sep 17 00:00:00 2001 From: ayushi-work Date: Thu, 18 Jun 2026 00:40:59 +0530 Subject: [PATCH] fix: improve SSA option error message and use constant over magic string - Change error to "invalid server-side apply option" (was misleadingly referencing "release server-side apply method") - Use string(release.ApplyMethodServerSideApply) constant instead of "ssa" - Update test assertions to match new error format Signed-off-by: ayushi-work --- pkg/action/action.go | 4 ++-- pkg/action/uninstall_test.go | 4 ++-- pkg/action/upgrade_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/action/action.go b/pkg/action/action.go index bf036dc8f..505bde144 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -735,13 +735,13 @@ func determineReleaseSSApplyMethod(serverSideApply bool) release.ApplyMethod { func getServerSideApplyValue(serverSideOption string, releaseApplyMethod string) (bool, error) { switch serverSideOption { case "auto": - return releaseApplyMethod == "ssa", nil + return releaseApplyMethod == string(release.ApplyMethodServerSideApply), nil case "false": return false, nil case "true": return true, nil default: - return false, fmt.Errorf("invalid/unknown release server-side apply method: %s", serverSideOption) + return false, fmt.Errorf("invalid server-side apply option %q (must be one of: auto, true, false)", serverSideOption) } } diff --git a/pkg/action/uninstall_test.go b/pkg/action/uninstall_test.go index deb166317..26a8db508 100644 --- a/pkg/action/uninstall_test.go +++ b/pkg/action/uninstall_test.go @@ -409,7 +409,7 @@ func TestGetServerSideApplyValue_WithUninstallScenarios(t *testing.T) { name: "invalid option", serverSideOption: "invalid", expectError: true, - errorContains: "invalid/unknown release server-side apply method", + errorContains: "invalid server-side apply option", }, } @@ -459,5 +459,5 @@ func TestUninstall_ServerSideApply_InvalidOption_WithHooks(t *testing.T) { _, err := unAction.Run(rel.Name) assert.Error(t, err) - assert.Contains(t, err.Error(), "invalid/unknown release server-side apply method") + assert.Contains(t, err.Error(), "invalid server-side apply option") } diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go index 92f152c50..b62573395 100644 --- a/pkg/action/upgrade_test.go +++ b/pkg/action/upgrade_test.go @@ -730,7 +730,7 @@ func TestGetServerSideApplyValue(t *testing.T) { name: "action invalid option", actionServerSideOption: "invalid", releaseApplyMethod: "ssa", - expectedErrorMsg: "invalid/unknown release server-side apply method: invalid", + expectedErrorMsg: "invalid server-side apply option \"invalid\" (must be one of: auto, true, false)", }, }