Merge branch '323961-remove-dast-failed-site-validations-ff' into 'master'

Remove dast_failed_site_validations feature flag

See merge request gitlab-org/gitlab!70697

doc/api/graphql/reference/index.md

@@ -12624,7 +12624,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="projectdastsitevalidationsnormalizedtargeturls"></a>`normalizedTargetUrls` | [`[String!]`](#string) | Normalized URL of the target to be scanned. |
-| <a id="projectdastsitevalidationsstatus"></a>`status` | [`DastSiteValidationStatusEnum`](#dastsitevalidationstatusenum) | Status of the site validation. Ignored if `dast_failed_site_validations` feature flag is disabled. |
+| <a id="projectdastsitevalidationsstatus"></a>`status` | [`DastSiteValidationStatusEnum`](#dastsitevalidationstatusenum) | Status of the site validation. |
 
 ##### `Project.environment`
 

doc/user/application_security/dast/index.md

@@ -1185,11 +1185,9 @@ If a validated site profile's target URL is edited, the site's validation status
 
 #### Retry a failed validation
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/322609) in GitLab 14.3.
-
-FLAG:
-On self-managed GitLab, by default this feature is available. To hide the feature, ask an
-administrator to [disable the `dast_failed_site_validations` flag](../../../administration/feature_flags.md).
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/322609) in GitLab 14.3.
+> - [Deployed behind the `dast_failed_site_validations` flag](../../../administration/feature_flags.md), enabled by default.
+> - [Feature flag `dast_failed_site_validations` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/323961) in GitLab 14.4.
 
 If a site profile's validation fails, you can retry it by selecting the **Retry validation** button
 in the profiles list.

ee/app/assets/javascripts/security_configuration/dast_profiles/components/dast_profiles.vue

@@ -3,7 +3,6 @@ import { GlDropdown, GlDropdownItem, GlTab, GlTabs } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
 import { getLocationHash } from '~/lib/utils/url_utility';
 import { __, s__ } from '~/locale';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import * as cacheUtils from '../graphql/cache_utils';
 import { getProfileSettings } from '../settings/profiles';
 import DastFailedSiteValidations from './dast_failed_site_validations.vue';
@@ -16,7 +15,6 @@ export default {
     GlTabs,
     DastFailedSiteValidations,
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     createNewProfilePaths: {
       type: Object,
@@ -224,10 +222,7 @@ export default {
 
 <template>
   <section>
-    <dast-failed-site-validations
-      v-if="glFeatures.dastFailedSiteValidations"
-      :full-path="projectFullPath"
-    />
+    <dast-failed-site-validations :full-path="projectFullPath" />
     <header>
       <div class="gl-display-flex gl-align-items-center gl-pt-6 gl-pb-4">
         <h2 class="my-0">

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

@@ -7,7 +7,6 @@ module Projects
 
       before_action do
         authorize_read_on_demand_dast_scan!
-        push_frontend_feature_flag(:dast_failed_site_validations, @project, default_enabled: :yaml)
       end
 
       feature_category :dynamic_application_security_testing

ee/app/graphql/resolvers/dast_site_validation_resolver.rb

@@ -12,11 +12,9 @@ module Resolvers
 
     argument :status, Types::DastSiteValidationStatusEnum,
              required: false,
-             description: 'Status of the site validation. Ignored if `dast_failed_site_validations` feature flag is disabled.'
+             description: 'Status of the site validation.'
 
     def resolve(**args)
-      args.delete(:status) unless Feature.enabled?(:dast_failed_site_validations, project, default_enabled: :yaml)
-
       DastSiteValidationsFinder
         .new(project_id: project.id, url_base: args[:normalized_target_urls], state: args[:status], most_recent: true)
         .execute

ee/config/feature_flags/development/dast_failed_site_validations.yml

----
-name: dast_failed_site_validations
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56146
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323961
-milestone: '13.10'
-type: development
-group: group::dynamic analysis
-default_enabled: true

ee/spec/frontend/security_configuration/dast_profiles/components/dast_profiles_spec.js

@@ -54,11 +54,6 @@ describe('EE - DastProfiles', () => {
         {
           propsData: defaultProps,
           mocks: defaultMocks,
-          provide: {
-            glFeatures: {
-              dastFailedSiteValidations: true,
-            },
-          },
         },
         options,
       ),
@@ -249,18 +244,4 @@ describe('EE - DastProfiles', () => {
       expect(mutate).toHaveBeenCalledTimes(1);
     });
   });
-
-  describe('dastFailedSiteValidations feature flag disabled', () => {
-    it('does not render the failed site validations summary', () => {
-      createComponent({
-        provide: {
-          glFeatures: {
-            dastFailedSiteValidations: false,
-          },
-        },
-      });
-
-      expect(wrapper.findComponent(DastFailedSiteValidations).exists()).toBe(false);
-    });
-  });
 });

ee/spec/graphql/resolvers/dast_site_validation_resolver_spec.rb

@@ -83,16 +83,6 @@ RSpec.describe Resolvers::DastSiteValidationResolver do
 
         it { is_expected.to contain_exactly(dast_site_validation4) }
       end
-
-      context 'when dast_failed_site_validations feature flag is disabled' do
-        let(:status) { 'PASSED_VALIDATION' }
-
-        before do
-          stub_feature_flags(dast_failed_site_validations: false)
-        end
-
-        it_behaves_like 'there is no filtering'
-      end
     end
   end