Merge pull request #221 from apelisse/improve-operations-parsing

Improve operations parsing

Author: k8s-ci-robot

merge/real_test.go

@@ -19,7 +19,6 @@ package merge_test
 import (
 	"io/ioutil"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	. "sigs.k8s.io/structured-merge-diff/v4/internal/fixture"
@@ -38,11 +37,7 @@ func read(file string) []byte {
 	return s
 }
 
-func lastPart(s string) string {
-	return s[strings.LastIndex(s, ".")+1:]
-}
-
-var parser = func() Parser {
+var k8s = func() Parser {
 	s := read(testdata("k8s-schema.yaml"))
 	parser, err := typed.NewParser(typed.YAMLObject(s))
 	if err != nil {
@@ -53,29 +48,30 @@ var parser = func() Parser {
 
 func BenchmarkOperations(b *testing.B) {
 	benches := []struct {
-		typename string
-		obj      typed.YAMLObject
+		parseType typed.ParseableType
+		filename  string
 	}{
 		{
-			typename: "io.k8s.api.core.v1.Pod",
-			obj:      typed.YAMLObject(read(testdata("pod.yaml"))),
+			parseType: k8s.Type("io.k8s.api.core.v1.Pod"),
+			filename:  "pod.yaml",
 		},
 		{
-			typename: "io.k8s.api.core.v1.Node",
-			obj:      typed.YAMLObject(read(testdata("node.yaml"))),
+			parseType: k8s.Type("io.k8s.api.core.v1.Node"),
+			filename:  "node.yaml",
 		},
 		{
-			typename: "io.k8s.api.core.v1.Endpoints",
-			obj:      typed.YAMLObject(read(testdata("endpoints.yaml"))),
+			parseType: k8s.Type("io.k8s.api.core.v1.Endpoints"),
+			filename:  "endpoints.yaml",
 		},
 		{
-			typename: "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinition",
-			obj:      typed.YAMLObject(read(testdata("prometheus-crd.yaml"))),
+			parseType: k8s.Type("io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinition"),
+			filename:  "prometheus-crd.yaml",
 		},
 	}
 
 	for _, bench := range benches {
-		b.Run(lastPart(bench.typename), func(b *testing.B) {
+		b.Run(bench.filename, func(b *testing.B) {
+			obj := typed.YAMLObject(read(testdata(bench.filename)))
 			tests := []struct {
 				name string
 				ops  []Operation
@@ -86,7 +82,7 @@ func BenchmarkOperations(b *testing.B) {
 						Update{
 							Manager:    "controller",
 							APIVersion: "v1",
-							Object:     bench.obj,
+							Object:     obj,
 						},
 					},
 				},
@@ -96,7 +92,7 @@ func BenchmarkOperations(b *testing.B) {
 						Apply{
 							Manager:    "controller",
 							APIVersion: "v1",
-							Object:     bench.obj,
+							Object:     obj,
 						},
 					},
 				},
@@ -106,12 +102,12 @@ func BenchmarkOperations(b *testing.B) {
 						Apply{
 							Manager:    "controller",
 							APIVersion: "v1",
-							Object:     bench.obj,
+							Object:     obj,
 						},
 						Apply{
 							Manager:    "other-controller",
 							APIVersion: "v1",
-							Object:     bench.obj,
+							Object:     obj,
 						},
 					},
 				},
@@ -121,12 +117,12 @@ func BenchmarkOperations(b *testing.B) {
 						Update{
 							Manager:    "controller",
 							APIVersion: "v1",
-							Object:     bench.obj,
+							Object:     obj,
 						},
 						Update{
 							Manager:    "other-controller",
 							APIVersion: "v1",
-							Object:     bench.obj,
+							Object:     obj,
 						},
 					},
 				},
@@ -136,12 +132,12 @@ func BenchmarkOperations(b *testing.B) {
 						Update{
 							Manager:    "controller",
 							APIVersion: "v1",
-							Object:     bench.obj,
+							Object:     obj,
 						},
 						Update{
 							Manager:    "other-controller",
 							APIVersion: "v2",
-							Object:     bench.obj,
+							Object:     obj,
 						},
 					},
 				},
@@ -151,7 +147,7 @@ func BenchmarkOperations(b *testing.B) {
 					tc := TestCase{
 						Ops: test.ops,
 					}
-					p := SameVersionParser{T: parser.Type(bench.typename)}
+					p := SameVersionParser{T: bench.parseType}
 					tc.PreprocessOperations(p)
 
 					b.ReportAllocs()