aws-sdk 1.38.0 → 1.39.0

data/lib/aws/api_config/OpsWorks-2013-02-18.yml

@@ -83,6 +83,12 @@
         - :string
         Version:
         - :string
+    ChefConfiguration:
+    - :structure:
+        ManageBerkshelf:
+        - :boolean
+        BerkshelfVersion:
+        - :string
     UseCustomCookbooks:
     - :boolean
     UseOpsworksSecurityGroups:
@@ -357,6 +363,12 @@
         - :string
         Version:
         - :string
+    ChefConfiguration:
+    - :structure:
+        ManageBerkshelf:
+        - :boolean
+        BerkshelfVersion:
+        - :string
     UseCustomCookbooks:
     - :boolean
     UseOpsworksSecurityGroups:
@@ -1261,6 +1273,16 @@
             Version:
               :sym: :version
               :type: :string
+        ChefConfiguration:
+          :sym: :chef_configuration
+          :type: :hash
+          :members:
+            ManageBerkshelf:
+              :sym: :manage_berkshelf
+              :type: :boolean
+            BerkshelfVersion:
+              :sym: :berkshelf_version
+              :type: :string
         UseCustomCookbooks:
           :sym: :use_custom_cookbooks
           :type: :boolean
@@ -1835,6 +1857,12 @@
         - :string
         Version:
         - :string
+    ChefConfiguration:
+    - :structure:
+        ManageBerkshelf:
+        - :boolean
+        BerkshelfVersion:
+        - :string
     UseCustomCookbooks:
     - :boolean
     CustomCookbooksSource:

data/lib/aws/auto_scaling/group.rb

@@ -175,7 +175,7 @@ module AWS
       #
       def ec2_instances
         instances = EC2::InstanceCollection.new(:config => config)
-        instances.tagged('aws:autoscaling:groupName').tagged_values(name)
+        instances.filter('tag:aws:autoscaling:groupName', name)
       end
 
       # @return [Array<EC2::Subnet>]

data/lib/aws/core.rb

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 
 require 'set'
+require 'securerandom'
 
 # AWS is the root module for all of the Amazon Web Services.  It is also
 # where you can configure you access to AWS.
@@ -657,6 +658,7 @@ module AWS
           end
         end
       end
+      visited
     end
 
     # Patches Net::HTTP, fixing a bug in how it handles non 100-continue
@@ -699,3 +701,15 @@ module AWS
   end
 
 end
+
+# Backport SecureRandom.uuid for Ruby 1.8
+unless SecureRandom.respond_to?(:uuid)
+  module SecureRandom
+    def self.uuid
+      ary = random_bytes(16).unpack("NnnnnN")
+      ary[2] = (ary[2] & 0x0fff) | 0x4000
+      ary[3] = (ary[3] & 0x3fff) | 0x8000
+      "%08x-%04x-%04x-%04x-%04x%08x" % ary
+    end
+  end
+end

data/lib/aws/core/client.rb

@@ -546,6 +546,7 @@ module AWS
 
         http_request = new_request
         http_request.access_key_id = credential_provider.access_key_id
+        http_request.service = self.class.name.split('::')[1]
 
         # configure the http request
         http_request.service_ruby_name = service_ruby_name
@@ -698,7 +699,7 @@ module AWS
             @signer ||= begin
               signer_class = AWS::Core::Signers.const_get(version)
               signer_args = (version == :Version4) ?
-                [credential_provider, service_signing_name, @region] :
+                [credential_provider, service_signing_name, req.region] :
                 [credential_provider]
               signer_class.new(*signer_args)
             end

data/lib/aws/core/configuration.rb

@@ -483,7 +483,7 @@ module AWS
       add_option :session_token
 
       add_option :region do |cfg,region|
-        region || ENV['AWS_REGION'] || ENV['AMAZON_REGION'] || 'us-east-1'
+        region || ENV['AWS_REGION'] || ENV['AMAZON_REGION'] || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
       end
 
       add_option_with_needs :credential_provider,

data/lib/aws/core/credential_providers.rb

@@ -37,14 +37,22 @@ module AWS
         #   `:access_key_id` or the `:secret_access_key` can not be found.
         #
         def credentials
-          @cached_credentials ||= begin
-            creds = get_credentials
-            unless creds[:access_key_id] and creds[:secret_access_key]
-              raise Errors::MissingCredentialsError
+          raise Errors::MissingCredentialsError unless set?
+          @cached_credentials.dup
+        end
+
+        # @return [Boolean] Returns true if has credentials and it contains
+        #   at least the `:access_key_id` and `:secret_access_key`.
+        #
+        def set?
+          @cache_mutex ||= Mutex.new
+          unless @cached_credentials
+            @cache_mutex.synchronize do
+              @cached_credentials ||= get_credentials
             end
-            creds
           end
-          @cached_credentials.dup
+          @cached_credentials[:access_key_id] &&
+            @cached_credentials[:secret_access_key]
         end
 
         # @return [String] Returns the AWS access key id.
