Replace deprecated ioutil with io and os (#20776)
* Replace ioutil with io and os * Replace ioutil in utils/file.go * Minor fix to tests and excluded files Co-authored-by: Tim Scheuermann <tim.scheuermann@mattermost.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
15b6046a62
Коммит
b4570afa90
@@ -10,7 +10,6 @@ import (
|
||||
_ "embed"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/user"
|
||||
@@ -257,7 +256,7 @@ func download(url string, limit int64) (string, error) {
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
out, err := ioutil.TempFile("", "*_mattermost.tar.gz")
|
||||
out, err := os.CreateTemp("", "*_mattermost.tar.gz")
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@@ -310,7 +309,7 @@ func extractBinary(executablePath string, filename string) error {
|
||||
|
||||
if header.Typeflag == tar.TypeReg && header.Name == "mattermost/bin/mattermost" {
|
||||
permissions := getFilePermissionsOrDefault(executablePath, 0755)
|
||||
tmpFile, err := ioutil.TempFile(path.Dir(executablePath), "*")
|
||||
tmpFile, err := os.CreateTemp(path.Dir(executablePath), "*")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ package upgrader
|
||||
import (
|
||||
"archive/tar"
|
||||
"compress/gzip"
|
||||
"io/ioutil"
|
||||
"io"
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
@@ -75,12 +75,12 @@ func TestGetCurrentVersionTgzURL(t *testing.T) {
|
||||
|
||||
func TestExtractBinary(t *testing.T) {
|
||||
t.Run("extract from empty file", func(t *testing.T) {
|
||||
tmpMockTarGz, err := ioutil.TempFile("", "mock_tgz")
|
||||
tmpMockTarGz, err := os.CreateTemp("", "mock_tgz")
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(tmpMockTarGz.Name())
|
||||
tmpMockTarGz.Close()
|
||||
|
||||
tmpMockExecutable, err := ioutil.TempFile("", "mock_exe")
|
||||
tmpMockExecutable, err := os.CreateTemp("", "mock_exe")
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(tmpMockExecutable.Name())
|
||||
tmpMockExecutable.Close()
|
||||
@@ -89,7 +89,7 @@ func TestExtractBinary(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("extract from empty tar.gz file", func(t *testing.T) {
|
||||
tmpMockTarGz, err := ioutil.TempFile("", "mock_tgz")
|
||||
tmpMockTarGz, err := os.CreateTemp("", "mock_tgz")
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(tmpMockTarGz.Name())
|
||||
gz := gzip.NewWriter(tmpMockTarGz)
|
||||
@@ -98,7 +98,7 @@ func TestExtractBinary(t *testing.T) {
|
||||
gz.Close()
|
||||
tmpMockTarGz.Close()
|
||||
|
||||
tmpMockExecutable, err := ioutil.TempFile("", "mock_exe")
|
||||
tmpMockExecutable, err := os.CreateTemp("", "mock_exe")
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(tmpMockExecutable.Name())
|
||||
tmpMockExecutable.Close()
|
||||
@@ -107,7 +107,7 @@ func TestExtractBinary(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("extract from tar.gz without mattermost/bin/mattermost file", func(t *testing.T) {
|
||||
tmpMockTarGz, err := ioutil.TempFile("", "mock_tgz")
|
||||
tmpMockTarGz, err := os.CreateTemp("", "mock_tgz")
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(tmpMockTarGz.Name())
|
||||
gz := gzip.NewWriter(tmpMockTarGz)
|
||||
@@ -123,7 +123,7 @@ func TestExtractBinary(t *testing.T) {
|
||||
gz.Close()
|
||||
tmpMockTarGz.Close()
|
||||
|
||||
tmpMockExecutable, err := ioutil.TempFile("", "mock_exe")
|
||||
tmpMockExecutable, err := os.CreateTemp("", "mock_exe")
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(tmpMockExecutable.Name())
|
||||
tmpMockExecutable.Close()
|
||||
@@ -132,7 +132,7 @@ func TestExtractBinary(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("extract from tar.gz with mattermost/bin/mattermost file", func(t *testing.T) {
|
||||
tmpMockTarGz, err := ioutil.TempFile("", "mock_tgz")
|
||||
tmpMockTarGz, err := os.CreateTemp("", "mock_tgz")
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(tmpMockTarGz.Name())
|
||||
gz := gzip.NewWriter(tmpMockTarGz)
|
||||
@@ -148,7 +148,7 @@ func TestExtractBinary(t *testing.T) {
|
||||
gz.Close()
|
||||
tmpMockTarGz.Close()
|
||||
|
||||
tmpMockExecutable, err := ioutil.TempFile("", "mock_exe")
|
||||
tmpMockExecutable, err := os.CreateTemp("", "mock_exe")
|
||||
require.NoError(t, err)
|
||||
defer os.Remove(tmpMockExecutable.Name())
|
||||
tmpMockExecutable.Close()
|
||||
@@ -157,7 +157,7 @@ func TestExtractBinary(t *testing.T) {
|
||||
tmpMockExecutableAfter, err := os.Open(tmpMockExecutable.Name())
|
||||
require.NoError(t, err)
|
||||
defer tmpMockExecutableAfter.Close()
|
||||
bytes, err := ioutil.ReadAll(tmpMockExecutableAfter)
|
||||
bytes, err := io.ReadAll(tmpMockExecutableAfter)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, []byte("test"), bytes)
|
||||
})
|
||||
|
||||
Ссылка в новой задаче
Block a user