aws-sdk-core 2.0.0.rc4 → 2.0.0.rc5

data/features/sdb/client.feature

@@ -3,14 +3,12 @@
 Feature: Amazon SimpleDB
 
   Scenario: Making a basic request
-    When I call "list_domains" on "sdb"
-    Then the response "domain_names" should be an array
+    When I call the "ListDomains" API
+    Then the response should contain a list of "DomainNames"
 
   Scenario: Error handling
-    Given I call "domain_metadata" on "sdb" with:
-    """
-    { domain_name: 'fake-domain' }
-    """
+    When I attempt to call the "DomainMetadata" API with:
+    | DomainName | fake-domain |
     Then I expect the response error code to be "NoSuchDomain"
     And I expect the response error message to include:
     """

data/features/sdb/{setup.rb → step_definitions.rb}

@@ -1,5 +1,5 @@
 Before("@sdb") do
-  @sdb = Aws.sdb
+  @sdb = @client = Aws.sdb
 end
 
 After("@sdb") do

data/features/ses/client.feature

@@ -3,14 +3,12 @@
 Feature: Amazon Simple Email Service
 
   Scenario: Making a basic request
-    When I call "list_identities" on "ses"
-    Then the response "identities" should be an array
+    When I call the "ListIdentities" API
+    Then the response should contain a list of "Identities"
 
   Scenario: Error handling
-    Given I call "verify_email_identity" on "ses" with:
-    """
-    { email_address: 'fake_email' }
-    """
+    When I attempt to call the "VerifyEmailIdentity" API with:
+    | EmailAddress | fake_email |
     Then I expect the response error code to be "InvalidParameterValue"
     And I expect the response error message to include:
     """

data/features/ses/{setup.rb → step_definitions.rb}

@@ -1,5 +1,5 @@
 Before("@ses") do
-  @ses = Aws.ses
+  @ses = @client = Aws.ses
 end
 
 After("@ses") do

data/features/sns/client.feature

@@ -3,14 +3,13 @@
 Feature: Amazon Simple Notification Service
 
   Scenario: Making a basic request
-    When I call "list_topics" on "sns"
-    Then the response "topics" should be an array
+    When I call the "ListTopics" API
+    Then the response should contain a list of "Topics"
 
   Scenario: Error handling
-    Given I call "publish" on "sns" with:
-    """
-    { message: 'hello', topic_arn: 'fake_topic' }
-    """
+    When I attempt to call the "Publish" API with:
+    | Message  | hello      |
+    | TopicArn | fake_topic |
     Then I expect the response error code to be "InvalidParameter"
     And I expect the response error message to include:
     """

data/features/sns/{setup.rb → step_definitions.rb}

@@ -1,5 +1,5 @@
 Before("@sns") do
-  @sns = Aws.sns
+  @sns = @client = Aws.sns
 end
 
 After("@sns") do

data/features/sqs/client.feature

@@ -3,19 +3,17 @@
 Feature: Amazon Simple Queue Service
 
   Scenario: Making a basic request
-    When I call "list_queues" on "sqs"
-    Then the response "queue_urls" should be an array
+    When I call the "ListQueues" API
+    Then the response should contain a list of "QueueUrls"
 
   Scenario: Cross Region Queue Operatoins
     Given I create a queue in "us-west-1"
-    When I operate on that queue in "us-west-2"
+    When I operate on that queue in "us-east-1"
     Then the request should be made against "us-west-1"
 
   Scenario: Error handling
-    Given I call "get_queue_url" on "sqs" with:
-    """
-    { queue_name: 'fake_queue' }
-    """
+    When I attempt to call the "GetQueueUrl" API with:
+    | QueueName | fake_queue |
     Then I expect the response error code to be "NonExistentQueue"
     And I expect the response error message to include:
     """

data/features/sqs/step_definitions.rb

