From 6010a33d68859beb94e2752e1d1fa1f1dc5cc070 Mon Sep 17 00:00:00 2001 From: Pranav Jain Date: Fri, 20 Dec 2024 10:07:23 -0600 Subject: [PATCH] Removed git_guardian_integration FF Changelog: other --- doc/api/integrations.md | 1 + doc/user/project/integrations/git_guardian.md | 1 + .../ee/integrations/base/integration.rb | 2 -- ee/app/models/integrations/git_guardian.rb | 2 -- .../development/git_guardian_integration.yml | 9 -------- ee/spec/models/ee/integration_spec.rb | 21 +++--------------- .../models/integrations/git_guardian_spec.rb | 14 ------------ ee/spec/requests/api/integrations_spec.rb | 22 ------------------- lib/api/integrations.rb | 8 ------- 9 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 ee/config/feature_flags/development/git_guardian_integration.yml diff --git a/doc/api/integrations.md b/doc/api/integrations.md index f3f93f16fcc5ca..69938fb7d1e8cd 100644 --- a/doc/api/integrations.md +++ b/doc/api/integrations.md @@ -779,6 +779,7 @@ DETAILS: > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/435706) in GitLab 16.9 [with a flag](../administration/feature_flags.md) named `git_guardian_integration`. Enabled by default. Disabled on GitLab.com. > - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/438695#note_2226917025) in GitLab 17.7. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/176391) in GitLab 17.8. Feature flag `git_guardian_integration` removed. > - `use_inherited_settings` parameter [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/467089) in GitLab 17.2 [with a flag](../administration/feature_flags.md) named `integration_api_inheritance`. Disabled by default. > - `use_inherited_settings` parameter [generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/467186) in GitLab 17.3. Feature flag `integration_api_inheritance` removed. diff --git a/doc/user/project/integrations/git_guardian.md b/doc/user/project/integrations/git_guardian.md index 62d53495a20f95..982ff318b76bb9 100644 --- a/doc/user/project/integrations/git_guardian.md +++ b/doc/user/project/integrations/git_guardian.md @@ -13,6 +13,7 @@ DETAILS: > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/435706) in GitLab 16.9 [with a flag](../../../administration/feature_flags.md) named `git_guardian_integration`. Enabled by default. Disabled on GitLab.com. > - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/438695#note_2226917025) in GitLab 17.7. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/176391) in GitLab 17.8. Feature flag `git_guardian_integration` removed. [GitGuardian](https://www.gitguardian.com/) is a cybersecurity service that detects sensitive data such as API keys and passwords in source code repositories. diff --git a/ee/app/models/concerns/ee/integrations/base/integration.rb b/ee/app/models/concerns/ee/integrations/base/integration.rb index 3ed3819160692e..8576c4a384c188 100644 --- a/ee/app/models/concerns/ee/integrations/base/integration.rb +++ b/ee/app/models/concerns/ee/integrations/base/integration.rb @@ -48,8 +48,6 @@ def integration_names names.delete('google_cloud_platform_workload_identity_federation') end - names.delete('git_guardian') unless ::Feature.enabled?(:git_guardian_integration) # rubocop:disable Gitlab/FeatureFlagWithoutActor -- Legacy use - names end diff --git a/ee/app/models/integrations/git_guardian.rb b/ee/app/models/integrations/git_guardian.rb index c06a3835ccb19c..d15ac8d0495f6b 100644 --- a/ee/app/models/integrations/git_guardian.rb +++ b/ee/app/models/integrations/git_guardian.rb @@ -41,8 +41,6 @@ def self.supported_events end def execute(blobs) - return unless Feature.enabled?(:git_guardian_integration) - ::Gitlab::GitGuardian::Client.new(token).execute(blobs) if activated? end diff --git a/ee/config/feature_flags/development/git_guardian_integration.yml b/ee/config/feature_flags/development/git_guardian_integration.yml deleted file mode 100644 index cefc8aa7fb9592..00000000000000 --- a/ee/config/feature_flags/development/git_guardian_integration.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: git_guardian_integration -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435706 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141611 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/438695 -milestone: '16.9' -group: group::source code -type: development -default_enabled: true diff --git a/ee/spec/models/ee/integration_spec.rb b/ee/spec/models/ee/integration_spec.rb index 0e8eb42335470e..1d8492487ff11f 100644 --- a/ee/spec/models/ee/integration_spec.rb +++ b/ee/spec/models/ee/integration_spec.rb @@ -52,24 +52,9 @@ it { is_expected.to include('google_cloud_platform_workload_identity_federation') } end - describe 'git_guardian_integration feature flag' do - context 'when feature flag is enabled' do - it 'includes git_guardian in Integration.project_specific_integration_names' do - expect(described_class.integration_names) - .to include('git_guardian') - end - end - - context 'when feature flag is disabled' do - before do - stub_feature_flags(git_guardian_integration: false) - end - - it 'does not include git_guardian Integration.project_specific_integration_names' do - expect(described_class.integration_names) - .not_to include('git_guardian') - end - end + it 'includes git_guardian in Integration.project_specific_integration_names' do + expect(described_class.integration_names) + .to include('git_guardian') end end diff --git a/ee/spec/models/integrations/git_guardian_spec.rb b/ee/spec/models/integrations/git_guardian_spec.rb index bc5fbc7d21169f..5d6838f323f860 100644 --- a/ee/spec/models/integrations/git_guardian_spec.rb +++ b/ee/spec/models/integrations/git_guardian_spec.rb @@ -34,20 +34,6 @@ integration.execute(blobs) end - - context 'when git_guardian_integration feature flag disabled' do - before do - stub_feature_flags(git_guardian_integration: false) - end - - # Not refactoring this repeated code because this FF is meant to be short lived - it 'returns nil on execution' do - response = integration.execute(blobs) - expect(integration.token).to be_present - expect(::Gitlab::GitGuardian::Client).not_to receive(:new) - expect(response).to be_nil - end - end end end end diff --git a/ee/spec/requests/api/integrations_spec.rb b/ee/spec/requests/api/integrations_spec.rb index 362d7781a5633e..ff0e660075e4d9 100644 --- a/ee/spec/requests/api/integrations_spec.rb +++ b/ee/spec/requests/api/integrations_spec.rb @@ -113,28 +113,6 @@ def stub_allow_list_license(allowed:) end end end - - describe 'GitGuardian Integration' do - let(:integration_name) { 'git-guardian' } - - context 'when git_guardian_integration feature flag is disabled' do - before do - stub_feature_flags(git_guardian_integration: false) - end - - it 'returns 400 for put request' do - put api("/projects/#{project.id}/#{endpoint}/#{integration_name}", user), params: { token: 'api-token' } - expect(response).to have_gitlab_http_status(:bad_request) - expect(response.body).to eq("{\"message\":\"GitGuardian feature is disabled\"}") - end - - it 'returns 400 for delete request' do - delete api("/projects/#{project.id}/#{endpoint}/#{integration_name}", user) - expect(response).to have_gitlab_http_status(:bad_request) - expect(response.body).to eq("{\"message\":\"GitGuardian feature is disabled\"}") - end - end - end end describe 'POST /slack/trigger' do diff --git a/lib/api/integrations.rb b/lib/api/integrations.rb index 0747cc8842baa4..d5284c56d3d91f 100644 --- a/lib/api/integrations.rb +++ b/lib/api/integrations.rb @@ -93,10 +93,6 @@ def integration_attributes(integration) end end put "#{path}/#{slug}" do - if slug == "git-guardian" && Feature.disabled?(:git_guardian_integration) - render_api_error!('GitGuardian feature is disabled', 400) - end - integration = user_project.find_or_initialize_integration(slug.underscore) render_api_error!('400 Integration not available', 400) if integration.nil? @@ -137,10 +133,6 @@ def integration_attributes(integration) requires :slug, type: String, values: INTEGRATIONS.keys, desc: 'The name of the integration' end delete "#{path}/:slug" do - if params[:slug] == "git-guardian" && Feature.disabled?(:git_guardian_integration) - render_api_error!('GitGuardian feature is disabled', 400) - end - integration = user_project.find_or_initialize_integration(params[:slug].underscore) not_found!('Integration') unless integration&.persisted? -- GitLab