set --auto-detect flag when no buildpacks were requested

Co-authored-by: Pavel Busko <[email protected]>

Author: 2 people

lib/cloud_controller/diego/cnb/lifecycle_data.rb

@@ -4,7 +4,7 @@ module CNB
       class LifecycleData
         attr_accessor :app_bits_download_uri, :build_artifacts_cache_download_uri, :build_artifacts_cache_upload_uri,
                       :buildpacks, :app_bits_checksum, :droplet_upload_uri, :stack, :buildpack_cache_checksum,
-                      :credentials
+                      :credentials, :auto_detect
 
         def message
           message = {
@@ -13,7 +13,8 @@ def message
             droplet_upload_uri:,
             buildpacks:,
             stack:,
-            app_bits_checksum:
+            app_bits_checksum:,
+            auto_detect:
           }
           message[:build_artifacts_cache_download_uri] = build_artifacts_cache_download_uri if build_artifacts_cache_download_uri
           message[:buildpack_cache_checksum] = buildpack_cache_checksum if buildpack_cache_checksum
@@ -36,7 +37,8 @@ def schema
               buildpacks: Array,
               stack: String,
               app_bits_checksum: Hash,
-              optional(:credentials) => String
+              optional(:credentials) => String,
+              auto_detect: bool
             }
           end
         end

lib/cloud_controller/diego/cnb/lifecycle_protocol.rb

@@ -25,6 +25,7 @@ def desired_lrp_builder(config, process)
           def new_lifecycle_data(staging_details)
             lifecycle_data = LifecycleData.new
             lifecycle_data.credentials = staging_details.lifecycle.credentials
+            lifecycle_data.auto_detect = staging_details.lifecycle.buildpack_infos.empty?
 
             lifecycle_data
           end

lib/cloud_controller/diego/cnb/staging_action_builder.rb

@@ -30,9 +30,10 @@ def stage_action
             '--cache-output', '/tmp/cache-output.tgz'
           ]
 
+          args.push('--auto-detect') if lifecycle_data[:auto_detect]
           lifecycle_data[:buildpacks].each do |buildpack|
             args.push('--buildpack', buildpack[:url]) if buildpack[:name] == 'custom'
-            args.push('--system-buildpack', buildpack[:key]) unless buildpack[:name] == 'custom'
+            args.push('--buildpack', buildpack[:key]) unless buildpack[:name] == 'custom'
           end
 
           env_vars = BbsEnvironmentBuilder.build(staging_details.environment_variables)

lib/cloud_controller/diego/lifecycles/lifecycle_base.rb

@@ -9,7 +9,7 @@ def initialize(package, staging_message)
       @staging_message = staging_message
       @package = package
 
-      db_result = BuildpackLifecycleFetcher.fetch(buildpacks_to_use, staging_stack)
+      db_result = BuildpackLifecycleFetcher.fetch(buildpacks_to_use, staging_stack, type)
       @buildpack_infos = db_result[:buildpack_infos]
       @validator = BuildpackLifecycleDataValidator.new({ buildpack_infos: buildpack_infos, stack: db_result[:stack] })
     end

spec/unit/lib/cloud_controller/diego/cnb/lifecycle_data_spec.rb

@@ -16,6 +16,7 @@ module CNB
           data.buildpack_cache_checksum           = 'bp-cache-checksum'
           data.app_bits_checksum                  = { type: 'sha256', value: 'package-checksum' }
           data.credentials                        = '{"registry":{"username":"password"}}'
+          data.auto_detect                        = false
           data
         end
 
@@ -29,7 +30,8 @@ module CNB
             stack: 'stack',
             buildpack_cache_checksum: 'bp-cache-checksum',
             app_bits_checksum: { type: 'sha256', value: 'package-checksum' },
-            credentials: '{"registry":{"username":"password"}}'
+            credentials: '{"registry":{"username":"password"}}',
+            auto_detect: false
           }
         end
 