@@ -1,3 +1,14 @@
+Before("@sqs") do
+  @sqs = @client = Aws.sqs
+  @sqs_created_queues = []
+end
+
+After("@sqs") do
+  @sqs_created_queues.each do |url|
+    @sqs.delete_delete_queue(queue_url: url)
+  end
+end
+
 Given(/^I create a queue in "(.*?)"$/) do |region|
   name = "aws-sdk-core-integration-test-#{Time.now.to_i}-#{rand(1000)}"
   resp = Aws.sqs(region: region).create_queue(queue_name: name)

data/features/step_definitions.rb

@@ -0,0 +1,88 @@
+def eventually(seconds = 15, &block)
+  delays = [1]
+  while delays.inject(0) { |sum, i| sum + i } < seconds
+    delays << delays.last * 1.2
+  end
+  begin
+    yield
+  rescue StandardError, RSpec::Expectations::ExpectationNotMetError => error
+    unless delays.empty?
+      sleep(delays.shift)
+      retry
+    end
+    raise error # terminal case
+  end
+end
+
+def underscore(str)
+  Aws::Util.underscore(str)
+end
+
+def symbolized_params(table)
+  table.rows_hash.each_with_object({}) do |(key,value), hash|
+    hash[underscore(key).to_sym] = param_value(value)
+  end
+end
+
+def raw_params(table)
+  table.rows_hash.each_with_object({}) do |(key,value), hash|
+    hash[key] = param_value(value)
+  end
+end
+
+def param_value(value)
+  case value
+  when /^\d+$/ then value.to_i
+  when /^\[(.*)\]$/ then $1.split(',').map { |str| str[1..-2] }
+  else value
+  end
+end
+
+When(/^I call the "(.*?)" API$/) do |api|
+  @response = @client.send(underscore(api))
+end
+
+When(/^I (attempt to )?call the "(.*?)" API with:$/) do |_, api, params|
+  params = @raw_json ? raw_params(params) : symbolized_params(params)
+  begin
+    @response = @client.send(underscore(api), params)
+  rescue => @error
+  end
+end
+
+Then(/^the response should contain a (list of )?"(\w+?)"$/) do |_,member_name|
+  data = @response.data
+  data = data[underscore(member_name)]
+  expect(data).to be_an(Array)
+end
+
+Then(/^the response should contain a "(\w+?)" with a list of "(\w+?)"$/) do |member1, member2|
+  data = @response.data
+  data = data[underscore(member1)]
+  data = data[underscore(member2)]
+  expect(data).to be_an(Array)
+end
+
+Then(/^I expect the response error code to be "(.*?)"$/) do |error_code|
+  expect(@error.class.name.split('::').last).to eq(error_code)
+end
+
+Then(/^I expect the response error message to include:$/) do |error_message|
+  expect(@error.message).to include(error_message)
+end
+
+Then(/^the HTTP request body should be:$/) do |string|
+  expect(@response.context.http_request.body_contents).to eq(string)
+end
+
+Then(/^I expect response data to be a hash$/) do
+  expect(@response.data).to be_a(Hash)
+end
+
+Then(/^I expect response data\["(.*?)"\] to be an array$/) do |key|
+  expect(@response.data[key]).to be_an(Array)
+end
+
+Then(/^the response should contain a "(.*?)" member$/) do |member_name|
+  expect(@response.data[underscore(member_name)]).not_to be_nil
+end

data/features/storagegateway/client.feature

@@ -3,14 +3,12 @@
 Feature: AWS Storage Gateway
 
   Scenario: Making a basic request
-    When I call "list_gateways" on "storagegateway"
-    Then the response "gateways" should be an array
+    When I call the "ListGateways" API
+    Then the response should contain a list of "Gateways"
 
   Scenario: Error handling
