fog-aws 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73747ec0175ac8091923c4376ba41da0626c0331
-  data.tar.gz: c43e09c5fa96cf35808262263fa58cc8d30e59bf
+  metadata.gz: 20c52aa88f06a8177fe9d43fa20e7ebd444a9a64
+  data.tar.gz: e1616bbc74d55c0e431606b0cb11f91bab3fb68a
 SHA512:
-  metadata.gz: ebb50ffdefcab540dd712073abf9be5ee889429a8b482f6c9300ad226d545d673dd7f9c228c57ba2bc444725d57078a053b053992f0b626bc9b47679820b2cf9
-  data.tar.gz: 4e5c905d9c783195184d9e18a135e5aafa89cef6c0bbf2ad616a1e6a039274a305dabe4d153b58fb2873f2fd831e49dfd6601b6c517432bc3010651c8b8c7d71
+  metadata.gz: 77794deeef38718df73253ac8d9088691e64272ed14bc7180fa7c237e88c67e02b0c45f8c426e5311587cab8fe6523b7f287d752d08ee108180cded5ba54f1c8
+  data.tar.gz: e767e0eeefed0b8806a24633ca77f7acf5fb307f9e795f9afeef5a52893bf52fbee64ae70dc3d3766e405f86e8fadbd5f8c5286d4a3e53fc8bf13202180ba73a

data/README.md

