Remove RegistryBitsPacker (#3990)

philippthun · web-flow · commit 7f485b6d3f33 · 2024-10-01T20:09:05.000-07:00
Config options 'packages.image_registry' and 'registry_buddy' are not
set in capi-release, thus all related artifacts can be removed from
Cloud Controller.
diff --git a/app/actions/package_delete.rb b/app/actions/package_delete.rb
@@ -24,13 +24,7 @@ def delete(packages)
     private
 
     def create_package_source_deletion_job(package)
-      return Jobs::Runtime::BlobstoreDelete.new(package.guid, :package_blobstore) unless package_registry_configured?
-
-      nil
-    end
-
-    def package_registry_configured?
-      VCAP::CloudController::Config.config.package_image_registry_configured?
+      Jobs::Runtime::BlobstoreDelete.new(package.guid, :package_blobstore)
     end
   end
 end
diff --git a/app/controllers/v3/packages_controller.rb b/app/controllers/v3/packages_controller.rb
@@ -93,7 +93,6 @@ def download
 
     unprocessable!('Package type must be bits.') unless package.type == 'bits'
     unprocessable!('Package has no bits to download.') unless package.state == 'READY'
-    unprocessable!('Unable to download packages when an image registry is used to store packages') if VCAP::CloudController::Config.config.package_image_registry_configured?
 
     VCAP::CloudController::Repositories::PackageEventRepository.record_app_package_download(
       package,
@@ -170,8 +169,6 @@ def create_fresh
   end
 
   def create_copy
-    unprocessable!('Unable to copy package when an image registry is used to store packages') if VCAP::CloudController::Config.config.package_image_registry_configured?
-
     app_guid = Oj.load(request.body).deep_symbolize_keys.dig(:relationships, :app, :data, :guid)
     destination_app = AppModel.where(guid: app_guid).first
 
diff --git a/app/jobs/runtime/delete_expired_package_blob.rb b/app/jobs/runtime/delete_expired_package_blob.rb
@@ -34,14 +34,8 @@ def logger
 
         private
 
-        def package_registry_configured?
-          VCAP::CloudController::Config.config.package_image_registry_configured?
-        end
-
         def create_package_source_deletion_job(package)
-          return Jobs::Runtime::BlobstoreDelete.new(package.guid, :package_blobstore) unless package_registry_configured?
-
-          nil
+          Jobs::Runtime::BlobstoreDelete.new(package.guid, :package_blobstore)
         end
       end
     end
diff --git a/app/models/runtime/package_model.rb b/app/models/runtime/package_model.rb
@@ -40,19 +40,6 @@ def image
       docker_image
     end
 
-    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)
-
-      reference = "#{package_registry_base_path}/#{guid}"
-      reference += "@sha256:#{sha256_checksum}" if digest
-
-      reference
-    end
-
     def bits?
       type == BITS_TYPE
     end
diff --git a/config/cloud_controller.yml b/config/cloud_controller.yml
@@ -204,10 +204,6 @@ buildpacks:
   fog_aws_storage_options: {}
   fog_gcp_storage_options: {}
 
-registry_buddy:
-  host: "127.0.0.1"
-  port: 8080
-
 db_encryption_key: "asdfasdfasdf"
 database_encryption:
   keys: {"encryption_key_0":"asdfasdfasdf"}
diff --git a/lib/cloud_controller/config.rb b/lib/cloud_controller/config.rb
@@ -147,10 +147,6 @@ def valid_config_path?(keys, some_schema)
       end
     end
 
-    def package_image_registry_configured?
-      !get(:packages, :image_registry).nil?
-    end
-
     private
 
     def invalid_config_path!(keys)
diff --git a/lib/cloud_controller/config_schemas/base/api_schema.rb b/lib/cloud_controller/config_schemas/base/api_schema.rb
@@ -174,10 +174,7 @@ class ApiSchema < VCAP::Config
               app_package_directory_key: String,
               fog_connection: Hash,
               fog_aws_storage_options: Hash,
-              fog_gcp_storage_options: Hash,
-              optional(:image_registry) => {
-                base_path: String
-              }
+              fog_gcp_storage_options: Hash
             },
 
             droplets: {
@@ -188,11 +185,6 @@ class ApiSchema < VCAP::Config
               fog_gcp_storage_options: Hash
             },
 
-            optional(:registry_buddy) => {
-              host: String,
-              port: Integer
-            },
-
             db_encryption_key: enum(String, NilClass),
 
             optional(:database_encryption) => {
diff --git a/lib/cloud_controller/config_schemas/base/clock_schema.rb b/lib/cloud_controller/config_schemas/base/clock_schema.rb
@@ -99,10 +99,7 @@ class ClockSchema < VCAP::Config
               app_package_directory_key: String,
               fog_connection: Hash,
               fog_aws_storage_options: Hash,
-              fog_gcp_storage_options: Hash,
-              optional(:image_registry) => {
-                base_path: String
-              }
+              fog_gcp_storage_options: Hash
             },
 
             droplets: {
diff --git a/lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb b/lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb
@@ -98,10 +98,7 @@ class DeploymentUpdaterSchema < VCAP::Config
               app_package_directory_key: String,
               fog_connection: Hash,
               fog_aws_storage_options: Hash,
-              fog_gcp_storage_options: Hash,
-              optional(:image_registry) => {
-                base_path: String
-              }
+              fog_gcp_storage_options: Hash
             },
 
             droplets: {
diff --git a/lib/cloud_controller/config_schemas/base/worker_schema.rb b/lib/cloud_controller/config_schemas/base/worker_schema.rb
@@ -84,10 +84,7 @@ class WorkerSchema < VCAP::Config
               app_package_directory_key: String,
               fog_connection: Hash,
               fog_aws_storage_options: Hash,
-              fog_gcp_storage_options: Hash,
-              optional(:image_registry) => {
-                base_path: String
-              }
+              fog_gcp_storage_options: Hash
             },
 
             droplets: {
@@ -97,11 +94,6 @@ class WorkerSchema < VCAP::Config
               fog_gcp_storage_options: Hash
             },
 
