automan 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31338e1bb603317a14baafac5806d0b35c96d8f3
-  data.tar.gz: 8c607dd86439e82816f15cd796b40e30d98e7200
+  metadata.gz: 95870592a6aa8d47bc163f61c50bf6db1f1de950
+  data.tar.gz: dfd047c6e6a07e96e4759b0ed4c7f6b9576189c3
 SHA512:
-  metadata.gz: d8b7af2e22147d25b7949b4d2add78f20036d2934a6af988a49a620a22c8da09b01b981a943413e504abf68cff9524c65a181b0859ca17ed6bd045c95db772fd
-  data.tar.gz: b2fd5b1272d04be6f8715d4b3eed8d30620bc11a77a85a726bd2941d2668559f9a3d9223be6fb6d788f1f48c4705fcc525d77f86bc8c01a8ad6309b22bc78761
+  metadata.gz: efceb65bcafb470813c983a73e84a8c597b20c5b79da6a0d816a0eed515effd671bcd0f78a3765f32804afcbca59ceeb783e8bbdd5f653b81d2417445afe36b7
+  data.tar.gz: 15ba5b7b1ffd022f8c0e26763177ca439bdf9ca1a269f524112bb50bb725bd5fb4160cc73de742aecc4e69860473a50a4acbc312582279ba1ec3cb5dc589e83f

data/lib/automan/rds/snapshot.rb

@@ -93,8 +93,8 @@ module Automan::RDS
       snap = db.create_snapshot(myname)
 
       if prune == true
-        logger.info "Setting snapshot to be prunable"
-        set_prunable(snap)
+        logger.info "Setting snapshot to be prunable and tagging environment"
+        set_prunable_and_env(snap,environment)
       end
 
       if wait_for_completion == true
@@ -145,10 +145,10 @@ module Automan::RDS
     end
 
     # tag with CanPrune
-    def set_prunable(snapshot)
+    def set_prunable_and_env(snapshot,environment)
       opts = {
         resource_name: snapshot_arn(snapshot),
-        tags: [ {key: 'CanPrune', value: 'yes'} ]
+        tags: [ {key: 'CanPrune', value: 'yes'}, {key: 'Environment', value: environment} ]
       }
       response = rds.client.add_tags_to_resource opts
 
@@ -185,6 +185,15 @@ module Automan::RDS
       tagged_can_prune?(snapshot) && available?(snapshot) && manual?(snapshot)
     end
 
+    def is_env?(snapshot,environment)
+      tagged_env?(snapshot,environment) && available?(snapshot) && manual?(snapshot)
+    end
+
+    def tagged_env?(snapshot,environment)
+      arn = snapshot_arn(snapshot)
+      tags(arn)['Environment']  == environment
+    end
+
     def tagged_can_prune?(snapshot)
       arn = snapshot_arn(snapshot)
       tags(arn)['CanPrune']  == 'yes'
@@ -235,9 +244,18 @@ module Automan::RDS
 
     def latest
       log_options
-      db = find_db
-      logger.info "Finding most recent snapshot for #{db.id}"
-      s = db.snapshots.sort_by {|i| i.created_at }.last
+      logger.info "Finding most recent snapshot for #{environment}"
+
+      allsnaps=get_all_snapshots
+
+      envsnaps=[]
+      allsnaps.each do |onesnap|
+        if is_env?(onesnap,environment)
+          envsnaps.push(onesnap)
+        end
+      end
+
+      s=envsnaps.sort_by {|i| i.created_at }.last
       logger.info "Most recent snapshot is #{s.id}"
       s.id
     end

data/lib/automan/version.rb

@@ -1,3 +1,3 @@
 module Automan
-  VERSION = "2.2.6"
+  VERSION = "2.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automan
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Chris Chalfant