Add latest changes from gitlab-org/gitlab@13-2-stable-ee

3 files changed, 88 insertions, 34 deletions

diff --git a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
index 11ea7d51673..2c708e75a25 100644
--- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ContainerRepository::CleanupTagsService do
+RSpec.describe Projects::ContainerRepository::CleanupTagsService do
   let_it_be(:user) { create(:user) }
   let_it_be(:project, reload: true) { create(:project, :private) }
   let_it_be(:repository) { create(:container_repository, :root, project: project) }
diff --git a/spec/services/projects/container_repository/delete_tags_service_spec.rb b/spec/services/projects/container_repository/delete_tags_service_spec.rb
index e17e4b6f7c9..3d065deefdf 100644
--- a/spec/services/projects/container_repository/delete_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/delete_tags_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ContainerRepository::DeleteTagsService do
+RSpec.describe Projects::ContainerRepository::DeleteTagsService do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :private) }
   let_it_be(:repository) { create(:container_repository, :root, project: project) }
@@ -20,6 +20,31 @@ describe Projects::ContainerRepository::DeleteTagsService do
       tags: %w(latest A Ba Bb C D E))
   end
 
+  RSpec.shared_examples 'logging a success response' do
+    it 'logs an info message' do
+      expect(service).to receive(:log_info).with(
+        service_class: 'Projects::ContainerRepository::DeleteTagsService',
+        message: 'deleted tags',
+        container_repository_id: repository.id,
+        deleted_tags_count: tags.size
+      )
+
+      subject
+    end
+  end
+
+  RSpec.shared_examples 'logging an error response' do |message: 'could not delete tags'|
+    it 'logs an error message' do
+      expect(service).to receive(:log_error).with(
+        service_class: 'Projects::ContainerRepository::DeleteTagsService',
+        message: message,
+        container_repository_id: repository.id
+      )
+
+      subject
+    end
+  end
+
   describe '#execute' do
     let(:tags) { %w[A] }
 
@@ -47,11 +72,8 @@ describe Projects::ContainerRepository::DeleteTagsService do
             let_it_be(:tags) { %w[A Ba] }
 
             it 'deletes the tags by name' do
-              stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/A")
-                .to_return(status: 200, body: "")
-
-              stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/Ba")
-                .to_return(status: 200, body: "")
+              stub_delete_reference_request('A')
+              stub_delete_reference_request('Ba')
 
               expect_delete_tag_by_name('A')
               expect_delete_tag_by_name('Ba')
@@ -60,26 +82,29 @@ describe Projects::ContainerRepository::DeleteTagsService do
             end
 
             it 'succeeds when tag delete returns 404' do
-              stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/A")
-                .to_return(status: 200, body: "")
-
-              stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/Ba")
-                .to_return(status: 404, body: "")
+              stub_delete_reference_request('A')
+              stub_delete_reference_request('Ba', 404)
 
               is_expected.to include(status: :success)
             end
 
+            it_behaves_like 'logging a success response' do
+              before do
+                stub_delete_reference_request('A')
+                stub_delete_reference_request('Ba')
+              end
+            end
+
             context 'with failures' do
               context 'when the delete request fails' do
                 before do
-                  stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/A")
-                  .to_return(status: 500, body: "")
-
-                  stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/Ba")
-                  .to_return(status: 500, body: "")
+                  stub_delete_reference_request('A', 500)
+                  stub_delete_reference_request('Ba', 500)
                 end
 
                 it { is_expected.to include(status: :error) }
+
+                it_behaves_like 'logging an error response'
               end
             end
           end
@@ -104,19 +129,35 @@ describe Projects::ContainerRepository::DeleteTagsService do
             end
           end
         end
+
         context 'and the feature is disabled' do
+          let_it_be(:tags) { %w[A Ba] }
+
           before do
             stub_feature_flags(container_registry_fast_tag_delete: false)
+            stub_upload("{\n  \"config\": {\n  }\n}", 'sha256:4435000728ee66e6a80e55637fc22725c256b61de344a2ecdeaac6bdb36e8bc3')
+            stub_put_manifest_request('A')
+            stub_put_manifest_request('Ba')
           end
 
           it 'fallbacks to slow delete' do
             expect(service).not_to receive(:fast_delete)
-            expect(service).to receive(:slow_delete).with(repository, tags)
+            expect(service).to receive(:slow_delete).with(repository, tags).and_call_original
+
+            expect_delete_tag_by_digest('sha256:dummy')
 
             subject
           end
+
+          it_behaves_like 'logging a success response' do
+            before do
+              allow(service).to receive(:slow_delete).and_call_original
+              expect_delete_tag_by_digest('sha256:dummy')
+            end
+          end
         end
       end
+
       context 'when the registry does not support fast delete' do
         let_it_be(:project) { create(:project, :private) }
         let_it_be(:repository) { create(:container_repository, :root, project: project) }
@@ -155,11 +196,8 @@ describe Projects::ContainerRepository::DeleteTagsService do
           it 'deletes the tags using a dummy image' do
             stub_upload("{\n  \"config\": {\n  }\n}", 'sha256:4435000728ee66e6a80e55637fc22725c256b61de344a2ecdeaac6bdb36e8bc3')
 
