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
@@ -7,7 +7,6 @@ import (
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -39,7 +38,7 @@ type pluginSignaturePath struct {
|
||||
signaturePath string
|
||||
}
|
||||
|
||||
//Ensure routerService implements `product.RouterService`
|
||||
// Ensure routerService implements `product.RouterService`
|
||||
var _ product.RouterService = (*routerService)(nil)
|
||||
|
||||
type routerService struct {
|
||||
@@ -976,7 +975,7 @@ func (ch *Channels) processPrepackagedPlugin(pluginPath *pluginSignaturePath) (*
|
||||
}
|
||||
defer fileReader.Close()
|
||||
|
||||
tmpDir, err := ioutil.TempDir("", "plugintmp")
|
||||
tmpDir, err := os.MkdirTemp("", "plugintmp")
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "Failed to create temp dir plugintmp")
|
||||
}
|
||||
@@ -1086,7 +1085,7 @@ func getPrepackagedPlugin(pluginPath *pluginSignaturePath, pluginFile io.ReadSee
|
||||
if sigErr != nil {
|
||||
return nil, "", errors.Wrapf(sigErr, "Failed to open prepackaged plugin signature %s", sig)
|
||||
}
|
||||
bytes, sigErr := ioutil.ReadAll(sigReader)
|
||||
bytes, sigErr := io.ReadAll(sigReader)
|
||||
if sigErr != nil {
|
||||
return nil, "", errors.Wrapf(sigErr, "Failed to read prepackaged plugin signature %s", sig)
|
||||
}
|
||||
@@ -1105,7 +1104,7 @@ func getPrepackagedPlugin(pluginPath *pluginSignaturePath, pluginFile io.ReadSee
|
||||
}
|
||||
|
||||
func getIcon(iconPath string) (string, error) {
|
||||
icon, err := ioutil.ReadFile(iconPath)
|
||||
icon, err := os.ReadFile(iconPath)
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "failed to open icon at path %s", iconPath)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user