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
@@ -6,7 +6,6 @@ package testlib
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -164,7 +163,7 @@ func (h *MainHelper) PreloadMigrations() {
|
||||
} else {
|
||||
finalPath = filepath.Join("mattermost-server", relPath, "postgres_migration_warmup.sql")
|
||||
}
|
||||
buf, err = ioutil.ReadFile(finalPath)
|
||||
buf, err = os.ReadFile(finalPath)
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("cannot read file: %v", err))
|
||||
}
|
||||
@@ -175,7 +174,7 @@ func (h *MainHelper) PreloadMigrations() {
|
||||
} else {
|
||||
finalPath = filepath.Join("mattermost-server", relPath, "mysql_migration_warmup.sql")
|
||||
}
|
||||
buf, err = ioutil.ReadFile(finalPath)
|
||||
buf, err = os.ReadFile(finalPath)
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("cannot read file: %v", err))
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ package testlib
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
@@ -116,7 +115,7 @@ func CopyFile(src, dst string) error {
|
||||
func SetupTestResources() (string, error) {
|
||||
testResourcesToSetup := getTestResourcesToSetup()
|
||||
|
||||
tempDir, err := ioutil.TempDir("", "testlib")
|
||||
tempDir, err := os.MkdirTemp("", "testlib")
|
||||
if err != nil {
|
||||
return "", errors.Wrap(err, "failed to create temporary directory")
|
||||
}
|
||||
@@ -195,7 +194,7 @@ func setupConfig(configDir string) error {
|
||||
}
|
||||
|
||||
configJSON := path.Join(configDir, "config.json")
|
||||
err = ioutil.WriteFile(configJSON, buf, 0644)
|
||||
err = os.WriteFile(configJSON, buf, 0644)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to write config to %s", configJSON)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user