cucloud 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c097b02b7b8ee93f6adb3be2c80ea3e859b767
-  data.tar.gz: 7e35d979d839416122e5b42a7805de6481afb2f5
+  metadata.gz: 77d0bd47f92d489422494497626323e67ee53c2f
+  data.tar.gz: 1c2955b81fb3954b6fb7413906078b98ff318dfd
 SHA512:
-  metadata.gz: d2be8ee2db184cf7b875764c83ee0fc01820710741fe981ffb73c95d93cb4a42c0f29d4459d8f4a255127df4448de5b8321ad46a8d1fdd142a5522a2cccca49b
-  data.tar.gz: 5d91d37eaa27392c7420458bb97d43caffa9502667701b366606ba6c1431c1582428b6dce2317ecfa5fb5724b5ca3e2d8906b73fd79eda2f33e8a9a69101a4fc
+  metadata.gz: 2ab4ce9d8144dff9d411c7bffb0f2160686fec8e5a58e848763cb0fd4cd55f9850a16176cfb80fb7bdc822cf1026a2c59fe695fbec694423b08fc92cae2abf49
+  data.tar.gz: c9bea429650b6dc9f8934939fdceeb983f4f06d2cedc33846e900640163421d6d74d5efa280b5da1b826095bc7536431139d8e7f0c370489ae94ba665b2a3e79

data/lib/cucloud.rb

@@ -20,6 +20,8 @@ module Cucloud
 
   # This is the default region API calls are made against
   DEFAULT_REGION = 'us-east-1'.freeze
+  # Used in time calculations
+  SECONDS_IN_A_DAY = 86_400
 
   Aws.config = { region: DEFAULT_REGION }
 

data/lib/cucloud/ec2_utils.rb

@@ -5,8 +5,6 @@ module Cucloud
     UBUNTU_PATCH_COMMAND = 'apt-get update; apt-get -y upgrade; reboot'.freeze
     # This is the command sent to amazon linux machines for patching
     AMAZON_PATCH_COMMAND = 'yum update -y; reboot & disown '.freeze
-    # Used in time calculations
-    SECONDS_IN_A_DAY = 86_400
     # Max attemps for a waiter to try
     WAITER_MAX_ATTEMPS = 240
     # Delay between calls used by waiter to check status
@@ -229,7 +227,7 @@ module Cucloud
 
       snapshots = @ec2.describe_snapshots(owner_ids: ['self'], filters: [{ name: 'status', values: ['completed'] }])
       snapshots.snapshots.each do |snapshot|
-        if snapshot.start_time > Time.now - (SECONDS_IN_A_DAY * days)
+        if snapshot.start_time > Time.now - (Cucloud::SECONDS_IN_A_DAY * days)
           volumes_backed_up_recently[snapshot.volume_id.to_s] = true
         end
       end
@@ -246,7 +244,7 @@ module Cucloud
 
       snapshots.snapshots.each do |snapshot|
         if !days_old.nil?
-          snapshot_days_old = (Time.now.to_i - snapshot.start_time.to_i) / SECONDS_IN_A_DAY
+          snapshot_days_old = (Time.now.to_i - snapshot.start_time.to_i) / Cucloud::SECONDS_IN_A_DAY
 
           if snapshot_days_old > days_old
             found_snapshots.push(snapshot.snapshot_id)

data/lib/cucloud/rds_utils.rb

@@ -86,8 +86,9 @@ module Cucloud
       @rds.wait_until(:db_instance_available, db_instance_identifier: db_instance_identifier)
     end
 
-    # Delete a givne db instance
+    # Find the latest snapshot for a given RDS instance
     # @param db_instance_identifier [String] RDS instance identifier
+    # @param snapshot_type [String] One of the following types public, shared, manual or automated
     # @return [String] Most recent snapshot ID for given RDS instance
     def find_latest_snapshot(db_instance_identifier, snapshot_type = 'manual')
       latest_snapshot_time = Time.new(2002)
@@ -170,6 +171,30 @@ module Cucloud
       wait_until_snapshot_available(snap, nil, 10)
     end
 
+    # Find RDS Snapshot older than supplied days
+    # @param options [Hash] User specified search options
+    # @param snapshot_type [String] One of the following types public, shared, manual or automated
+    # @return [String] Most recent snapshot ID for given RDS instance
+    def find_rds_snapshots(options = {}, snapshot_type = 'manual')
+      days_old = options[:days_old]
+      found_snap_shots = []
+
+      snapshots_info = @rds.describe_db_snapshots(snapshot_type: snapshot_type)[:db_snapshots]
+
+      snapshots_info.each do |snapshot_info|
+        next if snapshot_info[:status] != 'available'
+        if !days_old.nil?
+          snapshot_days_old = (Time.now.to_i - snapshot_info[:snapshot_create_time].to_i) / Cucloud::SECONDS_IN_A_DAY
+          if snapshot_days_old > days_old
+            found_snap_shots.push(snapshot_info[:db_snapshot_identifier])
+          end
+        else
+          found_snap_shots.push(snapshot_info[:db_snapshot_identifier])
+        end
+      end
+      found_snap_shots
+    end
+
     private
 
     # Return the given non-negative number as a string, zero-padded to 2 digits.

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.6'
+  VERSION = '0.7.7'
 end

metadata

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