Merge pull request #3962 from natasha41575/resourceRef

remove metadata field from resourceRef schema
kubernetes-sigs · Jun 3, 2021 · 0305860 · 0305860
2 parents da1bd90 + 0205090
commit 0305860
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/kyaml/fn/framework/command/example_test.go b/kyaml/fn/framework/command/example_test.go
@@ -320,9 +320,12 @@ func ExampleBuild_validate() {
 				continue
 			}
 			validationResults = append(validationResults, framework.ResultItem{
-				Severity:    framework.Error,
-				Message:     "field is required",
-				ResourceRef: meta,
+				Severity: framework.Error,
+				Message:  "field is required",
+				ResourceRef: yaml.ResourceIdentifier{
+					TypeMeta: meta.TypeMeta,
+					NameMeta: meta.ObjectMeta.NameMeta,
+				},
 				Field: framework.Field{
 					Path:           "spec.replicas",
 					SuggestedValue: "1",
@@ -374,8 +377,7 @@ items:
 	//     resourceRef:
 	//       apiVersion: apps/v1
 	//       kind: Deployment
-	//       metadata:
-	//         name: foo
+	//       name: foo
 	//     field:
 	//       path: spec.replicas
 	//       suggestedValue: "1"

diff --git a/kyaml/fn/framework/framework_test.go b/kyaml/fn/framework/framework_test.go
@@ -22,11 +22,9 @@ func TestExecute_Result(t *testing.T) {
 				{
 					Message:  "bad value for replicas",
 					Severity: framework.Error,
-					ResourceRef: yaml.ResourceMeta{
+					ResourceRef: yaml.ResourceIdentifier{
 						TypeMeta: yaml.TypeMeta{APIVersion: "v1", Kind: "Deployment"},
-						ObjectMeta: yaml.ObjectMeta{
-							NameMeta: yaml.NameMeta{Name: "tester", Namespace: "default"},
-						},
+						NameMeta: yaml.NameMeta{Name: "tester", Namespace: "default"},
 					},
 					Field: framework.Field{
 						Path:           ".spec.Replicas",
@@ -83,9 +81,8 @@ results:
     resourceRef:
       apiVersion: v1
       kind: Deployment
-      metadata:
-        name: tester
-        namespace: default
+      name: tester
+      namespace: default
     field:
       path: .spec.Replicas
       currentValue: "0"

diff --git a/kyaml/fn/framework/result.go b/kyaml/fn/framework/result.go
@@ -31,7 +31,7 @@ type ResultItem struct {
 	Severity Severity `yaml:"severity,omitempty"`
 
 	// ResourceRef is a reference to a resource
-	ResourceRef yaml.ResourceMeta `yaml:"resourceRef,omitempty"`
+	ResourceRef yaml.ResourceIdentifier `yaml:"resourceRef,omitempty"`
 
 	// Field is a reference to the field in a resource this result refers to
 	Field Field `yaml:"field,omitempty"`
@@ -42,7 +42,7 @@ type ResultItem struct {
 
 // String provides a human-readable message for the result item
 func (i ResultItem) String() string {
-	identifier := i.ResourceRef.GetIdentifier()
+	identifier := i.ResourceRef
 	var idStringList []string
 	if identifier.APIVersion != "" {
 		idStringList = append(idStringList, identifier.APIVersion)