dynamo-autoscale 0.3.6 → 0.4.1

data/.gitignore

@@ -1,3 +1,4 @@
 config/dynamo-autoscale.yml
 data/
 pkg/
+coverage/

data/Gemfile

@@ -11,4 +11,5 @@ end
 
 group :test do
   gem 'rspec'
+  gem 'simplecov'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dynamo-autoscale (0.3.6)
+    dynamo-autoscale (0.4.1)
       activesupport
       aws-sdk
       colored
@@ -12,28 +12,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.0)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     atomic (1.1.14)
-    aws-sdk (1.18.0)
+    aws-sdk (1.19.0)
       json (~> 1.4)
-      nokogiri (< 1.6.0)
+      nokogiri (>= 1.4.4, < 1.6.0)
       uuidtools (~> 2.1)
     bond (0.4.3)
     coderay (1.0.9)
     colored (1.2)
     diff-lcs (1.2.4)
-    i18n (0.6.5)
-    json (1.8.0)
+    i18n (0.6.9)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.1)
-    mime-types (1.23)
+    mime-types (1.25)
     minitest (4.7.5)
     multi_json (1.8.0)
     nokogiri (1.5.10)
@@ -57,6 +57,10 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
     ruby-prof (0.13.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     slop (3.4.5)
     thread_safe (0.1.3)
       atomic
@@ -64,7 +68,7 @@ GEM
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     uuidtools (2.1.4)
 
 PLATFORMS
@@ -76,4 +80,5 @@ DEPENDENCIES
   rake
   ripl
   rspec
+  simplecov
   timecop

data/README.md

@@ -78,7 +78,11 @@ tables only.
 :aws:
   :access_key_id:      "your_id"
   :secret_access_key:  "your_key"
-  :dynamo_db_endpoint: "dynamodb.us-east-1.amazonaws.com"
+
+  # Currently, dynamo-autoscale can only operate in one region at a time. If you
+  # want to track tables in multiple regions, you will have to run multiple
+  # instances of dynamo-autoscale.
+  :region:             "us-east-1"
 
 # There are some example rulesets in the rulesets/ directory of this project.
 :ruleset: "path_to_your_ruleset.rb"

data/bin/dynamo-autoscale

@@ -2,6 +2,8 @@
 
 require 'optparse'
 
+USAGE_PATH = File.join(File.dirname(__FILE__), '..', 'USAGE')
+
 # This OptionParser block is here to ensure the queries to --version are
 # actually fast and don't have to go through all of the Ruby requiring lark.
 begin
@@ -13,55 +15,64 @@ begin
     end
 
     opts.on('--help', 'Shows this documentation.') do
-      puts File.read(File.join(File.dirname(__FILE__), '..', 'USAGE'))
+      puts File.read(USAGE_PATH)
       exit 0
     end
   end.parse!
 rescue OptionParser::InvalidOption => e
-  STDERR.puts e.message
-  STDERR.puts
-
-  STDERR.puts File.read(File.join(File.dirname(__FILE__), '..', 'USAGE'))
+  STDERR.puts("#{e.message}\n\n#{File.read(USAGE_PATH)}")
   exit 1
 end
 
-require_relative '../config/environment/common'
+begin
+  require_relative '../config/environment/common'
+rescue DynamoAutoscale::Error::InvalidConfigurationError => e
+  STDERR.puts e.message
+  exit 1
+end
 
+# Typing out DynamoAutoscale so many times is tedious.
+DA = DynamoAutoscale
 
 if ARGV[0]
-  DynamoAutoscale.setup_from_config(ARGV[0])
+  begin
+    DA.setup_from_config(ARGV[0])
+  rescue DA::Error::InvalidConfigurationError => e
+    STDERR.puts e.message
+    exit 1
+  end
 elsif ARGV[0].nil?
-  STDERR.puts File.read(File.join(File.dirname(__FILE__), '..', 'USAGE'))
+  STDERR.puts File.read(USAGE_PATH)
 
   exit 1
 elsif ARGV[0] and !File.exists?(ARGV[0])
   STDERR.puts "Error: The path you specified is to a file that does not exist."
   STDERR.puts
-  STDERR.puts File.read(File.join(File.dirname(__FILE__), '..', 'USAGE'))
+  STDERR.puts File.read(USAGE_PATH)
 
   exit 1
 end
 
-DynamoAutoscale.logger.info "Ensuring tables exist in DynamoDB..."
+DA.logger.info "Ensuring tables exist in DynamoDB..."
 dynamo = AWS::DynamoDB.new
 
-DynamoAutoscale.poller_opts[:tables].select! do |table_name|
+DA.poller_opts[:tables].select! do |table_name|
   if dynamo.tables[table_name].exists?
     true
   else
-    DynamoAutoscale.logger.error "Table #{table_name} does not exist inside your DynamoDB."
+    DA.logger.error "Table #{table_name} does not exist inside your DynamoDB."
     false
   end
 end
 
-DynamoAutoscale.poller_class = DynamoAutoscale::CWPoller
+DA.poller_class = DA::CWPoller
 
-unless DynamoAutoscale.config[:dry_run]
-  DynamoAutoscale.actioner_class = DynamoAutoscale::DynamoActioner
+unless DA.config[:dry_run]
+  DA.actioner_class = DA::DynamoActioner
 end
 
-DynamoAutoscale.logger.info "Finished setup. Backdating..."
-DynamoAutoscale.poller.backdate
+DA.logger.info "Finished setup. Backdating..."
+DA.poller.backdate
 
-DynamoAutoscale.logger.info "Starting polling loop..."
-DynamoAutoscale.poller.run
+DA.logger.info "Starting polling loop..."
+DA.poller.run

data/config/environment/common.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'optparse'
 require 'fileutils'
 require 'time'
 require 'csv'
@@ -18,14 +19,32 @@ require_relative '../../lib/dynamo-autoscale/actioner'
 module DynamoAutoscale
   include DynamoAutoscale::Logger
 
-  DEFAULT_AWS_REGION = 'us-east-1'
+  module Error
+    InvalidConfigurationError = Class.new(StandardError)
+  end
 
   def self.root
-    File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+    @@root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+  end
+
+  def self.root_dir *args
+    File.join(self.root, *args)
+  end
+
+  def self.data_dir *args
+    root_dir 'data', *args
+  end
+
+  def self.config_dir *args
+    root_dir 'config', *args
   end
 
-  def self.data_dir
-    File.join(self.root, 'data')
+  def self.rlib_dir *args
+    root_dir 'rlib', *args
+  end
+
+  def self.template_dir *args
+    root_dir 'templates', *args
   end
 
   def self.config
@@ -36,18 +55,29 @@ module DynamoAutoscale
     @@config = new_config
   end
 
+  def self.require_in_order *files
+    expand_paths(*files).each { |path| require path }
+  end
+
+  def self.load_in_order *files
+    expand_paths(*files).each { |path| load path }
+  end
+
   def self.setup_from_config path, overrides = {}
     logger.debug "[setup] Loading config..."
     self.config = YAML.load_file(path).merge(overrides)
 
     if config[:tables].nil? or config[:tables].empty?
-      STDERR.puts "You need to specify at least one table in your config's " +
-        ":tables section."
-
-      exit 1
+      raise Error::InvalidConfigurationError.new("You need to specify at " +
+        "least one table in your config's :tables section.")
     end
 
-    filters = config[:dry_run] ? DynamoAutoscale::LocalActioner.faux_provisioning_filters : []
+    filters = if config[:dry_run]
+                DynamoAutoscale::LocalActioner.faux_provisioning_filters
+              else
+                []
+              end
+
     if filters.empty?
       logger.debug "[setup] Not running as a dry run. Hitting production Dynamo."
     else
@@ -89,14 +119,11 @@ module DynamoAutoscale
     DynamoAutoscale.load_services
   end
 
-  def self.require_all path
-    Dir[File.join(root, path, '*.rb')].each { |file| require file }
-  end
-
   def self.load_services
-    Dir[File.join(DynamoAutoscale.root, 'config', 'services', '*.rb')].each do |path|
-      load path
-    end
+    load_in_order(
+      'config/services/logger.rb',
+      'config/services/*.rb'
+    )
   end
 
   def self.dispatcher= new_dispatcher
@@ -153,6 +180,10 @@ module DynamoAutoscale
     end
   end
 
+  def self.actioners= new_actioners
+    @@actioners = new_actioners
+  end
+
   def self.reset_tables
     @@tables = Hash.new { |h, k| h[k] = TableTracker.new(k) }
   end
@@ -180,9 +211,33 @@ module DynamoAutoscale
   def self.current_table
     @@current_table ||= nil
   end
+
+  private
+
+  # Expands strings given to it as paths relative to the project root
+  def self.expand_paths *files
+    files.inject([]) do |memo, path|
+      full_path = root_dir(path)
+
+      if (paths = Dir.glob(full_path)).length > 0
+        memo += paths.select { |p| File.file?(p) }
+      elsif File.exist?("#{full_path}.rb")
+        memo << "#{full_path}.rb"
+      elsif File.exist?(full_path)
+        memo << full_path
+      else
+        logger.warn "[load] Could not load file #{full_path}"
+        STDERR.puts Kernel.caller
+        exit 1
+      end
+
+      memo
+    end
+  end
 end
 
-DynamoAutoscale.require_all 'lib/dynamo-autoscale'
-DynamoAutoscale.require_all 'lib/dynamo-autoscale/ext/**'
+DynamoAutoscale.require_in_order(
+  'lib/dynamo-autoscale/**.rb',
+)
 
 DynamoAutoscale.load_services

data/config/environment/test.rb

@@ -1,6 +1,29 @@
 ENV['RACK_ENV'] = "test"
+
+# SimpleCov seems to get confused when you load a file into your code multiple
+# times. It will wipe all of its current data about that file when it gets
+# reloaded, so some of our coverage stats are less than they should be.
+require 'simplecov'
+SimpleCov.start
+
 require_relative 'common'
 require 'timecop'
 
-path = File.join(DynamoAutoscale.root, 'config', 'dynamo-autoscale-test.yml')
-DynamoAutoscale.setup_from_config(path)
+TEST_CONFIG_PATH = DynamoAutoscale.config_dir('dynamo-autoscale-test.yml')
+DynamoAutoscale.setup_from_config(TEST_CONFIG_PATH)
+
+DynamoAutoscale.require_in_order(
+  'spec/helpers/**.rb'
+)
+
+RSpec.configure do |config|
+  config.include DynamoAutoscale::Helpers::LoggerHelper
+  config.include DynamoAutoscale::Helpers::EnvironmentHelper
+
+  config.before(:each) do
+    DynamoAutoscale.reset_tables
+    DynamoAutoscale.dispatcher = nil
+    DynamoAutoscale.actioners  = nil
+    DynamoAutoscale.poller     = nil
+  end
+end

data/config/services/aws.rb

@@ -1,3 +1,19 @@
-if DynamoAutoscale.config[:aws]
-  AWS.config(DynamoAutoscale.config[:aws])
+if config = DynamoAutoscale.config[:aws]
+  valid_regions = [
+    "us-east-1", "us-west-1", "us-west-2", "eu-west-1", "ap-southeast-1",
+    "ap-southeast-2", "ap-northeast-1", "sa-east-1",
+  ]
+
+  unless config[:region]
+    raise DynamoAutoscale::Error::InvalidConfigurationError.new("You must " +
+      "specify a :region key in the :aws section of your dynamo-autoscale " +
+      "configuration file!")
+  end
+
+  unless valid_regions.include?(config[:region])
+    DynamoAutoscale::Logger.logger.warn "Specified region \"#{config[:region]}\"" +
+      " does not appear in the valid list of regions. Proceed with caution."
+  end
+
+  AWS.config(config)
 end

data/config/services/logger.rb

@@ -1,31 +1,30 @@
-config = DynamoAutoscale.config[:logger] || {}
+if config = DynamoAutoscale.config[:logger]
+  if config[:sync]
+    STDOUT.sync = true
+    STDERR.sync = true
+  end
 
-if config[:sync]
-  STDOUT.sync = true
-  STDERR.sync = true
-end
+  if config[:log_to]
+    STDOUT.reopen(config[:log_to])
+    STDERR.reopen(config[:log_to])
+  end
 
-if config[:log_to]
-  STDOUT.reopen(config[:log_to])
-  STDERR.reopen(config[:log_to])
-end
+  DynamoAutoscale::Logger.logger = ::Logger.new(STDOUT)
 
-DynamoAutoscale::Logger.logger = ::Logger.new(STDOUT)
+  if config[:style] == "pretty"
+    DynamoAutoscale::Logger.logger.formatter = DynamoAutoscale::PrettyFormatter.new
+  else
+    DynamoAutoscale::Logger.logger.formatter = DynamoAutoscale::StandardFormatter.new
+  end
 
-if config[:style] == "pretty"
-  DynamoAutoscale::Logger.logger.formatter = DynamoAutoscale::PrettyFormatter.new
-else
-  DynamoAutoscale::Logger.logger.formatter = DynamoAutoscale::StandardFormatter.new
+  if config[:level]
+    DynamoAutoscale::Logger.logger.level = ::Logger.const_get(config[:level])
+  end
 end
 
 if ENV['DEBUG']
   DynamoAutoscale::Logger.logger.level = ::Logger::DEBUG
-elsif config[:level]
-  DynamoAutoscale::Logger.logger.level = ::Logger.const_get(config[:level])
-end
-
-if ENV['SILENT']
+  AWS.config(logger: DynamoAutoscale::Logger.logger)
+elsif ENV['SILENT']
   DynamoAutoscale::Logger.logger.level = ::Logger::FATAL
 end
-
-AWS.config(logger: DynamoAutoscale::Logger.logger) if ENV['DEBUG']

data/lib/dynamo-autoscale/actioner.rb

@@ -76,6 +76,7 @@ module DynamoAutoscale
 
     def downscales new_val = nil
       check_day_reset!
+      @downscales = new_val if new_val
       @downscales
     end
 

data/lib/dynamo-autoscale/dynamo_actioner.rb

@@ -86,13 +86,14 @@ module DynamoAutoscale
       aws_description = self.class.describe_table(table)
       decreases_today = aws_description[:provisioned_throughput][:number_of_decreases_today]
 
-      downscales(table, decreases_today)
+      downscales(decreases_today)
       logger.warn "[#{e.class}] #{e.message}"
       return false
     end
 
     def self.describe_table table
-      data = AWS::DynamoDB::ClientV2.new.describe_table(table_name: table.name)
+      client = AWS::DynamoDB::Client.new(:api_version => '2012-08-10')
+      data   = client.describe_table(table_name: table.name)
 
       data[:table]
     end