@@ -25,11 +25,60 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Before you can use fog-aws, you must require it in your application:
+
+```ruby
+require 'fog/aws'
+```
+
+Since it's a bad practice to have your credentials in source code, you should load them from default fog configuration file: ```~/.fog```. This file could look like this:
+
+```
+default:
+  aws_access_key_id:     <YOUR_ACCESS_KEY_ID>
+  aws_secret_access_key: <YOUR_SECRET_ACCESS_KEY>
+```
+
+### Connecting to EC2 service
+```ruby
+ec2 = Fog::Compute.new :provider => 'AWS', :region => 'us-west-2'
+```
+
+You can review all the requests available with this service using ```#requests``` method:
+
+```ruby
+ec2.requests # => [:allocate_address, :assign_private_ip_addresses, :associate_address, ...]
+```
+
+### Launch an EC2 on-demand instance:
+
+```ruby
+response = ec2.run_instances(
+  "ami-23ebb513",
+  1,
+  1,
+  "InstanceType"  => "t1.micro",
+  "SecurityGroup" => "ssh",
+  "KeyName"       => "miguel"
+)
+instance_id = response.body["instancesSet"].first["instanceId"] # => "i-02db5af4"
+instance = ec2.servers.get(instance_id)
+instance.wait_for { ready? }
+puts instance.public_ip_address # => "356.300.501.20"
+```
+
+### Terminate an EC2 instance:
+
+```ruby
+instance = ec2.servers.get("i-02db5af4")
+instance.destroy
+```
+
+Fog::AWS is more than EC2 since it supports many services provided by AWS. The best way to learn and to know about how many services are supported is to take a look at the source code. To review the tests directory and to play with the library in ```irb``` can be very helpful resources as well.
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/fog-aws/fork )
+1. Fork it ( https://github.com/fog/fog-aws/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`)

data/lib/fog/aws.rb

@@ -3,9 +3,6 @@ require 'fog/xml'
 require 'fog/json'
 
 require File.expand_path('../aws/version', __FILE__)
-require File.expand_path('../aws/credential_fetcher', __FILE__)
-require File.expand_path('../aws/region_methods', __FILE__)
-require File.expand_path('../aws/signaturev4', __FILE__)
 
 module Fog
   module CDN
@@ -23,57 +20,62 @@ module Fog
   module Storage
     autoload :AWS, File.expand_path('../aws/storage', __FILE__)
   end
-  
+
   module AWS
     extend Fog::Provider
 
-    autoload :Mock, File.expand_path('../aws/mock', __FILE__)
+    autoload :CredentialFetcher, File.expand_path('../aws/credential_fetcher', __FILE__)
     autoload :Errors, File.expand_path('../aws/errors', __FILE__)
+    autoload :Mock, File.expand_path('../aws/mock', __FILE__)
+    autoload :RegionMethods, File.expand_path('../aws/region_methods', __FILE__)
+    autoload :SignatureV4, File.expand_path('../aws/signaturev4', __FILE__)
 
     # Services
-    autoload :AutoScaling, File.expand_path('../aws/auto_scaling', __FILE__)
+    autoload :AutoScaling,      File.expand_path('../aws/auto_scaling', __FILE__)
+    autoload :CloudFormation,   File.expand_path('../aws/cloud_formation', __FILE__)
+    autoload :CloudWatch,       File.expand_path('../aws/cloud_watch', __FILE__)
+    autoload :DataPipeline,     File.expand_path('../aws/data_pipeline', __FILE__)
+    autoload :DynamoDB,         File.expand_path('../aws/dynamodb', __FILE__)
+    autoload :ELB,              File.expand_path('../aws/elb', __FILE__)
+    autoload :EMR,              File.expand_path('../aws/emr', __FILE__)
     autoload :ElasticBeanstalk, File.expand_path('../aws/beanstalk', __FILE__)
-    autoload :CloudFormation, File.expand_path('../aws/cloud_formation', __FILE__)
-    autoload :CloudWatch, File.expand_path('../aws/cloud_watch', __FILE__)
-    autoload :DataPipeline, File.expand_path('../aws/data_pipeline', __FILE__)
-    autoload :DynamoDB, File.expand_path('../aws/dynamodb', __FILE__)
-    autoload :Elasticache, File.expand_path('../aws/elasticache', __FILE__)
-    autoload :ELB, File.expand_path('../aws/elb', __FILE__)
-    autoload :EMR, File.expand_path('../aws/emr', __FILE__)
-    autoload :Federation, File.expand_path('../aws/federation', __FILE__)
-    autoload :Glacier, File.expand_path('../aws/glacier', __FILE__)
-    autoload :IAM, File.expand_path('../aws/iam', __FILE__)
-    autoload :RDS, File.expand_path('../aws/rds', __FILE__)
-    autoload :Redshift, File.expand_path('../aws/redshift', __FILE__)
-    autoload :SES, File.expand_path('../aws/ses', __FILE__)
-    autoload :SimpleDB, File.expand_path('../aws/simpledb', __FILE__)
-    autoload :SNS, File.expand_path('../aws/sns', __FILE__)
-    autoload :SQS, File.expand_path('../aws/sqs', __FILE__)
-    autoload :STS, File.expand_path('../aws/sts', __FILE__)
+    autoload :Elasticache,      File.expand_path('../aws/elasticache', __FILE__)
+    autoload :Federation,       File.expand_path('../aws/federation', __FILE__)
+    autoload :Glacier,          File.expand_path('../aws/glacier', __FILE__)
+    autoload :IAM,              File.expand_path('../aws/iam', __FILE__)
+    autoload :KMS,              File.expand_path('../aws/kms', __FILE__)
+    autoload :RDS,              File.expand_path('../aws/rds', __FILE__)
+    autoload :Redshift,         File.expand_path('../aws/redshift', __FILE__)
+    autoload :SES,              File.expand_path('../aws/ses', __FILE__)
+    autoload :SNS,              File.expand_path('../aws/sns', __FILE__)
+    autoload :SQS,              File.expand_path('../aws/sqs', __FILE__)
+    autoload :STS,              File.expand_path('../aws/sts', __FILE__)
+    autoload :SimpleDB,         File.expand_path('../aws/simpledb', __FILE__)
 
     service(:auto_scaling,    'AutoScaling')
     service(:beanstalk,       'ElasticBeanstalk')
     service(:cdn,             'CDN')
-    service(:compute,         'Compute')
     service(:cloud_formation, 'CloudFormation')
     service(:cloud_watch,     'CloudWatch')
+    service(:compute,         'Compute')
     service(:data_pipeline,   'DataPipeline')
-    service(:dynamodb,        'DynamoDB')
     service(:dns,             'DNS')
+    service(:dynamodb,        'DynamoDB')
     service(:elasticache,     'Elasticache')
     service(:elb,             'ELB')
     service(:emr,             'EMR')
     service(:federation,      'Federation')
     service(:glacier,         'Glacier')
     service(:iam,             'IAM')
+    service(:kms,             'KMS')
     service(:rds,             'RDS')
     service(:redshift,        'Redshift')
     service(:ses,             'SES')
     service(:simpledb,        'SimpleDB')
     service(:sns,             'SNS')
     service(:sqs,             'SQS')
-    service(:sts,             'STS')
     service(:storage,         'Storage')
+    service(:sts,             'STS')
 
     def self.indexed_param(key, values)
       params = {}
@@ -206,4 +208,4 @@ module Fog
       options
     end
   end
-end
+end

data/lib/fog/aws/elb.rb

@@ -96,7 +96,6 @@ module Fog
           @aws_secret_access_key = options[:aws_secret_access_key]
 
           @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,@region,'elasticloadbalancing')
-
         end
 
         def data

data/lib/fog/aws/iam.rb

@@ -10,7 +10,7 @@ module Fog
       class ValidationError < Fog::AWS::IAM::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent, :instrumentor, :instrumentor_name, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at
+      recognizes :host, :path, :port, :scheme, :persistent, :instrumentor, :instrumentor_name, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :region
 
       request_path 'fog/aws/requests/iam'
       request :add_user_to_group
@@ -211,6 +211,7 @@ module Fog
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
+          @region     = options[:region]      || "us-east-1"
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
 
           setup_credentials(options)
@@ -230,7 +231,8 @@ module Fog
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
           #global services that have no region are signed with the us-east-1 region
-          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,'us-east-1','iam')
+          #the only exception is GovCloud, which requires the region to be explicitly specified as us-gov-west-1
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region,'iam')
         end
 
         def request(params)

