Skip to content

Commit 22e9aff

Browse files
committed
* Updated to new lint rules (globals and inits)
* Fixes following scope lint checker Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
1 parent cfd46eb commit 22e9aff

13 files changed

+34
-21
lines changed

contact_info_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ import (
1818
"testing"
1919
)
2020

21-
var contactInfoJSON = `{"name":"wordnik api team","url":"http://developer.wordnik.com","email":"some@mailayada.dkdkd"}`
22-
var contactInfoYAML = `name: wordnik api team
21+
const contactInfoJSON = `{"name":"wordnik api team","url":"http://developer.wordnik.com","email":"some@mailayada.dkdkd"}`
22+
const contactInfoYAML = `name: wordnik api team
2323
url: http://developer.wordnik.com
2424
email: some@mailayada.dkdkd
2525
`
26+
2627
var contactInfo = ContactInfo{
2728
Name: "wordnik api team",
2829
URL: "http://developer.wordnik.com",

expander.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,22 +168,25 @@ func ExpandSpec(spec *Swagger, options *ExpandOptions) error {
168168
}
169169
}
170170

171-
for key, parameter := range spec.Parameters {
171+
for key := range spec.Parameters {
172+
parameter := spec.Parameters[key]
172173
if err := expandParameterOrResponse(&parameter, resolver, specBasePath); resolver.shouldStopOnError(err) {
173174
return err
174175
}
175176
spec.Parameters[key] = parameter
176177
}
177178

178-
for key, response := range spec.Responses {
179+
for key := range spec.Responses {
180+
response := spec.Responses[key]
179181
if err := expandParameterOrResponse(&response, resolver, specBasePath); resolver.shouldStopOnError(err) {
180182
return err
181183
}
182184
spec.Responses[key] = response
183185
}
184186

185187
if spec.Paths != nil {
186-
for key, path := range spec.Paths.Paths {
188+
for key := range spec.Paths.Paths {
189+
path := spec.Paths.Paths[key]
187190
if err := expandPathItem(&path, resolver, specBasePath); resolver.shouldStopOnError(err) {
188191
return err
189192
}
@@ -485,7 +488,8 @@ func expandOperation(op *Operation, resolver *schemaLoader, basePath string) err
485488
return nil
486489
}
487490

488-
for i, param := range op.Parameters {
491+
for i := range op.Parameters {
492+
param := op.Parameters[i]
489493
if err := expandParameterOrResponse(&param, resolver, basePath); resolver.shouldStopOnError(err) {
490494
return err
491495
}
@@ -497,7 +501,8 @@ func expandOperation(op *Operation, resolver *schemaLoader, basePath string) err
497501
if err := expandParameterOrResponse(responses.Default, resolver, basePath); resolver.shouldStopOnError(err) {
498502
return err
499503
}
500-
for code, response := range responses.StatusCodeResponses {
504+
for code := range responses.StatusCodeResponses {
505+
response := responses.StatusCodeResponses[code]
501506
if err := expandParameterOrResponse(&response, resolver, basePath); resolver.shouldStopOnError(err) {
502507
return err
503508
}

header_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var header = Header{
5757
},
5858
}
5959

60-
var headerJSON = `{
60+
const headerJSON = `{
6161
"items": {
6262
"$ref": "Cat"
6363
},

info_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/stretchr/testify/assert"
2222
)
2323

24-
var infoJSON = `{
24+
const infoJSON = `{
2525
"description": "A sample API that uses a petstore as an example to demonstrate features in ` +
2626
`the swagger-2.0 specification",
2727
"title": "Swagger Sample API",

items_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var items = Items{
4848
},
4949
}
5050

51-
var itemsJSON = `{
51+
const itemsJSON = `{
5252
"items": {
5353
"$ref": "Cat"
5454
},

operation.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"bytes"
1919
"encoding/gob"
2020
"encoding/json"
21+
"sort"
2122

2223
"github.com/go-openapi/jsonpointer"
2324
"github.com/go-openapi/swag"
@@ -88,11 +89,17 @@ func (o *Operation) SuccessResponse() (*Response, int, bool) {
8889
return nil, 0, false
8990
}
9091

91-
for k, v := range o.Responses.StatusCodeResponses {
92-
if k/100 == 2 {
93-
return &v, k, true
92+
responseCodes := make([]int, 0, len(o.Responses.StatusCodeResponses))
93+
for k := range o.Responses.StatusCodeResponses {
94+
if k >= 200 && k < 300 {
95+
responseCodes = append(responseCodes, k)
9496
}
9597
}
98+
if len(responseCodes) > 0 {
99+
sort.Ints(responseCodes)
100+
v := o.Responses.StatusCodeResponses[responseCodes[0]]
101+
return &v, responseCodes[0], true
102+
}
96103

97104
return o.Responses.Default, 0, false
98105
}

operation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var operation = Operation{
5858
},
5959
}
6060

61-
var operationJSON = `{
61+
const operationJSON = `{
6262
"description": "operation description",
6363
"x-framework": "go-swagger",
6464
"consumes": [ "application/json", "application/x-yaml" ],

path_item_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var pathItem = PathItem{
5858
},
5959
}
6060

61-
var pathItemJSON = `{
61+
const pathItemJSON = `{
6262
"$ref": "Dog",
6363
"x-framework": "go-swagger",
6464
"get": { "description": "get operation description" },

paths_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var paths = Paths{
3030
},
3131
}
3232

33-
var pathsJSON = `{"x-framework":"go-swagger","/":{"$ref":"cats"}}`
33+
const pathsJSON = `{"x-framework":"go-swagger","/":{"$ref":"cats"}}`
3434

3535
func TestIntegrationPaths(t *testing.T) {
3636
var actual Paths

response_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var response = Response{
3434
},
3535
}
3636

37-
var responseJSON = `{
37+
const responseJSON = `{
3838
"$ref": "Dog",
3939
"x-go-name": "PutDogExists",
4040
"description": "Dog exists",

0 commit comments

Comments
 (0)