Allow enqueuer to enqueue multiple jobs with the same instance (#4218)

cloudfoundry · Feb 19, 2025 · 9cf8c45 · 9cf8c45
1 parent 109dcaf
commit 9cf8c45
Show file tree

Hide file tree

Showing 73 changed files with 195 additions and 212 deletions.
diff --git a/app/actions/app_delete.rb b/app/actions/app_delete.rb
@@ -97,7 +97,7 @@ def route_mappings_to_delete(app)
 
     def delete_buildpack_cache(app)
       delete_job = Jobs::V3::BuildpackCacheDelete.new(app.guid)
-      Jobs::Enqueuer.new(delete_job, queue: Jobs::Queues.generic).enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(delete_job)
     end
 
     def logger

diff --git a/app/actions/buildpack_delete.rb b/app/actions/buildpack_delete.rb
@@ -8,7 +8,7 @@ def delete(buildpacks)
         end
         if buildpack.key
           blobstore_delete = Jobs::Runtime::BlobstoreDelete.new(buildpack.key, :buildpack_blobstore)
-          Jobs::Enqueuer.new(blobstore_delete, queue: Jobs::Queues.generic).enqueue
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(blobstore_delete)
         end
       end
 

diff --git a/app/actions/buildpack_upload.rb b/app/actions/buildpack_upload.rb
@@ -4,7 +4,7 @@ def upload_async(message:, buildpack:, config:)
       logger.info("uploading buildpacks bits for buildpack #{buildpack.guid}")
 
       upload_job = Jobs::V3::BuildpackBits.new(buildpack.guid, message.bits_path, message.bits_name)
-      Jobs::Enqueuer.new(upload_job, queue: Jobs::Queues.local(config)).enqueue_pollable
+      Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue_pollable(upload_job)
     end
 
     private

diff --git a/app/actions/droplet_copy.rb b/app/actions/droplet_copy.rb
@@ -60,7 +60,7 @@ def copy_buildpack_droplet(new_droplet)
       new_droplet.buildpack_lifecycle_data(reload: true)
 
       copy_job = Jobs::V3::DropletBitsCopier.new(@source_droplet.guid, new_droplet.guid)
-      Jobs::Enqueuer.new(copy_job, queue: Jobs::Queues.generic).enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(copy_job)
     end
   end
 end
diff --git a/app/actions/droplet_delete.rb b/app/actions/droplet_delete.rb
@@ -16,7 +16,7 @@ def delete(droplets)
 
         if droplet.blobstore_key
           blobstore_delete = Jobs::Runtime::BlobstoreDelete.new(droplet.blobstore_key, :droplet_blobstore)
-          Jobs::Enqueuer.new(blobstore_delete, queue: Jobs::Queues.generic).enqueue
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(blobstore_delete)
         end
 
         Repositories::DropletEventRepository.record_delete(

diff --git a/app/actions/droplet_upload.rb b/app/actions/droplet_upload.rb
@@ -20,7 +20,7 @@ def upload_async(message:, droplet:, config:, user_audit_info:)
           droplet.space.organization_guid
         )
 
-        enqueued_job = Jobs::Enqueuer.new(upload_job, queue: Jobs::Queues.local(config)).enqueue_pollable
+        enqueued_job = Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue_pollable(upload_job)
       end
 
       enqueued_job

diff --git a/app/actions/mixins/bindings_delete.rb b/app/actions/mixins/bindings_delete.rb
@@ -19,7 +19,7 @@ def delete_bindings(bindings, user_audit_info:)
           result = binding_delete_action.delete(binding)
           unless result[:finished]
             polling_job = DeleteBindingJob.new(type, binding.guid, user_audit_info:)
-            Jobs::Enqueuer.new(polling_job, queue: Jobs::Queues.generic).enqueue_pollable
+            Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(polling_job)
             unbinding_operation_in_progress!(binding)
           end
         rescue StandardError => e

diff --git a/app/actions/package_copy.rb b/app/actions/package_copy.rb
@@ -20,12 +20,7 @@ def copy(destination_app_guid:, source_package:, user_audit_info:, record_event:
       package.db.transaction do
         package.save
 
-        if source_package.type == 'bits'
-          @enqueued_job = Jobs::Enqueuer.new(
-            Jobs::V3::PackageBitsCopier.new(source_package.guid, package.guid),
-            queue: Jobs::Queues.generic
-          ).enqueue
-        end
+        @enqueued_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(Jobs::V3::PackageBitsCopier.new(source_package.guid, package.guid)) if source_package.type == 'bits'
 
         record_audit_event(package, source_package, user_audit_info) if record_event
       end

diff --git a/app/actions/package_delete.rb b/app/actions/package_delete.rb
@@ -10,7 +10,7 @@ def delete(packages)
       packages.each do |package|
         unless package.docker?
           package_src_delete_job = create_package_source_deletion_job(package)
-          Jobs::Enqueuer.new(package_src_delete_job, queue: Jobs::Queues.generic).enqueue if package_src_delete_job
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(package_src_delete_job) if package_src_delete_job
         end
 
         package.destroy

diff --git a/app/actions/package_upload.rb b/app/actions/package_upload.rb
@@ -14,7 +14,7 @@ def upload_async(message:, package:, config:, user_audit_info:, record_event: tr
         package.state = PackageModel::PENDING_STATE
         package.save
 
-        enqueued_job = Jobs::Enqueuer.new(upload_job, queue: Jobs::Queues.local(config)).enqueue
+        enqueued_job = Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue(upload_job)
 
         record_upload(package, user_audit_info) if record_event
       end

diff --git a/app/actions/routing/route_delete.rb b/app/actions/routing/route_delete.rb
@@ -15,8 +15,7 @@ def delete_sync(route:, recursive:)
     end
 
     def delete_async(route:, recursive:)
-      deletion_job = do_delete(recursive, route)
-      Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(do_delete(recursive, route))
     end
 
     def delete_unmapped_route(route:)

diff --git a/app/actions/service_broker_create.rb b/app/actions/service_broker_create.rb
@@ -31,7 +31,7 @@ def create(message)
           service_event_repository.record_broker_event_with_request(:create, broker, message.audit_hash)
 
           synchronization_job = SynchronizeBrokerCatalogJob.new(broker.guid, user_audit_info: service_event_repository.user_audit_info)
-          pollable_job = Jobs::Enqueuer.new(synchronization_job, queue: Jobs::Queues.generic).enqueue_pollable
+          pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(synchronization_job)
         end
 
         { pollable_job: }

diff --git a/app/actions/services/locks/deleter_lock.rb b/app/actions/services/locks/deleter_lock.rb
@@ -49,8 +49,7 @@ def unlock_and_destroy!
 
     def enqueue_and_unlock!(attributes_to_update, job)
       service_instance.save_and_update_operation(attributes_to_update)
-      enqueuer = Jobs::Enqueuer.new(job, queue: Jobs::Queues.generic)
-      enqueuer.enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(job)
       @needs_unlock = false
     end
 

diff --git a/app/actions/services/locks/updater_lock.rb b/app/actions/services/locks/updater_lock.rb
@@ -47,8 +47,7 @@ def asynchronous_unlock!
     end
 
     def enqueue_unlock!(job)
-      enqueuer = Jobs::Enqueuer.new(job, queue: Jobs::Queues.generic)
-      enqueuer.enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(job)
       @needs_unlock = false
     end
 

diff --git a/app/actions/services/service_instance_create.rb b/app/actions/services/service_instance_create.rb
@@ -48,8 +48,7 @@ def setup_async_job(request_attrs, service_instance)
         @services_event_repository.user_audit_info,
         request_attrs
       )
-      enqueuer = Jobs::Enqueuer.new(job, queue: Jobs::Queues.generic)
-      enqueuer.enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(job)
       @services_event_repository.record_service_instance_event(:start_create, service_instance, request_attrs)
     end
 

diff --git a/app/actions/space_delete.rb b/app/actions/space_delete.rb
@@ -56,7 +56,7 @@ def delete_service_instances(space_model)
         result = service_instance_deleter.delete
         unless result[:finished]
           polling_job = V3::DeleteServiceInstanceJob.new(service_instance.guid, @services_event_repository.user_audit_info)
-          Jobs::Enqueuer.new(polling_job, queue: Jobs::Queues.generic).enqueue_pollable
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(polling_job)
           errors << CloudController::Errors::ApiError.new_from_details('AsyncServiceInstanceOperationInProgress', service_instance.name)
         end
       rescue StandardError => e

diff --git a/app/actions/v2/services/service_binding_create.rb b/app/actions/v2/services/service_binding_create.rb
@@ -52,8 +52,7 @@ def create(app, service_instance, message, volume_mount_services_enabled, accept
 
           binding.save_with_new_operation({ type: 'create', state: 'in progress', broker_provided_operation: binding_result[:operation] })
           job = Jobs::Services::ServiceBindingStateFetch.new(binding.guid, @user_audit_info, message.audit_hash)
-          enqueuer = Jobs::Enqueuer.new(job, queue: Jobs::Queues.generic)
-          enqueuer.enqueue
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(job)
           Repositories::ServiceBindingEventRepository.record_start_create(binding, @user_audit_info, message.audit_hash, manifest_triggered: @manifest_triggered)
         else
           binding.save

diff --git a/app/actions/v2/services/service_binding_delete.rb b/app/actions/v2/services/service_binding_delete.rb
@@ -19,10 +19,7 @@ def foreground_delete_request(service_binding)
     end
 
     def background_delete_request(service_binding)
-      Jobs::Enqueuer.new(
-        Jobs::DeleteActionJob.new(ServiceBinding, service_binding.guid, self),
-        queue: Jobs::Queues.generic
-      ).enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(Jobs::DeleteActionJob.new(ServiceBinding, service_binding.guid, self))
     end
 
     def delete(service_bindings)
@@ -42,8 +39,7 @@ def delete(service_bindings)
           service_binding.save_with_new_operation({ type: 'delete', state: 'in progress', broker_provided_operation: broker_response[:operation] })
 
           job = VCAP::CloudController::Jobs::Services::ServiceBindingStateFetch.new(service_binding.guid, @user_audit_info, {})
-          enqueuer = Jobs::Enqueuer.new(job, queue: Jobs::Queues.generic)
-          enqueuer.enqueue
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(job)
           Repositories::ServiceBindingEventRepository.record_start_delete(service_binding, @user_audit_info)
         else
           service_binding.destroy

diff --git a/app/actions/v3/service_broker_update.rb b/app/actions/v3/service_broker_update.rb
@@ -58,7 +58,7 @@ def enqueue_update
             previous_broker_state,
             user_audit_info: service_event_repository.user_audit_info
           )
-          pollable_job = Jobs::Enqueuer.new(synchronization_job, queue: Jobs::Queues.generic).enqueue_pollable
+          pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(synchronization_job)
         end
 
         pollable_job

diff --git a/app/actions/v3/service_instance_update_managed.rb b/app/actions/v3/service_instance_update_managed.rb
@@ -83,7 +83,7 @@ def enqueue_update
             user_audit_info: user_audit_info,
             audit_hash: message.audit_hash
           )
-          pollable_job = Jobs::Enqueuer.new(update_job, queue: Jobs::Queues.generic).enqueue_pollable
+          pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(update_job)
           lock.asynchronous_unlock!
         ensure
           lock.unlock_and_fail! if lock.present? && lock.needs_unlock?

diff --git a/app/controllers/base/model_controller.rb b/app/controllers/base/model_controller.rb
@@ -82,7 +82,7 @@ def do_delete(obj)
 
     def run_or_enqueue_deletion_job(deletion_job)
       if async?
-        job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue
+        job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(deletion_job)
         [HTTP::ACCEPTED, JobPresenter.new(job).to_json]
       else
         deletion_job.perform

diff --git a/app/controllers/runtime/apps_controller.rb b/app/controllers/runtime/apps_controller.rb
@@ -197,7 +197,7 @@ def upload_droplet(guid)
         BuildpackLifecycleDataModel.create(droplet:)
 
         droplet_upload_job = Jobs::V2::UploadDropletFromUser.new(droplet_path, droplet.guid)
-        enqueued_job       = Jobs::Enqueuer.new(droplet_upload_job, queue: Jobs::Queues.local(config)).enqueue
+        enqueued_job       = Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue(droplet_upload_job)
       end
 
       [HTTP::CREATED, JobPresenter.new(enqueued_job).to_json]

diff --git a/app/controllers/runtime/buildpacks_cache_controller.rb b/app/controllers/runtime/buildpacks_cache_controller.rb
@@ -8,7 +8,7 @@ class BuildpacksCacheController < RestController::BaseController
     def delete
       raise CloudController::Errors::ApiError.new_from_details('NotAuthorized') unless SecurityContext.roles.admin?
 
-      job = Jobs::Enqueuer.new(Jobs::Runtime::BuildpackCacheCleanup.new, queue: Jobs::Queues.generic).enqueue
+      job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(Jobs::Runtime::BuildpackCacheCleanup.new)
       [HTTP::ACCEPTED, JobPresenter.new(job).to_json]
     end
   end

diff --git a/app/controllers/runtime/stagings_controller.rb b/app/controllers/runtime/stagings_controller.rb
@@ -74,7 +74,7 @@ def upload_v3_app_buildpack_cache(stack_name, guid)
       check_content_digest
 
       upload_job = Jobs::V3::BuildpackCacheUpload.new(local_path: upload_path, app_guid: guid, stack_name: stack_name)
-      Jobs::Enqueuer.new(upload_job, queue: Jobs::Queues.local(config)).enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue(upload_job)
 
       HTTP::OK
     end
@@ -119,7 +119,7 @@ def upload_droplet(guid)
 
       droplet_upload_job = Jobs::V3::DropletUpload.new(upload_path, droplet.guid, skip_state_transition: true)
 
-      Jobs::Enqueuer.new(droplet_upload_job, queue: Jobs::Queues.local(config)).enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue(droplet_upload_job)
     end
 
     def droplet_from_build(build, guid)

diff --git a/app/controllers/services/lifecycle/service_instance_deprovisioner.rb b/app/controllers/services/lifecycle/service_instance_deprovisioner.rb
@@ -16,7 +16,7 @@ def deprovision_service_instance(service_instance, accepts_incomplete, async)
 
       warnings = []
       if async && !accepts_incomplete
-        enqueued_job = Jobs::Enqueuer.new(delete_job, queue: Jobs::Queues.generic).enqueue
+        enqueued_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(delete_job)
       else
         warnings = delete_job.perform
       end

diff --git a/app/controllers/v3/admin_actions_controller.rb b/app/controllers/v3/admin_actions_controller.rb
@@ -4,7 +4,7 @@ class AdminActionsController < ApplicationController
   def clear_buildpack_cache
     unauthorized! unless permission_queryer.can_write_globally?
 
-    pollable_job = Jobs::Enqueuer.new(Jobs::V3::BuildpackCacheCleanup.new, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(Jobs::V3::BuildpackCacheCleanup.new)
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end
 end
diff --git a/app/controllers/v3/apps_controller.rb b/app/controllers/v3/apps_controller.rb
@@ -151,7 +151,7 @@ def destroy
     delete_action = AppDelete.new(user_audit_info)
     deletion_job  = VCAP::CloudController::Jobs::DeleteActionJob.new(AppModel, app.guid, delete_action)
 
-    job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable do |pollable_job|
+    job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job) do |pollable_job|
       DeleteAppErrorTranslatorJob.new(pollable_job)
     end
     VCAP::AppLogEmitter.emit(app.guid, "Enqueued job to delete app with guid #{app.guid}")
@@ -234,7 +234,7 @@ def clear_buildpack_cache
     suspended! unless permission_queryer.is_space_active?(space.id)
 
     delete_job = Jobs::V3::BuildpackCacheDelete.new(app.guid)
-    job = Jobs::Enqueuer.new(delete_job, queue: Jobs::Queues.generic).enqueue_pollable
+    job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(delete_job)
 
     VCAP::AppLogEmitter.emit(app.guid, "Enqueued job to delete app buildpack cache with app guid #{app.guid}")
 

diff --git a/app/controllers/v3/buildpacks_controller.rb b/app/controllers/v3/buildpacks_controller.rb
@@ -66,7 +66,7 @@ def destroy
 
     delete_action = BuildpackDelete.new
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(Buildpack, buildpack.guid, delete_action)
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/domains_controller.rb b/app/controllers/v3/domains_controller.rb
@@ -106,7 +106,7 @@ def destroy
 
     delete_action = DomainDelete.new
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(Domain, domain.guid, delete_action)
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/droplets_controller.rb b/app/controllers/v3/droplets_controller.rb
@@ -86,7 +86,7 @@ def destroy
 
     delete_action = DropletDelete.new(user_audit_info)
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(DropletModel, droplet.guid, delete_action)
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/organization_quotas_controller.rb b/app/controllers/v3/organization_quotas_controller.rb
@@ -80,7 +80,7 @@ def destroy
     delete_action = OrganizationQuotaDeleteAction.new
 
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(QuotaDefinition, organization_quota.guid, delete_action, 'organization_quota')
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/organizations_controller.rb b/app/controllers/v3/organizations_controller.rb
@@ -91,7 +91,7 @@ def destroy
     service_event_repository = VCAP::CloudController::Repositories::ServiceEventRepository.new(user_audit_info)
     delete_action = OrganizationDelete.new(SpaceDelete.new(user_audit_info, service_event_repository), user_audit_info)
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(Organization, org.guid, delete_action)
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/packages_controller.rb b/app/controllers/v3/packages_controller.rb
@@ -142,7 +142,7 @@ def destroy
 
     delete_action = PackageDelete.new(user_audit_info)
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(PackageModel, package.guid, delete_action)
-    job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head HTTP::ACCEPTED, 'Location' => url_builder.build_url(path: "/v3/jobs/#{job.guid}")
   end

diff --git a/app/controllers/v3/roles_controller.rb b/app/controllers/v3/roles_controller.rb
@@ -86,7 +86,7 @@ def destroy
     role_owner = fetch_role_owner_with_name(role)
     delete_action = RoleDeleteAction.new(user_audit_info, role_owner)
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(Role, role.guid, delete_action)
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/routes_controller.rb b/app/controllers/v3/routes_controller.rb
@@ -119,7 +119,7 @@ def destroy
 
     delete_action = RouteDeleteAction.new(user_audit_info)
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(Route, route.guid, delete_action)
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/security_groups_controller.rb b/app/controllers/v3/security_groups_controller.rb
@@ -157,7 +157,7 @@ def destroy
     delete_action = SecurityGroupDeleteAction.new
 
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(SecurityGroup, security_group.guid, delete_action)
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/service_brokers_controller.rb b/app/controllers/v3/service_brokers_controller.rb
@@ -122,7 +122,7 @@ def destroy
     deletion_job = VCAP::CloudController::Jobs::DeleteActionJob.new(ServiceBroker, service_broker.guid, delete_action)
 
     service_broker.update(state: ServiceBrokerStateEnum::DELETE_IN_PROGRESS)
-    pollable_job = Jobs::Enqueuer.new(deletion_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(deletion_job)
 
     head :accepted, 'Location' => url_builder.build_url(path: "/v3/jobs/#{pollable_job.guid}")
   end

diff --git a/app/controllers/v3/service_credential_bindings_controller.rb b/app/controllers/v3/service_credential_bindings_controller.rb
@@ -255,7 +255,7 @@ def enqueue_bind_job(type, binding_guid, message)
       audit_hash: message.audit_hash,
       parameters: message.parameters
     )
-    pollable_job = Jobs::Enqueuer.new(bind_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(bind_job)
     pollable_job.guid
   end
 
@@ -265,7 +265,7 @@ def enqueue_unbind_job(type, binding_guid)
       binding_guid,
       user_audit_info:
     )
-    pollable_job = Jobs::Enqueuer.new(bind_job, queue: Jobs::Queues.generic).enqueue_pollable
+    pollable_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(bind_job)
     pollable_job.guid
   end