data/lib/fog/aws/kms.rb

@@ -0,0 +1,180 @@
+module Fog
+  module AWS
+    class KMS < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
+
+      DependencyTimeoutException       = Class.new(Fog::Errors::Error)
+      DisabledException                = Class.new(Fog::Errors::Error)
+      InvalidArnException              = Class.new(Fog::Errors::Error)
+      InvalidGrantTokenException       = Class.new(Fog::Errors::Error)
+      InvalidKeyUsageException         = Class.new(Fog::Errors::Error)
+      KMSInternalException             = Class.new(Fog::Errors::Error)
+      KeyUnavailableException          = Class.new(Fog::Errors::Error)
+      MalformedPolicyDocumentException = Class.new(Fog::Errors::Error)
+      NotFoundException                = Class.new(Fog::Errors::Error)
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :instrumentor, :instrumentor_name
+
+      request_path 'fog/aws/requests/kms'
+      request :list_keys
+      request :create_key
+      request :describe_key
+
+      model_path 'fog/aws/models/kms'
+      model      :key
+      collection :keys
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |region_hash, access_key|
+              region_hash[access_key] = {
+                :keys => {},
+              }
+            end
+          end
+        end
+
+        def self.reset
+          @data.clear
+        end
+
+        attr_reader :account_id
+
+        def initialize(options={})
+          @use_iam_profile = options[:use_iam_profile]
+          @account_id = Fog::AWS::Mock.owner_id
+
+          @region = options[:region] || 'us-east-1'
+          setup_credentials(options)
+
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', '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
+
+        def setup_credentials(options)
+          @aws_access_key_id     = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
+
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 'kms')
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+        end
+      end
+
+      class Real
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
+        # Initialize connection to KMS
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   kms = KMS.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 {}.
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
+        #
+        # ==== Returns
+        # * KMS object with connection to AWS.
+        def initialize(options={})
+
+          @use_iam_profile    = options[:use_iam_profile]
+          @connection_options = options[:connection_options] || {}
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.kms'
+
+          options[:region] ||= 'us-east-1'
+
+          @region     = options[:region]
+          @host       = options[:host]       || "kms.#{@region}.amazonaws.com"
+          @path       = options[:path]       || '/'
+          @persistent = options[:persistent] || false
+          @port       = options[:port]       || 443
+          @scheme     = options[:scheme]     || 'https'
+
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+
+          setup_credentials(options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def setup_credentials(options={})
+          @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]
+
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 'kms')
+        end
+
+        def request(params)
+          refresh_credentials_if_expired
+
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body, headers = Fog::AWS.signed_params_v4(
+            params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            {
+              :aws_session_token  => @aws_session_token,
+              :signer             => @signer,
+              :host               => @host,
+              :path               => @path,
+              :port               => @port,
+              :version            => '2014-11-01',
+              :method             => 'POST'
+            }
+          )
+
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(body, headers, idempotent, parser)
+            end
+          else
+            _request(body, headers, idempotent, parser)
+          end
+        end
+
+        def _request(body, headers, idempotent, parser)
+          @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :headers    => headers,
+            :idempotent => idempotent,
+            :method     => 'POST',
+            :parser     => parser
+          })
+        rescue Excon::Errors::HTTPStatusError => error
+          match = Fog::AWS::Errors.match_error(error)
+
+          if match.empty?
+            raise
+          elsif Fog::AWS::KMS.const_defined?(match[:code])
+            raise Fog::AWS::KMS.const_get(match[:code]).slurp(error, match[:message])
+          else
+            raise Fog::AWS::KMS::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/mock.rb

@@ -165,6 +165,18 @@ module Fog
       def self.rds_address(db_name,region)
         "#{db_name}.#{Fog::Mock.random_letters(rand(12) + 4)}.#{region}.rds.amazonaws.com"
       end
+
+      def self.spot_instance_request_id
+        "sir-#{Fog::Mock.random_letters_and_numbers(8)}"
+      end
+
+      def self.spot_product_descriptions
+        [
+          'Linux/UNIX',
+          'Windows',
+          'SUSE Linux'
+        ]
+      end
     end
   end
-end
+end

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

@@ -433,6 +433,46 @@ module Fog
           :disk                    => 640,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 2
+        },
+        {
+          :id                      => "d2.xlarge",
+          :name                    => "D2 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 31232,
+          :disk                    => 6000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 3
+        },
+        {
+          :id                      => "d2.2xlarge",
+          :name                    => "D2 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 62464,
+          :disk                    => 12000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 6
+        },
+        {
+          :id                      => "d2.4xlarge",
+          :name                    => "D2 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 124928,
+          :disk                    => 24000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 12
+        },
+        {
+          :id                      => "d2.8xlarge",
+          :name                    => "D2 Eight Extra Large",
+          :bits                    => 64,
+          :cores                   => 36,
+          :ram                     => 249856,
+          :disk                    => 48000,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 24
         }
       ]