@@ -108,6 +116,7 @@ module AWS
           @providers = []
           @providers << StaticProvider.new(static_credentials)
           @providers << ENVProvider.new('AWS')
+          @providers << ENVProvider.new('AWS', :access_key_id => 'ACCESS_KEY', :secret_access_key => 'SECRET_KEY', :session_token => 'SESSION_TOKEN')
           @providers << ENVProvider.new('AMAZON')
           @providers << EC2Provider.new
         end
@@ -117,14 +126,17 @@ module AWS
 
         def credentials
           providers.each do |provider|
-            begin
+            if provider.set?
               return provider.credentials
-            rescue Errors::MissingCredentialsError
             end
           end
           raise Errors::MissingCredentialsError
         end
 
+        def set?
+          providers.any?(&:set?)
+        end
+
         def refresh
           providers.each do |provider|
             provider.refresh
@@ -181,8 +193,9 @@ module AWS
         include Provider
 
         # @param [String] prefix The prefix to apply to the ENV variable.
-        def initialize prefix
+        def initialize(prefix, suffixes=Hash[KEYS.map{|key| [key, key.to_s.upcase]}])
           @prefix = prefix
+          @suffixes = suffixes
         end
 
         # @return [String]
@@ -192,7 +205,7 @@ module AWS
         def get_credentials
           credentials = {}
           KEYS.each do |key|
-            if value = ENV["#{@prefix}_#{key.to_s.upcase}"]
+            if value = ENV["#{@prefix}_#{@suffixes[key]}"]
               credentials[key] = value
             end
           end

data/lib/aws/core/http/connection_pool.rb

@@ -287,8 +287,18 @@ module AWS
           args << endpoint.port
           args << proxy_uri.host
           args << proxy_uri.port
-          args << proxy_uri.user
-          args << proxy_uri.password
+          
+          if proxy_uri.user
+            args << URI::decode(proxy_uri.user)
+          else
+            args << nil
+          end
+          
+          if proxy_uri.password
+            args << URI::decode(proxy_uri.password)
+          else 
+            args << nil
+          end
 
           http = Net::HTTP.new(*args.compact)
           http.extend(SessionExtensions)

data/lib/aws/core/http/request.rb

@@ -54,6 +54,9 @@ module AWS
         #   to be populated for requests against signature v4 endpoints.
         attr_accessor :region
 
+        # @api private
+        attr_accessor :service
+
         # @return [String] Returns the AWS access key ID used to authorize the
         #   request.
         # @api private

data/lib/aws/core/log_formatter.rb

@@ -154,7 +154,7 @@ module AWS
       end
 
       def _service response
-        response.http_request.class.name.split('::')[1]
+        response.http_request.service
       end
 
       def _region response

data/lib/aws/core/policy.rb

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'uuidtools'
 require 'date'
 require 'json'
 
@@ -84,7 +83,7 @@ module AWS
         if opts.has_key?(:id) or opts.has_key?("Id")
           @id = opts[:id] || opts["Id"]
         else
-          @id = UUIDTools::UUID.timestamp_create.to_s.tr('-','')
+          @id = SecureRandom.uuid.tr('-','')
         end
         if opts.has_key?(:version) or opts.has_key?("Version")
           @version = opts[:version] || opts["Version"]
@@ -748,7 +747,7 @@ module AWS
         #   Policy#deny to add conditions to a statement.
         # @see S3::Client
         def initialize(opts = {})
-          self.sid = UUIDTools::UUID.timestamp_create.to_s.tr('-','')
+          self.sid = SecureRandom.uuid.tr('-','')
           self.conditions = ConditionBlock.new
 
           parse_options(opts)

data/lib/aws/dynamo_db/table.rb

@@ -154,15 +154,11 @@ module AWS
         end
       end
 
+      # Updates the provisioned throughput for this table.
       # @param [Hash] options
-      #
-      # @option options [Integer] :read_capacity_units
-      #
-      # @option options [Integer] :write_capacity_units
-      #
-      # @return [Hash] Returns a hash with the current throughput
-      #   provisioning (`:read_capacity_units` and `:write_capacity_units`).
-      #
+      # @option options [Integer] :read_capacity_units The desired read capacity units.
+      # @option options [Integer] :write_capacity_units The desired write capacity units.
+      # @return [Hash] Returns the given `options` hash.
       def provision_throughput options = {}
 
         options[:read_capacity_units] ||= read_capacity_units

data/lib/aws/ec2/instance.rb

@@ -267,7 +267,7 @@ module AWS
 
       describe_call_attribute :client_token
 
-      describe_call_attribute :image_id
+      describe_call_attribute :image_id, :static => true
 
       describe_call_attribute :key_name, :static => true
 

data/lib/aws/ec2/instance_collection.rb

@@ -12,7 +12,6 @@
 # language governing permissions and limitations under the License.
 
 require 'base64'
