Refactored version directory names

3.0 and 2.0 do not work, there are multiple versions and anything with a period in it sucks from my point of view, v2 and v3 feel much better from a DX perspective.
This commit is contained in:
Dave Shanley
2022-09-16 08:33:39 -04:00
parent 849074d0bc
commit 3d5ecf0efb
104 changed files with 48 additions and 48 deletions

View File

@@ -6,8 +6,8 @@ package v2
import ( import (
highbase "github.com/pb33f/libopenapi/datamodel/high/base" highbase "github.com/pb33f/libopenapi/datamodel/high/base"
lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowmodel "github.com/pb33f/libopenapi/datamodel/low"
low "github.com/pb33f/libopenapi/datamodel/low/2.0"
lowbase "github.com/pb33f/libopenapi/datamodel/low/base" lowbase "github.com/pb33f/libopenapi/datamodel/low/base"
low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Definitions struct { type Definitions struct {

View File

@@ -3,7 +3,7 @@
package v2 package v2
import low "github.com/pb33f/libopenapi/datamodel/low/2.0" import low "github.com/pb33f/libopenapi/datamodel/low/v2"
type Examples struct { type Examples struct {
Values map[string]any Values map[string]any

View File

@@ -5,7 +5,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Header struct { type Header struct {

View File

@@ -3,7 +3,7 @@
package v2 package v2
import low "github.com/pb33f/libopenapi/datamodel/low/2.0" import low "github.com/pb33f/libopenapi/datamodel/low/v2"
type Items struct { type Items struct {
Type string Type string

View File

@@ -6,7 +6,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
"github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/high/base"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Operation struct { type Operation struct {

View File

@@ -6,7 +6,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
"github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/high/base"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Parameter struct { type Parameter struct {

View File

@@ -3,7 +3,7 @@
package v2 package v2
import low "github.com/pb33f/libopenapi/datamodel/low/2.0" import low "github.com/pb33f/libopenapi/datamodel/low/v2"
type ParameterDefinitions struct { type ParameterDefinitions struct {
Definitions map[string]*Parameter Definitions map[string]*Parameter

View File

@@ -5,7 +5,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type PathItem struct { type PathItem struct {

View File

@@ -5,7 +5,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Paths struct { type Paths struct {

View File

@@ -6,7 +6,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
"github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/high/base"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Response struct { type Response struct {

View File

@@ -5,7 +5,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Responses struct { type Responses struct {

View File

@@ -3,7 +3,7 @@
package v2 package v2
import low "github.com/pb33f/libopenapi/datamodel/low/2.0" import low "github.com/pb33f/libopenapi/datamodel/low/v2"
type ResponsesDefinitions struct { type ResponsesDefinitions struct {
Definitions map[string]*Response Definitions map[string]*Response

View File

@@ -4,7 +4,7 @@
package v2 package v2
import ( import (
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Scopes struct { type Scopes struct {

View File

@@ -3,7 +3,7 @@
package v2 package v2
import low "github.com/pb33f/libopenapi/datamodel/low/2.0" import low "github.com/pb33f/libopenapi/datamodel/low/v2"
type SecurityDefinitions struct { type SecurityDefinitions struct {
Definitions map[string]*SecurityScheme Definitions map[string]*SecurityScheme

View File

@@ -3,7 +3,7 @@
package v2 package v2
import low "github.com/pb33f/libopenapi/datamodel/low/2.0" import low "github.com/pb33f/libopenapi/datamodel/low/v2"
type SecurityRequirement struct { type SecurityRequirement struct {
Requirements map[string][]string Requirements map[string][]string

View File

@@ -5,7 +5,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type SecurityScheme struct { type SecurityScheme struct {

View File

@@ -6,7 +6,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
"github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/high/base"
low "github.com/pb33f/libopenapi/datamodel/low/2.0" low "github.com/pb33f/libopenapi/datamodel/low/v2"
) )
type Swagger struct { type Swagger struct {

View File

@@ -5,7 +5,7 @@ package v2
import ( import (
"github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/datamodel"
v2 "github.com/pb33f/libopenapi/datamodel/low/2.0" v2 "github.com/pb33f/libopenapi/datamodel/low/v2"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"io/ioutil" "io/ioutil"

View File

@@ -3,7 +3,7 @@
package v3 package v3
import low "github.com/pb33f/libopenapi/datamodel/low/3.0" import low "github.com/pb33f/libopenapi/datamodel/low/v3"
type Callback struct { type Callback struct {
Expression map[string]*PathItem Expression map[string]*PathItem

View File

@@ -7,8 +7,8 @@ import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
highbase "github.com/pb33f/libopenapi/datamodel/high/base" highbase "github.com/pb33f/libopenapi/datamodel/high/base"
lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowmodel "github.com/pb33f/libopenapi/datamodel/low"
low "github.com/pb33f/libopenapi/datamodel/low/3.0"
"github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/datamodel/low/base"
low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
const ( const (

View File

@@ -6,7 +6,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
"github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/high/base"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
"github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/index"
) )

View File

@@ -6,7 +6,7 @@ package v3
import ( import (
"fmt" "fmt"
"github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/datamodel"
lowv3 "github.com/pb33f/libopenapi/datamodel/low/3.0" lowv3 "github.com/pb33f/libopenapi/datamodel/low/v3"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"io/ioutil" "io/ioutil"
"testing" "testing"

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowmodel "github.com/pb33f/libopenapi/datamodel/low"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type Encoding struct { type Encoding struct {

View File

@@ -6,8 +6,8 @@ package v3
import ( import (
highbase "github.com/pb33f/libopenapi/datamodel/high/base" highbase "github.com/pb33f/libopenapi/datamodel/high/base"
lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowmodel "github.com/pb33f/libopenapi/datamodel/low"
low "github.com/pb33f/libopenapi/datamodel/low/3.0"
"github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/datamodel/low/base"
low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type Header struct { type Header struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type Link struct { type Link struct {

View File

@@ -7,7 +7,7 @@ import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
"github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/high/base"
lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowmodel "github.com/pb33f/libopenapi/datamodel/low"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
"sync" "sync"
) )

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type OAuthFlow struct { type OAuthFlow struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type OAuthFlows struct { type OAuthFlows struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low"
v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" v3 "github.com/pb33f/libopenapi/datamodel/low/v3"
"github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/index"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/high/base"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type Operation struct { type Operation struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low"
v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" v3 "github.com/pb33f/libopenapi/datamodel/low/v3"
"github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/index"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"

View File

@@ -6,7 +6,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
"github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/high/base"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type Parameter struct { type Parameter struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
const ( const (

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low"
v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" v3 "github.com/pb33f/libopenapi/datamodel/low/v3"
"github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/index"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type Paths struct { type Paths struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type RequestBody struct { type RequestBody struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type Response struct { type Response struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low"
v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" v3 "github.com/pb33f/libopenapi/datamodel/low/v3"
"github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/index"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"fmt" "fmt"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type Responses struct { type Responses struct {

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low"
v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" v3 "github.com/pb33f/libopenapi/datamodel/low/v3"
"github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/index"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"

View File

@@ -3,7 +3,7 @@
package v3 package v3
import low "github.com/pb33f/libopenapi/datamodel/low/3.0" import low "github.com/pb33f/libopenapi/datamodel/low/v3"
type SecurityRequirement struct { type SecurityRequirement struct {
ValueRequirements []map[string][]string ValueRequirements []map[string][]string

View File

@@ -5,7 +5,7 @@ package v3
import ( import (
"github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high"
low "github.com/pb33f/libopenapi/datamodel/low/3.0" low "github.com/pb33f/libopenapi/datamodel/low/v3"
) )
type SecurityScheme struct { type SecurityScheme struct {

View File

@@ -3,7 +3,7 @@
package v3 package v3
import low "github.com/pb33f/libopenapi/datamodel/low/3.0" import low "github.com/pb33f/libopenapi/datamodel/low/v3"
type Server struct { type Server struct {
URL string URL string

View File

@@ -3,7 +3,7 @@
package v3 package v3
import low "github.com/pb33f/libopenapi/datamodel/low/3.0" import low "github.com/pb33f/libopenapi/datamodel/low/v3"
type ServerVariable struct { type ServerVariable struct {
Enum []string Enum []string

Some files were not shown because too many files have changed in this diff Show More