chore: sync with upstream/master

.github/docs/openapi2.txt

@@ -1,4 +1,4 @@
-package openapi2 // import "github.com/getkin/kin-openapi/openapi2"
+package openapi2 // import "github.com/oasdiff/kin-openapi/openapi2"
 
 Package openapi2 parses and writes OpenAPIv2 specification documents.
 

.github/docs/openapi2conv.txt

@@ -1,4 +1,4 @@
-package openapi2conv // import "github.com/getkin/kin-openapi/openapi2conv"
+package openapi2conv // import "github.com/oasdiff/kin-openapi/openapi2conv"
 
 Package openapi2conv converts an OpenAPI v2 specification document to v3.
 

.github/docs/openapi3.txt

@@ -1,4 +1,4 @@
-package openapi3 // import "github.com/getkin/kin-openapi/openapi3"
+package openapi3 // import "github.com/oasdiff/kin-openapi/openapi3"
 
 Package openapi3 parses and writes OpenAPI 3 specification documents.
 

.github/docs/openapi3filter.txt

@@ -1,4 +1,4 @@
-package openapi3filter // import "github.com/getkin/kin-openapi/openapi3filter"
+package openapi3filter // import "github.com/oasdiff/kin-openapi/openapi3filter"
 
 Package openapi3filter validates that requests and inputs request an OpenAPI 3
 specification file.

.github/docs/openapi3gen.txt

@@ -1,4 +1,4 @@
-package openapi3gen // import "github.com/getkin/kin-openapi/openapi3gen"
+package openapi3gen // import "github.com/oasdiff/kin-openapi/openapi3gen"
 
 Package openapi3gen generates OpenAPIv3 JSON schemas from Go types.
 

.github/docs/routers.txt

@@ -1,4 +1,4 @@
-package routers // import "github.com/getkin/kin-openapi/routers"
+package routers // import "github.com/oasdiff/kin-openapi/routers"
 
 
 VARIABLES

.github/docs/routers_gorillamux.txt

@@ -1,4 +1,4 @@
-package gorillamux // import "github.com/getkin/kin-openapi/routers/gorillamux"
+package gorillamux // import "github.com/oasdiff/kin-openapi/routers/gorillamux"
 
 Package gorillamux implements a router.
 

.github/docs/routers_legacy.txt

@@ -1,4 +1,4 @@
-package legacy // import "github.com/getkin/kin-openapi/routers/legacy"
+package legacy // import "github.com/oasdiff/kin-openapi/routers/legacy"
 
 Package legacy implements a router.
 

.github/docs/routers_legacy_pathpattern.txt

@@ -1,4 +1,4 @@
-package pathpattern // import "github.com/getkin/kin-openapi/routers/legacy/pathpattern"
+package pathpattern // import "github.com/oasdiff/kin-openapi/routers/legacy/pathpattern"
 
 Package pathpattern implements path matching.
 

README.md

