Merge branch '490354-remove-flag-set_delete_failed_container_repository' into 'master'

Remove feature flag: `set_delete_failed_container_repository`

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169040



Merged-by: Radamanthus Batnag <rbatnag@gitlab.com>
Approved-by: Moaz Khalifa <mkhalifa@gitlab.com>
Approved-by: Radamanthus Batnag <rbatnag@gitlab.com>
Co-authored-by: Adie Po <avpfestin@gitlab.com>

app/models/container_repository.rb

@@ -258,30 +258,22 @@ def last_published_at
   def set_delete_ongoing_status
     now = Time.zone.now
-    values = {
+    update_columns(
       status: :delete_ongoing,
       delete_started_at: now,
-      status_updated_at: now
-    }
-
-    values[:next_delete_attempt_at] = nil if Feature.enabled?(:set_delete_failed_container_repository, project)
-
-    update_columns(values)
+      status_updated_at: now,
+      next_delete_attempt_at: nil
+    )
   end
   def set_delete_scheduled_status
-    values = {
+    update_columns(
       status: :delete_scheduled,
       delete_started_at: nil,
-      status_updated_at: Time.zone.now
-    }
-
-    if Feature.enabled?(:set_delete_failed_container_repository, project)
-      values[:failed_deletion_count] = failed_deletion_count + 1
-      values[:next_delete_attempt_at] = next_delete_attempt_with_delay
-    end
-
-    update_columns(values)
+      status_updated_at: Time.zone.now,
+      failed_deletion_count: failed_deletion_count + 1,
+      next_delete_attempt_at: next_delete_attempt_with_delay
+    )
   end
   def set_delete_failed_status

app/workers/container_registry/delete_container_repository_worker.rb

@@ -53,8 +53,7 @@ def max_running_jobs
     def update_next_container_repository_status
       return unless next_container_repository
-      if next_container_repository.failed_deletion_count >= ContainerRepository::MAX_DELETION_FAILURES &&
-          Feature.enabled?(:set_delete_failed_container_repository, next_container_repository.project)
+      if next_container_repository.failed_deletion_count >= ContainerRepository::MAX_DELETION_FAILURES
         next_container_repository.set_delete_failed_status
       else
         next_container_repository.set_delete_scheduled_status

config/feature_flags/gitlab_com_derisk/set_delete_failed_container_repository.yml

----
-name: set_delete_failed_container_repository
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/480652
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/166119
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/490354
-milestone: '17.5'
-group: group::container registry
-type: gitlab_com_derisk
-default_enabled: false

spec/models/container_repository_spec.rb

@@ -792,21 +792,6 @@ def expected_tags_from(client_tags)
                               .and change(repository, :status_updated_at).from(nil).to(Time.zone.now)
                               .and change(repository, :next_delete_attempt_at).to(nil)
     end
-
-    context 'when the feature set_delete_failed_container_repository is disabled' do
-      before do
-        stub_feature_flags(set_delete_failed_container_repository: false)
-      end
-
-      it 'updates deletion status attributes', :freeze_time do
-        expect { subject }.to change(repository, :status).from(nil).to('delete_ongoing')
-                                .and change(repository, :delete_started_at).from(nil).to(Time.zone.now)
-                                .and change(repository, :status_updated_at).from(nil).to(Time.zone.now)
-                                .and not_change(repository, :next_delete_attempt_at)
-
-        expect(repository.updated_at).to eq(Time.zone.now)
-      end
-    end
   end
   describe '#set_delete_scheduled_status', :freeze_time do
@@ -842,21 +827,6 @@ def expected_tags_from(client_tags)
         expect(repository.status_updated_at).to eq(Time.zone.now)
       end
-
-      context 'when the feature set_delete_failed_container_repository is disabled' do
-        before do
-          stub_feature_flags(set_delete_failed_container_repository: false)
-        end
-
-        it 'updates delete attributes' do
-          expect { subject }.to change(repository, :status).from('delete_ongoing').to('delete_scheduled')
-                                  .and change(repository, :delete_started_at).to(nil)
-                                  .and not_change(repository, :failed_deletion_count)
-                                  .and not_change(repository, :next_delete_attempt_at)
-
-          expect(repository.status_updated_at).to eq(Time.zone.now)
-        end
-      end
     end
   end

spec/workers/container_registry/delete_container_repository_worker_spec.rb

@@ -58,27 +58,6 @@
         end
       end
-      shared_examples 'setting the status to delete_scheduled regardless of failed_deletion_count' do
-        let(:set_status_method) { :set_delete_scheduled_status }
-        let(:status_after_execution) { 'delete_scheduled' }
-
-        context 'when the failed_deletion_count is less than the max' do
-          before do
-            container_repository.update!(failed_deletion_count: ContainerRepository::MAX_DELETION_FAILURES - 1)
-          end
-
-          it_behaves_like 'not deleting the repository and setting the correct status'
-        end
-
-        context 'when the failed_deletion_count has reached the max' do
-          before do
-            container_repository.update!(failed_deletion_count: ContainerRepository::MAX_DELETION_FAILURES)
-          end
-
-          it_behaves_like 'not deleting the repository and setting the correct status'
-        end
-      end
-
       it 'picks and destroys the next container repository for destruction' do
         expect_next_pending_destruction_container_repository do |repo|
           expect_logs_on(repo, tags_size_before_delete: 100, deleted_tags_size: 0)
@@ -108,28 +87,12 @@
           let(:cleanup_tags_service_response) { { status: :error, original_size: 100, deleted_size: 0 } }
           it_behaves_like 'setting the correct status based on failed_deletion_count'
-
-          context 'when the feature set_delete_failed_container_repository is disabled' do
-            before do
-              stub_feature_flags(set_delete_failed_container_repository: false)
-            end
-
-            it_behaves_like 'setting the status to delete_scheduled regardless of failed_deletion_count'
-          end
         end
         context 'with tags left to destroy' do
           let(:tags_count) { 10 }
           it_behaves_like 'setting the correct status based on failed_deletion_count'
-
-          context 'when the feature set_delete_failed_container_repository is disabled' do
-            before do
-              stub_feature_flags(set_delete_failed_container_repository: false)
-            end
-
-            it_behaves_like 'setting the status to delete_scheduled regardless of failed_deletion_count'
-          end
         end
       end
@@ -153,14 +116,6 @@
         end
         it_behaves_like 'setting the correct status based on failed_deletion_count'
-
-        context 'when the feature set_delete_failed_container_repository is disabled' do
-          before do
-            stub_feature_flags(set_delete_failed_container_repository: false)
-          end
-
-          it_behaves_like 'setting the status to delete_scheduled regardless of failed_deletion_count'
-        end
       end
       context 'with no tags on the container repository' do