build(go): bump golang, build with 1.22, support 1.20+

Signed-off-by: Stephan Renatus <stephan@styra.com>
open-policy-agent · Feb 20, 2024 · f559627 · f559627
1 parent 0d70329
commit f559627
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 154 deletions.
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -292,7 +292,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, macos-latest]
-        version: ["1.19"]
+        version: ["1.20"]
     steps:
       - uses: actions/checkout@v4
       - name: Download generated artifacts

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.21.5
+1.22
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/open-policy-agent/opa
 
-go 1.19
+go 1.20
 
 require (
 	github.com/OneOfOne/xxhash v1.2.8

diff --git a/internal/prometheus/prometheus_go1.19_test.go b/internal/prometheus/prometheus_go1.19_test.go
diff --git a/topdown/tokens_test.go b/topdown/tokens_test.go
@@ -10,7 +10,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -472,12 +471,7 @@ func TestTopdownJWTEncodeSignECWithSeedReturnsSameSignature(t *testing.T) {
 	   "d":"jpsQnnGQmL-YBIffH1136cspYG6-0iY7X1fCE9-E9LI"
 	  }, x)`
 
-	// go1.20 and beyond
 	encodedSigned := "eyJhbGciOiAiRVMyNTYifQ.eyJwYXkiOiAibG9hZCJ9.GRp6wIqDZuYnvQH50hnIy559LdrjUux76v1ynxX6lH0XtlgwreyR16x2JMnuElo79X3zUbqlWrZITICv86arew"
-	if strings.HasPrefix(runtime.Version(), "go1.19") { // we don't use go1.18 anymore
-		encodedSigned = "eyJhbGciOiAiRVMyNTYifQ.eyJwYXkiOiAibG9hZCJ9.05wmHY3NomU1jr7yvusBvKwhthRklPuJhUPOkoeIn5e5n_GXvE25EfRs9AJK2wOy6NoY2ljhj07M9BMtV0dfyA"
-	}
-
 	for i := 0; i < 10; i++ {
 		q := NewQuery(ast.MustParseBody(query)).
 			WithSeed(&cng{}).