Merge pull request #4294 from Jimmyscene/master

k8s-ci-robot · web-flow · commit ff2a3d368bb3 · 2022-01-10T10:01:12.000-08:00
fix: prevent read file from throwing away OpenAPI config
diff --git a/kustomize/commands/internal/kustfile/kustomizationfile.go b/kustomize/commands/internal/kustfile/kustomizationfile.go
@@ -65,6 +65,7 @@ func determineFieldOrder() []string {
 		"Transformers",
 		"Inventory",
 		"Components",
+		"OpenAPI",
 	}
 
 	// Add deprecated fields here.
diff --git a/kustomize/commands/internal/kustfile/kustomizationfile_test.go b/kustomize/commands/internal/kustfile/kustomizationfile_test.go
@@ -47,6 +47,7 @@ func TestFieldOrder(t *testing.T) {
 		"Transformers",
 		"Inventory",
 		"Components",
+		"OpenAPI",
 	}
 	actual := determineFieldOrder()
 	if len(expected) != len(actual) {

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ func determineFieldOrder() []string {`
`65`	`65`	`"Transformers",`
`66`	`66`	`"Inventory",`
`67`	`67`	`"Components",`
	`68`	`+ "OpenAPI",`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`// Add deprecated fields here.`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ func TestFieldOrder(t *testing.T) {`
`47`	`47`	`"Transformers",`
`48`	`48`	`"Inventory",`
`49`	`49`	`"Components",`
	`50`	`+ "OpenAPI",`
`50`	`51`	`}`
`51`	`52`	`actual := determineFieldOrder()`
`52`	`53`	`if len(expected) != len(actual) {`