clean up some dependency injection cruft

- make k8s-client get_custom_builder return a complete when when we need it
- otherwise lean on the fact that the kpack lifecycle message only calls
    k8s client you ask for buildpack_infos, obviating a lot of sprawl

[#171029528]

Co-authored-by: Connor Braa <cbraa@pivotal.io>
Co-authored-by: Matt Royal <mroyal@pivotal.io>

Author: cwlbraa

lib/cloud_controller/kpack/stager.rb

@@ -18,10 +18,10 @@ def stage(staging_details)
       builder_spec = get_or_create_builder_spec(staging_details)
 
       existing_image = client.get_image(staging_details.package.app.guid, builder_namespace)
-      if existing_image.nil?
-        client.create_image(image_resource(staging_details, builder_spec))
-      else
+      if existing_image.present?
         client.update_image(update_image_resource(existing_image, staging_details, builder_spec))
+      else
+        client.create_image(image_resource(staging_details, builder_spec))
       end
     rescue CloudController::Errors::ApiError => e
       build = VCAP::CloudController::BuildModel.find(guid: staging_details.staging_guid)

spec/request/builds_spec.rb

@@ -134,7 +134,6 @@
         [
           OpenStruct.new(name: 'paketo-buildpacks/java'),
           OpenStruct.new(name: 'paketo-community/ruby'),
-          OpenStruct.new(name: 'paketo-buildpacks/httpd'),
         ]
       end
       let(:k8s_api_client) { instance_double(Kubernetes::ApiClient) }
@@ -145,13 +144,35 @@
         allow(k8s_api_client).to receive(:create_custom_builder)
         allow(k8s_api_client).to receive(:get_image)
         allow(k8s_api_client).to receive(:get_custom_builder).and_return(Kubeclient::Resource.new({
+          metadata: {
+            creationTimestamp: '1/1',
+          },
           spec: {
             stack: 'cflinuxfs3-stack',
             store: 'cf-buildpack-store',
-            serviceAccount: 'gcr-service-account'
-          }
+            serviceAccount: 'gcr-service-account',
+            order: [
+              { group: [{ id: 'paketo-buildpacks/java' }] },
+              { group: [{ id: 'paketo-community/ruby' }] },
+            ],
+          },
+          status: {
+            builderMetadata: [
+              { id: 'paketo-buildpacks/java', version: '1.14.0' },
+              { id: 'paketo-community/ruby', version: '0.0.11' },
+            ],
+            stack: {
+              id: 'org.cloudfoundry.stacks.cflinuxfs3'
+            },
+            conditions: [
+              {
+                lastTransitionTime: '1/1',
+                status: 'True',
+                type: 'Ready',
+              }
+            ],
+          },
         }))
-        allow_any_instance_of(VCAP::CloudController::KpackBuildpackListFetcher).to receive(:fetch_all).and_return(k8s_buildpacks)
       end
 
       it 'succeeds' do

spec/unit/lib/cloud_controller/diego/lifecycles/lifecycle_provider_spec.rb

@@ -26,9 +26,6 @@ module VCAP::CloudController
 
       context 'kpack type' do
         let(:type) { 'kpack' }
-        before do
-          allow_any_instance_of(KpackBuildpackListFetcher).to receive(:fetch_all).and_return([])
-        end
 
         it 'returns a KpackLifecycle' do
           expect(LifecycleProvider.provide(package, message)).to be_a(KpackLifecycle)
@@ -58,9 +55,6 @@ module VCAP::CloudController
 
       context 'kpack type' do
         let(:app) { AppModel.make(:kpack) }
-        before do
-          allow_any_instance_of(KpackBuildpackListFetcher).to receive(:fetch_all).and_return([])
-        end
 
         it 'returns a KpackLifecycle' do
           expect(LifecycleProvider.provide(package, message)).to be_a(KpackLifecycle)

spec/unit/lib/cloud_controller/kpack/stager_spec.rb

@@ -29,11 +29,13 @@ module Kpack
           creationTimestamp: '2020-06-27T03:13:07Z',
         },
         spec: {
+          stack: 'cflinuxfs3-stack',
+          store: 'cf-buildpack-store',
+          serviceAccount: 'gcr-service-account',
           order: [
             { group: [{ id: 'paketo-community/ruby' }] },
             { group: [{ id: 'paketo-buildpacks/java' }] },
           ],
-          stack: 'cflinuxfs3-stack',
         },
         status: {
           builderMetadata: [
@@ -45,6 +47,9 @@ module Kpack
             { id: 'paketo-buildpacks/java', version: '1.14.0' },
             { id: 'paketo-community/ruby', version: '0.0.11' },
           ],
+          stack: {
+            id: 'org.cloudfoundry.stacks.cflinuxfs3'
+          },
           conditions: [
             {
               lastTransitionTime: '2020-06-27T03:15:46Z',
@@ -76,21 +81,14 @@ module Kpack
         details.lifecycle = lifecycle
         details
       end
-      let(:staging_message) do
-        VCAP::CloudController::BuildCreateMessage.new(lifecycle: { data: { buildpacks: [] }, type: 'kpack' })
-      end
       let(:lifecycle) do
-        VCAP::CloudController::KpackLifecycle.new(package, staging_message)
+        instance_double(VCAP::CloudController::KpackLifecycle, buildpack_infos: [])
       end
       let(:package) do
         VCAP::CloudController::PackageModel.make(app: VCAP::CloudController::AppModel.make(:kpack))
       end
       let(:build) { VCAP::CloudController::BuildModel.make(:kpack) }
 
-      before do
-        allow_any_instance_of(::VCAP::CloudController::KpackBuildpackListFetcher).to receive(:fetch_all).and_return([])
-      end
-
       it 'checks if the image exists' do
         allow(client).to receive(:create_image)
         expect(client).to receive(:get_image).with(package.app.guid, 'namespace').and_return(nil)
@@ -140,26 +138,13 @@ module Kpack
 
       context 'when specifying buildpacks for a build' do
         let(:staging_message) do
-          VCAP::CloudController::BuildCreateMessage.new(lifecycle: { data: { buildpacks: ['paketo/java'] }, type: 'kpack' })
+          VCAP::CloudController::BuildCreateMessage.new(lifecycle: { data: { buildpacks: ['paketo-buildpacks/java'] }, type: 'kpack' })
         end
         let(:lifecycle) do
           VCAP::CloudController::KpackLifecycle.new(package, staging_message)
         end
         let(:package) { VCAP::CloudController::PackageModel.make(app: VCAP::CloudController::AppModel.make(:kpack)) }
 
-        before do
-          allow_any_instance_of(::VCAP::CloudController::KpackBuildpackListFetcher).to receive(:fetch_all).
-            and_return([OpenStruct.new(name: 'paketo/java')])
-          allow(client).to receive(:get_custom_builder).with('cf-default-builder', 'namespace').
-            and_return(Kubeclient::Resource.new({
-              spec: {
-                stack: 'cflinuxfs3-stack',
-                store: 'cf-buildpack-store',
-                serviceAccount: 'gcr-service-account'
-              }
-            }))
-        end
-
         it 'creates a custom builder' do
           expect(client).to receive(:create_custom_builder).with(Kubeclient::Resource.new({
             metadata: {
@@ -177,11 +162,12 @@ module Kpack
               stack: 'cflinuxfs3-stack',
               store: 'cf-buildpack-store',
               order: [
-                { group: [{ id: 'paketo/java' }] },
+                { group: [{ id: 'paketo-buildpacks/java' }] },
               ],
             }
           }))
           expect(client).to receive(:create_image)
+
           stager.stage(staging_details)
         end