openapi2conv: expose loader and location to ToV3 (#851)

getkin · Oct 31, 2023 · bfab8b0 · bfab8b0
1 parent c446426
commit bfab8b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/docs/openapi2conv.txt b/.github/docs/openapi2conv.txt
@@ -23,3 +23,4 @@ func ToV3SchemaRef(schema *openapi3.SchemaRef) *openapi3.SchemaRef
 func ToV3Schemas(defs map[string]*openapi3.SchemaRef) map[string]*openapi3.SchemaRef
 func ToV3SecurityRequirements(requirements openapi2.SecurityRequirements) openapi3.SecurityRequirements
 func ToV3SecurityScheme(securityScheme *openapi2.SecurityScheme) (*openapi3.SecuritySchemeRef, error)
+func ToV3WithLoader(doc2 *openapi2.T, loader *openapi3.Loader, location *url.URL) (*openapi3.T, error)
diff --git a/openapi2conv/openapi2_conv.go b/openapi2conv/openapi2_conv.go
@@ -13,6 +13,10 @@ import (
 
 // ToV3 converts an OpenAPIv2 spec to an OpenAPIv3 spec
 func ToV3(doc2 *openapi2.T) (*openapi3.T, error) {
+	return ToV3WithLoader(doc2, openapi3.NewLoader(), nil)
+}
+
+func ToV3WithLoader(doc2 *openapi2.T, loader *openapi3.Loader, location *url.URL) (*openapi3.T, error) {
 	doc3 := &openapi3.T{
 		OpenAPI:      "3.0.3",
 		Info:         &doc2.Info,
@@ -106,12 +110,11 @@ func ToV3(doc2 *openapi2.T) (*openapi3.T, error) {
 	}
 
 	doc3.Security = ToV3SecurityRequirements(doc2.Security)
-	{
-		sl := openapi3.NewLoader()
-		if err := sl.ResolveRefsIn(doc3, nil); err != nil {
-			return nil, err
-		}
+
+	if err := loader.ResolveRefsIn(doc3, location); err != nil {
+		return nil, err
 	}
+
 	return doc3, nil
 }