aws-sdk-core 2.0.0.rc6 → 2.0.0.rc7

data/lib/aws/structure.rb

@@ -26,6 +26,7 @@ module Aws
       else obj
       end
     end
+    alias to_h to_hash
 
     # @param [Array<Symbol>] properties
     # @return [Structure]

data/lib/aws/util.rb

@@ -4,28 +4,27 @@ module Aws
   # @api private
   module Util
 
+    # @api private
+    IRREGULAR_INFLECTIONS = {
+      'ARNs' => 'arns',
+      'CNAMEs' => 'cnames',
+      'Ec2' => 'ec2',
+      'ElastiCache' => 'elasticache',
+      'ETag' => 'etag',
+      'iSCSI' => 'iscsi',
+    }
+
+    # @api private
+    IRREGULAR_REGEX = Regexp.new(IRREGULAR_INFLECTIONS.keys.join('|'))
+
     # @param [String] string
     # @return [String] Returns the underscored version of the given string.
     def underscore(string)
-      inflector = Hash.new do |hash, key|
-        key.
-          gsub(/([A-Z0-9]+)([A-Z][a-z])/, '\1_\2'). # split acronyms
-          scan(/[a-z]+|\d+|[A-Z0-9]+[a-z]*/).       # split words
-          join('_').downcase                        # join parts
-      end
-
-      # add a few irregular inflections
-      inflector['ETag'] = 'etag'
-      inflector['s3Bucket'] = 's3_bucket'
-      inflector['s3Key'] = 's3_key'
-      inflector['Ec2KeyName'] = 'ec2_key_name'
-      inflector['Ec2SubnetId'] = 'ec2_subnet_id'
-      inflector['Ec2VolumeId'] = 'ec2_volume_id'
-      inflector['Ec2InstanceId'] = 'ec2_instance_id'
-      inflector['ElastiCache'] = 'elasticache'
-      inflector['NotificationARNs'] = 'notification_arns'
-
-      inflector[string]
+        string.
+          gsub(IRREGULAR_REGEX) { |word| '_' + IRREGULAR_INFLECTIONS[word] }.
+          gsub(/([A-Z0-9]+)([A-Z][a-z])/, '\1_\2').
+          scan(/[a-z0-9]+|\d+|[A-Z0-9]+[a-z]*/).
+          join('_').downcase
     end
     module_function :underscore
 

data/lib/aws/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.0.rc6'
+  VERSION = '2.0.0.rc7'
 end

data/spec/aws/credentials_spec.rb

@@ -34,6 +34,14 @@ module Aws
         expect(Credentials.new('akid', nil).set?).to be(false)
       end
 
+      it 'returns false if the key is an empty string' do
+        expect(Credentials.new('', 'secret').set?).to be(false)
+      end
+
+      it 'returns false if the secret is an empty string' do
+        expect(Credentials.new('akid', '').set?).to be(false)
+      end
+
     end
   end
 end

data/spec/aws/plugins/credentials_spec.rb

@@ -8,8 +8,19 @@ module Aws
 
       let(:plugin) { Plugins::Credentials.new }
 
+
       before do
+
+        # remove all
         stub_const("ENV", env)
+
+        # disable loading credentials from shared file
+        allow(Dir).to receive(:home).and_raise(ArgumentError)
+
+        # disable instance profile credentials
+        path = '/latest/meta-data/iam/security-credentials/'
+        stub_request(:get, "http://169.254.169.254#{path}").to_raise(SocketError)
+
       end
 
       describe 'configuration' do
@@ -26,19 +37,20 @@ module Aws
           expect(config.build!.credentials).to be(nil)
         end
 
-        it 'hydrates credentials from the cmdline env (AWS_)' do
-          env['AWS_ACCESS_KEY'] = 'akid'
-          env['AWS_SECRET_KEY'] = 'secret'
-          env['AWS_SESSION_TOKEN'] = 'token'
+        it 'hydrates credentials from config options' do
+          options = {}
+          options[:access_key_id] = 'akid'
+          options[:secret_access_key] = 'secret'
+          options[:session_token] = 'session'
           plugin.add_options(config)
-          cfg = config.build!
+          cfg = config.build!(options)
           expect(cfg.credentials.set?).to be(true)
           expect(cfg.credentials.access_key_id).to eq('akid')
           expect(cfg.credentials.secret_access_key).to eq('secret')
-          expect(cfg.credentials.session_token).to eq('token')
+          expect(cfg.credentials.session_token).to eq('session')
         end
 
-        it 'hydrates credentials from the env (AWS_)' do
+        it 'hydrates credentials from ENV with prefix AWS_' do
           env['AWS_ACCESS_KEY_ID'] = 'akid'
           env['AWS_SECRET_ACCESS_KEY'] = 'secret'
           env['AWS_SESSION_TOKEN'] = 'token'
