From 18550387d52993ef752056055a1b574670c9e1a9 Mon Sep 17 00:00:00 2001 From: Taran Pelkey Date: Sun, 8 Oct 2023 15:13:18 -0400 Subject: [PATCH] fix: DeleteServiceAccount API behavior (#18163) --- cmd/admin-handlers-users.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/admin-handlers-users.go b/cmd/admin-handlers-users.go index ac06ce8a5..263538566 100644 --- a/cmd/admin-handlers-users.go +++ b/cmd/admin-handlers-users.go @@ -1147,7 +1147,11 @@ func (a adminAPIHandlers) DeleteServiceAccount(w http.ResponseWriter, r *http.Re // We do not care if service account is readable or not at this point, // since this is a delete call we shall allow it to be deleted if possible. - svcAccount, _, _ := globalIAMSys.GetServiceAccount(ctx, serviceAccount) + svcAccount, _, err := globalIAMSys.GetServiceAccount(ctx, serviceAccount) + if errors.Is(err, errNoSuchServiceAccount) { + writeErrorResponseJSON(ctx, w, errorCodes.ToAPIErr(ErrAdminServiceAccountNotFound), r.URL) + return + } adminPrivilege := globalIAMSys.IsAllowed(policy.Args{ AccountName: cred.AccessKey,