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

chore: apply golangci-lint fmt

Browse Source
This commit is contained in:
yusing
2026-02-21 12:56:51 +08:00
parent ee973f7997
commit dea37a437b
14 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/autocert/config.go
View File

@@ -23,33 +23,35 @@ import (
strutils "github.com/yusing/goutils/strings"
)
type ConfigExtra Config
type Config struct {
Email string `json:"email,omitempty"`
Domains []string `json:"domains,omitempty"`
CertPath string `json:"cert_path,omitempty"`
KeyPath string `json:"key_path,omitempty"`
Extra []ConfigExtra `json:"extra,omitempty"`
ACMEKeyPath string `json:"acme_key_path,omitempty"` // shared by all extra providers with the same CA directory URL
Provider string `json:"provider,omitempty"`
Options map[string]strutils.Redacted `json:"options,omitempty"`
type (
ConfigExtra Config
Config struct {
Email string `json:"email,omitempty"`
Domains []string `json:"domains,omitempty"`
CertPath string `json:"cert_path,omitempty"`
KeyPath string `json:"key_path,omitempty"`
Extra []ConfigExtra `json:"extra,omitempty"`
ACMEKeyPath string `json:"acme_key_path,omitempty"` // shared by all extra providers with the same CA directory URL
Provider string `json:"provider,omitempty"`
Options map[string]strutils.Redacted `json:"options,omitempty"`
Resolvers []string `json:"resolvers,omitempty"`
Resolvers []string `json:"resolvers,omitempty"`
// Custom ACME CA
CADirURL string `json:"ca_dir_url,omitempty"`
CACerts []string `json:"ca_certs,omitempty"`
// Custom ACME CA
CADirURL string `json:"ca_dir_url,omitempty"`
CACerts []string `json:"ca_certs,omitempty"`
// EAB
EABKid string `json:"eab_kid,omitempty" validate:"required_with=EABHmac"`
EABHmac string `json:"eab_hmac,omitempty" validate:"required_with=EABKid"` // base64 encoded
// EAB
EABKid string `json:"eab_kid,omitempty" validate:"required_with=EABHmac"`
EABHmac string `json:"eab_hmac,omitempty" validate:"required_with=EABKid"` // base64 encoded
HTTPClient *http.Client `json:"-"` // for tests only
HTTPClient *http.Client `json:"-"` // for tests only
challengeProvider challenge.Provider
challengeProvider challenge.Provider
idx int // 0: main, 1+: extra[i]
}
idx int // 0: main, 1+: extra[i]
}
)
var (
ErrMissingField = gperr.New("missing field")

2
internal/autocert/provider_test/multi_cert_test.go
View File

@@ -68,7 +68,7 @@ func TestMultipleCertificatesLifecycle(t *testing.T) {
require.Equal(t, "custom", cfg.Extra[1].Provider)
/* track cert requests for all configs */
os.MkdirAll("certs", 0755)
os.MkdirAll("certs", 0o755)
defer os.RemoveAll("certs")
err = provider.ObtainCertIfNotExistsAll()

1
internal/health/check/http.go
View File

@@ -24,6 +24,7 @@ var h2cClient = &http.Client{
},
},
}
var pinger = &fasthttp.Client{
MaxConnDuration: 0,
DisableHeaderNamesNormalizing: true,

3
internal/logging/accesslog/console_logger.go
View File

@@ -21,7 +21,8 @@ var stdoutLogger = func() *zerolog.Logger {
w.FieldsOrder = []string{
"uri", "protocol", "type", "size",
"useragent", "query", "headers", "cookies",
"error", "iso_code", "time_zone"}
"error", "iso_code", "time_zone",
}
})).With().Str("level", zerolog.InfoLevel.String()).Timestamp().Logger()
return &l
}()

6
internal/logging/accesslog/file_access_logger.go
View File

@@ -63,8 +63,10 @@ const (
errBurst = 5
)
var bytesPool = synk.GetUnsizedBytesPool()
var sizedPool = synk.GetSizedBytesPool()
var (
bytesPool = synk.GetUnsizedBytesPool()
sizedPool = synk.GetSizedBytesPool()
)
func NewFileAccessLogger(parent task.Parent, file File, anyCfg AnyConfig) AccessLogger {
cfg := anyCfg.ToConfig()

6
internal/net/gphttp/loadbalancer/ip_hash.go
View File

@@ -19,8 +19,10 @@ type ipHash struct {
mu sync.Mutex
}
var _ impl = (*ipHash)(nil)
var _ customServeHTTP = (*ipHash)(nil)
var (
_ impl = (*ipHash)(nil)
_ customServeHTTP = (*ipHash)(nil)
)
func (lb *LoadBalancer) newIPHash() impl {
impl := &ipHash{LoadBalancer: lb}

6
internal/net/gphttp/loadbalancer/least_conn.go
View File

@@ -13,8 +13,10 @@ type leastConn struct {
nConn *xsync.Map[types.LoadBalancerServer, *atomic.Int64]
}
var _ impl = (*leastConn)(nil)
var _ customServeHTTP = (*leastConn)(nil)
var (
_ impl = (*leastConn)(nil)
_ customServeHTTP = (*leastConn)(nil)
)
func (lb *LoadBalancer) newLeastConn() impl {
return &leastConn{

4
internal/route/rules/http_flow_test.go
View File

@@ -523,11 +523,11 @@ func TestHTTPFlow_ServeCommand(t *testing.T) {
// The path /files/index.html gets mapped to tempDir + "/files/index.html"
// We need to create the file at the expected path
filesDir := filepath.Join(tempDir, "files")
err = os.Mkdir(filesDir, 0755)
err = os.Mkdir(filesDir, 0o755)
require.NoError(t, err)
filesIndexFile := filepath.Join(filesDir, "index.html")
err = os.WriteFile(filesIndexFile, []byte("<h1>Test Page</h1>"), 0644)
err = os.WriteFile(filesIndexFile, []byte("<h1>Test Page</h1>"), 0o644)
require.NoError(t, err)
req1 := httptest.NewRequest(http.MethodGet, "/files/index.html", nil)

5
internal/route/rules/rules_bench_test.go
View File

@@ -46,7 +46,7 @@ func BenchmarkRules(b *testing.B) {
})
b.Run("RunHandler", func(b *testing.B) {
var r = &http.Request{
r := &http.Request{
Body: io.NopCloser(bytes.NewReader([]byte(""))),
URL: &url.URL{Path: "/api/users/"},
}
@@ -59,8 +59,7 @@ func BenchmarkRules(b *testing.B) {
})
}
type noopResponseWriter struct {
}
type noopResponseWriter struct{}
func (w noopResponseWriter) Header() http.Header {
return http.Header{}

2
internal/types/docker_provider_config.go
View File

@@ -61,7 +61,7 @@ func (cfg *DockerProviderConfig) Parse(value string) error {
func (cfg *DockerProviderConfig) UnmarshalMap(m map[string]any) error {
var tmp DockerProviderConfigDetailed
var err = serialization.MapUnmarshalValidate(m, &tmp)
err := serialization.MapUnmarshalValidate(m, &tmp)
if err != nil {
return err
}