@@ -50,7 +62,7 @@ module Aws
           expect(cfg.credentials.session_token).to eq('token')
         end
 
-        it 'hydrates credentials from the env (AMAZON_)' do
+        it 'hydrates credentials from ENV with prefix AMAZON_' do
           env['AMAZON_ACCESS_KEY_ID'] = 'akid2'
           env['AMAZON_SECRET_ACCESS_KEY'] = 'secret2'
           env['AMAZON_SESSION_TOKEN'] = 'token2'
@@ -62,17 +74,61 @@ module Aws
           expect(cfg.credentials.session_token).to eq('token2')
         end
 
-        it 'hydrates credentials object from 3 options' do
-          options = {}
-          options[:access_key_id] = 'akid'
-          options[:secret_access_key] = 'secret'
-          options[:session_token] = 'session'
+        it 'hydrates credentials from ENV at AWS_ACCESS_KEY & AWS_SECRET_KEY' do
+          env['AWS_ACCESS_KEY'] = 'akid3'
+          env['AWS_SECRET_KEY'] = 'secret3'
           plugin.add_options(config)
-          cfg = config.build!(options)
+          cfg = config.build!
+          expect(cfg.credentials.set?).to be(true)
+          expect(cfg.credentials.access_key_id).to eq('akid3')
+          expect(cfg.credentials.secret_access_key).to eq('secret3')
+          expect(cfg.credentials.session_token).to be(nil)
+        end
+
+        it 'hydrates credentials from the shared credentials file' do
+          mock_path = File.join(
+            File.dirname(__FILE__), '..', '..', 'fixtures', 'credentials',
+            'mock_shared_credentials')
+          path = File.join('HOME', '.aws', 'credentials')
+          allow(Dir).to receive(:home).and_return('HOME')
+          allow(File).to receive(:exists?).with(path).and_return(true)
+          allow(File).to receive(:readable?).with(path).and_return(true)
+          expect(File).to receive(:read).with(path).and_return(File.read(mock_path))
+          plugin.add_options(config)
+          cfg = config.build!
+          cfg.credentials
+          expect(cfg.credentials).to be_kind_of(SharedCredentials)
+          expect(cfg.credentials.set?).to be(true)
+          expect(cfg.credentials.access_key_id).to eq('ACCESS_KEY_0')
+          expect(cfg.credentials.secret_access_key).to eq('SECRET_KEY_0')
+          expect(cfg.credentials.session_token).to eq('TOKEN_0')
+        end
+
+        it 'hydrates credentials from the instance profile service' do
+          path = '/latest/meta-data/iam/security-credentials/'
+          resp = <<-JSON.strip
+{
+  "Code" : "Success",
+  "LastUpdated" : "2013-11-22T20:03:48Z",
+  "Type" : "AWS-HMAC",
+  "AccessKeyId" : "akid",
+  "SecretAccessKey" : "secret",
+  "Token" : "token",
+  "Expiration" : "#{Time.now.strftime('%Y-%m-%dT%H:%M:%SZ')}"
+}
+          JSON
+          stub_request(:get, "http://169.254.169.254#{path}").
+            to_return(:status => 200, :body => "profile-name\n")
+          stub_request(:get, "http://169.254.169.254#{path}profile-name").
+            to_return(:status => 200, :body => resp)
+          plugin.add_options(config)
+          cfg = config.build!
+          cfg.credentials
+          expect(cfg.credentials).to be_kind_of(InstanceProfileCredentials)
           expect(cfg.credentials.set?).to be(true)
           expect(cfg.credentials.access_key_id).to eq('akid')
           expect(cfg.credentials.secret_access_key).to eq('secret')
-          expect(cfg.credentials.session_token).to eq('session')
+          expect(cfg.credentials.session_token).to eq('token')
         end
 
         it 'raises an error if you construct a client without credentials' do

data/spec/aws/plugins/s3_location_constraint_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module Aws
+  module Plugins
+    describe S3LocationConstraint do
+
+      let(:config_region) {
+        cfg = Seahorse::Client::Configuration.new
+        cfg.add_option(:region, 'sa-east-1')
+        cfg.add_option(:endpoint, 's3-sa-east-1.amazonaws.com')
+      }
+
+      let(:params_with_constraint) {
+        {create_bucket_configuration: {location_constraint: 'my-fake-1'}}
+      }
+
+      let(:config_default) {
+        cfg = Seahorse::Client::Configuration.new
+        cfg.add_option(:region, 'us-east-1')
+        cfg.add_option(:endpoint, 's3.amazonaws.com')
+      }
+
+      it 'coerces the location constraint from the S3 region' do
+        resp = call_handler(S3LocationConstraint::Handler,
+                            params: {}, config: config_region)
+        expect(resp.context
+               .params[:create_bucket_configuration][:location_constraint])
+               .to eq('sa-east-1')
+      end
+
+      it 'does not set location constraint when no region is specified' do
+        resp = call_handler(S3LocationConstraint::Handler,
+                            params: {}, config: config_default)
+        expect(resp.context
+               .params[:create_bucket_configuration]).to be_nil
+      end
+
+      it 'does not override a specified location constraint' do
+        resp = call_handler(S3LocationConstraint::Handler,
+                            params: params_with_constraint,
+                            config: config_region)
+        expect(resp.context
+               .params[:create_bucket_configuration][:location_constraint])
+               .to eq('my-fake-1')
+      end
+    end
+  end
+end

