kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 09:24:23 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Rename kv.KVPair to kv.Pair

Browse Source
This commit is contained in:
Jeffrey Regan
2019-02-06 16:45:44 -08:00
parent d720e9ef49
commit 7c8db24656
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
k8sdeps/configmapandsecret/configmapfactory.go
View File

@@ -55,7 +55,7 @@ func (f *ConfigMapFactory) makeFreshConfigMap(
// MakeConfigMap returns a new ConfigMap, or nil and an error.
func (f *ConfigMapFactory) MakeConfigMap(
args *types.ConfigMapArgs, options *types.GeneratorOptions) (*corev1.ConfigMap, error) {
var all []kv.KVPair
var all []kv.Pair
var err error
cm := f.makeFreshConfigMap(args)

14
k8sdeps/configmapandsecret/kv.go
View File

@@ -26,20 +26,20 @@ import (
"sigs.k8s.io/kustomize/pkg/ifc"
)
func keyValuesFromLiteralSources(sources []string) ([]kv.KVPair, error) {
var kvs []kv.KVPair
func keyValuesFromLiteralSources(sources []string) ([]kv.Pair, error) {
var kvs []kv.Pair
for _, s := range sources {
k, v, err := parseLiteralSource(s)
if err != nil {
return nil, err
}
kvs = append(kvs, kv.KVPair{Key: k, Value: v})
kvs = append(kvs, kv.Pair{Key: k, Value: v})
}
return kvs, nil
}
func keyValuesFromFileSources(ldr ifc.Loader, sources []string) ([]kv.KVPair, error) {
var kvs []kv.KVPair
func keyValuesFromFileSources(ldr ifc.Loader, sources []string) ([]kv.Pair, error) {
var kvs []kv.Pair
for _, s := range sources {
k, fPath, err := parseFileSource(s)
if err != nil {
@@ -49,12 +49,12 @@ func keyValuesFromFileSources(ldr ifc.Loader, sources []string) ([]kv.KVPair, er
if err != nil {
return nil, err
}
kvs = append(kvs, kv.KVPair{Key: k, Value: string(content)})
kvs = append(kvs, kv.Pair{Key: k, Value: string(content)})
}
return kvs, nil
}
func keyValuesFromEnvFile(l ifc.Loader, path string) ([]kv.KVPair, error) {
func keyValuesFromEnvFile(l ifc.Loader, path string) ([]kv.Pair, error) {
if path == "" {
return nil, nil
}

4
k8sdeps/configmapandsecret/kv_test.go
View File

@@ -29,12 +29,12 @@ func TestKeyValuesFromFileSources(t *testing.T) {
tests := []struct {
description string
sources []string
expected []kv.KVPair
expected []kv.Pair
}{
{
description: "create kvs from file sources",
sources: []string{"files/app-init.ini"},
expected: []kv.KVPair{
expected: []kv.Pair{
{
Key: "app-init.ini",
Value: "FOO=bar",

2
k8sdeps/configmapandsecret/secretfactory.go
View File

@@ -54,7 +54,7 @@ func (f *SecretFactory) makeFreshSecret(args *types.SecretArgs) *corev1.Secret {
// MakeSecret returns a new secret.
func (f *SecretFactory) MakeSecret(args *types.SecretArgs, options *types.GeneratorOptions) (*corev1.Secret, error) {
var all []kv.KVPair
var all []kv.Pair
var err error
s := f.makeFreshSecret(args)