Skip to content

G
gitlab-ce
Commit 3690691b authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

[ci skip] Changes after review

parent 38cf8d53
Show whitespace changes
Inline Side-by-side
Showing with 244 additions and 241 deletions
ee/app/assets/javascripts/vue_shared/security_reports/store/actions.js
View file @ 3690691b
......@@ -3,9 +3,7 @@ import * as types from './mutation_types';
export const setHeadBlobPath = ({ commit }, blobPath) => commit(types.SET_HEAD_BLOB_PATH, blobPath);
export const setBaseBlobPath = ({ commit }, blobPath) => {
commit(types.SET_BASE_BLOB_PATH, blobPath);
};
export const setBaseBlobPath = ({ commit }, blobPath) => commit(types.SET_BASE_BLOB_PATH, blobPath);
/**
* SAST
......@@ -28,29 +26,19 @@ export const fetchSastReports = ({ state, dispatch }) => {
dispatch('requestSastReports');
if (head && base) {
Promise.all([axios.get(head), axios.get(base)])
Promise.all([
head ? axios.get(head) : Promise.resolve(),
base ? axios.get(base) : Promise.resolve(),
])
.then(values => {
dispatch('receiveSastReports', {
head: values[0].data,
base: values[1].data,
});
})
.catch(() => {
dispatch('receiveSastError');
});
} else if (head && !base) {
axios
.get(head)
.then(response => {
dispatch('receiveSastReports', {
head: response.data,
head: values[0] ? values[0].data : null,
base: values[1] ? values[1].data : null,
});
})
.catch(() => {
dispatch('receiveSastError');
});
}
};
/**
......@@ -77,29 +65,19 @@ export const fetchSastContainerReports = ({ state, dispatch }) => {
dispatch('requestSastContainerReports');
if (head && base) {
Promise.all([axios.get(head), axios.get(base)])
Promise.all([
head ? axios.get(head) : Promise.resolve(),
base ? axios.get(base) : Promise.resolve(),
])
.then(values => {
dispatch('receiveSastContainerReports', {
head: values[0].data,
base: values[1].data,
});
})
.catch(() => {
dispatch('receiveSastContainerError');
});
} else {
axios
.get(head)
.then(response => {
dispatch('receiveSastContainerReports', {
head: response.data,
head: values[0] ? values[0].data : null,
base: values[1] ? values[1].data : null,
});
})
.catch(() => {
dispatch('receiveSastContainerError');
});
}
};
/**
......@@ -122,29 +100,19 @@ export const fetchDastReports = ({ state, dispatch }) => {
dispatch('requestDastReports');
if (head && base) {
Promise.all([axios.get(head), axios.get(base)])
Promise.all([
head ? axios.get(head) : Promise.resolve(),
base ? axios.get(base) : Promise.resolve(),
])
.then(values => {
dispatch('receiveDastReports', {
head: values[0].data,
base: values[1].data,
head: values[0] ? values[0].data : null,
base: values[1] ? values[1].data : null,
});
})
.catch(() => {
dispatch('receiveDastError');
});
} else {
axios
.get(head)
.then(response => {
dispatch('receiveDastReports', {
head: response.data,
});
})
.catch(() => {
dispatch('receiveDastError');
});
}
};
/**
......@@ -171,27 +139,17 @@ export const fetchDependencyScanningReports = ({ state, dispatch }) => {
dispatch('requestDependencyScanningReports');
if (head && base) {
Promise.all([axios.get(head), axios.get(base)])
Promise.all([
head ? axios.get(head) : Promise.resolve(),
base ? axios.get(base) : Promise.resolve(),
])
.then(values => {
dispatch('receiveDependencyScanningReports', {
head: values[0].data,
base: values[1].data,
});
})
.catch(() => {
dispatch('receiveDependencyScanningError');
});
} else {
axios
.get(head)
.then(response => {
dispatch('receiveDependencyScanningReports', {
head: response.data,
head: values[0] ? values[0].data : null,
base: values[1] ? values[1].data : null,
});
})
.catch(() => {
dispatch('receiveDependencyScanningError');
});
}
};
ee/app/assets/javascripts/vue_shared/security_reports/store/getters.js
View file @ 3690691b
import { n__, s__ } from '~/locale';
import { textBuilder, statusIcon } from './utils';
export const groupedSastText = state => {
const { sast } = state;
return textBuilder(
export const groupedSastText = ({ sast }) =>
textBuilder(
'SAST',
sast.paths,
sast.newIssues.length,
sast.resolvedIssues.length,
sast.allIssues.length,
);
};
export const groupedSastContainerText = state => {
const { sastContainer } = state;
return textBuilder(
export const groupedSastContainerText = ({ sastContainer }) =>
textBuilder(
'Container scanning',
sastContainer.paths,
sastContainer.newIssues.length,
sastContainer.resolvedIssues.length,
);
};
export const groupedDastText = state => {
const { dast } = state;
return textBuilder('DAST', dast.paths, dast.newIssues.length, dast.resolvedIssues.length);
};
export const groupedDastText = ({ dast }) =>
textBuilder('DAST', dast.paths, dast.newIssues.length, dast.resolvedIssues.length);
export const groupedDependencyText = state => {
const { dependencyScanning } = state;
return textBuilder(
export const groupedDependencyText = ({ dependencyScanning }) =>
textBuilder(
'Dependency scanning',
dependencyScanning.paths,
dependencyScanning.newIssues.length,
dependencyScanning.resolvedIssues.length,
);
};
export const groupedSummaryText = (state, getters) => {
const { added, fixed } = state.summaryCounts;
export const groupedSummaryText = ({ added, fixed }, getters) => {
// All reports returned error
if (getters.allReportsHaveError) {
return s__('ciReport|Security scanning failed loading any results');
......@@ -91,15 +80,15 @@ export const groupedSummaryText = (state, getters) => {
return text.join(' ');
};
export const sastStatusIcon = state => statusIcon(state.sast.hasError, state.sast.newIssues.length);
export const sastStatusIcon = ({ sast }) => statusIcon(sast.hasError, sast.newIssues.length);
export const sastContainerStatusIcon = state =>
statusIcon(state.sastContainer.hasError, state.sastContainer.newIssues.length);
export const sastContainerStatusIcon = ({ sastContainer }) =>
statusIcon(sastContainer.hasError, sastContainer.newIssues.length);
export const dastStatusIcon = state => statusIcon(state.dast.hasError, state.dast.newIssues.length);
export const dastStatusIcon = ({ dast }) => statusIcon(dast.hasError, dast.newIssues.length);
export const dependencyScanningStatusIcon = state =>
statusIcon(state.dependencyScanning.hasError, state.dependencyScanning.newIssues.length);
export const dependencyScanningStatusIcon = ({ dependencyScanning }) =>
statusIcon(dependencyScanning.hasError, dependencyScanning.newIssues.length);
export const areReportsLoading = state =>
state.sast.isLoading ||
......
ee/app/assets/javascripts/vue_shared/security_reports/store/mutations.js
View file @ 3690691b
......@@ -55,16 +55,18 @@ export default {
const allIssues = filterByKey(parsedHead, newIssues.concat(resolvedIssues), filterKey);
Object.assign(state.sast, {
Object.assign(state, {
sast: {
...state.sast,
newIssues,
resolvedIssues,
allIssues,
isLoading: false,
});
Object.assign(state.summaryCounts, {
},
summaryCounts: {
added: state.summaryCounts.added + newIssues.length,
fixed: state.summaryCounts.fixed + resolvedIssues.length,
},
});
} else if (reports.head && !reports.base) {
const newIssues = parseSastIssues(reports.head, state.blobPath.head);
......@@ -114,15 +116,17 @@ export default {
const newIssues = filterByKey(headIssues, baseIssues, filterKey);
const resolvedIssues = filterByKey(baseIssues, headIssues, filterKey);
Object.assign(state.sastContainer, {
Object.assign(state, {
sastContainer: {
...state.sastContainer,
isLoading: false,
newIssues,
resolvedIssues,
});
Object.assign(state.summaryCounts, {
},
summaryCounts: {
added: state.summaryCounts.added + newIssues.length,
fixed: state.summaryCounts.fixed + resolvedIssues.length,
},
});
} else if (reports.head && !reports.base) {
Object.assign(state.sastContainer, {
......@@ -164,15 +168,17 @@ export default {
const newIssues = filterByKey(headIssues, baseIssues, filterKey);
const resolvedIssues = filterByKey(baseIssues, headIssues, filterKey);
Object.assign(state.dast, {
Object.assign(state, {
dast: {
...state.dast,
isLoading: false,
newIssues,
resolvedIssues,
});
Object.assign(state.summaryCounts, {
},
summaryCounts: {
added: state.summaryCounts.added + newIssues.length,
fixed: state.summaryCounts.fixed + resolvedIssues.length,
},
});
} else if (reports.head && !reports.base) {
Object.assign(state.dast, {
......@@ -228,16 +234,18 @@ export default {
const resolvedIssues = filterByKey(parsedBase, parsedHead, filterKey);
const allIssues = filterByKey(parsedHead, newIssues.concat(resolvedIssues), filterKey);
Object.assign(state.dependencyScanning, {
Object.assign(state, {
dependencyScanning: {
...state.dependencyScanning,
newIssues,
resolvedIssues,
allIssues,
isLoading: false,
});
Object.assign(state.summaryCounts, {
},
summaryCounts: {
added: state.summaryCounts.added + newIssues.length,
fixed: state.summaryCounts.fixed + resolvedIssues.length,
},
});
} else {
Object.assign(state.dependencyScanning, {
......
ee/app/assets/javascripts/vue_shared/security_reports/store/utils.js
View file @ 3690691b
......@@ -11,13 +11,13 @@ import { n__, s__, sprintf } from '~/locale';
* @param {String} path
*/
export const parseSastIssues = (issues = [], path = '') =>
issues.map(issue =>
Object.assign({}, issue, {
issues.map(issue => ({
...issue,
name: issue.message,
path: issue.file,
urlPath: issue.line ? `${path}/${issue.file}#L${issue.line}` : `${path}/${issue.file}`,
}),
);
);
/**
* Parses Sast Container results into a common format to allow to use the same Vue component
......@@ -27,13 +27,13 @@ export const parseSastIssues = (issues = [], path = '') =>
* @returns {Array}
*/
export const parseSastContainer = (data = []) =>
data.map(el => ({
name: el.vulnerability,
priority: el.severity,
path: el.namespace,
data.map(element => ({
...element,
name: element.vulnerability,
priority: element.severity,
path: element.namespace,
// external link to provide better description
nameLink: `https://cve.mitre.org/cgi-bin/cvename.cgi?name=${el.vulnerability}`,
...el,
nameLink: `https://cve.mitre.org/cgi-bin/cvename.cgi?name=${element.vulnerability}`,
}));
export const parseDastIssues = (issues = []) =>
......
spec/javascripts/helpers/vuex_action_helper.js
View file @ 3690691b
/* eslint-disable */
/**
* helper for testing action with expected mutations
* helper for testing action with expected mutations inspired in
* https://vuex.vuejs.org/en/testing.html
*
* @example
* testAction(
* actions.actionName, // action
* { }, // mocked response
* state, // state
* [
* { type: types.MUTATION}
* { type: types.MUTATION_1, payload: {}}
* ], // mutations
* [
* { type: 'actionName', payload: {}},
* { type: 'actionName1', payload: {}}
* ] //actions
* done,
* );
*/
export default (action, payload, state, expectedMutations, done) => {
let count = 0;
export default (action, payload, state, expectedMutations, expectedActions, done) => {
let mutationsCount = 0;
let actionsCount = 0;
// mock commit
const commit = (type, payload) => {
const mutation = expectedMutations[count];
const commit = (type, mutationPayload) => {
const mutation = expectedMutations[mutationsCount];
try {
expect(mutation.type).to.equal(type);
if (payload) {
expect(mutation.payload).to.deep.equal(payload);
}
} catch (error) {
done(error);
expect(mutation.type).toEqual(type);
if (mutation.payload) {
expect(mutation.payload).toEqual(mutationPayload);
}
count++;
if (count >= expectedMutations.length) {
mutationsCount += 1;
if (mutationsCount >= expectedMutations.length) {
done();
}
};
// mock dispatch
const dispatch = (type, dispatchPayload) => {
const mutation = expectedMutations[count];
const dispatch = (type, actionPayload) => {
const actionExpected = expectedActions[actionsCount];
try {
expect(mutation.type).to.equal(type);
expect(actionExpected.type).toEqual(type);
if (dispatchPayload) {
expect(mutation.payload).to.deep.equal(dispatchPayload);
if (actionExpected.payload) {
expect(actionExpected.payload).toEqual(actionPayload);
}
} catch (error) {
done(error);
}
count++;
if (count >= expectedMutations.length) {
actionsCount += 1;
if (actionsCount >= expectedActions.length) {
done();
}
};
......@@ -52,7 +59,13 @@ export default (action, payload, state, expectedMutations, done) => {
// check if no mutations should have been dispatched
if (expectedMutations.length === 0) {
expect(count).to.equal(0);
expect(mutationsCount).toEqual(0);
done();
}
// check if no mutations should have been dispatched
if (expectedActions.length === 0) {
expect(actionsCount).toEqual(0);
done();
}
};
spec/javascripts/vue_shared/security_reports/store/actions_spec.js
View file @ 3690691b
......@@ -38,6 +38,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -55,6 +56,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -89,6 +91,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -128,7 +131,7 @@ describe('security reports actions', () => {
});
describe('receiveSastError', () => {
it('should commit sast error mutation', (done) => {
it('should commit sast error mutation', done => {
testAction(
actions.receiveSastError,
null,
......@@ -138,6 +141,7 @@ describe('security reports actions', () => {
type: types.RECEIVE_SAST_REPORTS_ERROR,
},
],
[],
done,
);
});
......@@ -156,12 +160,13 @@ describe('security reports actions', () => {
actions.fetchSastReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_SAST_REPORTS,
type: 'requestSastReports',
},
{
type: types.RECEIVE_SAST_REPORTS,
type: 'receiveSastReports',
payload: { head: sastIssues, base: sastIssuesBase },
},
],
......@@ -178,12 +183,13 @@ describe('security reports actions', () => {
actions.fetchSastReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_SAST_REPORTS,
type: 'requestSastReports',
},
{
type: types.RECEIVE_SAST_REPORTS_ERROR,
type: 'receiveSastError',
},
],
done,
......@@ -191,7 +197,7 @@ describe('security reports actions', () => {
});
});
describe('with base', () => {
describe('with head', () => {
it('should dispatch `receiveSastReports`', done => {
mock.onGet('foo').reply(200, sastIssues);
......@@ -201,12 +207,13 @@ describe('security reports actions', () => {
actions.fetchSastReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_SAST_REPORTS,
type: 'requestSastReports',
},
{
type: types.RECEIVE_SAST_REPORTS,
type: 'receiveSastReports',
payload: { head: sastIssues },
},
],
......@@ -222,12 +229,13 @@ describe('security reports actions', () => {
actions.fetchSastReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_SAST_REPORTS,
type: 'requestSastReports',
},
{
type: types.RECEIVE_SAST_REPORTS_ERROR,
type: 'receiveSastError',
},
],
done,
......@@ -248,6 +256,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -265,6 +274,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -281,6 +291,7 @@ describe('security reports actions', () => {
type: types.REQUEST_SAST_CONTAINER_REPORTS,
},
],
[],
done,
);
});
......@@ -298,6 +309,7 @@ describe('security reports actions', () => {
payload: {},
},
],
[],
done,
);
});
......@@ -314,6 +326,7 @@ describe('security reports actions', () => {
type: types.RECEIVE_SAST_CONTAINER_ERROR,
},
],
[],
done,
);
});
......@@ -332,12 +345,13 @@ describe('security reports actions', () => {
actions.fetchSastContainerReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_SAST_CONTAINER_REPORTS,
type: 'requestSastContainerReports',
},
{
type: types.RECEIVE_SAST_CONTAINER_REPORTS,
type: 'receiveSastContainerReports',
payload: { head: dockerReport, base: dockerBaseReport },
},
],
......@@ -354,12 +368,13 @@ describe('security reports actions', () => {
actions.fetchSastContainerReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_SAST_CONTAINER_REPORTS,
type: 'requestSastContainerReports',
},
{
type: types.RECEIVE_SAST_CONTAINER_ERROR,
type: 'receiveSastContainerError',
},
],
done,
......@@ -367,7 +382,7 @@ describe('security reports actions', () => {
});
});
describe('with base', () => {
describe('with head', () => {
it('should dispatch `receiveSastContainerReports`', done => {
mock.onGet('foo').reply(200, dockerReport);
......@@ -377,12 +392,13 @@ describe('security reports actions', () => {
actions.fetchSastContainerReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_SAST_CONTAINER_REPORTS,
type: 'requestSastContainerReports',
},
{
type: types.RECEIVE_SAST_CONTAINER_REPORTS,
type: 'receiveSastContainerReports',
payload: { head: dockerReport },
},
],
......@@ -398,12 +414,13 @@ describe('security reports actions', () => {
actions.fetchSastContainerReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_SAST_CONTAINER_REPORTS,
type: 'requestSastContainerReports',
},
{
type: types.RECEIVE_SAST_CONTAINER_REPORTS,
type: 'receiveSastContainerError',
},
],
done,
......@@ -424,6 +441,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -441,6 +459,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -457,6 +476,7 @@ describe('security reports actions', () => {
type: types.REQUEST_DAST_REPORTS,
},
],
[],
done,
);
});
......@@ -474,6 +494,7 @@ describe('security reports actions', () => {
payload: {},
},
],
[],
done,
);
});
......@@ -490,6 +511,7 @@ describe('security reports actions', () => {
type: types.RECEIVE_DAST_ERROR,
},
],
[],
done,
);
});
......@@ -508,12 +530,13 @@ describe('security reports actions', () => {
actions.fetchDastReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_DAST_REPORTS,
type: 'requestDastReports',
},
{
type: types.RECEIVE_DAST_REPORTS,
type: 'receiveDastReports',
payload: { head: dast, base: dastBase },
},
],
......@@ -530,12 +553,13 @@ describe('security reports actions', () => {
actions.fetchDastReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_DAST_REPORTS,
type: 'requestDastReports',
},
{
type: types.RECEIVE_DAST_ERROR,
type: 'receiveDastError',
},
],
done,
......@@ -543,7 +567,7 @@ describe('security reports actions', () => {
});
});
describe('with base', () => {
describe('with head', () => {
it('should dispatch `receiveSastContainerReports`', done => {
mock.onGet('foo').reply(200, dast);
mockedState.dast.paths.head = 'foo';
......@@ -552,12 +576,13 @@ describe('security reports actions', () => {
actions.fetchDastReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_DAST_REPORTS,
type: 'requestDastReports',
},
{
type: types.RECEIVE_DAST_REPORTS,
type: 'receiveDastReports',
payload: { head: dast },
},
],
......@@ -573,12 +598,13 @@ describe('security reports actions', () => {
actions.fetchDastReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_DAST_REPORTS,
type: 'requestDastReports',
},
{
type: types.RECEIVE_DAST_ERROR,
type: 'receiveDastError',
},
],
done,
......@@ -599,6 +625,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -616,6 +643,7 @@ describe('security reports actions', () => {
payload: 'path',
},
],
[],
done,
);
});
......@@ -632,6 +660,7 @@ describe('security reports actions', () => {
type: types.REQUEST_DEPENDENCY_SCANNING_REPORTS,
},
],
[],
done,
);
});
......@@ -649,6 +678,7 @@ describe('security reports actions', () => {
payload: {},
},
],
[],
done,
);
});
......@@ -665,6 +695,7 @@ describe('security reports actions', () => {
type: types.RECEIVE_DEPENDENCY_SCANNING_ERROR,
},
],
[],
done,
);
});
......@@ -683,12 +714,13 @@ describe('security reports actions', () => {
actions.fetchDependencyScanningReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_DEPENDENCY_SCANNING_REPORTS,
type: 'requestDependencyScanningReports',
},
{
type: types.RECEIVE_DEPENDENCY_SCANNING_REPORTS,
type: 'receiveDependencyScanningReports',
payload: { head: sastIssues, base: sastIssuesBase },
},
],
......@@ -705,12 +737,13 @@ describe('security reports actions', () => {
actions.fetchDependencyScanningReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_DEPENDENCY_SCANNING_REPORTS,
type: 'requestDependencyScanningReports',
},
{
type: types.RECEIVE_DEPENDENCY_SCANNING_ERROR,
type: 'receiveDependencyScanningError',
},
],
done,
......@@ -718,7 +751,7 @@ describe('security reports actions', () => {
});
});
describe('with base', () => {
describe('with head', () => {
it('should dispatch `receiveDependencyScanningReports`', done => {
mock.onGet('foo').reply(200, sastIssues);
mockedState.dependencyScanning.paths.head = 'foo';
......@@ -727,12 +760,13 @@ describe('security reports actions', () => {
actions.fetchDependencyScanningReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_DEPENDENCY_SCANNING_REPORTS,
type: 'requestDependencyScanningReports',
},
{
type: types.RECEIVE_DEPENDENCY_SCANNING_REPORTS,
type: 'receiveDependencyScanningReports',
payload: { head: sastIssues },
},
],
......@@ -748,12 +782,13 @@ describe('security reports actions', () => {
actions.fetchDependencyScanningReports,
null,
mockedState,
[],
[
{
type: types.REQUEST_DEPENDENCY_SCANNING_REPORTS,
type: 'requestDependencyScanningReports',
},
{
type: types.RECEIVE_DEPENDENCY_SCANNING_ERROR,
type: 'receiveDependencyScanningError',
},
],
done,
......
spec/javascripts/vue_shared/security_reports/store/getters_spec.js
View file @ 3690691b
......@@ -305,7 +305,7 @@ describe('Security reports getters', () => {
});
it('returns added and fixed text', () => {
const newState = Object.assign({}, state());
const newState = state();
newState.summaryCounts = {
added: 2,
fixed: 4,
......@@ -321,7 +321,7 @@ describe('Security reports getters', () => {
});
it('returns added text', () => {
const newState = Object.assign({}, state());
const newState = state();
newState.summaryCounts = {
added: 2,
fixed: 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7