From 46b5a1e68d93b15fe890717740b7208ea81e7873 Mon Sep 17 00:00:00 2001 From: guoguangwu Date: Sun, 3 Sep 2023 16:34:12 +0800 Subject: [PATCH] chore: remove refs to deprecated io/ioutil --- approvals/approvals_test.go | 3 +-- bot/hipchat/hipchat_test.go | 3 +-- bot/slack/slack_test.go | 3 +-- extension/credentialshelper/gcr/gcr.go | 3 +-- extension/notification/teams/teams_test.go | 4 ++-- extension/notification/webhook/webhook_test.go | 4 ++-- pkg/http/native_webhook_trigger_test.go | 3 +-- provider/helm3/helm3_test.go | 3 +-- provider/kubernetes/kubernetes_test.go | 3 +-- registry/docker/manifest.go | 4 ++-- registry/docker/manifest_test.go | 5 ++--- trigger/poll/manager_test.go | 3 +-- trigger/pubsub/manager_test.go | 3 +-- trigger/pubsub/util.go | 4 ++-- 14 files changed, 19 insertions(+), 29 deletions(-) diff --git a/approvals/approvals_test.go b/approvals/approvals_test.go index ddd8431a..2b8e156f 100644 --- a/approvals/approvals_test.go +++ b/approvals/approvals_test.go @@ -2,7 +2,6 @@ package approvals import ( "context" - "io/ioutil" "log" "os" "path/filepath" @@ -16,7 +15,7 @@ import ( ) func NewTestingUtils() (*sql.SQLStore, func()) { - dir, err := ioutil.TempDir("", "whstoretest") + dir, err := os.MkdirTemp("", "whstoretest") if err != nil { log.Fatal(err) } diff --git a/bot/hipchat/hipchat_test.go b/bot/hipchat/hipchat_test.go index f66d7e1a..9a8de2dd 100644 --- a/bot/hipchat/hipchat_test.go +++ b/bot/hipchat/hipchat_test.go @@ -1,7 +1,6 @@ package hipchat import ( - "io/ioutil" "os" "path/filepath" "regexp" @@ -108,7 +107,7 @@ func init() { } func newTestingUtils() (*sql.SQLStore, func()) { - dir, err := ioutil.TempDir("", "whstoretest") + dir, err := os.MkdirTemp("", "whstoretest") if err != nil { log.Fatal(err) } diff --git a/bot/slack/slack_test.go b/bot/slack/slack_test.go index 4406c1d1..a0ee0a0b 100644 --- a/bot/slack/slack_test.go +++ b/bot/slack/slack_test.go @@ -2,7 +2,6 @@ package slack import ( "fmt" - "io/ioutil" "log" "os" "path/filepath" @@ -88,7 +87,7 @@ func (i *fakeSlackImplementer) PostMessage(channelID string, options ...slack.Ms } func newTestingUtils() (*sql.SQLStore, func()) { - dir, err := ioutil.TempDir("", "whstoretest") + dir, err := os.MkdirTemp("", "whstoretest") if err != nil { log.Fatal(err) } diff --git a/extension/credentialshelper/gcr/gcr.go b/extension/credentialshelper/gcr/gcr.go index 759b0435..5df2c566 100644 --- a/extension/credentialshelper/gcr/gcr.go +++ b/extension/credentialshelper/gcr/gcr.go @@ -2,7 +2,6 @@ package gcr import ( "errors" - "io/ioutil" "os" "github.com/keel-hq/keel/extension/credentialshelper" @@ -26,7 +25,7 @@ func New() *CredentialsHelper { return ch } - credentials, err := ioutil.ReadFile(credentialsFile) + credentials, err := os.ReadFile(credentialsFile) if err != nil { return ch } diff --git a/extension/notification/teams/teams_test.go b/extension/notification/teams/teams_test.go index f3adf575..75041010 100644 --- a/extension/notification/teams/teams_test.go +++ b/extension/notification/teams/teams_test.go @@ -1,7 +1,7 @@ package teams import ( - "io/ioutil" + "io" "net/http" "net/http/httptest" "strings" @@ -24,7 +24,7 @@ func TestTrimLeftChar(t *testing.T) { func TestTeamsRequest(t *testing.T) { handler := func(resp http.ResponseWriter, req *http.Request) { - body, err := ioutil.ReadAll(req.Body) + body, err := io.ReadAll(req.Body) if err != nil { t.Errorf("failed to parse body: %s", err) } diff --git a/extension/notification/webhook/webhook_test.go b/extension/notification/webhook/webhook_test.go index c51c5004..a2767a73 100644 --- a/extension/notification/webhook/webhook_test.go +++ b/extension/notification/webhook/webhook_test.go @@ -1,7 +1,7 @@ package webhook import ( - "io/ioutil" + "io" "net/http" "net/http/httptest" "strings" @@ -14,7 +14,7 @@ import ( func TestWebhookRequest(t *testing.T) { currentTime := time.Now() handler := func(resp http.ResponseWriter, req *http.Request) { - body, err := ioutil.ReadAll(req.Body) + body, err := io.ReadAll(req.Body) if err != nil { t.Errorf("failed to parse body: %s", err) } diff --git a/pkg/http/native_webhook_trigger_test.go b/pkg/http/native_webhook_trigger_test.go index 330ab933..fb0b0ea3 100644 --- a/pkg/http/native_webhook_trigger_test.go +++ b/pkg/http/native_webhook_trigger_test.go @@ -2,7 +2,6 @@ package http import ( "bytes" - "io/ioutil" "log" "net/http" "os" @@ -22,7 +21,7 @@ import ( ) func NewTestingUtils() (*sql.SQLStore, func()) { - dir, err := ioutil.TempDir("", "whstoretest") + dir, err := os.MkdirTemp("", "whstoretest") if err != nil { log.Fatal(err) } diff --git a/provider/helm3/helm3_test.go b/provider/helm3/helm3_test.go index 8cfa1c07..78aa4799 100644 --- a/provider/helm3/helm3_test.go +++ b/provider/helm3/helm3_test.go @@ -1,7 +1,6 @@ package helm3 import ( - "io/ioutil" "log" "os" "path/filepath" @@ -21,7 +20,7 @@ import ( ) func newTestingUtils() (*sql.SQLStore, func()) { - dir, err := ioutil.TempDir("", "whstoretest") + dir, err := os.MkdirTemp("", "whstoretest") if err != nil { log.Fatal(err) } diff --git a/provider/kubernetes/kubernetes_test.go b/provider/kubernetes/kubernetes_test.go index 5586c993..b80959d7 100644 --- a/provider/kubernetes/kubernetes_test.go +++ b/provider/kubernetes/kubernetes_test.go @@ -1,7 +1,6 @@ package kubernetes import ( - "io/ioutil" "log" "os" "path/filepath" @@ -112,7 +111,7 @@ func (s *fakeSender) Send(event types.EventNotification) error { } func NewTestingUtils() (*sql.SQLStore, func()) { - dir, err := ioutil.TempDir("", "whstoretest") + dir, err := os.MkdirTemp("", "whstoretest") if err != nil { log.Fatal(err) } diff --git a/registry/docker/manifest.go b/registry/docker/manifest.go index ea9c51ea..9ffa715b 100644 --- a/registry/docker/manifest.go +++ b/registry/docker/manifest.go @@ -1,7 +1,7 @@ package docker import ( - "io/ioutil" + "io" "net/http" "strings" @@ -35,7 +35,7 @@ func (r *Registry) ManifestDigest(repository, reference string) (digest.Digest, // Try to get digest from body instead, should be equal to what would be presented // in Docker-Content-Digest - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return "", err } diff --git a/registry/docker/manifest_test.go b/registry/docker/manifest_test.go index c8d23800..842b25d7 100644 --- a/registry/docker/manifest_test.go +++ b/registry/docker/manifest_test.go @@ -3,7 +3,6 @@ package docker import ( "bytes" "io" - "io/ioutil" "net/http" "net/http/httptest" "testing" @@ -26,13 +25,13 @@ func TestGetDigest(t *testing.T) { } defer resp.Body.Close() - bodyBytes, _ := ioutil.ReadAll(resp.Body) + bodyBytes, _ := io.ReadAll(resp.Body) ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Header().Add("content-type", "application/vnd.docker.distribution.manifest.v2+json; charset=ISO-8859-1") io.Copy(w, resp.Body) // Reset body for additional calls - resp.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes)) + resp.Body = io.NopCloser(bytes.NewBuffer(bodyBytes)) })) defer ts.Close() diff --git a/trigger/poll/manager_test.go b/trigger/poll/manager_test.go index d4fe48f6..638a1c12 100644 --- a/trigger/poll/manager_test.go +++ b/trigger/poll/manager_test.go @@ -2,7 +2,6 @@ package poll import ( "context" - "io/ioutil" "log" "os" "path/filepath" @@ -30,7 +29,7 @@ func (g *FakeSecretsGetter) Get(image *types.TrackedImage) (*types.Credentials, } func newTestingUtils() (*sql.SQLStore, func()) { - dir, err := ioutil.TempDir("", "whstoretest") + dir, err := os.MkdirTemp("", "whstoretest") if err != nil { log.Fatal(err) } diff --git a/trigger/pubsub/manager_test.go b/trigger/pubsub/manager_test.go index c32305fa..3b8010bf 100644 --- a/trigger/pubsub/manager_test.go +++ b/trigger/pubsub/manager_test.go @@ -1,7 +1,6 @@ package pubsub import ( - "io/ioutil" "log" "os" "path/filepath" @@ -20,7 +19,7 @@ import ( ) func newTestingUtils() (*sql.SQLStore, func()) { - dir, err := ioutil.TempDir("", "whstoretest") + dir, err := os.MkdirTemp("", "whstoretest") if err != nil { log.Fatal(err) } diff --git a/trigger/pubsub/util.go b/trigger/pubsub/util.go index 1fb7b7ef..df76dec3 100644 --- a/trigger/pubsub/util.go +++ b/trigger/pubsub/util.go @@ -1,7 +1,7 @@ package pubsub import ( - "io/ioutil" + "io" "net/http" "regexp" @@ -43,7 +43,7 @@ func getClusterName(metadataEndpoint string) (string, error) { return "", err } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return "", err }