Merge branch '331144-remove-ssh_key_expiration_email_notification-ff' into 'master'

Remove ssh_key_expiration_email_notification Feature Flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!63877

app/workers/ssh_keys/expired_notification_worker.rb

@@ -15,8 +15,6 @@ module SshKeys
 
     # rubocop: disable CodeReuse/ActiveRecord
     def perform
-      return unless ::Feature.enabled?(:ssh_key_expiration_email_notification, default_enabled: :yaml)
-
       order = Gitlab::Pagination::Keyset::Order.build([
         Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
           attribute_name: 'expires_at_utc',

app/workers/ssh_keys/expiring_soon_notification_worker.rb

@@ -12,8 +12,6 @@ module SshKeys
     idempotent!
 
     def perform
-      return unless ::Feature.enabled?(:ssh_key_expiration_email_notification, default_enabled: :yaml)
-
       # rubocop:disable CodeReuse/ActiveRecord
       User.with_ssh_key_expiring_soon.find_each(batch_size: 10_000) do |user|
         with_context(user: user) do

config/feature_flags/development/ssh_key_expiration_email_notification.yml

----
-name: ssh_key_expiration_email_notification
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56888
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326386
-milestone: '13.11'
-type: development
-group: group::compliance
-default_enabled: true

doc/user/profile/notifications.md

@@ -176,6 +176,7 @@ Users are notified of the following events:
 | Event                        | Sent to             | Settings level               |
 |------------------------------|---------------------|------------------------------|
 | New SSH key added            | User                | Security email, always sent. |
+| SSH key has expired          | User                | Security email, always sent. |
 | New email added              | User                | Security email, always sent. |
 | Email changed                | User                | Security email, always sent. |
 | Password changed             | User                | Security email, always sent when user changes their own password |

spec/workers/ssh_keys/expired_notification_worker_spec.rb

@@ -49,16 +49,6 @@ RSpec.describe SshKeys::ExpiredNotificationWorker, type: :worker do
           perform_multiple(worker: worker)
         end
       end
-
-      context 'when feature is not enabled' do
-        before do
-          stub_feature_flags(ssh_key_expiration_email_notification: false)
-        end
-
-        it 'does not update notified column' do
-          expect { worker.perform }.not_to change { expired_today.reload.expiry_notification_delivered_at }
-        end
-      end
     end
 
     context 'when key has expired in the past' do

spec/workers/ssh_keys/expiring_soon_notification_worker_spec.rb

@@ -35,16 +35,6 @@ RSpec.describe SshKeys::ExpiringSoonNotificationWorker, type: :worker do
           perform_multiple(worker: worker)
         end
       end
-
-      context 'when feature is not enabled' do
-        before do
-          stub_feature_flags(ssh_key_expiration_email_notification: false)
-        end
-
-        it 'does not update notified column' do
-          expect { worker.perform }.not_to change { expiring_soon.reload.before_expiry_notification_delivered_at }
-        end
-      end
     end
 
     context 'when key has expired in the past' do