starred/godoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-23 09:18:51 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor(errors): simplify gperr.Builder usage

Browse Source
This commit is contained in:
yusing
2025-10-09 00:28:22 +08:00
parent bb5f0cdf09
commit d08be872a0
8 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/net/gphttp/middleware/cidr_whitelist_test.go
View File

@@ -62,7 +62,7 @@ func TestCIDRWhitelistValidation(t *testing.T) {
func TestCIDRWhitelist(t *testing.T) {
errs := gperr.NewBuilder("")
mids := BuildMiddlewaresFromYAML("", testCIDRWhitelistCompose, errs)
mids := BuildMiddlewaresFromYAML("", testCIDRWhitelistCompose, &errs)
expect.NoError(t, errs.Error())
deny = mids["deny@file"]
accept = mids["accept@file"]

2
internal/net/gphttp/middleware/middleware_builder_test.go
View File

@@ -14,7 +14,7 @@ var testMiddlewareCompose []byte
func TestBuild(t *testing.T) {
errs := gperr.NewBuilder("")
middlewares := BuildMiddlewaresFromYAML("", testMiddlewareCompose, errs)
middlewares := BuildMiddlewaresFromYAML("", testMiddlewareCompose, &errs)
expect.NoError(t, errs.Error())
expect.Must(json.MarshalIndent(middlewares, "", " "))
// t.Log(string(data))

4
internal/net/gphttp/middleware/middlewares.go
View File

@@ -73,7 +73,7 @@ func LoadComposeFiles() {
}
for _, defFile := range middlewareDefs {
voidErrs := gperr.NewBuilder("") // ignore these errors, will be added in next step
mws := BuildMiddlewaresFromComposeFile(defFile, voidErrs)
mws := BuildMiddlewaresFromComposeFile(defFile, &voidErrs)
if len(mws) == 0 {
continue
}
@@ -92,7 +92,7 @@ func LoadComposeFiles() {
}
// build again to resolve cross references
for _, defFile := range middlewareDefs {
mws := BuildMiddlewaresFromComposeFile(defFile, errs)
mws := BuildMiddlewaresFromComposeFile(defFile, &errs)
if len(mws) == 0 {
continue
}