vm_shepherd 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab0c19467d9811ac4ac4b56875e8155e3299390f
-  data.tar.gz: e3441beaa08bde0a2556d68b252f87b5725c213d
+  metadata.gz: cb58842910e0aaa03e530da601b34849dffdac3d
+  data.tar.gz: 5571666645019a72a933e4724dcd5b7a49a3aabf
 SHA512:
-  metadata.gz: b5fd911a4e52484be279df6cffe69b027fd29e2f4db2e4713cd7f22bd3d9e91c963cdd4eed2e9166b1460f66bc96051b3b28d1e66230d9bafa46059438a47c5b
-  data.tar.gz: d38f7542b02454852050272cb487ba02a7a64f35edf4bb031d3b3ded01bb65a51ed4f4de9d64e7d4df6d5347a8cabb61ec14887a5d49aaef1de2f0cc9b29ba4b
+  metadata.gz: efcb4d8f458a77b12a737fa452db657599201ed27714fb4127bfe663ddaaf73240fb4587043c28ddd3392f28ab359653765b964af22b86fb91427c78bee44382
+  data.tar.gz: eba88621eb495b53c180da8ae4ebff4c36e97be664faae428584a91aa2adb84b7be03637b84d3f926e3f66bb428c1110e5e87c3fdf57605f98b4190175da596d

data/lib/vm_shepherd/aws_manager.rb

@@ -107,7 +107,8 @@ module VmShepherd
         delete_elb(elb_config[:name])
       end
 
-      if (bucket_name = env_config.fetch(:outputs, {}).fetch(:s3_bucket_name, nil))
+      bucket_names = env_config.fetch(:outputs, {}).fetch(:s3_bucket_names, [])
+      bucket_names.each do |bucket_name|
         bucket = AWS::S3.new.buckets[bucket_name]
         if bucket && bucket.exists?
           logger.info("clearing bucket: #{bucket_name}")

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.7.3'.freeze
+  VERSION = '1.8.0'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -582,26 +582,52 @@ module VmShepherd
       end
 
       context 'when there is an s3 bucket configuration' do
-        let(:bucket) { instance_double(AWS::S3::Bucket) }
-        let(:extra_outputs) { {s3_bucket_name: bucket_name} }
-        let(:bucket_name) { 'bucket-name' }
+        let(:bucket_1) { instance_double(AWS::S3::Bucket) }
+        let(:bucket_2) { instance_double(AWS::S3::Bucket) }
+        let(:extra_outputs) { { s3_bucket_names: [bucket_name_1, bucket_name_2] } }
+        let(:bucket_name_1) { 'bucket-name-1' }
+        let(:bucket_name_2) { 'bucket-name-2' }
 
-        before { allow(buckets).to receive(:[]).with(bucket_name).and_return(bucket) }
+        before do
+          allow(buckets).to receive(:[]).with(bucket_name_1).and_return(bucket_1)
+          allow(buckets).to receive(:[]).with(bucket_name_2).and_return(bucket_2)
+        end
 
-        context 'and the bucket does exist' do
-          before { allow(bucket).to receive(:exists?).and_return(true) }
+        context 'and both buckets exist' do
+          before do
+            allow(bucket_1).to receive(:exists?).and_return(true)
+            allow(bucket_2).to receive(:exists?).and_return(true)
+          end
 
           it 'clears the bucket' do
-            expect(bucket).to receive(:clear!)
+            expect(bucket_1).to receive(:clear!)
+            expect(bucket_2).to receive(:clear!)
             ami_manager.clean_environment
           end
         end
 
-        context 'and the bucket does not exist' do
-          before { allow(bucket).to receive(:exists?).and_return(false) }
+        context 'and only one bucket exists' do
+          before do
+            allow(bucket_1).to receive(:exists?).and_return(false)
+            allow(bucket_2).to receive(:exists?).and_return(true)
+          end
 
-          it 'fails silently' do
-            expect(bucket).not_to receive(:clear!)
+          it 'clears the bucket' do
+            expect(bucket_1).not_to receive(:clear!)
+            expect(bucket_2).to receive(:clear!)
+            ami_manager.clean_environment
+          end
+        end
+
+        context 'and neither bucket exists' do
+          before do
+            allow(bucket_1).to receive(:exists?).and_return(false)
+            allow(bucket_2).to receive(:exists?).and_return(false)
+          end
+
+          it 'clears the bucket' do
+            expect(bucket_1).not_to receive(:clear!)
+            expect(bucket_2).not_to receive(:clear!)
             ami_manager.clean_environment
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.