Remove SharedBitsPacker mixin

* This module was a holdover from the 'RegistryBitsPacker' for cf-4-k8s. Since it's only used by the LocalBitsPacker, we can just merge the two files again.

lib/cloud_controller/packager/local_bits_packer.rb

@@ -1,14 +1,13 @@
 require 'cloud_controller/blobstore/fingerprints_collection'
 require 'cloud_controller/app_packager'
-require 'cloud_controller/packager/shared_bits_packer'
+require 'shellwords'
 
 module CloudController
   module Packager
     class ConflictError < StandardError
     end
 
     class LocalBitsPacker
-      include Packager::SharedBitsPacker
 
       def send_package_to_blobstore(blobstore_key, uploaded_package_zip, cached_files_fingerprints)
         tmp_dir = VCAP::CloudController::Config.config.get(:directories, :tmpdir)
@@ -39,6 +38,84 @@ def send_package_to_blobstore(blobstore_key, uploaded_package_zip, cached_files_
       def package_blobstore
         CloudController::DependencyLocator.instance.package_blobstore
       end
+
+      def package_zip_exists?(package_zip)
+        package_zip && File.exist?(package_zip)
+      end
+
+      def validate_size!(app_packager)
+        return unless max_package_size
+
+        return unless app_packager.size > max_package_size
+
+        raise CloudController::Errors::ApiError.new_from_details('AppPackageInvalid', "Package may not be larger than #{max_package_size} bytes")
+      end
+
+      def copy_uploaded_package(uploaded_package_zip, app_packager)
+        FileUtils.chmod('u+w', uploaded_package_zip)
+        FileUtils.cp(uploaded_package_zip, app_packager.path)
+      end
+
+      def populate_resource_cache(app_packager, app_contents_path)
+        FileUtils.mkdir(app_contents_path)
+        app_packager.unzip(app_contents_path)
+
+        remove_symlinks(app_contents_path)
+
+        global_app_bits_cache.cp_r_to_blobstore(app_contents_path)
+      end
+
+      def remove_symlinks(app_contents_path)
+        Find.find(app_contents_path) do |path|
+          File.delete(path) if File.symlink?(path)
+        end
+      end
+
+      def append_matched_resources(app_packager, cached_files_fingerprints, root_path)
+        matched_resources = CloudController::Blobstore::FingerprintsCollection.new(cached_files_fingerprints, root_path)
+        cached_resources_dir = File.join(root_path, 'cached_resources_dir')
+
+        FileUtils.mkdir(cached_resources_dir)
+        checksum_mismatch = false
+        matched_resources.each do |local_destination, file_sha, mode|
+          file_path = File.join(cached_resources_dir, local_destination)
+          global_app_bits_cache.download_from_blobstore(file_sha, File.join(cached_resources_dir, local_destination), mode:)
+
+          if Digester.new.digest_path(file_path) != file_sha
+            checksum_mismatch = true
+            global_app_bits_cache.delete(file_sha)
+          end
+        end
+
+        raise CloudController::Errors::ApiError.new_from_details('ResourceChecksumMismatch') if checksum_mismatch
+
+        app_packager.append_dir_contents(cached_resources_dir)
+      end
+
+      def match_resources_and_validate_package(root_path, uploaded_package_zip, cached_files_fingerprints)
+        app_packager = AppPackager.new(File.join(root_path, 'copied_app_package.zip'))
+        app_contents_path = File.join(root_path, 'application_contents')
+
+        if package_zip_exists?(uploaded_package_zip)
+          copy_uploaded_package(uploaded_package_zip, app_packager)
+          validate_size!(app_packager)
+          populate_resource_cache(app_packager, app_contents_path) unless VCAP::CloudController::FeatureFlag.disabled?(:resource_matching)
+        end
+
+        append_matched_resources(app_packager, cached_files_fingerprints, root_path)
+
+        validate_size!(app_packager)
+        app_packager.fix_subdir_permissions(root_path, app_contents_path)
+        app_packager.path
+      end
+
+      def max_package_size
+        VCAP::CloudController::Config.config.get(:packages, :max_package_size)
+      end
+
+      def global_app_bits_cache
+        CloudController::DependencyLocator.instance.global_app_bits_cache
+      end
     end
   end
 end