Support .cnb, .tgz, and .tar.gz as part of install_buildpacks

Author: sethboyles

lib/cloud_controller/install_buildpacks.rb

@@ -75,7 +75,7 @@ def detected_stack(file, opts)
     def buildpack_zip(package, zipfile)
       return zipfile if zipfile
 
-      job_dir = File.join('/var/vcap/packages', package, '*.zip')
+      job_dir = File.join('/var/vcap/packages', package, '*[.zip|.cnb|.tgz|.tar.gz]')
       Dir[job_dir].first
     end
 

spec/unit/lib/cloud_controller/install_buildpacks_spec.rb

@@ -40,6 +40,74 @@ module VCAP::CloudController
           end
         end
 
+        context 'when a cnb buildpack is specified' do
+          let(:file) { 'buildpack.cnb' }
+          let(:buildpack_fields) do
+            { name: 'cnb_buildpack', file: file, stack: nil, options: { lifecycle: Lifecycles::CNB } }
+          end
+
+          let(:install_buildpack_config) do
+            {
+              install_buildpacks: [
+                {
+                  'name' => 'cnb_buildpack',
+                  'package' => 'cnb-buildpack-package',
+                  'lifecycle' => 'cnb'
+                }
+              ]
+            }
+          end
+
+          before do
+            expect(Dir).to receive(:[]).with('/var/vcap/packages/cnb-buildpack-package/*[.zip|.cnb|.tgz|.tar.gz]').
+              and_return([file])
+            expect(File).to receive(:file?).with(file).
+              and_return(true)
+            allow(job_factory).to receive(:plan).with('cnb_buildpack', [buildpack_fields]).and_return([enqueued_job1])
+            allow(Jobs::Enqueuer).to receive(:new).and_return(enqueuer)
+          end
+
+          it 'succeeds' do
+            installer.install(TestConfig.config_instance.get(:install_buildpacks))
+
+            expect(job_factory).to have_received(:plan).with('cnb_buildpack', [buildpack_fields])
+          end
+        end
+
+        context 'when a cnb buildpack is specified with .tgz extension' do
+          let(:file) { 'buildpack.tgz' }
+          let(:buildpack_fields) do
+            { name: 'cnb_buildpack', file: file, stack: nil, options: { lifecycle: Lifecycles::CNB } }
+          end
+
+          let(:install_buildpack_config) do
+            {
+              install_buildpacks: [
+                {
+                  'name' => 'cnb_buildpack',
+                  'package' => 'cnb-buildpack-package',
+                  'lifecycle' => 'cnb'
+                }
+              ]
+            }
+          end
+
+          before do
+            expect(Dir).to receive(:[]).with('/var/vcap/packages/cnb-buildpack-package/*[.zip|.cnb|.tgz|.tar.gz]').
+              and_return([file])
+            expect(File).to receive(:file?).with(file).
+              and_return(true)
+            allow(job_factory).to receive(:plan).with('cnb_buildpack', [buildpack_fields]).and_return([enqueued_job1])
+            allow(Jobs::Enqueuer).to receive(:new).and_return(enqueuer)
+          end
+
+          it 'succeeds' do
+            installer.install(TestConfig.config_instance.get(:install_buildpacks))
+
+            expect(job_factory).to have_received(:plan).with('cnb_buildpack', [buildpack_fields])
+          end
+        end
+
         context 'when there are multiple buildpacks' do
           let(:buildpack1a_file) { 'abuildpacka.zip' }
           let(:buildpack1b_file) { 'abuildpackb.zip' }
@@ -56,15 +124,15 @@ module VCAP::CloudController
           end
 
           before do
-            expect(Dir).to receive(:[]).with('/var/vcap/packages/mybuildpackpkg/*.zip').
+            expect(Dir).to receive(:[]).with('/var/vcap/packages/mybuildpackpkg/*[.zip|.cnb|.tgz|.tar.gz]').
               and_return([buildpack1a_file])
             expect(File).to receive(:file?).with(buildpack1a_file).
               and_return(true)
-            expect(Dir).to receive(:[]).with('/var/vcap/packages/myotherpkg/*.zip').
+            expect(Dir).to receive(:[]).with('/var/vcap/packages/myotherpkg/*[.zip|.cnb|.tgz|.tar.gz]').
               and_return([buildpack1b_file])
             expect(File).to receive(:file?).with(buildpack1b_file).
               and_return(true)
-            expect(Dir).to receive(:[]).with('/var/vcap/packages/myotherpkg2/*.zip').
+            expect(Dir).to receive(:[]).with('/var/vcap/packages/myotherpkg2/*[.zip|.cnb|.tgz|.tar.gz]').
               and_return([buildpack2_file])
             expect(File).to receive(:file?).with(buildpack2_file).
               and_return(true)
@@ -124,7 +192,7 @@ module VCAP::CloudController
       end
 
       it 'logs an error when no buildpack zip file is found' do
-        expect(Dir).to receive(:[]).with('/var/vcap/packages/mybuildpackpkg/*.zip').and_return([])
+        expect(Dir).to receive(:[]).with('/var/vcap/packages/mybuildpackpkg/*[.zip|.cnb|.tgz|.tar.gz]').and_return([])
         expect(installer.logger).to receive(:error).with(/No file found for the buildpack/)
 
         installer.install(TestConfig.config_instance.get(:install_buildpacks))
@@ -212,7 +280,7 @@ module VCAP::CloudController
 
         it 'passes optional attributes to the job factory' do
           expect(Dir).to receive(:[]).
-            with('/var/vcap/packages/mybuildpackpkg/*.zip').
+            with('/var/vcap/packages/mybuildpackpkg/*[.zip|.cnb|.tgz|.tar.gz]').
             and_return(['abuildpack.zip'])
           expect(File).to receive(:file?).
             with('abuildpack.zip').