fog 0.6.0 → 0.7.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    fog (0.6.0)
+    fog (0.7.0)
       builder
       excon (>= 0.5.5)
-      formatador (>= 0.0.16)
+      formatador (>= 0.1.1)
       json
       mime-types
       net-ssh (>= 2.0.23)
@@ -16,7 +16,9 @@ GEM
   specs:
     builder (3.0.0)
     excon (0.5.6)
-    formatador (0.0.16)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    formatador (0.1.1)
     json (1.5.1)
     mime-types (1.16)
     net-ssh (2.1.0)
@@ -24,8 +26,10 @@ GEM
     rake (0.8.7)
     rspec (1.3.1)
     ruby-hmac (0.4.0)
-    shindo (0.2.2)
-      formatador (>= 0.0.16)
+    shindo (0.3.3)
+      formatador (>= 0.1.1)
+    virtualbox (0.8.3)
+      ffi (~> 0.6.3)
 
 PLATFORMS
   ruby
@@ -34,4 +38,5 @@ DEPENDENCIES
   fog!
   rake
   rspec (= 1.3.1)
-  shindo (= 0.2.2)
+  shindo (= 0.3.3)
+  virtualbox (= 0.8.3)

data/changelog.txt

@@ -1,3 +1,52 @@
+0.7.0 03/14/2011
+================
+
+[aws] added ap-northeast-1 (tokyo) region options
+
+[aws|cloudformation] add basic support. thanks crazed
+
+[aws|elb] add support for configuring https
+
+[aws|iam]
+  add support for server certificates. thanks bensie
+  add support for login profiles. thanks fcheung
+
+[aws|rds]
+  support basic rds operations. thanks fcheung
+  add support for restoring servers and security groups. thanks ktheory
+
+[cdn|rackspace] use post_container to update
+
+[compute]
+  [aws]
+    fix tag.destroy. thanks eabbott
+    allow deleting all tags (instead of just specific ones)
+    fix revoke_security_group method signature
+    FLAVORS is now a constant
+		allow for modifying server monitoring. thanks gilles
+  [brightbox] thanks tokengeek
+    Added listener management (add/remove) requests for Load Balancers
+    Added new Server console activation request
+    Added activate_console method to Brightbox servers
+    Set Server#private_ip_address to be the first interface
+  [rackspace] 'official' workaround for awful caching
+  [virtualbox] rough proof of concept/initial implementation
+
+[core]
+  fix behavior of slice on collections. thanks eabbott
+  fix reset_data to be instance method on mock connection (and work)
+  [credentials]
+    handle undefined ENV['HOME']
+    Allow string keys in credentials file [issue 179]. thanks ryanlower
+
+[dns|dnsimple] fix misc bugs in models. thanks ijonas
+
+[storage]
+  use shared parse_data across providers
+  [rackspace]
+    pass through explicit content-type
+    fix bug preventing file uploads to be streamed
+
 0.6.0 02/28/2011
 ================
 

data/fog.gemspec

@@ -7,8 +7,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           = '0.6.0'
-  s.date              = '2011-02-28'
+  s.version           = '0.7.0'
+  s.date              = '2011-03-18'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
   s.add_dependency('excon', '>=0.5.5')
-  s.add_dependency('formatador', '>=0.0.16')
+  s.add_dependency('formatador', '>=0.1.1')
   s.add_dependency('json')
   s.add_dependency('mime-types')
   s.add_dependency('net-ssh', '>=2.0.23')
@@ -55,7 +55,8 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '1.3.1')
-  s.add_development_dependency('shindo', '0.2.2')
+  s.add_development_dependency('shindo', '0.3.3')
+  s.add_development_dependency('virtualbox', '0.8.3')
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 
 end

data/lib/fog/aws/cloud_formation.rb

