vm_shepherd 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a9a455d9504af7f1bc06d5c48c9677046d9fe89
-  data.tar.gz: 88ab68ce1d9cd9aba074fc68b129def3d01538b8
+  metadata.gz: 88deef3c10c81db0c5ea70d8cfd04e85999424ba
+  data.tar.gz: 4d4a8c296e95d0c574d76f67a5f92ee21c2edf66
 SHA512:
-  metadata.gz: 13117df80be86c6c5b2472e0b92948e6f2e073c0c9a23c5f5bd50e797f74c15dea3d9a6aabee1fea0eb3ce38119d7ccf5c4c75f667f9bb4c986c5199c0a0ba3f
-  data.tar.gz: 83b9c1a707a8ec42c0cd82e521c6ab0533a9a1eb1029667d61726ce4acc64df1347ef3ddadac4fea1e6c6af1899dff954da838208dbae8ffd805bce143b8f4fb
+  metadata.gz: 1c71799a37d10d37049f2bce2410d34d3b8c0c6ca16ff242312786d76c486f98032216e7c25ad7d867c522fc810828ec69b73dcadda3a5f31e9bb0ad835eec66
+  data.tar.gz: 6332671a327756f8b1893082b4f67580f07cf52dc00c57d364802570d5457c5d5992b08129845239a9643ce5c716303bbc6aeb9ff7782a988b175db17882ff00

data/lib/vm_shepherd/aws_manager.rb

@@ -123,7 +123,8 @@ module VmShepherd
     def destroy(vm_config)
       AWS.ec2.instances.each do |instance|
         if instance.tags.to_h['Name'] == vm_config.fetch(:vm_name)
-          elastic_ip = instance.elastic_ip
+          vm_ip_address = vm_config.fetch(:vm_ip_address, nil)
+          elastic_ip = instance.elastic_ip unless vm_ip_address
           if elastic_ip
             elastic_ip.disassociate
             elastic_ip.delete

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.8.3'.freeze
+  VERSION = '1.8.4'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -686,7 +686,7 @@ module VmShepherd
         ami_manager.destroy(vm_config)
       end
 
-      context 'when there is an elastic ip' do
+      context 'when there is an elastic ip and it is not specified in env config' do
         let(:elastic_ip) { instance_double(AWS::EC2::ElasticIp) }
 
         before do
@@ -708,6 +708,29 @@ module VmShepherd
           ami_manager.destroy(vm_config)
         end
       end
+
+      context 'when there is an elastic ip and it is specified in env config' do
+        let(:elastic_ip) { instance_double(AWS::EC2::ElasticIp) }
+        let(:vm_config) do
+          {
+            vm_name: 'some-vm-name',
+            vm_ip_address: 'some-ip-address'
+          }
+        end
+
+        it 'terminates the VM with the specified name' do
+          expect(non_terminated_instance).not_to receive(:terminate)
+          expect(instance).to receive(:terminate)
+
+          ami_manager.destroy(vm_config)
+        end
+
+        it 'does not destroy the elastic ip' do
+          expect(elastic_ip).not_to receive(:delete).ordered
+
+          ami_manager.destroy(vm_config)
+        end
+      end
     end
   end
 end

metadata

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