From 17013001765bfb16ee6bfcc4435ea6576ce3b5d0 Mon Sep 17 00:00:00 2001
From: syumai <syumai@gmail.com>
Date: Tue, 13 Sep 2022 23:19:32 +0900
Subject: [PATCH] split cloudflare package

---
 kv.go => cloudflare/kv.go               | 2 +-
 r2bucket.go => cloudflare/r2bucket.go   | 2 +-
 r2object.go => cloudflare/r2object.go   | 2 +-
 r2objects.go => cloudflare/r2objects.go | 2 +-
 examples/kv-counter/main.go             | 4 +++-
 examples/r2-image-server/main.go        | 9 +++++----
 examples/r2-image-viewer/main.go        | 3 ++-
 7 files changed, 14 insertions(+), 10 deletions(-)
 rename kv.go => cloudflare/kv.go (99%)
 rename r2bucket.go => cloudflare/r2bucket.go (99%)
 rename r2object.go => cloudflare/r2object.go (99%)
 rename r2objects.go => cloudflare/r2objects.go (98%)

diff --git a/kv.go b/cloudflare/kv.go
similarity index 99%
rename from kv.go
rename to cloudflare/kv.go
index 40f1685..f5d0387 100644
--- a/kv.go
+++ b/cloudflare/kv.go
@@ -1,4 +1,4 @@
-package workers
+package cloudflare
 
 import (
 	"fmt"
diff --git a/r2bucket.go b/cloudflare/r2bucket.go
similarity index 99%
rename from r2bucket.go
rename to cloudflare/r2bucket.go
index ded1bb6..2fbc899 100644
--- a/r2bucket.go
+++ b/cloudflare/r2bucket.go
@@ -1,4 +1,4 @@
-package workers
+package cloudflare
 
 import (
 	"fmt"
diff --git a/r2object.go b/cloudflare/r2object.go
similarity index 99%
rename from r2object.go
rename to cloudflare/r2object.go
index d6b6322..8a26a31 100644
--- a/r2object.go
+++ b/cloudflare/r2object.go
@@ -1,4 +1,4 @@
-package workers
+package cloudflare
 
 import (
 	"errors"
diff --git a/r2objects.go b/cloudflare/r2objects.go
similarity index 98%
rename from r2objects.go
rename to cloudflare/r2objects.go
index 92208f7..4d0302b 100644
--- a/r2objects.go
+++ b/cloudflare/r2objects.go
@@ -1,4 +1,4 @@
-package workers
+package cloudflare
 
 import (
 	"fmt"
diff --git a/examples/kv-counter/main.go b/examples/kv-counter/main.go
index fb3761e..b9a0768 100644
--- a/examples/kv-counter/main.go
+++ b/examples/kv-counter/main.go
@@ -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)
diff --git a/examples/r2-image-server/main.go b/examples/r2-image-server/main.go
index 73e2d01..518dc92 100644
--- a/examples/r2-image-server/main.go
+++ b/examples/r2-image-server/main.go
@@ -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"},
diff --git a/examples/r2-image-viewer/main.go b/examples/r2-image-viewer/main.go
index 5b7c022..924281a 100644
--- a/examples/r2-image-viewer/main.go
+++ b/examples/r2-image-viewer/main.go
@@ -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