data/spec/aws/shared_credentials_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+module Aws
+  describe SharedCredentials do
+
+    before(:each) do
+      stub_const('ENV', {})
+      allow(Dir).to receive(:home).and_raise(ArgumentError)
+    end
+
+    let(:mock_credential_file) {
+      File.expand_path(File.join(File.dirname(__FILE__),
+        '..', 'fixtures', 'credentials', 'mock_shared_credentials'))
+    }
+
+    it 'defaults path to Dir.home/.aws/credentials' do
+      expect(Dir).to receive(:home).and_return('HOME')
+      credentials = SharedCredentials.new
+      expect(credentials.path).to eq(File.join('HOME', '.aws', 'credentials'))
+    end
+
+    it 'reads the correct default credentials from a credentials file' do
+      creds = SharedCredentials.new(path:mock_credential_file)
+      expect(creds.access_key_id).to eq('ACCESS_KEY_0')
+      expect(creds.secret_access_key).to eq('SECRET_KEY_0')
+      expect(creds.session_token).to eq('TOKEN_0')
+    end
+
+    it 'supports fetching profiles from ENV' do
+      stub_const('ENV', { 'AWS_PROFILE' => 'barprofile' })
+      creds = SharedCredentials.new(path:mock_credential_file)
+      expect(creds.access_key_id).to eq('ACCESS_KEY_2')
+      expect(creds.secret_access_key).to eq('SECRET_KEY_2')
+      expect(creds.session_token).to eq('TOKEN_2')
+    end
+
+    it 'supports a manually specified profile' do
+      stub_const('ENV', { 'AWS_PROFILE' => 'barporfile' })
+      creds = SharedCredentials.new(
+        path: mock_credential_file,
+        profile_name: 'fooprofile')
+      expect(creds.access_key_id).to eq('ACCESS_KEY_1')
+      expect(creds.secret_access_key).to eq('SECRET_KEY_1')
+      expect(creds.session_token).to eq('TOKEN_1')
+    end
+
+    it 'raises when a profile does not exist' do
+      msg = /^Profile `bazprofile' not found in .+mock_shared_credentials/
+      expect {
+        SharedCredentials.new(
+          path: mock_credential_file,
+          profile_name: 'bazprofile'
+        )
+      }.to raise_error(Errors::NoSuchProfileError, msg)
+    end
+
+    it 'is set when credentails is valid' do
+      creds = SharedCredentials.new(path:mock_credential_file)
+      expect(creds.set?).to eq(true)
+    end
+
+    it 'is not set when key_id or access_key is missing' do
+      creds = SharedCredentials.new(path:'/no/file/here')
+      expect(creds.set?).to eq(false)
+    end
+
+  end
+end

data/spec/aws/util_spec.rb

@@ -0,0 +1,107 @@
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'spec_helper'
+
+module Aws::Util
+  describe 'underscore' do
+
+    include Aws::Util
+
+    it 'downcases titleized words' do
+      expect(underscore('Foo')).to eq('foo')
+    end
+
+    it 'breaks compound titleized words with underscores' do
+      expect(underscore('FooBarYuck')).to eq('foo_bar_yuck')
+    end
+
+    it 'treats acronyms as a single word' do
+      expect(underscore('AWS')).to eq('aws')
+    end
+
+    it 'preserves leading acronyms' do
+      expect(underscore('AWSAccount')).to eq('aws_account')
+    end
+
+    it 'preserves trailing acronyms' do
+      expect(underscore('SimpleDB')).to eq('simple_db')
+    end
+
+    it 'preserves nested acronyms' do
+      expect(underscore('MySUPERWord')).to eq('my_super_word')
+      expect(underscore('AWSAccountID')).to eq('aws_account_id')
+    end
+
+    it 'treats trailing numbers as a part of acronyms' do
+      expect(underscore('MD5OfBody')).to eq('md5_of_body')
+      expect(underscore('S3Bucket')).to eq('s3_bucket')
+      expect(underscore('EC2Instance')).to eq('ec2_instance')
+    end
+
+    it 'does not include leading numbers as part of a word' do
+      expect(underscore('SentLast24Hours')).to eq('sent_last_24_hours')
+      expect(underscore('24MIN')).to eq('24_min')
+    end
+
+    it 'accepts words that start with a lower case letter' do
+      expect(underscore('s3Key')).to eq('s3_key')
+      expect(underscore('s3Bucket')).to eq('s3_bucket')
+    end
+
+    describe 'irregular inflections' do
+      # A known list of irregular strings that need to inflect correctly
+      {
+        'ETag' => 'etag',
+        's3Bucket' => 's3_bucket',
+        's3Key' => 's3_key',
+        'Ec2KeyName' => 'ec2_key_name',
+        'Ec2SubnetId' => 'ec2_subnet_id',
+        'Ec2VolumeId' => 'ec2_volume_id',
+        'Ec2InstanceId' => 'ec2_instance_id',
+        'ElastiCache' => 'elasticache',
+        'NotificationARNs' => 'notification_arns',
+        'SentLast24Hours' => 'sent_last_24_hours',
+        'Max24HourSend' => 'max_24_hour_send',
+        'AuthenticationCode1' => 'authentication_code_1',
+        'AuthenticationCode2' => 'authentication_code_2',
+        'SwapEnvironmentCNAMEs' => 'swap_environment_cnames',
+        'CachediSCSIVolume' => 'cached_iscsi_volume',
+        'CachediSCSIVolumeInformation' => 'cached_iscsi_volume_information',
+        'CachediSCSIVolumes' => 'cached_iscsi_volumes',
+        'CreateCachediSCSIVolume' => 'create_cached_iscsi_volume',
+        'CreateCachediSCSIVolumeInput' => 'create_cached_iscsi_volume_input',
+        'CreateCachediSCSIVolumeOutput' => 'create_cached_iscsi_volume_output',
+        'CreateStorediSCSIVolume' => 'create_stored_iscsi_volume',
+        'CreateStorediSCSIVolumeInput' => 'create_stored_iscsi_volume_input',
+        'CreateStorediSCSIVolumeOutput' => 'create_stored_iscsi_volume_output',
+        'DescribeCachediSCSIVolumes' => 'describe_cached_iscsi_volumes',
+        'DescribeCachediSCSIVolumesInput' => 'describe_cached_iscsi_volumes_input',
+        'DescribeCachediSCSIVolumesOutput' => 'describe_cached_iscsi_volumes_output',
+        'DescribeStorediSCSIVolumes' => 'describe_stored_iscsi_volumes',
+        'DescribeStorediSCSIVolumesInput' => 'describe_stored_iscsi_volumes_input',
+        'DescribeStorediSCSIVolumesOutput' => 'describe_stored_iscsi_volumes_output',
+        'DeviceiSCSIAttributes' => 'device_iscsi_attributes',
+        'StorediSCSIVolume' => 'stored_iscsi_volume',
+        'StorediSCSIVolumeInformation' => 'stored_iscsi_volume_information',
+        'StorediSCSIVolumes' => 'stored_iscsi_volumes',
+        'VolumeiSCSIAttributes' => 'volume_iscsi_attributes'
+      }.each do |camel_case, underscored|
+        it "inflects #{camel_case} to #{underscored}" do
+          expect(underscore(camel_case)).to eq(underscored)
+        end
+      end
+    end
+
+  end
+end

data/spec/aws_spec.rb

@@ -68,6 +68,12 @@ module Aws
       expect(svc.config.http_wire_trace).to be(true)
     end
 
+    it 'adds the helper method to Aws (not Module)' do
+      Aws.add_service(:DummyService, ['apis/S3-2006-03-01.json'])
+      expect(Aws).to respond_to(:dummyservice)
+      expect(Aws.class).not_to respond_to(:dummyservice)
+    end
+
     it 'filters the :api_version option from the client constructor' do
       Aws.add_service(:DummyService, ['apis/S3-2006-03-01.json'])
       Aws.config[:api_version] = '2007-01-01'

data/spec/fixtures/credentials/mock_shared_credentials

@@ -0,0 +1,14 @@
+[default]
+aws_access_key_id = ACCESS_KEY_0
+aws_secret_access_key = SECRET_KEY_0
+aws_session_token = TOKEN_0
+
+[fooprofile]
+aws_access_key_id = ACCESS_KEY_1
+aws_secret_access_key = SECRET_KEY_1
+aws_session_token = TOKEN_1
+
+[barprofile]
+aws_access_key_id = ACCESS_KEY_2
+aws_secret_access_key = SECRET_KEY_2
+aws_session_token = TOKEN_2