jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-11-06 09:09:19 +02:00
Code Issues Releases Activity

Merge branch 'master' into cfg-hierarchical-defaults

Browse Source
This commit is contained in:
Sven Merk
2019-11-06 12:13:15 +01:00
committed by GitHub
parent 147bc745af de31cde9b8
commit 6721c59a30
8 changed files with 248 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/getConfig.go
View File

@@ -53,9 +53,12 @@ func generateConfig() error {
return errors.Wrap(err, "metadata: read failed")
}
customConfig, err := configOptions.openFile(generalConfig.customConfig)
if err != nil {
return errors.Wrap(err, "config: open failed")
var customConfig io.ReadCloser
if fileExists(generalConfig.customConfig) {
customConfig, err = configOptions.openFile(generalConfig.customConfig)
if err != nil {
return errors.Wrap(err, "config: open failed")
}
}
defaultConfig, paramFilter, err := defaultsAndFilters(&metadata)
@@ -116,3 +119,11 @@ func defaultsAndFilters(metadata *config.StepData) ([]io.ReadCloser, config.Step
//ToDo: retrieve default values from metadata
return nil, metadata.GetParameterFilters(), nil
}
func fileExists(filename string) bool {
info, err := os.Stat(filename)
if os.IsNotExist(err) {
return false
}
return !info.IsDir()
}