[NET-4968] Upgrade Go to 1.21 #20062

zalimeni · 2023-12-22T21:02:23Z

Description

Upgrade Go to 1.21.

This is needed in advance of the EOL of Go 1.20 ~Feb. 1. The ideal timing is before our next patch release scheduled for the end of January.

A follow-up change will introduce toolchain directives to pin to the latest version; the hope is to use a root-level go.work to accomplish this, which requires some additional changes to support. See #20058 for more context.

That PR should set this change up to cleanly backport and sync without intervention 🤞🏻

Testing & Reproduction steps

Tests continue to pass, and Go 1.21 can be observed as the output of get-go-version.

PR Checklist

updated test coverage
external facing docs updated
appropriate backport labels added
not a security concern

zalimeni · 2024-01-03T20:56:24Z

Makefile

-GOLANGCI_LINT_VERSION='v1.51.1'
+GOLANGCI_LINT_VERSION='v1.55.2'


Needed for compatibility w/ Go 1.21

zalimeni · 2024-01-03T21:42:00Z

.golangci.yml

-    list-type: denylist
-    include-go-root: true
-    # A list of packages for the list type specified.
-    # Default: []
-    packages:
-      - net/rpc
-    # A list of packages for the list type specified.
-    # Specify an error message to output when a denied package is used.
-    # Default: []
-    packages-with-error-message:
-      - net/rpc: "only use forked copy in github.com/hashicorp/consul-net-rpc/net/rpc"
-      - github.com/golang/protobuf: "only use google.golang.org/protobuf"
+    rules:
+      main:
+        listMode: lax
+        deny:
+        - pkg: net/rpc
+          desc: "only use forked copy in github.com/hashicorp/consul-net-rpc/net/rpc"
+        - pkg: github.com/golang/protobuf
+          desc: "only use google.golang.org/protobuf"


See golangci/golangci-lint#3906. Some other projects disabled this linter or replaced w/ another tool like Semgrep in response, but since we use custom rules and don't yet use Semgrep, I tried to adapt ours in-place.

zalimeni · 2024-01-12T01:33:19Z

.changelog/20062.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+Upgrade to use Go 1.21.6.


@curtbushko FYI for K8s + DP bumps, we got 1.21.6 earlier this week

For our submodules and other places we choose to test against previous Go versions, detect this version automatically from the current one rather than hard-coding it.

zalimeni · 2024-01-12T02:37:01Z

.github/workflows/go-tests.yml

-  go-test-api-1-19:
+  go-test-api-backwards-compatibility:
+    name: go-test-api-${{ needs.get-go-version.outputs.go-version-previous }}


Prior art: #10488

The second commit in this PR (e71ae3a) automates the version selection so we don't have to remember to bump it every time we upgrade the minor version of Go.

mkeeler · 2024-01-12T14:15:24Z

.github/workflows/go-tests.yml

@@ -446,17 +449,19 @@ jobs:
      consul-license: ${{secrets.CONSUL_LICENSE}}
      datadog-api-key: "${{ !endsWith(github.repository, '-enterprise') && secrets.DATADOG_API_KEY || '' }}"

-  go-test-sdk-1-19:
+  go-test-sdk-backwards-compatibility:


I love this. No more twiddling versions whenever we update the go major version.

mkeeler · 2024-01-12T14:33:30Z

internal/mesh/internal/controllers/sidecarproxy/builder/local_app.go

@@ -138,6 +138,7 @@ func destinationRulesByPort(allPorts []string, destinationRules []*pbauth.Destin
 	return out
 }

+//nolint:unparam


Just curious but why was this necessary. AFAICT allPorts and dr are both used in the function.

Or is the linter even smarter and figuring out that one of the two is always nil based on other code.

I believe the latter - that was my best explanation for why it suddenly started failing on the linter upgrade (same question you asked led me to notice the same)

curtbushko

Looks great!

zalimeni force-pushed the zalimeni/use-go-version-file branch from 35f9114 to 01567a7 Compare December 22, 2023 21:07

zalimeni force-pushed the zalimeni/use-go-version-file branch 4 times, most recently from d02fcc3 to 9379260 Compare January 3, 2024 17:18

zalimeni force-pushed the zalimeni/go-1.21 branch 2 times, most recently from 6e5b640 to 31ea777 Compare January 3, 2024 20:53

zalimeni commented Jan 3, 2024

View reviewed changes

Makefile

GOLANGCI_LINT_VERSION='v1.51.1'

GOLANGCI_LINT_VERSION='v1.55.2'

Copy link

Member Author

zalimeni Jan 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed for compatibility w/ Go 1.21

