mirror of
https://github.com/LukeHagar/libopenapi.git
synced 2025-12-08 04:20:17 +00:00
Added support for unevaluatedProperties as Schema and bool #118
Also ran `gofmt` across the entire project. Things need cleaning up. Signed-off-by: Dave Shanley <dave@quobix.com>
This commit is contained in:
Dave Shanley
@@ -4,254 +4,254 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"github.com/pb33f/libopenapi/datamodel/low"
|
||||
"github.com/pb33f/libopenapi/datamodel/low/v3"
|
||||
"github.com/pb33f/libopenapi/datamodel/low"
|
||||
"github.com/pb33f/libopenapi/datamodel/low/v3"
|
||||
)
|
||||
|
||||
// OAuthFlowsChanges represents changes found between two OpenAPI OAuthFlows objects.
|
||||
type OAuthFlowsChanges struct {
|
||||
*PropertyChanges
|
||||
ImplicitChanges *OAuthFlowChanges `json:"implicit,omitempty" yaml:"implicit,omitempty"`
|
||||
PasswordChanges *OAuthFlowChanges `json:"password,omitempty" yaml:"password,omitempty"`
|
||||
ClientCredentialsChanges *OAuthFlowChanges `json:"clientCredentials,omitempty" yaml:"clientCredentials,omitempty"`
|
||||
AuthorizationCodeChanges *OAuthFlowChanges `json:"authCode,omitempty" yaml:"authCode,omitempty"`
|
||||
ExtensionChanges *ExtensionChanges `json:"extensions,omitempty" yaml:"extensions,omitempty"`
|
||||
*PropertyChanges
|
||||
ImplicitChanges *OAuthFlowChanges `json:"implicit,omitempty" yaml:"implicit,omitempty"`
|
||||
PasswordChanges *OAuthFlowChanges `json:"password,omitempty" yaml:"password,omitempty"`
|
||||
ClientCredentialsChanges *OAuthFlowChanges `json:"clientCredentials,omitempty" yaml:"clientCredentials,omitempty"`
|
||||
AuthorizationCodeChanges *OAuthFlowChanges `json:"authCode,omitempty" yaml:"authCode,omitempty"`
|
||||
ExtensionChanges *ExtensionChanges `json:"extensions,omitempty" yaml:"extensions,omitempty"`
|
||||
}
|
||||
|
||||
// GetAllChanges returns a slice of all changes made between OAuthFlows objects
|
||||
func (o *OAuthFlowsChanges) GetAllChanges() []*Change {
|
||||
var changes []*Change
|
||||
changes = append(changes, o.Changes...)
|
||||
if o.ImplicitChanges != nil {
|
||||
changes = append(changes, o.ImplicitChanges.GetAllChanges()...)
|
||||
}
|
||||
if o.PasswordChanges != nil {
|
||||
changes = append(changes, o.PasswordChanges.GetAllChanges()...)
|
||||
}
|
||||
if o.ClientCredentialsChanges != nil {
|
||||
changes = append(changes, o.ClientCredentialsChanges.GetAllChanges()...)
|
||||
}
|
||||
if o.AuthorizationCodeChanges != nil {
|
||||
changes = append(changes, o.AuthorizationCodeChanges.GetAllChanges()...)
|
||||
}
|
||||
if o.ExtensionChanges != nil {
|
||||
changes = append(changes, o.ImplicitChanges.GetAllChanges()...)
|
||||
}
|
||||
return changes
|
||||
var changes []*Change
|
||||
changes = append(changes, o.Changes...)
|
||||
if o.ImplicitChanges != nil {
|
||||
changes = append(changes, o.ImplicitChanges.GetAllChanges()...)
|
||||
}
|
||||
if o.PasswordChanges != nil {
|
||||
changes = append(changes, o.PasswordChanges.GetAllChanges()...)
|
||||
}
|
||||
if o.ClientCredentialsChanges != nil {
|
||||
changes = append(changes, o.ClientCredentialsChanges.GetAllChanges()...)
|
||||
}
|
||||
if o.AuthorizationCodeChanges != nil {
|
||||
changes = append(changes, o.AuthorizationCodeChanges.GetAllChanges()...)
|
||||
}
|
||||
if o.ExtensionChanges != nil {
|
||||
changes = append(changes, o.ImplicitChanges.GetAllChanges()...)
|
||||
}
|
||||
return changes
|
||||
}
|
||||
|
||||
// TotalChanges returns the number of changes made between two OAuthFlows instances.
|
||||
func (o *OAuthFlowsChanges) TotalChanges() int {
|
||||
c := o.PropertyChanges.TotalChanges()
|
||||
if o.ImplicitChanges != nil {
|
||||
c += o.ImplicitChanges.TotalChanges()
|
||||
}
|
||||
if o.PasswordChanges != nil {
|
||||
c += o.PasswordChanges.TotalChanges()
|
||||
}
|
||||
if o.ClientCredentialsChanges != nil {
|
||||
c += o.ClientCredentialsChanges.TotalChanges()
|
||||
}
|
||||
if o.AuthorizationCodeChanges != nil {
|
||||
c += o.AuthorizationCodeChanges.TotalChanges()
|
||||
}
|
||||
if o.ExtensionChanges != nil {
|
||||
c += o.ExtensionChanges.TotalChanges()
|
||||
}
|
||||
return c
|
||||
c := o.PropertyChanges.TotalChanges()
|
||||
if o.ImplicitChanges != nil {
|
||||
c += o.ImplicitChanges.TotalChanges()
|
||||
}
|
||||
if o.PasswordChanges != nil {
|
||||
c += o.PasswordChanges.TotalChanges()
|
||||
}
|
||||
if o.ClientCredentialsChanges != nil {
|
||||
c += o.ClientCredentialsChanges.TotalChanges()
|
||||
}
|
||||
if o.AuthorizationCodeChanges != nil {
|
||||
c += o.AuthorizationCodeChanges.TotalChanges()
|
||||
}
|
||||
if o.ExtensionChanges != nil {
|
||||
c += o.ExtensionChanges.TotalChanges()
|
||||
}
|
||||
return c
|
||||
}
|
||||
|
||||
// TotalBreakingChanges returns the number of breaking changes made between two OAuthFlows objects.
|
||||
func (o *OAuthFlowsChanges) TotalBreakingChanges() int {
|
||||
c := o.PropertyChanges.TotalBreakingChanges()
|
||||
if o.ImplicitChanges != nil {
|
||||
c += o.ImplicitChanges.TotalBreakingChanges()
|
||||
}
|
||||
if o.PasswordChanges != nil {
|
||||
c += o.PasswordChanges.TotalBreakingChanges()
|
||||
}
|
||||
if o.ClientCredentialsChanges != nil {
|
||||
c += o.ClientCredentialsChanges.TotalBreakingChanges()
|
||||
}
|
||||
if o.AuthorizationCodeChanges != nil {
|
||||
c += o.AuthorizationCodeChanges.TotalBreakingChanges()
|
||||
}
|
||||
return c
|
||||
c := o.PropertyChanges.TotalBreakingChanges()
|
||||
if o.ImplicitChanges != nil {
|
||||
c += o.ImplicitChanges.TotalBreakingChanges()
|
||||
}
|
||||
if o.PasswordChanges != nil {
|
||||
c += o.PasswordChanges.TotalBreakingChanges()
|
||||
}
|
||||
if o.ClientCredentialsChanges != nil {
|
||||
c += o.ClientCredentialsChanges.TotalBreakingChanges()
|
||||
}
|
||||
if o.AuthorizationCodeChanges != nil {
|
||||
c += o.AuthorizationCodeChanges.TotalBreakingChanges()
|
||||
}
|
||||
return c
|
||||
}
|
||||
|
||||
// CompareOAuthFlows compares a left and right OAuthFlows object. If changes are found a pointer to *OAuthFlowsChanges
|
||||
// is returned, otherwise nil is returned.
|
||||
func CompareOAuthFlows(l, r *v3.OAuthFlows) *OAuthFlowsChanges {
|
||||
if low.AreEqual(l, r) {
|
||||
return nil
|
||||
}
|
||||
if low.AreEqual(l, r) {
|
||||
return nil
|
||||
}
|
||||
|
||||
oa := new(OAuthFlowsChanges)
|
||||
var changes []*Change
|
||||
oa := new(OAuthFlowsChanges)
|
||||
var changes []*Change
|
||||
|
||||
// client credentials
|
||||
if !l.ClientCredentials.IsEmpty() && !r.ClientCredentials.IsEmpty() {
|
||||
oa.ClientCredentialsChanges = CompareOAuthFlow(l.ClientCredentials.Value, r.ClientCredentials.Value)
|
||||
}
|
||||
if !l.ClientCredentials.IsEmpty() && r.ClientCredentials.IsEmpty() {
|
||||
CreateChange(&changes, ObjectRemoved, v3.ClientCredentialsLabel,
|
||||
l.ClientCredentials.ValueNode, nil, true,
|
||||
l.ClientCredentials.Value, nil)
|
||||
}
|
||||
if l.ClientCredentials.IsEmpty() && !r.ClientCredentials.IsEmpty() {
|
||||
CreateChange(&changes, ObjectAdded, v3.ClientCredentialsLabel,
|
||||
nil, r.ClientCredentials.ValueNode, false,
|
||||
nil, r.ClientCredentials.Value)
|
||||
}
|
||||
// client credentials
|
||||
if !l.ClientCredentials.IsEmpty() && !r.ClientCredentials.IsEmpty() {
|
||||
oa.ClientCredentialsChanges = CompareOAuthFlow(l.ClientCredentials.Value, r.ClientCredentials.Value)
|
||||
}
|
||||
if !l.ClientCredentials.IsEmpty() && r.ClientCredentials.IsEmpty() {
|
||||
CreateChange(&changes, ObjectRemoved, v3.ClientCredentialsLabel,
|
||||
l.ClientCredentials.ValueNode, nil, true,
|
||||
l.ClientCredentials.Value, nil)
|
||||
}
|
||||
if l.ClientCredentials.IsEmpty() && !r.ClientCredentials.IsEmpty() {
|
||||
CreateChange(&changes, ObjectAdded, v3.ClientCredentialsLabel,
|
||||
nil, r.ClientCredentials.ValueNode, false,
|
||||
nil, r.ClientCredentials.Value)
|
||||
}
|
||||
|
||||
// implicit
|
||||
if !l.Implicit.IsEmpty() && !r.Implicit.IsEmpty() {
|
||||
oa.ImplicitChanges = CompareOAuthFlow(l.Implicit.Value, r.Implicit.Value)
|
||||
}
|
||||
if !l.Implicit.IsEmpty() && r.Implicit.IsEmpty() {
|
||||
CreateChange(&changes, ObjectRemoved, v3.ImplicitLabel,
|
||||
l.Implicit.ValueNode, nil, true,
|
||||
l.Implicit.Value, nil)
|
||||
}
|
||||
if l.Implicit.IsEmpty() && !r.Implicit.IsEmpty() {
|
||||
CreateChange(&changes, ObjectAdded, v3.ImplicitLabel,
|
||||
nil, r.Implicit.ValueNode, false,
|
||||
nil, r.Implicit.Value)
|
||||
}
|
||||
// implicit
|
||||
if !l.Implicit.IsEmpty() && !r.Implicit.IsEmpty() {
|
||||
oa.ImplicitChanges = CompareOAuthFlow(l.Implicit.Value, r.Implicit.Value)
|
||||
}
|
||||
if !l.Implicit.IsEmpty() && r.Implicit.IsEmpty() {
|
||||
CreateChange(&changes, ObjectRemoved, v3.ImplicitLabel,
|
||||
l.Implicit.ValueNode, nil, true,
|
||||
l.Implicit.Value, nil)
|
||||
}
|
||||
if l.Implicit.IsEmpty() && !r.Implicit.IsEmpty() {
|
||||
CreateChange(&changes, ObjectAdded, v3.ImplicitLabel,
|
||||
nil, r.Implicit.ValueNode, false,
|
||||
nil, r.Implicit.Value)
|
||||
}
|
||||
|
||||
// password
|
||||
if !l.Password.IsEmpty() && !r.Password.IsEmpty() {
|
||||
oa.PasswordChanges = CompareOAuthFlow(l.Password.Value, r.Password.Value)
|
||||
}
|
||||
if !l.Password.IsEmpty() && r.Password.IsEmpty() {
|
||||
CreateChange(&changes, ObjectRemoved, v3.PasswordLabel,
|
||||
l.Password.ValueNode, nil, true,
|
||||
l.Password.Value, nil)
|
||||
}
|
||||
if l.Password.IsEmpty() && !r.Password.IsEmpty() {
|
||||
CreateChange(&changes, ObjectAdded, v3.PasswordLabel,
|
||||
nil, r.Password.ValueNode, false,
|
||||
nil, r.Password.Value)
|
||||
}
|
||||
// password
|
||||
if !l.Password.IsEmpty() && !r.Password.IsEmpty() {
|
||||
oa.PasswordChanges = CompareOAuthFlow(l.Password.Value, r.Password.Value)
|
||||
}
|
||||
if !l.Password.IsEmpty() && r.Password.IsEmpty() {
|
||||
CreateChange(&changes, ObjectRemoved, v3.PasswordLabel,
|
||||
l.Password.ValueNode, nil, true,
|
||||
l.Password.Value, nil)
|
||||
}
|
||||
if l.Password.IsEmpty() && !r.Password.IsEmpty() {
|
||||
CreateChange(&changes, ObjectAdded, v3.PasswordLabel,
|
||||
nil, r.Password.ValueNode, false,
|
||||
nil, r.Password.Value)
|
||||
}
|
||||
|
||||
// auth code
|
||||
if !l.AuthorizationCode.IsEmpty() && !r.AuthorizationCode.IsEmpty() {
|
||||
oa.AuthorizationCodeChanges = CompareOAuthFlow(l.AuthorizationCode.Value, r.AuthorizationCode.Value)
|
||||
}
|
||||
if !l.AuthorizationCode.IsEmpty() && r.AuthorizationCode.IsEmpty() {
|
||||
CreateChange(&changes, ObjectRemoved, v3.AuthorizationCodeLabel,
|
||||
l.AuthorizationCode.ValueNode, nil, true,
|
||||
l.AuthorizationCode.Value, nil)
|
||||
}
|
||||
if l.AuthorizationCode.IsEmpty() && !r.AuthorizationCode.IsEmpty() {
|
||||
CreateChange(&changes, ObjectAdded, v3.AuthorizationCodeLabel,
|
||||
nil, r.AuthorizationCode.ValueNode, false,
|
||||
nil, r.AuthorizationCode.Value)
|
||||
}
|
||||
oa.ExtensionChanges = CompareExtensions(l.Extensions, r.Extensions)
|
||||
oa.PropertyChanges = NewPropertyChanges(changes)
|
||||
return oa
|
||||
// auth code
|
||||
if !l.AuthorizationCode.IsEmpty() && !r.AuthorizationCode.IsEmpty() {
|
||||
oa.AuthorizationCodeChanges = CompareOAuthFlow(l.AuthorizationCode.Value, r.AuthorizationCode.Value)
|
||||
}
|
||||
if !l.AuthorizationCode.IsEmpty() && r.AuthorizationCode.IsEmpty() {
|
||||
CreateChange(&changes, ObjectRemoved, v3.AuthorizationCodeLabel,
|
||||
l.AuthorizationCode.ValueNode, nil, true,
|
||||
l.AuthorizationCode.Value, nil)
|
||||
}
|
||||
if l.AuthorizationCode.IsEmpty() && !r.AuthorizationCode.IsEmpty() {
|
||||
CreateChange(&changes, ObjectAdded, v3.AuthorizationCodeLabel,
|
||||
nil, r.AuthorizationCode.ValueNode, false,
|
||||
nil, r.AuthorizationCode.Value)
|
||||
}
|
||||
oa.ExtensionChanges = CompareExtensions(l.Extensions, r.Extensions)
|
||||
oa.PropertyChanges = NewPropertyChanges(changes)
|
||||
return oa
|
||||
}
|
||||
|
||||
// OAuthFlowChanges represents an OpenAPI OAuthFlow object.
|
||||
type OAuthFlowChanges struct {
|
||||
*PropertyChanges
|
||||
ExtensionChanges *ExtensionChanges `json:"extensions,omitempty" yaml:"extensions,omitempty"`
|
||||
*PropertyChanges
|
||||
ExtensionChanges *ExtensionChanges `json:"extensions,omitempty" yaml:"extensions,omitempty"`
|
||||
}
|
||||
|
||||
// GetAllChanges returns a slice of all changes made between OAuthFlow objects
|
||||
func (o *OAuthFlowChanges) GetAllChanges() []*Change {
|
||||
var changes []*Change
|
||||
changes = append(changes, o.Changes...)
|
||||
if o.ExtensionChanges != nil {
|
||||
changes = append(changes, o.ExtensionChanges.GetAllChanges()...)
|
||||
}
|
||||
return changes
|
||||
var changes []*Change
|
||||
changes = append(changes, o.Changes...)
|
||||
if o.ExtensionChanges != nil {
|
||||
changes = append(changes, o.ExtensionChanges.GetAllChanges()...)
|
||||
}
|
||||
return changes
|
||||
}
|
||||
|
||||
// TotalChanges returns the total number of changes made between two OAuthFlow objects
|
||||
func (o *OAuthFlowChanges) TotalChanges() int {
|
||||
c := o.PropertyChanges.TotalChanges()
|
||||
if o.ExtensionChanges != nil {
|
||||
c += o.ExtensionChanges.TotalChanges()
|
||||
}
|
||||
return c
|
||||
c := o.PropertyChanges.TotalChanges()
|
||||
if o.ExtensionChanges != nil {
|
||||
c += o.ExtensionChanges.TotalChanges()
|
||||
}
|
||||
return c
|
||||
}
|
||||
|
||||
// TotalBreakingChanges returns the total number of breaking changes made between two OAuthFlow objects
|
||||
func (o *OAuthFlowChanges) TotalBreakingChanges() int {
|
||||
return o.PropertyChanges.TotalBreakingChanges()
|
||||
return o.PropertyChanges.TotalBreakingChanges()
|
||||
}
|
||||
|
||||
// CompareOAuthFlow checks a left and a right OAuthFlow object for changes. If found, returns a pointer to
|
||||
// an OAuthFlowChanges instance, or nil if nothing is found.
|
||||
func CompareOAuthFlow(l, r *v3.OAuthFlow) *OAuthFlowChanges {
|
||||
if low.AreEqual(l, r) {
|
||||
return nil
|
||||
}
|
||||
if low.AreEqual(l, r) {
|
||||
return nil
|
||||
}
|
||||
|
||||
var changes []*Change
|
||||
var props []*PropertyCheck
|
||||
var changes []*Change
|
||||
var props []*PropertyCheck
|
||||
|
||||
// authorization url
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.AuthorizationUrl.ValueNode,
|
||||
RightNode: r.AuthorizationUrl.ValueNode,
|
||||
Label: v3.AuthorizationUrlLabel,
|
||||
Changes: &changes,
|
||||
Breaking: true,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
// authorization url
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.AuthorizationUrl.ValueNode,
|
||||
RightNode: r.AuthorizationUrl.ValueNode,
|
||||
Label: v3.AuthorizationUrlLabel,
|
||||
Changes: &changes,
|
||||
Breaking: true,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
|
||||
// token url
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.TokenUrl.ValueNode,
|
||||
RightNode: r.TokenUrl.ValueNode,
|
||||
Label: v3.TokenUrlLabel,
|
||||
Changes: &changes,
|
||||
Breaking: true,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
// token url
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.TokenUrl.ValueNode,
|
||||
RightNode: r.TokenUrl.ValueNode,
|
||||
Label: v3.TokenUrlLabel,
|
||||
Changes: &changes,
|
||||
Breaking: true,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
|
||||
// refresh url
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.RefreshUrl.ValueNode,
|
||||
RightNode: r.RefreshUrl.ValueNode,
|
||||
Label: v3.RefreshUrlLabel,
|
||||
Changes: &changes,
|
||||
Breaking: true,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
// refresh url
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.RefreshUrl.ValueNode,
|
||||
RightNode: r.RefreshUrl.ValueNode,
|
||||
Label: v3.RefreshUrlLabel,
|
||||
Changes: &changes,
|
||||
Breaking: true,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
|
||||
CheckProperties(props)
|
||||
CheckProperties(props)
|
||||
|
||||
for v := range l.Scopes.Value {
|
||||
if r != nil && r.FindScope(v.Value) == nil {
|
||||
CreateChange(&changes, ObjectRemoved, v3.Scopes,
|
||||
l.Scopes.Value[v].ValueNode, nil, true,
|
||||
v.Value, nil)
|
||||
continue
|
||||
}
|
||||
if r != nil && r.FindScope(v.Value) != nil {
|
||||
if l.Scopes.Value[v].Value != r.FindScope(v.Value).Value {
|
||||
CreateChange(&changes, Modified, v3.Scopes,
|
||||
l.Scopes.Value[v].ValueNode, r.FindScope(v.Value).ValueNode, true,
|
||||
l.Scopes.Value[v].Value, r.FindScope(v.Value).Value)
|
||||
}
|
||||
}
|
||||
}
|
||||
for v := range r.Scopes.Value {
|
||||
if l != nil && l.FindScope(v.Value) == nil {
|
||||
CreateChange(&changes, ObjectAdded, v3.Scopes,
|
||||
nil, r.Scopes.Value[v].ValueNode, false,
|
||||
nil, v.Value)
|
||||
}
|
||||
}
|
||||
oa := new(OAuthFlowChanges)
|
||||
oa.PropertyChanges = NewPropertyChanges(changes)
|
||||
oa.ExtensionChanges = CompareExtensions(l.Extensions, r.Extensions)
|
||||
return oa
|
||||
for v := range l.Scopes.Value {
|
||||
if r != nil && r.FindScope(v.Value) == nil {
|
||||
CreateChange(&changes, ObjectRemoved, v3.Scopes,
|
||||
l.Scopes.Value[v].ValueNode, nil, true,
|
||||
v.Value, nil)
|
||||
continue
|
||||
}
|
||||
if r != nil && r.FindScope(v.Value) != nil {
|
||||
if l.Scopes.Value[v].Value != r.FindScope(v.Value).Value {
|
||||
CreateChange(&changes, Modified, v3.Scopes,
|
||||
l.Scopes.Value[v].ValueNode, r.FindScope(v.Value).ValueNode, true,
|
||||
l.Scopes.Value[v].Value, r.FindScope(v.Value).Value)
|
||||
}
|
||||
}
|
||||
}
|
||||
for v := range r.Scopes.Value {
|
||||
if l != nil && l.FindScope(v.Value) == nil {
|
||||
CreateChange(&changes, ObjectAdded, v3.Scopes,
|
||||
nil, r.Scopes.Value[v].ValueNode, false,
|
||||
nil, v.Value)
|
||||
}
|
||||
}
|
||||
oa := new(OAuthFlowChanges)
|
||||
oa.PropertyChanges = NewPropertyChanges(changes)
|
||||
oa.ExtensionChanges = CompareExtensions(l.Extensions, r.Extensions)
|
||||
return oa
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user