-            optional(:registry_buddy) => {
-              host: String,
-              port: Integer
-            },
-
             db_encryption_key: enum(String, NilClass),
 
             optional(:database_encryption) => {
diff --git a/lib/cloud_controller/dependency_locator.rb b/lib/cloud_controller/dependency_locator.rb
@@ -22,7 +22,6 @@
 require 'cloud_controller/blobstore/client_provider'
 require 'cloud_controller/resource_pool_wrapper'
 require 'cloud_controller/packager/local_bits_packer'
-require 'cloud_controller/packager/registry_bits_packer'
 require 'credhub/client'
 require 'cloud_controller/metrics/prometheus_updater'
 
@@ -332,18 +331,7 @@ def resource_pool_wrapper
     end
 
     def packer
-      if config.package_image_registry_configured?
-        Packager::RegistryBitsPacker.new
-      else
-        Packager::LocalBitsPacker.new
-      end
-    end
-
-    def registry_buddy_client
-      RegistryBuddy::Client.new(
-        VCAP::CloudController::Config.config.get(:registry_buddy, :host),
-        VCAP::CloudController::Config.config.get(:registry_buddy, :port)
-      )
+      Packager::LocalBitsPacker.new
     end
 
     def statsd_client
diff --git a/lib/cloud_controller/packager/registry_bits_packer.rb b/lib/cloud_controller/packager/registry_bits_packer.rb
diff --git a/lib/registry_buddy/client.rb b/lib/registry_buddy/client.rb
diff --git a/spec/support/bootstrap/test_config.rb b/spec/support/bootstrap/test_config.rb
@@ -81,7 +81,6 @@ def configure_components(config)
       Fog.mock! unless
         context == :route_syncer ||
         context == :deployment_updater ||
-        config.get(:packages)[:image_registry] ||
         is_using_local_blobstore?(config)
 
       # reset dependency locator
diff --git a/spec/unit/actions/package_delete_spec.rb b/spec/unit/actions/package_delete_spec.rb
@@ -19,35 +19,17 @@ module VCAP::CloudController
           expect { package.refresh }.to raise_error Sequel::Error, 'Record not found'
         end
 
-        context 'when using a package registry' do
-          before do
-            TestConfig.override(packages: { image_registry: { base_path: 'hub.example.com/user' } })
-          end
-
-          context 'when the package type is docker' do
-            let!(:package) { PackageModel.make(type: PackageModel::DOCKER_TYPE) }
-
-            it 'does not schedule a deletion job since there was no source code uploaded' do
-              expect do
-                package_delete.delete(package)
-              end.not_to(change(Delayed::Job, :count))
-            end
-          end
-        end
-
-        context 'when not using a package registry' do
-          it 'schedules a job to the delete the blobstore item' do
-            expect do
-              package_delete.delete(package)
-            end.to change(Delayed::Job, :count).by(1)
+        it 'schedules a job to the delete the blobstore item' do
+          expect do
+            package_delete.delete(package)
+          end.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 match(/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
+          job = Delayed::Job.last
+          expect(job.handler).to include('VCAP::CloudController::Jobs::Runtime::BlobstoreDelete')
+          expect(job.handler).to match(/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
 
         it 'creates an v3 audit event' do
diff --git a/spec/unit/controllers/v3/packages_controller_spec.rb b/spec/unit/controllers/v3/packages_controller_spec.rb
@@ -287,19 +287,6 @@
       end
     end
 
-    context 'when the package is stored in an image registry' do
-      before do
-        TestConfig.override(packages: { image_registry: { base_path: 'hub.example.com/user' } })
-      end
-
-      it 'returns 422' do
-        get :download, params: { guid: package.guid }
-
-        expect(response).to have_http_status(:unprocessable_entity)
-        expect(response.body).to include('UnprocessableEntity')
-      end
-    end
-
     context 'when the package cannot be found' do
       it 'returns 404' do
         get :download, params: { guid: 'a-bogus-guid' }
@@ -1230,19 +1217,6 @@
         allow_user_write_access(user, space: destination_space)
       end
 
-      context 'when the package is stored in an image registry' do
-        before do
-          TestConfig.override(packages: { image_registry: { base_path: 'hub.example.com/user' } })
-        end
-
-        it 'returns 422' do
-          post :create, params: { source_guid: original_package.guid }.merge(relationship_request_body), as: :json
-
-          expect(response).to have_http_status :unprocessable_entity
-          expect(response.body).to include('UnprocessableEntity')
-        end
-      end
-
       it 'returns a 201 and the response' do
         expect(target_app_model.packages.count).to eq(0)
 
diff --git a/spec/unit/jobs/runtime/delete_expired_package_blob_spec.rb b/spec/unit/jobs/runtime/delete_expired_package_blob_spec.rb
diff --git a/spec/unit/lib/cloud_controller/packager/registry_bits_packer_spec.rb b/spec/unit/lib/cloud_controller/packager/registry_bits_packer_spec.rb
diff --git a/spec/unit/lib/registry_buddy/client_spec.rb b/spec/unit/lib/registry_buddy/client_spec.rb
diff --git a/spec/unit/models/runtime/package_model_spec.rb b/spec/unit/models/runtime/package_model_spec.rb
