Minor refactor, using restclient.BaseClient instead of

our own silly wrappers around get / post / put / delete.

Author: nathanejohnson

adminapi.go

@@ -1,7 +1,6 @@
 package radosgwadmin
 
 import (
-	"context"
 	"net/http"
 	"net/url"
 	"strings"
@@ -35,8 +34,7 @@ var FalseRef = &falsch
 
 // AdminAPI - admin api struct
 type AdminAPI struct {
-	*restclient.Client
-	u     *url.URL
+	*restclient.BaseClient
 	creds *awsauth.Credentials
 }
 
@@ -46,15 +44,16 @@ func NewAdminAPI(cfg *Config) (*AdminAPI, error) {
 	adminPath := strings.Trim(cfg.AdminPath, "/")
 	aa := &AdminAPI{}
 	var err error
-	aa.u, err = url.Parse(baseURL + "/" + adminPath)
+	u, err := url.Parse(baseURL + "/" + adminPath)
 	if err != nil {
 		return nil, err
 	}
 
-	aa.Client, err = restclient.NewClient(&(cfg.ClientConfig), nil)
+	c, err := restclient.NewClient(&(cfg.ClientConfig), nil)
 	if err != nil {
 		return nil, err
 	}
+	aa.BaseClient = &restclient.BaseClient{Client: c, BaseURL: u}
 	aa.Client.FixupCallback = aa.fixupCallback
 
 	aa.creds = &awsauth.Credentials{
@@ -75,23 +74,6 @@ func NewAdminAPI(cfg *Config) (*AdminAPI, error) {
 	return aa, nil
 }
 
-func (aa *AdminAPI) get(ctx context.Context, path string, queryStruct interface{}, responseBody interface{}) error {
-	return aa.Client.Get(ctx, aa.u, path, queryStruct, responseBody)
-}
-
-func (aa *AdminAPI) delete(ctx context.Context, path string, queryStruct interface{}, responseBody interface{}) error {
-	return aa.Client.Delete(ctx, aa.u, path, queryStruct, responseBody)
-}
-
-func (aa *AdminAPI) post(ctx context.Context, path string, queryStruct, requestBody interface{}, responseBody interface{}) error {
-
-	return aa.Client.Post(ctx, aa.u, path, queryStruct, requestBody, responseBody)
-}
-
-func (aa *AdminAPI) put(ctx context.Context, path string, queryStruct, requestBody interface{}, responseBody interface{}) error {
-	return aa.Put(ctx, aa.u, path, queryStruct, requestBody, responseBody)
-}
-
 // Config - this configures an AdminAPI.
 //
 // Specify CACertBundlePath to load a bundle from disk to override the default.

bucket.go

@@ -164,7 +164,7 @@ func (aa *AdminAPI) BucketList(ctx context.Context, uid string) ([]string, error
 		Stats:  false,
 	}
 	resp := []string{}
-	err := aa.get(ctx, "/bucket", breq, &resp)
+	err := aa.Get(ctx, "/bucket", breq, &resp)
 	return resp, err
 }
 
@@ -180,51 +180,51 @@ func (aa *AdminAPI) BucketStats(ctx context.Context, uid string, bucket string)
 	if bucket != "" {
 		breq.Bucket = bucket
 		respB := BucketStatsResponse{}
-		err := aa.get(ctx, "/bucket", breq, &respB)
+		err := aa.Get(ctx, "/bucket", breq, &respB)
 		return append(resp, respB), err
 	}
 
 	breq.UID = uid
-	err := aa.get(ctx, "/bucket", breq, &resp)
+	err := aa.Get(ctx, "/bucket", breq, &resp)
 	return resp, err
 }
 
 // BucketIndex - Bucket index operations.  Bucket name required.
 func (aa *AdminAPI) BucketIndex(ctx context.Context, bireq *BucketIndexRequest) (*BucketIndexResponse, error) {
 	resp := &BucketIndexResponse{}
-	err := aa.get(ctx, "/bucket?index", bireq, resp)
+	err := aa.Get(ctx, "/bucket?index", bireq, resp)
 	return resp, err
 }
 
 // BucketRm - remove a bucket.  bucket must be non-empty string.
 func (aa *AdminAPI) BucketRm(ctx context.Context, bucket string, purge bool) error {
 	req := &bucketRmRequest{Bucket: bucket, PurgeObjects: purge}
-	return aa.delete(ctx, "/bucket", req, nil)
+	return aa.Delete(ctx, "/bucket", req, nil)
 }
 
 // BucketUnlink - unlink a bucket from a user.  All parameters required.
 func (aa *AdminAPI) BucketUnlink(ctx context.Context, bucket string, uid string) error {
 	req := &bucketUnlinkRequest{Bucket: bucket, UID: uid}
-	return aa.post(ctx, "/bucket", req, nil, nil)
+	return aa.Post(ctx, "/bucket", req, nil, nil)
 }
 
 // BucketLink - link a bucket to a user, removing any previous links.  All
 // parameters required.
 func (aa *AdminAPI) BucketLink(ctx context.Context, bucket, bucketID, uid string) error {
 	req := &bucketLinkRequest{Bucket: bucket, BucketID: bucketID, UID: uid}
-	return aa.put(ctx, "/bucket", req, nil, nil)
+	return aa.Put(ctx, "/bucket", req, nil, nil)
 }
 
 // BucketObjectRm - remove a bucket.  bucket must be non-empty string.
 func (aa *AdminAPI) BucketObjectRm(ctx context.Context, bucket, object string) error {
 	req := &bucketObjectRmRequest{Bucket: bucket, Object: object}
-	return aa.delete(ctx, "/bucket?object", req, nil)
+	return aa.Delete(ctx, "/bucket?object", req, nil)
 }
 
 // BucketPolicy - get a bucket policy.  bucket required, object is optional.
 func (aa *AdminAPI) BucketPolicy(ctx context.Context, bucket, object string) (*BucketPolicyResponse, error) {
 	req := bucketPolicyRequest{Bucket: bucket, Object: object}
 	resp := &BucketPolicyResponse{}
-	err := aa.get(ctx, "/bucket?policy", req, resp)
+	err := aa.Get(ctx, "/bucket?policy", req, resp)
 	return resp, err
 }

glide.lock

@@ -35,13 +35,13 @@ type KeyRmRequest struct {
 // effect. Additionally, only one swift key may be held by each user or subuser.
 func (aa *AdminAPI) KeyCreate(ctx context.Context, kcr *KeyCreateRequest) ([]UserKey, error) {
 	resp := []UserKey{}
-	err := aa.put(ctx, "/user?key", kcr, nil, &resp)
+	err := aa.Put(ctx, "/user?key", kcr, nil, &resp)
 	return resp, err
 }
 
 // KeyRm - delete an existing key.
 //
 // Key type is optional, but required to remove a swift key.
 func (aa *AdminAPI) KeyRm(ctx context.Context, krr *KeyRmRequest) error {
-	return aa.delete(ctx, "/user?key", krr, nil)
+	return aa.Delete(ctx, "/user?key", krr, nil)
 }

key.go

@@ -82,7 +82,7 @@ type MUserResponse struct {
 // Returns a list of usernames
 func (aa *AdminAPI) MListUsers(ctx context.Context) ([]string, error) {
 	resp := []string{}
-	err := aa.get(ctx, "/metadata/user", nil, &resp)
+	err := aa.Get(ctx, "/metadata/user", nil, &resp)
 	return resp, err
 }
 
@@ -92,15 +92,15 @@ func (aa *AdminAPI) MGetUser(ctx context.Context, user string) (*MUserResponse,
 	mr := &metaReq{user}
 	resp := &MUserResponse{}
 
-	err := aa.get(ctx, "metadata/user", mr, resp)
+	err := aa.Get(ctx, "metadata/user", mr, resp)
 	return resp, err
 }
 
 // MListBuckets - This is the "radosgw-admin metadata list bucket" command
 // Returns a list of usernames
 func (aa *AdminAPI) MListBuckets(ctx context.Context) ([]string, error) {
 	resp := []string{}
-	err := aa.get(ctx, "/metadata/bucket", nil, &resp)
+	err := aa.Get(ctx, "/metadata/bucket", nil, &resp)
 	return resp, err
 }
 
@@ -110,15 +110,15 @@ func (aa *AdminAPI) MGetBucket(ctx context.Context, bucket string) (*MBucketResp
 	mr := &metaReq{bucket}
 	resp := &MBucketResponse{}
 
-	err := aa.get(ctx, "metadata/bucket", mr, resp)
+	err := aa.Get(ctx, "metadata/bucket", mr, resp)
 	return resp, err
 }
 
 // MListBucketInstances - This is the "radosgw-admin metadata list bucket.instance" command
 // Returns a list of usernames
 func (aa *AdminAPI) MListBucketInstances(ctx context.Context) ([]string, error) {
 	resp := []string{}
-	err := aa.get(ctx, "/metadata/bucket.instance", nil, &resp)
+	err := aa.Get(ctx, "/metadata/bucket.instance", nil, &resp)
 	return resp, err
 }
 
@@ -128,6 +128,6 @@ func (aa *AdminAPI) MGetBucketInstance(ctx context.Context, bucket string) (*MBu
 	mr := &metaReq{bucket}
 	resp := &MBucketInstanceResponse{}
 
-	err := aa.get(ctx, "metadata/bucket.instance", mr, resp)
+	err := aa.Get(ctx, "metadata/bucket.instance", mr, resp)
 	return resp, err
 }

metadata.go

@@ -35,27 +35,27 @@ type Quotas struct {
 func (aa *AdminAPI) Quotas(ctx context.Context, uid string) (*Quotas, error) {
 	resp := &Quotas{}
 	req := &quotaGetRequest{UID: uid}
-	err := aa.get(ctx, "/user?quota", req, &resp)
+	err := aa.Get(ctx, "/user?quota", req, &resp)
 	return resp, err
 }
 
 // QuotaBucket - get bucket quota info by uid
 func (aa *AdminAPI) QuotaBucket(ctx context.Context, uid string) (*QuotaMeta, error) {
 	resp := &QuotaMeta{}
 	req := &quotaGetRequest{UID: uid, QuotaType: "bucket"}
-	err := aa.get(ctx, "/user?quota", req, &resp)
+	err := aa.Get(ctx, "/user?quota", req, &resp)
 	return resp, err
 }
 
 // QuotaUser - get user quota info by uid.
 func (aa *AdminAPI) QuotaUser(ctx context.Context, uid string) (*QuotaMeta, error) {
 	resp := &QuotaMeta{}
 	req := &quotaGetRequest{UID: uid, QuotaType: "user"}
-	err := aa.get(ctx, "/user?quota", req, &resp)
+	err := aa.Get(ctx, "/user?quota", req, &resp)
 	return resp, err
 }
 
 // QuotaSet - Set a quota
 func (aa *AdminAPI) QuotaSet(ctx context.Context, qsr *QuotaSetRequest) error {
-	return aa.put(ctx, "/user?quota", qsr, nil, nil)
+	return aa.Put(ctx, "/user?quota", qsr, nil, nil)
 }

quota.go

@@ -23,15 +23,15 @@ type TrimUsageRequest struct {
 
 // UsageTrim - trim usage data
 func (aa *AdminAPI) UsageTrim(ctx context.Context, treq *TrimUsageRequest) error {
-	err := aa.delete(ctx, "/usage", treq, nil)
+	err := aa.Delete(ctx, "/usage", treq, nil)
 	return err
 }
 
 // Usage - Get usage data.
 func (aa *AdminAPI) Usage(ctx context.Context, ureq *UsageRequest) (*UsageResponse, error) {
 	uresp := new(UsageResponse)
 
-	err := aa.get(ctx, "/usage", ureq, uresp)
+	err := aa.Get(ctx, "/usage", ureq, uresp)
 	return uresp, err
 }
 

usage.go

@@ -130,47 +130,47 @@ func (aa *AdminAPI) UserInfo(ctx context.Context, uid string, stats bool) (*User
 	uir := &userInfoRequest{uid, stats}
 	resp := &UserInfoResponse{}
 
-	err := aa.get(ctx, "/user", uir, resp)
+	err := aa.Get(ctx, "/user", uir, resp)
 	return resp, err
 }
 
 // UserCreate - create a user described by cur.
 func (aa *AdminAPI) UserCreate(ctx context.Context, cur *UserCreateRequest) (*UserInfoResponse, error) {
 	resp := &UserInfoResponse{}
-	err := aa.put(ctx, "/user", cur, nil, resp)
+	err := aa.Put(ctx, "/user", cur, nil, resp)
 	return resp, err
 }
 
 // UserRm - delete user uid
 func (aa *AdminAPI) UserRm(ctx context.Context, uid string, purge bool) error {
 	udr := &userDeleteRequest{uid, purge}
-	return aa.delete(ctx, "/user", udr, nil)
+	return aa.Delete(ctx, "/user", udr, nil)
 }
 
 // UserModify - modify a user described by umr
 func (aa *AdminAPI) UserModify(ctx context.Context, umr *UserModifyRequest) (*UserInfoResponse, error) {
 	resp := &UserInfoResponse{}
-	err := aa.post(ctx, "/user", umr, nil, resp)
+	err := aa.Post(ctx, "/user", umr, nil, resp)
 	return resp, err
 }
 
 // SubUserCreate - create a subuser
 func (aa *AdminAPI) SubUserCreate(ctx context.Context, sucr *SubUserCreateModifyRequest) ([]SubUser, error) {
 	resp := []SubUser{}
-	err := aa.put(ctx, "/user?subuser", sucr, nil, &resp)
+	err := aa.Put(ctx, "/user?subuser", sucr, nil, &resp)
 	return resp, err
 }
 
 // SubUserModify - modify a subuser
 func (aa *AdminAPI) SubUserModify(ctx context.Context, sucr *SubUserCreateModifyRequest) ([]SubUser, error) {
 	resp := []SubUser{}
-	err := aa.post(ctx, "/user?subuser", sucr, nil, &resp)
+	err := aa.Post(ctx, "/user?subuser", sucr, nil, &resp)
 	return resp, err
 }
 
 // SubUserRm - delete a subuser
 func (aa *AdminAPI) SubUserRm(ctx context.Context, surm *SubUserRmRequest) error {
-	return aa.delete(ctx, "/user?subuser", surm, nil)
+	return aa.Delete(ctx, "/user?subuser", surm, nil)
 }
 
 // CapsAdd - Add capabilities / permissions.  Returns the new effective capabilities.
@@ -183,14 +183,14 @@ func (aa *AdminAPI) SubUserRm(ctx context.Context, surm *SubUserRmRequest) error
 // subtractive.
 func (aa *AdminAPI) CapsAdd(ctx context.Context, ucr *UserCapsRequest) ([]UserCap, error) {
 	resp := []UserCap{}
-	err := aa.put(ctx, "/user?caps", ucr, nil, &resp)
+	err := aa.Put(ctx, "/user?caps", ucr, nil, &resp)
 	return resp, err
 }
 
 // CapsRm - Remove capabilities / permissions.  Returns the new effective capabilities.
 // See notes for CapsAdd().
 func (aa *AdminAPI) CapsRm(ctx context.Context, ucr *UserCapsRequest) ([]UserCap, error) {
 	resp := []UserCap{}
-	err := aa.delete(ctx, "/user?caps", ucr, &resp)
+	err := aa.Delete(ctx, "/user?caps", ucr, &resp)
 	return resp, err
 }