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

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

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

data/features/elasticloadbalancing/client.feature

@@ -3,14 +3,12 @@
 Feature: Elastic Load Balancing
 
   Scenario: Making a basic request
-    When I call "describe_load_balancers" on "elasticloadbalancing"
-    Then the response "load_balancer_descriptions" should be an array
+    When I call the "DescribeLoadBalancers" API
+    Then the response should contain a list of "LoadBalancerDescriptions"
 
   Scenario: Error handling
-    Given I call "describe_load_balancers" on "elasticloadbalancing" with:
-    """
-    { load_balancer_names: ['fake_load_balancer'] }
-    """
+    When I attempt to call the "DescribeLoadBalancers" API with:
+    | LoadBalancerNames | ['fake_load_balancer'] |
     Then I expect the response error code to be "ValidationError"
     And I expect the response error message to include:
     """

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

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

data/features/elastictranscoder/client.feature

@@ -3,14 +3,12 @@
 Feature: Amazon Elastic Transcoder
 
   Scenario: Making a basic request
-    When I call "list_presets" on "elastictranscoder"
-    Then the response "presets" should be an array
+    When I call the "ListPresets" API
+    Then the response should contain a list of "Presets"
 
   Scenario: Error handling
-    Given I call "read_job" on "elastictranscoder" with:
-    """
-    { id: 'fake_job' }
-    """
+    When I attempt to call the "ReadJob" API with:
+    | Id | fake_job |
     Then I expect the response error code to be "ValidationException"
     And I expect the response error message to include:
     """

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

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

data/features/emr/client.feature

@@ -3,14 +3,12 @@
 Feature: Amazon EMR
 
   Scenario: Making a basic request
-    When I call "describe_job_flows" on "emr"
-    Then the response "job_flows" should be an array
+    When I call the "DescribeJobFlows" API
+    Then the response should contain a list of "JobFlows"
 
   Scenario: Error handling
-    Given I call "describe_job_flows" on "emr" with:
-    """
-    { job_flow_ids: ['fake_job_flow'] }
-    """
+    When I attempt to call the "DescribeJobFlows" API with:
+    | JobFlowIds | ['fake_job_flow'] |
     Then I expect the response error code to be "ValidationException"
     And I expect the response error message to include:
     """

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

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

data/features/env.rb

@@ -21,5 +21,3 @@ else
   puts msg
   exit(0)
 end
-
-Aws.config[:raise_response_errors] = false

data/features/glacier/client.feature

@@ -1,41 +1,17 @@
 # language: en
-@glacier
+@glacier @client
 Feature: Amazon Glacier
 
-  Scenario: Listing vaults
-    When I call "list_vaults" on "glacier" with:
-    """
-    { account_id: '-' }
-    """
-    Then the response data should include "vault_list"
-    And the response "vault_list" should be an array
-
-  @upload
-  Scenario: Uploading an archive from a string
-    When I upload an archive with the contents "Hello World!"
-    Then I should be able to delete the archive
-
-  @upload @slow
-  Scenario: Uploading and deleting an archive
-    When I upload an archive from a 5.5MB large file
-    Then I should be able to delete the archive
-
-  @multipart @upload @slow
-  Scenario: Using multipart upload interface
-    When I multipart-upload a 15.5MB file in 1048576 byte chunks
-    Then I should be able to delete the archive
-
-  # There was an issue where the client would fail attempting to compute
-  # a checksum of an empty body, this step ensures that the checksum
-  # computation does not hang.
-  @upload
-  Scenario: Attempting to upload an empty archive
-    When I upload an archive with the contents ""
-    Then a "InvalidParameterValueException" error should be raised
+  Scenario: Making a basic request
+    When I call the "ListVaults" API with:
+    | AccountId | - |
+    Then the response should contain a "VaultList"
 
   Scenario: Error handling
-    When I call "list_vaults" on "glacier" with:
+    When I attempt to call the "ListVaults" API with:
+    | AccountId | abcmnoxyz |
+    Then I expect the response error code to be "AccessDeniedException"
+    And I expect the response error message to include:
     """
