stemcell 0.11.9 → 0.11.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3d71d194f64fa371f8052946dd96ce7d014434
-  data.tar.gz: e25f56378baeeaee5e5750fb74fc938db759c2d4
+  metadata.gz: 7507325651ec8da0572ef5638823edc4250ba9c7
+  data.tar.gz: 5141fb0f5d90116e1245a233193d144af1b7bb4a
 SHA512:
-  metadata.gz: ad7f8d3f4343e2c98591339cda7f6351d25aac7648e54c7a4f6d46e23264fefeb704e74a4d69bbdb7cc67f12f0fcefdf44d69c43db1728a35f3850592a4408b8
-  data.tar.gz: 253d9789fe346065cb9a4911e6806a0a60a3a2ccd3161fd9452b307ff57f1c54d3a9daa5bb97e54c1ceb8bc4c5c7eefc6b5e12e208e42e56a4518fe2c05241c5
+  metadata.gz: 02625b23aeefca813c24cdbba7c7886f15f9294938ff78b5b0fcacd599e2404e751db09c414750e29f1b533e13f0997a4abea5535c4d0e9d6d69f0df3e1541a6
+  data.tar.gz: 14009ac687b05b8b8eb931d62b2593ebfcf4eefe0c61f6ab00f156580c8a3e830d3e8bb87e4ac6b0fd1a102f74c396ef15ec16c071463be504edb90d20dc059d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.11.10
+- Configurable number of retries for batch operations
+- Do not set set_classic_link on vpc instances
+
 # 0.11.9
 - Transform chef_cookbook_attributes option for command-line parser
 - Set vpc_id when creating Launcher object

data/lib/stemcell/launcher.rb

@@ -78,6 +78,7 @@ module Stemcell
       @aws_access_key = opts['aws_access_key']
       @aws_secret_key = opts['aws_secret_key']
       @aws_session_token = opts['aws_session_token']
+      @max_attempts = opts['max_attempts'] || 3
       configure_aws_creds_and_region
     end
 
@@ -194,8 +195,10 @@ module Stemcell
         @log.info "sent ec2 api tag requests successfully"
 
         # link to classiclink
-        set_classic_link(instances, opts['classic_link'])
-        @log.info "successfully applied classic link settings (if any)"
+        if @vpc_id.nil?
+          set_classic_link(instances, opts['classic_link'])
+          @log.info "successfully applied classic link settings (if any)"
+        end
 
         # turn on termination protection
         # we do this now to make sure all other settings worked
@@ -391,7 +394,6 @@ module Stemcell
         File.read(File.expand_path(opt)) rescue opt
     end
 
-    MAX_ATTEMPTS = 3
     INITIAL_RETRY_SEC = 1
 
     # Return a Hash of instance => error. Empty hash indicates "no error"
@@ -404,7 +406,7 @@ module Stemcell
         begin
           attempt = 0
           result = nil
-          while attempt < MAX_ATTEMPTS
+          while attempt < @max_attempts
             # sleep idempotently except for the first attempt
             sleep(INITIAL_RETRY_SEC * 2 ** attempt) if attempt != 0
             result = yield(instance)

data/lib/stemcell/metadata_launcher.rb

@@ -100,6 +100,7 @@ module Stemcell
         'aws_session_token' => options['aws_session_token'],
         'region'            => options['region'],
         'vpc_id'            => options['vpc_id'],
+        'max_attempts'      => options['batch_operation_retries'],
       })
       # Slice off just the options used for launching.
       launch_options = {}

data/lib/stemcell/option_parser.rb

@@ -291,7 +291,15 @@ module Stemcell
         :desc  => "comma-separated list of contexts to override certain values",
         :type  => String,
         :env   => "CONTEXTS",
-      }
+      },
+      {
+        :name  => 'batch_operation_retries',
+        :desc  => "maximum number of retries",
+        :type  => Integer,
+        :env   => 'BATCH_OPERATION_RETRIES',
+        :short => :r,
+        :default => 3,
+      },
     ]
 
     def initialize(config={})

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.11.9"
+  VERSION = "0.11.10"
 end

data/spec/lib/stemcell/launcher_spec.rb

@@ -86,6 +86,8 @@ describe Stemcell::Launcher do
           :user_data          => 'template'
         )).and_return(instances)
       expect(launcher).to receive(:set_tags).with(kind_of(Array), kind_of(Hash)).and_return(nil)
+      # set_classic_link should not be set on vpc hosts.
+      expect(launcher).not_to receive(:set_classic_link)
 
       launcher.send(:launch, launch_options)
     end
@@ -155,6 +157,24 @@ describe Stemcell::Launcher do
       end
       expect(errors.all?(&:nil?)).to be true
     end
+
+    it "retries up to max_attempts option per instance" do
+      max_attempts = 6
+      opts = {'region' => 'region', 'max_attempts' => max_attempts}
+      launcher = Stemcell::Launcher.new(opts)
+      allow(launcher).to receive(:sleep).and_return(0)
+      tags = double("Tags")
+      instances = (1..2).map do |id|
+        inst = MockInstance.new(id)
+        allow(inst).to receive(:tags).and_return(tags)
+        inst
+      end
+      expect(tags).to receive(:set).with({'a' => 'b'}).exactly(12).times.
+        and_raise(AWS::EC2::Errors::InvalidInstanceID::NotFound.new("error"))
+      expect do
+        launcher.send(:set_tags, instances, {'a' => 'b'})
+      end.to raise_error(Stemcell::IncompleteOperation)
+    end
   end
 
   describe '#configure_aws_creds_and_region' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.11.9
+  version: 0.11.10
 platform: ruby
 authors:
 - Martin Rhoads
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: no summary