From 9604e19a0e8da73d70cda7917467a98ec0f6a938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20J=C3=BCrgensmeyer?= Date: Thu, 13 Jun 2024 11:41:08 +0200 Subject: [PATCH] rgw/admin: add ErrNoSuchSubUser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Simon Jürgensmeyer --- rgw/admin/errors.go | 5 ++++- rgw/admin/errors_test.go | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rgw/admin/errors.go b/rgw/admin/errors.go index 332d779..6f63e2c 100644 --- a/rgw/admin/errors.go +++ b/rgw/admin/errors.go @@ -10,7 +10,7 @@ const ( // ErrUserExists - Attempt to create existing user ErrUserExists errorReason = "UserAlreadyExists" - // ErrNoSuchUser - Attempt to create existing user + // ErrNoSuchUser - User does not exist ErrNoSuchUser errorReason = "NoSuchUser" // ErrInvalidAccessKey - Invalid access key specified @@ -34,6 +34,9 @@ const ( // ErrSubuserExists - Specified subuser exists ErrSubuserExists errorReason = "SubuserExists" + // ErrNoSuchSubUser - SubUser does not exist + ErrNoSuchSubUser errorReason = "NoSuchSubUser" + // ErrInvalidAccess - Invalid subuser access specified ErrInvalidAccess errorReason = "InvalidAccess" diff --git a/rgw/admin/errors_test.go b/rgw/admin/errors_test.go index 8dabe0e..c3a1bf9 100644 --- a/rgw/admin/errors_test.go +++ b/rgw/admin/errors_test.go @@ -8,11 +8,16 @@ import ( ) var ( - fakeGetUserError = []byte(`{"Code":"NoSuchUser","RequestId":"tx0000000000000000005a9-00608957a2-10496-my-store","HostId":"10496-my-store-my-store"}`) + fakeGetUserError = []byte(`{"Code":"NoSuchUser","RequestId":"tx0000000000000000005a9-00608957a2-10496-my-store","HostId":"10496-my-store-my-store"}`) + fakeGetSubUserError = []byte(`{"Code":"NoSuchSubUser","RequestId":"tx0000000000000000005a9-00608957a2-10496-my-store","HostId":"10496-my-store-my-store"}`) ) func TestHandleStatusError(t *testing.T) { err := handleStatusError(fakeGetUserError) assert.Error(t, err) assert.True(t, errors.Is(err, ErrNoSuchUser), err) + + err = handleStatusError(fakeGetSubUserError) + assert.Error(t, err) + assert.True(t, errors.Is(err, ErrNoSuchSubUser), err) }