@@ -98,7 +100,7 @@ module CNB
                 expect do
                   data.message
                 end.to raise_error(
-                  Membrane::SchemaValidationError, /{ #{key} => Expected instance of (String|Array|Hash), given an instance of NilClass }/
+                  Membrane::SchemaValidationError, /{ #{key} => Expected instance of (String|Array|Hash|true or false), given .*}/
                 )
               end
             end

spec/unit/lib/cloud_controller/diego/cnb/lifecycle_protocol_spec.rb

@@ -77,6 +77,16 @@ module CNB
               end
             end
 
+            context 'when buildpack_infos is empty' do
+              let(:buildpack_infos) { [] }
+
+              it 'sets auto_detect: true' do
+                lifecycle_data = lifecycle_protocol.lifecycle_data(staging_details)
+
+                expect(lifecycle_data[:auto_detect]).to be true
+              end
+            end
+
             context 'when the generated message has invalid data' do
               let(:buildpack_infos) { [] }
 

spec/unit/lib/cloud_controller/diego/cnb/staging_action_builder_spec.rb

@@ -241,19 +241,23 @@ module CNB
             end
           end
 
-          context('when system-buildpaks are used') do
+          context('when system-buildpacks are used') do
             let(:buildpacks) do
               [
                 { name: 'node-cnb', key: 'node-key', skip_detect: false },
                 { name: 'java-cnb', key: 'java-key', skip_detect: false }
               ]
             end
 
+            before do
+              lifecycle_data[:auto_detect] = true
+            end
+
             let(:run_staging_action) do
               ::Diego::Bbs::Models::RunAction.new(
                 path: '/tmp/lifecycle/builder',
                 user: 'vcap',
-                args: ['--cache-dir', '/tmp/cache', '--cache-output', '/tmp/cache-output.tgz', '--system-buildpack', 'node-key', '--system-buildpack',
+                args: ['--cache-dir', '/tmp/cache', '--cache-output', '/tmp/cache-output.tgz', '--auto-detect', '--buildpack', 'node-key', '--buildpack',
                        'java-key', '--pass-env-var', 'FOO', '--pass-env-var', 'BAR'],
                 env: bbs_env
               )
@@ -269,17 +273,17 @@ module CNB
               expect(builder.cached_dependencies).to include(::Diego::Bbs::Models::CachedDependency.new(
                                                                name: 'node-cnb',
                                                                from: '',
-                                                               to: '/tmp/buildpacks/54548f35489d6234',
-                                                               cache_key: 'node-cnb',
+                                                               to: '/tmp/buildpacks/0dcf6bb539d77cbc',
+                                                               cache_key: 'node-key',
                                                                log_source: '',
                                                                checksum_algorithm: '',
                                                                checksum_value: ''
                                                              ))
               expect(builder.cached_dependencies).to include(::Diego::Bbs::Models::CachedDependency.new(
                                                                name: 'java-cnb',
                                                                from: '',
-                                                               to: '/tmp/buildpacks/c56b3bfdba7aa4dd',
-                                                               cache_key: 'java-cnb',
+                                                               to: '/tmp/buildpacks/be0ef1aa1092a6db',
+                                                               cache_key: 'java-key',
                                                                log_source: '',
                                                                checksum_algorithm: '',
                                                                checksum_value: ''

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

@@ -16,10 +16,15 @@ module VCAP::CloudController
       context 'when the user specifies buildpacks' do
         let(:request_data) do
           {
-            buildpacks: %w[docker://cool-buildpack docker://rad-buildpack]
+            buildpacks: %w[docker://nodejs cool-buildpack]
           }
         end
 
+        before do
+          Buildpack.make(name: 'cool-buildpack', lifecycle: 'cnb')
+          Buildpack.make(name: 'rad-buildpack')
+        end
+
         it 'uses the buildpacks from the user' do
           build = BuildModel.make(:cnb)
 
@@ -29,7 +34,7 @@ module VCAP::CloudController
 
           data_model = VCAP::CloudController::CNBLifecycleDataModel.last
 
-          expect(data_model.buildpacks).to eq(%w[docker://cool-buildpack docker://rad-buildpack])
+          expect(data_model.buildpacks).to eq(%w[docker://nodejs cool-buildpack])
           expect(data_model.build).to eq(build)
         end
       end