rds-rotate-db-snapshots 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTU5MzFjZjk0ZWYzYzQ3YzAzYmVmYzk1OGY0MDAzM2E3YjA5MmZhZg==
-  data.tar.gz: !binary |-
-    OGZmNTJiNGJmMTNiOWM4OGRmMTkwNjkzNjg2ZWJlNDZlYjdhZGU0NA==
+SHA256:
+  metadata.gz: 89f6c03c428ea666793c1a5b1f8c73f9667466db382e4f69358aff1dee3026a1
+  data.tar.gz: 1a2ef773c19beeaefe8f393d26e97c4e1eb022288268f8881280978ad2ada7d6
 SHA512:
-  metadata.gz: !binary |-
-    NTg4MzgxZDcxODY2MTgxOGJhZmU5ZDU4YjJlMzg2NDJkNTIyNGY1MjJjZjUy
-    OTE5OTIzMDU1YzhjMWYzMWZkN2ZiNjM3OWEwNWEwYWNkNGY4YjZmMDFhZDVi
-    YzkzYTZjMDE0NjVjN2RiOTJmMWM2OGQ4ZjcxZDFmYTJkMmZjY2M=
-  data.tar.gz: !binary |-
-    YzgzZWRiMjA0OTM0OTdiNTAzNmJhMDIyNDJkMzQzMWQ2YzM5MDk4YWMwZmVm
-    OTk2MTA5OTVkNDQ0ZDQxZWExYmJiOTZkNDZlNGI3MjUzOWUyMzU3OWMxOWIz
-    ZTJkNGZkY2IxZmE4ZjRjM2FiZmRjY2VhMzc1ZWIwZWIxZTk5ZDE=
+  metadata.gz: 860abf62c29df38f7028c6466992af8c150217b9f0b5502343c895cb8620857ff8871795cccc3120d5ea226220dc897b8607652cf5f20c972e15306a1d25ecc3
+  data.tar.gz: c2d7fde7e855cbbc9fbd45edf7f935cfa4d310c6677ab9b0171b48840690ecee6ccca3af753c81fbae93ca425ef3d2df611c1323e953da14fd5bc57b835087d7

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'aws-sdk', '>= 1.51.0', '< 2.0'
+gem 'aws-sdk-rds', '~> 1'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -10,7 +10,7 @@ group :development, :test do
 end
 
 group :development do
-  gem 'jeweler'
+  gem 'juwelier'
 end
 
 group :test do

data/Rakefile

@@ -9,9 +9,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   gem.name = "rds-rotate-db-snapshots"
   gem.homepage = "http://github.com/serg-kovalev/rds-rotate-db-snapshots"
   gem.license = "MIT"
@@ -19,8 +18,9 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Provides a simple way to rotate RDS DB snapshots with configurable retention periods.}
   gem.email = "kovserg@gmail.com"
   gem.authors = ["Siarhei Kavaliou"]
