cucloud 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0ec7bb76b35852525278900952ba8a595085bcf
-  data.tar.gz: 885960dcb92af67a402bfbcccc8ae32eb77f3a20
+  metadata.gz: 34988a759221260aa910c03f3063f5dc833f5422
+  data.tar.gz: b002d383d5a5766231643a6d9ec214e0c376396c
 SHA512:
-  metadata.gz: 02e22a020ab6c0541e3b28c2063585284e24260f423eb0d620f1384d4c28f8e736418f256c14c39337278ce77773a1b07f5aa18fd642dac4e5717037124cb08d
-  data.tar.gz: dbc7c489fc8f3792c6a345ffb87c8297635f6fd9ba4a6d13fc5ab083e1baab3409366f62ba6ebed58d7f14ea31cb80d0d43c7b57d5f24b58e93fbd7591823ef5
+  metadata.gz: 359e34085a6474d24686dc2874ac878cea7856be6549afe3d542b35aeb7a8108ecdb2cd5d335f52ef8efbd945385ae1f601e36bd9cb49aa0030c4a2578ab88d9
+  data.tar.gz: 9a9d44ee28bfe4572f0351afe87aea8f2868f013386e6832ec9e454a110ba1b0b84548ecc7235aa533d33ed24a4b38bd9a660dca899ce1df89f032bae539e506

data/lib/cucloud/ec2_utils.rb

@@ -179,10 +179,14 @@ module Cucloud
       snapshot_info
     end
 
-    # Preforms a backup on volumes that do not have a recent snapshot_info
+    # Performs a backup on volumes that do not have a recent snapshot_info
+    # Tags specified in additional_snapshot_tags[] will take precedence over tags we would
+    #    normally create or would have copied from the volume via preserve_tags[].
     # @param days [Integer] defaults to 5
+    # @param preserve_volume_tags [Array] Array of tag keys to copy from from volume, if present.
+    # @param additional_snapshot_tags [Array] Array of hashes containing additional tags to apply,
     # @return [Array<Hash>]  An array of hashes containing snapshot_id, instance_name and volume
-    def backup_volumes_unless_recent_backup(days = 5)
+    def backup_volumes_unless_recent_backup(days = 5, preserve_volume_tags = [], additional_snapshot_tags = [])
       volumes_backed_up_recently = volumes_with_snapshot_within_last_days(days)
       snapshots_created = []
 
@@ -190,15 +194,24 @@ module Cucloud
       volumes.volumes.each do |volume|
         next if volumes_backed_up_recently[volume.volume_id.to_s]
         instance_name = get_instance_name(volume.attachments[0].instance_id)
+        tags = additional_snapshot_tags.dup
+        unless tags.any? { |tagitem| tagitem[:key] == 'Instance Name' }
+          tags << { key: 'Instance Name', value: instance_name }
+        end
+        volume.tags.each do |tag|
+          if preserve_volume_tags.include?(tag.key) && !tags.any? { |tagitem| tagitem[:key] == tag.key }
+            tags << tag
+          end
+        end
 
-        tags = instance_name ? [{ key: 'Instance Name', value: instance_name }] : []
         snapshot_info = create_ebs_snapshot(volume.volume_id,
                                             'auto-ebs-snap-' + Time.now.strftime('%Y-%m-%d-%H:%M:%S'),
                                             tags)
 
         snapshots_created.push(snapshot_id: snapshot_info.snapshot_id,
                                instance_name: instance_name,
-                               volume: volume.volume_id)
+                               volume: volume.volume_id,
+                               tags: tags)
       end
 
       snapshots_created

data/lib/cucloud/version.rb

@@ -1,5 +1,5 @@
 module Cucloud
   # Disable mutable constant warning - freezing this oddly breaks bundler
   # rubocop:disable Style/MutableConstant
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucloud
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - sbower
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk