split cloudflare package

This commit is contained in:
syumai 2022-09-13 23:19:32 +09:00
parent 890096fce9
commit 1701300176
7 changed files with 14 additions and 10 deletions

View File

@ -1,4 +1,4 @@
package workers
package cloudflare
import (
"fmt"

View File

@ -1,4 +1,4 @@
package workers
package cloudflare
import (
"fmt"

View File

@ -1,4 +1,4 @@
package workers
package cloudflare
import (
"errors"

View File

@ -1,4 +1,4 @@
package workers
package cloudflare
import (
"fmt"

View File

@ -7,6 +7,8 @@ import (
"os"
"strconv"
"github.com/syumai/workers/cloudflare"
"github.com/syumai/workers"
)
@ -24,7 +26,7 @@ func handleErr(w http.ResponseWriter, msg string, err error) {
func main() {
// initialize KV namespace instance
kv, err := workers.NewKVNamespace(counterNamespace)
kv, err := cloudflare.NewKVNamespace(counterNamespace)
if err != nil {
fmt.Fprintf(os.Stderr, "failed to init KV: %v", err)
os.Exit(1)

View File

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

View File

@ -8,6 +8,7 @@ import (
"strings"
"github.com/syumai/workers"
"github.com/syumai/workers/cloudflare"
)
// bucketName is R2 bucket name defined in wrangler.toml.
@ -22,7 +23,7 @@ func handleErr(w http.ResponseWriter, msg string, err error) {
// 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
func handler(w http.ResponseWriter, req *http.Request) {
bucket, err := workers.NewR2Bucket(bucketName)
bucket, err := cloudflare.NewR2Bucket(bucketName)
if err != nil {
handleErr(w, "failed to get R2Bucket\n", err)
return