add support for system cnbs

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

Author: 2 people

app/messages/app_manifest_message.rb

@@ -284,15 +284,6 @@ def docker_lifecycle_data
     end
 
     def cnb_lifecycle_data
-      return unless requested?(:buildpacks) || requested?(:buildpack) || requested?(:stack)
-
-      if requested?(:buildpacks)
-        requested_buildpacks = @buildpacks
-      elsif requested?(:buildpack)
-        requested_buildpacks = []
-        requested_buildpacks.push(@buildpack) unless should_autodetect?(@buildpack)
-      end
-
       {
         type: Lifecycles::CNB,
         data: {
@@ -304,16 +295,8 @@ def cnb_lifecycle_data
     end
 
     def buildpacks_lifecycle_data
-      return unless requested?(:buildpacks) || requested?(:buildpack) || requested?(:stack)
-
-      if requested?(:buildpacks)
-        requested_buildpacks = @buildpacks
-      elsif requested?(:buildpack)
-        requested_buildpacks = []
-        requested_buildpacks.push(@buildpack) unless should_autodetect?(@buildpack)
-      end
-
       {
+        type: Lifecycles::BUILDPACK,
         data: {
           buildpacks: requested_buildpacks,
           stack: @stack
@@ -493,5 +476,15 @@ def validate_docker_buildpacks_combination!
     def add_process_error!(error_message, type)
       errors.add(:base, %(Process "#{type}": #{error_message}))
     end
+
+    def requested_buildpacks
+      return nil unless requested?(:buildpacks) || requested?(:buildpack)
+      return @buildpacks if requested?(:buildpacks)
+
+      buildpacks = []
+      buildpacks.push(@buildpack) if requested?(:buildpack) && !should_autodetect?(@buildpack)
+
+      buildpacks
+    end
   end
 end

lib/cloud_controller/diego/buildpack/lifecycle_protocol.rb

@@ -23,6 +23,10 @@ def desired_lrp_builder(config, process)
           def new_lifecycle_data(_)
             LifecycleData.new
           end
+
+          def type
+            VCAP::CloudController::Lifecycles::BUILDPACK
+          end
         end
       end
     end

lib/cloud_controller/diego/buildpack_entry_generator.rb

@@ -1,8 +1,9 @@
 module VCAP::CloudController
   module Diego
     class BuildpackEntryGenerator
-      def initialize(blobstore_url_generator)
+      def initialize(blobstore_url_generator, type)
         @blobstore_url_generator = blobstore_url_generator
+        @type = type
       end
 
       def buildpack_entries(buildpack_infos, stack_name)
@@ -26,7 +27,7 @@ def custom_buildpack_entry(buildpack)
       end
 
       def default_admin_buildpacks(stack_name)
-        VCAP::CloudController::Buildpack.list_admin_buildpacks(stack_name).
+        VCAP::CloudController::Buildpack.list_admin_buildpacks(stack_name, @type).
           select(&:enabled).
           collect { |buildpack| admin_buildpack_entry(buildpack) }
       end

lib/cloud_controller/diego/cnb/lifecycle_protocol.rb

@@ -28,6 +28,10 @@ def new_lifecycle_data(staging_details)
 
             lifecycle_data
           end
+
+          def type
+            VCAP::CloudController::Lifecycles::CNB
+          end
         end
       end
     end

lib/cloud_controller/diego/cnb/staging_action_builder.rb

@@ -11,18 +11,6 @@ def initialize(config, staging_details, lifecycle_data)
           super(config, staging_details, lifecycle_data, 'cnb', '/home/vcap/workspace', '/tmp/cache-output.tgz', ::Diego::Bbs::Models::ImageLayer::MediaType::TGZ)
         end
 
-        def cached_dependencies
-          return nil if @config.get(:diego, :enable_declarative_asset_downloads)
-
-          [
-            ::Diego::Bbs::Models::CachedDependency.new(
-              from: LifecycleBundleUriGenerator.uri(config.get(:diego, :lifecycle_bundles)[lifecycle_bundle_key]),
-              to: '/tmp/lifecycle',
-              cache_key: "#{@prefix}-#{lifecycle_stack}-lifecycle"
-            )
-          ]
-        end
-
         def task_environment_variables
           env = [
             ::Diego::Bbs::Models::EnvironmentVariable.new(name: 'CNB_USER_ID', value: '2000'),
@@ -43,7 +31,8 @@ def stage_action
           ]
 
           lifecycle_data[:buildpacks].each do |buildpack|
-            args.push('--buildpack', buildpack[:url])
+            args.push('--buildpack', buildpack[:url]) if buildpack[:name] == 'custom'
+            args.push('--system-buildpack', buildpack[:key]) unless buildpack[:name] == 'custom'
           end
 
           env_vars = BbsEnvironmentBuilder.build(staging_details.environment_variables)

lib/cloud_controller/diego/lifecycle_protocol.rb

@@ -19,7 +19,7 @@ class InvalidDownloadUri < StandardError; end
       def initialize(blobstore_url_generator=::CloudController::DependencyLocator.instance.blobstore_url_generator,
                      droplet_url_generator=::CloudController::DependencyLocator.instance.droplet_url_generator)
         @blobstore_url_generator   = blobstore_url_generator
-        @buildpack_entry_generator = BuildpackEntryGenerator.new(@blobstore_url_generator)
+        @buildpack_entry_generator = BuildpackEntryGenerator.new(@blobstore_url_generator, type)
         @droplet_url_generator = droplet_url_generator
       end
 

lib/cloud_controller/upload_buildpack.rb

@@ -1,4 +1,5 @@
 require 'vcap/digester'
+require 'cloud_controller/diego/lifecycles/lifecycles'
 
 module VCAP::CloudController
   class UploadBuildpack
@@ -69,6 +70,8 @@ def determine_new_stack(buildpack, bits_file_path)
       extracted_stack = Buildpacks::StackNameExtractor.extract_from_file(bits_file_path)
       [extracted_stack, buildpack.stack].find(&:present?)
     rescue CloudController::Errors::BuildpackError => e
+      return buildpack.stack if buildpack.lifecycle == Lifecycles::CNB
+
       raise CloudController::Errors::ApiError.new_from_details('BuildpackZipError', e.message)
     end
 

spec/unit/messages/app_manifest_message_spec.rb

@@ -1114,22 +1114,6 @@ module VCAP::CloudController
           expect(message.errors.full_messages).to match_array(error_messages)
         end
       end
-
-      context 'when cnb: true and no buildpacks provided' do
-        before do
-          FeatureFlag.make(name: 'diego_cnb', enabled: true, error_message: nil)
-        end
-
-        let(:params_from_yaml) { { name: 'eugene', lifecycle: 'cnb' } }
-
-        it 'is not valid' do
-          message = AppManifestMessage.create_from_yml(params_from_yaml)
-
-          expect(message).not_to be_valid
-          expect(message.errors).to have(1).items
-          expect(message.errors.full_messages).to include('Buildpack(s) must be specified when using Cloud Native Buildpacks')
-        end
-      end
     end
 
     describe '.create_from_yml' do
@@ -2009,10 +1993,11 @@ module VCAP::CloudController
           context 'when no lifecycle data is requested in the manifest' do
             let(:parsed_yaml) { {} }
 
-            it 'does not forward missing attributes to the AppUpdateMessage' do
+            it 'defaults to the buildpack lifecycle' do
               message = AppManifestMessage.create_from_yml(parsed_yaml)
 
-              expect(message.app_update_message.requested?(:lifecycle)).to be false
+              expect(message.app_update_message.requested?(:lifecycle)).to be true
+              expect(message.app_update_message.lifecycle_type).to eq('buildpack')
             end
           end