Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-09-22 05:40:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removes ioutil

Browse source 
ioutil is not used anymore, in favor of io or os. in this case, io is a drop in replacement for ioutil.
This commit is contained in:
donuts-are-good 2023-10-07 13:18:07 -05:00
parent 284066a39d
commit 0a57f46df1
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkg/api/metrics/metrics_test.go
View file

@ -2,18 +2,18 @@ package metrics_test
import ( import (
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"strings" "strings"
"testing" "testing"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/containrrr/watchtower/pkg/api" "github.com/containrrr/watchtower/pkg/api"
metricsAPI "github.com/containrrr/watchtower/pkg/api/metrics" metricsAPI "github.com/containrrr/watchtower/pkg/api/metrics"
"github.com/containrrr/watchtower/pkg/metrics" "github.com/containrrr/watchtower/pkg/metrics"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
) )
const ( const (
@ -36,7 +36,7 @@ func getWithToken(handler http.Handler) map[string]string {
handler.ServeHTTP(respWriter, req) handler.ServeHTTP(respWriter, req)
res := respWriter.Result() res := respWriter.Result()
body, _ := ioutil.ReadAll(res.Body) body, _ := io.ReadAll(res.Body)
for _, line := range strings.Split(string(body), "\n") { for _, line := range strings.Split(string(body), "\n") {
if len(line) < 1 || line[0] == '#' { if len(line) < 1 || line[0] == '#' {

12
pkg/container/client.go
View file

@ -3,14 +3,10 @@ package container
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io"
"strings" "strings"
"time" "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"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
@ -18,6 +14,10 @@ import (
sdkClient "github.com/docker/docker/client" sdkClient "github.com/docker/docker/client"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.org/x/net/context" "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" const defaultStopSignal = "SIGTERM"
@ -399,7 +399,7 @@ func (client dockerClient) PullImage(ctx context.Context, container t.Container)
defer response.Close() defer response.Close()
// the pull request will be aborted prematurely unless the response is read // 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) log.Error(err)
return err return err
} }