diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2022-08-02 16:39:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 16:39:09 -0400 |
| commit | 141872ed80d6323505e7543628c259fdae8506d3 (patch) | |
| tree | 53581cddf2fcce189c3a55019194b64b0cd3af13 /caddytest | |
| parent | db1aa5b5bc174e5a5df39a277f737b304e1e2350 (diff) | |
chore: Bump up to Go 1.19, minimum 1.18 (#4925)
Diffstat (limited to 'caddytest')
| -rw-r--r-- | caddytest/caddytest.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/caddytest/caddytest.go b/caddytest/caddytest.go index 3be332e..9addd14 100644 --- a/caddytest/caddytest.go +++ b/caddytest/caddytest.go @@ -186,7 +186,7 @@ func (tc *Tester) ensureConfigRunning(rawConfig string, configType string) error expectedBytes, _, _ = adapter.Adapt([]byte(rawConfig), nil) } - var expected interface{} + var expected any err := json.Unmarshal(expectedBytes, &expected) if err != nil { return err @@ -196,7 +196,7 @@ func (tc *Tester) ensureConfigRunning(rawConfig string, configType string) error Timeout: Default.LoadRequestTimeout, } - fetchConfig := func(client *http.Client) interface{} { + fetchConfig := func(client *http.Client) any { resp, err := client.Get(fmt.Sprintf("http://localhost:%d/config/", Default.AdminPort)) if err != nil { return nil @@ -206,7 +206,7 @@ func (tc *Tester) ensureConfigRunning(rawConfig string, configType string) error if err != nil { return nil } - var actual interface{} + var actual any err = json.Unmarshal(actualBytes, &actual) if err != nil { return nil @@ -371,7 +371,7 @@ func CompareAdapt(t *testing.T, filename, rawConfig string, adapterName string, return false } - options := make(map[string]interface{}) + options := make(map[string]any) result, warnings, err := cfgAdapter.Adapt([]byte(rawConfig), options) if err != nil { |