Add support for listing R2 buckets

.changelog/1035.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+r2: fix create bucket endpoint
+```

.changelog/1040.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+workers: Support for multipart encoding for DownloadWorker on a module-format Worker script
+```

.changelog/1046.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+tunnel_configuration: Remove unnecessary double-unmarshalling due to changes in the API
+```

.changelog/1047.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+errors: add some error type convenience functions for mocking and inspection
+```

.changelog/1050.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+r2: Add in support for listing R2 buckets
+```

.changelog/1051.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+pages_project: Add compatibility date and compatibility_flags to pages deployment configs
+```

.changelog/1052.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+zonelockdown: add `Priority` to `ZoneLockdownCreateParams` and `ZoneLockdownUpdateParams`
+```

.changelog/1053.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+teams_account: add support for `suppress_footer`
+```

.changelog/1059.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+api_shield: add GET/PUT for API Shield Configuration
+```

.changelog/1060.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+email_routing_settings: change enable endpoint from `enabled` to `enable`
+```

.devcontainer/devcontainer.json

@@ -1,47 +1,36 @@
 {
-	"name": "Go",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined"
-	],
-	"containerEnv": {
-		"GOPATH": "/go"
-	},
-	"remoteEnv": {
-		"GOPATH": "${containerEnv:GOPATH}"
-	},
-	"onCreateCommand": "go generate -tags tools tools/tools.go",
-	"customizations": {
-		"vscode": {
-			"settings": {
-				"go.toolsManagement.checkForUpdates": "local",
-				"go.useLanguageServer": true,
-				"go.gopath": "/go",
-				"[go]": {
-					"editor.formatOnSave": true
-				},
-				"go.formatTool": "gofmt",
-				"go.formatFlags": [
-					"-w",
-					"-s"
-				],
-				"go.toolsManagement.autoUpdate": true,
-				"go.lintTool": "golangci-lint",
-				"go.lintFlags": [
-					"--fast"
-				],
-				"gopls": {
-					"ui.semanticTokens": true
-				},
-				"go.survey.prompt": false
-			},
-			"extensions": [
-				"golang.Go"
-			]
-		}
-	}
+  "name": "Go",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
+  "containerEnv": {
+    "GOPATH": "/go"
+  },
+  "remoteEnv": {
+    "GOPATH": "${containerEnv:GOPATH}"
+  },
+  "updateContentCommand": "go generate -tags tools internal/tools/tools.go",
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "go.toolsManagement.checkForUpdates": "local",
+        "go.useLanguageServer": true,
+        "go.gopath": "/go",
+        "[go]": {
+          "editor.formatOnSave": true
+        },
+        "go.formatTool": "gofmt",
+        "go.formatFlags": ["-w", "-s"],
+        "go.toolsManagement.autoUpdate": true,
+        "go.lintTool": "golangci-lint",
+        "go.lintFlags": ["--fast"],
+        "gopls": {
+          "ui.semanticTokens": true
+        },
+        "go.survey.prompt": false
+      },
+      "extensions": ["golang.Go"]
+    }
+  }
 }

.github/workflows/changelog-check.yml

@@ -13,8 +13,9 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: ^1.17
-      - run: make tools
-      - run: go run tools/cmd/changelog-check/main.go ${{ github.event.pull_request.number }}
+      - run: go generate -tags tools internal/tools/tools.go
+      - run: go run cmd/changelog-check/main.go ${{ github.event.pull_request.number }}
+        working-directory: ./internal/tools
         env:
           GITHUB_OWNER: cloudflare
           GITHUB_REPO: cloudflare-go

.github/workflows/generate-changelog.yml

@@ -8,10 +8,13 @@ jobs:
     if: github.event.pull_request.merged || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.18
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - run: cd tools && go install github.com/hashicorp/go-changelog/cmd/changelog-build
+      - run: go generate -tags tools internal/tools/tools.go
       - run: ./scripts/generate-changelog.sh
       - run: |
           if [[ `git status --porcelain` ]]; then

CHANGELOG.md