-require 'uuidtools'
 
 module AWS
   class EC2
@@ -118,6 +117,9 @@ module AWS
       #   availability zone where the instance should run.  Without
       #   this option, EC2 will choose an availability zone for you.
       #
+      # @option options [String] :placement_group Specifies the
+      #   cluster placement group where the instance should run.
+      #
       # @option options [String] :image_id ID of the AMI you want to
       #   launch.
       #
@@ -257,6 +259,11 @@ module AWS
           options.delete(:availability_zone)
         end
 
+        if options[:placement_group]
+          placement[:group_name] = options[:placement_group].to_s
+          options.delete(:placement_group)
+        end
+
         if options[:dedicated_tenancy]
           placement[:tenancy] = 'dedicated'
           options.delete(:dedicated_tenancy)
@@ -291,7 +298,7 @@ module AWS
 
         security_group_opts(options)
 
-        options[:client_token] = UUIDTools::UUID.timestamp_create.to_s
+        options[:client_token] = SecureRandom.uuid
 
         resp = client.run_instances(options)
 
@@ -310,7 +317,9 @@ module AWS
         response = filtered_request(:describe_instances)
         response.reservation_set.each do |reservation|
           reservation.instances_set.each do |i|
-            yield(Instance.new(i.instance_id, :config => config))
+            instance = Instance.new_from(:describe_instances, i,
+              i.instance_id, :config => config)
+            yield(instance)
           end
         end
       end

data/lib/aws/elasticache/client.rb

@@ -17,7 +17,7 @@ module AWS
     # Client class for Amazon ElastiCache.
     class Client < Core::QueryClient
 
-      API_VERSION = '2013-06-15'
+      API_VERSION = '2014-03-24'
 
       signature_version :Version4, 'elasticache'
 
@@ -27,9 +27,12 @@ module AWS
     end
 
     class Client::V20130615 < Client
-
       define_client_methods('2013-06-15')
+    end
 
+    class Client::V20140324 < Client
+      define_client_methods('2014-03-24')
     end
+
   end
 end

data/lib/aws/glacier/vault.rb

@@ -69,7 +69,7 @@ module AWS
 
       # @return [ArchiveCollection]
       def archives
-        ArchiveCollection.new(self)
+        ArchiveCollection.new(self, :account_id => account_id)
       end
 
       # @param [String,SNS::Topic] topic The SNS topic ARN string or an

data/lib/aws/iam/server_certificate.rb

@@ -20,6 +20,30 @@ module AWS
     #
     # You can use this class to get information about a certificate
     # and to delete it.
+    #
+    # @attr [String] The name that identifies the server certificate.
+    #
+    # @attr_reader [String] The stable and unique string identifying
+    #   the server certificate.
+    #
+    # @attr_reader [Time] The date when the server certificate was
+    #   uploaded.
+    #
+    # @attr_reader [String] The Amazon Resource Name (ARN)
+    #   specifying the server certificate. For more information
+    #   about ARNs and how to use them in policies, see
+    #   {http://docs.amazonwebservices.com/IAM/latest/UserGuide/index.html?Using_Identifiers.html
+    #   Identifiers for IAM Entities} in <i>Using AWS Identity and
+    #   Access Management</i>.
+    #
+    # @attr [String] Path to the server certificate.
+    #
+    # @attr_reader [String] The contents of the public key
+    #   certificate.
+    #
+    # @attr_reader [String] The contents of the public key
+    #   certificate chain.
+    #
     class ServerCertificate < Resource
 
       prefix_update_attributes
@@ -30,27 +54,14 @@ module AWS
         super(opts)
       end
 
-      # @attr [String] The name that identifies the server
-      #   certificate.
       mutable_attribute :name, :static => true, :from => :server_certificate_name
 
-      # @attr_reader [String] The stable and unique string identifying
-      #   the server certificate.
       attribute :id, :static => true, :from => :server_certificate_id
 
-      # @attr_reader [Time] The date when the server certificate was
-      #   uploaded.
       attribute :upload_date, :static => true
 
-      # @attr_reader [String] The Amazon Resource Name (ARN)
-      #   specifying the server certificate. For more information
-      #   about ARNs and how to use them in policies, see
-      #   {http://docs.amazonwebservices.com/IAM/latest/UserGuide/index.html?Using_Identifiers.html
-      #   Identifiers for IAM Entities} in <i>Using AWS Identity and
-      #   Access Management</i>.
       attribute :arn
 
-      # @attr [String] Path to the server certificate.
       mutable_attribute :path do
         translates_input do |path|
           path = "/#{path}" unless path[0] == ?/
@@ -59,12 +70,8 @@ module AWS
         end
       end
 
-      # @attr_reader [String] The contents of the public key
-      #   certificate.
       attribute :certificate_body
 
-      # @attr_reader [String] The contents of the public key
-      #   certificate chain.
       attribute :certificate_chain
 
       provider(:get_server_certificate) do |provider|