zalimeni force-pushed the zalimeni/go-1.21 branch from 31ea777 to 9d82e31 Compare January 3, 2024 21:12

zalimeni force-pushed the zalimeni/use-go-version-file branch from 9379260 to ea888cd Compare January 3, 2024 21:13

zalimeni force-pushed the zalimeni/go-1.21 branch 2 times, most recently from 238434e to 2006920 Compare January 3, 2024 21:33

zalimeni commented Jan 3, 2024

View reviewed changes

zalimeni force-pushed the zalimeni/go-1.21 branch 4 times, most recently from d25fe6c to eb9e190 Compare January 4, 2024 16:48

zalimeni changed the title ~~Upgrade Go to 1.21~~ [NET-4968] Upgrade Go to 1.21 Jan 5, 2024

Base automatically changed from zalimeni/use-go-version-file to main January 8, 2024 22:18

zalimeni force-pushed the zalimeni/go-1.21 branch from eb9e190 to f924a05 Compare January 9, 2024 20:57

zalimeni added backport/1.15 This release series is no longer active on CE. Use backport/ent/1.15. backport/1.16 This release series is no longer active on CE. Use backport/ent/1.16. backport/1.17 This release series is no longer active on CE. Use backport/ent/1.17. labels Jan 11, 2024

zalimeni force-pushed the zalimeni/go-1.21 branch from f924a05 to cdcac95 Compare January 12, 2024 01:29

Upgrade Go to 1.21

01ca961

zalimeni force-pushed the zalimeni/go-1.21 branch from cdcac95 to 01ca961 Compare January 12, 2024 01:30

zalimeni requested review from rboyer, curtbushko and mkeeler January 12, 2024 01:31

zalimeni marked this pull request as ready for review January 12, 2024 01:31

zalimeni commented Jan 12, 2024

View reviewed changes

ci: detect Go backwards compatibility test version automatically

e71ae3a

For our submodules and other places we choose to test against previous Go versions, detect this version automatically from the current one rather than hard-coding it.

zalimeni commented Jan 12, 2024

View reviewed changes

mkeeler reviewed Jan 12, 2024

View reviewed changes

mkeeler approved these changes Jan 12, 2024

View reviewed changes

curtbushko approved these changes Jan 12, 2024

View reviewed changes

zalimeni merged commit 76b5de5 into main Jan 12, 2024
92 checks passed

zalimeni deleted the zalimeni/go-1.21 branch January 12, 2024 14:57

This was referenced Jan 12, 2024

Backport of [NET-4968] Upgrade Go to 1.21 into release/1.15.x #20180

Merged

Backport of [NET-4968] Upgrade Go to 1.21 into release/1.16.x #20181

Merged

Backport of [NET-4968] Upgrade Go to 1.21 into release/1.17.x #20182

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NET-4968] Upgrade Go to 1.21 #20062

[NET-4968] Upgrade Go to 1.21 #20062

zalimeni commented Dec 22, 2023 •

edited

Loading

zalimeni Jan 3, 2024

zalimeni Jan 3, 2024

zalimeni Jan 12, 2024

zalimeni Jan 12, 2024 •

edited

Loading

mkeeler Jan 12, 2024

mkeeler Jan 12, 2024

mkeeler Jan 12, 2024

zalimeni Jan 12, 2024 •

edited

Loading

curtbushko left a comment

		GOLANGCI_LINT_VERSION='v1.51.1'
		GOLANGCI_LINT_VERSION='v1.55.2'

		@@ -0,0 +1,3 @@
		```release-note:improvement
		Upgrade to use Go 1.21.6.

[NET-4968] Upgrade Go to 1.21 #20062

[NET-4968] Upgrade Go to 1.21 #20062

Conversation

zalimeni commented Dec 22, 2023 • edited Loading

Description

Testing & Reproduction steps

PR Checklist

zalimeni Jan 3, 2024

Choose a reason for hiding this comment

zalimeni Jan 3, 2024

Choose a reason for hiding this comment

zalimeni Jan 12, 2024

Choose a reason for hiding this comment

zalimeni Jan 12, 2024 • edited Loading

Choose a reason for hiding this comment

mkeeler Jan 12, 2024

Choose a reason for hiding this comment

mkeeler Jan 12, 2024

Choose a reason for hiding this comment

mkeeler Jan 12, 2024

Choose a reason for hiding this comment

zalimeni Jan 12, 2024 • edited Loading

Choose a reason for hiding this comment

curtbushko left a comment

Choose a reason for hiding this comment

zalimeni commented Dec 22, 2023 •

edited

Loading

zalimeni Jan 12, 2024 •

edited

Loading

zalimeni Jan 12, 2024 •

edited

Loading