Rename PackageImageUploader to RegistryBuddy

The config options are still package_image_uploader_*, but we will
change those in a later commit.

[#175080280]

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

Author: matt-royal

lib/cloud_controller/dependency_locator.rb

@@ -367,7 +367,7 @@ def packer
     end
 
     def registry_buddy_client
-      PackageImageUploader::Client.new(
+      RegistryBuddy::Client.new(
         VCAP::CloudController::Config.config.get(:package_image_uploader, :host),
         VCAP::CloudController::Config.config.get(:package_image_uploader, :port),
       )

lib/cloud_controller/packager/registry_bits_packer.rb

@@ -1,4 +1,4 @@
-require 'package_image_uploader/client'
+require 'registry_buddy/client'
 require 'cloud_controller/blobstore/fingerprints_collection'
 require 'cloud_controller/app_packager'
 require 'cloud_controller/packager/shared_bits_packer'

lib/package_image_uploader/client.rb lib/registry_buddy/client.rblib/package_image_uploader/client.rb renamed to lib/registry_buddy/client.rb

@@ -1,6 +1,6 @@
 require 'jsonclient'
 
-module PackageImageUploader
+module RegistryBuddy
   class Client
     def initialize(host, port)
       @url = "http://#{host}:#{port}"
@@ -38,7 +38,7 @@ def client
     end
 
     def logger
-      @logger ||= Steno.logger('cc.package_image_uploader')
+      @logger ||= Steno.logger('cc.registry_buddy')
     end
 
     def with_request_error_handling(successful_status)
@@ -48,13 +48,13 @@ def with_request_error_handling(successful_status)
       when successful_status
         response
       when 400
-        logger.error("PackageImageUploader returned: #{response.status} with #{response.body}")
+        logger.error("RegistryBuddy returned: #{response.status} with #{response.body}")
         raise Error.new("Bad Request error, status: #{response.status}")
       when 422
-        logger.error("PackageImageUploader returned: #{response.status} with #{response.body}")
+        logger.error("RegistryBuddy returned: #{response.status} with #{response.body}")
         raise Error.new("Unprocessable Entity error, status: #{response.status}")
       else
-        logger.error("PackageImageUploader returned: #{response.status} with #{response.body}")
+        logger.error("RegistryBuddy returned: #{response.status} with #{response.body}")
         raise Error.new("Server error, status: #{response.status}")
       end
     end

spec/unit/jobs/kubernetes/registry_delete_spec.rb

@@ -4,7 +4,7 @@ module VCAP::CloudController
   module Jobs::Kubernetes
     RSpec.describe RegistryDelete, job_context: :worker do
       let(:image_reference) { 'path/to/image' }
-      let(:registry_buddy_client) { instance_double(PackageImageUploader::Client) }
+      let(:registry_buddy_client) { instance_double(RegistryBuddy::Client) }
 
       subject(:job) do
         RegistryDelete.new(image_reference)

spec/unit/lib/cloud_controller/packager/registry_bits_packer_spec.rb

@@ -9,7 +9,7 @@ module CloudController::Packager
     let(:input_zip) { File.join(Paths::FIXTURES, 'good.zip') }
     let(:blobstore_dir) { Dir.mktmpdir }
     let(:local_tmp_dir) { Dir.mktmpdir }
-    let(:package_image_uploader_client) { instance_double(PackageImageUploader::Client) }
+    let(:registry_buddy_client) { instance_double(RegistryBuddy::Client) }
     let(:package_guid) { 'im-a-package-guid' }
     let(:registry) { 'hub.example.com/user' }
     let(:min_size) { 4 }
@@ -38,8 +38,8 @@ module CloudController::Packager
       allow(CloudController::DependencyLocator.instance).to receive(:global_app_bits_cache).and_return(global_app_bits_cache)
       allow(packer).to receive(:max_package_size).and_return(max_package_size)
 
-      allow(PackageImageUploader::Client).to receive(:new).and_return(package_image_uploader_client)
-      allow(package_image_uploader_client).to receive(:post_package).and_return(
+      allow(RegistryBuddy::Client).to receive(:new).and_return(registry_buddy_client)
+      allow(registry_buddy_client).to receive(:post_package).and_return(
         'hash' => { 'algorithm' => 'sha256', 'hex' => 'sha-2-5-6-hex' }
       )
 
@@ -62,7 +62,7 @@ module CloudController::Packager
       let(:cached_files_fingerprints) { [] }
 
       it 'uploads to the registry and returns the uploaded file hash' do
-        expect(package_image_uploader_client).to receive(:post_package).
+        expect(registry_buddy_client).to receive(:post_package).
           with(package_guid, %r{#{local_tmp_dir}\/packages\/registry_bits_packer}, registry).
           and_return('hash' => { 'algorithm' => 'sha256', 'hex' => 'sha-2-5-6-hex' })
 
@@ -74,7 +74,7 @@ module CloudController::Packager
         let(:expected_exception) { StandardError.new('some error') }
 
         it 'raises the exception' do
-          allow(package_image_uploader_client).to receive(:post_package).and_raise(expected_exception)
+          allow(registry_buddy_client).to receive(:post_package).and_raise(expected_exception)
           expect {
             packer.send_package_to_blobstore(package_guid, uploaded_files_path, [])
           }.to raise_error(expected_exception)
@@ -98,7 +98,7 @@ module CloudController::Packager
           let(:cached_files_fingerprints) { fingerprints }
 
           it 'packs a zip with the cached files' do
-            expect(package_image_uploader_client).to receive(:post_package).
+            expect(registry_buddy_client).to receive(:post_package).
               with(package_guid, %r{#{local_tmp_dir}\/packages\/registry_bits_packer}, registry).
               and_return('hash' => { 'algorithm' => 'sha256', 'hex' => 'sha-2-5-6-hex' })
 
@@ -134,7 +134,7 @@ module CloudController::Packager
           let(:cached_files_fingerprints) { fingerprints }
 
           it 'packs a zip with the cached files' do
-            expect(package_image_uploader_client).to receive(:post_package).
+            expect(registry_buddy_client).to receive(:post_package).
               with(package_guid, %r{#{local_tmp_dir}\/packages\/registry_bits_packer}, registry).
               and_return('hash' => { 'algorithm' => 'sha256', 'hex' => 'sha-2-5-6-hex' })
             packer.send_package_to_blobstore(package_guid, uploaded_files_path, cached_files_fingerprints)

…ib/package_image_uploader/client_spec.rb …c/unit/lib/registry_buddy/client_spec.rbspec/unit/lib/package_image_uploader/client_spec.rb renamed to spec/unit/lib/registry_buddy/client_spec.rb spec/unit/lib/package_image_uploader/client_spec.rb renamed to spec/unit/lib/registry_buddy/client_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
-require 'package_image_uploader/client'
+require 'registry_buddy/client'
 
-module PackageImageUploader
+module RegistryBuddy
   RSpec.describe Client do
-    let(:package_image_uploader_host) { '127.0.0.1' }
-    let(:package_image_uploader_port) { 8080 }
-    subject(:client) { PackageImageUploader::Client.new(package_image_uploader_host, package_image_uploader_port) }
+    let(:registry_buddy_host) { '127.0.0.1' }
+    let(:registry_buddy_port) { 8080 }
+    subject(:client) { RegistryBuddy::Client.new(registry_buddy_host, registry_buddy_port) }
 
     describe '#post_package' do
       let(:status) { 200 }
       let(:response) { '{}' }
 
       before do
-        stub_request(:post, "http://#{package_image_uploader_host}:#{package_image_uploader_port}/packages").
+        stub_request(:post, "http://#{registry_buddy_host}:#{registry_buddy_port}/packages").
           with(body: {
             'package_zip_path' => '/path/to/package.zip',
             'package_guid' => 'a-package-guid',
@@ -31,33 +31,33 @@ module PackageImageUploader
         end
       end
 
-      context 'when PackageImageUploader returns a 422' do
+      context 'when RegistryBuddy returns a 422' do
         let(:status) { 422 }
         let(:response) { 'unprocessable entity' }
 
-        it 'raises a PackageImageUploader::Error' do
+        it 'raises a RegistryBuddy::Error' do
           expect { client.post_package('a-package-guid', '/path/to/package.zip', 'docker.io/cfcapidocker') }.
-            to raise_error(PackageImageUploader::Error, /Unprocessable Entity error/)
+            to raise_error(RegistryBuddy::Error, /Unprocessable Entity error/)
         end
       end
 
-      context 'when PackageImageUploader returns a 400' do
+      context 'when RegistryBuddy returns a 400' do
         let(:status) { 400 }
         let(:response) { 'bad request' }
 
-        it 'raises a PackageImageUploader::Error' do
+        it 'raises a RegistryBuddy::Error' do
           expect { client.post_package('a-package-guid', '/path/to/package.zip', 'docker.io/cfcapidocker') }.
-            to raise_error(PackageImageUploader::Error, /Bad Request error/)
+            to raise_error(RegistryBuddy::Error, /Bad Request error/)
         end
       end
 
-      context 'when PackageImageUploader returns a 500' do
+      context 'when RegistryBuddy returns a 500' do
         let(:status) { 500 }
         let(:response) { 'bad response' }
 
-        it 'raises a PackageImageUploader::Error' do
+        it 'raises a RegistryBuddy::Error' do
           expect { client.post_package('a-package-guid', '/path/to/package.zip', 'docker.io/cfcapidocker') }.
-            to raise_error(PackageImageUploader::Error, /Server error/)
+            to raise_error(RegistryBuddy::Error, /Server error/)
         end
       end
     end
@@ -69,15 +69,15 @@ module PackageImageUploader
       let(:image_reference) { 'reference-to-my-image' }
 
       before do
-        stub_request(:delete, "http://#{package_image_uploader_host}:#{package_image_uploader_port}/images").
+        stub_request(:delete, "http://#{registry_buddy_host}:#{registry_buddy_port}/images").
           to_return(status: status, body: response)
       end
 
       it 'sends the request to the server' do
         client.delete_image(image_reference)
 
         expect(WebMock).to have_requested(:delete,
-          "http://#{package_image_uploader_host}:#{package_image_uploader_port}/images"
+          "http://#{registry_buddy_host}:#{registry_buddy_port}/images"
         ).with(body: { 'image_reference' => image_reference })
       end
 
@@ -90,33 +90,33 @@ module PackageImageUploader
         end
       end
 
-      context 'when PackageImageUploader returns a 422' do
+      context 'when RegistryBuddy returns a 422' do
         let(:status) { 422 }
         let(:response) { 'unprocessable entity' }
 
-        it 'raises a PackageImageUploader::Error' do
+        it 'raises a RegistryBuddy::Error' do
           expect { client.delete_image(image_reference) }.
-            to raise_error(PackageImageUploader::Error, /Unprocessable Entity error/)
+            to raise_error(RegistryBuddy::Error, /Unprocessable Entity error/)
         end
       end
 
-      context 'when PackageImageUploader returns a 400' do
+      context 'when RegistryBuddy returns a 400' do
         let(:status) { 400 }
         let(:response) { 'bad request' }
 
-        it 'raises a PackageImageUploader::Error' do
+        it 'raises a RegistryBuddy::Error' do
           expect { client.delete_image(image_reference) }.
-            to raise_error(PackageImageUploader::Error, /Bad Request error/)
+            to raise_error(RegistryBuddy::Error, /Bad Request error/)
         end
       end
 
-      context 'when PackageImageUploader returns a 500' do
+      context 'when RegistryBuddy returns a 500' do
         let(:status) { 500 }
         let(:response) { 'bad response' }
 
-        it 'raises a PackageImageUploader::Error' do
+        it 'raises a RegistryBuddy::Error' do
           expect { client.delete_image(image_reference) }.
-            to raise_error(PackageImageUploader::Error, /Server error/)
+            to raise_error(RegistryBuddy::Error, /Server error/)
         end
       end
     end