-            stub_request(:put, "http://registry.gitlab/v2/#{repository.path}/manifests/A")
-              .to_return(status: 200, body: "", headers: { 'docker-content-digest' => 'sha256:dummy' })
-
-            stub_request(:put, "http://registry.gitlab/v2/#{repository.path}/manifests/Ba")
-              .to_return(status: 200, body: "", headers: { 'docker-content-digest' => 'sha256:dummy' })
+            stub_put_manifest_request('A')
+            stub_put_manifest_request('Ba')
 
             expect_delete_tag_by_digest('sha256:dummy')
 
@@ -169,11 +207,8 @@ describe Projects::ContainerRepository::DeleteTagsService do
           it 'succeeds when tag delete returns 404' do
             stub_upload("{\n  \"config\": {\n  }\n}", 'sha256:4435000728ee66e6a80e55637fc22725c256b61de344a2ecdeaac6bdb36e8bc3')
 
-            stub_request(:put, "http://registry.gitlab/v2/#{repository.path}/manifests/A")
-              .to_return(status: 200, body: "", headers: { 'docker-content-digest' => 'sha256:dummy' })
-
-            stub_request(:put, "http://registry.gitlab/v2/#{repository.path}/manifests/Ba")
-              .to_return(status: 200, body: "", headers: { 'docker-content-digest' => 'sha256:dummy' })
+            stub_put_manifest_request('A')
+            stub_put_manifest_request('Ba')
 
             stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/manifests/sha256:dummy")
               .to_return(status: 404, body: "", headers: {})
@@ -181,6 +216,15 @@ describe Projects::ContainerRepository::DeleteTagsService do
             is_expected.to include(status: :success)
           end
 
+          it_behaves_like 'logging a success response' do
+            before do
+              stub_upload("{\n  \"config\": {\n  }\n}", 'sha256:4435000728ee66e6a80e55637fc22725c256b61de344a2ecdeaac6bdb36e8bc3')
+              stub_put_manifest_request('A')
+              stub_put_manifest_request('Ba')
+              expect_delete_tag_by_digest('sha256:dummy')
+            end
+          end
+
           context 'with failures' do
             context 'when the dummy manifest generation fails' do
               before do
@@ -188,23 +232,23 @@ describe Projects::ContainerRepository::DeleteTagsService do
               end
 
               it { is_expected.to include(status: :error) }
+
+              it_behaves_like 'logging an error response', message: 'could not generate manifest'
             end
 
             context 'when updating the tags fails' do
               before do
                 stub_upload("{\n  \"config\": {\n  }\n}", 'sha256:4435000728ee66e6a80e55637fc22725c256b61de344a2ecdeaac6bdb36e8bc3')
 
-                stub_request(:put, "http://registry.gitlab/v2/#{repository.path}/manifests/A")
-                  .to_return(status: 500, body: "", headers: { 'docker-content-digest' => 'sha256:dummy' })
-
-                stub_request(:put, "http://registry.gitlab/v2/#{repository.path}/manifests/Ba")
-                  .to_return(status: 500, body: "", headers: { 'docker-content-digest' => 'sha256:dummy' })
+                stub_put_manifest_request('A', 500)
+                stub_put_manifest_request('Ba', 500)
 
                 stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/manifests/sha256:4435000728ee66e6a80e55637fc22725c256b61de344a2ecdeaac6bdb36e8bc3")
                   .to_return(status: 200, body: "", headers: {})
               end
 
               it { is_expected.to include(status: :error) }
+              it_behaves_like 'logging an error response'
             end
           end
         end
@@ -214,6 +258,16 @@ describe Projects::ContainerRepository::DeleteTagsService do
 
   private
 
+  def stub_delete_reference_request(tag, status = 200)
+    stub_request(:delete, "http://registry.gitlab/v2/#{repository.path}/tags/reference/#{tag}")
+      .to_return(status: status, body: '')
+  end
+
+  def stub_put_manifest_request(tag, status = 200, headers = { 'docker-content-digest' => 'sha256:dummy' })
+    stub_request(:put, "http://registry.gitlab/v2/#{repository.path}/manifests/#{tag}")
+      .to_return(status: status, body: '', headers: headers)
+  end
+
   def stub_tag_digest(tag, digest)
     stub_request(:head, "http://registry.gitlab/v2/#{repository.path}/manifests/#{tag}")
       .to_return(status: 200, body: "", headers: { 'docker-content-digest' => digest })
diff --git a/spec/services/projects/container_repository/destroy_service_spec.rb b/spec/services/projects/container_repository/destroy_service_spec.rb
index 753b7540d7f..20e75d94e05 100644
--- a/spec/services/projects/container_repository/destroy_service_spec.rb
+++ b/spec/services/projects/container_repository/destroy_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Projects::ContainerRepository::DestroyService do
+RSpec.describe Projects::ContainerRepository::DestroyService do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, :private) }