Replace deprecated function calls

Signed-off-by: Maksym Pavlenko <[email protected]>
mxpv · Apr 1, 2024 · e784990 · e784990
1 parent d8e042a
commit e784990
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 21 deletions.
diff --git a/cmd/podsync/config.go b/cmd/podsync/config.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"regexp"
 
@@ -54,7 +54,7 @@ type Log struct {
 
 // LoadConfig loads TOML configuration from a file path
 func LoadConfig(path string) (*Config, error) {
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to read config file: %s", path)
 	}

diff --git a/pkg/fs/local_test.go b/pkg/fs/local_test.go
@@ -3,13 +3,11 @@ package fs
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 var (
@@ -23,10 +21,7 @@ func TestNewLocal(t *testing.T) {
 }
 
 func TestLocal_Create(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "podsync-local-stor-")
-	require.NoError(t, err)
-
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 
 	stor, err := NewLocal(tmpDir)
 	assert.NoError(t, err)
@@ -41,8 +36,7 @@ func TestLocal_Create(t *testing.T) {
 }
 
 func TestLocal_Size(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "podsync-local-stor-")
-	require.NoError(t, err)
+	tmpDir := t.TempDir()
 
 	defer os.RemoveAll(tmpDir)
 
@@ -66,10 +60,7 @@ func TestLocal_NoSize(t *testing.T) {
 }
 
 func TestLocal_Delete(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "podsync-local-stor-")
-	require.NoError(t, err)
-
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 
 	stor, err := NewLocal(tmpDir)
 	assert.NoError(t, err)
@@ -89,11 +80,7 @@ func TestLocal_Delete(t *testing.T) {
 
 func TestLocal_copyFile(t *testing.T) {
 	reader := bytes.NewReader([]byte{1, 2, 4})
-
-	tmpDir, err := ioutil.TempDir("", "podsync-test-")
-	require.NoError(t, err)
-
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 
 	file := filepath.Join(tmpDir, "1")
 

diff --git a/pkg/fs/s3_test.go b/pkg/fs/s3_test.go
@@ -2,7 +2,7 @@ package fs
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 
@@ -98,7 +98,7 @@ func newMockS3(files map[string][]byte, prefix string) (*S3, error) {
 }
 
 func (m *mockS3API) PutObjectRequest(input *s3.PutObjectInput) (*request.Request, *s3.PutObjectOutput) {
-	content, _ := ioutil.ReadAll(input.Body)
+	content, _ := io.ReadAll(input.Body)
 	req := request.New(aws.Config{}, metadata.ClientInfo{}, request.Handlers{}, nil, &request.Operation{}, nil, nil)
 	m.files[*input.Key] = content
 	return req, &s3.PutObjectOutput{}