Merge branch 'master' into nicky/fix-aop-switch-stmt

.changelog/1835.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+resource/cloudflare_pages_domain: Adds support for Pages domains
+```
+```release-note:enhancement
+resource/cloudflare_pages_project: Adds support for Pages Projects
+```

.changelog/1856.txt

@@ -0,0 +1,15 @@
+```release-note:new-resource
+cloudflare_email_routing_address
+```
+
+```release-note:new-resource
+cloudflare_email_routing_rules
+```
+
+```release-note:new-resource
+cloudflare_email_routing_settings
+```
+
+```release-note:new-resource
+cloudflare_email_routing_catch_all
+```

.changelog/1865.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/cloudflare_worker: provide js module option to allow service bindings
+```

.changelog/1871.txt

@@ -0,0 +1,3 @@
+```release-note:dependency
+provider: bumps github.com/cloudflare/cloudflare-go from 0.48.0 to 0.49.0
+```

.github/workflows/acceptance-tests.yml

@@ -38,12 +38,14 @@ jobs:
       CLOUDFLARE_WORKSPACE_ONE_CLIENT_SECRET: ${{ secrets.CLOUDFLARE_WORKSPACE_ONE_CLIENT_SECRET }}
       CLOUDFLARE_WORKSPACE_ONE_API_URL: ${{ secrets.CLOUDFLARE_WORKSPACE_ONE_API_URL }}
       CLOUDFLARE_WORKSPACE_ONE_AUTH_URL: ${{ secrets.CLOUDFLARE_WORKSPACE_ONE_AUTH_URL }}
+      CLOUDFLARE_PAGES_OWNER: jacobbednarz
+      CLOUDFLARE_PAGES_REPO: pages-example
 
     steps:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: ^1.18
       id: go
 
     - name: Check out code into the Go module directory

.github/workflows/changelog-check.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.17
+          go-version: ^1.18
       - run: make tools
       - run: go run tools/cmd/changelog-check/main.go ${{ github.event.pull_request.number }}
         env:

.github/workflows/lint.yml

@@ -10,6 +10,10 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ^1.18
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # needed for `only-new-issues` to compare diffs
@@ -31,5 +35,5 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.17
+          go-version: ^1.18
       - run: make terraform-provider-lint

.github/workflows/maintainer-only-files.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.17
+          go-version: ^1.18
       - run: make tools
       - run: go run tools/cmd/maintainer-only-file-check/main.go ${{ github.event.pull_request.number }}
         env:

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.17
+          go-version: ^1.18
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v5

.github/workflows/terraform-log-check.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.17
+          go-version: ^1.18
       - run: make tools
       - run: go run tools/cmd/tf-log-check/main.go ${{ github.event.issue.number }}
         env:

.github/workflows/unit-tests.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.17
+          go-version: ^1.18
         id: go
       - name: Check out code repository source code
         uses: actions/checkout@v3

CHANGELOG.md

@@ -1,7 +1,21 @@
 ## 3.23.0 (Unreleased)
 
