update R2 examples

This commit is contained in:
syumai 2025-01-12 22:54:47 +09:00
parent c30f8b601c
commit f11ec6530f
2 changed files with 7 additions and 7 deletions

View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"github.com/syumai/workers" "github.com/syumai/workers"
"github.com/syumai/workers/cloudflare" "github.com/syumai/workers/cloudflare/r2"
) )
// bucketName is R2 bucket name defined in wrangler.toml. // bucketName is R2 bucket name defined in wrangler.toml.
@ -23,8 +23,8 @@ func handleErr(w http.ResponseWriter, msg string, err error) {
type server struct{} type server struct{}
func (s *server) bucket() (*cloudflare.R2Bucket, error) { func (s *server) bucket() (*r2.Bucket, error) {
return cloudflare.NewR2Bucket(bucketName) return r2.NewBucket(bucketName)
} }
func (s *server) post(w http.ResponseWriter, req *http.Request, key string) { func (s *server) post(w http.ResponseWriter, req *http.Request, key string) {
@ -45,8 +45,8 @@ func (s *server) post(w http.ResponseWriter, req *http.Request, key string) {
return return
} }
} }
_, err = bucket.Put(key, req.Body, &cloudflare.R2PutOptions{ _, err = bucket.Put(key, req.Body, &r2.PutOptions{
HTTPMetadata: cloudflare.R2HTTPMetadata{ HTTPMetadata: r2.HTTPMetadata{
ContentType: req.Header.Get("Content-Type"), ContentType: req.Header.Get("Content-Type"),
}, },
CustomMetadata: map[string]string{"custom-key": "custom-value"}, CustomMetadata: map[string]string{"custom-key": "custom-value"},

View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"github.com/syumai/workers" "github.com/syumai/workers"
"github.com/syumai/workers/cloudflare" "github.com/syumai/workers/cloudflare/r2"
) )
// bucketName is R2 bucket name defined in wrangler.toml. // bucketName is R2 bucket name defined in wrangler.toml.
@ -23,7 +23,7 @@ func handleErr(w http.ResponseWriter, msg string, err error) {
// This example is based on implementation in syumai/workers-playground // This example is based on implementation in syumai/workers-playground
// - https://github.com/syumai/workers-playground/blob/e32881648ccc055e3690a0d9c750a834261c333e/r2-image-viewer/src/index.ts#L30 // - https://github.com/syumai/workers-playground/blob/e32881648ccc055e3690a0d9c750a834261c333e/r2-image-viewer/src/index.ts#L30
func handler(w http.ResponseWriter, req *http.Request) { func handler(w http.ResponseWriter, req *http.Request) {
bucket, err := cloudflare.NewR2Bucket(bucketName) bucket, err := r2.NewBucket(bucketName)
if err != nil { if err != nil {
handleErr(w, "failed to get R2Bucket\n", err) handleErr(w, "failed to get R2Bucket\n", err)
return return