CCNG can delete packages in an image registry

This affects the various endpoints that can delete a package.

[#175080280]

Co-authored-by: Matt Royal <mroyal@pivotal.io>
Co-authored-by: Tim Downey <tdowney@vmware.com>

Author: matt-royal

app/actions/package_delete.rb

@@ -8,8 +8,12 @@ def delete(packages)
       packages = Array(packages)
 
       packages.each do |package|
-        blobstore_delete = Jobs::Runtime::BlobstoreDelete.new(package.guid, :package_blobstore)
-        Jobs::Enqueuer.new(blobstore_delete, queue: Jobs::Queues.generic).enqueue
+        package_delete = if VCAP::CloudController::Config.config.package_image_registry_configured?
+                           Jobs::Kubernetes::RegistryDelete.new(package.bits_image_reference)
+                         else
+                           Jobs::Runtime::BlobstoreDelete.new(package.guid, :package_blobstore)
+                         end
+        Jobs::Enqueuer.new(package_delete, queue: Jobs::Queues.generic).enqueue
         package.destroy
 
         Repositories::PackageEventRepository.record_app_package_delete(

spec/unit/actions/package_delete_spec.rb

@@ -19,19 +19,41 @@ module VCAP::CloudController
           expect { package.refresh }.to raise_error Sequel::Error, 'Record not found'
         end
 
-        it 'schedules a job to the delete the blobstore item' do
-          expect {
-            package_delete.delete(package)
-          }.to change {
-            Delayed::Job.count
-          }.by(1)
+        context 'when using a package registry' do
+          before do
+            TestConfig.override(packages: { image_registry: { base_path: 'hub.example.com/user' } })
+          end
+
+          it 'schedules a job to the delete the blobstore item' do
+            expect {
+              package_delete.delete(package)
+            }.to change {
+              Delayed::Job.count
+            }.by(1)
+
+            job = Delayed::Job.last
+            expect(job.handler).to include('VCAP::CloudController::Jobs::Kubernetes::RegistryDelete')
+            expect(job.handler).to include(package.bits_image_reference)
+            expect(job.queue).to eq(Jobs::Queues.generic)
+            expect(job.guid).not_to be_nil
+          end
+        end
+
+        context 'when not using a package registry' do
+          it 'schedules a job to the delete the blobstore item' do
+            expect {
+              package_delete.delete(package)
+            }.to change {
+              Delayed::Job.count
+            }.by(1)
 
-          job = Delayed::Job.last
-          expect(job.handler).to include('VCAP::CloudController::Jobs::Runtime::BlobstoreDelete')
-          expect(job.handler).to include("key: #{package.guid}")
-          expect(job.handler).to include('package_blobstore')
-          expect(job.queue).to eq(Jobs::Queues.generic)
-          expect(job.guid).not_to be_nil
+            job = Delayed::Job.last
+            expect(job.handler).to include('VCAP::CloudController::Jobs::Runtime::BlobstoreDelete')
+            expect(job.handler).to include("key: #{package.guid}")
+            expect(job.handler).to include('package_blobstore')
+            expect(job.queue).to eq(Jobs::Queues.generic)
+            expect(job.guid).not_to be_nil
+          end
         end
 
         it 'creates an v3 audit event' do