Merge branch 'master' into INFRANG-6880

Author: ChrisScotMartin

.circleci/config.yml

@@ -26,6 +26,9 @@ jobs:
       - run: make install_deps
       - run: make build
       - run: sudo npm install -g jsdoc-to-markdown@^4.0.0
+      - run:
+          name: vet
+          command: go vet -mod=readonly $(go list ./...)
       - run: make test
       - run: if [ "${CIRCLE_BRANCH}" == "master" ]; then make release && $HOME/ci-scripts/circleci/submodule-github-release $GH_RELEASE_TOKEN clientconfig; fi;
       - run: if [ "${CIRCLE_BRANCH}" == "master" ]; then make release && $HOME/ci-scripts/circleci/submodule-github-release $GH_RELEASE_TOKEN logging/wagclientlogger; fi;

VERSION

@@ -1,8 +1,11 @@
-v9.7.0
-Go 1.24 upgrade
+v9.7.1
+Downgrade generated modules and submodules to 1.21 until every wag service is upgraded
 
 Previously:
 
+v9.7.0
+Go 1.24 upgrade
+
 v9.6.0
 remove hystrix-go dependency from wag go clients, fix some tests.
 

clientconfig/go.mod

@@ -1,6 +1,6 @@
 module github.com/Clever/wag/clientconfig/v9
 
-go 1.24
+go 1.21
 
 require (
 	github.com/Clever/kayvee-go/v7 v7.7.0

clients/go/gengo.go

@@ -207,7 +207,7 @@ func CreateModFile(path string, basePath string, codeTemplate clientCodeTemplate
 	modFileString := `
 module ` + codeTemplate.ModuleName + codeTemplate.OutputPath + `/client` + codeTemplate.VersionSuffix + `
 
-go 1.24
+go 1.21
 
 require (
 	github.com/Clever/discovery-go v1.8.1

logging/wagclientlogger/go.mod

@@ -1,3 +1,3 @@
 module github.com/Clever/wag/logging/wagclientlogger
 
-go 1.24
+go 1.21

models/genmodels.go

@@ -73,7 +73,7 @@ func CreateModFile(path string, basePath, packageName, outputPath string) error
 module ` + moduleName + outputPath + `/models` + versionSuffix + `
 
 
-go 1.24
+go 1.21
 
 require (
 	github.com/go-openapi/errors v0.20.2

samples/gen-go-basic/client/go.mod

@@ -1,6 +1,6 @@
 module github.com/Clever/wag/tracing
 
-go 1.24
+go 1.21
 
 require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 // indirect