rdstune 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83bde836e4413eeea8e3885fc07c908125e96226
-  data.tar.gz: 741dffc42a9a8e332d595dbe393a38642a75d2fc
+  metadata.gz: 9b304bd65c257d28fe26645a22f45af55266b6b5
+  data.tar.gz: 1e828da1b0e0a1f664619dba251ce75001c3b43c
 SHA512:
-  metadata.gz: d3dde8892b10db353007b1d54a6af0631fa95e47589388b31fff01d816612fda5c55258d9ac6f345649873ee412e4fb252142aabd76b2edebcceee4684317b2e
-  data.tar.gz: 9949fa00c33055f1accd770e62dc839fc4f2c1167fb52d7309a8870d63e3d2dc4bfd4b7b7a33313c6fd98d63eaf1baae794edb3c37687012849b39ef7e8e77fd
+  metadata.gz: 46f46ddd08ccdbcbaf82eccaf1bd843fecd0235b8a083c35c723340528846064518c9bb8238e46394a160cd8ee8be3df0561791bcb4dbc98f04e161c15085f2e
+  data.tar.gz: 13c519d846d21ecacbb9627b0448689356d594deab4421a84973ad52cf4a5e7085a2ac8b6cbabba9dd0942668a8ecfb55648b05108c951d96831c22fba3b981d

data/bin/rdstune

@@ -5,18 +5,11 @@ require_relative '../lib/rdstune'
 require_relative '../lib/version'
 
 p = Trollop::Parser.new do
-  version "rdstune version: #{VERSION}"
+  version "rdstune version: #{RDSTUNE::VERSION}"
   banner <<-EOS
 
 This gem creates a Parameter Group with sane defaults for your PostgreSQL RDS instances
 
-Make sure you set the following environment variables
-(or their ~/.aws/credentials equivilant)
-
-  export AWS_ACCESS_KEY="AWS_ACCESS_KEY"
-  export AWS_SECRET_KEY="AWS_SECRET_KEY"
-  export AWS_REGION='REGION' # ex: us-west-2
-
 Options:
 EOS
   opt :type, "Type of Database Server (Web/DW/Mixed/Desktop)", :type => :string, :default => 'web'
@@ -24,7 +17,10 @@ EOS
   opt :connections, "Specify the Target Max Connections", :type => :integer
   opt :oversubscribe, "Oversubscribe the number of connections", :type => :integer
   opt :name, "Name of your RDS Parameter Group", :type => :string
-  opt :family, "Database Family (Postgres version)", :type => :string, :default => 'postgres9.3'
+  opt :family, "Database Family (Postgres version)", :type => :string, :default => 'postgres9.4'
+  opt :access_key_id, "Set the AWS Access Key for the account (default: $AWS_ACCESS_KEY_ID)", :type => :string, :default => ENV['AWS_ACCESS_KEY_ID']
+  opt :secret_access_key, "Set the AWS Secret Key for the account (default: $AWS_SECRET_ACCESS_KEY)", :type => :string, :default => ENV['AWS_SECRET_ACCESS_KEY']
+  opt :region, "Specify the AWS Region for the account (default: $AWS_REGION)", :type => :string, :default => ENV['AWS_REGION']
   opt :version, "Show the current version of rdstune"
 end
 
@@ -38,8 +34,12 @@ end
 
 name = opts[:name] || "rdstune-#{opts[:type]}-#{opts[:memory]}-#{opts[:connections]}".gsub('.','-')
 options = {}
+aws_credentials = { :access_key_id => opts[:access_key_id],
+                    :secret_access_key => opts[:secret_access_key],
+                    :region => opts[:region] }
 options['connections']   = opts[:connections] if opts[:connections]
 options['oversubscribe'] = opts[:oversubscribe] if opts[:oversubscribe]
-rdstune = RdsTune.new opts[:type], opts[:memory], options
+rdstune = RDSTUNE::RdsTune.new(type: opts[:type], memory: opts[:memory],
+              aws_credentials: aws_credentials, options: options)
 rdstune.create_parameter_group name, opts[:family]
 rdstune.display_config

data/lib/rdstune.rb

@@ -2,104 +2,110 @@ require 'aws-sdk'
 require 'mrtuner'
 
 
-class RdsTune < MrTuner
+module RDSTUNE
+  class RdsTune < MrTuner
 
-  def initialize(type, memory, options={})
-    @rds     = Aws::RDS::Client.new
-    @type    = type
-    @memory  = memory
-    @options = options
-    super(@type, @memory, @options)
-  end
-
-  def create_parameter_group(name = nil, family = nil)
-    abort("Please Specify a Parameter Group Name: #{name} or Family: #{family}") unless name && family
-    group_name   = name
-    group_family = family
-    unless find_parameter_group(group_name)
-      @rds.create_db_parameter_group({
-        :db_parameter_group_name   => group_name,
-        :db_parameter_group_family => group_family,
-        :description               => "Created by RdsTune - #{@type} - #{@memory} - #{Time.now.to_s}"
-      })
+    def initialize(type:, memory:, options: {}, aws_credentials: {}, rds_client: nil)
+      if rds_client
+        @rds   = rds_client
+      else
+        @rds   = Aws::RDS::Client.new(aws_credentials)
+      end
+      @type    = type
+      @memory  = memory
+      @options = options
+      super(@type, @memory, @options)
     end
-    update_parameter_group(group_name)
-  end
 
