Introduce envs field.

This commit is contained in:
Jeffrey Regan
2019-05-06 13:51:08 -07:00
parent a8c476f7c0
commit 529db0493b
15 changed files with 127 additions and 84 deletions

View File

@@ -42,15 +42,14 @@ func (bf baseFactory) loadKvPairs(
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf(
"plugins: %s",
args.EnvSource))
args.KVSources))
}
all = append(all, pairs...)
pairs, err = bf.keyValuesFromEnvFile(args.EnvSource)
pairs, err = bf.keyValuesFromEnvFiles(args.EnvSources)
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf(
"env source file: %s",
args.EnvSource))
"env source files: %v",
args.EnvSources))
}
all = append(all, pairs...)
@@ -136,13 +135,18 @@ func (bf baseFactory) keyValuesFromFileSources(sources []string) ([]kv.Pair, err
return kvs, nil
}
func (bf baseFactory) keyValuesFromEnvFile(path string) ([]kv.Pair, error) {
if path == "" {
return nil, nil
func (bf baseFactory) keyValuesFromEnvFiles(paths []string) ([]kv.Pair, error) {
var kvs []kv.Pair
for _, path := range paths {
content, err := bf.ldr.Load(path)
if err != nil {
return nil, err
}
more, err := kv.KeyValuesFromLines(content)
if err != nil {
return nil, err
}
kvs = append(kvs, more...)
}
content, err := bf.ldr.Load(path)
if err != nil {
return nil, err
}
return kv.KeyValuesFromLines(content)
return kvs, nil
}

View File

@@ -99,7 +99,7 @@ func TestConstructConfigMap(t *testing.T) {
GeneratorArgs: types.GeneratorArgs{
Name: "envConfigMap",
DataSources: types.DataSources{
EnvSource: "configmap/app.env",
EnvSources: []string{"configmap/app.env"},
},
},
},

View File

@@ -97,7 +97,7 @@ func TestConstructSecret(t *testing.T) {
GeneratorArgs: types.GeneratorArgs{
Name: "envSecret",
DataSources: types.DataSources{
EnvSource: "secret/app.env",
EnvSources: []string{"secret/app.env"},
},
},
},

View File

@@ -32,7 +32,6 @@ type Registry struct {
}
const (
PluginSymbol = "KustomizePlugin"
PluginRoot = "plugin"
pluginTypeGo = types.PluginType("go")
pluginTypeBuiltIn = types.PluginType("builtin")