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>
---
 pkg/auth/auth.go      | 3 +--
 pkg/auth/auth_test.go | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'pkg/auth')

diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index 270cd4207..52a632b33 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
@@ -233,7 +232,7 @@ func encodeMultiAuthConfigs(authConfigs map[string]types.DockerAuthConfig) (stri
 // TMPDIR will be used.
 func authConfigsToAuthFile(authConfigs map[string]types.DockerAuthConfig) (string, error) {
 	// Initialize an empty temporary JSON file.
-	tmpFile, err := ioutil.TempFile("", "auth.json.")
+	tmpFile, err := os.CreateTemp("", "auth.json.")
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go
index f25cbf2cc..90a81ac9a 100644
--- a/pkg/auth/auth_test.go
+++ b/pkg/auth/auth_test.go
@@ -3,7 +3,6 @@ package auth
 import (
 	"encoding/base64"
 	"encoding/json"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"testing"
@@ -37,10 +36,10 @@ func systemContextForAuthFile(t *testing.T, fileContents string) (*types.SystemC
 		return nil, func() {}
 	}
 
-	f, err := ioutil.TempFile("", "auth.json")
+	f, err := os.CreateTemp("", "auth.json")
 	require.NoError(t, err)
 	path := f.Name()
-	err = ioutil.WriteFile(path, []byte(fileContents), 0700)
+	err = os.WriteFile(path, []byte(fileContents), 0700)
 	require.NoError(t, err)
 	return &types.SystemContext{AuthFilePath: path}, func() { os.Remove(path) }
 }
@@ -347,7 +346,7 @@ func TestAuthConfigsToAuthFile(t *testing.T) {
 			assert.Empty(t, filePath)
 		} else {
 			assert.NoError(t, err)
-			content, err := ioutil.ReadFile(filePath)
+			content, err := os.ReadFile(filePath)
 			require.NoError(t, err)
 			assert.Contains(t, string(content), tc.expectedContains)
 			os.Remove(filePath)
-- 
cgit v1.2.3-54-g00ecf