rdstune 1.2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4edf67742bd54a9a386e0b11a73a805837ae822
-  data.tar.gz: 157a3204c4082b6543aa0481b5fa511d05bca54b
+  metadata.gz: 2ac11bb822eb833691837dde44033a06ed68e8cd
+  data.tar.gz: da661b2ba83116d93c866081678bc1f23e53c161
 SHA512:
-  metadata.gz: f2696f3a9dcbe01451029a05778256376ff9d129933ca7aebbbf8759c1f043b0a48752fad50e4ebda1af40cfed02676c9989e2b838b6d910e2286a82e96f8c3a
-  data.tar.gz: 07cb4d939e26b37a1710608455af464f0de726e7424d07e86a7cabddab81e11fc730223d01b6e2e6d4a9b43207c9838f700cd4834d2dadb511f1b990aa1db758
+  metadata.gz: 5f4b503d14c8041a1a6f9be33f903a87c03ba4ccd1fae8aafd0fdf09ec1f86362f1636f9d14980a3ad8f1eb663c8175a182227369b846136950d1ab166d245ee
+  data.tar.gz: 1657ab25b1ea3c35511fb964810a4f54805cd388f08fd09019f8fa7ce1c71386bec6ed4a0d3a400ede77cc5718460eb3b6a5163d773d3f6051c19b9fca6cdb9c

data/bin/rdstune

@@ -13,33 +13,43 @@ This gem creates a Parameter Group with sane defaults for your PostgreSQL RDS in
 Options:
 EOS
   opt :type, "Type of Database Server (Web/DW/Mixed/Desktop)", :type => :string, :default => 'web'
+  opt :instance_type, "Generate values based on an AWS instance type", :type => :string
   opt :memory, "Amount of Memory on the Server (GiB)", :type => :float
   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.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 :access_key_id, "Set the AWS Access Key for the account", :type => :string, :default => ENV['AWS_ACCESS_KEY_ID']
+  opt :secret_access_key, "Set the AWS Secret Key for the account", :type => :string, :default => ENV['AWS_SECRET_ACCESS_KEY']
+  opt :region, "Specify the AWS Region for the account", :type => :string, :default => ENV['AWS_REGION']
+  opt :dry, "Dry Run - Do not Create", :default => false
   opt :version, "Show the current version of rdstune"
 end
 
 opts = Trollop::with_standard_exception_handling p do
   o = p.parse ARGV
-  if o[:memory] == nil or o[:connections] == nil
+  if (o[:memory] == nil or o[:instance_type] == nil) and (o[:connections] == nil)
     raise Trollop::HelpNeeded
   end
   o
 end
 
-name = opts[:name] || "rdstune-#{opts[:type]}-#{opts[:memory]}-#{opts[:connections]}".gsub('.','-')
+if opts[:instance_type]
+  name = opts[:name] || "rdstune-#{opts[:instance_type]}-#{opts[:connections]}".gsub('.','-')
+else
+  name = opts[:name] || "rdstune-#{opts[:type]}-#{opts[:memory]}-#{opts[:connections]}".gsub('.','-')
+end
+
 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::RdsTune.new(type: opts[:type], memory: opts[:memory],
-              aws_credentials: aws_credentials, options: options)
-rdstune.create_parameter_group name, opts[:family]
+
+rdstune = RDSTUNE::RdsTune.new(instance_type: opts[:instance_type], type: opts[:type],
+                               memory: opts[:memory],aws_credentials: aws_credentials,
+                               options: options)
+
+rdstune.create_parameter_group(name: name, family: opts[:family]) unless opts[:dry]
 rdstune.display_config

data/lib/ec2info.rb

@@ -0,0 +1,20 @@
+require 'net/http'
+require 'json'
+
+module RDSTUNE
+  class Ec2Info
+    def initialize(instance_type)
+      @instance_type = instance_type
+      @ec2info = JSON.parse(Net::HTTP.get(URI('http://www.ec2instances.info/instances.json')))
+    end
+
+    def show()
+      puts get()
+    end
+
+    def get_memory()
+      m = @ec2info.select {|instances| instances['instance_type'] == @instance_type}
+      m.first["memory"]
+    end
+  end
+end

data/lib/rdstune.rb

@@ -1,18 +1,26 @@
 require 'aws-sdk'
 require 'mrtuner'
+require_relative 'ec2info'
 
 
 module RDSTUNE
   class RdsTune < MrTuner
 
-    def initialize(type: nil, memory: nil, options: {}, aws_credentials: {}, rds_client: nil)
+    def initialize(instance_type: nil, type: nil, memory: nil, options: {}, aws_credentials: {}, rds_client: nil)
       if rds_client
         @rds   = rds_client
       else
         @rds   = Aws::RDS::Client.new(aws_credentials)
       end
+
+      if instance_type then
+        @ec2info = Ec2Info.new(instance_type)
+        @memory  = @ec2info.get_memory
+      else
+        @memory  = memory
+      end
+
       @type    = type
-      @memory  = memory
       @options = options
       super(@type, @memory, @options)
     end
@@ -22,10 +30,11 @@ module RDSTUNE
       group_name   = name
       group_family = family
       unless find_parameter_group(group_name)
+        description = "Created by RdsTune - #{@type} - #{@memory} - #{Time.now.to_s}"
         @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}"
+          :description               => description
         })
       end
       update_parameter_group(group_name)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RDSTUNE
-  VERSION = "1.2.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdstune
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.1
 platform: ruby
 authors:
 - David Kerr
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - bin/rdstune
 - contributors.txt
+- lib/ec2info.rb
 - lib/rdstune.rb
 - lib/version.rb
 - license.txt