mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 10:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: make util.ClusterInfo usable outside util package

Browse Source 
functions like getClusterInfo() returns struct
instead of a set of strings.

Fix: #998

Signed-off-by: Yug Gupta <ygupta@redhat.com>
This commit is contained in:
Yug Gupta
2020-05-14 18:50:11 +05:30
committed by mergify[bot]
parent 63c458bd63
commit 2cdf5c3b9f
3 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/util/csiconfig.go
View File

@ -29,8 +29,8 @@ const (
defaultCsiSubvolumeGroup = "csi"
)
// clusterInfo strongly typed JSON spec for the above JSON structure
type clusterInfo struct {
// ClusterInfo strongly typed JSON spec for the below JSON structure
type ClusterInfo struct {
// ClusterID is used for unique identification
ClusterID string `json:"clusterID"`
// Monitors is monitor list for corresponding cluster ID
@ -58,29 +58,29 @@ type clusterInfo struct {
// },
// ...
// ]
func readClusterInfo(pathToConfig, clusterID string) (clusterInfo, error) {
var config []clusterInfo
func readClusterInfo(pathToConfig, clusterID string) (*ClusterInfo, error) {
var config []ClusterInfo
// #nosec
content, err := ioutil.ReadFile(pathToConfig)
if err != nil {
err = fmt.Errorf("error fetching configuration for cluster ID (%s). (%s)", clusterID, err)
return clusterInfo{}, err
return nil, err
}
err = json.Unmarshal(content, &config)
if err != nil {
return clusterInfo{}, fmt.Errorf("unmarshal failed: %v. raw buffer response: %s",
return nil, fmt.Errorf("unmarshal failed: %v. raw buffer response: %s",
err, string(content))
}
for _, cluster := range config {
if cluster.ClusterID == clusterID {
return cluster, nil
return &cluster, nil
}
}
return clusterInfo{}, fmt.Errorf("missing configuration for cluster ID (%s)", clusterID)
return nil, fmt.Errorf("missing configuration for cluster ID (%s)", clusterID)
}
// Mons returns a comma separated MON list from the csi config for the given clusterID