amazon-ec2 0.9.15 → 0.9.17

data/bin/ec2sh

@@ -4,59 +4,17 @@
 #
 # Ruby Gem Name::  amazon-ec2
 # Author::    Glenn Rempe  (mailto:glenn@rempe.us)
-# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
+# Copyright:: Copyright (c) 2007-2010 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
 # Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
-# CREDITS : Credit for this bit of shameful ripoff coolness
-# goes to Marcel Molina and his AWS::S3 gem.  Thanks!
+message = <<-MESSAGE
 
-# Usage : running this starts up an irb session and
-# sets up the connection to EC2 as a class variable called
-# '@ec2'.  So just do something like the following on the
-# shell command line:
+  DEPRECATION WARNING:
 
-#   macbook-pro:~ glenn$ ec2sh
-#   >> @ec2.describe_images
-#   => [#<AWS::EC2::Item image_location...
+  This script has been renamed to 'awshell'.  Please run that command instead.
 
-aws_lib   = File.dirname(__FILE__) + '/../lib/AWS'
-setup = File.dirname(__FILE__) + '/setup'
-irb_name = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
+MESSAGE
 
-if ( ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY'] )
-
-  welcome_message = <<-MESSAGE
-
-  'ec2sh' usage :
-  This is an interactive 'irb' command shell that allows you to use all
-  commands available to the amazon-ec2 gem.  You'll find this to be a
-  great tool to help you debug issues and practice running commands
-  against the live EC2 servers prior to putting them in your code.
-
-  The EC2 connection is wired to the class instance '@ec2'.  Make method calls
-  on this to execute commands on EC2.  Adding a #to_s
-  at the end of any command should give you a full String representation of the
-  response.
-
-    Examples to try:
-
-      returns : all ec2 public methods
-      >> @ec2.methods.sort
-
-      returns : a string representation of ALL images
-      >> @ec2.describe_images.to_s
-
-      returns : an Array of AWS::Response objects, each an EC2 image and its data
-      >> @ec2.describe_images.imagesSet.item
-      >> @ec2.describe_images.imagesSet.item[0] (a hash representing a single item in that array)
-      >> @ec2.describe_images.imagesSet.item[0].to_s (a String representation of that item)
-
-  MESSAGE
-
-  puts welcome_message
-  exec "#{irb_name} -rubygems -r #{aws_lib} -r #{setup} --simple-prompt"
-else
-  puts "You must define AMAZON_ACCESS_KEY_ID and AMAZON_SECRET_ACCESS_KEY as shell environment variables before running #{$0}!"
-end
+puts message

data/bin/setup.rb

@@ -4,26 +4,75 @@
 #
 # Ruby Gem Name::  amazon-ec2
 # Author::    Glenn Rempe  (mailto:glenn@rempe.us)
-# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
+# Copyright:: Copyright (c) 2007-2010 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
 # Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 if ENV['AMAZON_ACCESS_KEY_ID'] && ENV['AMAZON_SECRET_ACCESS_KEY']
+
   opts = {
     :access_key_id => ENV['AMAZON_ACCESS_KEY_ID'],
     :secret_access_key => ENV['AMAZON_SECRET_ACCESS_KEY']
   }
+
   if ENV['EC2_URL']
-    opts[:server] = URI.parse(ENV['EC2_URL']).host
+    ec2uri = URI.parse(ENV['EC2_URL'])
+    opts[:server] = ec2uri.host
+    if ec2uri.path.downcase.include?("eucalyptus")
+      opts[:path] = ec2uri.path
+      opts[:port] = ec2uri.port
+      if ec2uri.class == URI::HTTPS
+        opts[:use_ssl] = true
+      else
+        opts[:use_ssl] = false
+      end
+    end
+    @ec2 = AWS::EC2::Base.new(opts)
+  else
+    @ec2 = AWS::EC2::Base.new(opts)
+  end
+
+  if ENV['ELB_URL']
+    opts[:server] = URI.parse(ENV['ELB_URL']).host
+    @elb = AWS::ELB::Base.new(opts)
+  else
+    @elb = AWS::ELB::Base.new(opts)
+  end
+
+  if ENV['AS_URL']
+    opts[:server] = URI.parse(ENV['AS_URL']).host
+    @as = AWS::Autoscaling::Base.new(opts)
+  else
+    @as = AWS::Autoscaling::Base.new(opts)
   end
-  @ec2 = AWS::EC2::Base.new(opts)
-  @elb = AWS::ELB::Base.new(opts)
-  @as = AWS::Autoscaling::Base.new(opts)
-  @rds = AWS::RDS::Base.new(opts)
-end
 
-puts "EC2 Server: #{opts[:server]}"
+  if ENV['RDS_URL']
+    opts[:server] = URI.parse(ENV['RDS_URL']).host
+    @rds = AWS::RDS::Base.new(opts)
+  else
+    @rds = AWS::RDS::Base.new(opts)
+  end
+
+  if ENV['AWS_CLOUDWATCH_URL']
+    opts[:server] = URI.parse(ENV['AWS_CLOUDWATCH_URL']).host
+    @cw = AWS::Cloudwatch::Base.new(opts)
+  else
+    @cw = AWS::Cloudwatch::Base.new(opts)
+  end
+
+  puts ""
+  puts "Server Endpoints Configured"
+  puts "--"
+  puts "@ec2.default_host (Elastic Compute Cloud) : #{@ec2.default_host}"
+  puts "@elb.default_host (Elastic Load Balancer) : #{@elb.default_host}"
+  puts "@as.default_host (Autoscaling) : #{@as.default_host}"
+  puts "@rds.default_host (Relational DB Service) : #{@rds.default_host}"
+  puts "@cw.default_host (Cloudwatch) : #{@cw.default_host}"
+  puts ""
+
+end
 
+require 'pp'
 include AWS
 

data/lib/AWS.rb

@@ -93,7 +93,7 @@ module AWS
   # @param [Boolean] urlencode whether or not to url encode the result., true or false
   # @return [String] the signed and encoded string.
   def AWS.encode(secret_access_key, str, urlencode=true)
-    digest = OpenSSL::Digest::Digest.new('sha1')
+    digest = OpenSSL::Digest::Digest.new('sha256')
     b64_hmac =
       Base64.encode64(
         OpenSSL::HMAC.digest(digest, secret_access_key, str)).gsub("\n","")
@@ -126,12 +126,14 @@ module AWS
                   :secret_access_key => "",
                   :use_ssl => true,
                   :server => default_host,
+                  :path => "/",
                   :proxy_server => nil
                   }.merge(options)
 
       @server = options[:server]
       @proxy_server = options[:proxy_server]
       @use_ssl = options[:use_ssl]
