refactor: convert slices to []interface before inserion into VendorExtensible

Alexander Zielenski · Alexander Zielenski · commit 635875ad5217 · 2023-07-18T11:49:30.000-07:00
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/validation.go
@@ -341,7 +341,7 @@ func ConvertJSONSchemaPropsWithPostProcess(in *apiextensions.JSONSchemaProps, ou
 		out.VendorExtensible.AddExtension("x-kubernetes-embedded-resource", true)
 	}
 	if len(in.XListMapKeys) != 0 {
-		out.VendorExtensible.AddExtension("x-kubernetes-list-map-keys", in.XListMapKeys)
+		out.VendorExtensible.AddExtension("x-kubernetes-list-map-keys", convertSliceToInterfaceSlice(in.XListMapKeys))
 	}
 	if in.XListType != nil {
 		out.VendorExtensible.AddExtension("x-kubernetes-list-type", *in.XListType)
@@ -354,11 +354,19 @@ func ConvertJSONSchemaPropsWithPostProcess(in *apiextensions.JSONSchemaProps, ou
 		if err := apiextensionsv1.Convert_apiextensions_ValidationRules_To_v1_ValidationRules(&in.XValidations, &serializationValidationRules, nil); err != nil {
 			return err
 		}
-		out.VendorExtensible.AddExtension("x-kubernetes-validations", serializationValidationRules)
+		out.VendorExtensible.AddExtension("x-kubernetes-validations", convertSliceToInterfaceSlice(serializationValidationRules))
 	}
 	return nil
 }
 
+func convertSliceToInterfaceSlice[T any](in []T) []interface{} {
+	var res []interface{}
+	for _, v := range in {
+		res = append(res, v)
+	}
+	return res
+}
+
 func convertSliceOfJSONSchemaProps(in *[]apiextensions.JSONSchemaProps, out *[]spec.Schema, postProcess PostProcessFunc) error {
 	if in != nil {
 		for _, jsonSchemaProps := range *in {

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ func ConvertJSONSchemaPropsWithPostProcess(in *apiextensions.JSONSchemaProps, ou`
`341`	`341`	`out.VendorExtensible.AddExtension("x-kubernetes-embedded-resource", true)`
`342`	`342`	`}`
`343`	`343`	`if len(in.XListMapKeys) != 0 {`
`344`		`- out.VendorExtensible.AddExtension("x-kubernetes-list-map-keys", in.XListMapKeys)`
	`344`	`+ out.VendorExtensible.AddExtension("x-kubernetes-list-map-keys", convertSliceToInterfaceSlice(in.XListMapKeys))`
`345`	`345`	`}`
`346`	`346`	`if in.XListType != nil {`
`347`	`347`	`out.VendorExtensible.AddExtension("x-kubernetes-list-type", *in.XListType)`
`@@ -354,11 +354,19 @@ func ConvertJSONSchemaPropsWithPostProcess(in *apiextensions.JSONSchemaProps, ou`
`354`	`354`	`if err := apiextensionsv1.Convert_apiextensions_ValidationRules_To_v1_ValidationRules(&in.XValidations, &serializationValidationRules, nil); err != nil {`
`355`	`355`	`return err`
`356`	`356`	`}`
`357`		`- out.VendorExtensible.AddExtension("x-kubernetes-validations", serializationValidationRules)`
	`357`	`+ out.VendorExtensible.AddExtension("x-kubernetes-validations", convertSliceToInterfaceSlice(serializationValidationRules))`
`358`	`358`	`}`
`359`	`359`	`return nil`
`360`	`360`	`}`
`361`	`361`
	`362`	`+func convertSliceToInterfaceSlice[T any](in []T) []interface{} {`
	`363`	`+ var res []interface{}`
	`364`	`+ for _, v := range in {`
	`365`	`+ res = append(res, v)`
	`366`	`+ }`
	`367`	`+ return res`
	`368`	`+}`
	`369`	`+`
`362`	`370`	`func convertSliceOfJSONSchemaProps(in []apiextensions.JSONSchemaProps, out []spec.Schema, postProcess PostProcessFunc) error {`
`363`	`371`	`if in != nil {`
`364`	`372`	`for _, jsonSchemaProps := range *in {`