Skip to content

Commit ef3a5df

Browse files
morlaymorlay
committed
chore(dep): updates
1 parent 5cc4396 commit ef3a5df

File tree

5 files changed

+39
-62
lines changed

5 files changed

+39
-62
lines changed

‎go.mod‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,28 @@ tool (
1111

1212
require (
1313
github.com/go-courier/logr v0.3.2
14-
github.com/octohelm/gengo v0.0.0-20250711045910-061ca3315825
15-
github.com/octohelm/x v0.0.0-20250814014249-e79c91160fc4
14+
github.com/octohelm/gengo v0.0.0-20250905104150-5f9d079e202e
15+
github.com/octohelm/x v0.0.0-20250905103750-d1a271ae07dd
1616
)
1717

1818
require (
1919
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
2020
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b
2121
github.com/juju/ansiterm v1.0.0
2222
golang.org/x/net v0.43.0
23-
golang.org/x/sync v0.16.0
24-
k8s.io/apimachinery v0.33.4
23+
golang.org/x/sync v0.17.0
24+
k8s.io/apimachinery v0.34.0
2525
)
2626

2727
require (
2828
github.com/gogo/protobuf v1.3.2 // indirect
2929
github.com/google/go-cmp v0.7.0 // indirect
3030
github.com/lunixbochs/vtclean v1.0.0 // indirect
31-
github.com/mattn/go-colorable v0.1.14 // indirect
32-
github.com/mattn/go-isatty v0.0.20 // indirect
33-
github.com/onsi/gomega v1.38.0 // indirect
31+
github.com/mattn/go-colorable v0.1.10 // indirect
32+
github.com/mattn/go-isatty v0.0.14 // indirect
3433
golang.org/x/mod v0.27.0 // indirect
3534
golang.org/x/sys v0.35.0 // indirect
3635
golang.org/x/text v0.28.0 // indirect
3736
golang.org/x/tools v0.36.0 // indirect
38-
mvdan.cc/gofumpt v0.8.0 // indirect
37+
mvdan.cc/gofumpt v0.9.0 // indirect
3938
)

‎go.sum‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,12 @@ github.com/go-courier/logr v0.3.2 h1:zzh5t9BFtZ6IjALisEbWQy11WPMa259wgQRYM8K4fVc
44
github.com/go-courier/logr v0.3.2/go.mod h1:ojcyR9ttwhxczm8iABg/ekFwLlzvGaJVLyqWLhL7woM=
55
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU=
66
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
7-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
8-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
97
github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
108
github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
11-
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
12-
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
139
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
1410
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
1511
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1612
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
17-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
18-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
1913
github.com/juju/ansiterm v1.0.0 h1:gmMvnZRq7JZJx6jkfSq9/+2LMrVEwGwt7UR6G+lmDEg=
2014
github.com/juju/ansiterm v1.0.0/go.mod h1:PyXUpnI3olx3bsPcHt98FGPX/KCFZ1Fi+hw1XLI6384=
2115
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -29,27 +23,19 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
2923
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
3024
github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8=
3125
github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
26+
github.com/mattn/go-colorable v0.1.10 h1:KWqbp83oZ6YOEgIbNW3BM1Jbe2tz4jgmWA9FOuAF8bw=
3227
github.com/mattn/go-colorable v0.1.10/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
33-
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
34-
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
3528
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
29+
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
3630
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
37-
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
38-
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
39-
github.com/octohelm/gengo v0.0.0-20250711045910-061ca3315825 h1:AUrch0RlkzgB7DSwpWg4FqGEFG01jMMxM8FHd8OTFE4=
40-
github.com/octohelm/gengo v0.0.0-20250711045910-061ca3315825/go.mod h1:oQSj17xXy1mKdauQYRRuWsE3mqCCbQsCxRIQAaKdM5Q=
41-
github.com/octohelm/x v0.0.0-20250814014249-e79c91160fc4 h1:ugym4sFCqDzpMD+RHzfhoav8jH/2cDb/vVF8lUZ1TQU=
42-
github.com/octohelm/x v0.0.0-20250814014249-e79c91160fc4/go.mod h1:8K69M459Co+Li9SAq6joUlvlCsmCqk2HJhG7JJSnD+U=
43-
github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
44-
github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
45-
github.com/onsi/gomega v1.38.0 h1:c/WX+w8SLAinvuKKQFh77WEucCnPk4j2OTUr7lt7BeY=
46-
github.com/onsi/gomega v1.38.0/go.mod h1:OcXcwId0b9QsE7Y49u+BTrL4IdKOBOKnD6VQNTJEB6o=
31+
github.com/octohelm/gengo v0.0.0-20250905104150-5f9d079e202e h1:lhKkmWk3FLP1MS+EwJ6T+nMDdShsvvd9B8CQrBpEcys=
32+
github.com/octohelm/gengo v0.0.0-20250905104150-5f9d079e202e/go.mod h1:Uu4o1R2dlYWG4zwK0luZM7AOCkQy2oNwJG2ooCHy0e8=
33+
github.com/octohelm/x v0.0.0-20250905103750-d1a271ae07dd h1:R+jqiDdAWxe+F9ld5WLAXK9kCUBJDLmViov+P5VAerM=
34+
github.com/octohelm/x v0.0.0-20250905103750-d1a271ae07dd/go.mod h1:V0ZpkPrXZQIT8QUQwFM/tc021/aq/d/XljpUT7/H9OQ=
4735
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
4836
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
4937
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
5038
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
51-
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
52-
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
5339
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
5440
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
5541
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -66,15 +52,14 @@ golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
6652
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6753
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6854
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
69-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
70-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
55+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
56+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
7157
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
7258
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7359
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7460
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7561
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7662
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
77-
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
7863
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
7964
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
8065
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -93,9 +78,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
9378
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
9479
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
9580
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
96-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
97-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
98-
k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s=
99-
k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
100-
mvdan.cc/gofumpt v0.8.0 h1:nZUCeC2ViFaerTcYKstMmfysj6uhQrA2vJe+2vwGU6k=
101-
mvdan.cc/gofumpt v0.8.0/go.mod h1:vEYnSzyGPmjvFkqJWtXkh79UwPWP9/HMxQdGEXZHjpg=
81+
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
82+
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
83+
mvdan.cc/gofumpt v0.9.0 h1:W0wNHMSvDBDIyZsm3nnGbVfgp5AknzBrGJnfLCy501w=
84+
mvdan.cc/gofumpt v0.9.0/go.mod h1:3xYtNemnKiXaTh6R4VtlqDATFwBbdXI8lJvH/4qk7mw=

‎internal/testingutil/http_req.go‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package testingutil
22

33
import (
44
"bytes"
5-
"fmt"
65
"net/http"
76
"net/http/httputil"
87
"regexp"
@@ -24,26 +23,25 @@ type requestMatcher struct {
2423
func (m *requestMatcher) Match(req *http.Request) bool {
2524
raw, _ := httputil.DumpRequest(req, true)
2625
m.actual = unifyRequestData(raw)
27-
2826
return bytes.Equal(m.actual, m.expect)
2927
}
3028

29+
func (m *requestMatcher) Action() string {
30+
return "Be Request"
31+
}
32+
3133
func (m *requestMatcher) Negative() bool {
3234
return false
3335
}
3436

35-
func (m *requestMatcher) FormatActual(req *http.Request) string {
36-
fmt.Println(string(m.actual))
37-
37+
func (m *requestMatcher) NormalizeActual(req *http.Request) any {
3838
return string(m.actual)
3939
}
4040

41-
func (m *requestMatcher) FormatExpected() string {
42-
return string(m.expect)
43-
}
41+
var _ testingx.MatcherWithNormalizedExpected = &requestMatcher{}
4442

45-
func (m *requestMatcher) Name() string {
46-
return "Be Request"
43+
func (m *requestMatcher) NormalizedExpected() any {
44+
return string(m.expect)
4745
}
4846

4947
var reContentTypeWithBoundary = regexp.MustCompile(`Content-Type: multipart/form-data; boundary=([A-Za-z0-9]+)`)

‎internal/testingutil/http_resp.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package testingutil
33
import (
44
"bytes"
55
"context"
6-
"fmt"
76
"io/ioutil"
87
"net/http"
98
"net/http/httputil"
@@ -31,7 +30,7 @@ type responseMatcher struct {
3130
respData []byte
3231
}
3332

34-
func (r *responseMatcher) Name() string {
33+
func (r *responseMatcher) Action() string {
3534
return "Return When Request"
3635
}
3736

@@ -47,13 +46,13 @@ func (r *responseMatcher) Match(h http.Handler) bool {
4746
return bytes.Equal(r.respData, r.expect)
4847
}
4948

50-
func (r *responseMatcher) FormatActual(actual http.Handler) string {
51-
fmt.Println(string(r.respData))
52-
49+
func (r *responseMatcher) NormalizeActual(actual http.Handler) any {
5350
return string(r.respData)
5451
}
5552

56-
func (m *responseMatcher) FormatExpected() string {
53+
var _ testingx.MatcherWithNormalizedExpected = &responseMatcher{}
54+
55+
func (m *responseMatcher) NormalizedExpected() any {
5756
return string(m.expect)
5857
}
5958

‎internal/testingutil/json.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package testingutil
22

33
import (
44
"bytes"
5-
"fmt"
5+
"net/http"
66
"os"
77

88
"github.com/go-json-experiment/json"
@@ -26,6 +26,10 @@ type jsonMatcher[X any] struct {
2626
actual []byte
2727
}
2828

29+
func (m *jsonMatcher[X]) Action() string {
30+
return "Be JSON"
31+
}
32+
2933
func (m *jsonMatcher[X]) Match(v X) bool {
3034
m.actual, _ = json.Marshal(v)
3135

@@ -36,16 +40,10 @@ func (m *jsonMatcher[X]) Negative() bool {
3640
return false
3741
}
3842

39-
func (m *jsonMatcher[X]) FormatActual(x X) string {
40-
fmt.Println(string(m.actual))
41-
43+
func (m *jsonMatcher[X]) NormalizeActual(actual http.Handler) any {
4244
return string(m.actual)
4345
}
4446

45-
func (m *jsonMatcher[X]) FormatExpected() string {
47+
func (m *jsonMatcher[X]) NormalizedExpected() any {
4648
return string(m.expect)
4749
}
48-
49-
func (m *jsonMatcher[X]) Name() string {
50-
return "Be JSON"
51-
}

0 commit comments

Comments
 (0)