Merge branch 'move-sast-iac-fe-ce' into 'master'

Move IaC Scanning UI to CE

See merge request gitlab-org/gitlab!74084

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

@@ -17,6 +17,7 @@ import {
 } from '~/vue_shared/security_reports/constants';
 
 import configureSastMutation from '../graphql/configure_sast.mutation.graphql';
+import configureSastIacMutation from '../graphql/configure_iac.mutation.graphql';
 import configureSecretDetectionMutation from '../graphql/configure_secret_detection.mutation.graphql';
 
 /**
@@ -162,6 +163,11 @@ export const securityFeatures = [
           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 will eventually come from the backend, the progress is
           // tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/331621
           canEnableByMergeRequest: true,
@@ -269,6 +275,21 @@ export const featureToMutationMap = {
       },
     }),
   },
+  ...(gon?.features?.configureIacScanningViaMr
+    ? {
+        [REPORT_TYPE_SAST_IAC]: {
+          mutationId: 'configureSastIac',
+          getMutationPayload: (projectPath) => ({
+            mutation: configureSastIacMutation,
+            variables: {
+              input: {
+                projectPath,
+              },
+            },
+          }),
+        },
+      }
+    : {}),
   [REPORT_TYPE_SECRET_DETECTION]: {
     mutationId: 'configureSecretDetection',
     getMutationPayload: (projectPath) => ({

config/known_invalid_graphql_queries.yml

 ---
 filenames:
-  - ee/app/assets/javascripts/oncall_schedules/graphql/mutations/update_oncall_schedule_rotation.mutation.graphql
-  - ee/app/assets/javascripts/security_configuration/graphql/configure_iac.mutation.graphql
+  - ee/app/assets/javascripts/oncall_schedules/graphql/mutations/update_oncall_schedule_rotation.mutation.graphql
\ No newline at end of file

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

 import { s__ } from '~/locale';
 import { featureToMutationMap as featureToMutationMapCE } from '~/security_configuration/components/constants';
-import {
-  REPORT_TYPE_SAST_IAC,
-  REPORT_TYPE_DEPENDENCY_SCANNING,
-} from '~/vue_shared/security_reports/constants';
-import configureSastIacMutation from '../graphql/configure_iac.mutation.graphql';
+import { REPORT_TYPE_DEPENDENCY_SCANNING } from '~/vue_shared/security_reports/constants';
 import configureDependencyScanningMutation from '../graphql/configure_dependency_scanning.mutation.graphql';
 
 export const SMALL = 'SMALL';
@@ -25,21 +21,6 @@ export const CUSTOM_VALUE_MESSAGE = s__(
 
 export const featureToMutationMap = {
   ...featureToMutationMapCE,
-  ...(gon?.features?.configureIacScanningViaMr
-    ? {
-        [REPORT_TYPE_SAST_IAC]: {
-          mutationId: 'configureSastIac',
-          getMutationPayload: (projectPath) => ({
-            mutation: configureSastIacMutation,
-            variables: {
-              input: {
-                projectPath,
-              },
-            },
-          }),
-        },
-      }
-    : {}),
   [REPORT_TYPE_DEPENDENCY_SCANNING]: {
     mutationId: 'configureDependencyScanning',
     getMutationPayload: (projectPath) => ({

ee/lib/ee/gitlab/gon_helper.rb

@@ -15,8 +15,6 @@ module EE
           gon.subscriptions_url = ::Gitlab::SubscriptionPortal::SUBSCRIPTIONS_URL
           gon.payment_form_url  = ::Gitlab::SubscriptionPortal::PAYMENT_FORM_URL
         end
-
-        push_frontend_feature_flag(:configure_iac_scanning_via_mr, current_user, default_enabled: :yaml)
       end
 
       # Exposes if a licensed feature is available.

lib/gitlab/gon_helper.rb

@@ -57,6 +57,7 @@ module Gitlab
       push_frontend_feature_flag(:improved_emoji_picker, default_enabled: :yaml)
       push_frontend_feature_flag(:new_header_search, default_enabled: :yaml)
       push_frontend_feature_flag(:suppress_apollo_errors_during_navigation, current_user, default_enabled: :yaml)
+      push_frontend_feature_flag(:configure_iac_scanning_via_mr, current_user, default_enabled: :yaml)
     end
 
     # Exposes the state of a feature flag to the frontend code.