Fix openapi3.referencedDocumentPath (getkin#248)

eliottness · Jan 27, 2022 · 09b642f · 09b642f
1 parent 2392e46
commit 09b642f
Show file tree

Hide file tree

Showing 57 changed files with 149 additions and 86 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-[![CI](https://github.com/getkin/kin-openapi/workflows/go/badge.svg)](https://github.com/getkin/kin-openapi/actions)
-[![Go Report Card](https://goreportcard.com/badge/github.com/getkin/kin-openapi)](https://goreportcard.com/report/github.com/getkin/kin-openapi)
-[![GoDoc](https://godoc.org/github.com/getkin/kin-openapi?status.svg)](https://godoc.org/github.com/getkin/kin-openapi)
+[![CI](https://github.com/eliottness/kin-openapi/workflows/go/badge.svg)](https://github.com/eliottness/kin-openapi/actions)
+[![Go Report Card](https://goreportcard.com/badge/github.com/eliottness/kin-openapi)](https://goreportcard.com/report/github.com/eliottness/kin-openapi)
+[![GoDoc](https://godoc.org/github.com/eliottness/kin-openapi?status.svg)](https://godoc.org/github.com/eliottness/kin-openapi)
 [![Join Gitter Chat Channel -](https://badges.gitter.im/getkin/kin.svg)](https://gitter.im/getkin/kin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # Introduction
@@ -17,25 +17,25 @@ Here's some projects that depend on _kin-openapi_:
   * [github.com/deepmap/oapi-codegen](https://github.com/deepmap/oapi-codegen) - Generate Go server boilerplate from an OpenAPI 3 spec
   * [github.com/dunglas/vulcain](https://github.com/dunglas/vulcain) - "Use HTTP/2 Server Push to create fast and idiomatic client-driven REST APIs"
   * [github.com/danielgtaylor/restish](https://github.com/danielgtaylor/restish) - "...a CLI for interacting with REST-ish HTTP APIs with some nice features built-in"
-  * (Feel free to add your project by [creating an issue](https://github.com/getkin/kin-openapi/issues/new) or a pull request)
+  * (Feel free to add your project by [creating an issue](https://github.com/eliottness/kin-openapi/issues/new) or a pull request)
 
 ## Alternative projects
   * [go-openapi](https://github.com/go-openapi)
     * Supports OpenAPI version 2.
   * See [this list](https://github.com/OAI/OpenAPI-Specification/blob/OpenAPI.next/IMPLEMENTATIONS.md).
 
 # Structure
-  * _openapi2_ ([godoc](https://godoc.org/github.com/getkin/kin-openapi/openapi2))
+  * _openapi2_ ([godoc](https://godoc.org/github.com/eliottness/kin-openapi/openapi2))
     * Support for OpenAPI 2 files, including serialization, deserialization, and validation.
-  * _openapi2conv_ ([godoc](https://godoc.org/github.com/getkin/kin-openapi/openapi2conv))
+  * _openapi2conv_ ([godoc](https://godoc.org/github.com/eliottness/kin-openapi/openapi2conv))
     * Converts OpenAPI 2 files into OpenAPI 3 files.
-  * _openapi3_ ([godoc](https://godoc.org/github.com/getkin/kin-openapi/openapi3))
+  * _openapi3_ ([godoc](https://godoc.org/github.com/eliottness/kin-openapi/openapi3))
     * Support for OpenAPI 3 files, including serialization, deserialization, and validation.
-  * _openapi3filter_ ([godoc](https://godoc.org/github.com/getkin/kin-openapi/openapi3filter))
+  * _openapi3filter_ ([godoc](https://godoc.org/github.com/eliottness/kin-openapi/openapi3filter))
     * Validates HTTP requests and responses
-  * _openapi3gen_ ([godoc](https://godoc.org/github.com/getkin/kin-openapi/openapi3gen))
+  * _openapi3gen_ ([godoc](https://godoc.org/github.com/eliottness/kin-openapi/openapi3gen))
     * Generates `*openapi3.Schema` values for Go types.
-  * _pathpattern_ ([godoc](https://godoc.org/github.com/getkin/kin-openapi/pathpattern))
+  * _pathpattern_ ([godoc](https://godoc.org/github.com/eliottness/kin-openapi/pathpattern))
     * Matches strings with OpenAPI path patterns ("/path/{parameter}")
 
 # Some recipes
@@ -73,7 +73,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/getkin/kin-openapi/openapi3filter"
+	"github.com/eliottness/kin-openapi/openapi3filter"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
-module github.com/getkin/kin-openapi
+module github.com/eliottness/kin-openapi
 
-go 1.14
+go 1.13
 
 require (
 	github.com/ghodss/yaml v1.0.0

diff --git a/jsoninfo/marshal_test.go b/jsoninfo/marshal_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/openapi3"
 )
 
 type Simple struct {

diff --git a/jsoninfo/unmarshal_test.go b/jsoninfo/unmarshal_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/openapi2/openapi2.go b/openapi2/openapi2.go
@@ -11,8 +11,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/openapi3"
 )
 
 type Swagger struct {

diff --git a/openapi2conv/issue187_test.go b/openapi2conv/issue187_test.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi2"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/ghodss/yaml"
 	"github.com/stretchr/testify/require"
 )

diff --git a/openapi2conv/openapi2_conv.go b/openapi2conv/openapi2_conv.go
@@ -7,8 +7,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi2"
+	"github.com/eliottness/kin-openapi/openapi3"
 )
 
 // ToV3Swagger converts an OpenAPIv2 spec to an OpenAPIv3 spec

diff --git a/openapi2conv/openapi2_conv_test.go b/openapi2conv/openapi2_conv_test.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi2"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/openapi3/components.go b/openapi3/components.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Components is specified by OpenAPI/Swagger standard version 3.0.

diff --git a/openapi3/discriminator.go b/openapi3/discriminator.go
@@ -3,7 +3,7 @@ package openapi3
 import (
 	"context"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Discriminator is specified by OpenAPI/Swagger standard version 3.0.

diff --git a/openapi3/discriminator_test.go b/openapi3/discriminator_test.go
@@ -3,7 +3,7 @@ package openapi3_test
 import (
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/openapi3/encoding.go b/openapi3/encoding.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Encoding is specified by OpenAPI/Swagger 3.0 standard.

diff --git a/openapi3/encoding_test.go b/openapi3/encoding_test.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/openapi3/example_test.go b/openapi3/example_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/openapi3/examples.go b/openapi3/examples.go
@@ -1,7 +1,7 @@
 package openapi3
 
 import (
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Example is specified by OpenAPI/Swagger 3.0 standard.

diff --git a/openapi3/extension.go b/openapi3/extension.go
@@ -1,7 +1,7 @@
 package openapi3
 
 import (
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // ExtensionProps provides support for OpenAPI extensions.

diff --git a/openapi3/extension_test.go b/openapi3/extension_test.go
@@ -1,8 +1,8 @@
 package openapi3_test
 
 import (
-	"github.com/getkin/kin-openapi/jsoninfo"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

diff --git a/openapi3/external_docs.go b/openapi3/external_docs.go
@@ -1,7 +1,7 @@
 package openapi3
 
 import (
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // ExternalDocs is specified by OpenAPI/Swagger standard version 3.0.

diff --git a/openapi3/header.go b/openapi3/header.go
@@ -3,7 +3,7 @@ package openapi3
 import (
 	"context"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 type Header struct {

diff --git a/openapi3/info.go b/openapi3/info.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Info is specified by OpenAPI/Swagger standard version 3.0.

diff --git a/openapi3/link.go b/openapi3/link.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Link is specified by OpenAPI/Swagger standard version 3.0.

diff --git a/openapi3/media_type.go b/openapi3/media_type.go
@@ -3,7 +3,7 @@ package openapi3
 import (
 	"context"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // MediaType is specified by OpenAPI/Swagger 3.0 standard.

diff --git a/openapi3/media_type_test.go b/openapi3/media_type_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/openapi3/operation.go b/openapi3/operation.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Operation represents "operation" specified by" OpenAPI/Swagger 3.0 standard.

diff --git a/openapi3/parameter.go b/openapi3/parameter.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Parameters is specified by OpenAPI/Swagger 3.0 standard.

diff --git a/openapi3/path_item.go b/openapi3/path_item.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 type PathItem struct {

diff --git a/openapi3/refs.go b/openapi3/refs.go
@@ -3,7 +3,7 @@ package openapi3
 import (
 	"context"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 type CallbackRef struct {

diff --git a/openapi3/request_body.go b/openapi3/request_body.go
@@ -3,7 +3,7 @@ package openapi3
 import (
 	"context"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // RequestBody is specified by OpenAPI/Swagger 3.0 standard.

diff --git a/openapi3/response.go b/openapi3/response.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 // Responses is specified by OpenAPI/Swagger 3.0 standard.

diff --git a/openapi3/schema.go b/openapi3/schema.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"unicode/utf16"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 var (

diff --git a/openapi3/schema_test.go b/openapi3/schema_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/openapi3/security_scheme.go b/openapi3/security_scheme.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 type SecurityScheme struct {

diff --git a/openapi3/security_scheme_test.go b/openapi3/security_scheme_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/openapi3/server_test.go b/openapi3/server_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/eliottness/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/openapi3/swagger.go b/openapi3/swagger.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/getkin/kin-openapi/jsoninfo"
+	"github.com/eliottness/kin-openapi/jsoninfo"
 )
 
 type Swagger struct {

diff --git a/openapi3/swagger_loader.go b/openapi3/swagger_loader.go
@@ -876,16 +876,19 @@ func unescapeRefString(ref string) string {
 }
 
 func referencedDocumentPath(documentPath *url.URL, ref string) (*url.URL, error) {
-	newDocumentPath := documentPath
-	if documentPath != nil {
-		refDirectory, err := url.Parse(path.Dir(ref))
-		if err != nil {
-			return nil, err
-		}
-		joinedDirectory := path.Join(path.Dir(documentPath.String()), refDirectory.String())
-		if newDocumentPath, err = url.Parse(joinedDirectory + "/"); err != nil {
-			return nil, err
-		}
+	if documentPath == nil {
+		return nil, nil
+	}
+
+	newDocumentPath, err := copyURL(documentPath)
+	if err != nil {
+		return nil, err
 	}
+	refPath, err := url.Parse(ref)
+	if err != nil {
+		return nil, err
+	}
+	newDocumentPath.Path = path.Join(path.Dir(newDocumentPath.Path), path.Dir(refPath.Path)) + "/"
+
 	return newDocumentPath, nil
 }