-    { account_id: 'abcmnoxyz' }
+    Access denied
     """
-    Then a "AccessDeniedException" error should be raised

data/features/glacier/step_definitions.rb

@@ -1,8 +1,15 @@
+Before("@glacier") do
+  @glacier = @client = Aws.glacier
+end
+
+After("@glacier") do
+end
+
 def upload_glacier_archive(contents)
-  resp = call_request('glacier', 'upload_archive', {
+  resp = @glacier.upload_archive(
     vault_name: @vault_name,
-    body: contents,
-  })
+    body: contents
+  )
   @archive_id = resp.data.archive_id if resp.data
 end
 
@@ -17,8 +24,21 @@ def bytes(megabytes)
   megabytes.to_f * 1024 * 1024
 end
 
+Given(/^I have a vault ready to receive uploads$/) do
+  # ensure we have a suitable vault for testing with
+  @vault_name = 'aws-sdk-core-integration-test-vault'
+  begin
+    @glacier.describe_vault(vault_name: @vault_name, account_id: '-')
+  rescue Aws::Glacier::Errors::ResourceNotFoundException
+    @glacier.create_vault(vault_name: @vault_name, account_id: '-')
+  end
+end
+
 When(/^I upload an archive with the contents "(.*?)"$/) do |contents|
-  upload_glacier_archive(contents)
+  begin
+    upload_glacier_archive(contents)
+  rescue => @error
+  end
 end
 
 When(/^I upload an archive from a ([0-9\.]+)MB large file$/) do |size_in_mb|
@@ -69,8 +89,5 @@ When(/^I multipart\-upload a ([0-9\.]+)MB file in ([0-9\.]+) byte chunks$/) do |
 end
 
 Then(/^I should be able to delete the archive$/) do
-  call_request('glacier', 'delete_archive', {
-    vault_name: @vault_name,
-    archive_id: @archive_id,
-  })
+  @glacier.delete_archive(vault_name: @vault_name, archive_id: @archive_id)
 end

data/features/glacier/upload.feature

@@ -0,0 +1,27 @@
+# language: en
+@glacier @upload
+Feature: Amazon Glacier
+
+  Background:
+    Given I have a vault ready to receive uploads
+
+  Scenario: Uploading an archive from a string
+    When I upload an archive with the contents "Hello World!"
+    Then I should be able to delete the archive
+
+  @slow
+  Scenario: Uploading and deleting an archive
+    When I upload an archive from a 5.5MB large file
+    Then I should be able to delete the archive
+
+  @multipart @slow
+  Scenario: Using multipart upload interface
+    When I multipart-upload a 15.5MB file in 1048576 byte chunks
+    Then I should be able to delete the archive
+
+  # There was an issue where the client would fail attempting to compute
+  # a checksum of an empty body, this step ensures that the checksum
+  # computation does not hang.
+  Scenario: Attempting to upload an empty archive
+    When I upload an archive with the contents ""
+    Then I expect the response error code to be "InvalidParameterValueException"

data/features/iam/client.feature

@@ -3,14 +3,12 @@
 Feature: AWS Identity and Access Management
 
   Scenario: Making a basic request
-    When I call "list_users" on "iam"
-    Then the response "users" should be an array
+    When I call the "ListUsers" API
+    Then the response should contain a list of "Users"
 
   Scenario: Error handling
-    Given I call "get_user" on "iam" with:
-    """
-    { user_name: 'fake_user' }
-    """
+    When I attempt to call the "GetUser" API with:
+    | UserName | fake_user |
     Then I expect the response error code to be "NoSuchEntity"
     And I expect the response error message to include:
     """

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

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

data/features/importexport/client.feature

