vm_shepherd 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9005c41f3252dada8327d25150585f18eab17a14
-  data.tar.gz: c1b4637cbe43854e4a1a3e1569beffa64c333adf
+  metadata.gz: b7e502bced271f1b5046793bd8965232d23291a5
+  data.tar.gz: 8cfa8bde123a2bf7a238e3f5cab9e05abc0bfbf2
 SHA512:
-  metadata.gz: 3545eaa72f1f99a5896eb1a2660ea995bc08ffe810a45f5368111e05ef9500eb222326d1000b6257d2bfdeda899bfa63b6f3ef4b67ca470dc30e3515a9def169
-  data.tar.gz: bf1964936e38d28329afa32d70c83e506f129ec8b879bd65fdd0367790c536af3113213c2a54b5e609b31c541bc35aec8faef79984b4dc4b003847395f5e3f80
+  metadata.gz: e2913b86106d6e4b57656a729291eb590dae6f9ac10bc99a9b8e5cb60a61e197515dae763f8c5957093847c01ea95a30b8154f1eff0ecb6fc2b10f7419c3da6b
+  data.tar.gz: 841d05a234ac68d9cb6147d29afa9f89cbf43e43d0f2ee106e7b66815907a42d6baf7298920b5fbb8befc628bd0fd9dd44e824065ec619835a39213c72e68c9e

data/lib/vm_shepherd/aws_manager.rb

@@ -174,7 +174,13 @@ module VmShepherd
     def delete_elb(elb_name)
       if (elb = AWS::ELB.new.load_balancers.find { |lb| lb.name == elb_name })
         sg = elb.security_groups.first
-        net_interfaces = AWS.ec2.network_interfaces.select { |ni| ni.security_groups.map(&:id).include? sg.id }
+        net_interfaces = AWS.ec2.network_interfaces.select do |ni|
+          begin
+            ni.security_groups.map(&:id).include? sg.id
+          rescue AWS::EC2::Errors::InvalidNetworkInterfaceID::NotFound
+            false
+          end
+        end
         logger.info("deleting elb: #{elb.name}")
         elb.delete
         logger.info('waiting until elb is deleted')

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.9.0'.freeze
+  VERSION = '1.9.1'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -528,6 +528,18 @@ module VmShepherd
           expect { ami_manager.clean_environment }.to raise_error(AwsManager::RetryLimitExceeded)
         end
 
+        it 'does not care about network interfaces deleted by other processes' do
+          allow(network_interface_1_elb_1).to receive(:security_groups).and_raise(AWS::EC2::Errors::InvalidNetworkInterfaceID::NotFound)
+
+          expect(load_balancer_1_to_delete).to receive(:delete).ordered
+          expect(elb_1_security_group).to receive(:delete).ordered
+
+          expect(load_balancer_2_to_delete).to receive(:delete).ordered
+          expect(elb_2_security_group).to receive(:delete).ordered
+
+          ami_manager.clean_environment
+        end
+
         it 'terminates the ELBs then removes the security group' do
           expect(load_balancer_1_to_delete).to receive(:delete).ordered
           expect(elb_1_security_group).to receive(:delete).ordered

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1