Skip to content

Commit 065047c

Browse files
mromaszewiczmromaszewicz
committed
Update Fiber in test issue
Contain Fiber to its own module in test for Issue 1469
1 parent 48473f3 commit 065047c

File tree

5 files changed

+283
-16
lines changed

5 files changed

+283
-16
lines changed

‎internal/test/go.mod‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/getkin/kin-openapi v0.133.0
99
github.com/gin-gonic/gin v1.9.1
1010
github.com/go-chi/chi/v5 v5.0.10
11-
github.com/gofiber/fiber/v2 v2.49.1
1211
github.com/google/uuid v1.4.0
1312
github.com/gorilla/mux v1.8.1
1413
github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9
@@ -65,7 +64,6 @@ require (
6564
github.com/mailru/easyjson v0.7.7 // indirect
6665
github.com/mattn/go-colorable v0.1.13 // indirect
6766
github.com/mattn/go-isatty v0.0.19 // indirect
68-
github.com/mattn/go-runewidth v0.0.15 // indirect
6967
github.com/microcosm-cc/bluemonday v1.0.25 // indirect
7068
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7169
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -75,7 +73,6 @@ require (
7573
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
7674
github.com/perimeterx/marshmallow v1.1.5 // indirect
7775
github.com/pmezard/go-difflib v1.0.0 // indirect
78-
github.com/rivo/uniseg v0.4.4 // indirect
7976
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8077
github.com/schollz/closestmatch v2.1.0+incompatible // indirect
8178
github.com/sirupsen/logrus v1.8.1 // indirect
@@ -87,9 +84,7 @@ require (
8784
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
8885
github.com/ugorji/go/codec v1.2.11 // indirect
8986
github.com/valyala/bytebufferpool v1.0.0 // indirect
90-
github.com/valyala/fasthttp v1.49.0 // indirect
9187
github.com/valyala/fasttemplate v1.2.2 // indirect
92-
github.com/valyala/tcplisten v1.0.0 // indirect
9388
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
9489
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
9590
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect

‎internal/test/go.sum‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
7878
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
7979
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
8080
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
81-
github.com/gofiber/fiber/v2 v2.49.1 h1:0W2DRWevSirc8pJl4o8r8QejDR8TV6ZUCawHxwbIdOk=
82-
github.com/gofiber/fiber/v2 v2.49.1/go.mod h1:nPUeEBUeeYGgwbDm59Gp7vS8MDyScL6ezr/Np9A13WU=
8381
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
8482
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
8583
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -168,8 +166,6 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
168166
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
169167
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
170168
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
171-
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
172-
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
173169
github.com/microcosm-cc/bluemonday v1.0.25 h1:4NEwSfiJ+Wva0VxN5B8OwMicaJvD8r9tlJWm9rtloEg=
174170
github.com/microcosm-cc/bluemonday v1.0.25/go.mod h1:ZIOjCQp1OrzBBPIJmfX4qDYFuhU02nx4bn030ixfHLE=
175171
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
@@ -213,9 +209,6 @@ github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX
213209
github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
214210
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
215211
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
216-
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
217-
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
218-
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
219212
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
220213
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
221214
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -263,13 +256,9 @@ github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4d
263256
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
264257
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
265258
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
266-
github.com/valyala/fasthttp v1.49.0 h1:9FdvCpmxB74LH4dPb7IJ1cOSsluR07XG3I1txXWwJpE=
267-
github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA=
268259
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
269260
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
270261
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
271-
github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
272-
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
273262
github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
274263
github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
275264
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=

‎internal/test/issues/issue1469/Makefile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
SHELL:=/bin/bash
2+
3+
YELLOW := \e[0;33m
4+
RESET := \e[0;0m
5+
6+
GOVER := $(shell go env GOVERSION)
7+
GOMINOR := $(shell bash -c "cut -f1 -d' ' <<< \"$(GOVER)\" | cut -f2 -d.")
8+
9+
define execute-if-go-124
10+
@{ \
11+
if [[ 24 -le $(GOMINOR) ]]; then \
12+
$1; \
13+
else \
14+
echo -e "$(YELLOW)Skipping task as you're running Go v1.$(GOMINOR).x which is < Go 1.24, which this module requires$(RESET)"; \
15+
fi \
16+
}
17+
endef
18+
19+
lint:
20+
$(call execute-if-go-124,$(GOBIN)/golangci-lint run ./...)
21+
22+
lint-ci:
23+
24+
$(call execute-if-go-124,$(GOBIN)/golangci-lint run ./... --output.text.path=stdout --timeout=5m)
25+
26+
generate:
27+
$(call execute-if-go-124,go generate ./...)
28+
29+
test:
30+
$(call execute-if-go-124,go test -cover ./...)
31+
32+
tidy:
33+
$(call execute-if-go-124,go mod tidy)
34+
35+
tidy-ci:
36+
$(call execute-if-go-124,tidied -verbose)

‎internal/test/issues/issue1469/go.mod‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
module github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue1469
2+
3+
go 1.24.0
4+
5+
replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../../
6+
7+
tool github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
8+
9+
require (
10+
github.com/gofiber/fiber/v2 v2.52.11
11+
github.com/stretchr/testify v1.11.1
12+
)
13+
14+
require (
15+
github.com/andybalholm/brotli v1.1.0 // indirect
16+
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
18+
github.com/getkin/kin-openapi v0.133.0 // indirect
19+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
20+
github.com/go-openapi/swag v0.23.0 // indirect
21+
github.com/google/uuid v1.6.0 // indirect
22+
github.com/josharian/intern v1.0.0 // indirect
23+
github.com/klauspost/compress v1.17.9 // indirect
24+
github.com/mailru/easyjson v0.7.7 // indirect
25+
github.com/mattn/go-colorable v0.1.13 // indirect
26+
github.com/mattn/go-isatty v0.0.20 // indirect
27+
github.com/mattn/go-runewidth v0.0.16 // indirect
28+
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
29+
github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 // indirect
30+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
31+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
32+
github.com/perimeterx/marshmallow v1.1.5 // indirect
33+
github.com/pmezard/go-difflib v1.0.0 // indirect
34+
github.com/rivo/uniseg v0.2.0 // indirect
35+
github.com/speakeasy-api/jsonpath v0.6.0 // indirect
36+
github.com/speakeasy-api/openapi-overlay v0.10.2 // indirect
37+
github.com/valyala/bytebufferpool v1.0.0 // indirect
38+
github.com/valyala/fasthttp v1.51.0 // indirect
39+
github.com/valyala/tcplisten v1.0.0 // indirect
40+
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
41+
github.com/woodsbury/decimal128 v1.3.0 // indirect
42+
golang.org/x/mod v0.23.0 // indirect
43+
golang.org/x/sync v0.11.0 // indirect
44+
golang.org/x/sys v0.30.0 // indirect
45+
golang.org/x/text v0.20.0 // indirect
46+
golang.org/x/tools v0.30.0 // indirect
47+
gopkg.in/yaml.v2 v2.4.0 // indirect
48+
gopkg.in/yaml.v3 v3.0.1 // indirect
49+
)

0 commit comments

Comments
 (0)