Merge branch 'master' into bump-golang.org/x/net

cloudflare · Feb 20, 2023 · 014c331 · 014c331
2 parents e8030c9 + 3146ba4
commit 014c331
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.20
 
 RUN apt-get update -y && apt-get install -y lsb-release
 RUN wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | tee /usr/share/keyrings/hashicorp-archive-keyring.gpg

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@ BUG FIXES:
 * resource/cloudflare_record: always send tags object which allows removal of unwanted tags ([#2205](https://github.com/cloudflare/terraform-provider-cloudflare/issues/2205))
 * resource/cloudflare_tunnel_config: use correct notation for nested lists ([#2235](https://github.com/cloudflare/terraform-provider-cloudflare/issues/2235))
 
+INTERNAL:
+
+* internal: bump Go version to 1.20 ([#2245](https://github.com/cloudflare/terraform-provider-cloudflare/issues/2245))
+
 DEPENDENCIES:
 
 * provider: bumps github.com/cloudflare/cloudflare-go from 0.60.0 to 0.61.0 ([#2240](https://github.com/cloudflare/terraform-provider-cloudflare/issues/2240))

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cloudflare/terraform-provider-cloudflare
 
-go 1.19
+go 1.20
 
 require (
 	github.com/agext/levenshtein v1.2.3 // indirect

diff --git a/tools/go.mod b/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/cloudflare/terraform-provider-cloudflare/tools
 
-go 1.19
+go 1.20
 
 require (
 	github.com/bflad/tfproviderlint v0.28.1