@@ -1,4 +1,32 @@
-## 0.48.0 (Unreleased)
+## 0.49.0 (Unreleased)
+
+ENHANCEMENTS:
+
+* api_shield: add GET/PUT for API Shield Configuration ([#1059](https://github.com/cloudflare/cloudflare-go/issues/1059))
+* workers: Support for multipart encoding for DownloadWorker on a module-format Worker script ([#1040](https://github.com/cloudflare/cloudflare-go/issues/1040))
+
+BUG FIXES:
+
+* email_routing_settings: change enable endpoint from `enabled` to `enable` ([#1060](https://github.com/cloudflare/cloudflare-go/issues/1060))
+
+## 0.48.0 (August 22nd, 2022)
+
+ENHANCEMENTS:
+
+* errors: add some error type convenience functions for mocking and inspection ([#1047](https://github.com/cloudflare/cloudflare-go/issues/1047))
+* pages_project: Add compatibility date and compatibility_flags to pages deployment configs ([#1051](https://github.com/cloudflare/cloudflare-go/issues/1051))
+* teams_account: add support for `suppress_footer` ([#1053](https://github.com/cloudflare/cloudflare-go/issues/1053))
+
+BUG FIXES:
+
+* r2: fix create bucket endpoint ([#1035](https://github.com/cloudflare/cloudflare-go/issues/1035))
+* tunnel_configuration: Remove unnecessary double-unmarshalling due to changes in the API ([#1046](https://github.com/cloudflare/cloudflare-go/issues/1046))
+
+## 0.47.1 (August 18th, 2022)
+
+BUG FIXES:
+
+* zonelockdown: add `Priority` to `ZoneLockdownCreateParams` and `ZoneLockdownUpdateParams` ([#1052](https://github.com/cloudflare/cloudflare-go/issues/1052))
 
 ## 0.47.0 (August 17th, 2022)
 

api_shield.go

@@ -0,0 +1,70 @@
+package cloudflare
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+)
+
+// AuthIdCharacteristics a single option from
+// configuration?properties=auth_id_characteristics.
+type AuthIdCharacteristics struct {
+	Type string `json:"type"`
+	Name string `json:"name"`
+}
+
+// APIShield is all the available options under
+// configuration?properties=auth_id_characteristics.
+type APIShield struct {
+	AuthIdCharacteristics []AuthIdCharacteristics `json:"auth_id_characteristics"`
+}
+
+// APIShieldResponse represents the response from the api_gateway/configuration endpoint.
+type APIShieldResponse struct {
+	Result APIShield `json:"result"`
+	Response
+	ResultInfo `json:"result_info"`
+}
+
+type UpdateAPIShieldParams struct {
+	AuthIdCharacteristics []AuthIdCharacteristics `json:"auth_id_characteristics"`
+}
+
+// GetAPIShieldConfiguration gets a zone API shield configuration.
+//
+// API documentation: https://api.cloudflare.com/#api-shield-settings-retrieve-information-about-specific-configuration-properties
+func (api *API) GetAPIShieldConfiguration(ctx context.Context, rc *ResourceContainer) (APIShield, ResultInfo, error) {
+	uri := fmt.Sprintf("/zones/%s/api_gateway/configuration?properties=auth_id_characteristics", rc.Identifier)
+
+	res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
+	if err != nil {
+		return APIShield{}, ResultInfo{}, err
+	}
+	var asResponse APIShieldResponse
+	err = json.Unmarshal(res, &asResponse)
+	if err != nil {
+		return APIShield{}, ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
+	}
+
+	return asResponse.Result, asResponse.ResultInfo, nil
+}
+
+// UpdateAPIShieldConfiguration sets a zone API shield configuration.
+//
+// API documentation: https://api.cloudflare.com/#api-shield-settings-set-configuration-properties
+func (api *API) UpdateAPIShieldConfiguration(ctx context.Context, rc *ResourceContainer, params UpdateAPIShieldParams) (Response, error) {
+	uri := fmt.Sprintf("/zones/%s/api_gateway/configuration", rc.Identifier)
+
+	res, err := api.makeRequestContext(ctx, http.MethodPut, uri, params)
+	if err != nil {
+		return Response{}, err
+	}
+	var asResponse Response
+	err = json.Unmarshal(res, &asResponse)
+	if err != nil {
+		return Response{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
+	}
+
+	return asResponse, nil
+}

api_shield_test.go

@@ -0,0 +1,84 @@
+package cloudflare
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetAPIShield(t *testing.T) {
+	setup()
+	defer teardown()
+
+	handler := func(w http.ResponseWriter, r *http.Request) {
+		assert.Equal(t, http.MethodGet, r.Method, "Expected method 'GET', got %s", r.Method)
+		w.Header().Set("content-type", "application/json")
+		fmt.Fprintf(w, `{
+	"success" : true,
+	"errors": [],
+	"messages": [],
+	"result": {
+		"auth_id_characteristics": [
+			{
+				"type": "header",
+				"name": "test-header"
+			},
+			{
+				"type": "cookie",
+				"name": "test-cookie"
+			}
+		]
+	}
+}
+		`)
+	}
+
+	mux.HandleFunc("/zones/"+testZoneID+"/api_gateway/configuration", handler)
+
+	var authChars []AuthIdCharacteristics
+	authChars = append(authChars, AuthIdCharacteristics{Type: "header", Name: "test-header"})
+	authChars = append(authChars, AuthIdCharacteristics{Type: "cookie", Name: "test-cookie"})
+
+	want := APIShield{
+		AuthIdCharacteristics: authChars,
+	}
+
+	actual, _, err := client.GetAPIShieldConfiguration(context.Background(), ZoneIdentifier(testZoneID))
+
+	if assert.NoError(t, err) {
+		assert.Equal(t, want, actual)
+	}
+}
+
+func TestPutAPIShield(t *testing.T) {
+	setup()
+	defer teardown()
+
+	// now lets do a PUT
+	handler := func(w http.ResponseWriter, r *http.Request) {
+		assert.Equal(t, http.MethodPut, r.Method, "Expected method 'PUT', got %s", r.Method)
+		w.Header().Set("content-type", "application/json")
+		fmt.Fprintf(w, `{
+	"success" : true,
+	"errors": [],
+	"messages": [],
+	"result": []
+}
+		`)
+	}
+
+	mux.HandleFunc("/zones/"+testZoneID+"/api_gateway/configuration", handler)
+
+	apiShieldData := UpdateAPIShieldParams{AuthIdCharacteristics: []AuthIdCharacteristics{{Type: "header", Name: "different-header"}, {Type: "cookie", Name: "different-cookie"}}}
+
+	want := Response{Success: true, Errors: []ResponseInfo{}, Messages: []ResponseInfo{}}
+
+	actual, err := client.UpdateAPIShieldConfiguration(context.Background(), ZoneIdentifier(testZoneID), apiShieldData)
+
+	if assert.NoError(t, err) {
+		assert.Equal(t, want, actual)
+	}
+}

argo.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"time"
-
-	"errors"
 )
 
 var validSettingValues = []string{"on", "off"}
@@ -52,7 +50,7 @@ func (api *API) ArgoSmartRouting(ctx context.Context, zoneID string) (ArgoFeatur
 // API reference: https://api.cloudflare.com/#argo-smart-routing-patch-argo-smart-routing-setting
 func (api *API) UpdateArgoSmartRouting(ctx context.Context, zoneID, settingValue string) (ArgoFeatureSetting, error) {
 	if !contains(validSettingValues, settingValue) {
-		return ArgoFeatureSetting{}, errors.New(fmt.Sprintf("invalid setting value '%s'. must be 'on' or 'off'", settingValue))
+		return ArgoFeatureSetting{}, fmt.Errorf("invalid setting value '%s'. must be 'on' or 'off'", settingValue)
 	}
 
 	uri := fmt.Sprintf("/zones/%s/argo/smart_routing", zoneID)
@@ -94,7 +92,7 @@ func (api *API) ArgoTieredCaching(ctx context.Context, zoneID string) (ArgoFeatu
 // API reference: TBA.
 func (api *API) UpdateArgoTieredCaching(ctx context.Context, zoneID, settingValue string) (ArgoFeatureSetting, error) {
 	if !contains(validSettingValues, settingValue) {
-		return ArgoFeatureSetting{}, errors.New(fmt.Sprintf("invalid setting value '%s'. must be 'on' or 'off'", settingValue))
+		return ArgoFeatureSetting{}, fmt.Errorf("invalid setting value '%s'. must be 'on' or 'off'", settingValue)
 	}
 
 	uri := fmt.Sprintf("/zones/%s/argo/tiered_caching", zoneID)