+      @path = options[:path]
 
       raise ArgumentError, "No :access_key_id provided" if options[:access_key_id].nil? || options[:access_key_id].empty?
       raise ArgumentError, "No :secret_access_key provided" if options[:secret_access_key].nil? || options[:secret_access_key].empty?
@@ -219,7 +221,46 @@ module AWS
         params = {}
         arr_of_hashes.each_with_index do |hash, i|
           hash.each do |attribute, value|
-            params["#{key}.#{i+1}.#{mappings[attribute]}"] = value.to_s
+            if value.is_a? Array
+              params["#{key}.#{i+1}.Name"] = mappings[attribute]
+              value.each_with_index do |item, j|
+                params["#{key}.#{i+1}.Value.#{j+1}"] = item.to_s
+              end
+            else
+              params["#{key}.#{i+1}.#{mappings[attribute]}"] = value.to_s
+            end
+          end
+        end
+        params
+      end
+
+      # Same as _pathhashlist_ except it generates explicit <prefix>.Key= and <prefix>.Value or <prefix>.Value.1, <prefix>.Value.2
+      # depending on whether the value is a scalar or an array.
+      #
+      # So if you pass in args
+      # ("People", [{:name=>'jon'}, {:names=>['chris', 'bob']} with key_name = 'Key' and value_name = 'Value',
+      # you should get
+      # {"People.1.Key"=>"name", "People.1.Value"=>'jon', "People.2.Key"=>'names', 'People.2.Value.1'=>'chris', 'People.2.Value.2'=>'bob'}
+      def pathkvlist(key, arr_of_hashes, key_name, value_name, mappings)
+        raise ArgumentError, "expected a key that is a String" unless key.is_a? String
+        raise ArgumentError, "expected a arr_of_hashes that is an Array" unless arr_of_hashes.is_a? Array
+        arr_of_hashes.each{|h| raise ArgumentError, "expected each element of arr_of_hashes to be a Hash" unless h.is_a?(Hash)}
+        raise ArgumentError, "expected a key_nam that is a String" unless key_name.is_a? String
+        raise ArgumentError, "expected a value_name that is a String" unless value_name.is_a? String
+        raise ArgumentError, "expected a mappings that is an Hash" unless mappings.is_a? Hash
+        params = {}
+        arr_of_hashes.each_with_index do |hash, i|
+          hash.each do |attribute, value|
+            params["#{key}.#{i+1}.#{key_name}"] = mappings.fetch(attribute, attribute)
+            if !value.nil?
+              if value.is_a? Array
+                value.each_with_index do |item, j|
+                  params["#{key}.#{i+1}.#{value_name}.#{j+1}"] = item.to_s
+                end
+              else
+                params["#{key}.#{i+1}.#{value_name}"] = value.to_s
+              end
+            end
           end
         end
         params
