Validate CNB lifecycle data

Co-authored-by: Johannes Dillmann <[email protected]>

Author: pbusko

app/messages/app_manifest_message.rb

@@ -71,6 +71,7 @@ def self.underscore_keys(hash)
     validate :validate_buildpack_and_buildpacks_combination!
     validate :validate_docker_enabled!
     validate :validate_cnb_enabled!
+    validate :validate_cnb_buildpacks!, if: ->(record) { record.requested?(:cnb) }
     validate :validate_docker_buildpacks_combination!
     validate :validate_service_bindings_message!, if: ->(record) { record.requested?(:services) }
     validate :validate_env_update_message!,       if: ->(record) { record.requested?(:env) }
@@ -481,6 +482,12 @@ def validate_cnb_enabled!
       errors.add(:base, e.message)
     end
 
+    def validate_cnb_buildpacks!
+      return if requested?(:cnb) && (requested?(:buildpack) || requested?(:buildpacks))
+
+      errors.add(:base, 'Buildpack(s) must be specified when using Cloud Native Buildpacks')
+    end
+
     def validate_docker_buildpacks_combination!
       return unless requested?(:docker) && (requested?(:buildpack) || requested?(:buildpacks))
 

app/messages/validators.rb

@@ -184,7 +184,6 @@ def validate(record)
       data_message_class_table = {
         lifecycles::BUILDPACK => VCAP::CloudController::BuildpackLifecycleDataMessage,
         lifecycles::DOCKER => VCAP::CloudController::EmptyLifecycleDataMessage,
-        # FIXME: Do we want CNBLifecycleDataMessage ???
         lifecycles::CNB => VCAP::CloudController::BuildpackLifecycleDataMessage
       }
 

lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle.rb

@@ -32,7 +32,7 @@ def update_lifecycle_data_stack(app)
     end
 
     def valid?
-      true
+      !buildpacks.empty?
     end
 
     def errors

lib/tasks/spec.rake

@@ -25,6 +25,7 @@ namespace :spec do
     run_specs('spec/unit/messages/validators_spec.rb')
     run_specs('spec/unit/lib/cloud_controller/errands/rotate_database_key_spec.rb')
     run_specs('spec/unit/messages/app_create_message_spec.rb')
+    run_specs('spec/unit/messages/app_manifest_message_spec.rb')
     run_specs('spec/unit/models/runtime/buildpack_lifecycle_buildpack_model_spec.rb')
   end
 

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

@@ -106,7 +106,7 @@ module CNB
             ::Diego::Bbs::Models::RunAction.new(
               path: '/tmp/lifecycle/builder',
               user: 'vcap',
-              args: ["--buildpacks", "gcr.io/paketo-buildpacks/node-start", "--buildpacks", "gcr.io/paketo-buildpacks/node-engine"]
+              args: ['--buildpack', 'gcr.io/paketo-buildpacks/node-start', '--buildpack', 'gcr.io/paketo-buildpacks/node-engine']
             )
           end
 

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

@@ -94,5 +94,23 @@ module VCAP::CloudController
         expect(data_model.stack).to eq('sweetness')
       end
     end
+
+    describe '#validation' do
+      context 'with no buildpacks' do
+        let(:lifecycle_request_data) { {} }
+
+        it 'invalid' do
+          expect(lifecycle.valid?).to be(false)
+        end
+      end
+
+      context 'with buildpacks' do
+        let(:lifecycle_request_data) { { buildpacks: %w[foo bar] } }
+
+        it 'valid' do
+          expect(lifecycle.valid?).to be(true)
+        end
+      end
+    end
   end
 end

spec/unit/messages/app_manifest_message_spec.rb

@@ -1114,6 +1114,22 @@ 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', cnb: true } }
+
+        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