diff --git a/pkg/api/metrics/metrics_test.go b/pkg/api/metrics/metrics_test.go index 5120f8d..48b6dd7 100644 --- a/pkg/api/metrics/metrics_test.go +++ b/pkg/api/metrics/metrics_test.go @@ -2,18 +2,18 @@ package metrics_test import ( "fmt" - "io/ioutil" + "io" "net/http" "net/http/httptest" "strings" "testing" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + "github.com/containrrr/watchtower/pkg/api" metricsAPI "github.com/containrrr/watchtower/pkg/api/metrics" "github.com/containrrr/watchtower/pkg/metrics" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" ) const ( @@ -36,7 +36,7 @@ func getWithToken(handler http.Handler) map[string]string { handler.ServeHTTP(respWriter, req) res := respWriter.Result() - body, _ := ioutil.ReadAll(res.Body) + body, _ := io.ReadAll(res.Body) for _, line := range strings.Split(string(body), "\n") { if len(line) < 1 || line[0] == '#' { diff --git a/pkg/container/client.go b/pkg/container/client.go index ba065ed..51868e4 100644 --- a/pkg/container/client.go +++ b/pkg/container/client.go @@ -3,14 +3,10 @@ package container import ( "bytes" "fmt" - "io/ioutil" + "io" "strings" "time" - "github.com/containrrr/watchtower/pkg/registry" - "github.com/containrrr/watchtower/pkg/registry/digest" - - t "github.com/containrrr/watchtower/pkg/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" @@ -18,6 +14,10 @@ import ( sdkClient "github.com/docker/docker/client" log "github.com/sirupsen/logrus" "golang.org/x/net/context" + + "github.com/containrrr/watchtower/pkg/registry" + "github.com/containrrr/watchtower/pkg/registry/digest" + t "github.com/containrrr/watchtower/pkg/types" ) const defaultStopSignal = "SIGTERM" @@ -399,7 +399,7 @@ func (client dockerClient) PullImage(ctx context.Context, container t.Container) defer response.Close() // the pull request will be aborted prematurely unless the response is read - if _, err = ioutil.ReadAll(response); err != nil { + if _, err = io.ReadAll(response); err != nil { log.Error(err) return err }