Merge pull request #1035 from Cyb3r-Jak3/r2-bucket-fix

cloudflare · Aug 22, 2022 · 033c9d6 · 033c9d6
2 parents ebb2785 + 23bde0b
commit 033c9d6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/.changelog/1035.txt b/.changelog/1035.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+r2: fix create bucket endpoint
+```
diff --git a/r2_bucket.go b/r2_bucket.go
@@ -11,20 +11,24 @@ var (
 	ErrMissingBucketName = errors.New("require bucket name missing")
 )
 
+type CreateR2BucketParameters struct {
+	Name string `json:"name,omitempty"`
+}
+
 // CreateR2Bucket Creates a new R2 bucket.
 //
 // API reference: https://api.cloudflare.com/#r2-bucket-create-bucket
-func (api *API) CreateR2Bucket(ctx context.Context, rc *ResourceContainer, bucketName string) error {
+func (api *API) CreateR2Bucket(ctx context.Context, rc *ResourceContainer, params CreateR2BucketParameters) error {
 	if rc.Identifier == "" {
 		return ErrMissingAccountID
 	}
 
-	if bucketName == "" {
+	if params.Name == "" {
 		return ErrMissingBucketName
 	}
 
-	uri := fmt.Sprintf("/accounts/%s/r2/buckets/%s", rc.Identifier, bucketName)
-	_, err := api.makeRequestContext(ctx, http.MethodPost, uri, nil)
+	uri := fmt.Sprintf("/accounts/%s/r2/buckets", rc.Identifier)
+	_, err := api.makeRequestContext(ctx, http.MethodPost, uri, params)
 
 	return err
 }

diff --git a/r2_bucket_test.go b/r2_bucket_test.go
@@ -15,7 +15,7 @@ func TestR2_CreateBucket(t *testing.T) {
 	setup()
 	defer teardown()
 
-	mux.HandleFunc(fmt.Sprintf("/accounts/%s/r2/buckets/%s", testAccountID, testBucketName), func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc(fmt.Sprintf("/accounts/%s/r2/buckets", testAccountID), func(w http.ResponseWriter, r *http.Request) {
 		assert.Equal(t, http.MethodPost, r.Method, "Expected method 'POST', got %s", r.Method)
 		w.Header().Set("content-type", "application/json")
 		fmt.Fprintf(w, `{
@@ -26,17 +26,17 @@ func TestR2_CreateBucket(t *testing.T) {
 }`)
 	})
 
-	err := client.CreateR2Bucket(context.Background(), AccountIdentifier(""), "")
+	err := client.CreateR2Bucket(context.Background(), AccountIdentifier(""), CreateR2BucketParameters{})
 	if assert.Error(t, err) {
 		assert.Equal(t, ErrMissingAccountID, err)
 	}
 
-	err = client.CreateR2Bucket(context.Background(), AccountIdentifier(testAccountID), "")
+	err = client.CreateR2Bucket(context.Background(), AccountIdentifier(testAccountID), CreateR2BucketParameters{Name: ""})
 	if assert.Error(t, err) {
 		assert.Equal(t, ErrMissingBucketName, err)
 	}
 
-	err = client.CreateR2Bucket(context.Background(), AccountIdentifier(testAccountID), "example-bucket")
+	err = client.CreateR2Bucket(context.Background(), AccountIdentifier(testAccountID), CreateR2BucketParameters{Name: testBucketName})
 	assert.NoError(t, err)
 }