@@ -237,7 +278,7 @@ module AWS
 
           params.merge!( {"Action" => action,
                           "SignatureVersion" => "2",
-                          "SignatureMethod" => 'HmacSHA1',
+                          "SignatureMethod" => 'HmacSHA256',
                           "AWSAccessKeyId" => @access_key_id,
                           "Version" => api_version,
                           "Timestamp"=>Time.now.getutc.iso8601} )
@@ -248,7 +289,7 @@ module AWS
             CGI::escape(param[0]) + "=" + CGI::escape(param[1])
           end.join("&") + "&Signature=" + sig
 
-          req = Net::HTTP::Post.new("/")
+          req = Net::HTTP::Post.new(@path)
           req.content_type = 'application/x-www-form-urlencoded'
           req['User-Agent'] = "github-amazon-ec2-ruby-gem"
 
@@ -265,7 +306,7 @@ module AWS
 
       # Set the Authorization header using AWS signed header authentication
       def get_aws_auth_param(params, secret_access_key, server)
-        canonical_string =  AWS.canonical_string(params, server)
+        canonical_string =  AWS.canonical_string(params, server,"POST", @path)
         encoded_canonical = AWS.encode(secret_access_key, canonical_string)
       end
 
@@ -282,6 +323,7 @@ module AWS
 
         http_response = make_request(options[:action], options[:params])
         http_xml = http_response.body
+
         return Response.parse(:xml => http_xml)
       end
 
@@ -296,6 +338,8 @@ module AWS
         # exceptions.rb
         return false if response.is_a?(Net::HTTPSuccess)
 
+        raise AWS::Error, "Unexpected server error. response.body is: #{response.body}" if response.is_a?(Net::HTTPServerError)
+
         # parse the XML document so we can walk through it
         doc = REXML::Document.new(response.body)
 

data/lib/AWS/Autoscaling.rb

@@ -7,8 +7,6 @@ module AWS
     #   export AS_URL='http://autoscaling.amazonaws.com'
     if ENV['AS_URL']
       AS_URL = ENV['AS_URL']
-      VALID_HOSTS = ['http://autoscaling.amazonaws.com']
-      raise ArgumentError, "Invalid AS_URL environment variable : #{AS_URL}" unless VALID_HOSTS.include?(AS_URL)
       DEFAULT_HOST = URI.parse(AS_URL).host
     else
       # Default US API endpoint

data/lib/AWS/Cloudwatch.rb

@@ -8,8 +8,6 @@ module AWS
     #   export AWS_CLOUDWATCH_URL='https://montoring.amazonaws.com'
     if ENV['AWS_CLOUDWATCH_URL']
       AWS_CLOUDWATCH_URL = ENV['AWS_CLOUDWATCH_URL']
-      VALID_HOSTS = ['monitoring.amazonaws.com']
-      raise ArgumentError, "Invalid AWS_CLOUDWATCH_URL environment variable : #{AWS_CLOUDWATCH_URL}" unless VALID_HOSTS.include?(AWS_CLOUDWATCH_URL)
       DEFAULT_HOST = URI.parse(AWS_CLOUDWATCH_URL).host
     else
       # Default US API endpoint

data/lib/AWS/Cloudwatch/monitoring.rb

@@ -7,9 +7,7 @@ module AWS
       # call get_metric_statistics.
       #
       # there are no options available to this method.
-
       def list_metrics
