Merge remote-tracking branch 'upstream/main'

Author: mromaszewicz

.github/workflows/ci.yml

@@ -9,6 +9,7 @@ jobs:
   build:
     uses: oapi-codegen/actions/.github/workflows/ci.yml@75566d848d25021f137594c947f26171094fb511 # v0.5.0
     with:
+      excluding_versions: '["1.22", "1.23"]'
       lint_versions: '["1.25"]'
 
   build-binaries:
@@ -21,10 +22,10 @@ jobs:
           - "oldstable"
     steps:
       - name: Check out source code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Set up Go
-        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: ${{ matrix.version }}
 

.github/workflows/govulncheck.yml

@@ -29,7 +29,7 @@ jobs:
 
       # ... such as the Code Scanning tab (https://github.com/oapi-codegen/oapi-codegen/security/code-scanning?query=is%3Aopen+branch%3Amain+tool%3Agovulncheck)
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
         with:
           sarif_file: govulncheck.sarif
           category: govulncheck

.github/workflows/label-actions.yml

@@ -18,6 +18,6 @@ jobs:
   reaction:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/label-actions@102faf474a544be75fbaf4df54e73d3c515a0e65 # v4.0.1
+      - uses: dessant/label-actions@9e5fd757ffe1e065abf55e9f74d899dbe012922a # v5.0.0
         with:
           github-token: ${{ github.token }}

.github/workflows/release-drafter.yml

@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
+      - uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6.2.0
         with:
           name: next
           tag: next

.github/workflows/scorecard.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
           show-progress: false
@@ -33,14 +33,14 @@ jobs:
           publish_results: true
 
       - name: "Upload artifact"
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
         with:
           sarif_file: results.sarif

Makefile

@@ -10,7 +10,7 @@ help:
 	@echo "    lint         lint the project"
 
 $(GOBIN)/golangci-lint:
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.6.0
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v2.10.1
 
 .PHONY: tools
 tools: $(GOBIN)/golangci-lint

README.md

@@ -50,8 +50,6 @@ go install github.com/oapi-codegen/oapi-codegen-exp/v2/cmd/oapi-codegen@latest
 
 ## Install
 