-    Given I call "list_volumes" on "storagegateway" with:
-    """
-    { gateway_arn: 'fake_gateway' }
-    """
+    When I attempt to call the "ListVolumes" API with:
+    | GatewayARN | fake_gateway |
     Then I expect the response error code to be "ValidationException"
     And I expect the response error message to include:
     """

data/features/storagegateway/{setup.rb → step_definitions.rb}

@@ -1,5 +1,5 @@
 Before("@storagegateway") do
-  @storagegateway = Aws.storagegateway
+  @storagegateway = @client = Aws.storagegateway
 end
 
 After("@storagegateway") do

data/features/sts/client.feature

@@ -3,14 +3,13 @@
 Feature: AWS STS
 
   Scenario: Making a basic request
-    When I call "get_session_token" on "sts"
-    Then the response data should include "credentials"
+    When I call the "GetSessionToken" API
+    Then the response should contain a "Credentials" member
 
   Scenario: Error handling
-    Given I call "get_federation_token" on "sts" with:
-    """
-    { name: 'temp', policy: '' }
-    """
+    When I attempt to call the "GetFederationToken" API with:
+    | Name   | temp |
+    | Policy |      |
     Then I expect the response error code to be "ValidationError"
     And I expect the response error message to include:
     """

data/features/sts/{setup.rb → step_definitions.rb}

@@ -1,5 +1,5 @@
 Before("@sts") do
-  @sts = Aws.sts
+  @sts = @client = Aws.sts
 end
 
 After("@sts") do

data/features/swf/client.feature

@@ -3,17 +3,13 @@
 Feature: Amazon Simple Workflow Service
 
   Scenario: Making a basic request
-    When I call "list_domains" on "swf" with:
-    """
-    { registration_status: 'REGISTERED' }
-    """
-    Then the response "domain_infos" should be an array
+    When I call the "ListDomains" API with:
+    | RegistrationStatus | REGISTERED |
+    Then the response should contain a list of "DomainInfos"
 
   Scenario: Error handling