+FEATURES:
+
+* **New Resource:** `cloudflare_email_routing_address` ([#1856](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1856))
+* **New Resource:** `cloudflare_email_routing_catch_all` ([#1856](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1856))
+* **New Resource:** `cloudflare_email_routing_rules` ([#1856](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1856))
+* **New Resource:** `cloudflare_email_routing_settings` ([#1856](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1856))
+
+ENHANCEMENTS:
+
+* resource/cloudflare_pages_domain: Adds support for Pages domains ([#1835](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1835))
+* resource/cloudflare_pages_project: Adds support for Pages Projects ([#1835](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1835))
+* resource/cloudflare_worker: provide js module option to allow service bindings ([#1865](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1865))
+
 DEPENDENCIES:
 
+* provider: bumps github.com/cloudflare/cloudflare-go from 0.48.0 to 0.49.0 ([#1871](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1871))
 * provider: bumps github.com/golangci/golangci-lint from 1.48.0 to 1.49.0 ([#1855](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1855))
 * provider: bumps goreleaser/goreleaser-action from 3.0.0 to 3.1.0 ([#1868](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1868))
 

contributing/development.md

@@ -8,7 +8,7 @@
 ## Quick Start
 
 If you wish to work on the provider, you'll first need [Go](http://www.golang.org)
-installed on your machine (version 1.18+ is *required*). You'll also need to
+installed on your machine (version 1.18+ is _required_). You'll also need to
 correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well
 as adding `$GOPATH/bin` to your `$PATH`.
 
@@ -22,12 +22,20 @@ $ make test
 
 In order to run the full suite of Acceptance tests, run `make testacc`.
 
-*Note:* Acceptance tests create real resources, and often cost money to run.
+_Note:_ Acceptance tests create real resources, and often cost money to run.
 
 ```sh
 $ make testacc
 ```
 
+To run a subset of the acceptance test suite, you can run
+
+```sh
+TESTARGS='-run "^<regex target of tests>" -count 1 -parallel 1' make testacc
+# Example
+# TESTARGS='-run "^TestAccTestPagesProject" -count 1 -parallel 1' make testacc
+```
+
 You can also install other optional (but great to have tools) using `make tools`.
 Most of these tools run in CI automatically but helps having these locally to
 either hook into your editor or debug CI failures.

docs/resources/email_routing_address.md

@@ -0,0 +1,36 @@
+---
+page_title: "cloudflare_email_routing_address Resource - Cloudflare"
+subcategory: ""
+description: |-
+  Provides a resource for managing Email Routing Addresses.
+---
+
+# cloudflare_email_routing_address (Resource)
+
+Provides a resource for managing Email Routing Addresses.
+
+## Example Usage
+
+```terraform
+resource "cloudflare_email_routing_address" "example" {
+  account_id = "f037e56e89293a057740de681ac9abbe"
+  email      = "user@example.com"
+}
+```
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `account_id` (String) The account identifier to target for the resource.
+- `email` (String) The contact email address of the user.
+
+### Read-Only
+
+- `created` (String) The date and time the destination address has been created.
+- `id` (String) The ID of this resource.
+- `modified` (String) The date and time the destination address was last modified.
+- `tag` (String) Destination address identifier.
+- `verified` (String) The date and time the destination address has been verified. Null means not verified yet.
+
+

docs/resources/email_routing_catch_all.md

@@ -0,0 +1,54 @@
+---
+page_title: "cloudflare_email_routing_catch_all Resource - Cloudflare"
+subcategory: ""
+description: |-
+  Provides a resource for managing Email Routing Addresses catch all behaviour.
+---
+
+# cloudflare_email_routing_catch_all (Resource)
+
+Provides a resource for managing Email Routing Addresses catch all behaviour.
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `action` (Block Set, Min: 1) List actions patterns. (see [below for nested schema](#nestedblock--action))
+- `matcher` (Block Set, Min: 1) Matching patterns to forward to your actions. (see [below for nested schema](#nestedblock--matcher))
+- `name` (String) Routing rule name.
+- `zone_id` (String) The zone identifier to target for the resource.
+
+### Optional
+
+- `enabled` (Boolean) Routing rule status.
+- `priority` (Number) Priority of the routing rule.
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+- `tag` (String) Routing rule identifier.
+
+<a id="nestedblock--action"></a>
+### Nested Schema for `action`
+
+Required:
+
+- `type` (String) Type of supported action.
+- `value` (List of String) An array with items in the following form.
+
+
+<a id="nestedblock--matcher"></a>
+### Nested Schema for `matcher`
+
+Required:
+
+- `type` (String) Type of matcher.
+
+Optional:
+
+- `field` (String) Field for type matcher.
+- `value` (String) Value for matcher.
+
+

docs/resources/email_routing_rule.md

@@ -0,0 +1,76 @@
+---
+page_title: "cloudflare_email_routing_rule Resource - Cloudflare"
+subcategory: ""
+description: |-
+  Provides a resource for managing Email Routing rules.
+---
+
+# cloudflare_email_routing_rule (Resource)
+
+Provides a resource for managing Email Routing rules.
+
+## Example Usage
+
+```terraform
+resource "cloudflare_email_routing_rule" "main" {
+  zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
+  name    = "terraform rule"
+  enabled = true
+  matchers = [
+    {
+      type  = "literal",
+      field = "to",
+      value = "test@example.com"
+    }
+  ]
+
+  actions = [
+    {
+      type  = "forward"
+      value = ["destinationaddress@example.net"]
+    }
+  ]
+}
+```
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `action` (Block Set, Min: 1) List actions patterns. (see [below for nested schema](#nestedblock--action))
+- `matcher` (Block Set, Min: 1) Matching patterns to forward to your actions. (see [below for nested schema](#nestedblock--matcher))
+- `name` (String) Routing rule name.
+- `zone_id` (String) The zone identifier to target for the resource.
+
+### Optional
+
+- `enabled` (Boolean) Routing rule status.
+- `priority` (Number) Priority of the routing rule.
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+- `tag` (String) Routing rule identifier.
+
+<a id="nestedblock--action"></a>
+### Nested Schema for `action`
+
+Required:
+
+- `type` (String) Type of supported action.
+- `value` (List of String) An array with items in the following form.
+
+
+<a id="nestedblock--matcher"></a>
+### Nested Schema for `matcher`
+
+Required:
+
+- `type` (String) Type of matcher.
+
+Optional:
+
+- `field` (String) Field for type matcher.
+- `value` (String) Value for matcher.
+
+

docs/resources/email_routing_settings.md

@@ -0,0 +1,41 @@
+---
+page_title: "cloudflare_email_routing_settings Resource - Cloudflare"
+subcategory: ""
+description: |-
+  Provides a resource for managing Email Routing settings.
+---
+
+# cloudflare_email_routing_settings (Resource)
+
+Provides a resource for managing Email Routing settings.
+
+## Example Usage
+
+```terraform
+resource "cloudflare_email_routing_settings" "my_zone" {
+  zone_id = "0da42c8d2132a9ddaf714f9e7c920711"
+  enabled = "true"
+}
+```
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `enabled` (Boolean) State of the zone settings for Email Routing.
+- `zone_id` (String) The zone identifier to target for the resource.
+
+### Optional
+
+- `skip_wizard` (Boolean) Flag to check if the user skipped the configuration wizard.
+
+### Read-Only
+
+- `created` (String) The date and time the settings have been created.
+- `id` (String) The ID of this resource.
+- `modified` (String) The date and time the settings have been modified.
+- `name` (String) Domain of your zone.
+- `status` (String) Show the state of your account, and the type or configuration error.
+- `tag` (String) Email Routing settings identifier.
+
+