-        raise ArgumentError, "Server must be monitoring.amazonaws.com" if server != 'monitoring.amazonaws.com'
         return response_generator(:action => 'ListMetrics', :params => {})
       end
 
@@ -34,8 +32,6 @@ module AWS
       # @option options [String] :statistics (nil) The statistics to be returned for your metric. See the developer guide for valid options. Required.
       # @option options [Time] :start_time (Time.now() - 86400) Inner bound of the date range you want to view. Defaults to 24 hours ago
       # @option options [String] :unit (nil) Standard unit for a given Measure. See the developer guide for valid options.
-
-
       def get_metric_statistics ( options ={} )
         options = { :custom_unit => nil,
                     :dimensions => nil,
@@ -51,23 +47,42 @@ module AWS
         raise ArgumentError, ":end_time must be a Time object" if options[:end_time].class != Time
         raise ArgumentError, ":start_time must be provided" if options[:start_time].nil?
         raise ArgumentError, ":start_time must be a Time object" if options[:start_time].class != Time
-        raise ArgumentError, "Server must be monitoring.amazonaws.com" if server != 'monitoring.amazonaws.com'
         raise ArgumentError, ":start_time must be before :end_time" if options[:start_time] > options[:end_time]
         raise ArgumentError, ":measure_name must be provided" if options[:measure_name].nil? || options[:measure_name].empty?
         raise ArgumentError, ":statistics must be provided" if options[:statistics].nil? || options[:statistics].empty?
 
         params = {
                     "CustomUnit" => options[:custom_unit],
-                    "Dimensions" => options[:dimensions],
                     "EndTime" => options[:end_time].iso8601,
                     "MeasureName" => options[:measure_name],
                     "Namespace" => options[:namespace],
                     "Period" => options[:period].to_s,
-                    "Statistics.member.1" => options[:statistics],
                     "StartTime" => options[:start_time].iso8601,
                     "Unit" => options[:unit]
         }
 
+        # FDT: Fix statistics and dimensions values
+        if !(options[:statistics].nil? || options[:statistics].empty?)
+          stats_params = {}
+          i = 1
+          options[:statistics].split(',').each{ |stat|
+            stats_params.merge!( "Statistics.member.#{i}" => "#{stat}" )
+            i += 1
+          }
+          params.merge!( stats_params )
+        end
+
+        if !(options[:dimensions].nil? || options[:dimensions].empty?)
+          dims_params = {}
+          i = 1
+          options[:dimensions].split(',').each{ |dimension|
+            dimension_var = dimension.split('=')
+            dims_params = dims_params.merge!( "Dimensions.member.#{i}.Name" => "#{dimension_var[0]}", "Dimensions.member.#{i}.Value" => "#{dimension_var[1]}" )
+            i += 1
+          }
+          params.merge!( dims_params )
+        end
+
         return response_generator(:action => 'GetMetricStatistics', :params => params)
 
       end

data/lib/AWS/EC2.rb

@@ -14,7 +14,7 @@ module AWS
       DEFAULT_HOST = 'ec2.amazonaws.com'
     end
 
-    API_VERSION = '2009-11-30'
+    API_VERSION = '2010-08-31'
 
     class Base < AWS::Base
       def api_version

data/lib/AWS/EC2/instances.rb

@@ -36,7 +36,7 @@ module AWS
         raise ArgumentError, ":image_id must be provided" if options[:image_id].nil? || options[:image_id].empty?
         raise ArgumentError, ":min_count is not valid" unless options[:min_count].to_i > 0
         raise ArgumentError, ":max_count is not valid or must be >= :min_count" unless options[:max_count].to_i > 0 && options[:max_count].to_i >= options[:min_count].to_i
-        raise ArgumentError, ":instance_type must specify a valid instance type" unless options[:instance_type].nil? || ["m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge"].include?(options[:instance_type])
+        raise ArgumentError, ":instance_type must specify a valid instance type" unless options[:instance_type].nil? || ["t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge", "cc1.4xlarge"].include?(options[:instance_type])
         raise ArgumentError, ":monitoring_enabled must be 'true' or 'false'" unless options[:monitoring_enabled].nil? || [true, false].include?(options[:monitoring_enabled])
         raise ArgumentError, ":disable_api_termination must be 'true' or 'false'" unless options[:disable_api_termination].nil? || [true, false].include?(options[:disable_api_termination])
         raise ArgumentError, ":instance_initiated_shutdown_behavior must be 'stop' or 'terminate'" unless options[:instance_initiated_shutdown_behavior].nil? || ["stop", "terminate"].include?(options[:instance_initiated_shutdown_behavior])
@@ -92,30 +92,57 @@ module AWS
       end
 
 
-      # Not yet implemented
+      # Returns information about an attribute of an instance.
       #
-      # @todo Implement this method
+      # @option options [String] :instance_id (nil) ID of the instance on which the attribute will be queried.
+      # @option options [String] :attribute (nil) Specifies the attribute to query..
       #
       def describe_instance_attribute( options = {} )
-        raise "Not yet implemented"
+        raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
+        raise ArgumentError, "No :attribute provided" if options[:attribute].nil? || options[:attribute].empty?
+        valid_attributes = %w(instanceType kernel ramdisk userData disableApiTermination instanceInitiatedShutdownBehavior rootDevice blockDeviceMapping)
+        raise ArgumentError, "Invalid :attribute provided" unless valid_attributes.include?(options[:attribute].to_s)
+        params = {}
+        params["InstanceId"] =  options[:instance_id]
+        params["Attribute"] =  options[:attribute]
+        return response_generator(:action => "DescribeInstanceAttribute", :params => params)
       end
 
 
-      # Not yet implemented
+      # Modifies an attribute of an instance.
       #
-      # @todo Implement this method
+      # @option options [String] :instance_id (nil) ID of the instance on which the attribute will be modified.
+      # @option options [String] :attribute (nil) Specifies the attribute to modify.
+      # @option options [String] :value (nil) The value of the attribute being modified.
       #
       def modify_instance_attribute( options = {} )
-        raise "Not yet implemented"
+        raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
+        raise ArgumentError, "No :attribute provided" if options[:attribute].nil? || options[:attribute].empty?
+        raise ArgumentError, "No :value provided" if options[:value].nil?
+        valid_attributes = %w(instanceType kernel ramdisk userData disableApiTermination instanceInitiatedShutdownBehavior rootDevice blockDeviceMapping)
+        raise ArgumentError, "Invalid :attribute provided" unless valid_attributes.include?(options[:attribute].to_s)
+        params = {}
+        params["InstanceId"] =  options[:instance_id]
+        params["Attribute"] =  options[:attribute]
+        params["Value"] =  options[:value].to_s
+        return response_generator(:action => "ModifyInstanceAttribute", :params => params)
       end
 
 
-      # Not yet implemented
+      # Resets an attribute of an instance to its default value.
       #
-      # @todo Implement this method
+      # @option options [String] :instance_id (nil) ID of the instance on which the attribute will be reset.
+      # @option options [String] :attribute (nil) The instance attribute to reset to the default value.
       #
       def reset_instance_attribute( options = {} )
-        raise "Not yet implemented"
+        raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
+        raise ArgumentError, "No :attribute provided" if options[:attribute].nil? || options[:attribute].empty?
+        valid_attributes = %w(kernel ramdisk)
+        raise ArgumentError, "Invalid :attribute provided" unless valid_attributes.include?(options[:attribute].to_s)
+        params = {}
+        params["InstanceId"] =  options[:instance_id]
+        params["Attribute"] =  options[:attribute]
+        return response_generator(:action => "ResetInstanceAttribute", :params => params)
       end
 
 
@@ -238,7 +265,7 @@ module AWS
     # Example Class Method Usage :
     # instance_id = AWS::EC2::Instance.local_instance_id
     #
-    module Instance
+    class Instance
 
       EC2_META_URL_BASE = 'http://169.254.169.254/latest/meta-data/'
 

data/lib/AWS/EC2/password.rb

@@ -0,0 +1,20 @@
+module AWS
+  module EC2
+    class Base < AWS::Base
+
+
+      # The GetPasswordData operation retrieves the encrypted administrator password for the instances running Window.
+      #
+      # @option options [String] :instance_id ("") an Instance ID
+      #
+      def get_password_data( options = {} )
+        options = {:instance_id => ""}.merge(options)
+        raise ArgumentError, "No instance ID provided" if options[:instance_id].nil? || options[:instance_id].empty?
+        params = { "InstanceId" => options[:instance_id] }
+        return response_generator(:action => "GetPasswordData", :params => params)
+      end
+
+
+    end
+  end
+end