github/zfssa-csi-driver
1
0
Fork 0
mirror of https://github.com/oracle/zfssa-csi-driver.git synced 2025-06-28 14:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from aboovara-orcl/read_zfssa_target_from_file

Browse Source 
Add ability to provide config values via mounted file
This commit is contained in:
Paul Monday 2023-05-11 16:10:44 -06:00 committed by GitHub
commit e6f3d2ca17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/service/service.go
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates.
* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
*/
@ -31,6 +31,7 @@ const (
DefaultLogLevel = "3"
DefaultCertPath = "/mnt/certs/zfssa.crt"
DefaultCredPath = "/mnt/zfssa/zfssa.yaml"
DefaultConfigPath = "/mnt/config/config.yaml"
)
type ZFSSADriver struct {
@ -174,7 +175,9 @@ func getConfig(zd *ZFSSADriver) error {
return errors.New(fmt.Sprintf("Cannot get ZFSSA username: %s", err))
}
appliance := getEnvFallback("ZFSSA_TARGET", "")
// Get ZFSSA_TARGET from the mounted config file if available
zfssaHost, _ := utils.GetValueFromYAML(DefaultConfigPath,"ZFSSA_TARGET")
appliance := getEnvFallback("ZFSSA_TARGET", zfssaHost)
zd.config.Appliance = strings.TrimSpace(appliance)
if zd.config.Appliance == "not-set" {
return errors.New("appliance name required")

39
pkg/utils/parser_utils.go Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates.
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
*/
package utils
import (
"io/ioutil"
"gopkg.in/yaml.v2"
"errors"
"fmt"
)
func GetValueFromYAML(yamlFilePath string, key string) (string, error) {
yamlData, err := ioutil.ReadFile(yamlFilePath)
if err != nil {
return "", errors.New(fmt.Sprintf("the file <%s> could not be read from: <%s>",
yamlFilePath, err))
}
// Unmarshal YAML into a map[string]interface{}
yamlMap := make(map[string]interface{})
err = yaml.Unmarshal(yamlData, &yamlMap)
if err != nil {
return "", errors.New(fmt.Sprintf("the file <%s> could not be parsed: <%s>",
yamlFilePath, err))
}
// Get value from map using key
value, ok := yamlMap[key]
if !ok {
return "", errors.New(fmt.Sprintf("key: <%s> could not be retrieved from <%s> : <%s>",
key, yamlFilePath, err))
}
// Convert value to string and return
return fmt.Sprintf("%v", value), nil
}