@@ -0,0 +1,124 @@
+module Fog
+  module AWS
+    class CloudFormation < Fog::Service
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :persistent
+
+      request_path 'fog/aws/requests/cloud_formation'
+      request :create_stack
+      request :delete_stack
+      request :describe_stack_events
+      request :describe_stack_resources
+      request :describe_stacks
+      request :get_template
+      request :validate_template
+
+      class Mock
+
+        def initialize(options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        # Initialize connection to CloudFormation
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   cf = CloudFormation.new(
+        #    :aws_access_key_id => your_aws_access_key_id,
+        #    :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #
+        # ==== Returns
+        # * CloudFormation object with connection to AWS.
+        def initialize(options={})
+          require 'fog/core/parser'
+          require 'json'
+
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+
+          options[:region] ||= 'us-east-1'
+          @host = options[:host] || case options[:region]
+          when 'ap-northeast-1'
+            'cloudformation.ap-northeast-1.amazonaws.com'
+          when 'ap-southeast-1'
+            'cloudformation.ap-southeast-1.amazonaws.com'
+          when 'eu-west-1'
+            'cloudformation.eu-west-1.amazonaws.com'
+          when 'us-east-1'
+            'cloudformation.us-east-1.amazonaws.com'
+          when 'us-west-1'
+            'cloudformation.us-west-1.amazonaws.com'
+          else
+            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+          end
+          @path       = options[:path]      || '/'
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def request(params)
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body = AWS.signed_params(
+            params,
+            {
+              :aws_access_key_id  => @aws_access_key_id,
+              :hmac               => @hmac,
+              :host               => @host,
+              :path               => @path,
+              :port               => @port,
+              :version            => '2010-05-15'
+            }
+          )
+
+          begin
+            response = @connection.request({
+              :body       => body,
+              :expects    => 200,
+              :idempotent => idempotent,
+              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :host       => @host,
+              :method     => 'POST',
+              :parser     => parser
+            })
+          rescue Excon::Errors::HTTPStatusError => error
+            if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
+              raise case match[1].split('.').last
+              when 'NotFound'
+                Fog::AWS::Compute::NotFound.slurp(error, match[2])
+              else
+                Fog::AWS::Compute::Error.slurp(error, "#{match[1]} => #{match[2]}")
+              end
+            else
+              raise error
+            end
+          end
+
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/elb.rb

@@ -48,8 +48,11 @@ module Fog
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
+          when 'ap-northeast-1'
+            'elasticloadbalancing.ap-northeast-1.amazonaws.com'
           when 'ap-southeast-1'
             'elasticloadbalancing.ap-southeast-1.amazonaws.com'
           when 'eu-west-1'
@@ -85,7 +88,7 @@ module Fog
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2009-11-25'
+              :version            => '2010-07-01'
             }
           )
 

data/lib/fog/aws/iam.rb

@@ -10,12 +10,16 @@ module Fog
       request :create_access_key
       request :create_group
       request :create_user
+      request :create_login_profile
       request :delete_access_key
       request :delete_group
       request :delete_group_policy
+      request :delete_login_profile
+      request :delete_server_certificate
       request :delete_signing_certificate
       request :delete_user
       request :delete_user_policy
+      request :get_login_profile
       request :get_user
       request :get_user_policy
       request :get_group
@@ -31,8 +35,10 @@ module Fog
       request :remove_user_from_group
       request :update_access_key
       request :update_group
+      request :update_login_profile
       request :update_user
       request :update_signing_certificate
+      request :upload_server_certificate
       request :upload_signing_certificate
 
       class Mock

data/lib/fog/aws/parsers/cloud_formation/basic.rb

@@ -0,0 +1,12 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class Basic < Fog::Parsers::Base
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_formation/create_stack.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class CreateStack < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'RequestId', 'StackId'
+              @response[name] = @value
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_formation/describe_stack_events.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class DescribeStackEvents < Fog::Parsers::Base
+
+          def reset
+            @event = {}
+            @response = { 'StackEvents' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'EventId', 'LogicalResourceId', 'PhysicalResourceId', 'ResourceProperties', 'ResourceStatus', 'ResourceStatusReason', 'ResourceType', 'StackId', 'StackName'
+              @event[name] = @value
+            when 'member'
+              @response['StackEvents'] << @event
+              @event = {}
+            when 'RequestId'
+              @response[name] = @value
+            when 'Timestamp'
+              @event[name] = Time.parse(@value)
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_formation/describe_stack_resources.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class DescribeStackResources < Fog::Parsers::Base
+
+          def reset
+            @resource = {}
+            @response = { 'StackResources' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'StackId', 'StackName', 'LogicalResourceId', 'PhysicalResourceId', 'ResourceType', 'ResourceStatus'
+              @resource[name] = @value
+            when 'member'
+              @response['StackResources'] << @resource
+              @resource = {}
+            when 'RequestId'
+              @response[name] = @value
+            when 'Timestamp'
+              @resource[name] = Time.parse(@value)
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb

@@ -0,0 +1,72 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class DescribeStacks < Fog::Parsers::Base
+
+          def reset
+            @stack = { 'Outputs' => [], 'Parameters' => [] }
+            @output = {}
+            @parameter = {}
+            @response = { 'Stacks' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'Outputs'
+              @in_outputs = true
+            when 'Parameters'
+              @in_parameters = true
+            end
+          end
+
+          def end_element(name)
+            if @in_outputs
+              case name
+              when 'OutputKey', 'OutputValue'
+                @output[name] = @value
+              when 'member'
+                @stack['Outputs'] << @output
+                @output = {}
+              when 'Outputs'
+                @in_outputs = false
+              end
+            elsif @in_parameters
+              case name
+              when 'ParameterKey', 'ParameterValue'
+                @parameter[name] = @value
+              when 'member'
+                @stack['Parameters'] << @parameter
+                @parameter = {}
+              when 'Parameters'
+                @in_parameters = false
+              end
+            else
+              case name
+              when 'member'
+                @response['Stacks'] << @stack
+                @stack = { 'Outputs' => [], 'Parameters' => [] }
+              when 'RequestId'
+                @response[name] = @value
+              when 'CreationTime'
+                @stack[name] = Time.parse(@value)
+              when 'DisableRollback'
+                case @value
+                when 'false'
+                  @stack[name] = false
+                when 'true'
+                  @stack[name] = true
+                end
+              when 'StackName', 'StackId', 'StackStatus'
+                @stack[name] = @value
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end