@@ -3,14 +3,12 @@
 Feature: AWS Import/Export
 
   Scenario: Making a basic request
-    When I call "list_jobs" on "importexport"
-    Then the response "jobs" should be an array
+    When I call the "ListJobs" API
+    Then the response should contain a list of "Jobs"
 
   Scenario: Error handling
-    Given I call "get_status" on "importexport" with:
-    """
-    { job_id: 'fake_job' }
-    """
+    When I attempt to call the "GetStatus" API with:
+    | JobId | fake_job |
     Then I expect the response error code to be "InvalidJobIdException"
     And I expect the response error message to include:
     """

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

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

data/features/kinesis/client.feature

@@ -3,14 +3,12 @@
 Feature: AWS Kinesis
 
   Scenario: Making a basic request
-    When I call "list_streams" on "kinesis"
-    Then the response "stream_names" should be an array
+    When I call the "ListStreams" API
+    Then the response should contain a list of "StreamNames"
 
   Scenario: Error handling
-    Given I call "describe_stream" on "kinesis" with:
-    """
-    { stream_name: 'bogus-stream-name' }
-    """
+    When I attempt to call the "DescribeStream" API with:
+    | StreamName | bogus-stream-name |
     Then I expect the response error code to be "ResourceNotFoundException"
     And I expect the response error message to include:
     """

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

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

data/features/opsworks/client.feature

@@ -3,14 +3,12 @@
 Feature: AWS OpsWorks
 
   Scenario: Making a basic request
-    When I call "describe_stacks" on "opsworks"
-    Then the response "stacks" should be an array
+    When I call the "DescribeStacks" API
+    Then the response should contain a list of "Stacks"
 
   Scenario: Error handling
-    Given I call "describe_layers" on "opsworks" with:
-    """
-    { stack_id: 'fake_stack' }
-    """
+    When I attempt to call the "DescribeLayers" API with:
+    | StackId | fake_stack |
     Then I expect the response error code to be "ResourceNotFoundException"
     And I expect the response error message to include:
     """

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

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

data/features/rds/client.feature

@@ -3,14 +3,12 @@
 Feature: Amazon RDS
 
   Scenario: Making a basic request
-    When I call "describe_db_engine_versions" on "rds"
-    Then the response "db_engine_versions" should be an array
+    When I call the "DescribeDbEngineVersions" API
+    Then the response should contain a list of "DbEngineVersions"
 
   Scenario: Error handling
-    Given I call "describe_db_instances" on "rds" with:
-    """
-    { db_instance_identifier: 'fake-id' }
-    """
+    When I attempt to call the "DescribeDbInstances" API with:
+    | DbInstanceIdentifier | fake-id |
     Then I expect the response error code to be "DBInstanceNotFound"
     And I expect the response error message to include:
     """

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

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

data/features/redshift/client.feature

@@ -3,14 +3,12 @@
 Feature: Amazon Redshift
 
   Scenario: Making a basic request
-    When I call "describe_cluster_versions" on "redshift"
-    Then the response "cluster_versions" should be an array
+    When I call the "DescribeClusterVersions" API
+    Then the response should contain a list of "ClusterVersions"
 
   Scenario: Error handling
-    Given I call "describe_clusters" on "redshift" with:
-    """
-    { cluster_identifier: 'fake-cluster' }
-    """
+    When I attempt to call the "DescribeClusters" API with:
+    | ClusterIdentifier | fake-cluster |
     Then I expect the response error code to be "ClusterNotFound"
     And I expect the response error message to include:
     """

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

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

data/features/route53/client.feature

@@ -3,14 +3,12 @@
 Feature: Amazon Route 53
 
   Scenario: Making a basic request
-    When I call "list_hosted_zones" on "route53"
-    Then the response "hosted_zones" should be an array
+    When I call the "ListHostedZones" API
+    Then the response should contain a list of "HostedZones"
 
   Scenario: Error handling
-    Given I call "get_hosted_zone" on "route53" with:
-    """
-    { id: 'fake-zone' }
-    """
+    When I attempt to call the "GetHostedZone" API with:
+    | Id | fake-zone |
     Then I expect the response error code to be "NoSuchHostedZone"
     And I expect the response error message to include:
     """

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

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