-### For Go 1.24+
-
 It is recommended to follow [the `go tool` support available from Go 1.24+](https://www.jvt.me/posts/2025/01/27/go-tools-124/) for managing the dependency of `oapi-codegen` alongside your core application.
 
 To do this, you run `go get -tool`:
@@ -67,29 +65,6 @@ From there, each invocation of `oapi-codegen` would be used like so:
 //go:generate go tool oapi-codegen -config cfg.yaml ../../api.yaml
 ```
 
-### Prior to Go 1.24
-
-It is recommended to follow [the `tools.go` pattern](https://www.jvt.me/posts/2022/06/15/go-tools-dependency-management/) for managing the dependency of `oapi-codegen` alongside your core application.
-
-This would give you a `tools/tools.go`:
-
-```go
-//go:build tools
-// +build tools
-
-package main
-
-import (
-	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
-)
-```
-
-Then, each invocation of `oapi-codegen` would be used like so:
-
-```go
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml
-```
-
 Alternatively, you can install it as a binary with:
 
 ```sh
@@ -145,11 +120,13 @@ For full details of what is supported, it's worth checking out [the GoDoc for `c
 We also have [a JSON Schema](configuration-schema.json) that can be used by IDEs/editors with the Language Server Protocol (LSP) to perform intelligent suggestions, i.e.:
 
 ```yaml
-# yaml-language-server: $schema=https://raw.githubusercontent.com/oapi-codegen/oapi-codegen/HEAD/configuration-schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/oapi-codegen/oapi-codegen/v2.6.0/configuration-schema.json
 package: api
 # ...
 ```
 
+Note that it's recommended to pin to a specific version of the configuration schema, so it matches the version of `oapi-codegen` you're using. For instance, if you're using [Renovate](https://docs.renovatebot.com/), you can [have Renovate automagically update this version for you](https://www.jvt.me/posts/2026/03/01/oapi-codegen-config-renovate/).
+
 ### Backwards compatibility
 
 Although we strive to retain backwards compatibility - as a project that's using a stable API per SemVer - there are sometimes opportunities we must take to fix a bug that could cause a breaking change for [people relying upon the behaviour](https://xkcd.com/1172/).
@@ -3452,6 +3429,8 @@ It is also possible to use HTTPS URLs.
 >
 > See [this blog post](https://www.jvt.me/posts/2024/04/27/github-actions-update-file/) for an example of how to use GitHub Actions to manage the updates of files across repos
 >
+> See [this blog post](https://www.jvt.me/posts/2026/02/27/renovate-update-file) for an example of how to use Renovate to manage the updates of files across repos
+>
 > This will be disabled by default (but possible to turn back on via configuration) [in the future](https://github.com/oapi-codegen/oapi-codegen/issues/1564)
 
 To use it, you can use the following configuration:

configuration-schema.json

@@ -255,7 +255,7 @@
         },
         "resolve-type-name-collisions": {
           "type": "boolean",
-          "description": "When set to true, automatically renames types that collide across different OpenAPI component sections (schemas, parameters, requestBodies, responses, headers) by appending a suffix based on the component section (e.g., 'Parameter', 'Response', 'RequestBody'). Without this, the codegen will error on duplicate type names, requiring manual resolution via x-go-name.",
+          "description": "When set to true, automatically renames types that collide across different OpenAPI component sections (schemas, parameters, requestBodies, responses, headers) by appending a suffix based on the component section. Also detects collisions between component types and client response wrapper types. Without this, the codegen will error on duplicate type names, requiring manual resolution via x-go-name.",
           "default": false
         },
         "type-mapping": {

examples/authenticated-api/echo/main.go

@@ -6,7 +6,6 @@ import (
 	"net"
 
 	"github.com/labstack/echo/v4"
-	"github.com/labstack/echo/v4/middleware"
 	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api"
 	"github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/server"
 )
@@ -28,7 +27,6 @@ func main() {
 	if err != nil {
 		log.Fatalln("error creating middleware:", err)
 	}
-	e.Use(middleware.Logger())
 	e.Use(mw...)
 
 	svr := server.NewServer()

examples/authenticated-api/stdhttp/Makefile

@@ -1,36 +1,17 @@
-SHELL:=/bin/bash
-
-YELLOW := \e[0;33m
-RESET := \e[0;0m
-
-GOVER := $(shell go env GOVERSION)
-GOMINOR := $(shell bash -c "cut -f1 -d' ' <<< \"$(GOVER)\" | cut -f2 -d.")
-
-define execute-if-go-122
-@{ \
-if [[ 22 -le $(GOMINOR) ]]; then \
-	$1; \
-else \
-	echo -e "$(YELLOW)Skipping task as you're running Go v1.$(GOMINOR).x which is < Go 1.22, which this module requires$(RESET)"; \
-fi \
-}
-endef
-
 lint:
-	$(call execute-if-go-122,$(GOBIN)/golangci-lint run ./...)
+	$(GOBIN)/golangci-lint run ./...
 
 lint-ci:
-
-	$(call execute-if-go-122,$(GOBIN)/golangci-lint run ./... --output.text.path=stdout --timeout=5m)
+	$(GOBIN)/golangci-lint run ./... --output.text.path=stdout --timeout=5m
 
 generate:
-	$(call execute-if-go-122,go generate ./...)
+	go generate ./...
 
 test:
-	$(call execute-if-go-122,go test -cover ./...)
+	go test -cover ./...
 
 tidy:
-	$(call execute-if-go-122,go mod tidy)
+	go mod tidy
 
 tidy-ci:
-	$(call execute-if-go-122,tidied -verbose)
+	tidied -verbose