mirror of
https://github.com/containers/podman.git
synced 2026-10-23 18:29:13 -04:00
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>
This commit is contained in:
126 files changed
+347
-452
No files matched your search
+1
-2
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user