Address comments

Author: Jefftree

pkg/openapiconv/convert.go

@@ -20,17 +20,17 @@ import (
 	"strings"
 
 	klog "k8s.io/klog/v2"
+	builderutil "k8s.io/kube-openapi/pkg/builder3/util"
 	"k8s.io/kube-openapi/pkg/spec3"
 	"k8s.io/kube-openapi/pkg/validation/spec"
-	builderutil "k8s.io/kube-openapi/pkg/builder3/util"
 )
 
 var OpenAPIV2DefPrefix = "#/definitions/"
 var OpenAPIV3DefPrefix = "#/components/schemas/"
 
 // ConvertV2ToV3 converts an OpenAPI V2 object into V3.
 // Certain references may be shared between the V2 and V3 objects in the conversion.
-func ConvertV2ToV3(v2Spec *spec.Swagger) (*spec3.OpenAPI) {
+func ConvertV2ToV3(v2Spec *spec.Swagger) *spec3.OpenAPI {
 	v3Spec := &spec3.OpenAPI{
 		Version:      "3.0.0",
 		Info:         v2Spec.Info,
@@ -84,10 +84,10 @@ func ConvertSchema(v2Schema *spec.Schema) *spec.Schema {
 		return nil
 	}
 	v3Schema := spec.Schema{
-		VendorExtensible: v2Schema.VendorExtensible,
-		SchemaProps: v2Schema.SchemaProps,
+		VendorExtensible:   v2Schema.VendorExtensible,
+		SchemaProps:        v2Schema.SchemaProps,
 		SwaggerSchemaProps: v2Schema.SwaggerSchemaProps,
-		ExtraProps: v2Schema.ExtraProps,
+		ExtraProps:         v2Schema.ExtraProps,
 	}
 
 	if refString := v2Schema.Ref.String(); refString != "" {
@@ -105,30 +105,39 @@ func ConvertSchema(v2Schema *spec.Schema) *spec.Schema {
 		}
 	}
 	if v2Schema.Items != nil {
-		v3Schema.Items = new(spec.SchemaOrArray)
-		v3Schema.Items.Schema = ConvertSchema(v2Schema.Items.Schema)
-		if v2Schema.Items.Schemas != nil {
-			v3Schema.Items.Schemas = []spec.Schema{}
-			for _, s := range v2Schema.Items.Schemas {
-				v3Schema.Items.Schemas = append(v3Schema.Items.Schemas, *ConvertSchema(&s))
-			}
+		v3Schema.Items = &spec.SchemaOrArray{
+			Schema:  ConvertSchema(v2Schema.Items.Schema),
+			Schemas: ConvertSchemaList(v2Schema.Items.Schemas),
 		}
 	}
 
 	if v2Schema.AdditionalProperties != nil {
-		v3Schema.AdditionalProperties = new(spec.SchemaOrBool)
-		v3Schema.AdditionalProperties.Schema = ConvertSchema(v2Schema.AdditionalProperties.Schema)
-		v3Schema.AdditionalProperties.Allows = v2Schema.AdditionalProperties.Allows
+		v3Schema.AdditionalProperties = &spec.SchemaOrBool{
+			Schema: ConvertSchema(v2Schema.AdditionalProperties.Schema),
+			Allows: v2Schema.AdditionalProperties.Allows,
+		}
 	}
 	if v2Schema.AdditionalItems != nil {
-		v3Schema.AdditionalItems = new(spec.SchemaOrBool)
-		v3Schema.AdditionalItems.Schema = ConvertSchema(v2Schema.AdditionalItems.Schema)
-		v3Schema.AdditionalItems.Allows = v2Schema.AdditionalItems.Allows
+		v3Schema.AdditionalItems = &spec.SchemaOrBool{
+			Schema: ConvertSchema(v2Schema.AdditionalItems.Schema),
+			Allows: v2Schema.AdditionalItems.Allows,
+		}
 	}
 
 	return builderutil.WrapRefs(&v3Schema)
 }
 
+func ConvertSchemaList(v2SchemaList []spec.Schema) []spec.Schema {
+	if v2SchemaList == nil {
+		return nil
+	}
+	v3SchemaList := []spec.Schema{}
+	for _, s := range v2SchemaList {
+		v3SchemaList = append(v3SchemaList, *ConvertSchema(&s))
+	}
+	return v3SchemaList
+}
+
 func ConvertSecurityScheme(v2securityScheme *spec.SecurityScheme) *spec3.SecurityScheme {
 	if v2securityScheme == nil {
 		return nil