-  private
-  def update_parameter_group(group_name)
-    begin
-      @rds.modify_db_parameter_group({
-          :db_parameter_group_name => group_name,
-          :parameters              => generate_update(group_name)
+    def create_parameter_group(name = nil, family = nil)
+      abort("Please Specify a Parameter Group Name: #{name} or Family: #{family}") unless name && family
+      group_name   = name
+      group_family = family
+      unless find_parameter_group(group_name)
+        @rds.create_db_parameter_group({
+          :db_parameter_group_name   => group_name,
+          :db_parameter_group_family => group_family,
+          :description               => "Created by RdsTune - #{@type} - #{@memory} - #{Time.now.to_s}"
         })
-        puts "Group #{group_name } created."
-        return group_name
-    rescue Aws::RDS::Errors::InvalidDBParameterGroupState
-      abort("Parameter group not updateable at this time " + Aws::RDS::Errors::InvalidDBParameterGroupState)
+      end
+      update_parameter_group(group_name)
     end
-  end
-
-  def generate_update(group_name)
-    parameters = get_all_parameters(group_name)
-    new_config = get_config
-    out        = Array.new
-    new_config.each do |p, v|
-      parameter  = get_parameter(p.to_s, parameters)
-      low,high = parameter[:allowed_values].split('-')
 
-      # Convert Bytes to Kibibytes for Memory parameters
-      case parameter[:parameter_name]
-      when 'work_mem','maintenance_work_mem'
-        v = v / 1024
-      when 'shared_buffers','effective_cache_size'
-        v = (v / 1024) / 8
+    private
+    def update_parameter_group(group_name)
+      begin
+        @rds.modify_db_parameter_group({
+            :db_parameter_group_name => group_name,
+            :parameters              => generate_update(group_name)
+          })
+          puts "Group #{group_name } created."
+          return group_name
+      rescue Aws::RDS::Errors::InvalidDBParameterGroupState
+        abort("Parameter group not updateable at this time " + Aws::RDS::Errors::InvalidDBParameterGroupState)
       end
+    end
 
-      case parameter[:data_type]
-      when 'float'
-        v = low if v.to_f < low.to_f
-        v = high if v.to_f > high.to_f
-        parameter[:parameter_value] = v.to_f.to_s
-      when 'integer'
-        v = low if v.to_f < low.to_f
-        v = high if v.to_f > high.to_f
-        parameter[:parameter_value] = v.to_i.to_s
-      end
+    def generate_update(group_name)
+      parameters = get_all_parameters(group_name)
+      new_config = get_config
+      out        = Array.new
+      new_config.each do |p, v|
+        parameter  = get_parameter(p.to_s, parameters)
+        low,high = parameter[:allowed_values].split('-')
 
-      if parameter[:apply_type] == 'dynamic'
-        parameter[:apply_method] = 'immediate'
-      else
-        parameter[:apply_method] = 'pending-reboot'
+        # Convert Bytes to Kibibytes for Memory parameters
+        case parameter[:parameter_name]
+        when 'work_mem','maintenance_work_mem'
+          v = v / 1024
+        when 'shared_buffers','effective_cache_size'
+          v = (v / 1024) / 8
+        end
+
+        case parameter[:data_type]
+        when 'float'
+          v = low if v.to_f < low.to_f
+          v = high if v.to_f > high.to_f
+          parameter[:parameter_value] = v.to_f.to_s
+        when 'integer'
+          v = low if v.to_f < low.to_f
+          v = high if v.to_f > high.to_f
+          parameter[:parameter_value] = v.to_i.to_s
+        end
+
+        if parameter[:apply_type] == 'dynamic'
+          parameter[:apply_method] = 'immediate'
+        else
+          parameter[:apply_method] = 'pending-reboot'
+        end
+        out.push(parameter)
       end
-      out.push(parameter)
+      out
     end
-    out
-  end
 
-  def get_all_parameters(group_name)
-    marker = ""
-    parameters = []
-    loop do
-      resp       = @rds.describe_db_parameters( :db_parameter_group_name => group_name, :marker => marker)
-      parameters += resp[:parameters]
-      marker     = resp[:marker]
-      break unless marker
+    def get_all_parameters(group_name)
+      marker = ""
+      parameters = []
+      loop do
+        resp       = @rds.describe_db_parameters( :db_parameter_group_name => group_name, :marker => marker)
+        parameters += resp[:parameters]
+        marker     = resp[:marker]
+        break unless marker
+      end
+      parameters
     end
-    parameters
-  end
 
-  def find_parameter_group(name)
-    begin
-      @rds.describe_db_parameter_groups( { :db_parameter_group_name => name } )
-    rescue Aws::RDS::Errors::DBParameterGroupNotFound
-      nil
+    def find_parameter_group(name)
+      begin
+        @rds.describe_db_parameter_groups( { :db_parameter_group_name => name } )
+      rescue Aws::RDS::Errors::DBParameterGroupNotFound
+        nil
+      end
     end
-  end
 
-  def get_parameter(name, parameters)
-    parameters.select {|parameter| parameter[:parameter_name] == name}.first
-  end
+    def get_parameter(name, parameters)
+      parameters.select {|parameter| parameter[:parameter_name] == name}.first
+    end
 
 
+  end
 end

data/lib/version.rb

@@ -1 +1,3 @@
-VERSION = "0.8.0"
+module RDSTUNE
+  VERSION = "1.0.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdstune
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - David Kerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -74,9 +74,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Creates Tuned RDS Parameter Group for Postgres