Merge pull request #10832 from true-north-engineering/main

Fixing downloader plugin error handling
pull/10855/head
Matt Farina 2 years ago committed by GitHub
commit 4d2e21e860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -75,6 +75,9 @@ func (opts *Options) MergeValues(p getter.Providers) (map[string]interface{}, er
for _, value := range opts.FileValues {
reader := func(rs []rune) (interface{}, error) {
bytes, err := readFile(string(rs), p)
if err != nil {
return nil, err
}
return string(bytes), err
}
if err := strvals.ParseIntoFile(value, base, reader); err != nil {
@ -117,5 +120,8 @@ func readFile(filePath string, p getter.Providers) ([]byte, error) {
return ioutil.ReadFile(filePath)
}
data, err := g.Get(filePath, getter.WithURL(filePath))
if err != nil {
return nil, err
}
return data.Bytes(), err
}

Loading…
Cancel
Save