Commit 8e6d996b authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch '343966-remove-iac-feature-flag' into 'master'

Remove the configureIacScanningViaMr feature flag

See merge request gitlab-org/gitlab!75721
parents 73ff9e6f 2da8ae7b
...@@ -156,8 +156,6 @@ export const securityFeatures = [ ...@@ -156,8 +156,6 @@ export const securityFeatures = [
// https://gitlab.com/gitlab-org/gitlab/-/issues/331621 // https://gitlab.com/gitlab-org/gitlab/-/issues/331621
canEnableByMergeRequest: true, canEnableByMergeRequest: true,
}, },
...(gon?.features?.configureIacScanningViaMr
? [
{ {
name: SAST_IAC_NAME, name: SAST_IAC_NAME,
shortName: SAST_IAC_SHORT_NAME, shortName: SAST_IAC_SHORT_NAME,
...@@ -175,8 +173,6 @@ export const securityFeatures = [ ...@@ -175,8 +173,6 @@ export const securityFeatures = [
// tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/331621 // tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/331621
canEnableByMergeRequest: true, canEnableByMergeRequest: true,
}, },
]
: []),
{ {
name: DAST_NAME, name: DAST_NAME,
shortName: DAST_SHORT_NAME, shortName: DAST_SHORT_NAME,
...@@ -278,8 +274,6 @@ export const featureToMutationMap = { ...@@ -278,8 +274,6 @@ export const featureToMutationMap = {
}, },
}), }),
}, },
...(gon?.features?.configureIacScanningViaMr
? {
[REPORT_TYPE_SAST_IAC]: { [REPORT_TYPE_SAST_IAC]: {
mutationId: 'configureSastIac', mutationId: 'configureSastIac',
getMutationPayload: (projectPath) => ({ getMutationPayload: (projectPath) => ({
...@@ -291,8 +285,6 @@ export const featureToMutationMap = { ...@@ -291,8 +285,6 @@ export const featureToMutationMap = {
}, },
}), }),
}, },
}
: {}),
[REPORT_TYPE_SECRET_DETECTION]: { [REPORT_TYPE_SECRET_DETECTION]: {
mutationId: 'configureSecretDetection', mutationId: 'configureSecretDetection',
getMutationPayload: (projectPath) => ({ getMutationPayload: (projectPath) => ({
......
---
name: configure_iac_scanning_via_mr
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73155
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343966
milestone: '14.5'
type: development
group: group::static analysis
default_enabled: true
...@@ -91,24 +91,6 @@ RSpec.describe 'User sees Security Configuration table', :js do ...@@ -91,24 +91,6 @@ RSpec.describe 'User sees Security Configuration table', :js do
expect(page).to have_link('Configure DAST') expect(page).to have_link('Configure DAST')
end end
end end
context 'with configure_iac_scanning_via_mr feature flag off' do
before do
stub_feature_flags(configure_iac_scanning_via_mr: false)
end
it 'shows DAST card at the second position and no IaC Scanning card' do
visit(project_security_configuration_path(project))
within '[data-testid="security-testing-card"]:nth-of-type(2)' do
expect(page).to have_text('DAST')
expect(page).to have_text('Enabled')
expect(page).to have_link('Configure DAST')
end
expect(page).not_to have_text('Infrastructure as Code (IaC) Scanning')
end
end
end end
end end
......
...@@ -56,7 +56,6 @@ module Gitlab ...@@ -56,7 +56,6 @@ module Gitlab
push_frontend_feature_flag(:security_auto_fix, default_enabled: false) push_frontend_feature_flag(:security_auto_fix, default_enabled: false)
push_frontend_feature_flag(:improved_emoji_picker, default_enabled: :yaml) push_frontend_feature_flag(:improved_emoji_picker, default_enabled: :yaml)
push_frontend_feature_flag(:new_header_search, default_enabled: :yaml) push_frontend_feature_flag(:new_header_search, default_enabled: :yaml)
push_frontend_feature_flag(:configure_iac_scanning_via_mr, current_user, default_enabled: :yaml)
push_frontend_feature_flag(:bootstrap_confirmation_modals, default_enabled: :yaml) push_frontend_feature_flag(:bootstrap_confirmation_modals, default_enabled: :yaml)
end end
......
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