Merge pull request #714 from monopole/deleteField

DataSources is now common to Secrets and ConfigMaps.
kubernetes-sigs · Jan 23, 2019 · 1edfdea · 1edfdea
2 parents 244b3a2 + d141b24
commit 1edfdea
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 38 deletions.
diff --git a/k8sdeps/configmapandsecret/configmapfactory_test.go b/k8sdeps/configmapandsecret/configmapfactory_test.go
@@ -95,9 +95,11 @@ func TestConstructConfigMap(t *testing.T) {
 		{
 			description: "construct config map from env",
 			input: types.ConfigMapArgs{
-				GeneratorArgs: types.GeneratorArgs{Name: "envConfigMap"},
-				DataSources: types.DataSources{
-					EnvSource: "configmap/app.env",
+				GeneratorArgs: types.GeneratorArgs{
+					Name: "envConfigMap",
+					DataSources: types.DataSources{
+						EnvSource: "configmap/app.env",
+					},
 				},
 			},
 			options:  nil,
@@ -106,9 +108,11 @@ func TestConstructConfigMap(t *testing.T) {
 		{
 			description: "construct config map from file",
 			input: types.ConfigMapArgs{
-				GeneratorArgs: types.GeneratorArgs{Name: "fileConfigMap"},
-				DataSources: types.DataSources{
-					FileSources: []string{"configmap/app-init.ini", "configmap/app.bin"},
+				GeneratorArgs: types.GeneratorArgs{
+					Name: "fileConfigMap",
+					DataSources: types.DataSources{
+						FileSources: []string{"configmap/app-init.ini", "configmap/app.bin"},
+					},
 				},
 			},
 			options:  nil,
@@ -117,9 +121,11 @@ func TestConstructConfigMap(t *testing.T) {
 		{
 			description: "construct config map from literal",
 			input: types.ConfigMapArgs{
-				GeneratorArgs: types.GeneratorArgs{Name: "literalConfigMap"},
-				DataSources: types.DataSources{
-					LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
+				GeneratorArgs: types.GeneratorArgs{
+					Name: "literalConfigMap",
+					DataSources: types.DataSources{
+						LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
+					},
 				},
 			},
 			options: &types.GeneratorOptions{

diff --git a/k8sdeps/configmapandsecret/secretfactory_test.go b/k8sdeps/configmapandsecret/secretfactory_test.go
@@ -93,9 +93,11 @@ func TestConstructSecret(t *testing.T) {
 		{
 			description: "construct secret from env",
 			input: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{Name: "envSecret"},
-				DataSources: types.DataSources{
-					EnvSource: "secret/app.env",
+				GeneratorArgs: types.GeneratorArgs{
+					Name: "envSecret",
+					DataSources: types.DataSources{
+						EnvSource: "secret/app.env",
+					},
 				},
 			},
 			options:  nil,
@@ -104,9 +106,11 @@ func TestConstructSecret(t *testing.T) {
 		{
 			description: "construct secret from file",
 			input: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{Name: "fileSecret"},
-				DataSources: types.DataSources{
-					FileSources: []string{"secret/app-init.ini"},
+				GeneratorArgs: types.GeneratorArgs{
+					Name: "fileSecret",
+					DataSources: types.DataSources{
+						FileSources: []string{"secret/app-init.ini"},
+					},
 				},
 			},
 			options:  nil,
@@ -115,9 +119,11 @@ func TestConstructSecret(t *testing.T) {
 		{
 			description: "construct secret from literal",
 			input: types.SecretArgs{
-				GeneratorArgs: types.GeneratorArgs{Name: "literalSecret"},
-				DataSources: types.DataSources{
-					LiteralSources: []string{"a=x", "b=y"},
+				GeneratorArgs: types.GeneratorArgs{
+					Name: "literalSecret",
+					DataSources: types.DataSources{
+						LiteralSources: []string{"a=x", "b=y"},
+					},
 				},
 			},
 			options: &types.GeneratorOptions{

diff --git a/pkg/resmap/factory_test.go b/pkg/resmap/factory_test.go
@@ -151,9 +151,11 @@ func TestNewFromConfigMaps(t *testing.T) {
 			description: "construct config map from env",
 			input: []types.ConfigMapArgs{
 				{
-					GeneratorArgs: types.GeneratorArgs{Name: "envConfigMap"},
-					DataSources: types.DataSources{
-						EnvSource: "app.env",
+					GeneratorArgs: types.GeneratorArgs{
+						Name: "envConfigMap",
+						DataSources: types.DataSources{
+							EnvSource: "app.env",
+						},
 					},
 				},
 			},
@@ -177,9 +179,11 @@ func TestNewFromConfigMaps(t *testing.T) {
 		{
 			description: "construct config map from file",
 			input: []types.ConfigMapArgs{{
-				GeneratorArgs: types.GeneratorArgs{Name: "fileConfigMap"},
-				DataSources: types.DataSources{
-					FileSources: []string{"app-init.ini"},
+				GeneratorArgs: types.GeneratorArgs{
+					Name: "fileConfigMap",
+					DataSources: types.DataSources{
+						FileSources: []string{"app-init.ini"},
+					},
 				},
 			},
 			},
@@ -205,9 +209,11 @@ BAR=baz
 			description: "construct config map from literal",
 			input: []types.ConfigMapArgs{
 				{
-					GeneratorArgs: types.GeneratorArgs{Name: "literalConfigMap"},
-					DataSources: types.DataSources{
-						LiteralSources: []string{"a=x", "b=y", "c=\"Good Morning\"", "d=\"false\""},
+					GeneratorArgs: types.GeneratorArgs{
+						Name: "literalConfigMap",
+						DataSources: types.DataSources{
+							LiteralSources: []string{"a=x", "b=y", "c=\"Good Morning\"", "d=\"false\""},
+						},
 					},
 				},
 			},
@@ -251,11 +257,13 @@ var secret = gvk.Gvk{Version: "v1", Kind: "Secret"}
 func TestNewResMapFromSecretArgs(t *testing.T) {
 	secrets := []types.SecretArgs{
 		{
-			GeneratorArgs: types.GeneratorArgs{Name: "apple"},
-			DataSources: types.DataSources{
-				LiteralSources: []string{
-					"DB_USERNAME=admin",
-					"DB_PASSWORD=somepw",
+			GeneratorArgs: types.GeneratorArgs{
+				Name: "apple",
+				DataSources: types.DataSources{
+					LiteralSources: []string{
+						"DB_USERNAME=admin",
+						"DB_PASSWORD=somepw",
+					},
 				},
 			},
 			Type: ifc.SecretTypeOpaque,

diff --git a/pkg/types/kustomization.go b/pkg/types/kustomization.go
@@ -206,15 +206,15 @@ type GeneratorArgs struct {
 	//   'replace': replace the existing one
 	//   'merge': merge with the existing one
 	Behavior string `json:"behavior,omitempty" yaml:"behavior,omitempty"`
+
+	// DataSources for the generator.
+	DataSources `json:",inline,omitempty" yaml:",inline,omitempty"`
 }
 
 // ConfigMapArgs contains the metadata of how to generate a configmap.
 type ConfigMapArgs struct {
 	// GeneratorArgs for the configmap.
 	GeneratorArgs `json:",inline,omitempty" yaml:",inline,omitempty"`
-
-	// DataSources for configmap.
-	DataSources `json:",inline,omitempty" yaml:",inline,omitempty"`
 }
 
 // SecretArgs contains the metadata of how to generate a secret.
@@ -230,9 +230,6 @@ type SecretArgs struct {
 	// If type is "kubernetes.io/tls", then "literals" or "files" must have exactly two
 	// keys: "tls.key" and "tls.crt"
 	Type string `json:"type,omitempty" yaml:"type,omitempty"`
-
-	// DataSources for secret.
-	DataSources `json:",inline,omitempty" yaml:",inline,omitempty"`
 }
 
 // DataSources contains some generic sources for configmaps.