mirror of https://github.com/helm/helm
Merge pull request #6142 from joelanford/decouple-cli-vals
cmd/*,pkg/*: move ValueOptions and decouple from SDKpull/6168/head
Adam Reese
5 years ago
committed by
GitHub
commit
2aee21730d
@ -0,0 +1,117 @@
|
|||||||
|
/*
|
||||||
|
Copyright The Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package values
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io/ioutil"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"sigs.k8s.io/yaml"
|
||||||
|
|
||||||
|
"helm.sh/helm/pkg/cli"
|
||||||
|
"helm.sh/helm/pkg/getter"
|
||||||
|
"helm.sh/helm/pkg/strvals"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Options struct {
|
||||||
|
ValueFiles []string
|
||||||
|
StringValues []string
|
||||||
|
Values []string
|
||||||
|
}
|
||||||
|
|
||||||
|
// MergeValues merges values from files specified via -f/--values and
|
||||||
|
// directly via --set or --set-string, marshaling them to YAML
|
||||||
|
func (opts *Options) MergeValues(settings cli.EnvSettings) (map[string]interface{}, error) {
|
||||||
|
base := map[string]interface{}{}
|
||||||
|
|
||||||
|
// User specified a values files via -f/--values
|
||||||
|
for _, filePath := range opts.ValueFiles {
|
||||||
|
currentMap := map[string]interface{}{}
|
||||||
|
|
||||||
|
bytes, err := readFile(filePath, settings)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := yaml.Unmarshal(bytes, ¤tMap); err != nil {
|
||||||
|
return nil, errors.Wrapf(err, "failed to parse %s", filePath)
|
||||||
|
}
|
||||||
|
// Merge with the previous map
|
||||||
|
base = mergeMaps(base, currentMap)
|
||||||
|
}
|
||||||
|
|
||||||
|
// User specified a value via --set
|
||||||
|
for _, value := range opts.Values {
|
||||||
|
if err := strvals.ParseInto(value, base); err != nil {
|
||||||
|
return nil, errors.Wrap(err, "failed parsing --set data")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// User specified a value via --set-string
|
||||||
|
for _, value := range opts.StringValues {
|
||||||
|
if err := strvals.ParseIntoString(value, base); err != nil {
|
||||||
|
return nil, errors.Wrap(err, "failed parsing --set-string data")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return base, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func mergeMaps(a, b map[string]interface{}) map[string]interface{} {
|
||||||
|
out := make(map[string]interface{}, len(a))
|
||||||
|
for k, v := range a {
|
||||||
|
out[k] = v
|
||||||
|
}
|
||||||
|
for k, v := range b {
|
||||||
|
if v, ok := v.(map[string]interface{}); ok {
|
||||||
|
if bv, ok := out[k]; ok {
|
||||||
|
if bv, ok := bv.(map[string]interface{}); ok {
|
||||||
|
out[k] = mergeMaps(bv, v)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out[k] = v
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// readFile load a file from stdin, the local directory, or a remote file with a url.
|
||||||
|
func readFile(filePath string, settings cli.EnvSettings) ([]byte, error) {
|
||||||
|
if strings.TrimSpace(filePath) == "-" {
|
||||||
|
return ioutil.ReadAll(os.Stdin)
|
||||||
|
}
|
||||||
|
u, _ := url.Parse(filePath)
|
||||||
|
p := getter.All(settings)
|
||||||
|
|
||||||
|
// FIXME: maybe someone handle other protocols like ftp.
|
||||||
|
getterConstructor, err := p.ByScheme(u.Scheme)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return ioutil.ReadFile(filePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
getter, err := getterConstructor(getter.WithURL(filePath))
|
||||||
|
if err != nil {
|
||||||
|
return []byte{}, err
|
||||||
|
}
|
||||||
|
data, err := getter.Get(filePath)
|
||||||
|
return data.Bytes(), err
|
||||||
|
}
|
||||||
@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
Copyright The Helm Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package values
|
||||||
|
|
||||||
|
import (
|
||||||
|
"reflect"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMergeValues(t *testing.T) {
|
||||||
|
nestedMap := map[string]interface{}{
|
||||||
|
"foo": "bar",
|
||||||
|
"baz": map[string]string{
|
||||||
|
"cool": "stuff",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
anotherNestedMap := map[string]interface{}{
|
||||||
|
"foo": "bar",
|
||||||
|
"baz": map[string]string{
|
||||||
|
"cool": "things",
|
||||||
|
"awesome": "stuff",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
flatMap := map[string]interface{}{
|
||||||
|
"foo": "bar",
|
||||||
|
"baz": "stuff",
|
||||||
|
}
|
||||||
|
anotherFlatMap := map[string]interface{}{
|
||||||
|
"testing": "fun",
|
||||||
|
}
|
||||||
|
|
||||||
|
testMap := mergeMaps(flatMap, nestedMap)
|
||||||
|
equal := reflect.DeepEqual(testMap, nestedMap)
|
||||||
|
if !equal {
|
||||||
|
t.Errorf("Expected a nested map to overwrite a flat value. Expected: %v, got %v", nestedMap, testMap)
|
||||||
|
}
|
||||||
|
|
||||||
|
testMap = mergeMaps(nestedMap, flatMap)
|
||||||
|
equal = reflect.DeepEqual(testMap, flatMap)
|
||||||
|
if !equal {
|
||||||
|
t.Errorf("Expected a flat value to overwrite a map. Expected: %v, got %v", flatMap, testMap)
|
||||||
|
}
|
||||||
|
|
||||||
|
testMap = mergeMaps(nestedMap, anotherNestedMap)
|
||||||
|
equal = reflect.DeepEqual(testMap, anotherNestedMap)
|
||||||
|
if !equal {
|
||||||
|
t.Errorf("Expected a nested map to overwrite another nested map. Expected: %v, got %v", anotherNestedMap, testMap)
|
||||||
|
}
|
||||||
|
|
||||||
|
testMap = mergeMaps(anotherFlatMap, anotherNestedMap)
|
||||||
|
expectedMap := map[string]interface{}{
|
||||||
|
"testing": "fun",
|
||||||
|
"foo": "bar",
|
||||||
|
"baz": map[string]string{
|
||||||
|
"cool": "things",
|
||||||
|
"awesome": "stuff",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
equal = reflect.DeepEqual(testMap, expectedMap)
|
||||||
|
if !equal {
|
||||||
|
t.Errorf("Expected a map with different keys to merge properly with another map. Expected: %v, got %v", expectedMap, testMap)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in new issue