@@ -294,6 +294,9 @@ for _, path := range doc.Paths.InMatchingOrder() {
 
 ## CHANGELOG: Sub-v1 breaking API changes
 
+### v0.136.0
+* Module renamed from `github.com/getkin/kin-openapi` to `github.com/oasdiff/kin-openapi`. Update all imports accordingly: `openapi2`, `openapi2conv`, `openapi3`, `openapi3filter`, `openapi3gen`, `routers`, `routers/gorillamux`, `routers/legacy`, `routers/legacy/pathpattern`
+
 ### v0.135.0
 * `openapi3.MediaType.Encoding` field type changed from `map[string]*Encoding` to `Encodings`
 * `openapi3.Server.Variables` field type changed from `map[string]*ServerVariable` to `ServerVariables`

cmd/validate/main.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/oasdiff/yaml"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 var (
@@ -36,7 +36,7 @@ func main() {
 	flag.Parse()
 	filename := flag.Arg(0)
 	if len(flag.Args()) != 1 || filename == "" {
-		log.Fatalf("Usage: go run github.com/getkin/kin-openapi/cmd/validate@latest [--circular] [--defaults] [--examples] [--ext] [--patterns] -- <local YAML or JSON file>\nGot: %+v\n", os.Args)
+		log.Fatalf("Usage: go run github.com/oasdiff/kin-openapi/cmd/validate@latest [--circular] [--defaults] [--examples] [--ext] [--patterns] -- <local YAML or JSON file>\nGot: %+v\n", os.Args)
 	}
 
 	data, err := os.ReadFile(filename)

go.mod

@@ -1,13 +1,13 @@
-module github.com/getkin/kin-openapi
+module github.com/oasdiff/kin-openapi
 
 go 1.22.5
 
 require (
 	github.com/go-openapi/jsonpointer v0.21.0
 	github.com/gorilla/mux v1.8.0
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
-	github.com/oasdiff/yaml v0.0.4
-	github.com/oasdiff/yaml3 v0.0.4
+	github.com/oasdiff/yaml v0.0.7
+	github.com/oasdiff/yaml3 v0.0.6
 	github.com/perimeterx/marshmallow v1.1.5
 	github.com/stretchr/testify v1.9.0
 	github.com/woodsbury/decimal128 v1.3.0

go.sum

@@ -18,10 +18,10 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
-github.com/oasdiff/yaml v0.0.4 h1:airPco4LbUoK4nbVwu+wwkRg2WarLC96cgBhgN93fsE=
-github.com/oasdiff/yaml v0.0.4/go.mod h1:EaJ6/lcrRLK+syawtvtrHdbrrln4/SUmQw6aBTIlaMs=
-github.com/oasdiff/yaml3 v0.0.4 h1:U5RTQZpBmsbcyCFlzPVuMctk6Jme6lOrbl0jJoOovMw=
-github.com/oasdiff/yaml3 v0.0.4/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
+github.com/oasdiff/yaml v0.0.7 h1:r/BR4tqb+W/5fSV6RknYrfBa+PSZnRRvZ/nUnDdepFQ=
+github.com/oasdiff/yaml v0.0.7/go.mod h1:EaJ6/lcrRLK+syawtvtrHdbrrln4/SUmQw6aBTIlaMs=
+github.com/oasdiff/yaml3 v0.0.6 h1:459QJwIK3pqFs91pIbH/XxCld0ugHd4/F8xHkFjaJPo=
+github.com/oasdiff/yaml3 v0.0.6/go.mod h1:y5+oSEHCPT/DGrS++Wc/479ERge0zTFxaF8PbGKcg2o=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
 github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

openapi2/marsh.go

@@ -19,7 +19,7 @@ func unmarshalError(jsonUnmarshalErr error) error {
 func unmarshal(data []byte, v any) error {
 	var jsonErr, yamlErr error
 
-	// See https://github.com/getkin/kin-openapi/issues/680
+	// See https://github.com/oasdiff/kin-openapi/issues/680
 	if jsonErr = json.Unmarshal(data, v); jsonErr == nil {
 		return nil
 	}

openapi2/openapi2.go

@@ -3,7 +3,7 @@ package openapi2
 import (
 	"encoding/json"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 // T is the root of an OpenAPI v2 document

openapi2/openapi2_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/oasdiff/yaml"
 
-	"github.com/getkin/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi2"
 )
 
 func Example() {

openapi2/operation.go

@@ -3,7 +3,7 @@ package openapi2
 import (
 	"encoding/json"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 type Operation struct {

openapi2/parameter.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 type Parameters []*Parameter

openapi2/path_item.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 type PathItem struct {

openapi2/response.go

@@ -3,7 +3,7 @@ package openapi2
 import (
 	"encoding/json"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 type Response struct {

openapi2/schema.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 type (
@@ -260,7 +260,7 @@ func (schema *Schema) UnmarshalJSON(data []byte) error {
 	*schema = Schema(x)
 
 	if schema.Format == "date" {
-		// This is a fix for: https://github.com/getkin/kin-openapi/issues/697
+		// This is a fix for: https://github.com/oasdiff/kin-openapi/issues/697
 		if eg, ok := schema.Example.(string); ok {
 			schema.Example = strings.TrimSuffix(eg, "T00:00:00Z")
 		}

openapi2/security_scheme.go

@@ -3,7 +3,7 @@ package openapi2
 import (
 	"encoding/json"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 type SecurityRequirements []map[string][]string

openapi2conv/issue1016_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi2"
 	"github.com/stretchr/testify/require"
 )
 

openapi2conv/issue1069_test.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi3"
 	"github.com/oasdiff/yaml"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

openapi2conv/issue1091_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/getkin/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi2"
 )
 
 func TestIssue1091_PropertyExtensions(t *testing.T) {

openapi2conv/issue187_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/oasdiff/yaml"
 	"github.com/stretchr/testify/require"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 func v2v3JSON(spec2 []byte) (doc3 *openapi3.T, err error) {

openapi2conv/issue440_test.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 func TestIssue440(t *testing.T) {

openapi2conv/issue979_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 func TestIssue979(t *testing.T) {

openapi2conv/openapi2_conv.go

@@ -7,8 +7,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 // ToV3 converts an OpenAPIv2 spec to an OpenAPIv3 spec

openapi2conv/openapi2_conv_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi2"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 func TestConvOpenAPIV3ToV2(t *testing.T) {

openapi3/additionalProperties_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/oasdiff/yaml3"
 	"github.com/stretchr/testify/require"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 )
 
 func TestMarshalAdditionalProperties(t *testing.T) {

openapi3/callback.go

@@ -56,6 +56,6 @@ func (callback *Callback) Validate(ctx context.Context, opts ...ValidationOption
 
 // UnmarshalJSON sets Callbacks to a copy of data.
 func (callbacks *Callbacks) UnmarshalJSON(data []byte) (err error) {
-	*callbacks, _, err = unmarshalStringMapP[CallbackRef](data)
+	*callbacks, err = unmarshalStringMapP[CallbackRef](data)
 	return
 }

openapi3/components.go

@@ -95,8 +95,6 @@ func (components *Components) UnmarshalJSON(data []byte) error {
 		return unmarshalError(err)
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "schemas")
 	delete(x.Extensions, "parameters")
 	delete(x.Extensions, "headers")

openapi3/contact.go

@@ -52,8 +52,6 @@ func (contact *Contact) UnmarshalJSON(data []byte) error {
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
 
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "name")
 	delete(x.Extensions, "url")
 	delete(x.Extensions, "email")

openapi3/content.go

@@ -125,6 +125,6 @@ func (content Content) Validate(ctx context.Context, opts ...ValidationOption) e
 
 // UnmarshalJSON sets Content to a copy of data.
 func (content *Content) UnmarshalJSON(data []byte) (err error) {
-	*content, _, err = unmarshalStringMapP[MediaType](data)
+	*content, err = unmarshalStringMapP[MediaType](data)
 	return
 }

openapi3/discriminator.go

@@ -60,8 +60,6 @@ func (discriminator *Discriminator) UnmarshalJSON(data []byte) error {
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
 
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "propertyName")
 	delete(x.Extensions, "mapping")
 	if len(x.Extensions) == 0 {

openapi3/encoding.go

@@ -29,7 +29,7 @@ type Encodings map[string]*Encoding
 
 // UnmarshalJSON sets Encodings to a copy of data, stripping __origin__ metadata.
 func (encodings *Encodings) UnmarshalJSON(data []byte) (err error) {
-	*encodings, _, err = unmarshalStringMapP[Encoding](data)
+	*encodings, err = unmarshalStringMapP[Encoding](data)
 	return
 }
 
@@ -91,8 +91,6 @@ func (encoding *Encoding) UnmarshalJSON(data []byte) error {
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
 
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "contentType")
 	delete(x.Extensions, "headers")
 	delete(x.Extensions, "style")

openapi3/example.go

@@ -60,8 +60,6 @@ func (example *Example) UnmarshalJSON(data []byte) error {
 		return unmarshalError(err)
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "summary")
 	delete(x.Extensions, "description")
 	delete(x.Extensions, "value")
@@ -70,7 +68,6 @@ func (example *Example) UnmarshalJSON(data []byte) error {
 		x.Extensions = nil
 	}
 	*example = Example(x)
-	example.Value = stripOriginFromAny(example.Value)
 	return nil
 }
 
@@ -90,6 +87,6 @@ func (example *Example) Validate(ctx context.Context, opts ...ValidationOption)
 
 // UnmarshalJSON sets Examples to a copy of data.
 func (examples *Examples) UnmarshalJSON(data []byte) (err error) {
-	*examples, _, err = unmarshalStringMapP[ExampleRef](data)
+	*examples, err = unmarshalStringMapP[ExampleRef](data)
 	return
 }

openapi3/example_refs_test.go

@@ -3,7 +3,7 @@ package openapi3_test
 import (
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/oasdiff/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )