From 68d0efbeaa54e8b575e4f5634d222db691adecc5 Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Wed, 23 Oct 2019 22:57:11 +0100
Subject: [PATCH] Move api types in cf store

---
 store/cloudflare/cloudflare.go | 72 +++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/store/cloudflare/cloudflare.go b/store/cloudflare/cloudflare.go
index 2a8e48ec..ea8240bd 100644
--- a/store/cloudflare/cloudflare.go
+++ b/store/cloudflare/cloudflare.go
@@ -37,6 +37,42 @@ type workersKV struct {
 	httpClient *http.Client
 }
 
+// apiResponse is a cloudflare v4 api response
+type apiResponse struct {
+	Result []struct {
+		ID         string    `json:"id"`
+		Type       string    `json:"type"`
+		Name       string    `json:"name"`
+		Expiration string    `json:"expiration"`
+		Content    string    `json:"content"`
+		Proxiable  bool      `json:"proxiable"`
+		Proxied    bool      `json:"proxied"`
+		TTL        int       `json:"ttl"`
+		Priority   int       `json:"priority"`
+		Locked     bool      `json:"locked"`
+		ZoneID     string    `json:"zone_id"`
+		ZoneName   string    `json:"zone_name"`
+		ModifiedOn time.Time `json:"modified_on"`
+		CreatedOn  time.Time `json:"created_on"`
+	} `json:"result"`
+	Success bool         `json:"success"`
+	Errors  []apiMessage `json:"errors"`
+	// not sure Messages is ever populated?
+	Messages   []apiMessage `json:"messages"`
+	ResultInfo struct {
+		Page       int `json:"page"`
+		PerPage    int `json:"per_page"`
+		Count      int `json:"count"`
+		TotalCount int `json:"total_count"`
+	} `json:"result_info"`
+}
+
+// apiMessage is a Cloudflare v4 API Error
+type apiMessage struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
 // In the cloudflare workers KV implemention, List() doesn't guarantee
 // anything as the workers API is eventually consistent.
 func (w *workersKV) List() ([]*store.Record, error) {
@@ -220,42 +256,6 @@ func (w *workersKV) request(ctx context.Context, method, path string, body inter
 	return respBody, resp.Header, resp.StatusCode, nil
 }
 
-// apiResponse is a cloudflare v4 api response
-type apiResponse struct {
-	Result []struct {
-		ID         string    `json:"id"`
-		Type       string    `json:"type"`
-		Name       string    `json:"name"`
-		Expiration string    `json:"expiration"`
-		Content    string    `json:"content"`
-		Proxiable  bool      `json:"proxiable"`
-		Proxied    bool      `json:"proxied"`
-		TTL        int       `json:"ttl"`
-		Priority   int       `json:"priority"`
-		Locked     bool      `json:"locked"`
-		ZoneID     string    `json:"zone_id"`
-		ZoneName   string    `json:"zone_name"`
-		ModifiedOn time.Time `json:"modified_on"`
-		CreatedOn  time.Time `json:"created_on"`
-	} `json:"result"`
-	Success bool         `json:"success"`
-	Errors  []apiMessage `json:"errors"`
-	// not sure Messages is ever populated?
-	Messages   []apiMessage `json:"messages"`
-	ResultInfo struct {
-		Page       int `json:"page"`
-		PerPage    int `json:"per_page"`
-		Count      int `json:"count"`
-		TotalCount int `json:"total_count"`
-	} `json:"result_info"`
-}
-
-// apiMessage is a Cloudflare v4 API Error
-type apiMessage struct {
-	Code    int    `json:"code"`
-	Message string `json:"message"`
-}
-
 // New returns a cloudflare Store implementation.
 // Options expects CF_API_TOKEN to a cloudflare API token scoped to Workers KV,
 // CF_ACCOUNT_ID to contain a string with your cloudflare account ID and