upgrade go version to 1.21 (#306)

* upgrade go version to `1.21` * changelogs * changelog
patrickcping · Dec 29, 2023 · 065438b · 065438b
1 parent 36393cb
commit 065438b
Show file tree

Hide file tree

Showing 41 changed files with 96 additions and 65 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,12 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.1
+      uses: actions/checkout@v4
+
+    - name: Install Go
+      uses: actions/setup-go@v4
+      with:
+        go-version-file: go.mod
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,35 @@
 # Release (Unreleased)
 
 * `github.com/patrickcping/pingone-go-sdk-v2` : v0.11.4
+    * **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
+    * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+* `github.com/patrickcping/pingone-go-sdk-v2/agreementmanagement` : [v0.3.1](./agreementmanagement/CHANGELOG.md)
+    * **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
+    * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+    * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+* `github.com/patrickcping/pingone-go-sdk-v2/authorize` : [v0.4.1](./authorize/CHANGELOG.md)
+    * **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
+    * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+    * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+* `github.com/patrickcping/pingone-go-sdk-v2/credentials` : [v0.6.2](./credentials/CHANGELOG.md)
+    * **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
+    * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+    * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+* `github.com/patrickcping/pingone-go-sdk-v2/management` : [v0.34.1](./management/CHANGELOG.md)
+    * **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
+    * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+    * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+* `github.com/patrickcping/pingone-go-sdk-v2/mfa` : [v0.18.3](./mfa/CHANGELOG.md)
+    * **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
+    * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+    * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+* `github.com/patrickcping/pingone-go-sdk-v2/risk` : [v0.12.2](./risk/CHANGELOG.md)
+    * **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
+    * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+    * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
+* `github.com/patrickcping/pingone-go-sdk-v2/verify` : [v0.4.1](./verify/CHANGELOG.md)
+    * **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
+    * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
     * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 
 # Release (2023-12-27)

diff --git a/agreementmanagement/CHANGELOG.md b/agreementmanagement/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v0.3.1 (Unreleased)
 
+* **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
 * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 

diff --git a/agreementmanagement/client_ext.go b/agreementmanagement/client_ext.go
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 type SDKInterfaceFunc func() (any, *http.Response, error)

diff --git a/agreementmanagement/go.mod b/agreementmanagement/go.mod
@@ -1,5 +1,3 @@
 module github.com/patrickcping/pingone-go-sdk-v2/agreementmanagement
 
-go 1.18
-
-require golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
+go 1.21
diff --git a/agreementmanagement/go.sum b/agreementmanagement/go.sum
@@ -1,2 +0,0 @@
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=

diff --git a/authorize/CHANGELOG.md b/authorize/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v0.4.1 (Unreleased)
 
+* **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
 * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 

diff --git a/authorize/client_ext.go b/authorize/client_ext.go
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 type SDKInterfaceFunc func() (any, *http.Response, error)

diff --git a/authorize/go.mod b/authorize/go.mod
@@ -1,5 +1,3 @@
 module github.com/patrickcping/pingone-go-sdk-v2/authorize
 
-go 1.18
-
-require golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
+go 1.21
diff --git a/authorize/go.sum b/authorize/go.sum
@@ -1,2 +0,0 @@
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=

diff --git a/credentials/CHANGELOG.md b/credentials/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v0.6.2 (Unreleased)
 
+* **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
 * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 

diff --git a/credentials/client_ext.go b/credentials/client_ext.go
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 type SDKInterfaceFunc func() (any, *http.Response, error)

diff --git a/credentials/go.mod b/credentials/go.mod
@@ -1,11 +1,8 @@
 module github.com/patrickcping/pingone-go-sdk-v2/credentials
 
-go 1.18
+go 1.21
 
-require (
-	github.com/stretchr/testify v1.8.4
-	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
-)
+require github.com/stretchr/testify v1.8.4
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect

diff --git a/credentials/go.sum b/credentials/go.sum
@@ -4,8 +4,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/patrickcping/pingone-go-sdk-v2
 
-go 1.20
+go 1.21
 
 require (
 	github.com/patrickcping/pingone-go-sdk-v2/agreementmanagement v0.3.0
@@ -10,12 +10,12 @@ require (
 	github.com/patrickcping/pingone-go-sdk-v2/mfa v0.18.2
 	github.com/patrickcping/pingone-go-sdk-v2/risk v0.12.1
 	github.com/patrickcping/pingone-go-sdk-v2/verify v0.4.0
-	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
 	golang.org/x/oauth2 v0.15.0
 )
 
 require (
 	github.com/golang/protobuf v1.5.3 // indirect
+	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
 	golang.org/x/net v0.19.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect

diff --git a/go.sum b/go.sum
@@ -4,6 +4,7 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/patrickcping/pingone-go-sdk-v2/agreementmanagement v0.3.0 h1:1q0mSmaqukeieFXy2uYB4DDVTE0Jl6/+DIvxwrLIjBI=
 github.com/patrickcping/pingone-go-sdk-v2/agreementmanagement v0.3.0/go.mod h1:tq8S1tyW9yYipql5KFhdEWmMZo8rMbkVAmVJ8/TcB7M=
 github.com/patrickcping/pingone-go-sdk-v2/authorize v0.4.0 h1:OwtWDa+HIblEH1sHSqK6m73XWMlc7O3OMLvPrl5zJLk=

diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.20
+go 1.21
 
 use (
     ./

diff --git a/management/CHANGELOG.md b/management/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v0.34.1 (Unreleased)
 
+* **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
 * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 

diff --git a/management/client_ext.go b/management/client_ext.go
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 type SDKInterfaceFunc func() (any, *http.Response, error)

diff --git a/management/go.mod b/management/go.mod
@@ -1,5 +1,3 @@
 module github.com/patrickcping/pingone-go-sdk-v2/management
 
-go 1.18
-
-require golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
+go 1.21
diff --git a/management/go.sum b/management/go.sum
@@ -1,2 +0,0 @@
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=

diff --git a/mfa/CHANGELOG.md b/mfa/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v0.18.3 (Unreleased)
 
+* **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
 * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 

diff --git a/mfa/client_ext.go b/mfa/client_ext.go
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 type SDKInterfaceFunc func() (any, *http.Response, error)

diff --git a/mfa/go.mod b/mfa/go.mod
@@ -1,5 +1,3 @@
 module github.com/patrickcping/pingone-go-sdk-v2/mfa
 
-go 1.18
-
-require golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
+go 1.21
diff --git a/mfa/go.sum b/mfa/go.sum
@@ -1,2 +0,0 @@
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=

diff --git a/pingone/config.go b/pingone/config.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 	"regexp"
+	"slices"
 	"strings"
 
 	"github.com/patrickcping/pingone-go-sdk-v2/pingone/model"
-	"golang.org/x/exp/slices"
 	"golang.org/x/oauth2"
 )
 

diff --git a/pingone/model/product.go b/pingone/model/product.go
@@ -2,10 +2,10 @@ package model
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 
 	"github.com/patrickcping/pingone-go-sdk-v2/management"
-	"golang.org/x/exp/slices"
 )
 
 type ProductMapping struct {

diff --git a/pingone/model/region.go b/pingone/model/region.go
@@ -2,10 +2,9 @@ package model
 
 import (
 	"log"
+	"slices"
 	"sort"
 
-	"golang.org/x/exp/slices"
-
 	"github.com/patrickcping/pingone-go-sdk-v2/management"
 )
 

diff --git a/risk/CHANGELOG.md b/risk/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v0.12.2 (Unreleased)
 
+* **Note** Upgrade GO to `v1.21` [#306](https://github.com/patrickcping/pingone-go-sdk-v2/pull/306)
 * **Note** Updated the default UserAgent string format. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 * **Enhancement** Add ability to append custom user-agent information to HTTP requests. [#305](https://github.com/patrickcping/pingone-go-sdk-v2/pull/305)
 

diff --git a/risk/client_ext.go b/risk/client_ext.go
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 type SDKInterfaceFunc func() (any, *http.Response, error)

diff --git a/risk/go.mod b/risk/go.mod
@@ -1,5 +1,3 @@
 module github.com/patrickcping/pingone-go-sdk-v2/risk
 
-go 1.18
-
-require golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
+go 1.21
diff --git a/risk/go.sum b/risk/go.sum
@@ -1,2 +0,0 @@
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b h1:kLiC65FbiHWFAOu+lxwNPujcsl8VYyTYYEZnsOO1WK4=
-golang.org/x/exp v0.0.0-20231226003508-02704c960a9b/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=

diff --git a/scripts/client_ext.go.tmpl b/scripts/client_ext.go.tmpl
@@ -6,11 +6,10 @@ import (
 	"net/http"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 type SDKInterfaceFunc func() (any, *http.Response, error)

diff --git a/scripts/generate-module.sh b/scripts/generate-module.sh
@@ -13,9 +13,6 @@ else
         echo "==> Running codegen-$3..."
         openapi-generator-cli version-manager set 7.0.1
         openapi-generator-cli generate -i generate/pingone-$3.yml -g go --additional-properties=packageName=$3,packageVersion=$version,isGoSubmodule=true,enumClassPrefix=true,apiNameSuffix=Api -o . --git-repo-id $2 --git-user-id $1 --http-user-agent \"pingtools PingOne-GOLANG-SDK-$3/$version\"; \
-        go get -u ./...
-        go mod tidy
-        go mod vendor
 
         echo "==> Copying custom templated files..."
         template=$(cat ../scripts/client_ext.go.tmpl)
@@ -28,6 +25,10 @@ else
         echo "==> Applying module specific postprocessing..."
         go run generate/postprocessing/generate-replace-regex.go .
 
+        go get -u ./...
+        go mod tidy
+        go mod vendor
+
     else \
         echo "pingone-$3.yml missing.  Skipping"; \
     fi

diff --git a/scripts/generate-replace-regex.go b/scripts/generate-replace-regex.go
@@ -50,6 +50,12 @@ var (
 		repl              string
 	}{
 
+		{
+			fileSelectPattern: "go.mod",
+			pattern:           `go 1.18`,
+			repl:              `go 1.21`,
+		},
+
 		/////////////////////////
 		// ALL configuration.go
 		/////////////////////////

diff --git a/tools/go.mod b/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/patrickcping/pingone-go-sdk-v2/tools
 
-go 1.20
+go 1.21
 
 require (
 	github.com/golangci/golangci-lint v1.55.1