From d968f3fe09a4c7d74464cfe2eaa9e4febbe61ba5 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Tue, 20 Sep 2022 09:59:28 -0400
Subject: Replace deprecated ioutil

Package `io/ioutil` was deprecated in golang 1.16, preventing podman from
building under Fedora 37.  Fortunately, functionality identical
replacements are provided by the packages `io` and `os`.  Replace all
usage of all `io/ioutil` symbols with appropriate substitutions
according to the golang docs.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 libpod/events/logfile.go      |  5 ++---
 libpod/events/logfile_test.go | 17 ++++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'libpod/events')

diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go
index d749a0d4d..bb0f461e3 100644
--- a/libpod/events/logfile.go
+++ b/libpod/events/logfile.go
@@ -9,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -204,11 +203,11 @@ func truncate(filePath string) error {
 	size := origFinfo.Size()
 	threshold := size / 2
 
-	tmp, err := ioutil.TempFile(path.Dir(filePath), "")
+	tmp, err := os.CreateTemp(path.Dir(filePath), "")
 	if err != nil {
 		// Retry in /tmp in case creating a tmp file in the same
 		// directory has failed.
-		tmp, err = ioutil.TempFile("", "")
+		tmp, err = os.CreateTemp("", "")
 		if err != nil {
 			return err
 		}
diff --git a/libpod/events/logfile_test.go b/libpod/events/logfile_test.go
index 302533c12..50141168e 100644
--- a/libpod/events/logfile_test.go
+++ b/libpod/events/logfile_test.go
@@ -1,7 +1,6 @@
 package events
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -29,7 +28,7 @@ func TestRotateLog(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		tmp, err := ioutil.TempFile("", "log-rotation-")
+		tmp, err := os.CreateTemp("", "log-rotation-")
 		require.NoError(t, err)
 		defer os.Remove(tmp.Name())
 		defer tmp.Close()
@@ -84,7 +83,7 @@ func TestTruncationOutput(t *testing.T) {
 10
 `
 	// Create dummy file
-	tmp, err := ioutil.TempFile("", "log-rotation")
+	tmp, err := os.CreateTemp("", "log-rotation")
 	require.NoError(t, err)
 	defer os.Remove(tmp.Name())
 	defer tmp.Close()
@@ -94,11 +93,11 @@ func TestTruncationOutput(t *testing.T) {
 	require.NoError(t, err)
 
 	// Truncate the file
-	beforeTruncation, err := ioutil.ReadFile(tmp.Name())
+	beforeTruncation, err := os.ReadFile(tmp.Name())
 	require.NoError(t, err)
 	err = truncate(tmp.Name())
 	require.NoError(t, err)
-	afterTruncation, err := ioutil.ReadFile(tmp.Name())
+	afterTruncation, err := os.ReadFile(tmp.Name())
 	require.NoError(t, err)
 
 	// Test if rotation was successful
@@ -116,9 +115,9 @@ func TestRenameLog(t *testing.T) {
 5
 `
 	// Create two dummy files
-	source, err := ioutil.TempFile("", "removing")
+	source, err := os.CreateTemp("", "removing")
 	require.NoError(t, err)
-	target, err := ioutil.TempFile("", "renaming")
+	target, err := os.CreateTemp("", "renaming")
 	require.NoError(t, err)
 
 	// Write to source dummy file
@@ -126,11 +125,11 @@ func TestRenameLog(t *testing.T) {
 	require.NoError(t, err)
 
 	// Rename the files
-	beforeRename, err := ioutil.ReadFile(source.Name())
+	beforeRename, err := os.ReadFile(source.Name())
 	require.NoError(t, err)
 	err = renameLog(source.Name(), target.Name())
 	require.NoError(t, err)
-	afterRename, err := ioutil.ReadFile(target.Name())
+	afterRename, err := os.ReadFile(target.Name())
 	require.NoError(t, err)
 
 	// Test if renaming was successful
-- 
cgit v1.2.3-54-g00ecf