Skip to content

Commit 15de319

Browse files
committed
Fix linting issues
1 parent 383e51e commit 15de319

File tree

3 files changed

+33
-17
lines changed

3 files changed

+33
-17
lines changed

build.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func makeAllPathsMap(paths *Paths) pathsMap {
158158
pathMap[keySecurity] = makeSecurityMap(&path.Security)
159159
pathMap[keyRequestBody] = makeRequestBodyMap(&path.RequestBody)
160160
pathMap[keyResponses] = makeResponsesMap(&path.Responses)
161-
pathMap[keyParameters] = makeParametersMap(&path.Parameters)
161+
pathMap[keyParameters] = makeParametersMap(path.Parameters)
162162

163163
allPaths[path.Route][strings.ToLower(path.HTTPMethod)] = pathMap
164164
}
@@ -348,11 +348,14 @@ func isStrEmpty(s string) bool {
348348
return s == emptyStr
349349
}
350350

351-
func makeParametersMap(parameters *Parameters) []map[string]interface{} {
351+
func makeParametersMap(parameters Parameters) []map[string]interface{} {
352352
parametersMap := []map[string]interface{}{}
353353

354-
for _, param := range *parameters {
355-
paramMap := make(map[string]interface{})
354+
for i := 0; i < len(parameters); i++ {
355+
var (
356+
param = &parameters[i]
357+
paramMap = make(map[string]interface{})
358+
)
356359

357360
paramMap[keyName] = param.Name
358361
paramMap[keyIn] = param.In

build_test.go

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,12 @@ func TestOAS_BuildStream(t *testing.T) {
232232
}
233233

234234
func Test_makeParametersMap(t *testing.T) {
235+
t.Parallel()
236+
235237
type args struct {
236-
parameters *Parameters
238+
parameters Parameters
237239
}
240+
238241
tests := []struct {
239242
name string
240243
args args
@@ -243,7 +246,7 @@ func Test_makeParametersMap(t *testing.T) {
243246
{
244247
name: "success-minimal",
245248
args: args{
246-
parameters: &Parameters{{
249+
parameters: Parameters{{
247250
Name: "id",
248251
In: "path",
249252
Description: "test",
@@ -262,7 +265,7 @@ func Test_makeParametersMap(t *testing.T) {
262265
{
263266
name: "success-full",
264267
args: args{
265-
parameters: &Parameters{{
268+
parameters: Parameters{{
266269
Name: "id",
267270
In: "path",
268271
Description: "test",
@@ -279,16 +282,19 @@ func Test_makeParametersMap(t *testing.T) {
279282
"in": "path",
280283
"description": "test",
281284
"required": true,
282-
"schema": map[string]interface{}{"name": "id", "type": "integer",
285+
"schema": map[string]interface{}{
286+
"name": "id",
287+
"type": "integer",
283288
"properties": map[string]interface{}{
284289
"id": map[string]interface{}{"type": "integer"},
285-
}},
290+
},
291+
},
286292
}},
287293
},
288294
{
289295
name: "success-ref",
290296
args: args{
291-
parameters: &Parameters{{
297+
parameters: Parameters{{
292298
Name: "id",
293299
In: "path",
294300
Description: "test",
@@ -307,7 +313,7 @@ func Test_makeParametersMap(t *testing.T) {
307313
{
308314
name: "success-xml-entry",
309315
args: args{
310-
parameters: &Parameters{{
316+
parameters: Parameters{{
311317
Name: "id",
312318
In: "path",
313319
Description: "test",
@@ -325,9 +331,13 @@ func Test_makeParametersMap(t *testing.T) {
325331
},
326332
}
327333
for _, tt := range tests {
328-
t.Run(tt.name, func(t *testing.T) {
329-
if got := makeParametersMap(tt.args.parameters); !reflect.DeepEqual(got, tt.want) {
330-
t.Errorf("makeParametersMap() = %+v, want %+v", got, tt.want)
334+
trn := tt
335+
336+
t.Run(trn.name, func(t *testing.T) {
337+
t.Parallel()
338+
339+
if got := makeParametersMap(trn.args.parameters); !reflect.DeepEqual(got, trn.want) {
340+
t.Errorf("makeParametersMap() = %+v, want %+v", got, trn.want)
331341
}
332342
})
333343
}

models.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,15 @@ type SecurityScope struct {
211211
Description string `yaml:"description,omitempty"`
212212
}
213213

214-
// Parameters
214+
// Parameters is a slice of Parameter objects.
215215
type Parameters []Parameter
216216

217+
// Parameter represents OAS parameter object.
217218
type Parameter struct {
218-
// If in is "path", the name field MUST correspond to a template expression occurring within the path field in the Paths Object. See Path Templating for further information.
219-
// If in is "header" and the name field is "Accept", "Content-Type" or "Authorization", the parameter definition SHALL be ignored.
219+
// If in is "path", the name field MUST correspond to a template expression occurring within
220+
// the path field in the Paths Object. See Path Templating for further information.
221+
// If in is "header" and the name field is "Accept", "Content-Type" or "Authorization",
222+
// the parameter definition SHALL be ignored.
220223
// For all other cases, the name corresponds to the parameter name used by the in property.
221224
Name string `yaml:"name,omitempty"`
222225
In string `yaml:"in,omitempty"` // "query", "header", "path" or "cookie".

0 commit comments

Comments
 (0)