aboutsummaryrefslogtreecommitdiffhomepage
path: root/admin.go
diff options
context:
space:
mode:
authorFrancis Lavoie <[email protected]>2022-08-02 16:39:09 -0400
committerGitHub <[email protected]>2022-08-02 16:39:09 -0400
commit141872ed80d6323505e7543628c259fdae8506d3 (patch)
tree53581cddf2fcce189c3a55019194b64b0cd3af13 /admin.go
parentdb1aa5b5bc174e5a5df39a277f737b304e1e2350 (diff)
downloadcaddy-141872ed80d6323505e7543628c259fdae8506d3.tar.gz
caddy-141872ed80d6323505e7543628c259fdae8506d3.zip
chore: Bump up to Go 1.19, minimum 1.18 (#4925)
Diffstat (limited to 'admin.go')
-rw-r--r--admin.go24
1 files changed, 12 insertions, 12 deletions
diff --git a/admin.go b/admin.go
index 125a7b2ef..9aa17f870 100644
--- a/admin.go
+++ b/admin.go
@@ -441,7 +441,7 @@ func manageIdentity(ctx Context, cfg *Config) error {
if err != nil {
return fmt.Errorf("loading identity issuer modules: %s", err)
}
- for _, issVal := range val.([]interface{}) {
+ for _, issVal := range val.([]any) {
cfg.Admin.Identity.issuers = append(cfg.Admin.Identity.issuers, issVal.(certmagic.Issuer))
}
}
@@ -1034,7 +1034,7 @@ func handleStop(w http.ResponseWriter, r *http.Request) error {
// only a read lock; all others need a write lock).
func unsyncedConfigAccess(method, path string, body []byte, out io.Writer) error {
var err error
- var val interface{}
+ var val any
// if there is a request body, decode it into the
// variable that will be set in the config according
@@ -1071,16 +1071,16 @@ func unsyncedConfigAccess(method, path string, body []byte, out io.Writer) error
parts = parts[:len(parts)-1]
}
- var ptr interface{} = rawCfg
+ var ptr any = rawCfg
traverseLoop:
for i, part := range parts {
switch v := ptr.(type) {
- case map[string]interface{}:
+ case map[string]any:
// if the next part enters a slice, and the slice is our destination,
// handle it specially (because appending to the slice copies the slice
// header, which does not replace the original one like we want)
- if arr, ok := v[part].([]interface{}); ok && i == len(parts)-2 {
+ if arr, ok := v[part].([]any); ok && i == len(parts)-2 {
var idx int
if method != http.MethodPost {
idxStr := parts[len(parts)-1]
@@ -1102,7 +1102,7 @@ traverseLoop:
}
case http.MethodPost:
if ellipses {
- valArray, ok := val.([]interface{})
+ valArray, ok := val.([]any)
if !ok {
return fmt.Errorf("final element is not an array")
}
@@ -1137,9 +1137,9 @@ traverseLoop:
case http.MethodPost:
// if the part is an existing list, POST appends to
// it, otherwise it just sets or creates the value
- if arr, ok := v[part].([]interface{}); ok {
+ if arr, ok := v[part].([]any); ok {
if ellipses {
- valArray, ok := val.([]interface{})
+ valArray, ok := val.([]any)
if !ok {
return fmt.Errorf("final element is not an array")
}
@@ -1170,12 +1170,12 @@ traverseLoop:
// might not exist yet; that's OK but we need to make them as
// we go, while we still have a pointer from the level above
if v[part] == nil && method == http.MethodPut {
- v[part] = make(map[string]interface{})
+ v[part] = make(map[string]any)
}
ptr = v[part]
}
- case []interface{}:
+ case []any:
partInt, err := strconv.Atoi(part)
if err != nil {
return fmt.Errorf("[/%s] invalid array index '%s': %v",
@@ -1197,7 +1197,7 @@ traverseLoop:
// RemoveMetaFields removes meta fields like "@id" from a JSON message
// by using a simple regular expression. (An alternate way to do this
-// would be to delete them from the raw, map[string]interface{}
+// would be to delete them from the raw, map[string]any
// representation as they are indexed, then iterate the index we made
// and add them back after encoding as JSON, but this is simpler.)
func RemoveMetaFields(rawJSON []byte) []byte {
@@ -1329,7 +1329,7 @@ const (
)
var bufPool = sync.Pool{
- New: func() interface{} {
+ New: func() any {
return new(bytes.Buffer)
},
}