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

Remove the configureIacScanningViaMr feature flag

See merge request gitlab-org/gitlab!75721

app/assets/javascripts/security_configuration/components/constants.js

@@ -156,27 +156,23 @@ export const securityFeatures = [
     // https://gitlab.com/gitlab-org/gitlab/-/issues/331621
     canEnableByMergeRequest: true,
   },
-  ...(gon?.features?.configureIacScanningViaMr
-    ? [
-        {
-          name: SAST_IAC_NAME,
-          shortName: SAST_IAC_SHORT_NAME,
-          description: SAST_IAC_DESCRIPTION,
-          helpPath: SAST_IAC_HELP_PATH,
-          configurationHelpPath: SAST_IAC_CONFIG_HELP_PATH,
-          type: REPORT_TYPE_SAST_IAC,
+  {
+    name: SAST_IAC_NAME,
+    shortName: SAST_IAC_SHORT_NAME,
+    description: SAST_IAC_DESCRIPTION,
+    helpPath: SAST_IAC_HELP_PATH,
+    configurationHelpPath: SAST_IAC_CONFIG_HELP_PATH,
+    type: REPORT_TYPE_SAST_IAC,
 
-          // This field is currently hardcoded because SAST IaC is always available.
-          // It will eventually come from the Backend, the progress is tracked in
-          // https://gitlab.com/gitlab-org/gitlab/-/issues/331622
-          available: true,
+    // This field is currently hardcoded because SAST IaC is always available.
+    // It will eventually come from the Backend, the progress is tracked in
+    // https://gitlab.com/gitlab-org/gitlab/-/issues/331622
+    available: true,
 
-          // This field will eventually come from the backend, the progress is
-          // tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/331621
-          canEnableByMergeRequest: true,
-        },
-      ]
-    : []),
+    // This field will eventually come from the backend, the progress is
+    // tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/331621
+    canEnableByMergeRequest: true,
+  },
   {
     name: DAST_NAME,
     shortName: DAST_SHORT_NAME,
@@ -278,21 +274,17 @@ export const featureToMutationMap = {
       },
     }),
   },
-  ...(gon?.features?.configureIacScanningViaMr
-    ? {
-        [REPORT_TYPE_SAST_IAC]: {
-          mutationId: 'configureSastIac',
-          getMutationPayload: (projectPath) => ({
-            mutation: configureSastIacMutation,
-            variables: {
-              input: {
-                projectPath,
-              },
-            },
-          }),
+  [REPORT_TYPE_SAST_IAC]: {
+    mutationId: 'configureSastIac',
+    getMutationPayload: (projectPath) => ({
+      mutation: configureSastIacMutation,
+      variables: {
+        input: {
+          projectPath,
         },
-      }
-    : {}),
+      },
+    }),
+  },
   [REPORT_TYPE_SECRET_DETECTION]: {
     mutationId: 'configureSecretDetection',
     getMutationPayload: (projectPath) => ({

config/feature_flags/development/configure_iac_scanning_via_mr.yml

----
-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

ee/spec/features/projects/security/user_views_security_configuration_spec.rb

@@ -91,24 +91,6 @@ RSpec.describe 'User sees Security Configuration table', :js do
           expect(page).to have_link('Configure DAST')
         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
 

lib/gitlab/gon_helper.rb

@@ -56,7 +56,6 @@ module Gitlab
       push_frontend_feature_flag(:security_auto_fix, default_enabled: false)
       push_frontend_feature_flag(:improved_emoji_picker, 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)
     end