bosh-stemcell 1.5.0.pre.1210 → 1.5.0.pre.1211

data/lib/bosh/stemcell/archive_filename.rb

@@ -1,16 +1,21 @@
 module Bosh::Stemcell
   class ArchiveFilename
-    def initialize(version, infrastructure, operating_system, base_name, light)
+    # rubocop:disable ParameterLists
+    def initialize(version, infrastructure, operating_system, base_name, light, agent_name = 'ruby')
       @version = version
       @infrastructure = infrastructure
       @operating_system = operating_system
       @base_name = base_name
       @light = light
+      @agent_name = agent_name
     end
+    # rubocop:enable ParameterLists
 
     def to_s
       stemcell_filename_parts = [name, version, infrastructure.name, infrastructure.hypervisor, operating_system.name]
 
+      stemcell_filename_parts << "#{agent_name}_agent" unless agent_name == 'ruby'
+
       "#{stemcell_filename_parts.join('-')}.tgz"
     end
 
@@ -20,10 +25,13 @@ module Bosh::Stemcell
       light ? "light-#{base_name}" : base_name
     end
 
-    attr_reader :base_name,
-                :version,
-                :infrastructure,
-                :operating_system,
-                :light
+    attr_reader(
+      :base_name,
+      :version,
+      :infrastructure,
+      :operating_system,
+      :light,
+      :agent_name,
+    )
   end
 end

data/lib/bosh/stemcell/builder_command.rb

@@ -22,6 +22,7 @@ module Bosh::Stemcell
         stemcell_version: options.fetch(:version),
         infrastructure: infrastructure,
         operating_system: operating_system,
+        agent_name: agent_name,
       )
       @shell = Bosh::Core::Shell.new
     end

data/lib/bosh/stemcell/builder_options.rb

@@ -8,6 +8,7 @@ module Bosh::Stemcell
       @environment = env
       @infrastructure = options.fetch(:infrastructure)
       @operating_system = options.fetch(:operating_system)
+      @agent_name = options.fetch(:agent_name)
 
       @stemcell_version = options.fetch(:stemcell_version)
       @image_create_disk_size = options.fetch(:disk_size, infrastructure.default_disk_size)
@@ -15,8 +16,11 @@ module Bosh::Stemcell
     end
 
     def default
+      stemcell_name = "bosh-#{infrastructure.name}-#{infrastructure.hypervisor}-#{operating_system.name}"
+      stemcell_name += "-#{agent_name}_agent" unless agent_name == 'ruby'
+
       {
-        'stemcell_name' => "bosh-#{infrastructure.name}-#{infrastructure.hypervisor}-#{operating_system.name}",
+        'stemcell_name' => stemcell_name,
         'stemcell_tgz' => archive_filename.to_s,
         'stemcell_image_name' => stemcell_image_name,
         'stemcell_version' => stemcell_version,
@@ -38,6 +42,7 @@ module Bosh::Stemcell
       :environment,
       :infrastructure,
       :operating_system,
+      :agent_name,
       :stemcell_version,
       :image_create_disk_size,
       :bosh_micro_release_tgz_path
@@ -68,7 +73,7 @@ module Bosh::Stemcell
     end
 
     def archive_filename
-      ArchiveFilename.new(stemcell_version, infrastructure, operating_system, 'bosh-stemcell', false)
+      ArchiveFilename.new(stemcell_version, infrastructure, operating_system, 'bosh-stemcell', false, agent_name)
     end
 
     def stemcell_image_name

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.5.0.pre.1210'
+    VERSION = '1.5.0.pre.1211'
   end
 end

data/spec/bosh/stemcell/archive_filename_spec.rb

@@ -37,6 +37,20 @@ module Bosh::Stemcell
           expect(archive_filename.to_s).to eq ('light-FAKE_NAME-007-INFRASTRUCTURE-HYPERVISOR-OPERATING_SYSTEM.tgz')
         end
       end
+
+      context 'when stemcell has ruby agent' do
+        it 'does not include the agent name in the archive name' do
+          archive_filename = ArchiveFilename.new(version, infrastructure, operating_system, 'FAKE_NAME', false, 'ruby')
+          expect(archive_filename.to_s).to eq ('FAKE_NAME-007-INFRASTRUCTURE-HYPERVISOR-OPERATING_SYSTEM.tgz')
+        end
+      end
+
+      context 'when stemcell has go agent' do
+        it 'includes go_agent in the archive name' do
+          archive_filename = ArchiveFilename.new(version, infrastructure, operating_system, 'FAKE_NAME', false, 'go')
+          expect(archive_filename.to_s).to eq ('FAKE_NAME-007-INFRASTRUCTURE-HYPERVISOR-OPERATING_SYSTEM-go_agent.tgz')
+        end
+      end
     end
   end
 end

data/spec/bosh/stemcell/builder_command_spec.rb

@@ -52,7 +52,8 @@ module Bosh::Stemcell
         tarball: release_tarball_path,
         stemcell_version: version,
         infrastructure: infrastructure,
-        operating_system: operating_system
+        operating_system: operating_system,
+        agent_name: expected_agent_name,
       ).and_return(stemcell_builder_options)
     end
 

data/spec/bosh/stemcell/builder_options_spec.rb

@@ -12,18 +12,20 @@ module Bosh::Stemcell
         tarball: 'fake/release.tgz',
         stemcell_version: '007',
         infrastructure: infrastructure,
-        operating_system: operating_system
+        operating_system: operating_system,
+        agent_name: agent_name,
       }
     end
 
     let(:infrastructure) { Infrastructure.for('aws') }
     let(:operating_system) { OperatingSystem.for('ubuntu') }
+    let(:agent_name) { 'ruby' }
     let(:expected_source_root) { File.expand_path('../../../../..', __FILE__) }
     let(:archive_filename) { instance_double('Bosh::Stemcell::ArchiveFilename', to_s: 'FAKE_STEMCELL.tgz') }
 
     before do
       ArchiveFilename.stub(:new).
-        with('007', infrastructure, operating_system, 'bosh-stemcell', false).and_return(archive_filename)
+        with('007', infrastructure, operating_system, 'bosh-stemcell', false, agent_name).and_return(archive_filename)
     end
 
     describe '#initialize' do
@@ -149,6 +151,17 @@ module Bosh::Stemcell
               expect(result['image_create_disk_size']).to eq(1234)
             end
           end
+
+          context 'when go agent is used' do
+            let(:agent_name) { 'go' }
+
+            it 'changes the stemcell_name' do
+              result = stemcell_builder_options.default
+
+              expect(result['stemcell_name']).to eq(
+                "bosh-#{infrastructure.name}-#{infrastructure.hypervisor}-#{operating_system.name}-go_agent")
+            end
+          end
         end
       end
       # rubocop:enable MethodLength

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1210
+  version: 1.5.0.pre.1211
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1210
+        version: 1.5.0.pre.1211
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1210
+        version: 1.5.0.pre.1211
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement