resize-aws-instance 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01c74c80dde4104d8b0477a7e4d935c4053b0569
-  data.tar.gz: 5623c4e5b45a2b10c0ef34683deac7387c31ef72
+  metadata.gz: a40b6b7be4e2071da0c6d91360723aa63832abc4
+  data.tar.gz: 5a03414dfee4015f7502188c6700b66928a46526
 SHA512:
-  metadata.gz: 7b8894c543974775de8e3e5cf45b8de43ce8f78777fec9204d6d3c864a6c80360a2ec734f60be641d3e86609c6838b491e569a47a79aca937396a7b1fd78703a
-  data.tar.gz: 78afc917e6ff461343b9e2b27aecbc1608928701c3efff9d6b1904df13fadb5bd6346e6f60abef5e403c0f0f4f65a128146aaada3740c99c771d9bed2f5ae8b1
+  metadata.gz: 4ed65501c48c2c6d4d4e6e1444c12cfbfc6bd684ec45973be1ae209e1201a0dce73e141adbda8a93556e38bdbb43bc58b17d89b821ca5ffb69e87c9d4bd4100f
+  data.tar.gz: 775ac82e5e32002a27ceb0477844a5bd1ce96bc25f4685eaf29340f3c9d6b08a790f3c5108566020e37d9ef4c5084874e10edaa4136c1c1d26405ce3abac659b

data/README.md

@@ -18,15 +18,25 @@ come with a shared library.  To install, simply run the following command:
 
     Simple script to resize EBS based AWS instance.
 
-    Usage:
-      resize_aws_instance [options]
-    --instance-id, -i <s>:   Instance ID of AWS instance
-         --key-id, -k <s>:   AWS access key ID
-     --secret-key, -s <s>:   AWS secret access key
-         --region, -r <s>:   AWS region
-           --type, -t <s>:   Target instance type
-            --version, -v:   Print version and exit
-               --help, -h:   Show this message
+     Usage:
+       resize_aws_instance [options]
+
+     Note:
+       The following AWS config options may be provided via environment variables:
+         key-id     => AWS_ACCESS_KEY_ID
+         secret-key => AWS_SECRET_ACCESS_KEY
+         region     => AWS_DEFAULT_REGION
+
+     Options:
+      --instance-id, -i <s>:   AWS instance ID
+           --key-id, -k <s>:   AWS access key ID
+       --secret-key, -s <s>:   AWS secret access key
+           --region, -r <s>:   AWS region
+             --type, -t <s>:   Target instance type
+         --snapshot, -n <s>:   Snapshot EBS volumes [none, root or comma separated
+                               list IDs (a,b,c)] (default: none)
+              --version, -v:   Print version and exit
+                 --help, -h:   Show this message
 
 ## Contributing
 

data/bin/resize_aws_instance

@@ -6,44 +6,65 @@ require 'trollop'
 opts = Trollop.options do
   version ResizeAwsInstance::VERSION
   banner <<-EOS
-  Simple script to resize EBS based AWS instance.
+Simple script to resize EBS based AWS instance.
 
-  Usage:
-    resize_aws_instance [options]
+ Usage:
+   resize_aws_instance [options]
+
+ Note:
+   The following AWS config options may be provided via environment variables:
+     key-id     => AWS_ACCESS_KEY_ID
+     secret-key => AWS_SECRET_ACCESS_KEY
+     region     => AWS_DEFAULT_REGION
+
+ Options:
   EOS
 
   opt :instance_id,
-      'Instance ID of AWS instance',
+      'AWS instance ID',
       type: :string,
       required: true
   opt :key_id,
       'AWS access key ID',
-      default: ENV['AWS_ACCESS_KEY_ID'],
       type: :string
   opt :secret_key,
       'AWS secret access key',
-      default: ENV['AWS_SECRET_ACCESS_KEY'],
       type: :string
   opt :region,
       'AWS region',
-      default: ENV['AWS_DEFAULT_REGION'],
       type: :string
   opt :type,
       'Target instance type',
       type: :string,
       required: true
+  opt :snapshot,
+      'Snapshot EBS volumes [none, root or comma separated list IDs (a,b,c)]',
+      type: :string,
+      default: 'none'
+end
+
+opts[:key_id] ||= ENV['AWS_ACCESS_KEY_ID']
+opts[:secret_key] ||= ENV['AWS_SECRET_ACCESS_KEY']
+opts[:region] ||= ENV['AWS_DEFAULT_REGION']
+
+if opts[:key_id].nil?
+  Trollop.die :key_id, 'must be provided or set via AWS_ACCESS_KEY_ID'
+end
+if opts[:secret_key].nil?
+  Trollop.die :secret_key, 'must be provided or set via AWS_SECRET_ACCESS_KEY'
+end
+if opts[:region].nil?
+  Trollop.die :region, 'must be provided or set via AWS_DEFAULT_REGION'
 end
-Trollop.die :key_id, 'unset' if opts[:key_id].nil?
-Trollop.die :secret_key, 'unset' if opts[:secret_key].nil?
-Trollop.die :region, 'unset' if opts[:region].nil?
 
 begin
   instance = ResizeAwsInstance.new(
     opts[:key_id],
     opts[:secret_key],
-    opts[:region], opts[:instance_id]
+    opts[:region],
+    opts[:instance_id]
   )
-  instance.resize(opts[:type])
+  instance.resize(opts[:type], opts[:snapshot].split(','))
   puts "[#{Time.now}] Resize complete."
 rescue => e
   puts "[#{Time.now}] #{e}"

data/lib/resize_aws_instance/version.rb

@@ -1,4 +1,4 @@
 # ResizeAwsInstance::VERSION
 class ResizeAwsInstance
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/resize_aws_instance.rb

@@ -17,9 +17,12 @@ class ResizeAwsInstance
     fail 'FATAL: Non EBS root volume.'
   end
 
-  def resize(type)
-    fail 'Instance already target type.' if @instance.instance_type == type
+  def resize(type, snapshot)
+    if @instance.instance_type == type
+      fail 'FATAL: Instance already target type.'
+    end
     stop
+    backup(snapshot) unless snapshot == ['none']
     change_type(type)
     start
     @instance.instance_type
@@ -28,24 +31,67 @@ class ResizeAwsInstance
   private
 
   def stop
+    @instance.stop
     loop do
-      @instance.stop
-      break if @instance.status == :stopped
+      return true if @instance.status == :stopped
       puts "[#{Time.now}] Waiting for instance to stop..."
       sleep 5
     end
   end
 
+  def backup(snapshot)
+    case snapshot
+    when ['root']
+      name = @instance.root_device_name
+      volume =  @instance.attachments[name].volume
+      create_snapshot(name, volume)
+    else
+      threads = []
+      snapshot.each do |id|
+        # AWS advertises devices as /dev/sdN and Linux sees them as
+        # /dev/xvdN.  In case this ever changes, this should match
+        # either pattern.
+        attachments = instance.attachments.select do |k, _|
+          k.match(%r{/dev/(s|xv)d#{id}\d*})
+        end
+        attachments.keys.each do |attachment|
+          volume = @instance.attachments[attachment].volume
+          threads << Thread.new { create_snapshot(attachment, volume) }
+        end
+      end
+      threads.each { |t| t.join }
+    end
+  end
+
+  def create_snapshot(name, vol)
+    desc = "#{@instance.id} - #{name} - #{Time.now}"
+    snap = vol.create_snapshot(desc)
+    loop do
+      case snap.status
+      when :pending
+        puts "[#{Time.now}] Snapshot pending [#{name}]: #{snap.progress || 0}%"
+      when :completed
+        puts "[#{Time.now}] Snapshot complete [#{name}]"
+        return true
+      when :error
+        fail "FATAL: Failed to create snapshot: #{desc}"
+      else
+        puts "Snapshot status unknown [#{name}]: #{snap.status}"
+      end
+      sleep 5
+    end
+  end
+
   def change_type(type)
     @instance.instance_type = type
   rescue AWS::EC2::Errors::Client::InvalidParameterValue
-    raise "Invalid instance type: #{type}"
+    raise "FATAL: Invalid instance type: #{type}"
   end
 
   def start
+    @instance.start
     loop do
-      @instance.start
-      break if @instance.status == :running
+      return true if @instance.status == :running
       puts "[#{Time.now}] Waiting for instance to start..."
       sleep 5
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resize-aws-instance
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tucker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -127,12 +127,16 @@ summary: "# ResizeAwsInstance  This is a quick Ruby scipt to simplify the proces
   i-xxxxxxxx  ## Installation  This is packaged as a gem to simplify the process of
   installation.  It does not come with a shared library.  To install, simply run the
   following command:  $ gem install resize_aws_instance  ## Usage  Simple script to
-  resize EBS based AWS instance.  Usage: resize_aws_instance [options] --instance-id,
-  -i <s>:   Instance ID of AWS instance --key-id, -k <s>:   AWS access key ID --secret-key,
-  -s <s>:   AWS secret access key --region, -r <s>:   AWS region --type, -t <s>:   Target
-  instance type --version, -v:   Print version and exit --help, -h:   Show this message
-  \ ## Contributing  1. Fork it ( https://github.com/[my-github-username]/resize-aws-instance/fork
-  ) 2. Create your feature branch (`git checkout -b my-new-feature`) 3. Commit your
-  changes (`git commit -am 'Add some feature'`) 4. Push to the branch (`git push origin
-  my-new-feature`) 5. Create a new Pull Request"
+  resize EBS based AWS instance.  Usage: resize_aws_instance [options]  Note: The
+  following AWS config options may be provided via environment variables: key-id     =>
+  AWS_ACCESS_KEY_ID secret-key => AWS_SECRET_ACCESS_KEY region     => AWS_DEFAULT_REGION
+  \ Options: --instance-id, -i <s>:   AWS instance ID --key-id, -k <s>:   AWS access
+  key ID --secret-key, -s <s>:   AWS secret access key --region, -r <s>:   AWS region
+  --type, -t <s>:   Target instance type --snapshot, -n <s>:   Snapshot EBS volumes
+  [none, root or comma separated list IDs (a,b,c)] (default: none) --version, -v:
+  \  Print version and exit --help, -h:   Show this message  ## Contributing  1. Fork
+  it ( https://github.com/[my-github-username]/resize-aws-instance/fork ) 2. Create
+  your feature branch (`git checkout -b my-new-feature`) 3. Commit your changes (`git
+  commit -am 'Add some feature'`) 4. Push to the branch (`git push origin my-new-feature`)
+  5. Create a new Pull Request"
 test_files: []