fog 1.7.0 → 1.8.0

data/docs/about/contributing.markdown

@@ -9,6 +9,7 @@ First off, high five for coming to visit this page.  You are my new hero.
 
 * Organize your patches by keeping all related changes together in a topic branch.
 * Rebase your branch against master before submitting a pull request (and squish any 'oops' or work in progress commits).
+* Ensure your changes work with both Ruby 1.8.7 and 1.9! We support both!
 * Submit changes as pull requests describing what the changes should cover and referencing issues (if any).
 * Use 'tags' in your commits to indicate the scope, so things like '\[aws|compute\] fixed something'.
 * Write and run tests.  Tests should follow through usage workflows and ought to pass both with mocking on and off.

data/docs/dns/index.markdown

@@ -76,4 +76,4 @@ If you already have an account with another service you can just as easily use t
 
 ## Go Forth and Resolve
 
-You can see an example of reusing code like this in the <a href="https://github.com/fog/fog/blob/master/examples/dns_tests.rb">examples folder</a>. Using this makes it easier to give yourself shortcuts to your cloud servers and manage how clients and users access them as well. It is great to have this flexibility so that you can modify your cloud infrastructure as needed while keeping everything ship shape. It also provides a nice way to create custom subdomains for users and just generally round out your cloud solution.
+Using this makes it easier to give yourself shortcuts to your cloud servers and manage how clients and users access them as well. It is great to have this flexibility so that you can modify your cloud infrastructure as needed while keeping everything ship shape. It also provides a nice way to create custom subdomains for users and just generally round out your cloud solution.

data/docs/index.markdown

@@ -42,10 +42,15 @@ geemus says: "That should give you everything you need to get started, but let m
 
 ## Contributing
 
-* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](http://github.com/fog/fog/issues)
+* Find something you would like to work on.
+  * Look for anything you can help with in the [issue tracker](https://github.com/fog/fog/issues).
+  * Look at the [code quality metrics](https://codeclimate.com/github/fog/fog) for anything you can help clean up.
+  * Or anything else!
 * Fork the project and do your work in a topic branch.
+  * Make sure your changes will work on both Ruby 1.8.7 and Ruby 1.9.
+* Add a config at `tests/.fog` for the component you want to test.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
-* Rebase your branch against fog/fog to make sure everything is up to date.
+* Rebase your branch against `fog/fog` to make sure everything is up to date.
 * Commit your changes and send a pull request.
 
 ## Resources
@@ -53,7 +58,7 @@ geemus says: "That should give you everything you need to get started, but let m
 Enjoy, and let me know what I can do to continue improving fog!
 
 * Work through the [fog tutorial](https://github.com/downloads/geemus/learn_fog/learn_fog.tar.gz)
-* Read fog's [API documentation](/rdoc)
+* Read fog's API documentation [master branch](http://rubydoc.info/github/fog/fog) or [latest gem release](http://rubydoc.info/gems/fog)
 * Stay up to date by following [@fog](http://twitter.com/fog) and/or [@geemus](http://twitter.com/geemus) on Twitter.
 * Get and give help on the [#ruby-fog](irc://irc.freenode.net/ruby-fog) irc channel on Freenode
 * Follow release notes and discussions on the [mailing list](http://groups.google.com/group/ruby-fog)

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.7.0'
-  s.date              = '2012-11-04'
+  s.version           = '1.8.0'
+  s.date              = '2012-12-01'
   s.rubyforge_project = 'fog'
 
 
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('jekyll')
   s.add_development_dependency('rake')
   s.add_development_dependency('rbvmomi')
-  s.add_development_dependency('rdoc')
+  s.add_development_dependency('yard')
   s.add_development_dependency('thor')
   s.add_development_dependency('rspec', '~>1.3.1')
   s.add_development_dependency('rbovirt', '>=0.0.11')

data/lib/fog.rb

@@ -1,11 +1,6 @@
 require File.join(File.dirname(__FILE__), 'fog', 'core')
 
 module Fog
-
-  unless const_defined?(:VERSION)
-    VERSION = '1.7.0'
-  end
-
 end
 
 # FIXME: these should go away (force usage of Fog::[Compute, CDN, DNS, Storage]  etc)

data/lib/fog/aws/auto_scaling.rb

@@ -258,7 +258,7 @@ module Fog
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/cloud_watch.rb

@@ -55,7 +55,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/compute.rb

@@ -113,6 +113,7 @@ module Fog
       request :modify_instance_attribute
       request :modify_network_interface_attribute
       request :modify_snapshot_attribute
+      request :modify_volume_attribute
       request :purchase_reserved_instances_offering
       request :reboot_instances
       request :release_address
@@ -220,7 +221,7 @@ module Fog
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/dynamodb.rb

@@ -76,41 +76,30 @@ module Fog
         # * DynamoDB object with connection to aws
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
-          #TODO check dynamodb stuff
+          @region = options[:region] || 'us-east-1'
 
           setup_credentials(options)
-          
+
           @connection_options     = options[:connection_options] || {}
-          
-          options[:region] ||= 'us-east-1'
-          @host = options[:host] || "dynamodb.#{options[:region]}.amazonaws.com"
+
+          @host       = options[:host]        || "dynamodb.#{@region}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || '80' #443
           @scheme     = options[:scheme]      || 'http' #'https'
+
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         private
 
         def setup_credentials(options)
-          if options[:aws_session_token]
-            @aws_access_key_id      = options[:aws_access_key_id]
-            @aws_secret_access_key  = options[:aws_secret_access_key]
-            @aws_session_token      = options[:aws_session_token]
-            @aws_credentials_expire_at = options[:aws_credentials_expire_at]
-          else
-            sts = Fog::AWS::STS.new(
-              :aws_access_key_id      => options[:aws_access_key_id],
-              :aws_secret_access_key  => options[:aws_secret_access_key]
-            )
-            session_data = sts.get_session_token.body
-
-            @aws_access_key_id      = session_data['AccessKeyId']
-            @aws_secret_access_key  = session_data['SecretAccessKey']
-            @aws_session_token      = session_data['SessionToken']
-          end
-          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @aws_access_key_id          = options[:aws_access_key_id]
+          @aws_secret_access_key      = options[:aws_secret_access_key]
+          @aws_session_token          = options[:aws_session_token]
+          @aws_credentials_expire_at  = options[:aws_credentials_expire_at]
+
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 'dynamodb')
         end
 
         def reload
@@ -119,25 +108,27 @@ module Fog
 
         def request(params)
           refresh_credentials_if_expired
-          idempotent = params.delete(:idempotent)
-
-          headers = {
-            'Content-Type'          => 'application/x-amz-json-1.0',
-            'x-amz-date'            => Fog::Time.now.to_date_header,
-            'x-amz-security-token'  => @aws_session_token
-          }.merge(params[:headers])
-
-          headers['x-amzn-authorization']  = signed_authorization_header(params, headers)
-
-          response = @connection.request({
-            :body       => params[:body],
-            :expects    => 200,
-            :headers    => headers,
-            :host       => @host,
-            :idempotent => idempotent,
-            :method     => 'POST',
+
+          # defaults for all dynamodb requests
+          params.merge!({
+            :expects  => 200,
+            :host     => @host,
+            :method   => :post,
+            :path     => '/'
           })
 
+          # setup headers and sign with signature v4
+          date = Fog::Time.now
+          params[:headers] = {
+            'Content-Type'  => 'application/x-amz-json-1.0',
+            'Date'          => date.to_iso8601_basic,
+            'Host'          => @host,
+          }.merge!(params[:headers])
+          params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
+          params[:headers]['Authorization'] = @signer.sign(params, date)
+
+          response = @connection.request(params)
+
           unless response.body.empty?
             response.body = Fog::JSON.decode(response.body)
           end
@@ -145,31 +136,6 @@ module Fog
           response
         end
 
-        def signed_authorization_header(params, headers)
-          string_to_sign = "POST\n/\n\nhost:#{@host}:#{@port}\n"
-
-          amz_headers, canonical_amz_headers = {}, ''
-          for key, value in headers
-            if key[0..5] == 'x-amz-'
-              amz_headers[key] = value
-            end
-          end
-          amz_headers = amz_headers.sort {|x, y| x[0] <=> y[0]}
-          for key, value in amz_headers
-            canonical_amz_headers << "#{key}:#{value}\n"
-          end
-          string_to_sign << canonical_amz_headers
-          string_to_sign << "\n"
-          string_to_sign << (params[:body] || '')
-
-          string_to_sign = OpenSSL::Digest::SHA256.digest(string_to_sign)
-
-          signed_string = @hmac.sign(string_to_sign)
-          signature = Base64.encode64(signed_string).chomp!
-
-          "AWS3 AWSAccessKeyId=#{@aws_access_key_id},Algorithm=HmacSHA256,Signature=#{signature}"
-        end
-
       end
     end
   end

data/lib/fog/aws/elb.rb

@@ -81,7 +81,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/glacier.rb

@@ -169,4 +169,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/iam.rb

@@ -89,6 +89,7 @@ module Fog
               :users => Hash.new do |uhash, ukey|
                 uhash[ukey] = {
                   :user_id     => Fog::AWS::Mock.key_id,
+                  :path        => '/',
                   :arn         => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:user/#{ukey}",
                   :access_keys => [],
                   :policies    => {}

data/lib/fog/aws/models/auto_scaling/group.rb

@@ -125,7 +125,7 @@ module Fog
           requires :id
 
           opts = {}
-          opts.merge({'ForceDelete' => true}) if options[:force]
+          opts.merge!({'ForceDelete' => true}) if options[:force]
           
           connection.delete_auto_scaling_group(id, opts)
         end

data/lib/fog/aws/models/compute/server.rb

@@ -60,6 +60,8 @@ module Fog
               'ami-5e0fa45f'
             when 'ap-southeast-1'
               'ami-f092eca2'
+            when 'ap-southeast-2'
+              'ami-fb8611c1' # Ubuntu 12.04 LTS 64bit (EBS)
             when 'eu-west-1'
               'ami-3d1f2b49'
             when 'sa-east-1'

data/lib/fog/aws/models/compute/volume.rb

@@ -125,7 +125,6 @@ module Fog
         end
 
       end
-
     end
   end
 end

data/lib/fog/aws/models/iam/user.rb

@@ -13,7 +13,7 @@ module Fog
         
         def save
           requires :id
-          data = connection.create_user(id).body['User']
+          data = connection.create_user(id, path || '/').body['User']
           merge_attributes(data)
           true
         end

data/lib/fog/aws/parsers/compute/describe_instances.rb

@@ -41,7 +41,9 @@ module Fog
             when *@contexts
               @context.pop
             when 'code'
-              @instance[@context.last][name] = value.to_i
+              @instance[@context.last][name] = @context.last == 'stateReason' ? value : value.to_i
+            when 'message'
+              @instance[@context.last][name] = value
             when 'deleteOnTermination'
               @block_device_mapping[name] = (value == 'true')
             when 'deviceName', 'status', 'volumeId'

data/lib/fog/aws/parsers/compute/describe_reserved_instances_offerings.rb

@@ -12,7 +12,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'availabilityZone', 'currencyCode', 'instanceType', 'instanceTenancy', 'productDescription', 'reservedInstancesOfferingId'
+            when 'availabilityZone', 'currencyCode', 'instanceType', 'offeringType', 'instanceTenancy', 'productDescription', 'reservedInstancesOfferingId'
               @reserved_instances_offering[name] = value
             when 'duration'
               @reserved_instances_offering[name] = value.to_i

data/lib/fog/aws/parsers/storage/delete_multiple_objects.rb

@@ -0,0 +1,50 @@
+module Fog
+  module Parsers
+    module Storage
+      module AWS
+
+        class DeleteMultipleObjects < Fog::Parsers::Base
+
+          def reset
+            @deleted = { 'Deleted' => {} }
+            @error = { 'Error' => {} }
+            @response = { 'DeleteResult' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'Deleted'
+              @in_deleted = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Deleted'
+              @response['DeleteResult'] << @deleted
+              @deleted = { 'Deleted' => {} }
+              @in_deleted = false
+            when 'Error'
+              @response['DeleteResult'] << @error
+              @error = { 'Error' => {} }
+            when 'Key', 'VersionId'
+              if @in_deleted
+                @deleted['Deleted'][name] = value
+              else
+                @error['Error'][name] = value
+              end
+            when 'DeleteMarker', 'DeletemarkerVersionId'
+              @deleted['Deleted'][name] = value
+            when 'Code', 'Message'
+              @error['Error'][name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/aws/rds.rb

@@ -101,7 +101,7 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
 
@@ -158,7 +158,7 @@ module Fog
         end
 
         def owner_id
-          @owner_id ||= Fog::AWS[:rds].security_groups.get('default').owner_id
+          @owner_id ||= security_groups.get('default').owner_id
         end
 
         def reload

data/lib/fog/aws/requests/compute/describe_availability_zones.rb

@@ -71,6 +71,9 @@ module Fog
 
             {"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1b", "zoneState" => "available"},
+
+            {"messageSet" => [], "regionName" => "ap-southeast-2", "zoneName" => "ap-southeast-2a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "ap-southeast-2", "zoneName" => "ap-southeast-2b", "zoneState" => "available"},
           ]
 
           availability_zone_info = all_zones.select { |zoneinfo| zoneinfo["regionName"] == @region }

data/lib/fog/aws/requests/compute/describe_reserved_instances_offerings.rb

@@ -18,7 +18,9 @@ module Fog
         #       * 'availabilityZone'<~String> - availability zone of offering
         #       * 'duration'<~Integer> - duration, in seconds, of offering
         #       * 'fixedPrice'<~Float> - purchase price of offering
+        #       * 'includeMarketplace'<~Boolean> - whether or not to include marketplace offerings
         #       * 'instanceType'<~String> - instance type of offering
+        #       * 'offeringType'<~String> - type of offering, in ['Heavy Utilization', 'Medium Utilization', 'Light Utilization']
         #       * 'productDescription'<~String> - description of offering
         #       * 'reservedInstancesOfferingId'<~String> - id of offering
         #       * 'usagePrice'<~Float> - usage price of offering, per hour
@@ -41,14 +43,15 @@ module Fog
 
           self.data[:reserved_instances_offerings] ||= [{
             'reservedInstancesOfferingId' => Fog::AWS::Mock.reserved_instances_offering_id,
-            'instanceType'        => 'm1.small',
-            'availabilityZone'    => 'us-east-1d',
-            'duration'            => 31536000,
-            'fixedPrice'          => 350.0,
-            'usagePrice'          => 0.03,
-            'productDescription'  => 'Linux/UNIX',
-            'instanceTenancy'     => 'default',
-            'currencyCode'         => 'USD'
+            'instanceType'                => 'm1.small',
+            'availabilityZone'            => 'us-east-1d',
+            'duration'                    => 31536000,
+            'fixedPrice'                  => 350.0,
+            'offeringType'                => 'Medium Utilization',
+            'usagePrice'                  => 0.03,
+            'productDescription'          => 'Linux/UNIX',
+            'instanceTenancy'             => 'default',
+            'currencyCode'                => 'USD'
           }]
 
           response.body = {

data/lib/fog/aws/requests/compute/modify_volume_attribute.rb

@@ -0,0 +1,51 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/basic'
+
+        # Modifies a volume attribute.
+        #
+        # ==== Parameters
+        # * volume_id<~String> - The ID of the volume.
+        # * auto_enable_io_value<~Boolean> - This attribute exists to auto-enable the I/O operations to the volume.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyVolumeAttribute.html]
+        def modify_volume_attribute(volume_id=nil, auto_enable_io_value=false)
+          request(
+            'Action'             => 'ModifyVolumeAttribute',
+            'VolumeId'           => volume_id,
+            'AutoEnableIO.Value' => auto_enable_io_value,
+            :idempotent          => true,
+            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+
+      end
+
+      class Mock
+
+        def modify_volume_attribute(volume_id=nil, auto_enable_io_value=false)
+          response = Excon::Response.new
+          if volume = self.data[:volumes][volume_id]
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            response
+          else
+            raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
+          end
+        end
+      end
+    end
+  end
+end