From aba6979d294b5a271d17dc8c56be7bf5fa824cd5 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 21 Jan 2022 15:02:34 +0530 Subject: [PATCH] cleanup: use os.ReadFile to read file as ioutil.ReadFile is deprecated and suggestion is to use os.ReadFile as per https://pkg.go.dev/io/ioutil updating the same. Signed-off-by: Madhu Rajanna --- e2e/cephfs.go | 5 ++--- e2e/namespace.go | 4 ++-- e2e/rbd.go | 5 ++--- e2e/utils.go | 4 ++-- internal/kms/kms.go | 3 +-- internal/rbd/rbd_util.go | 5 ++--- internal/util/cluster_mapping.go | 3 +-- internal/util/conn_pool.go | 4 ++-- internal/util/csiconfig.go | 4 ++-- internal/util/log/log_utils.go | 3 +-- 10 files changed, 17 insertions(+), 23 deletions(-) diff --git a/e2e/cephfs.go b/e2e/cephfs.go index 61a9b0ec1..6de77cd5e 100644 --- a/e2e/cephfs.go +++ b/e2e/cephfs.go @@ -19,7 +19,6 @@ package e2e import ( "context" "fmt" - "io/ioutil" "os" "strings" "sync" @@ -79,7 +78,7 @@ func deleteCephfsPlugin() { } func createORDeleteCephfsResources(action kubectlAction) { - csiDriver, err := ioutil.ReadFile(cephFSDirPath + csiDriverObject) + csiDriver, err := os.ReadFile(cephFSDirPath + csiDriverObject) if err != nil { // createORDeleteRbdResources is used for upgrade testing as csidriverObject is // newly added, discarding file not found error. @@ -92,7 +91,7 @@ func createORDeleteCephfsResources(action kubectlAction) { e2elog.Failf("failed to %s CSIDriver object: %v", action, err) } } - cephConf, err := ioutil.ReadFile(examplePath + cephConfconfigMap) + cephConf, err := os.ReadFile(examplePath + cephConfconfigMap) if err != nil { // createORDeleteCephfsResources is used for upgrade testing as cephConfConfigmap is // newly added, discarding file not found error. diff --git a/e2e/namespace.go b/e2e/namespace.go index 24cc2bddc..a9959d1a5 100644 --- a/e2e/namespace.go +++ b/e2e/namespace.go @@ -19,7 +19,7 @@ package e2e import ( "context" "fmt" - "io/ioutil" + "os" "strings" "time" @@ -87,7 +87,7 @@ func deleteNamespace(c kubernetes.Interface, name string) error { } func replaceNamespaceInTemplate(filePath string) (string, error) { - read, err := ioutil.ReadFile(filePath) + read, err := os.ReadFile(filePath) if err != nil { return "", err } diff --git a/e2e/rbd.go b/e2e/rbd.go index d39d99aef..e6de737f3 100644 --- a/e2e/rbd.go +++ b/e2e/rbd.go @@ -20,7 +20,6 @@ import ( "context" "errors" "fmt" - "io/ioutil" "os" "strings" "time" @@ -120,7 +119,7 @@ func deleteRBDPlugin() { } func createORDeleteRbdResources(action kubectlAction) { - csiDriver, err := ioutil.ReadFile(rbdDirPath + csiDriverObject) + csiDriver, err := os.ReadFile(rbdDirPath + csiDriverObject) if err != nil { // createORDeleteRbdResources is used for upgrade testing as csidriverObject is // newly added, discarding file not found error. @@ -133,7 +132,7 @@ func createORDeleteRbdResources(action kubectlAction) { e2elog.Failf("failed to %s CSIDriver object: %v", action, err) } } - cephConf, err := ioutil.ReadFile(examplePath + cephConfconfigMap) + cephConf, err := os.ReadFile(examplePath + cephConfconfigMap) if err != nil { // createORDeleteRbdResources is used for upgrade testing as cephConf Configmap is // newly added, discarding file not found error. diff --git a/e2e/utils.go b/e2e/utils.go index 69c401764..ca6da4ac0 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -23,7 +23,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "os" "regexp" "strconv" "strings" @@ -160,7 +160,7 @@ func deleteResource(scPath string) error { } func unmarshal(fileName string, obj interface{}) error { - f, err := ioutil.ReadFile(fileName) + f, err := os.ReadFile(fileName) if err != nil { return err } diff --git a/internal/kms/kms.go b/internal/kms/kms.go index 01ea68edc..e886321ac 100644 --- a/internal/kms/kms.go +++ b/internal/kms/kms.go @@ -20,7 +20,6 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" "os" "github.com/ceph/ceph-csi/internal/util/k8s" @@ -94,7 +93,7 @@ func GetKMS(tenant, kmsID string, secrets map[string]string) (EncryptionKMS, err func getKMSConfiguration() (map[string]interface{}, error) { var config map[string]interface{} // #nosec - content, err := ioutil.ReadFile(kmsConfigPath) + content, err := os.ReadFile(kmsConfigPath) if err == nil { // kmsConfigPath exists and was successfully read err = json.Unmarshal(content, &config) diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index ad4dafc8f..aa40e1d88 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -21,7 +21,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "os" "path/filepath" "strconv" @@ -244,7 +243,7 @@ func GetKrbdSupportedFeatures() (string, error) { return "", err } } - val, err := ioutil.ReadFile(krbdSupportedFeaturesFile) + val, err := os.ReadFile(krbdSupportedFeaturesFile) if err != nil { log.ErrorLogMsg("reading file %q failed: %v", krbdSupportedFeaturesFile, err) @@ -1638,7 +1637,7 @@ func lookupRBDImageMetadataStash(metaDataPath string) (rbdImageMetadataStash, er var imgMeta rbdImageMetadataStash fPath := filepath.Join(metaDataPath, stashFileName) - encodedBytes, err := ioutil.ReadFile(fPath) // #nosec - intended reading from fPath + encodedBytes, err := os.ReadFile(fPath) // #nosec - intended reading from fPath if err != nil { if !os.IsNotExist(err) { return imgMeta, fmt.Errorf("failed to read stashed JSON image metadata from path (%s): %w", fPath, err) diff --git a/internal/util/cluster_mapping.go b/internal/util/cluster_mapping.go index 37155f623..e9ec753c0 100644 --- a/internal/util/cluster_mapping.go +++ b/internal/util/cluster_mapping.go @@ -21,7 +21,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "os" "github.com/ceph/ceph-csi/internal/util/log" @@ -70,7 +69,7 @@ type ClusterMappingInfo struct { func readClusterMappingInfo(filename string) (*[]ClusterMappingInfo, error) { var info []ClusterMappingInfo - content, err := ioutil.ReadFile(filename) // #nosec:G304, file inclusion via variable. + content, err := os.ReadFile(filename) // #nosec:G304, file inclusion via variable. if err != nil { err = fmt.Errorf("error fetching clusterID mapping %w", err) diff --git a/internal/util/conn_pool.go b/internal/util/conn_pool.go index aca2bb482..8b85017db 100644 --- a/internal/util/conn_pool.go +++ b/internal/util/conn_pool.go @@ -18,7 +18,7 @@ package util import ( "fmt" - "io/ioutil" + "os" "sync" "time" @@ -96,7 +96,7 @@ func (cp *ConnPool) Destroy() { func (cp *ConnPool) generateUniqueKey(monitors, user, keyfile string) (string, error) { // the keyfile can be unique for operations, contents will be the same - key, err := ioutil.ReadFile(keyfile) // #nosec:G304, file inclusion via variable. + key, err := os.ReadFile(keyfile) // #nosec:G304, file inclusion via variable. if err != nil { return "", fmt.Errorf("could not open keyfile %s: %w", keyfile, err) } diff --git a/internal/util/csiconfig.go b/internal/util/csiconfig.go index 874ff5269..97076cde6 100644 --- a/internal/util/csiconfig.go +++ b/internal/util/csiconfig.go @@ -20,7 +20,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" + "os" "strings" ) @@ -72,7 +72,7 @@ func readClusterInfo(pathToConfig, clusterID string) (*ClusterInfo, error) { var config []ClusterInfo // #nosec - content, err := ioutil.ReadFile(pathToConfig) + content, err := os.ReadFile(pathToConfig) if err != nil { err = fmt.Errorf("error fetching configuration for cluster ID %q: %w", clusterID, err) diff --git a/internal/util/log/log_utils.go b/internal/util/log/log_utils.go index 18a778996..d78d96e63 100644 --- a/internal/util/log/log_utils.go +++ b/internal/util/log/log_utils.go @@ -15,7 +15,6 @@ package log import ( "compress/gzip" - "io/ioutil" "os" "strings" ) @@ -24,7 +23,7 @@ import ( // compressed format. func GzipLogFile(pathToFile string) error { // Get all the bytes from the file. - content, err := ioutil.ReadFile(pathToFile) // #nosec:G304, file inclusion via variable. + content, err := os.ReadFile(pathToFile) // #nosec:G304, file inclusion via variable. if err != nil { return err }