From 51770c95756bd2340d1de66775965074bdf1bdac Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Sun, 17 Nov 2024 12:53:12 +0100 Subject: [PATCH] Remove deprecated package 'ioutil' --- changelogutils/changelog_test.go | 3 +-- cliutils/port_forward.go | 4 ++-- contextutils/backoff.go | 2 -- docker/docker_test.go | 6 +++--- fileutils/messages_test.go | 5 ++--- gcloudutils/builders/storage_builder.go | 5 ++--- gcloudutils/clients.go | 3 +-- githubutils/githubutils_test.go | 5 ++--- githubutils/repo.go | 3 +-- githubutils/upload_release_asset.go | 3 +-- osutils/client.go | 3 +-- pkgmgmtutils/internal/local_clone_change_pusher.go | 7 +++---- pkgmgmtutils/internal/remote_sha_getter.go | 4 ++-- securityscanutils/commands/format_results.go | 4 ++-- securityscanutils/securityscan_test.go | 5 ++--- securityscanutils/trivy_scanner_test.go | 3 +-- securityscanutils/trivy_templates.go | 4 ++-- test/checks/checks_test.go | 4 ++-- testutils/consul.go | 8 +++----- testutils/fail_handler_unix.go | 3 +-- testutils/runners/consul/consul.go | 7 +++---- testutils/vault.go | 8 +++----- versionutils/repo_test.go | 5 ++--- 23 files changed, 42 insertions(+), 62 deletions(-) diff --git a/changelogutils/changelog_test.go b/changelogutils/changelog_test.go index 0f23db56..b3f145a1 100644 --- a/changelogutils/changelog_test.go +++ b/changelogutils/changelog_test.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -508,7 +507,7 @@ func createSubdirs(dir string, names ...string) error { } func mustWriteTestDir() string { - tmpDir, err := ioutil.TempDir("", "changelog-test-") + tmpDir, err := os.MkdirTemp("", "changelog-test-") Expect(err).NotTo(HaveOccurred()) return tmpDir } diff --git a/cliutils/port_forward.go b/cliutils/port_forward.go index e4aec55f..d5246deb 100644 --- a/cliutils/port_forward.go +++ b/cliutils/port_forward.go @@ -3,7 +3,7 @@ package cliutils import ( "context" "fmt" - "io/ioutil" + "io" "net" "net/http" "os" @@ -71,7 +71,7 @@ func PortForwardGet(ctx context.Context, namespace string, resource string, loca time.Sleep(retryInterval) continue } - b, err := ioutil.ReadAll(res.Body) + b, err := io.ReadAll(res.Body) if err != nil { errs <- err time.Sleep(retryInterval) diff --git a/contextutils/backoff.go b/contextutils/backoff.go index e61d5299..d5c60611 100644 --- a/contextutils/backoff.go +++ b/contextutils/backoff.go @@ -53,8 +53,6 @@ type exponentialBackoff struct { MaxRetries uint MaxDuration *time.Duration MaxDelay time.Duration - - start *time.Duration } func (e *exponentialBackoff) Backoff(ctx context.Context, f func(ctx context.Context) error) error { diff --git a/docker/docker_test.go b/docker/docker_test.go index 1fe7812b..f5b1f791 100644 --- a/docker/docker_test.go +++ b/docker/docker_test.go @@ -2,7 +2,7 @@ package docker_test import ( "context" - "io/ioutil" + "os" "os/exec" . "github.com/onsi/ginkgo/v2" @@ -50,14 +50,14 @@ var _ = Describe("Docker", func() { Context("Save", func() { It("can save a valid, present container", func() { pullValidImage() - file, err := ioutil.TempFile("", "docker_test") + file, err := os.CreateTemp("", "docker_test") Expect(err).NotTo(HaveOccurred()) err = docker.Save(validImage, file.Name()) Expect(err).NotTo(HaveOccurred()) }) It("cannot save an invalid container", func() { - file, err := ioutil.TempFile("", "docker_test") + file, err := os.CreateTemp("", "docker_test") Expect(err).NotTo(HaveOccurred()) err = docker.Save(invalidImage, file.Name()) Expect(err).To(HaveOccurred()) diff --git a/fileutils/messages_test.go b/fileutils/messages_test.go index 8ef8b87f..287a5423 100644 --- a/fileutils/messages_test.go +++ b/fileutils/messages_test.go @@ -4,7 +4,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "io/ioutil" "os" "github.com/gogo/protobuf/types" @@ -14,7 +13,7 @@ import ( var _ = Describe("Messages", func() { var filename string BeforeEach(func() { - f, err := ioutil.TempFile("", "messages_test") + f, err := os.CreateTemp("", "messages_test") Expect(err).NotTo(HaveOccurred()) filename = f.Name() }) @@ -32,7 +31,7 @@ var _ = Describe("Messages", func() { err := WriteToFile(filename, input) Expect(err).NotTo(HaveOccurred()) - b, err := ioutil.ReadFile(filename) + b, err := os.ReadFile(filename) Expect(err).NotTo(HaveOccurred()) Expect(string(b)).To(Equal("foo: bar\n")) diff --git a/gcloudutils/builders/storage_builder.go b/gcloudutils/builders/storage_builder.go index 41172880..42ba44b3 100644 --- a/gcloudutils/builders/storage_builder.go +++ b/gcloudutils/builders/storage_builder.go @@ -6,7 +6,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "net/http" "os" "strings" @@ -104,7 +103,7 @@ func (sb *StorageBuilder) copyArchiveToStorage(ctx context.Context, builderCtx B return nil, err } - tmpf, err := ioutil.TempFile("", "*.tar.gz") + tmpf, err := os.CreateTemp("", "*.tar.gz") if err != nil { logger.Error().Err(err).Msg("can't create temp file") return nil, err @@ -169,7 +168,7 @@ func (sb *StorageBuilder) copyToBucket(ctx context.Context, builderCtx BuildCont func removeGHPrefix(ctx context.Context, archiveFile string) (*os.File, error) { logger := zerolog.Ctx(ctx) - tmpf, err := ioutil.TempFile("", "*.tar.gz") + tmpf, err := os.CreateTemp("", "*.tar.gz") if err != nil { logger.Error().Err(err).Msg("can't create temp file") return nil, err diff --git a/gcloudutils/clients.go b/gcloudutils/clients.go index 2f72768c..7ca1ddf0 100644 --- a/gcloudutils/clients.go +++ b/gcloudutils/clients.go @@ -3,7 +3,6 @@ package gcloudutils import ( "context" "fmt" - "io/ioutil" "os" "path/filepath" @@ -41,7 +40,7 @@ func credsFromProjectId(ctx context.Context, projectId string) (*google.Credenti contextutils.LoggerFrom(ctx).Debugw("Looking for creds for project", zap.String("projectId", projectId), zap.String("credsFile", pathToCredsFile)) - credByt, err := ioutil.ReadFile(pathToCredsFile) + credByt, err := os.ReadFile(pathToCredsFile) if err != nil { contextutils.LoggerFrom(ctx).Errorw("Error reading creds file", zap.Error(err), diff --git a/githubutils/githubutils_test.go b/githubutils/githubutils_test.go index 7f00b1f8..1ae7d72c 100644 --- a/githubutils/githubutils_test.go +++ b/githubutils/githubutils_test.go @@ -2,7 +2,6 @@ package githubutils import ( "context" - "io/ioutil" "os" "github.com/google/go-github/v32/github" @@ -72,9 +71,9 @@ var _ = Describe("github utils", func() { }) func mustSetupTempFiles() (file *os.File, dir string) { - tmpf, err := ioutil.TempFile("", "tar-file-") + tmpf, err := os.CreateTemp("", "tar-file-") Expect(err).NotTo(HaveOccurred()) - tmpd, err := ioutil.TempDir("", "tar-dir-") + tmpd, err := os.MkdirTemp("", "tar-dir-") Expect(err).NotTo(HaveOccurred()) return tmpf, tmpd } diff --git a/githubutils/repo.go b/githubutils/repo.go index c5377cfa..714075bf 100644 --- a/githubutils/repo.go +++ b/githubutils/repo.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "math" "net/http" "os" @@ -139,7 +138,7 @@ func GetRawGitFile(ctx context.Context, client *github.Client, content *github.R } defer r.Close() - byt, err := ioutil.ReadAll(r) + byt, err := io.ReadAll(r) return byt, err } diff --git a/githubutils/upload_release_asset.go b/githubutils/upload_release_asset.go index cde0ae53..f0e4dbb2 100644 --- a/githubutils/upload_release_asset.go +++ b/githubutils/upload_release_asset.go @@ -5,7 +5,6 @@ import ( "crypto/sha256" "encoding/hex" "io" - "io/ioutil" "log" "os" "path/filepath" @@ -121,7 +120,7 @@ func writeSha256OrExit(ctx context.Context, file *os.File, outputPath string) { contextutils.LoggerFrom(ctx).Fatal(err) } sha256String := hex.EncodeToString(h.Sum(nil)) + " " + filepath.Base(file.Name()) + "\n" - err := ioutil.WriteFile(outputPath, []byte(sha256String), 0700) + err := os.WriteFile(outputPath, []byte(sha256String), 0700) if err != nil { contextutils.LoggerFrom(ctx).Fatal(err) } diff --git a/osutils/client.go b/osutils/client.go index b307dadd..2cbbd7b9 100644 --- a/osutils/client.go +++ b/osutils/client.go @@ -1,7 +1,6 @@ package osutils import ( - "io/ioutil" "os" ) @@ -18,7 +17,7 @@ func (*osClient) Getenv(key string) string { } func (*osClient) ReadFile(path string) ([]byte, error) { - return ioutil.ReadFile(path) + return os.ReadFile(path) } func NewOsClient() OsClient { diff --git a/pkgmgmtutils/internal/local_clone_change_pusher.go b/pkgmgmtutils/internal/local_clone_change_pusher.go index 2a63eeab..fc23d2fb 100644 --- a/pkgmgmtutils/internal/local_clone_change_pusher.go +++ b/pkgmgmtutils/internal/local_clone_change_pusher.go @@ -2,7 +2,6 @@ package internal import ( "context" - "io/ioutil" "os" "path/filepath" "time" @@ -33,7 +32,7 @@ func (l *localCloneChangePusher) UpdateAndPush( formulaOptions *formula_updater_types.FormulaOptions, ) error { // create temp dir for local git clone - dirTemp, err := ioutil.TempDir("", formulaOptions.RepoName) + dirTemp, err := os.MkdirTemp("", formulaOptions.RepoName) if err != nil { return err } @@ -86,7 +85,7 @@ func (l *localCloneChangePusher) UpdateAndPush( formulaPath := filepath.Join(dirTemp, formulaOptions.Path) - byt, err := ioutil.ReadFile(formulaPath) + byt, err := os.ReadFile(formulaPath) if err != nil { return err } @@ -98,7 +97,7 @@ func (l *localCloneChangePusher) UpdateAndPush( } // Write Updated file to git clone directory - err = ioutil.WriteFile(formulaPath, byt, 0644) + err = os.WriteFile(formulaPath, byt, 0644) if err != nil { return err } diff --git a/pkgmgmtutils/internal/remote_sha_getter.go b/pkgmgmtutils/internal/remote_sha_getter.go index 66ed33cf..110ef03f 100644 --- a/pkgmgmtutils/internal/remote_sha_getter.go +++ b/pkgmgmtutils/internal/remote_sha_getter.go @@ -2,7 +2,7 @@ package internal import ( "fmt" - "io/ioutil" + "io" "net/http" "strings" @@ -25,7 +25,7 @@ func (*remoteShaGetter) GetShaFromUrl(url string) (sha string, err error) { } defer resp.Body.Close() - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) if err != nil { return "", err } diff --git a/securityscanutils/commands/format_results.go b/securityscanutils/commands/format_results.go index 60ca5218..98cac3e9 100644 --- a/securityscanutils/commands/format_results.go +++ b/securityscanutils/commands/format_results.go @@ -5,7 +5,7 @@ import ( "context" "encoding/gob" "fmt" - "io/ioutil" + "io" "log" "net/http" "os" @@ -208,7 +208,7 @@ func GetSecurityScanReport(url string) (string, error) { var report string if resp.StatusCode == http.StatusOK { - bodyBytes, _ := ioutil.ReadAll(resp.Body) + bodyBytes, _ := io.ReadAll(resp.Body) report = string(bodyBytes) } else if resp.StatusCode == http.StatusNotFound { // Older releases may be missing scan results diff --git a/securityscanutils/securityscan_test.go b/securityscanutils/securityscan_test.go index 8646c20c..0adebaa5 100644 --- a/securityscanutils/securityscan_test.go +++ b/securityscanutils/securityscan_test.go @@ -3,7 +3,6 @@ package securityscanutils_test import ( "context" "fmt" - "io/ioutil" "os" "path" "sort" @@ -28,7 +27,7 @@ var _ = Describe("Security Scan Suite", func() { BeforeEach(func() { var err error - outputDir, err = ioutil.TempDir("", "") + outputDir, err = os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) }) @@ -215,7 +214,7 @@ var _ = Describe("Security Scan Suite", func() { // Accepts a list of file names and passes all tests only if the directory path passed in // as dir includes all fileNames passed in. func ExpectDirToHaveFiles(dir string, fileNames ...string) { - dirResults, err := ioutil.ReadDir(dir) + dirResults, err := os.ReadDir(dir) ExpectWithOffset(1, err).NotTo(HaveOccurred()) ExpectWithOffset(1, dirResults).To(HaveLen(len(fileNames))) var dirFiles []string diff --git a/securityscanutils/trivy_scanner_test.go b/securityscanutils/trivy_scanner_test.go index 5af9c5d8..bb666a39 100644 --- a/securityscanutils/trivy_scanner_test.go +++ b/securityscanutils/trivy_scanner_test.go @@ -2,7 +2,6 @@ package securityscanutils_test import ( "context" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -28,7 +27,7 @@ var _ = Describe("Trivy Scanner", func() { t = NewTrivyScanner(executils.CombinedOutputWithStatus) inputMarkdownTemplateFile, err = GetTemplateFile(MarkdownTrivyTemplate) Expect(err).NotTo(HaveOccurred()) - outputDir, err := ioutil.TempDir("", "") + outputDir, err := os.MkdirTemp("", "") Expect(err).NotTo(HaveOccurred()) outputFile = filepath.Join(outputDir, "test_report.docgen") inputImage = "quay.io/solo-io/gloo:1.11.1" diff --git a/securityscanutils/trivy_templates.go b/securityscanutils/trivy_templates.go index c9611772..db53e11c 100644 --- a/securityscanutils/trivy_templates.go +++ b/securityscanutils/trivy_templates.go @@ -1,7 +1,7 @@ package securityscanutils import ( - "io/ioutil" + "os" "github.com/rotisserie/eris" ) @@ -30,7 +30,7 @@ Trivy Returned Empty Report // Create tempoarary file that contains the trivy template // Trivy CLI only accepts files as input for a template, so this is a workaround func GetTemplateFile(trivyTemplate string) (string, error) { - f, err := ioutil.TempFile("", "") + f, err := os.CreateTemp("", "") if err != nil { return "", eris.Wrap(err, "Unable to create temporary file to write template to") } diff --git a/test/checks/checks_test.go b/test/checks/checks_test.go index 8445004d..a5acfd57 100644 --- a/test/checks/checks_test.go +++ b/test/checks/checks_test.go @@ -1,7 +1,7 @@ package checks import ( - "io/ioutil" + "os" "os/exec" "strings" @@ -19,7 +19,7 @@ var _ = Describe("Checks", func() { gomod, err := exec.Command("go", "env", "GOMOD").CombinedOutput() Expect(err).NotTo(HaveOccurred()) gomodfile := strings.TrimSpace(string(gomod)) - data, err := ioutil.ReadFile(gomodfile) + data, err := os.ReadFile(gomodfile) Expect(err).NotTo(HaveOccurred()) modFile, err := modfile.Parse(gomodfile, data, nil) diff --git a/testutils/consul.go b/testutils/consul.go index 6703a9b2..f6df6641 100644 --- a/testutils/consul.go +++ b/testutils/consul.go @@ -6,8 +6,6 @@ import ( "os/exec" "path/filepath" - "io/ioutil" - "time" "github.com/onsi/ginkgo/v2" @@ -30,7 +28,7 @@ func NewConsulFactory() (*ConsulFactory, error) { } // try to grab one form docker... - tmpdir, err := ioutil.TempDir(os.Getenv("HELPER_TMP"), "consul") + tmpdir, err := os.MkdirTemp(os.Getenv("HELPER_TMP"), "consul") if err != nil { return nil, err } @@ -48,7 +46,7 @@ docker rm -f $CID `, defaultConsulDockerImage, defaultConsulDockerImage) scriptfile := filepath.Join(tmpdir, "getconsul.sh") - ioutil.WriteFile(scriptfile, []byte(bash), 0755) + os.WriteFile(scriptfile, []byte(bash), 0755) cmd := exec.Command("bash", scriptfile) cmd.Dir = tmpdir @@ -83,7 +81,7 @@ type ConsulInstance struct { func (ef *ConsulFactory) NewConsulInstance() (*ConsulInstance, error) { // try to grab one form docker... - tmpdir, err := ioutil.TempDir(os.Getenv("HELPER_TMP"), "consul") + tmpdir, err := os.MkdirTemp(os.Getenv("HELPER_TMP"), "consul") if err != nil { return nil, err } diff --git a/testutils/fail_handler_unix.go b/testutils/fail_handler_unix.go index 69d1f09a..18faad2d 100644 --- a/testutils/fail_handler_unix.go +++ b/testutils/fail_handler_unix.go @@ -5,7 +5,6 @@ package testutils import ( "fmt" - "io/ioutil" "os" "os/signal" "runtime/debug" @@ -34,7 +33,7 @@ func init() { } IsDebuggerPresent = func() bool { - f, err := ioutil.ReadFile("/proc/self/status") + f, err := os.ReadFile("/proc/self/status") if err != nil { // no status so we don't know return false diff --git a/testutils/runners/consul/consul.go b/testutils/runners/consul/consul.go index a9fe1234..6e8ca1f4 100644 --- a/testutils/runners/consul/consul.go +++ b/testutils/runners/consul/consul.go @@ -2,7 +2,6 @@ package consul import ( "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -42,7 +41,7 @@ func NewConsulFactory() (*ConsulFactory, error) { } // try to grab one form docker... - tmpdir, err := ioutil.TempDir(os.Getenv("HELPER_TMP"), "consul") + tmpdir, err := os.MkdirTemp(os.Getenv("HELPER_TMP"), "consul") if err != nil { return nil, err } @@ -60,7 +59,7 @@ docker rm -f $CID `, defaultConsulDockerImage, defaultConsulDockerImage) scriptfile := filepath.Join(tmpdir, "getconsul.sh") - ioutil.WriteFile(scriptfile, []byte(bash), 0755) + os.WriteFile(scriptfile, []byte(bash), 0755) cmd := exec.Command("bash", scriptfile) cmd.Dir = tmpdir @@ -97,7 +96,7 @@ type ConsulInstance struct { func (ef *ConsulFactory) NewConsulInstance() (*ConsulInstance, error) { // try to grab one form docker... - tmpdir, err := ioutil.TempDir(os.Getenv("HELPER_TMP"), "consul") + tmpdir, err := os.MkdirTemp(os.Getenv("HELPER_TMP"), "consul") if err != nil { return nil, err } diff --git a/testutils/vault.go b/testutils/vault.go index 7bfb665f..5228c573 100644 --- a/testutils/vault.go +++ b/testutils/vault.go @@ -6,8 +6,6 @@ import ( "os/exec" "path/filepath" - "io/ioutil" - "time" "bytes" @@ -36,7 +34,7 @@ func NewVaultFactory() (*VaultFactory, error) { } // try to grab one from docker... - tmpdir, err := ioutil.TempDir(os.Getenv("HELPER_TMP"), "vault") + tmpdir, err := os.MkdirTemp(os.Getenv("HELPER_TMP"), "vault") if err != nil { return nil, err } @@ -54,7 +52,7 @@ docker rm -f $CID `, defaultVaultDockerImage, defaultVaultDockerImage) scriptfile := filepath.Join(tmpdir, "getvault.sh") - ioutil.WriteFile(scriptfile, []byte(bash), 0755) + os.WriteFile(scriptfile, []byte(bash), 0755) cmd := exec.Command("bash", scriptfile) cmd.Dir = tmpdir @@ -90,7 +88,7 @@ type VaultInstance struct { func (ef *VaultFactory) NewVaultInstance() (*VaultInstance, error) { // try to grab one form docker... - tmpdir, err := ioutil.TempDir(os.Getenv("HELPER_TMP"), "vault") + tmpdir, err := os.MkdirTemp(os.Getenv("HELPER_TMP"), "vault") if err != nil { return nil, err } diff --git a/versionutils/repo_test.go b/versionutils/repo_test.go index 937ca6d9..3119d5fd 100644 --- a/versionutils/repo_test.go +++ b/versionutils/repo_test.go @@ -1,7 +1,6 @@ package versionutils_test import ( - "io/ioutil" "os" "path/filepath" @@ -36,10 +35,10 @@ var _ = Describe("Repo", func() { ) BeforeEach(func() { - tmpDir, err = ioutil.TempDir("", "toml-parse-test-") + tmpDir, err = os.MkdirTemp("", "toml-parse-test-") Expect(err).NotTo(HaveOccurred()) tomlFile = filepath.Join(tmpDir, "Gopkg.toml") - err = ioutil.WriteFile(tomlFile, []byte(tomlContent), 0700) + err = os.WriteFile(tomlFile, []byte(tomlContent), 0700) Expect(err).NotTo(HaveOccurred()) tomlWrapper, err = ParseFullTomlFromDir(tmpDir)