starred/ddns-updater-qdm12-3
1
0
Fork 0
mirror of https://github.com/qdm12/ddns-updater.git synced 2026-04-05 08:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Maintenance: use io instead of ioutil if possible

Browse Source
This commit is contained in:
Quentin McGaw
2021-05-20 15:27:54 +00:00
parent ae978e007b
commit b1a3740059
18 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/health/client.go
View File

@@ -3,7 +3,7 @@ package health
import (
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"time"
)
@@ -44,7 +44,7 @@ func (c *client) Query(ctx context.Context) error {
return nil
}
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("%s: %s", resp.Status, err)
}

4
internal/settings/providers/ddnss/ddnss.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -126,7 +126,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/dnsomatic/dnsomatic.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -135,7 +135,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/duckdns/duckdns.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -124,7 +124,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/dyn/dyn.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -121,7 +121,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/freedns/freedns.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -108,7 +108,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/godaddy/godaddy.go
View File

@@ -5,7 +5,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -140,7 +140,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
return ip, nil
}
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/google/google.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -121,7 +121,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/he/he.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -115,7 +115,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/infomaniak/infomaniak.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -124,7 +124,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/noip/noip.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -129,7 +129,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/opendns/opendns.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -120,7 +120,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/ovh/ovh.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -149,7 +149,7 @@ func (p *provider) updateWithDynHost(ctx context.Context, client *http.Client, i
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/selfhostde/selfhostde.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -143,7 +143,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
errors.ErrBadHTTPStatus, response.StatusCode, utils.BodyToSingleLine(response.Body))
}
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/spdyn/spdyn.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -135,7 +135,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
internal/settings/providers/strato/strato.go
View File

@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"net/url"
@@ -115,7 +115,7 @@ func (p *provider) Update(ctx context.Context, client *http.Client, ip net.IP) (
}
defer response.Body.Close()
b, err := ioutil.ReadAll(response.Body)
b, err := io.ReadAll(response.Body)
if err != nil {
return nil, fmt.Errorf("%w: %s", errors.ErrUnmarshalResponse, err)
}

4
pkg/publicip/http/fetch_test.go
View File

@@ -4,7 +4,7 @@ import (
"bytes"
"context"
"errors"
"io/ioutil"
"io"
"net"
"net/http"
"testing"
@@ -156,7 +156,7 @@ func Test_fetch(t *testing.T) {
}
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(tc.httpContent)),
Body: io.NopCloser(bytes.NewReader(tc.httpContent)),
}, nil
}),
}

10
pkg/publicip/http/ip_test.go
View File

@@ -4,7 +4,7 @@ import (
"bytes"
"context"
"errors"
"io/ioutil"
"io"
"net"
"net/http"
"testing"
@@ -30,7 +30,7 @@ func Test_fetcher_IP(t *testing.T) { //nolint:dupl
assert.Equal(t, url, r.URL.String())
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(httpBytes)),
Body: io.NopCloser(bytes.NewReader(httpBytes)),
}, nil
}),
}
@@ -74,7 +74,7 @@ func Test_fetcher_IP4(t *testing.T) { //nolint:dupl
assert.Equal(t, url, r.URL.String())
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(httpBytes)),
Body: io.NopCloser(bytes.NewReader(httpBytes)),
}, nil
}),
}
@@ -121,7 +121,7 @@ func Test_fetcher_IP6(t *testing.T) {
assert.Equal(t, url, r.URL.String())
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(httpBytes)),
Body: io.NopCloser(bytes.NewReader(httpBytes)),
}, nil
}),
}
@@ -170,7 +170,7 @@ func Test_fetcher_ip(t *testing.T) {
}
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(httpBytes)),
Body: io.NopCloser(bytes.NewReader(httpBytes)),
}, nil
}),
}