Commit 7afc24ac authored by Illya Klymov's avatar Illya Klymov

Merge branch...

Merge branch '227575-fe-implementation-convert-rest-api-to-graphql-mutation-for-mr-creation-flow' into 'master'

Replace POST with GraphQL mutation in SAST Configuration

See merge request gitlab-org/gitlab!41995
parents 3dacb762 2dca2bce
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
required: false, required: false,
default: false, default: false,
}, },
// TODO: Remove as part of https://gitlab.com/gitlab-org/gitlab/-/issues/227575 // TODO: Remove as part of https://gitlab.com/gitlab-org/gitlab/-/issues/241377
createSastMergeRequestPath: { createSastMergeRequestPath: {
type: String, type: String,
required: true, required: true,
......
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
canConfigureFeature() { canConfigureFeature() {
return Boolean(this.glFeatures.sastConfigurationUi && this.feature.configuration_path); return Boolean(this.glFeatures.sastConfigurationUi && this.feature.configuration_path);
}, },
// TODO: Remove as part of https://gitlab.com/gitlab-org/gitlab/-/issues/227575 // TODO: Remove as part of https://gitlab.com/gitlab-org/gitlab/-/issues/241377
canCreateSASTMergeRequest() { canCreateSASTMergeRequest() {
return Boolean(this.feature.type === 'sast' && this.createSastMergeRequestPath); return Boolean(this.feature.type === 'sast' && this.createSastMergeRequestPath);
}, },
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
>{{ s__('SecurityConfiguration|Enable') }}</gl-button >{{ s__('SecurityConfiguration|Enable') }}</gl-button
> >
<!-- TODO: Remove as part of https://gitlab.com/gitlab-org/gitlab/-/issues/227575 --> <!-- TODO: Remove as part of https://gitlab.com/gitlab-org/gitlab/-/issues/241377 -->
<create-merge-request-button <create-merge-request-button
v-else-if="canCreateSASTMergeRequest" v-else-if="canCreateSASTMergeRequest"
:auto-devops-enabled="autoDevopsEnabled" :auto-devops-enabled="autoDevopsEnabled"
......
...@@ -3,7 +3,6 @@ import { GlAlert, GlLink, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; ...@@ -3,7 +3,6 @@ import { GlAlert, GlLink, GlLoadingIcon, GlSprintf } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import sastCiConfigurationQuery from '../graphql/sast_ci_configuration.query.graphql'; import sastCiConfigurationQuery from '../graphql/sast_ci_configuration.query.graphql';
import ConfigurationForm from './configuration_form.vue'; import ConfigurationForm from './configuration_form.vue';
import { extractSastConfigurationEntities } from './utils';
export default { export default {
components: { components: {
...@@ -24,16 +23,18 @@ export default { ...@@ -24,16 +23,18 @@ export default {
}, },
}, },
apollo: { apollo: {
sastConfigurationEntities: { sastCiConfiguration: {
query: sastCiConfigurationQuery, query: sastCiConfigurationQuery,
variables() { variables() {
return { return {
fullPath: this.projectPath, fullPath: this.projectPath,
}; };
}, },
update: extractSastConfigurationEntities, update({ project }) {
return project?.sastCiConfiguration;
},
result({ loading }) { result({ loading }) {
if (!loading && this.sastConfigurationEntities.length === 0) { if (!loading && !this.sastCiConfiguration) {
this.onError(); this.onError();
} }
}, },
...@@ -44,7 +45,7 @@ export default { ...@@ -44,7 +45,7 @@ export default {
}, },
data() { data() {
return { return {
sastConfigurationEntities: [], sastCiConfiguration: null,
hasLoadingError: false, hasLoadingError: false,
showFeedbackAlert: true, showFeedbackAlert: true,
}; };
...@@ -114,6 +115,6 @@ export default { ...@@ -114,6 +115,6 @@ export default {
>{{ $options.i18n.loadingErrorText }}</gl-alert >{{ $options.i18n.loadingErrorText }}</gl-alert
> >
<configuration-form v-else :entities="sastConfigurationEntities" /> <configuration-form v-else :sast-ci-configuration="sastCiConfiguration" />
</article> </article>
</template> </template>
...@@ -3,10 +3,10 @@ import { GlAlert, GlButton } from '@gitlab/ui'; ...@@ -3,10 +3,10 @@ import { GlAlert, GlButton } from '@gitlab/ui';
import * as Sentry from '@sentry/browser'; import * as Sentry from '@sentry/browser';
import { cloneDeep } from 'lodash'; import { cloneDeep } from 'lodash';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
import axios from '~/lib/utils/axios_utils';
import { redirectTo } from '~/lib/utils/url_utility'; import { redirectTo } from '~/lib/utils/url_utility';
import DynamicFields from './dynamic_fields.vue'; import DynamicFields from './dynamic_fields.vue';
import { isValidConfigurationEntity } from './utils'; import configureSastMutation from '../graphql/configure_sast.mutation.graphql';
import { toSastCiConfigurationEntityInput } from './utils';
export default { export default {
components: { components: {
...@@ -23,17 +23,22 @@ export default { ...@@ -23,17 +23,22 @@ export default {
from: 'securityConfigurationPath', from: 'securityConfigurationPath',
default: '', default: '',
}, },
projectPath: {
from: 'projectPath',
default: '',
},
}, },
props: { props: {
entities: { // A SastCiConfiguration GraphQL object
type: Array, sastCiConfiguration: {
type: Object,
required: true, required: true,
validator: value => value.every(isValidConfigurationEntity),
}, },
}, },
data() { data() {
return { return {
formEntities: cloneDeep(this.entities), globalConfiguration: cloneDeep(this.sastCiConfiguration.global.nodes),
pipelineConfiguration: cloneDeep(this.sastCiConfiguration.pipeline.nodes),
hasSubmissionError: false, hasSubmissionError: false,
isSubmitting: false, isSubmitting: false,
}; };
...@@ -43,16 +48,25 @@ export default { ...@@ -43,16 +48,25 @@ export default {
this.isSubmitting = true; this.isSubmitting = true;
this.hasSubmissionError = false; this.hasSubmissionError = false;
return axios return this.$apollo
.post(this.createSastMergeRequestPath, this.getFormData()) .mutate({
mutation: configureSastMutation,
variables: {
input: {
projectPath: this.projectPath,
configuration: this.getMutationConfiguration(),
},
},
})
.then(({ data }) => { .then(({ data }) => {
const { filePath } = data; const { errors, successPath } = data.configureSast;
if (!filePath) {
if (errors.length > 0 || !successPath) {
// eslint-disable-next-line @gitlab/require-i18n-strings // eslint-disable-next-line @gitlab/require-i18n-strings
throw new Error('SAST merge request creation failed'); throw new Error('SAST merge request creation mutation failed');
} }
redirectTo(filePath); redirectTo(successPath);
}) })
.catch(error => { .catch(error => {
this.isSubmitting = false; this.isSubmitting = false;
...@@ -60,11 +74,11 @@ export default { ...@@ -60,11 +74,11 @@ export default {
Sentry.captureException(error); Sentry.captureException(error);
}); });
}, },
getFormData() { getMutationConfiguration() {
return this.formEntities.reduce((acc, { field, value }) => { return {
acc[field] = value; global: this.globalConfiguration.map(toSastCiConfigurationEntityInput),
return acc; pipeline: this.pipelineConfiguration.map(toSastCiConfigurationEntityInput),
}, {}); };
}, },
}, },
i18n: { i18n: {
...@@ -79,7 +93,8 @@ export default { ...@@ -79,7 +93,8 @@ export default {
<template> <template>
<form @submit.prevent="onSubmit"> <form @submit.prevent="onSubmit">
<dynamic-fields v-model="formEntities" /> <dynamic-fields v-model="globalConfiguration" class="gl-m-0" />
<dynamic-fields v-model="pipelineConfiguration" class="gl-m-0" />
<hr /> <hr />
......
...@@ -28,11 +28,14 @@ export const isValidAnalyzerEntity = object => { ...@@ -28,11 +28,14 @@ export const isValidAnalyzerEntity = object => {
return isString(name) && isString(label) && isString(description) && isBoolean(enabled); return isString(name) && isString(label) && isString(description) && isBoolean(enabled);
}; };
export const extractSastConfigurationEntities = ({ project }) => { /**
if (!project?.sastCiConfiguration) { * Given a SastCiConfigurationEntity, returns a SastCiConfigurationEntityInput
return []; * suitable for use in the configureSast GraphQL mutation.
} * @param {SastCiConfigurationEntity}
* @returns {SastCiConfigurationEntityInput}
const { global, pipeline } = project.sastCiConfiguration; */
return [...global.nodes, ...pipeline.nodes]; export const toSastCiConfigurationEntityInput = ({ field, defaultValue, value }) => ({
}; field,
defaultValue,
value,
});
mutation configureSast($input: ConfigureSastInput!) {
configureSast(input: $input) {
successPath
errors
}
}
...@@ -26,7 +26,6 @@ module Mutations ...@@ -26,7 +26,6 @@ module Mutations
def resolve(project_path:, configuration:) def resolve(project_path:, configuration:)
project = authorized_find!(full_path: project_path) project = authorized_find!(full_path: project_path)
validate_flag!(project)
sast_create_service_params = format_for_service(configuration) sast_create_service_params = format_for_service(configuration)
result = ::Security::CiConfiguration::SastCreateService.new(project, current_user, sast_create_service_params).execute result = ::Security::CiConfiguration::SastCreateService.new(project, current_user, sast_create_service_params).execute
...@@ -35,12 +34,6 @@ module Mutations ...@@ -35,12 +34,6 @@ module Mutations
private private
def validate_flag!(project)
return if ::Feature.enabled?(:security_sast_configuration, project)
raise Gitlab::Graphql::Errors::ResourceNotAvailable, 'security_sast_configuration flag is not enabled on this project'
end
def find_object(full_path:) def find_object(full_path:)
resolve_project(full_path: full_path) resolve_project(full_path: full_path)
end end
......
---
name: security_sast_configuration
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40637
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235929
group: group::static analysis
type: development
default_enabled: false
...@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils'; ...@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
import { GlLink, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; import { GlLink, GlLoadingIcon, GlSprintf } from '@gitlab/ui';
import SASTConfigurationApp from 'ee/security_configuration/sast/components/app.vue'; import SASTConfigurationApp from 'ee/security_configuration/sast/components/app.vue';
import ConfigurationForm from 'ee/security_configuration/sast/components/configuration_form.vue'; import ConfigurationForm from 'ee/security_configuration/sast/components/configuration_form.vue';
import { makeEntities } from './helpers'; import { makeSastCiConfiguration } from './helpers';
const sastDocumentationPath = '/help/sast'; const sastDocumentationPath = '/help/sast';
const projectPath = 'namespace/project'; const projectPath = 'namespace/project';
...@@ -11,11 +11,10 @@ describe('SAST Configuration App', () => { ...@@ -11,11 +11,10 @@ describe('SAST Configuration App', () => {
let wrapper; let wrapper;
const createComponent = ({ const createComponent = ({
provide = {},
stubs = {}, stubs = {},
loading = false, loading = true,
hasLoadingError = false, hasLoadingError = false,
sastConfigurationEntities = [], sastCiConfiguration = null,
} = {}) => { } = {}) => {
wrapper = shallowMount(SASTConfigurationApp, { wrapper = shallowMount(SASTConfigurationApp, {
mocks: { $apollo: { loading } }, mocks: { $apollo: { loading } },
...@@ -23,16 +22,16 @@ describe('SAST Configuration App', () => { ...@@ -23,16 +22,16 @@ describe('SAST Configuration App', () => {
provide: { provide: {
sastDocumentationPath, sastDocumentationPath,
projectPath, projectPath,
...provide,
}, },
}); // While setting data is usually frowned upon, it is the documented way
// of mocking GraphQL response data:
// While setData is usually frowned upon, it is the documented way of // https://docs.gitlab.com/ee/development/fe_guide/graphql.html#testing
// mocking GraphQL response data: data() {
// https://docs.gitlab.com/ee/development/fe_guide/graphql.html#testing return {
wrapper.setData({ hasLoadingError,
hasLoadingError, sastCiConfiguration,
sastConfigurationEntities, };
},
}); });
}; };
...@@ -119,6 +118,7 @@ describe('SAST Configuration App', () => { ...@@ -119,6 +118,7 @@ describe('SAST Configuration App', () => {
describe('when loading failed', () => { describe('when loading failed', () => {
beforeEach(() => { beforeEach(() => {
createComponent({ createComponent({
loading: false,
hasLoadingError: true, hasLoadingError: true,
}); });
}); });
...@@ -137,12 +137,13 @@ describe('SAST Configuration App', () => { ...@@ -137,12 +137,13 @@ describe('SAST Configuration App', () => {
}); });
describe('when loaded', () => { describe('when loaded', () => {
let entities; let sastCiConfiguration;
beforeEach(() => { beforeEach(() => {
entities = makeEntities(3); sastCiConfiguration = makeSastCiConfiguration();
createComponent({ createComponent({
sastConfigurationEntities: entities, loading: false,
sastCiConfiguration,
}); });
}); });
...@@ -154,8 +155,8 @@ describe('SAST Configuration App', () => { ...@@ -154,8 +155,8 @@ describe('SAST Configuration App', () => {
expect(findConfigurationForm().exists()).toBe(true); expect(findConfigurationForm().exists()).toBe(true);
}); });
it('passes the sastConfigurationEntities to the entities prop', () => { it('passes the sastCiConfiguration to the sastCiConfiguration prop', () => {
expect(findConfigurationForm().props('entities')).toBe(entities); expect(findConfigurationForm().props('sastCiConfiguration')).toBe(sastCiConfiguration);
}); });
it('does not display an alert message', () => { it('does not display an alert message', () => {
......
import * as Sentry from '@sentry/browser'; import * as Sentry from '@sentry/browser';
import AxiosMockAdapter from 'axios-mock-adapter';
import { GlAlert } from '@gitlab/ui'; import { GlAlert } from '@gitlab/ui';
import waitForPromises from 'helpers/wait_for_promises';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import ConfigurationForm from 'ee/security_configuration/sast/components/configuration_form.vue'; import ConfigurationForm from 'ee/security_configuration/sast/components/configuration_form.vue';
import DynamicFields from 'ee/security_configuration/sast/components/dynamic_fields.vue'; import DynamicFields from 'ee/security_configuration/sast/components/dynamic_fields.vue';
import configureSastMutation from 'ee/security_configuration/sast/graphql/configure_sast.mutation.graphql';
import { redirectTo } from '~/lib/utils/url_utility'; import { redirectTo } from '~/lib/utils/url_utility';
import axios from '~/lib/utils/axios_utils'; import { makeEntities, makeSastCiConfiguration } from './helpers';
import { makeEntities } from './helpers';
jest.mock('~/lib/utils/url_utility', () => ({ jest.mock('~/lib/utils/url_utility', () => ({
redirectTo: jest.fn(), redirectTo: jest.fn(),
})); }));
const createSastMergeRequestPath = '/merge_request/create'; const projectPath = 'group/project';
const securityConfigurationPath = '/security/configuration'; const securityConfigurationPath = '/security/configuration';
const newMergeRequestPath = '/merge_request/new'; const newMergeRequestPath = '/merge_request/new';
describe('ConfigurationForm component', () => { describe('ConfigurationForm component', () => {
let wrapper; let wrapper;
let entities; let sastCiConfiguration;
let axiosMock;
const createComponent = ({ props = {} } = {}) => { let pendingPromiseResolvers;
entities = makeEntities(3, { value: 'foo' }); const fulfillPendingPromises = () => {
pendingPromiseResolvers.forEach(resolve => resolve());
};
const createComponent = ({ mutationResult } = {}) => {
sastCiConfiguration = makeSastCiConfiguration();
wrapper = shallowMount(ConfigurationForm, { wrapper = shallowMount(ConfigurationForm, {
provide: { provide: {
createSastMergeRequestPath, projectPath,
securityConfigurationPath, securityConfigurationPath,
}, },
propsData: { propsData: {
entities, sastCiConfiguration,
...props, },
mocks: {
$apollo: {
mutate: jest.fn(
() =>
new Promise(resolve => {
pendingPromiseResolvers.push(() =>
resolve({
data: { configureSast: mutationResult },
}),
);
}),
),
},
}, },
}); });
}; };
...@@ -41,52 +56,73 @@ describe('ConfigurationForm component', () => { ...@@ -41,52 +56,73 @@ describe('ConfigurationForm component', () => {
const findSubmitButton = () => wrapper.find({ ref: 'submitButton' }); const findSubmitButton = () => wrapper.find({ ref: 'submitButton' });
const findErrorAlert = () => wrapper.find(GlAlert); const findErrorAlert = () => wrapper.find(GlAlert);
const findCancelButton = () => wrapper.find({ ref: 'cancelButton' }); const findCancelButton = () => wrapper.find({ ref: 'cancelButton' });
const findDynamicFieldsComponent = () => wrapper.find(DynamicFields); const findDynamicFieldsComponents = () => wrapper.findAll(DynamicFields);
const expectPayloadForEntities = () => { const expectPayloadForEntities = () => {
const { post } = axiosMock.history; const expectedPayload = {
mutation: configureSastMutation,
expect(post).toHaveLength(1); variables: {
input: {
projectPath,
configuration: {
global: [
{
field: 'field0',
defaultValue: 'defaultValue0',
value: 'value0',
},
],
pipeline: [
{
field: 'field1',
defaultValue: 'defaultValue1',
value: 'value1',
},
],
},
},
},
};
const postedData = JSON.parse(post[0].data); expect(wrapper.vm.$apollo.mutate.mock.calls).toEqual([[expectedPayload]]);
entities.forEach(entity => {
expect(postedData[entity.field]).toBe(entity.value);
});
}; };
beforeEach(() => { beforeEach(() => {
axiosMock = new AxiosMockAdapter(axios); pendingPromiseResolvers = [];
}); });
afterEach(() => { afterEach(() => {
wrapper.destroy(); wrapper.destroy();
wrapper = null;
axiosMock.restore();
}); });
describe('the DynamicFields component', () => { describe.each`
type | expectedPosition
${'global'} | ${0}
${'pipeline'} | ${1}
`('the $type DynamicFields component', ({ type, expectedPosition }) => {
let dynamicFields;
beforeEach(() => { beforeEach(() => {
createComponent(); createComponent();
dynamicFields = findDynamicFieldsComponents().at(expectedPosition);
}); });
it('renders', () => { it('renders', () => {
expect(findDynamicFieldsComponent().exists()).toBe(true); expect(dynamicFields.exists()).toBe(true);
}); });
it('recieves a copy of the entities prop', () => { it(`receives a copy of the ${type} entities`, () => {
const entitiesProp = findDynamicFieldsComponent().props('entities'); const entitiesProp = dynamicFields.props('entities');
expect(entitiesProp).not.toBe(entities); expect(entitiesProp).not.toBe(sastCiConfiguration[type].nodes);
expect(entitiesProp).toEqual(entities); expect(entitiesProp).toEqual(sastCiConfiguration[type].nodes);
}); });
describe('when the dynamic fields component emits an input event', () => { describe('when it emits an input event', () => {
let dynamicFields;
let newEntities; let newEntities;
beforeEach(() => { beforeEach(() => {
dynamicFields = findDynamicFieldsComponent(); newEntities = makeEntities(1);
newEntities = makeEntities(3, { value: 'foo' });
dynamicFields.vm.$emit(DynamicFields.model.event, newEntities); dynamicFields.vm.$emit(DynamicFields.model.event, newEntities);
}); });
...@@ -102,65 +138,68 @@ describe('ConfigurationForm component', () => { ...@@ -102,65 +138,68 @@ describe('ConfigurationForm component', () => {
}); });
describe.each` describe.each`
context | filePath | statusCode | partialErrorMessage context | successPath | errors
${'a response error code'} | ${newMergeRequestPath} | ${500} | ${'500'} ${'no successPath'} | ${''} | ${[]}
${'no filePath'} | ${''} | ${200} | ${/merge request.*fail/} ${'any errors'} | ${''} | ${['an error']}
`( `('given an unsuccessful endpoint response due to $context', ({ successPath, errors }) => {
'given an unsuccessful endpoint response due to $context', beforeEach(() => {
({ filePath, statusCode, partialErrorMessage }) => { createComponent({
beforeEach(() => { mutationResult: {
axiosMock.onPost(createSastMergeRequestPath).replyOnce(statusCode, { filePath }); successPath,
createComponent(); errors,
},
findForm().trigger('submit');
}); });
it('includes the value of each entity in the payload', expectPayloadForEntities); findForm().trigger('submit');
});
it(`sets the submit button's loading prop to true`, () => { it('includes the value of each entity in the payload', expectPayloadForEntities);
expect(findSubmitButton().props('loading')).toBe(true);
});
describe('after async tasks', () => { it(`sets the submit button's loading prop to true`, () => {
beforeEach(() => waitForPromises()); expect(findSubmitButton().props('loading')).toBe(true);
});
it('does not call redirectTo', () => { describe('after async tasks', () => {
expect(redirectTo).not.toHaveBeenCalled(); beforeEach(fulfillPendingPromises);
});
it('displays an alert message', () => { it('does not call redirectTo', () => {
expect(findErrorAlert().exists()).toBe(true); expect(redirectTo).not.toHaveBeenCalled();
}); });
it('sends the error to Sentry', () => { it('displays an alert message', () => {
expect(Sentry.captureException.mock.calls).toMatchObject([ expect(findErrorAlert().exists()).toBe(true);
[{ message: expect.stringMatching(partialErrorMessage) }], });
]);
});
it(`sets the submit button's loading prop to false`, () => { it('sends the error to Sentry', () => {
expect(findSubmitButton().props('loading')).toBe(false); expect(Sentry.captureException.mock.calls).toMatchObject([
}); [{ message: expect.stringMatching(/merge request.*fail/) }],
]);
});
describe('submitting again after a previous error', () => { it(`sets the submit button's loading prop to false`, () => {
beforeEach(() => { expect(findSubmitButton().props('loading')).toBe(false);
findForm().trigger('submit'); });
});
describe('submitting again after a previous error', () => {
beforeEach(() => {
findForm().trigger('submit');
});
it('hides the alert message', () => { it('hides the alert message', () => {
expect(findErrorAlert().exists()).toBe(false); expect(findErrorAlert().exists()).toBe(false);
});
}); });
}); });
}, });
); });
describe('given a successful endpoint response', () => { describe('given a successful endpoint response', () => {
beforeEach(() => { beforeEach(() => {
axiosMock createComponent({
.onPost(createSastMergeRequestPath) mutationResult: {
.replyOnce(200, { filePath: newMergeRequestPath }); successPath: newMergeRequestPath,
createComponent(); errors: [],
},
});
findForm().trigger('submit'); findForm().trigger('submit');
}); });
...@@ -172,7 +211,7 @@ describe('ConfigurationForm component', () => { ...@@ -172,7 +211,7 @@ describe('ConfigurationForm component', () => {
}); });
describe('after async tasks', () => { describe('after async tasks', () => {
beforeEach(() => waitForPromises()); beforeEach(fulfillPendingPromises);
it('calls redirectTo', () => { it('calls redirectTo', () => {
expect(redirectTo).toHaveBeenCalledWith(newMergeRequestPath); expect(redirectTo).toHaveBeenCalledWith(newMergeRequestPath);
......
...@@ -14,10 +14,30 @@ export const makeEntities = (count, changes) => ...@@ -14,10 +14,30 @@ export const makeEntities = (count, changes) =>
field: `field${i}`, field: `field${i}`,
label: `label${i}`, label: `label${i}`,
type: 'string', type: 'string',
value: `defaultValue${i}`, value: `value${i}`,
...changes, ...changes,
})); }));
/**
* Creates a mock SastCiConfiguration GraphQL object instance.
*
* @param {number} totalEntities - The total number of entities to create.
* @returns {SastCiConfiguration}
*/
export const makeSastCiConfiguration = (totalEntities = 2) => {
// Call makeEntities just once to ensure unique fields
const entities = makeEntities(totalEntities);
return {
global: {
nodes: entities.slice(0, totalEntities - 1),
},
pipeline: {
nodes: entities.slice(totalEntities - 1),
},
};
};
/** /**
* Creates an array of objects matching the shape of a GraphQl * Creates an array of objects matching the shape of a GraphQl
* SastCiConfigurationAnalyzersEntity. * SastCiConfigurationAnalyzersEntity.
......
import { import {
isValidConfigurationEntity, isValidConfigurationEntity,
isValidAnalyzerEntity, isValidAnalyzerEntity,
extractSastConfigurationEntities, toSastCiConfigurationEntityInput,
} from 'ee/security_configuration/sast/components/utils'; } from 'ee/security_configuration/sast/components/utils';
import { makeEntities, makeAnalyzerEntities } from './helpers'; import { makeEntities, makeAnalyzerEntities } from './helpers';
...@@ -54,36 +54,20 @@ describe('isValidAnalyzerEntity', () => { ...@@ -54,36 +54,20 @@ describe('isValidAnalyzerEntity', () => {
}); });
}); });
describe('extractSastConfigurationEntities', () => { describe('toSastCiConfigurationEntityInput', () => {
describe.each` let entity = makeEntities(1);
context | response
${'which is empty'} | ${{}}
${'with no project'} | ${{ project: null }}
${'with no configuration'} | ${{ project: {} }}
`('given a response $context', ({ response }) => {
it('returns an empty array', () => {
expect(extractSastConfigurationEntities(response)).toEqual([]);
});
});
describe('given a valid response', () => { describe('given a SastCiConfigurationEntity', () => {
it('returns an array of entities from the global and pipeline sections', () => { beforeEach(() => {
const globalEntities = makeEntities(3, { description: 'global' }); [entity] = makeEntities(1);
const pipelineEntities = makeEntities(3, { description: 'pipeline' }); });
const response = {
project: {
sastCiConfiguration: {
global: { nodes: globalEntities },
pipeline: { nodes: pipelineEntities },
},
},
};
expect(extractSastConfigurationEntities(response)).toEqual([ it('returns a SastCiConfigurationEntityInput object', () => {
...globalEntities, expect(toSastCiConfigurationEntityInput(entity)).toEqual({
...pipelineEntities, field: entity.field,
]); defaultValue: entity.defaultValue,
value: entity.value,
});
}); });
}); });
}); });
...@@ -32,10 +32,6 @@ RSpec.describe Mutations::Security::CiConfiguration::ConfigureSast do ...@@ -32,10 +32,6 @@ RSpec.describe Mutations::Security::CiConfiguration::ConfigureSast do
) )
end end
before do
stub_feature_flags(security_sast_configuration: true)
end
specify { expect(described_class).to require_graphql_authorizations(:push_code) } specify { expect(described_class).to require_graphql_authorizations(:push_code) }
describe '#resolve' do describe '#resolve' do
...@@ -86,14 +82,6 @@ RSpec.describe Mutations::Security::CiConfiguration::ConfigureSast do ...@@ -86,14 +82,6 @@ RSpec.describe Mutations::Security::CiConfiguration::ConfigureSast do
end end
end end
context 'when sast configuration feature is not enabled' do
it 'raises an exception' do
stub_feature_flags(security_sast_configuration: false)
expect { subject }.to raise_error(Gitlab::Graphql::Errors::ResourceNotAvailable)
end
end
context 'when service can not generate any path to create a new merge request' do context 'when service can not generate any path to create a new merge request' do
it 'returns an array of errors' do it 'returns an array of errors' do
allow_next_instance_of(::Security::CiConfiguration::SastCreateService) do |service| allow_next_instance_of(::Security::CiConfiguration::SastCreateService) do |service|
......
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