Merge branch '321258-on-by-default' into 'master'

Default on policies feature flag

See merge request gitlab-org/gitlab!69804

config/feature_flags/development/security_orchestration_policies_configuration.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321258
 milestone: '13.9'
 type: development
 group: group::container security
-default_enabled: false
+default_enabled: true

ee/app/controllers/projects/security/policies_controller.rb

@@ -9,7 +9,7 @@ class PoliciesController < Projects::ApplicationController
       before_action :validate_policy_configuration, only: :edit
 
       before_action do
-        push_frontend_feature_flag(:security_orchestration_policies_configuration, project)
+        push_frontend_feature_flag(:security_orchestration_policies_configuration, project, default_enabled: :yaml)
         check_feature_flag!
       end
 
@@ -91,7 +91,7 @@ def policy_configuration
       end
 
       def check_feature_flag!
-        render_404 if Feature.disabled?(:security_orchestration_policies_configuration, project)
+        render_404 if Feature.disabled?(:security_orchestration_policies_configuration, project, default_enabled: :yaml)
       end
     end
   end

ee/app/controllers/projects/threat_monitoring_controller.rb

@@ -7,7 +7,7 @@ class ThreatMonitoringController < Projects::ApplicationController
     before_action :authorize_read_threat_monitoring!
 
     before_action do
-      push_frontend_feature_flag(:security_orchestration_policies_configuration, @project)
+      push_frontend_feature_flag(:security_orchestration_policies_configuration, @project, default_enabled: :yaml)
     end
 
     feature_category :not_owned

ee/app/graphql/mutations/security_policy/assign_security_policy_project.rb

@@ -40,7 +40,7 @@ def find_policy_project(id)
       end
 
       def allowed?(project)
-        Feature.enabled?(:security_orchestration_policies_configuration, project)
+        Feature.enabled?(:security_orchestration_policies_configuration, project, default_enabled: :yaml)
       end
 
       def assign_project(project, policy_project)

ee/app/graphql/mutations/security_policy/commit_scan_execution_policy.rb

@@ -43,7 +43,7 @@ def resolve(args)
       private
 
       def allowed?(project)
-        Feature.enabled?(:security_orchestration_policies_configuration, project)
+        Feature.enabled?(:security_orchestration_policies_configuration, project, default_enabled: :yaml)
       end
 
       def commit_policy(project, policy_yaml, operation_mode)

ee/app/graphql/mutations/security_policy/create_security_policy_project.rb

@@ -34,7 +34,7 @@ def resolve(args)
       private
 
       def allowed?(project)
-        Feature.enabled?(:security_orchestration_policies_configuration, project)
+        Feature.enabled?(:security_orchestration_policies_configuration, project, default_enabled: :yaml)
       end
 
       def create_project(project)

ee/app/models/security/orchestration_policy_configuration.rb

@@ -46,7 +46,7 @@ def self.valid_scan_type?(scan_type)
     end
 
     def enabled?
-      ::Feature.enabled?(:security_orchestration_policies_configuration, project)
+      ::Feature.enabled?(:security_orchestration_policies_configuration, project, default_enabled: :yaml)
     end
 
     def policy_hash

ee/app/services/ee/projects/create_service.rb

@@ -65,7 +65,7 @@ def create_security_policy_configuration_if_exists
         return unless security_policy_target_project_id.present?
 
         if (security_policy_target_project = ::Project.find(security_policy_target_project_id))
-          return unless ::Feature.enabled?(:security_orchestration_policies_configuration, security_policy_target_project)
+          return unless ::Feature.enabled?(:security_orchestration_policies_configuration, security_policy_target_project, default_enabled: :yaml)
 
           ::Security::Orchestration::AssignService
             .new(security_policy_target_project, current_user, policy_project_id: project.id)

ee/lib/ee/sidebars/projects/menus/security_compliance_menu.rb

@@ -143,7 +143,7 @@ def threat_monitoring_menu_item
           end
 
           def scan_policies_menu_item
-            if ::Feature.disabled?(:security_orchestration_policies_configuration, context.project) ||
+            if ::Feature.disabled?(:security_orchestration_policies_configuration, context.project, default_enabled: :yaml) ||
               !can?(context.current_user, :security_orchestration_policies, context.project)
               return ::Sidebars::NilMenuItem.new(item_id: :scan_policies)
             end