Fix issues deleting packages via registry buddy

- JSONClient does not json-encode the body for DELETE requests, so we
  have to do it
- The image reference we're deleting should not include the digest (this
  breaks on GCR)

[#175080280]

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

Author: matt-royal

app/models/runtime/package_model.rb

@@ -40,14 +40,17 @@ def image
       docker_image
     end
 
-    def bits_image_reference
+    def bits_image_reference(digest: false)
       config = VCAP::CloudController::Config.config
       raise 'Package Registry is not configured' unless config.package_image_registry_configured?
       raise 'Package type must be bits' unless bits?
 
       package_registry_base_path = config.get(:packages, :image_registry, :base_path)
 
-      "#{package_registry_base_path}/#{guid}@sha256:#{sha256_checksum}"
+      reference = "#{package_registry_base_path}/#{guid}"
+      reference += "@sha256:#{sha256_checksum}" if digest
+
+      reference
     end
 
     def bits?

lib/cloud_controller/kpack/stager.rb

@@ -94,7 +94,7 @@ def image_resource(staging_details, builder_spec)
     def configure_source(staging_details)
       if config.package_image_registry_configured?
         { registry: {
-          image: staging_details.package.bits_image_reference
+          image: staging_details.package.bits_image_reference(digest: true)
         } }
       else
         { blob: { url: blobstore_url_generator.package_download_url(staging_details.package) } }

lib/registry_buddy/client.rb

@@ -22,9 +22,7 @@ def post_package(package_guid, zip_file_path, registry)
     def delete_image(image_reference)
       with_request_error_handling 202 do
         client.delete('/images',
-          body: {
-            image_reference: image_reference
-          }
+          body: JSON.dump(image_reference: image_reference)
         )
       end
 

spec/unit/actions/package_delete_spec.rb

@@ -33,7 +33,7 @@ module VCAP::CloudController
 
             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.handler).to include(package.bits_image_reference(digest: false))
             expect(job.queue).to eq(Jobs::Queues.generic)
             expect(job.guid).not_to be_nil
           end

spec/unit/jobs/runtime/delete_expired_package_blob_spec.rb

@@ -20,7 +20,8 @@ module Jobs::Runtime
         it 'delegates to registry delete job' do
           job.perform
 
-          expect(VCAP::CloudController::Jobs::Kubernetes::RegistryDelete).to have_received(:new).with(package.bits_image_reference)
+          expect(VCAP::CloudController::Jobs::Kubernetes::RegistryDelete).to have_received(:new).
+            with(package.bits_image_reference(digest: false))
           expect(registry_delete).to have_received(:perform)
         end
 

spec/unit/lib/registry_buddy/client_spec.rb

@@ -78,7 +78,7 @@ module RegistryBuddy
 
         expect(WebMock).to have_requested(:delete,
           "http://#{registry_buddy_host}:#{registry_buddy_port}/images"
-        ).with(body: { 'image_reference' => image_reference })
+        ).with(body: JSON.dump('image_reference' => image_reference))
       end
 
       context 'when the request succeeds' do

spec/unit/models/runtime/package_model_spec.rb

@@ -32,7 +32,13 @@ module VCAP::CloudController
         end
 
         it 'returns the image reference for the package' do
-          expect(package.bits_image_reference).to eq("hub.example.com/user/#{package.guid}@sha256:#{package_sha256_checksum}")
+          expect(package.bits_image_reference).to eq("hub.example.com/user/#{package.guid}")
+        end
+
+        context 'when digest: true is given' do
+          it 'returns the image reference for the package, including the digest' do
+            expect(package.bits_image_reference(digest: true)).to eq("hub.example.com/user/#{package.guid}@sha256:#{package_sha256_checksum}")
+          end
         end
 
         context 'when the package is type DOCKER' do