data/features/s3/buckets.feature

@@ -30,3 +30,11 @@ Feature: S3 Buckets
     Given I am using the S3 "http://s3.amazonaws.com" endpoint
     When I create a bucket with a DNS compatible name that contains a dot
     Then I should be able to delete the bucket
+
+  @force_path_style
+  Scenario: Operating on a bucket/object using path style
+    Given I force path style requests
+    And I create a DNS compatible bucket
+    When I put "abc" to the key "object-key"
+    Then the bucket name should be in the request path
+    And the bucket name should not be in the request host

data/features/s3/step_definitions.rb

@@ -1,3 +1,21 @@
+Before("@s3") do
+  @s3 = @client = Aws.s3
+  @created_buckets = []
+end
+
+After("@s3") do
+  @created_buckets.each do |bucket|
+    loop do
+      objects = @s3.list_object_versions(bucket: bucket).data.versions.map do |v|
+        { key: v.key, version_id: v.version_id }
+      end
+      break if objects.empty?
+      @s3.delete_objects(bucket: bucket, delete: { objects: objects })
+    end
+    @s3.delete_bucket(bucket: bucket)
+  end
+end
+
 def create_bucket(options = {})
   @bucket_name = "aws-sdk-test-#{Time.now.to_i}-#{rand(1000)}"
   options[:bucket] = @bucket_name
@@ -10,6 +28,10 @@ def create_bucket(options = {})
   @created_buckets << @bucket_name
 end
 
+When(/^I force path style requests$/) do
+  @s3 = Aws.s3(force_path_style:true)
+end
+
 Given(/^I am using the S3 "(.*?)" region$/) do |region|
   @s3 = Aws.s3(region: region)
 end
@@ -18,6 +40,10 @@ When(/^I create a bucket$/) do
   create_bucket
 end
 
+Given(/^I create a DNS compatible bucket$/) do
+  create_bucket
+end
+
 When(/^I create a bucket with the location constraint "(.*?)"$/) do |loc|
   create_bucket(create_bucket_configuration: {
     location_constraint: loc
@@ -40,8 +66,11 @@ end
 
 Then(/^the bucket should not exist$/) do
   eventually do
-    resp = @s3.get_bucket_location(bucket: @bucket_name)
-    expect(resp.error).to be_kind_of(Aws::S3::Errors::NoSuchBucket)
+    begin
+      @s3.get_bucket_location(bucket: @bucket_name)
+    rescue => @error
+    end
+    expect(@error).to be_kind_of(Aws::S3::Errors::NoSuchBucket)
   end
 end
 
@@ -50,7 +79,7 @@ When(/^I put nothing to the key "(.*?)"$/) do |key|
 end
 
 When(/^I put "(.*?)" to the key "(.*?)"$/) do |data, key|
-  @s3.put_object(bucket: @bucket_name, key: key, body: data)
+  @response = @s3.put_object(bucket: @bucket_name, key: key, body: data)
 end
 
 When(/^I put the test png to the key "(.*?)"$/) do |key|
@@ -92,3 +121,13 @@ end
 Then(/^I should be able to delete the bucket$/) do
   @s3.delete_bucket(bucket: @bucket_name)
 end
+
+Then(/^the bucket name should be in the request path$/) do
+  endpoint = @response.context.http_request.endpoint
+  expect(endpoint.path).to include(@bucket_name)
+end
+
+Then(/^the bucket name should not be in the request host$/) do
+  endpoint = @response.context.http_request.endpoint
+  expect(endpoint.host).not_to include(@bucket_name)
+end