summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.golangci.yml2
-rw-r--r--admin.go2
-rw-r--r--caddyconfig/httpcaddyfile/addresses.go6
-rw-r--r--caddyconfig/httpcaddyfile/httptype.go4
-rw-r--r--caddyconfig/httpcaddyfile/tlsapp.go2
-rw-r--r--caddytest/caddytest.go2
-rw-r--r--logging.go4
-rw-r--r--modules.go6
-rw-r--r--modules/caddyhttp/caddyauth/basicauth.go4
-rw-r--r--modules/caddyhttp/caddyauth/command.go2
-rw-r--r--modules/caddyhttp/fileserver/caddyfile.go2
-rw-r--r--modules/caddyhttp/replacer.go2
-rw-r--r--modules/caddyhttp/responsewriter.go4
-rw-r--r--modules/caddyhttp/routes.go2
-rw-r--r--modules/caddyhttp/templates/frontmatter.go2
-rw-r--r--modules/caddytls/automation.go2
-rw-r--r--modules/caddytls/fileloader.go2
-rw-r--r--modules/caddytls/pemloader.go2
-rw-r--r--modules/caddytls/tls.go2
19 files changed, 28 insertions, 26 deletions
diff --git a/.golangci.yml b/.golangci.yml
index 5429e1a..f6d8322 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -8,6 +8,8 @@ linters-settings:
linters:
enable:
- bodyclose
+ - prealloc
+ - unconvert
- errcheck
- gofmt
- goimports
diff --git a/admin.go b/admin.go
index 77ec7ab..0b509f2 100644
--- a/admin.go
+++ b/admin.go
@@ -149,7 +149,7 @@ func (admin AdminConfig) allowedOrigins(listen string) []string {
if admin.Origins == nil {
uniqueOrigins[listen] = struct{}{}
}
- var allowed []string
+ allowed := make([]string, 0, len(uniqueOrigins))
for origin := range uniqueOrigins {
allowed = append(allowed, origin)
}
diff --git a/caddyconfig/httpcaddyfile/addresses.go b/caddyconfig/httpcaddyfile/addresses.go
index 6545585..e40f30c 100644
--- a/caddyconfig/httpcaddyfile/addresses.go
+++ b/caddyconfig/httpcaddyfile/addresses.go
@@ -138,7 +138,7 @@ func (st *ServerType) mapAddressToServerBlocks(originalServerBlocks []serverBloc
// association from multiple addresses to multiple server blocks; i.e. each element of
// the returned slice) becomes a server definition in the output JSON.
func (st *ServerType) consolidateAddrMappings(addrToServerBlocks map[string][]serverBlock) []sbAddrAssociation {
- var sbaddrs []sbAddrAssociation
+ sbaddrs := make([]sbAddrAssociation, 0, len(addrToServerBlocks))
for addr, sblocks := range addrToServerBlocks {
// we start with knowing that at least this address
// maps to these server blocks
@@ -199,7 +199,7 @@ func (st *ServerType) listenerAddrsForServerBlockKey(sblock serverBlock, key str
}
// the bind directive specifies hosts, but is optional
- var lnHosts []string
+ lnHosts := make([]string, 0, len(sblock.pile))
for _, cfgVal := range sblock.pile["bind"] {
lnHosts = append(lnHosts, cfgVal.Value.([]string)...)
}
@@ -219,7 +219,7 @@ func (st *ServerType) listenerAddrsForServerBlockKey(sblock serverBlock, key str
}
// now turn map into list
- var listenersList []string
+ listenersList := make([]string, 0, len(listeners))
for lnStr := range listeners {
listenersList = append(listenersList, lnStr)
}
diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go
index 4c5f445..b7d16d8 100644
--- a/caddyconfig/httpcaddyfile/httptype.go
+++ b/caddyconfig/httpcaddyfile/httptype.go
@@ -50,7 +50,7 @@ func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock,
// chosen to handle a request - we actually will make each
// server block's route terminal so that only one will run
sbKeys := make(map[string]struct{})
- var serverBlocks []serverBlock
+ serverBlocks := make([]serverBlock, 0, len(originalServerBlocks))
for i, sblock := range originalServerBlocks {
for j, k := range sblock.Keys {
if _, ok := sbKeys[k]; ok {
@@ -939,7 +939,7 @@ func (st *ServerType) compileEncodedMatcherSets(sblock serverBlock) ([]caddy.Mod
}
// finally, encode each of the matcher sets
- var matcherSetsEnc []caddy.ModuleMap
+ matcherSetsEnc := make([]caddy.ModuleMap, 0, len(matcherSets))
for _, ms := range matcherSets {
msEncoded, err := encodeMatcherSet(ms)
if err != nil {
diff --git a/caddyconfig/httpcaddyfile/tlsapp.go b/caddyconfig/httpcaddyfile/tlsapp.go
index b31bdc5..5c62233 100644
--- a/caddyconfig/httpcaddyfile/tlsapp.go
+++ b/caddyconfig/httpcaddyfile/tlsapp.go
@@ -246,7 +246,7 @@ func (st ServerType) buildTLSApp(
}
clVal := reflect.ValueOf(cl)
for i := 0; i < clVal.Len(); i++ {
- combined = reflect.Append(reflect.Value(combined), clVal.Index(i))
+ combined = reflect.Append(combined, clVal.Index(i))
}
loadersByName[name] = combined.Interface().(caddytls.CertificateLoader)
}
diff --git a/caddytest/caddytest.go b/caddytest/caddytest.go
index ce70f77..c94ef6c 100644
--- a/caddytest/caddytest.go
+++ b/caddytest/caddytest.go
@@ -255,7 +255,7 @@ func AssertGetResponse(t *testing.T, requestURI string, statusCode int, expected
if !strings.Contains(body, expectedBody) {
t.Errorf("requesting \"%s\" expected response body \"%s\" but got \"%s\"", requestURI, expectedBody, body)
}
- return resp, string(body)
+ return resp, body
}
// AssertGetResponseBody request a URI and assert the status code matches
diff --git a/logging.go b/logging.go
index bd291ff..1017293 100644
--- a/logging.go
+++ b/logging.go
@@ -217,7 +217,7 @@ func (logging *Logging) Logger(mod Module) *zap.Logger {
multiCore := zapcore.NewTee(cores...)
- return zap.New(multiCore).Named(string(modID))
+ return zap.New(multiCore).Named(modID)
}
// openWriter opens a writer using opener, and returns true if
@@ -464,7 +464,7 @@ func (cl *CustomLog) buildCore() {
}
func (cl *CustomLog) matchesModule(moduleID string) bool {
- return cl.loggerAllowed(string(moduleID), true)
+ return cl.loggerAllowed(moduleID, true)
}
// loggerAllowed returns true if name is allowed to emit
diff --git a/modules.go b/modules.go
index bd1f0e9..d8d6fdd 100644
--- a/modules.go
+++ b/modules.go
@@ -210,7 +210,7 @@ func GetModules(scope string) []ModuleInfo {
var mods []ModuleInfo
iterateModules:
for id, m := range modules {
- modParts := strings.Split(string(id), ".")
+ modParts := strings.Split(id, ".")
// match only the next level of nesting
if len(modParts) != len(scopeParts)+1 {
@@ -241,9 +241,9 @@ func Modules() []string {
modulesMu.RLock()
defer modulesMu.RUnlock()
- var names []string
+ names := make([]string, 0, len(modules))
for name := range modules {
- names = append(names, string(name))
+ names = append(names, name)
}
sort.Strings(names)
diff --git a/modules/caddyhttp/caddyauth/basicauth.go b/modules/caddyhttp/caddyauth/basicauth.go
index b4cf838..d709f94 100644
--- a/modules/caddyhttp/caddyauth/basicauth.go
+++ b/modules/caddyhttp/caddyauth/basicauth.go
@@ -77,8 +77,8 @@ func (hba *HTTPBasicAuth) Provision(ctx caddy.Context) error {
}
acct.Username = repl.ReplaceAll(acct.Username, "")
- acct.Password = repl.ReplaceAll(string(acct.Password), "")
- acct.Salt = repl.ReplaceAll(string(acct.Salt), "")
+ acct.Password = repl.ReplaceAll(acct.Password, "")
+ acct.Salt = repl.ReplaceAll(acct.Salt, "")
if acct.Username == "" || acct.Password == "" {
return fmt.Errorf("account %d: username and password are required", i)
diff --git a/modules/caddyhttp/caddyauth/command.go b/modules/caddyhttp/caddyauth/command.go
index 70a11a0..24f6c5a 100644
--- a/modules/caddyhttp/caddyauth/command.go
+++ b/modules/caddyhttp/caddyauth/command.go
@@ -76,7 +76,7 @@ func cmdHashPassword(fs caddycmd.Flags) (int, error) {
return caddy.ExitCodeFailedStartup, err
}
- hashBase64 := base64.StdEncoding.EncodeToString([]byte(hash))
+ hashBase64 := base64.StdEncoding.EncodeToString(hash)
fmt.Println(hashBase64)
diff --git a/modules/caddyhttp/fileserver/caddyfile.go b/modules/caddyhttp/fileserver/caddyfile.go
index 2980436..9b458b2 100644
--- a/modules/caddyhttp/fileserver/caddyfile.go
+++ b/modules/caddyhttp/fileserver/caddyfile.go
@@ -146,7 +146,7 @@ func parseTryFiles(h httpcaddyfile.Helper) ([]httpcaddyfile.ConfigValue, error)
// if there are query strings in the list, we have to split into
// a separate route for each item with a query string, because
// the rewrite is different for that item
- var try []string
+ try := make([]string, 0, len(tryFiles))
for _, item := range tryFiles {
if idx := strings.Index(item, "?"); idx >= 0 {
if len(try) > 0 {
diff --git a/modules/caddyhttp/replacer.go b/modules/caddyhttp/replacer.go
index 51fe67f..b83977c 100644
--- a/modules/caddyhttp/replacer.go
+++ b/modules/caddyhttp/replacer.go
@@ -188,7 +188,7 @@ func addHTTPVarsToReplacer(repl *caddy.Replacer, req *http.Request, w http.Respo
if strings.HasPrefix(key, varsReplPrefix) {
varName := key[len(varsReplPrefix):]
tbl := req.Context().Value(VarsCtxKey).(map[string]interface{})
- raw, _ := tbl[varName]
+ raw := tbl[varName]
// variables can be dynamic, so always return true
// even when it may not be set; treat as empty then
return raw, true
diff --git a/modules/caddyhttp/responsewriter.go b/modules/caddyhttp/responsewriter.go
index a4ea1db..4338f6f 100644
--- a/modules/caddyhttp/responsewriter.go
+++ b/modules/caddyhttp/responsewriter.go
@@ -76,13 +76,13 @@ var ErrNotImplemented = fmt.Errorf("method not implemented")
type responseRecorder struct {
*ResponseWriterWrapper
- wroteHeader bool
statusCode int
buf *bytes.Buffer
shouldBuffer ShouldBufferFunc
- stream bool
size int
header http.Header
+ wroteHeader bool
+ stream bool
}
// NewResponseRecorder returns a new ResponseRecorder that can be
diff --git a/modules/caddyhttp/routes.go b/modules/caddyhttp/routes.go
index 1224e32..27d4922 100644
--- a/modules/caddyhttp/routes.go
+++ b/modules/caddyhttp/routes.go
@@ -167,7 +167,7 @@ func (routes RouteList) ProvisionHandlers(ctx caddy.Context) error {
// This should only be done once: after all the routes have
// been provisioned, and before serving requests.
func (routes RouteList) Compile(next Handler) Handler {
- var mid []Middleware
+ mid := make([]Middleware, 0, len(routes))
for _, route := range routes {
mid = append(mid, wrapRoute(route))
}
diff --git a/modules/caddyhttp/templates/frontmatter.go b/modules/caddyhttp/templates/frontmatter.go
index 730cfd1..d6b6d0e 100644
--- a/modules/caddyhttp/templates/frontmatter.go
+++ b/modules/caddyhttp/templates/frontmatter.go
@@ -33,7 +33,7 @@ func extractFrontMatter(input string) (map[string]interface{}, string, error) {
// see what kind of front matter there is, if any
var closingFence string
var fmParser func([]byte) (map[string]interface{}, error)
- switch string(firstLine) {
+ switch firstLine {
case yamlFrontMatterFenceOpen:
fmParser = yamlFrontMatter
closingFence = yamlFrontMatterFenceClose
diff --git a/modules/caddytls/automation.go b/modules/caddytls/automation.go
index 87e6b28..c623b82 100644
--- a/modules/caddytls/automation.go
+++ b/modules/caddytls/automation.go
@@ -150,7 +150,7 @@ func (ap *AutomationPolicy) Provision(tlsApp *TLS) error {
// none of the subjects qualify for a public certificate,
// set the issuer to internal so that these names can all
// get certificates; critically, we can only do this if an
- // issuer is not explictly configured (IssuerRaw, vs. just
+ // issuer is not explicitly configured (IssuerRaw, vs. just
// Issuer) AND if the list of subjects is non-empty
if ap.IssuerRaw == nil && len(ap.Subjects) > 0 {
var anyPublic bool
diff --git a/modules/caddytls/fileloader.go b/modules/caddytls/fileloader.go
index 6d6ff99..fdf5486 100644
--- a/modules/caddytls/fileloader.go
+++ b/modules/caddytls/fileloader.go
@@ -57,7 +57,7 @@ type CertKeyFilePair struct {
// LoadCertificates returns the certificates to be loaded by fl.
func (fl FileLoader) LoadCertificates() ([]Certificate, error) {
- var certs []Certificate
+ certs := make([]Certificate, 0, len(fl))
for _, pair := range fl {
certData, err := ioutil.ReadFile(pair.Certificate)
if err != nil {
diff --git a/modules/caddytls/pemloader.go b/modules/caddytls/pemloader.go
index 46d06a8..bd95781 100644
--- a/modules/caddytls/pemloader.go
+++ b/modules/caddytls/pemloader.go
@@ -54,7 +54,7 @@ type CertKeyPEMPair struct {
// LoadCertificates returns the certificates contained in pl.
func (pl PEMLoader) LoadCertificates() ([]Certificate, error) {
- var certs []Certificate
+ certs := make([]Certificate, 0, len(pl))
for i, pair := range pl {
cert, err := tls.X509KeyPair([]byte(pair.CertificatePEM), []byte(pair.KeyPEM))
if err != nil {
diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index 1255d3d..ea80fa9 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -471,7 +471,7 @@ func (t *TLS) moveCertificates() error {
}
// get list of used CAs
- var oldCANames []string
+ oldCANames := make([]string, 0, len(oldAcmeCas))
for _, fi := range oldAcmeCas {
if !fi.IsDir() {
continue
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 06:37:33 +0000