Fix request specs

* The production change was a little confusing to us. We believe it is a
combination of initialization + how backgrounds jobs are marshalled into
the database. Loading the `kpack_client` at runtime fixes this.

[#171900207]

Co-authored-by: Aakash Shah <ashah@pivotal.io>
Co-authored-by: Seth Boyles <sboyles@pivotal.io>

Author: Aakash Shah

app/actions/app_delete.rb

@@ -29,7 +29,6 @@ def underlying_errors
 
     def initialize(user_audit_info)
       @user_audit_info = user_audit_info
-      @kpack_client = CloudController::DependencyLocator.instance.kpack_client
     end
 
     def delete(apps, record_event: true)
@@ -55,7 +54,7 @@ def delete(apps, record_event: true)
 
         if kubernetes_api_configured?
           logger.info('Deleting associated kpack image')
-          @kpack_client.delete_image(
+          kpack_client.delete_image(
             app.guid,
             VCAP::CloudController::Config.config.get(:kubernetes, :kpack, :builder_namespace)
           )
@@ -69,6 +68,10 @@ def delete_without_event(apps)
 
     private
 
+    def kpack_client
+      CloudController::DependencyLocator.instance.kpack_client
+    end
+
     def kubernetes_api_configured?
       !!VCAP::CloudController::Config.config.get(:kubernetes, :host_url)
     end

spec/api/documentation/apps_api_spec.rb

@@ -118,14 +118,17 @@ def self.fields_info(required)
   end
 
   describe 'Standard endpoints' do
-    standard_model_delete_without_async :app
-    standard_model_list 'ProcessModel', VCAP::CloudController::AppsController, path: :app, response_fields: true
-    standard_model_get 'ProcessModel', path: :app, nested_associations: [:stack, :space], response_fields: true
+    let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
 
     before do
+      allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
       TestConfig.override(diego: { staging: 'optional', running: 'optional' })
     end
 
+    standard_model_delete_without_async :app
+    standard_model_list 'ProcessModel', VCAP::CloudController::AppsController, path: :app, response_fields: true
+    standard_model_get 'ProcessModel', path: :app, nested_associations: [:stack, :space], response_fields: true
+
     def after_standard_model_delete(guid)
       event = VCAP::CloudController::Event.find(type: 'audit.app.delete-request', actee: guid, actee_type: 'app')
       audited_event event

spec/request/apps_spec.rb

@@ -1461,6 +1461,11 @@
     let!(:process) { VCAP::CloudController::ProcessModel.make(app: app_model) }
     let!(:deployment) { VCAP::CloudController::DeploymentModel.make(app: app_model) }
     let(:user_email) { nil }
+    let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
+
+    before do
+      allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
+    end
 
     it 'deletes an App' do
       delete "/v3/apps/#{app_model.guid}", nil, user_header

spec/request/spaces_spec.rb

@@ -888,8 +888,11 @@
       s.add_shared_space(space)
       s
     end
+    let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
 
     before do
+      allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
+
       VCAP::CloudController::AppModel.make(space: space)
       VCAP::CloudController::Route.make(space: space)
       org.add_user(associated_user)

spec/request/v2/apps_spec.rb

@@ -1126,6 +1126,11 @@
 
   describe 'DELETE /v2/apps/:guid' do
     let!(:process) { VCAP::CloudController::ProcessModelFactory.make(space: space) }
+    let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
+
+    before do
+      allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
+    end
 
     it 'deletes the specified app' do
       delete "/v2/apps/#{process.guid}", nil, headers_for(user)

spec/unit/actions/app_delete_spec.rb

@@ -10,6 +10,11 @@ module VCAP::CloudController
 
     let!(:app) { AppModel.make }
     let!(:app_dataset) { [app] }
+    let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
+
+    before do
+      allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
+    end
 
     describe '#delete' do
       it 'deletes the app record' do
@@ -41,6 +46,11 @@ module VCAP::CloudController
         app_delete.delete(app_dataset)
       end
 
+      it 'deletes the associated kpack Image' do
+        expect(kpack_client).to receive(:delete_image).with(app.guid, 'cf-workloads')
+        app_delete.delete(app_dataset)
+      end
+
       describe 'recursive deletion' do
         it 'deletes associated packages' do
           package = PackageModel.make(app: app)
@@ -319,29 +329,6 @@ module VCAP::CloudController
           end
         end
       end
-
-      context 'when targeting a kubernetes API' do
-        let(:kpack_client) { instance_double(Kubernetes::KpackClient) }
-        let!(:config) do
-          TestConfig.override(
-            kubernetes: {
-                host_url: 'some-kubernetes-host-url',
-                kpack: {
-                  builder_namespace: 'builder-namespace',
-                },
-            },
-          )
-        end
-
-        before do
-          allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
-        end
-
-        it 'deletes the associated kpack Image' do
-          expect(kpack_client).to receive(:delete_image).with(app.guid, 'builder-namespace')
-          app_delete.delete(app_dataset)
-        end
-      end
     end
 
     describe '#delete_without_event' do

spec/unit/actions/organization_delete_spec.rb

@@ -7,8 +7,13 @@ module VCAP::CloudController
     let(:services_event_repository) { Repositories::ServiceEventRepository.new(user_audit_info) }
     let(:user_audit_info) { UserAuditInfo.new(user_guid: user.guid, user_email: user_email) }
     let(:space_delete) { SpaceDelete.new(user_audit_info, services_event_repository) }
+    let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
     subject(:org_delete) { OrganizationDelete.new(space_delete, user_audit_info) }
 
+    before do
+      allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
+    end
+
     describe '#delete' do
       let!(:org_1) { Organization.make }
       let!(:org_2) { Organization.make }
@@ -51,8 +56,10 @@ module VCAP::CloudController
       let!(:org_dataset) { Organization.where(guid: [org_1.guid, org_2.guid]) }
       let(:user) { User.make }
       let(:user_email) { 'user@example.com' }
+      let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
 
       before do
+        allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
         stub_deprovision(service_instance, accepts_incomplete: true)
         stub_deprovision(service_instance_2, accepts_incomplete: true)
       end

spec/unit/actions/space_delete_spec.rb

@@ -15,6 +15,11 @@ module VCAP::CloudController
       let(:space_dataset) { Space.dataset }
       let(:user) { User.make }
       let(:user_email) { 'user@example.com' }
+      let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
+
+      before do
+        allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
+      end
 
       it 'deletes both space records' do
         expect {

spec/unit/actions/v2/organization_delete_spec.rb

@@ -9,7 +9,6 @@ module V2
       let(:user_audit_info) { UserAuditInfo.new(user_guid: user.guid, user_email: user_email) }
       let(:space_delete) { SpaceDelete.new(user_audit_info, services_event_repository) }
       subject(:org_delete) { V2::OrganizationDelete.new(space_delete) }
-
       describe '#delete' do
         let!(:org_1) { Organization.make }
         let!(:org_2) { Organization.make }
@@ -38,8 +37,10 @@ module V2
         let!(:org_dataset) { Organization.where(guid: [org_1.guid, org_2.guid]) }
         let(:user) { User.make }
         let(:user_email) { 'user@example.com' }
+        let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
 
         before do
+          allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
           stub_deprovision(service_instance, accepts_incomplete: true)
           stub_deprovision(service_instance_2, accepts_incomplete: true)
         end

spec/unit/controllers/runtime/organizations_controller_spec.rb

@@ -1383,6 +1383,12 @@ def decoded_guids
       end
 
       context 'with recursive=true' do
+        let(:kpack_client) { instance_double(Kubernetes::KpackClient, delete_image: nil) }
+
+        before do
+          allow(CloudController::DependencyLocator.instance).to receive(:kpack_client).and_return(kpack_client)
+        end
+
         it 'deletes the org and all of its spaces' do
           space_1 = Space.make(organization: org)
           space_2 = Space.make(organization: org)