-    Given I call "describe_domain" on "swf" with:
-    """
-    { name: 'fake_domain' }
-    """
+    When I attempt to call the "DescribeDomain" API with:
+    | Name | fake_domain |
     Then I expect the response error code to be "UnknownResourceFault"
     And I expect the response error message to include:
     """

data/features/swf/{setup.rb → step_definitions.rb}

@@ -1,5 +1,5 @@
 Before("@swf") do
-  @swf = Aws.swf
+  @swf = @client = Aws.swf
 end
 
 After("@swf") do

data/lib/aws/api/shape_translator.rb

@@ -36,6 +36,7 @@ module Aws
       ignore :member_order
       ignore :box
       ignore :streaming
+      ignore :sensitive
 
       # validation properties
       ignore :pattern

data/lib/aws/errors.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Aws
   module Errors
 
@@ -9,12 +11,8 @@ module Aws
 
       # @param [Seahorse::Client::RequestContext] context
       # @param [String] message
-      def initialize(context = nil, message = nil)
-        if context.is_a?(String)
-          message = context
-        else
-          @context = context
-        end
+      def initialize(context, message)
+        @context = context
         super(message)
       end
 
@@ -53,8 +51,12 @@ module Aws
     # @api private
     module DynamicErrors
 
+      def self.extended(submodule)
+        submodule.instance_variable_set("@const_set_mutex", Mutex.new)
+      end
+
       def const_missing(constant)
-        const_set(constant, Class.new(ServiceError))
+        set_error_constant(constant)
       end
 
       # Given the name of a service and an error code, this method
@@ -64,14 +66,36 @@ module Aws
       #     #=> #<Aws::S3::Errors::NoSuchBucket>
       #
       # @api private
-      def error_class(contstant)
-        if constants.include?(contstant.to_sym)
-          const_get(contstant)
+      def error_class(error_code)
+        constant = error_code.to_s
+        constant = constant.gsub(/http:\/\/.*$/, '') # remove http namespaces
+        constant = constant.gsub(/[^a-zA-Z0-9]/, '').to_sym
+        if error_const_set?(constant)
+          const_get(constant)
         else
-          const_set(contstant, Class.new(ServiceError))
+          set_error_constant(constant)
         end
       end
 
+      private
+
+      def set_error_constant(constant)
+        @const_set_mutex.synchronize do
+          # Ensure the const was not defined while blocked by the mutex
+          if error_const_set?(constant)
+            const_get(constant)
+          else
+            const_set(constant , Class.new(ServiceError))
+          end
+        end
+      end
+
+      def error_const_set?(constant)
+        # Purposefully not using #const_defined? as that method returns true
+        # for constants not defined directly in the current module.
+        constants.include?(constant.to_sym)
+      end
+
     end
   end
 end

data/lib/aws/plugins/credentials.rb

@@ -2,14 +2,17 @@ module Aws
   module Plugins
 
     # @seahorse.client.option [String] :access_key_id Your AWS account
-    #   access key ID.  Defaults to `ENV['AWS_ACCESS_KEY_ID']`.
+    #   access key ID.  Defaults to `ENV['AWS_ACCESS_KEY']`.
+    #   Also checks `AWS_ACCESS_KEY_ID` and `AMAZON_ACCESS_KEY_ID`.
     #
     # @seahorse.client.option [String] :secret_access_key Your AWS account
-    #   secret access key.  Defaults to `ENV['AWS_SECRET_ACCESS_KEY']`.
+    #   secret access key.  Defaults to `ENV['AWS_SECRET_KEY']`.
+    #   Also checks `AWS_SECRET_ACCESS_KEY` and `AMAZON_SECRET_ACCESS_KEY`.
     #
     # @seahorse.client.option [String] :session_token If your credentials
     #   are temporary session credentials, this should be the
     #   session token.  Defaults to `ENV['AWS_SESSION_TOKEN']`.
+    #   Also checks `AMAZON_SESSION_TOKEN`.
     #
     # @seahorse.client.option [Credentials] :credentials
     #   Your AWS account credentials.  Defaults to a new {Credentials} object
@@ -19,15 +22,18 @@ module Aws
     class Credentials < Seahorse::Client::Plugin
 
       option(:access_key_id) {
-        ENV['AWS_ACCESS_KEY_ID'] || ENV['AMAZON_ACCESS_KEY_ID']
+        keys = %w(AWS_ACCESS_KEY AWS_ACCESS_KEY_ID AMAZON_ACCESS_KEY_ID)
+        ENV.values_at(*keys).compact.first
       }
 
       option(:secret_access_key) {
-        ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
+        keys = %w(AWS_SECRET_KEY AWS_SECRET_ACCESS_KEY AMAZON_SECRET_ACCESS_KEY)
+        ENV.values_at(*keys).compact.first
       }
 
       option(:session_token) {
-        ENV['AWS_SESSION_TOKEN'] || ENV['AMAZON_SESSION_TOKEN']
+        keys = %w(AWS_SESSION_TOKEN AMAZON_SESSION_TOKEN)
+        ENV.values_at(*keys).compact.first
       }
 
       option(:credentials) do |config|

data/lib/aws/plugins/regional_endpoint.rb

@@ -1,9 +1,10 @@
 module Aws
   module Plugins
 
-    # @seahorse.client.option [String] :region (ENV['AWS_REGION'])
+    # @seahorse.client.option [String] :region
     #   The AWS region to connect to.  The region is used to construct
-    #   the client endpoint.
+    #   the client endpoint.  Defaults to `ENV['AWS_DEFAULT_REGION']`.
+    #   Also checks `AWS_REGION` and `AMAZON_REGION`.
     #
     # @seahorse.client.option [String] :endpoint
     #   The HTTP endpoint for this client. Normally you should not need
@@ -17,7 +18,10 @@ module Aws
       # raised when region is not configured
       MISSING_REGION = 'missing required configuration option :region'
 
-      option(:region) { ENV['AWS_REGION'] || ENV['AMAZON_REGION'] }
+      option(:region) {
+        keys = %w(AWS_DEFAULT_REGION AWS_REGION AMAZON_REGION)
+        ENV.values_at(*keys).compact.first
+      }
 
       option(:endpoint) do |cfg|
         endpoints = cfg.api.metadata['regional_endpoints']