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 <ayushi.work007@gmail.com>
pull/32232/head
ayushi-work 4 months ago
parent 5b9cf6dedb
commit f979194ea7

@ -735,13 +735,13 @@ func determineReleaseSSApplyMethod(serverSideApply bool) release.ApplyMethod {
func getServerSideApplyValue(serverSideOption string, releaseApplyMethod string) (bool, error) { func getServerSideApplyValue(serverSideOption string, releaseApplyMethod string) (bool, error) {
switch serverSideOption { switch serverSideOption {
case "auto": case "auto":
return releaseApplyMethod == "ssa", nil return releaseApplyMethod == string(release.ApplyMethodServerSideApply), nil
case "false": case "false":
return false, nil return false, nil
case "true": case "true":
return true, nil return true, nil
default: 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)
} }
} }

@ -409,7 +409,7 @@ func TestGetServerSideApplyValue_WithUninstallScenarios(t *testing.T) {
name: "invalid option", name: "invalid option",
serverSideOption: "invalid", serverSideOption: "invalid",
expectError: true, 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) _, err := unAction.Run(rel.Name)
assert.Error(t, err) 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")
} }

@ -730,7 +730,7 @@ func TestGetServerSideApplyValue(t *testing.T) {
name: "action invalid option", name: "action invalid option",
actionServerSideOption: "invalid", actionServerSideOption: "invalid",
releaseApplyMethod: "ssa", 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)",
}, },
} }

Loading…
Cancel
Save