vm_shepherd 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99a0f22efce7d9dfcbc9d57fed83296f53ba78f4
-  data.tar.gz: cddee95e088cfeb14da595da8ba90440124b540f
+  metadata.gz: d6846007d4981d1f09863a0c1efaa73667598060
+  data.tar.gz: 1e102d3be9b16a9d16ef28795a43b55bb3f2cf56
 SHA512:
-  metadata.gz: a4bfb0896dc269d8a88cefd12372e9fa9aa463d47d34c5a0d56164151cb5471bbafe9cb2c0eb2e4d10edb00601fa7bb82865a78c0bad76686696e9ce2ba9a9e0
-  data.tar.gz: b56fdd0f724900ebe79af8261c40988141b3355137105143937533c410ac8d0ab9756c70393beff9a0684a1c90ff08e1b48a45988265e4541f1fbb0d39736e5b
+  metadata.gz: 3b03d22cf4c7099442b0130c3ab36c50e2b5443bd00f0dd00f600a5e1f821c782ad69405d87d6aa4fc213776f192622636234174513555c6af79bcab329335eb
+  data.tar.gz: 19ba79193fcfad0c6c41d3dd3b9d80555f11254ce817d5084e4c3b41b1a26f9800f44f41a2dfd786160b7717f5cc6abd18eb6822ee13b3643f7a80e46ae9b7d4

data/lib/vm_shepherd/aws_manager.rb

@@ -34,7 +34,7 @@ module VmShepherd
       stack = cfm.stacks.create(env_config.fetch(:stack_name), template, parameters: env_config.fetch(:parameters), capabilities: ['CAPABILITY_IAM'])
 
       logger.info("Waiting for status: #{CREATE_COMPLETE}")
-      retry_until(retry_limit: 360) do
+      retry_until(retry_limit: 30) do
         status = stack.status
         logger.info("current stack status: #{status}")
         case status
@@ -227,7 +227,7 @@ module VmShepherd
       logger.info('deleting CloudFormation stack')
       stack.delete
       logger.info("waiting until status: #{DELETE_COMPLETE}")
-      retry_until(retry_limit: 360) do
+      retry_until(retry_limit: 30) do
         begin
           status = stack.status
           logger.info("current stack status: #{status}")

data/lib/vm_shepherd/retry_helper.rb

@@ -3,8 +3,8 @@ module VmShepherd
     class RetryLimitExceeded < StandardError
     end
 
-    RETRY_LIMIT = 60
-    RETRY_INTERVAL = 10
+    RETRY_LIMIT = 10
+    RETRY_INTERVAL = 60
 
     def retry_until(retry_limit: RETRY_LIMIT, &block)
       tries = 0

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.7.2'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -91,7 +91,7 @@ module VmShepherd
 
         it 'stops retrying after 360 times' do
           expect(stack).to receive(:status).and_return('CREATE_IN_PROGRESS').
-              exactly(360).times
+              exactly(30).times
 
           expect { ami_manager.prepare_environment(cloudformation_template_file.path) }.to raise_error(AwsManager::RetryLimitExceeded)
         end
@@ -367,7 +367,7 @@ module VmShepherd
 
       it 'stops retrying after 360 times' do
         expect(stack).to receive(:status).and_return('DELETE_IN_PROGRESS').
-            exactly(360).times
+            exactly(30).times
 
         expect { ami_manager.clean_environment }.to raise_error(AwsManager::RetryLimitExceeded)
       end
@@ -467,7 +467,7 @@ module VmShepherd
 
         it 'waits for the elb to be deleted' do
           expect(load_balancer_to_delete).to receive(:exists?).and_return(true).
-              exactly(60).times
+              exactly(10).times
 
           expect(elb_security_group).not_to receive(:delete).ordered
           expect { ami_manager.clean_environment }.to raise_error(AwsManager::RetryLimitExceeded)
@@ -477,10 +477,10 @@ module VmShepherd
           allow(load_balancer_to_delete).to receive(:exists?).and_return(false)
 
           expect(network_interface_1).to receive(:exists?).and_return(false).
-              exactly(60).times
+              exactly(10).times
 
           expect(network_interface_2).to receive(:exists?).and_return(true).
-              exactly(60).times
+              exactly(10).times
 
           expect(elb_security_group).not_to receive(:delete).ordered
           expect { ami_manager.clean_environment }.to raise_error(AwsManager::RetryLimitExceeded)

data/spec/vm_shepherd/retry_helper_spec.rb

@@ -12,8 +12,8 @@ module VmShepherd
       allow(retry_helper).to receive(:sleep) # speed up retry logic
     end
 
-    it 'calls the given block 60 times by default' do
-      sixty_times = [true] + [false] * 59
+    it 'calls the given block 10 times by default' do
+      sixty_times = [true] + [false] * 9
       expect {
         retry_helper.retry_until { sixty_times.pop }
       }.not_to raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Ops Manager Team