got namespace filter test to pass with node string tag

kubernetes-sigs · Jan 25, 2022 · f4008c0 · f4008c0
1 parent 7beb686
commit f4008c0
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 45 deletions.
diff --git a/api/filters/filtersutil/setters.go b/api/filters/filtersutil/setters.go
@@ -19,6 +19,7 @@ func SetString(value string) SetFn {
 	n := &yaml.Node{
 		Kind:  yaml.ScalarNode,
 		Value: value,
+		Tag:   yaml.NodeTagString,
 	}
 	if yaml.IsYaml1_1NonString(n) {
 		n.Style = yaml.DoubleQuotedStyle

diff --git a/api/filters/namespace/namespace.go b/api/filters/namespace/namespace.go
@@ -77,7 +77,8 @@ func (ns Filter) metaNamespaceHack(obj *yaml.RNode, gvk resid.Gvk) error {
 		FsSlice: []types.FieldSpec{
 			{Path: types.MetadataNamespacePath, CreateIfNotPresent: true},
 		},
-		SetValue:   filtersutil.SetScalar(ns.Namespace),
+		// SetValue:   filtersutil.SetScalar(ns.Namespace),
+		SetValue:   filtersutil.SetString(ns.Namespace),
 		CreateKind: yaml.ScalarNode, // Namespace is a ScalarNode
 	}
 	_, err := f.Filter(obj)

diff --git a/api/internal/accumulator/resaccumulator.go b/api/internal/accumulator/resaccumulator.go
@@ -70,7 +70,6 @@ func (ra *ResAccumulator) GetTransformerConfig() *builtinconfig.TransformerConfi
 // by digging into a particular fieldpath of "james".
 func (ra *ResAccumulator) MergeVars(incoming []types.Var) error {
 	for _, v := range incoming {
-		fmt.Printf("MergVars v.ObjRef.Namespace: %s", v.ObjRef.Namespace)
 		targetId := resid.NewResIdWithNamespace(v.ObjRef.GVK(), v.ObjRef.Name, v.ObjRef.Namespace)
 		idMatcher := targetId.GvknEquals
 		if targetId.Namespace != "" || targetId.IsClusterScoped() {

diff --git a/api/internal/accumulator/resaccumulator_test.go b/api/internal/accumulator/resaccumulator_test.go
@@ -27,50 +27,44 @@ func makeResAccumulator(t *testing.T) *ResAccumulator {
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}
-	r := resmaptest_test.NewRmBuilderDefault(t).
-		Add(map[string]interface{}{
-			"apiVersion": "apps/v1",
-			"kind":       "Deployment",
-			"metadata": map[string]interface{}{
-				"name":      "deploy1",
-				"namespace": "01234",
-			},
-			"spec": map[string]interface{}{
-				"template": map[string]interface{}{
-					"spec": map[string]interface{}{
-						"containers": []interface{}{
-							map[string]interface{}{
-								"command": []interface{}{
-									"myserver",
-									"--somebackendService $(SERVICE_ONE)",
-									"--yetAnother $(SERVICE_TWO)",
+	err = ra.AppendAll(
+		resmaptest_test.NewRmBuilderDefault(t).
+			Add(map[string]interface{}{
+				"apiVersion": "apps/v1",
+				"kind":       "Deployment",
+				"metadata": map[string]interface{}{
+					"name": "deploy1",
+				},
+				"spec": map[string]interface{}{
+					"template": map[string]interface{}{
+						"spec": map[string]interface{}{
+							"containers": []interface{}{
+								map[string]interface{}{
+									"command": []interface{}{
+										"myserver",
+										"--somebackendService $(SERVICE_ONE)",
+										"--yetAnother $(SERVICE_TWO)",
+									},
 								},
 							},
 						},
 					},
-				},
-			}}).
-		Add(map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Service",
-			"metadata": map[string]interface{}{
-				"name": "backendOne",
-			}}).
-		Add(map[string]interface{}{
-			"apiVersion": "v1",
-			"kind":       "Service",
-			"metadata": map[string]interface{}{
-				"name": "backendTwo",
-			}}).ResMap()
-	err = ra.AppendAll(r)
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	result, err := r.AsYaml()
+				}}).
+			Add(map[string]interface{}{
+				"apiVersion": "v1",
+				"kind":       "Service",
+				"metadata": map[string]interface{}{
+					"name": "backendOne",
+				}}).
+			Add(map[string]interface{}{
+				"apiVersion": "v1",
+				"kind":       "Service",
+				"metadata": map[string]interface{}{
+					"name": "backendTwo",
+				}}).ResMap())
 	if err != nil {
 		t.Fatalf("unexpected err: %v", err)
 	}
-	t.Fatalf(string(result))
 	return ra
 }
 

diff --git a/api/internal/builtins/NamespaceTransformer.go b/api/internal/builtins/NamespaceTransformer.go
diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go
@@ -194,10 +194,6 @@ var transformerConfigurators = map[builtinhelpers.BuiltinPluginType]func(
 		}
 		c.Namespace = kt.kustomization.Namespace
 		c.FieldSpecs = tc.NameSpace
-		fmt.Printf("c.Namespace: %s\n", c.Namespace)
-		// for i, spec := range c.FieldSpecs {
-		// 	fmt.Printf("c.FieldSpecs[%d]: %s\n", i, spec.String())
-		// }
 		p := f()
 		err = kt.configureBuiltinPlugin(p, c, bpt)
 		if err != nil {