Merge branch '340388-dast-view-scans-remove-feature-flag' into 'master'

Remove the dast_view_scans feature flag

See merge request gitlab-org/gitlab!77672

app/graphql/resolvers/concerns/resolves_pipelines.rb

@@ -24,7 +24,7 @@ module ResolvesPipelines
     argument :source,
              GraphQL::Types::String,
              required: false,
-             description: "Filter pipelines by their source. Will be ignored if `dast_view_scans` feature flag is disabled."
+             description: "Filter pipelines by their source."
   end
 
   class_methods do
@@ -38,8 +38,6 @@ module ResolvesPipelines
   end
 
   def resolve_pipelines(project, params = {})
-    params.delete(:source) unless Feature.enabled?(:dast_view_scans, project, default_enabled: :yaml)
-
     Ci::PipelinesFinder.new(project, context[:current_user], params).execute
   end
 end

config/feature_flags/development/dast_view_scans.yml

----
-name: dast_view_scans
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69571
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340388
-milestone: '14.3'
-type: development
-group: group::dynamic analysis
-default_enabled: true

doc/api/graphql/reference/index.md

@@ -9158,7 +9158,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="commitpipelinesref"></a>`ref` | [`String`](#string) | Filter pipelines by the ref they are run for. |
 | <a id="commitpipelinesscope"></a>`scope` | [`PipelineScopeEnum`](#pipelinescopeenum) | Filter pipelines by scope. |
 | <a id="commitpipelinessha"></a>`sha` | [`String`](#string) | Filter pipelines by the sha of the commit they are run for. |
-| <a id="commitpipelinessource"></a>`source` | [`String`](#string) | Filter pipelines by their source. Will be ignored if `dast_view_scans` feature flag is disabled. |
+| <a id="commitpipelinessource"></a>`source` | [`String`](#string) | Filter pipelines by their source. |
 | <a id="commitpipelinesstatus"></a>`status` | [`PipelineStatusEnum`](#pipelinestatusenum) | Filter pipelines by their status. |
 
 ### `ComplianceFramework`
@@ -11911,7 +11911,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="mergerequestpipelinesref"></a>`ref` | [`String`](#string) | Filter pipelines by the ref they are run for. |
 | <a id="mergerequestpipelinesscope"></a>`scope` | [`PipelineScopeEnum`](#pipelinescopeenum) | Filter pipelines by scope. |
 | <a id="mergerequestpipelinessha"></a>`sha` | [`String`](#string) | Filter pipelines by the sha of the commit they are run for. |
-| <a id="mergerequestpipelinessource"></a>`source` | [`String`](#string) | Filter pipelines by their source. Will be ignored if `dast_view_scans` feature flag is disabled. |
+| <a id="mergerequestpipelinessource"></a>`source` | [`String`](#string) | Filter pipelines by their source. |
 | <a id="mergerequestpipelinesstatus"></a>`status` | [`PipelineStatusEnum`](#pipelinestatusenum) | Filter pipelines by their status. |
 
 ##### `MergeRequest.reference`
@@ -12945,7 +12945,7 @@ Represents a file or directory in the project repository that has been locked.
 | <a id="pipelineconfigsource"></a>`configSource` | [`PipelineConfigSourceEnum`](#pipelineconfigsourceenum) | Configuration source of the pipeline (UNKNOWN_SOURCE, REPOSITORY_SOURCE, AUTO_DEVOPS_SOURCE, WEBIDE_SOURCE, REMOTE_SOURCE, EXTERNAL_PROJECT_SOURCE, BRIDGE_SOURCE, PARAMETER_SOURCE, COMPLIANCE_SOURCE). |
 | <a id="pipelinecoverage"></a>`coverage` | [`Float`](#float) | Coverage percentage. |
 | <a id="pipelinecreatedat"></a>`createdAt` | [`Time!`](#time) | Timestamp of the pipeline's creation. |
-| <a id="pipelinedastprofile"></a>`dastProfile` | [`DastProfile`](#dastprofile) | DAST profile associated with the pipeline. Returns `null`if `dast_view_scans` feature flag is disabled. |
+| <a id="pipelinedastprofile"></a>`dastProfile` | [`DastProfile`](#dastprofile) | DAST profile associated with the pipeline. |
 | <a id="pipelinedetailedstatus"></a>`detailedStatus` | [`DetailedStatus!`](#detailedstatus) | Detailed status of the pipeline. |
 | <a id="pipelinedownstream"></a>`downstream` | [`PipelineConnection`](#pipelineconnection) | Pipelines this pipeline will trigger. (see [Connections](#connections)) |
 | <a id="pipelineduration"></a>`duration` | [`Int`](#int) | Duration of the pipeline in seconds. |
@@ -13377,7 +13377,7 @@ Returns [`DastProfile`](#dastprofile).
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| <a id="projectdastprofilehasdastprofileschedule"></a>`hasDastProfileSchedule` | [`Boolean`](#boolean) | Filter DAST Profiles by whether or not they have a schedule. Will be ignored if `dast_view_scans` feature flag is disabled. |
+| <a id="projectdastprofilehasdastprofileschedule"></a>`hasDastProfileSchedule` | [`Boolean`](#boolean) | Filter DAST Profiles by whether or not they have a schedule. |
 | <a id="projectdastprofileid"></a>`id` | [`DastProfileID!`](#dastprofileid) | ID of the DAST Profile. |
 
 ##### `Project.dastProfiles`
@@ -13394,7 +13394,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| <a id="projectdastprofileshasdastprofileschedule"></a>`hasDastProfileSchedule` | [`Boolean`](#boolean) | Filter DAST Profiles by whether or not they have a schedule. Will be ignored if `dast_view_scans` feature flag is disabled. |
+| <a id="projectdastprofileshasdastprofileschedule"></a>`hasDastProfileSchedule` | [`Boolean`](#boolean) | Filter DAST Profiles by whether or not they have a schedule. |
 
 ##### `Project.dastSiteProfile`
 
@@ -13854,7 +13854,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="projectpipelinesref"></a>`ref` | [`String`](#string) | Filter pipelines by the ref they are run for. |
 | <a id="projectpipelinesscope"></a>`scope` | [`PipelineScopeEnum`](#pipelinescopeenum) | Filter pipelines by scope. |
 | <a id="projectpipelinessha"></a>`sha` | [`String`](#string) | Filter pipelines by the sha of the commit they are run for. |
-| <a id="projectpipelinessource"></a>`source` | [`String`](#string) | Filter pipelines by their source. Will be ignored if `dast_view_scans` feature flag is disabled. |
+| <a id="projectpipelinessource"></a>`source` | [`String`](#string) | Filter pipelines by their source. |
 | <a id="projectpipelinesstatus"></a>`status` | [`PipelineStatusEnum`](#pipelinestatusenum) | Filter pipelines by their status. |
 
 ##### `Project.projectMembers`

ee/app/controllers/projects/on_demand_scans_controller.rb

@@ -11,7 +11,6 @@ module Projects
     feature_category :dynamic_application_security_testing
 
     def index
-      redirect_to new_project_on_demand_scan_path(project) unless Feature.enabled?(:dast_view_scans, @project, default_enabled: :yaml)
     end
 
     def new

ee/app/graphql/ee/types/ci/pipeline_type.rb

@@ -28,15 +28,14 @@ module EE
           field :dast_profile,
             ::Types::Dast::ProfileType,
             null: true,
-            description: 'DAST profile associated with the pipeline. Returns `null`' \
-                         'if `dast_view_scans` feature flag is disabled.'
+            description: 'DAST profile associated with the pipeline.'
 
           def code_quality_reports
             pipeline.codequality_reports.sort_degradations!.values.presence
           end
 
           def dast_profile
-            pipeline.dast_profile if ::Feature.enabled?(:dast_view_scans, pipeline.project, default_enabled: :yaml)
+            pipeline.dast_profile
           end
         end
       end

ee/app/graphql/resolvers/app_sec/dast/profile_resolver.rb

@@ -12,7 +12,7 @@ module Resolvers
 
         argument :has_dast_profile_schedule, ::GraphQL::Types::Boolean,
                  required: false,
-                 description: 'Filter DAST Profiles by whether or not they have a schedule. Will be ignored if `dast_view_scans` feature flag is disabled.'
+                 description: 'Filter DAST Profiles by whether or not they have a schedule.'
 
         when_single do
           argument :id, ::Types::GlobalIDType[::Dast::Profile],
@@ -21,7 +21,6 @@ module Resolvers
         end
 
         def resolve_with_lookahead(**args)
-          args.delete(:has_dast_profile_schedule) unless Feature.enabled?(:dast_view_scans, project, default_enabled: :yaml)
           apply_lookahead(find_dast_profiles(args))
         end
 

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

@@ -91,11 +91,7 @@ module EE
               return ::Sidebars::NilMenuItem.new(item_id: :on_demand_scans)
             end
 
-            link = if ::Feature.enabled?(:dast_view_scans, context.project, default_enabled: :yaml)
-                     project_on_demand_scans_path(context.project)
-                   else
-                     new_project_on_demand_scan_path(context.project)
-                   end
+            link = project_on_demand_scans_path(context.project)
 
             ::Sidebars::MenuItem.new(
               title: s_('OnDemandScans|On-demand scans'),

ee/spec/requests/api/graphql/project/dast_profiles_spec.rb

@@ -109,33 +109,13 @@ RSpec.describe 'Query.project(fullPath).dastProfiles' do
       expect { subject }.not_to exceed_query_limit(control)
     end
 
-    context 'when `dast_view_scans` feature flag is disabled' do
-      before do
-        stub_feature_flags(dast_view_scans: false)
-      end
-
-      context 'when hasDastProfileSchedule is false' do
-        let(:query_args) { { hasDastProfileSchedule: false } }
-
-        include_examples 'returns all dastProfiles'
-      end
-
-      context 'when hasDastProfileSchedule is true' do
-        let(:query_args) { { hasDastProfileSchedule: true } }
+    context 'when hasDastProfileSchedule is true' do
+      let(:query_args) { { hasDastProfileSchedule: true } }
 
-        include_examples 'returns all dastProfiles'
-      end
-    end
-
-    context 'when `dast_view_scans` feature flag is enabled' do
-      context 'when hasDastProfileSchedule is true' do
-        let(:query_args) { { hasDastProfileSchedule: true } }
-
-        it 'returns all dastProfiles with a schedule' do
-          subject
+      it 'returns all dastProfiles with a schedule' do
+        subject
 
-          expect(graphql_data_at(:project, :dast_profiles, :nodes, :id)).to contain_exactly(dast_profile5.to_global_id.to_s)
-        end
+        expect(graphql_data_at(:project, :dast_profiles, :nodes, :id)).to contain_exactly(dast_profile5.to_global_id.to_s)
       end
     end
   end

ee/spec/requests/api/graphql/project/pipelines/dast_profile_spec.rb

@@ -78,16 +78,6 @@ RSpec.describe 'Query.project(fullPath).pipelines.dastProfile' do
         expect { subject }.not_to exceed_query_limit(control)
         expect(dast_profile_data.size).to eq(6)
       end
-
-      context 'when feature flag is not enabled' do
-        it 'does not return dast profile data' do
-          stub_feature_flags(dast_view_scans: false)
-
-          subject
-
-          expect(dast_profile_data).to contain_exactly(nil)
-        end
-      end
     end
   end
 end

ee/spec/requests/projects/on_demand_scans_controller_spec.rb

@@ -73,20 +73,6 @@ RSpec.describe Projects::OnDemandScansController, type: :request do
     it_behaves_like 'on-demand scans page' do
       let(:path) { project_on_demand_scans_path(project) }
     end
-
-    context 'when dast_view_scans feature flag is disabled' do
-      before do
-        stub_licensed_features(security_on_demand_scans: true)
-        stub_feature_flags(dast_view_scans: false)
-        project.add_developer(user)
-        login_as(user)
-        get project_on_demand_scans_path(project)
-      end
-
-      it 'redirects to new on-demands scans form' do
-        expect(response).to redirect_to(new_project_on_demand_scan_path(project))
-      end
-    end
   end
 
   describe 'GET #new' do

ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

@@ -210,22 +210,6 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
         expect(rendered).to have_link('Audit events', href: project_audit_events_path(project))
       end
     end
-
-    context 'when dast_view_scans feature flag is disabled' do
-      before do
-        allow(view).to receive(:current_user).and_return(user)
-        stub_feature_flags(dast_view_scans: false)
-        stub_licensed_features(
-          security_on_demand_scans: true
-        )
-
-        render
-      end
-
-      it 'links to on-demand scans form instead of index page' do
-        expect(rendered).to have_link('On-demand scans', href: new_project_on_demand_scan_path(project))
-      end
-    end
   end
 
   describe 'Operations' do

spec/graphql/resolvers/concerns/resolves_pipelines_spec.rb

@@ -62,24 +62,12 @@ RSpec.describe ResolvesPipelines do
   context 'filtering by source' do
     let_it_be(:source_pipeline) { create(:ci_pipeline, project: project, source: 'web') }
 
-    context 'when `dast_view_scans` feature flag is disabled' do
-      before do
-        stub_feature_flags(dast_view_scans: false)
-      end
-
-      it 'does not filter by source' do
-        expect(resolve_pipelines(source: 'web')).to contain_exactly(*all_pipelines, source_pipeline)
-      end
+    it 'does filter by source' do
+      expect(resolve_pipelines(source: 'web')).to contain_exactly(source_pipeline)
     end
 
-    context 'when `dast_view_scans` feature flag is enabled' do
-      it 'does filter by source' do
-        expect(resolve_pipelines(source: 'web')).to contain_exactly(source_pipeline)
-      end
-
-      it 'returns all the pipelines' do
-        expect(resolve_pipelines).to contain_exactly(*all_pipelines, source_pipeline)
-      end
+    it 'returns all the pipelines' do
+      expect(resolve_pipelines).to contain_exactly(*all_pipelines, source_pipeline)
     end
   end