build: bump oapi-codegen to 2.4.1

.gitignore

@@ -11,3 +11,4 @@ dnf-json
 local.env
 __debug*
 coverage*
+/bin

internal/clients/composer/package.go

@@ -1,4 +1,4 @@
-//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.3.0 --config client.cfg.yaml openapi.v2.yml
+//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1 --config client.cfg.yaml openapi.v2.yml
 
 // Generated OpenAPI clients for the Composer service.
 package composer

internal/clients/content_sources/package.go

@@ -1,4 +1,4 @@
-//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.3.0 --config client.cfg.yaml content-sources.v1.json
+//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1 --config client.cfg.yaml content-sources.v1.json
 
 // Generated OpenAPI clients for the Content Sources service.
 package content_sources

internal/clients/provisioning/package.go

@@ -1,4 +1,4 @@
-//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.3.0 --config client.cfg.yml provisioning.v1.yml
+//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1 --config client.cfg.yml provisioning.v1.yml
 
 // Generated OpenAPI clients for the Provisioning service.
 package provisioning

internal/clients/recommendations/package.go

@@ -1,2 +1,2 @@
-//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.3.0 --config client.cfg.yml recommendations.v3.json
+//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1 --config client.cfg.yml recommendations.v3.json
 package recommendations

internal/v1/server.go

@@ -1,4 +1,4 @@
-//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.3.0 --config server.cfg.yaml api.yaml
+//go:generate go run -mod=mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.4.1 --config server.cfg.yaml api.yaml
 package v1
 
 import (

tools/prepare-source.sh

@@ -2,20 +2,20 @@
 set -eux
 
 GO_VERSION=1.21.9
+OAPI_VERSION=2.4.1
+
 GO_BINARY=$(go env GOPATH)/bin/go$GO_VERSION
-OAPI_VERSION=2.3.0
+TOOLS_PATH="$(realpath $(dirname "$0")/../bin)"
 
-# this is the official way to get a different version of golang
-# see https://go.dev/doc/manage-install
+# Install Go SDK
 go install golang.org/dl/go$GO_VERSION@latest
 $GO_BINARY download
 
 # Ensure dev tools are installed
-which goimports || $GO_BINARY install golang.org/x/tools/cmd/goimports@latest
+which goimports >/dev/null || GOBIN=$TOOLS_PATH $GO_BINARY install golang.org/x/tools/cmd/goimports@latest
+("$TOOLS_PATH/oapi-codegen" -version | grep "$OAPI_VERSION" >/dev/null) || GOBIN=$TOOLS_PATH $GO_BINARY install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v$OAPI_VERSION
 
-# Ensure that all code has been regenerated from its sources with the pinned oapi version
-git grep -l "go:generate.*github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" | grep -v prepare-source.sh | xargs sed -i "s|github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen[[email protected]]*|github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v$OAPI_VERSION|g"
-$GO_BINARY generate -mod=mod ./...
+GOBIN=$TOOLS_PATH $GO_BINARY generate -x -mod=mod ./...
 
 # ... the code is formatted correctly, ...
 goimports -w internal cmd