+  gem.version = File.exist?('VERSION') ? File.read('VERSION') : ""
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -28,7 +28,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'simplecov'
+# require 'simplecov'
 # Rcov::RcovTask.new do |test|
 #   test.libs << 'test'
 #   test.pattern = 'test/**/test_*.rb'

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/bin/rds-rotate-db-snapshots

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'aws-sdk'
+require 'aws-sdk-rds'
 require 'optparse'
 
 $opts = {
   :aws_access_key => ENV["AWS_ACCESS_KEY_ID"],
   :aws_secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"],
+  :aws_session_token => ENV["AWS_SESSION_TOKEN"],
   :aws_region => ENV["AWS_REGION"],
   :pattern => nil,
   :by_tags => nil,
@@ -38,24 +39,24 @@ end
 def rotate_em(snapshots)
   # poor man's way to get a deep copy of our time_periods definition hash
   periods = Marshal.load(Marshal.dump($time_periods))
-  
+
   snapshots.each do |snapshot|
     time = snapshot[:snapshot_create_time]
     db_id = snapshot[:db_instance_identifier]
     snapshot_id = snapshot[:db_snapshot_identifier]
     description = snapshot_id
     keep_reason = nil
-    
+
     if $opts[:pattern] && description !~ /#{$opts[:pattern]}/
       puts "  #{time.strftime '%Y-%m-%d %H:%M:%S'} #{snapshot_id} Skipping snapshot with description #{description}"
       next
     end
-    
+
     periods.keys.sort { |a, b| periods[a][:seconds] <=> periods[b][:seconds] }.each do |period|
       period_info = periods[period]
       keep = period_info[:keep]
       keeping = period_info[:keeping]
-      
+
       time_string = time.strftime period_info[:format]
       if Time.now - time < keep * period_info[:seconds]
         if !keeping.key?(time_string) && keeping.length < keep
@@ -65,18 +66,18 @@ def rotate_em(snapshots)
         break
       end
     end
-    
+
     if keep_reason.nil? && snapshot == snapshots.last && $opts[:keep_last]
       keep_reason = 'last snapshot'
     end
-    
+
     if !keep_reason.nil?
       puts "  #{time.strftime '%Y-%m-%d %H:%M:%S'} #{snapshot_id} Keeping for #{keep_reason}"
     else
       puts "  #{time.strftime '%Y-%m-%d %H:%M:%S'} #{snapshot_id} Deleting"
       begin
         $rds.delete_db_snapshot(db_snapshot_identifier: snapshot_id) unless $opts[:dry_run]
-      rescue AWS::RDS::Errors => e
+      rescue Aws::RDS::Errors => e
         backoff()
         retry
       end
@@ -93,7 +94,7 @@ def create_snapshot(name, db_indentifier_ids)
         begin
           $rds.create_db_snapshot(db_snapshot_identifier: name, db_instance_identifier: db_id) unless $opts[:dry_run]
           puts "  #{Time.now.strftime '%Y-%m-%d %H:%M:%S'} Creation snapshot #{name} is pending (db: #{db_id})"
-        rescue AWS::RDS::Errors::InvalidDBInstanceState => e
+        rescue Aws::RDS::Errors::InvalidDBInstanceStateFault => e
           backoff()
           retry
         end
@@ -116,6 +117,18 @@ def split_tag(hash,v)
     end
 end
 
+def get_db_snapshots(options)
+  snapshots = []
+  response = $rds.describe_db_snapshots(options)
+  while true do
+    snapshots += response.db_snapshots
+    break unless response[:marker]
+
+    response = $rds.describe_db_snapshots(options.merge(marker: response[:marker]))
+  end
+  snapshots
+end
+
 OptionParser.new do |o|
   script_name = File.basename($0)
   o.banner = "Usage: #{script_name} [options] <db_indentifier>\nUsage: #{script_name} --by-tags <tag=value,...> [other options]"
@@ -133,6 +146,10 @@ OptionParser.new do |o|
     $opts[:aws_region] = v
   end
 
+  o.on("--aws-session-token SESSION_TOKEN", "AWS session token") do |v|
+    $opts[:aws_session_token] = v
+  end
+
   o.on("--pattern STRING", "Snapshots without this string in the description will be ignored") do |v|
     $opts[:pattern] = v
   end
@@ -204,9 +221,14 @@ end
 
 $backoffed = 0
 begin
-  AWS.config(access_key_id: $opts[:aws_access_key], secret_access_key: $opts[:aws_secret_access_key], region: $opts[:aws_region])
-  $rds = AWS.rds.client
-rescue AWS::RDS::Errors => e
+  Aws.config.update(
+    access_key_id: $opts[:aws_access_key],
+    secret_access_key: $opts[:aws_secret_access_key],
+    region: $opts[:aws_region],
+    session_token: $opts[:aws_session_token]
+  )
+  $rds = Aws::RDS::Client.new
+rescue Aws::RDS::Errors => e
   backoff()
   retry
 end
@@ -221,7 +243,7 @@ if $opts[:by_tags]
     begin
       these_snapshots = $rds.describe_tags(snapshot_type: 'manual', filters: {'resource-type'=>"snapshot", 'key'=>tag, 'value'=>value}).
         delete_if{ |e| e.status != 'available' }
-    rescue AWS::RDS::Errors => e
+    rescue Aws::RDS::Errors => e
       backoff()
       retry
     end
@@ -242,10 +264,10 @@ if $opts[:by_tags]
   end
 
   begin
-    rotate_these = $rds.describe_db_snapshots(db_instance_identifier: all_snapshots.map(&:db_instance_identifier).uniq).
-      db_snapshots.delete_if{ |e| !all_snapshots.include?(e.db_snapshot_identifier) }.
+    rotate_these = get_db_snapshots(db_instance_identifier: all_snapshots.map(&:db_instance_identifier).uniq).
+      delete_if{ |e| !all_snapshots.include?(e.db_snapshot_identifier) }.
       sort {|a,b| a[:snapshot_create_time] <=> b[:snapshot_create_time] }
-  rescue AWS::RDS::Errors => e
+  rescue Aws::RDS::Errors => e
     backoff()
     retry
   end
@@ -253,9 +275,9 @@ if $opts[:by_tags]
   rotate_em(rotate_these)
 else
   begin
-    all_snapshots = $rds.describe_db_snapshots(snapshot_type: 'manual').db_snapshots.
-      delete_if{ |e| e.status != 'available' }
-  rescue AWS::RDS::Errors => e
+    all_snapshots = get_db_snapshots(snapshot_type: 'manual').
+      delete_if{ |e| e[:status] != 'available' }
+  rescue Aws::RDS::Errors => e
     backoff()
     retry
   end

data/lib/.empty

@@ -1 +1 @@
-Jeweler doesn't like me not having a lib/ directory.
+Juwelier doesn't like me not having a lib/ directory.

data/rds-rotate-db-snapshots.gemspec

@@ -1,20 +1,20 @@
-# Generated by jeweler
+# Generated by juwelier
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rds-rotate-db-snapshots 0.3.1 ruby lib
+# stub: rds-rotate-db-snapshots 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "rds-rotate-db-snapshots"
-  s.version = "0.3.1"
+  s.name = "rds-rotate-db-snapshots".freeze
+  s.version = "0.4.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Siarhei Kavaliou"]
-  s.date = "2015-07-30"
-  s.description = "Provides a simple way to rotate RDS DB snapshots with configurable retention periods."
-  s.email = "kovserg@gmail.com"
-  s.executables = ["rds-rotate-db-snapshots"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Siarhei Kavaliou".freeze]
+  s.date = "2022-12-24"
+  s.description = "Provides a simple way to rotate RDS DB snapshots with configurable retention periods.".freeze
+  s.email = "kovserg@gmail.com".freeze
+  s.executables = ["rds-rotate-db-snapshots".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -33,30 +33,25 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_rds-rotate-db-snapshots.rb"
   ]
-  s.homepage = "http://github.com/serg-kovalev/rds-rotate-db-snapshots"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "Amazon RDS DB snapshot rotator"
+  s.homepage = "http://github.com/serg-kovalev/rds-rotate-db-snapshots".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.3.7".freeze
+  s.summary = "Amazon RDS DB snapshot rotator".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<aws-sdk>, ["< 2.0", ">= 1.51.0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<aws-sdk>, ["< 2.0", ">= 1.51.0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<aws-sdk-rds>.freeze, ["~> 1"])
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<aws-sdk>, ["< 2.0", ">= 1.51.0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<aws-sdk-rds>.freeze, ["~> 1"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 0"])
   end
 end
 

metadata

@@ -1,75 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rds-rotate-db-snapshots
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Siarhei Kavaliou
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2022-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-rds
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.51.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.51.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: juwelier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides a simple way to rotate RDS DB snapshots with configurable retention
@@ -82,8 +76,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .travis.yml
+- ".document"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -98,24 +92,23 @@ homepage: http://github.com/serg-kovalev/rds-rotate-db-snapshots
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Amazon RDS DB snapshot rotator
 test_files: []