Skip to content

Commit f769668

Browse files
cx-RomeuAlvescx-RomeuAlves
committed
lint
1 parent d20ac83 commit f769668

File tree

3 files changed

+28
-98
lines changed

3 files changed

+28
-98
lines changed

‎internal/app/astquery/provider.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ func (e *Provider) GetCustomStatesList() (*soap.GetResultStateListResponse, erro
7373
output.GetResultStateListResult.ResultStateList.ResultState = []soap.ResultState{}
7474

7575
//nolint:gocritic
76-
for _, v := range statesResponse.GetResultStateListResult.ResultStateList.ResultState {
77-
output.GetResultStateListResult.ResultStateList.ResultState =
78-
append(output.GetResultStateListResult.ResultStateList.ResultState, v)
79-
}
76+
output.GetResultStateListResult.ResultStateList.ResultState =
77+
append(output.GetResultStateListResult.ResultStateList.ResultState, statesResponse.GetResultStateListResult.ResultStateList.ResultState...)
8078

8179
return &output, nil
8280
}

‎internal/process_test.go

+7-60
Original file line numberDiff line numberDiff line change
@@ -1775,77 +1775,24 @@ func TestFetchProjects(t *testing.T) {
17751775

17761776
func TestCustomQueries(t *testing.T) {
17771777
t.Run("fetch custom queries", func(t *testing.T) {
1778-
var customQueriesObj soap.GetQueryCollectionResponse
1779-
ctrl := gomock.NewController(t)
1780-
queryProvider := mock_interfaces_query_common.NewMockASTQueryProvider(ctrl)
1781-
exporter := mock_app_export.NewMockExporter(gomock.NewController(t))
1782-
customQueries, ioCustomErr := os.ReadFile("../test/data/queries/custom_queries.xml")
1783-
assert.NoError(t, ioCustomErr)
1784-
_ = xml.Unmarshal(customQueries, &customQueriesObj)
1785-
queryProvider.EXPECT().GetCustomQueriesList().Return(&customQueriesObj, nil).Times(1)
1786-
exporter.EXPECT().AddFile(export2.QueriesFileName, gomock.Any()).Return(nil)
1787-
1788-
result := fetchQueriesData(queryProvider, exporter)
1789-
1790-
assert.NoError(t, result)
1791-
})
1792-
1793-
t.Run("fetch custom states", func(t *testing.T) {
17941778
var customQueriesObj soap.GetQueryCollectionResponse
17951779
var customStatesObj soap.GetResultStateListResponse
17961780
ctrl := gomock.NewController(t)
17971781
defer ctrl.Finish()
17981782

17991783
queryProvider := mock_interfaces_query_common.NewMockASTQueryProvider(ctrl)
1800-
exporter := mock_app_export.NewMockExporter(ctrl)
1784+
exporter := mock_app_export.NewMockExporter(gomock.NewController(t))
18011785

1802-
customQueries, ioCustomErr := os.ReadFile("../test/data/queries/custom_states.xml")
1786+
customQueries, ioCustomErr := os.ReadFile("../test/data/queries/custom_queries.xml")
18031787
assert.NoError(t, ioCustomErr)
1804-
err := xml.Unmarshal(customQueries, &customQueriesObj)
1788+
_ = xml.Unmarshal(customQueries, &customQueriesObj)
1789+
18051790
queryProvider.EXPECT().GetCustomQueriesList().Return(&customQueriesObj, nil).Times(1)
18061791
exporter.EXPECT().AddFile(export2.QueriesFileName, gomock.Any()).Return(nil).Times(1)
18071792

1808-
customStatesXML := []byte(`
1809-
<GetResultStateListResponse>
1810-
<GetResultStateListResult>
1811-
<ResultStateList>
1812-
<ResultState>
1813-
<ResultName>To Verify</ResultName>
1814-
<ResultID>0</ResultID>
1815-
<ResultPermission>set-result-state-toverify</ResultPermission>
1816-
</ResultState>
1817-
<ResultState>
1818-
<ResultName>Not Exploitable</ResultName>
1819-
<ResultID>1</ResultID>
1820-
<ResultPermission>set-result-state-notexploitable</ResultPermission>
1821-
</ResultState>
1822-
<ResultState>
1823-
<ResultName>Confirmed by Security Team</ResultName>
1824-
<ResultID>2</ResultID>
1825-
<ResultPermission>set-result-state-confirmedbysecurityteam</ResultPermission>
1826-
</ResultState>
1827-
<ResultState>
1828-
<ResultName>Urgent</ResultName>
1829-
<ResultID>3</ResultID>
1830-
<ResultPermission>set-result-state-urgent</ResultPermission>
1831-
</ResultState>
1832-
<ResultState>
1833-
<ResultName>Proposed Not Exploitable</ResultName>
1834-
<ResultID>4</ResultID>
1835-
<ResultPermission>set-result-state-proposednotexploitable</ResultPermission>
1836-
</ResultState>
1837-
<ResultState>
1838-
<ResultName>Accepted</ResultName>
1839-
<ResultID>5</ResultID>
1840-
<ResultPermission>set-result-state-accepted</ResultPermission>
1841-
</ResultState>
1842-
</ResultStateList>
1843-
</GetResultStateListResult>
1844-
</GetResultStateListResponse>
1845-
1846-
`)
1847-
err = xml.Unmarshal(customStatesXML, &customStatesObj)
1848-
assert.NoError(t, err)
1793+
customStates, ioCustomStatesErr := os.ReadFile("../test/data/queries/custom_states.xml")
1794+
assert.NoError(t, ioCustomStatesErr)
1795+
_ = xml.Unmarshal(customStates, &customStatesObj)
18491796

18501797
queryProvider.EXPECT().GetCustomStatesList().Return(&customStatesObj, nil).Times(1)
18511798
exporter.EXPECT().AddFile(export2.CustomStatesFileName, gomock.Any()).Return(nil).Times(1)

‎test/data/queries/custom_states.xml

+19-34
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,22 @@
11
<GetResultStateListResponse>
2-
<GetResultStateListResult>
3-
<ResultStateList>
4-
<ResultState>
5-
<ResultName>To Verify</ResultName>
6-
<ResultID>0</ResultID>
7-
<ResultPermission>set-result-state-toverify</ResultPermission>
8-
</ResultState>
9-
<ResultState>
10-
<ResultName>Not Exploitable</ResultName>
11-
<ResultID>1</ResultID>
12-
<ResultPermission>set-result-state-notexploitable</ResultPermission>
13-
</ResultState>
14-
<ResultState>
15-
<ResultName>Confirmed by Security Team</ResultName>
16-
<ResultID>2</ResultID>
17-
<ResultPermission>set-result-state-confirmedbysecurityteam</ResultPermission>
18-
</ResultState>
19-
<ResultState>
20-
<ResultName>Urgent</ResultName>
21-
<ResultID>3</ResultID>
22-
<ResultPermission>set-result-state-urgent</ResultPermission>
23-
</ResultState>
24-
<ResultState>
25-
<ResultName>Proposed Not Exploitable</ResultName>
26-
<ResultID>4</ResultID>
27-
<ResultPermission>set-result-state-proposednotexploitable</ResultPermission>
28-
</ResultState>
29-
<ResultState>
30-
<ResultName>Accepted</ResultName>
31-
<ResultID>5</ResultID>
32-
<ResultPermission>set-result-state-accepted</ResultPermission>
33-
</ResultState>
34-
</ResultStateList>
35-
</GetResultStateListResult>
2+
<GetResultStateListResult>
3+
<ResultStateList>
4+
<ResultState>
5+
<ResultName>To Verify</ResultName>
6+
<ResultID>0</ResultID>
7+
<ResultPermission>set-result-state-toverify</ResultPermission>
8+
</ResultState>
9+
<ResultState>
10+
<ResultName>Not Exploitable</ResultName>
11+
<ResultID>1</ResultID>
12+
<ResultPermission>set-result-state-notexploitable</ResultPermission>
13+
</ResultState>
14+
<ResultState>
15+
<ResultName>Confirmed by Security Team</ResultName>
16+
<ResultID>2</ResultID>
17+
<ResultPermission>set-result-state-confirmedbysecurityteam</ResultPermission>
18+
</ResultState>
19+
</ResultStateList>
20+
</GetResultStateListResult>
3621
</GetResultStateListResponse>
3722

0 commit comments

Comments
 (0)