Apply suggestions from code review

Co-authored-by: Anoop C S <[email protected]>

Author: thotz

rgw/admin/account.go

@@ -25,6 +25,7 @@ type Account struct {
 }
 
 // CreateAccount will create a new RGW account
+// https://docs.ceph.com/en/latest/radosgw/adminops/#create-account
 func (api *API) CreateAccount(ctx context.Context, account Account) (Account, error) {
 
 	body, err := api.call(ctx, http.MethodPost, "/account", valueToURLParams(account, []string{"id", "name", "email", "tenant", "max-users", "max-roles", "max-groups", "max-access-keys", "max-buckets"}))
@@ -42,6 +43,7 @@ func (api *API) CreateAccount(ctx context.Context, account Account) (Account, er
 }
 
 // GetAccount will return the RGW account details
+// https://docs.ceph.com/en/latest/radosgw/adminops/#get-account-info
 func (api *API) GetAccount(ctx context.Context, accountID string) (Account, error) {
 	if accountID == "" {
 		return Account{}, ErrInvalidArgument
@@ -62,6 +64,7 @@ func (api *API) GetAccount(ctx context.Context, accountID string) (Account, erro
 }
 
 // DeleteAccount will delete the RGW account
+// https://docs.ceph.com/en/latest/radosgw/adminops/#remove-account
 func (api *API) DeleteAccount(ctx context.Context, accountID string) error {
 	if accountID == "" {
 		return ErrInvalidArgument
@@ -76,6 +79,7 @@ func (api *API) DeleteAccount(ctx context.Context, accountID string) error {
 }
 
 // ModifyAccount will modify the RGW account
+// https://docs.ceph.com/en/latest/radosgw/adminops/#modify-account
 func (api *API) ModifyAccount(ctx context.Context, account Account) (Account, error) {
 	if account.ID == "" {
 		return Account{}, ErrInvalidArgument

rgw/admin/account_test.go

@@ -28,14 +28,15 @@ func (suite *RadosGWTestSuite) TestAccount() {
 		assert.ErrorIs(suite.T(), err, ErrInvalidArgument)
 	})
 
-	if util.CurrentCephVersion() > util.CephTentacle {
-		suite.T().Run("successfully get account", func(_ *testing.T) {
-			account, err := co.GetAccount(context.Background(), "RGW12345678901234567")
-			assert.NoError(suite.T(), err)
-			assert.Equal(suite.T(), "RGW12345678901234567", account.ID)
-			assert.Equal(suite.T(), "test-account", account.Name)
-		})
-	}
+	suite.T().Run("successfully get account", func(t *testing.T) {
+		if util.CurrentCephVersion() <= util.CephTentacle {
+			t.Skipf("GetAccount is not yet supported on %s", util.CurrentCephVersionString())
+		}
+		account, err := co.GetAccount(context.Background(), "RGW12345678901234567")
+		assert.NoError(t, err)
+		assert.Equal(t, "RGW12345678901234567", account.ID)
+		assert.Equal(t, "test-account", account.Name)
+	})
 
 	suite.T().Run("fail to modify account since no ID provided", func(_ *testing.T) {
 		_, err := co.ModifyAccount(context.Background(), Account{Name: "modified-account"})
@@ -54,10 +55,11 @@ func (suite *RadosGWTestSuite) TestAccount() {
 		assert.ErrorIs(suite.T(), err, ErrInvalidArgument)
 	})
 
-	if util.CurrentCephVersion() > util.CephTentacle {
-		suite.T().Run("successfully delete account", func(_ *testing.T) {
-			err := co.DeleteAccount(context.Background(), "RGW12345678901234567")
-			assert.NoError(suite.T(), err)
-		})
-	}
+	suite.T().Run("successfully delete account", func(t *testing.T) {
+		if util.CurrentCephVersion() <= util.CephTentacle {
+			t.Skipf("DeleteAccount is not yet supported on %s", util.CurrentCephVersionString())
+		}
+		err := co.DeleteAccount(context.Background(), "RGW12345678901234567")
+		assert.NoError(t, err)
+	})
 }