remove deprecated use of ioutil (#5205)

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2022-12-08 14:44:53 +01:00
committed by GitHub
parent 46cb910637
commit 53d15d329e
24 changed files with 57 additions and 67 deletions
@@ -2,7 +2,6 @@
package store
import (
"io/ioutil"
"os"
"path/filepath"
@@ -14,7 +13,7 @@ import (
func (s Store) ListRoleAssignments(accountUUID string) ([]*settingsmsg.UserRoleAssignment, error) {
var records []*settingsmsg.UserRoleAssignment
assignmentsFolder := s.buildFolderPathForRoleAssignments(false)
assignmentFiles, err := ioutil.ReadDir(assignmentsFolder)
assignmentFiles, err := os.ReadDir(assignmentsFolder)
if err != nil {
return records, nil
}
@@ -3,7 +3,7 @@ package store
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"sync"
@@ -21,7 +21,7 @@ func (s Store) ListBundles(bundleType settingsmsg.Bundle_Type, bundleIDs []strin
defer m.RUnlock()
bundlesFolder := s.buildFolderPathForBundles(false)
bundleFiles, err := ioutil.ReadDir(bundlesFolder)
bundleFiles, err := os.ReadDir(bundlesFolder)
if err != nil {
return []*settingsmsg.Bundle{}, nil
}
+2 -2
View File
@@ -1,7 +1,7 @@
package store
import (
"io/ioutil"
"io"
"os"
"github.com/owncloud/ocis/v2/services/settings/pkg/store/errortypes"
@@ -22,7 +22,7 @@ func (s Store) parseRecordFromFile(record proto.Message, filePath string) error
}
defer file.Close()
b, err := ioutil.ReadAll(file)
b, err := io.ReadAll(file)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package store
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"github.com/gofrs/uuid"
@@ -16,7 +16,7 @@ import (
// If the accountUUID is not empty, values with an empty or with a matching accountUUID are returned.
func (s Store) ListValues(bundleID, accountUUID string) ([]*settingsmsg.Value, error) {
valuesFolder := s.buildFolderPathForValues(false)
valueFiles, err := ioutil.ReadDir(valuesFolder)
valueFiles, err := os.ReadDir(valuesFolder)
if err != nil {
return []*settingsmsg.Value{}, nil
}
@@ -61,7 +61,7 @@ func (s Store) ReadValue(valueID string) (*settingsmsg.Value, error) {
// ReadValueByUniqueIdentifiers tries to find a value given a set of unique identifiers
func (s Store) ReadValueByUniqueIdentifiers(accountUUID, settingID string) (*settingsmsg.Value, error) {
valuesFolder := s.buildFolderPathForValues(false)
files, err := ioutil.ReadDir(valuesFolder)
files, err := os.ReadDir(valuesFolder)
if err != nil {
return nil, err
}