Use ordered maps

fenollp · fenollp · commit 7b068defbf4d · 2023-11-26T17:34:13.000+01:00
Signed-off-by: Pierre Fenoll &lt;pierrefenoll@gmail.com&gt;
diff --git a/go.mod b/go.mod
@@ -27,4 +27,7 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/bahlo/generic-list-go v0.2.0 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -3,6 +3,10 @@ github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xW
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
+github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
+github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
+github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/openapi3/loader_test.go b/openapi3/loader_test.go
@@ -62,6 +62,7 @@ paths:
 	require.Equal(t, 2, len(doc.Components.Schemas))
 	require.Equal(t, 1, doc.Paths.Len())
 	require.Equal(t, "unexpected error", *doc.Paths.Value("/items").Put.Responses.Default().Value.Description)
+
 	err = doc.Validate(loader.Context)
 	require.NoError(t, err)
 }
diff --git a/openapi3/security_scheme.go b/openapi3/security_scheme.go
@@ -373,8 +373,8 @@ func (flow *OAuthFlow) Validate(ctx context.Context, opts ...ValidationOption) e
 		}
 	}
 
-	if flow.Scopes == nil {
-		return errors.New("field 'scopes' is missing")
+	if v := flow.Scopes; v == nil || v.Len() == 0 {
+		return errors.New("field 'scopes' is empty or missing")
 	}
 
 	return validateExtensions(ctx, flow.Extensions)

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,7 @@ require (`
`27`	`27`	`github.com/josharian/intern v1.0.0 // indirect`
`28`	`28`	`github.com/mailru/easyjson v0.7.7 // indirect`
`29`	`29`	`github.com/pmezard/go-difflib v1.0.0 // indirect`
	`30`	`+ github.com/bahlo/generic-list-go v0.2.0 // indirect`
	`31`	`+ github.com/buger/jsonparser v1.1.1 // indirect`
	`32`	`+ gopkg.in/yaml.v2 v2.4.0 // indirect`
`30`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ paths:`
`62`	`62`	`require.Equal(t, 2, len(doc.Components.Schemas))`
`63`	`63`	`require.Equal(t, 1, doc.Paths.Len())`
`64`	`64`	`require.Equal(t, "unexpected error", *doc.Paths.Value("/items").Put.Responses.Default().Value.Description)`
	`65`	`+`
`65`	`66`	`err = doc.Validate(loader.Context)`
`66`	`67`	`require.NoError(t, err)`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -373,8 +373,8 @@ func (flow *OAuthFlow) Validate(ctx context.Context, opts ...ValidationOption) e`
`373`	`373`	`}`
`374`	`374`	`}`
`375`	`375`
`376`		`- if flow.Scopes == nil {`
`377`		`- return errors.New("field 'scopes' is missing")`
	`376`	`+ if v := flow.Scopes; v == nil \|\| v.Len() == 0 {`
	`377`	`+ return errors.New("field 'scopes' is empty or missing")`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`return validateExtensions(ctx, flow.Extensions)`