mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-12 17:30:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: standardize error format in util.readClusterInfo()

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-12-08 15:20:13 +01:00 committed by mergify[bot]
parent 3dfe65d17c
commit 752841d213
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/util/csiconfig.go
View File

@ -71,13 +71,13 @@ func readClusterInfo(pathToConfig, clusterID string) (*ClusterInfo, error) {
// #nosec // #nosec
content, err := ioutil.ReadFile(pathToConfig) content, err := ioutil.ReadFile(pathToConfig)
if err != nil { if err != nil {
err = fmt.Errorf("error fetching configuration for cluster ID (%s). (%s)", clusterID, err) err = fmt.Errorf("error fetching configuration for cluster ID %q: %w", clusterID, err)
return nil, err return nil, err
} }
err = json.Unmarshal(content, &config) err = json.Unmarshal(content, &config)
if err != nil { if err != nil {
return nil, fmt.Errorf("unmarshal failed: %v. raw buffer response: %s", return nil, fmt.Errorf("unmarshal failed (%w), raw buffer response: %s",
err, string(content)) err, string(content))
} }
@ -87,7 +87,7 @@ func readClusterInfo(pathToConfig, clusterID string) (*ClusterInfo, error) {
} }
} }
return nil, fmt.Errorf("missing configuration for cluster ID (%s)", clusterID) return nil, fmt.Errorf("missing configuration for cluster ID %q", clusterID)
} }
// Mons returns a comma separated MON list from the csi config for the given clusterID. // Mons returns a comma separated MON list from the csi config for the given clusterID.