aws-sdk 1.3.2 → 1.3.3

data/lib/aws/api_config/{IAM-2010-07-15.yml → IAM-2010-05-08.yml}

@@ -405,7 +405,7 @@
       - :required
       SerialNumber:
       - :string
-      - :pattern: !ruby/regexp /[\w]*/
+      - :pattern: !ruby/regexp /[\w+=\/:,.@-]*/
       - :required
       AuthenticationCode1:
       - :string
@@ -424,7 +424,7 @@
       - :required
       SerialNumber:
       - :string
-      - :pattern: !ruby/regexp /[\w]*/
+      - :pattern: !ruby/regexp /[\w+=\/:,.@-]*/
       - :required
       AuthenticationCode1:
       - :string
@@ -443,7 +443,7 @@
       - :required
       SerialNumber:
       - :string
-      - :pattern: !ruby/regexp /[\w]*/
+      - :pattern: !ruby/regexp /[\w+=\/:,.@-]*/
       - :required
     :output: []
   ListMFADevices:
@@ -451,7 +451,6 @@
       UserName:
       - :string
       - :pattern: !ruby/regexp /[\w+=,.@-]*/
-      - :required
       Marker:
       - :string
       - :pattern: !ruby/regexp /[\u0020-\u00FF]*/
@@ -465,6 +464,57 @@
           - :timestamp
     - IsTruncated:
       - :boolean
+  CreateVirtualMFADevice:
+    :input:
+      Path:
+      - :string
+      - :pattern: !ruby/regexp /(\u002F)|(\u002F[\u0021-\u007F]+\u002F)/
+      VirtualMFADeviceName:
+      - :string
+      - :pattern: !ruby/regexp /[\w+=,.@-]*/
+      - :required
+    :output:
+    - VirtualMFADevice:
+      - Base32StringSeed:
+        - :blob
+      - QRCodePNG:
+        - :blob
+      - User:
+        - CreateDate:
+          - :timestamp
+      - EnableDate:
+        - :timestamp
+  DeleteVirtualMFADevice:
+    :input:
+      SerialNumber:
+      - :string
+      - :pattern: !ruby/regexp /[\w+=\/:,.@-]*/
+      - :required
+    :output: []
+  ListVirtualMFADevices:
+    :input:
+      AssignmentStatus:
+      - :string
+      Marker:
+      - :string
+      - :pattern: !ruby/regexp /[\u0020-\u00FF]*/
+      MaxItems:
+      - :integer
+    :output:
+    - VirtualMFADevices:
+      - :list: member
+      - member:
+        - Base32StringSeed:
+          - :blob
+        - QRCodePNG:
+          - :blob
+        - User:
+          - CreateDate:
+            - :timestamp
+        - EnableDate:
+          - :timestamp
+    - IsTruncated:
+      - :boolean
   CreateLoginProfile:
     :input:
       UserName:
@@ -629,4 +679,6 @@
   DuplicateCertificate: []
   KeyPairMismatch: []
   NoSuchVendor: []
+  InvalidPublicKey: []
+  DuplicatePublicKey: []
 :server_errors: {}

data/lib/aws/api_config/SNS-2010-03-31.yml

@@ -18,154 +18,163 @@
       Name: 
       - :string
       - :required
-    :output: 
+    :output:
     - TopicArn: []
-
-  GetTopicAttributes: 
-    :input: 
-      TopicArn: 
+  GetTopicAttributes:
+    :input:
+      TopicArn:
       - :string
       - :required
-    :output: 
-    - Attributes: 
-      - :map: 
+    :output:
+    - Attributes:
+      - :map:
         - entry
         - key
         - value
-  SetTopicAttributes: 
-    :input: 
-      TopicArn: 
+  SetTopicAttributes:
+    :input:
+      TopicArn:
       - :string
       - :required
-      AttributeName: 
+      AttributeName:
       - :string
       - :required
-      AttributeValue: 
+      AttributeValue:
       - :string
       - :required
     :output: []
-
-  DeleteTopic: 
-    :input: 
-      TopicArn: 
+  DeleteTopic:
+    :input:
+      TopicArn:
       - :string
       - :required
     :output: []
-
-  AddPermission: 
-    :input: 
-      TopicArn: 
+  AddPermission:
+    :input:
+      TopicArn:
       - :string
       - :required
-      Label: 
+      Label:
       - :string
       - :required
-      AWSAccountId: 
-      - :membered_list: 
+      AWSAccountId:
+      - :membered_list:
         - :string
       - :required
-      ActionName: 
-      - :membered_list: 
+      ActionName:
+      - :membered_list:
         - :string
       - :required
     :output: []
-
-  RemovePermission: 
-    :input: 
-      TopicArn: 
+  RemovePermission:
+    :input:
+      TopicArn:
       - :string
       - :required
-      Label: 
+      Label:
       - :string
       - :required
     :output: []
-
-  Subscribe: 
-    :input: 
-      TopicArn: 
+  Subscribe:
+    :input:
+      TopicArn:
       - :string
       - :required
-      Protocol: 
+      Protocol:
       - :string
       - :required
-      Endpoint: 
+      Endpoint:
       - :string
       - :required
     :output: []
-
-  Unsubscribe: 
-    :input: 
-      SubscriptionArn: 
+  Unsubscribe:
+    :input:
+      SubscriptionArn:
       - :string
       - :required
     :output: []
-
-  ConfirmSubscription: 
-    :input: 
-      TopicArn: 
+  ConfirmSubscription:
+    :input:
+      TopicArn:
       - :string
       - :required
-      Token: 
+      Token:
       - :string
       - :required
-      AuthenticateOnUnsubscribe: 
+      AuthenticateOnUnsubscribe:
       - :boolean
     :output: []
-
-  ListTopics: 
-    :input: 
-      NextToken: 
+  SetSubscriptionAttributes:
+    :input:
+      SubscriptionArn:
+      - :string
+      - :required
+      AttributeName:
       - :string
-    :output: 
-    - Topics: 
+      - :required
+      AttributeValue:
+      - :string
+      - :required
+    :output: []
+  GetSubscriptionAttributes:
+    :input:
+      SubscriptionArn:
+      - :string
+      - :required
+    :output:
+    - Attributes:
+      - :map:
+        - entry
+        - key
+        - value
+  ListTopics:
+    :input:
+      NextToken:
+      - :string
+    :output:
+    - Topics:
       - :list: member
-    - NextToken: 
+    - NextToken:
       - :force
-  ListSubscriptions: 
-    :input: 
-      NextToken: 
+  ListSubscriptions:
+    :input:
+      NextToken:
       - :string
-    :output: 
-    - Subscriptions: 
+    :output:
+    - Subscriptions:
       - :list: member
-    - NextToken: 
+    - NextToken:
       - :force
-  ListSubscriptionsByTopic: 
-    :input: 
-      TopicArn: 
+  ListSubscriptionsByTopic:
+    :input:
+      TopicArn:
       - :string
       - :required
-      NextToken: 
+      NextToken:
       - :string
-    :output: 
-    - Subscriptions: 
+    :output:
+    - Subscriptions:
       - :list: member
-    - NextToken: 
+    - NextToken:
       - :force
-  Publish: 
-    :input: 
-      TopicArn: 
+  Publish:
+    :input:
+      TopicArn:
       - :string
       - :required
-      Message: 
+      Message:
       - :string
       - :required
-      Subject: 
+      Subject:
       - :string
-      MessageStructure: 
+      MessageStructure:
       - :string
     :output: []
-
-:client_errors: 
+:client_errors:
   InvalidParameter: []
-
   AuthorizationError: []
-
   TopicLimitExceeded: []
-
   SubscriptionLimitExceeded: []
-
   NotFound: []
-
-:server_errors: 
+:server_errors:
   InternalError: []

data/lib/aws/core.rb

@@ -20,16 +20,16 @@ require 'aws/core/autoloader'
 #
 # The currently supported services are:
 #
-# * {DynamoDB}
-# * {EC2}
-# * {ELB}
-# * {IAM}
-# * {S3}
-# * {SimpleDB}
-# * {SimpleEmailService}
-# * {SNS}
-# * {SQS}
-# * {STS}
+# * {AWS::DynamoDB}
+# * {AWS::EC2}
+# * {AWS::ELB}
+# * {AWS::IAM}
+# * {AWS::S3}
+# * {AWS::SimpleDB}
+# * {AWS::SimpleEmailService}
+# * {AWS::SNS}
+# * {AWS::SQS}
+# * {AWS::STS}
 #
 # = AWS::Record
 #
@@ -58,7 +58,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'
@@ -86,6 +86,7 @@ module AWS
       autoload :IgnoreResultElement,       'ignore_result_element'
       autoload :IndifferentHash,           'indifferent_hash'
       autoload :Inflection,                'inflection'
+      autoload :JsonClient,                'json_client'
       autoload :LazyErrorClasses,          'lazy_error_classes'
       autoload :MetaUtils,                 'meta_utils'
       autoload :Model,                     'model'
@@ -154,28 +155,40 @@ module AWS
     #   that have already been constructed.
     #
     # @param [Hash] options
+    #
     # @option options [String] :access_key_id (nil) AWS access key id 
     #   credential.
+    #
     # @option options [String] :dynamo_db_endpoint ('dynamodb.amazonaws.com') The 
     #   service endpoint for Amazon DynamoDB.
+    #
     # @option options [String] :dynamo_db_retry_throughput_errors (false) When
     #   true, AWS::DynamoDB::Errors::ProvisionedThroughputExceededException
     #   errors will be retried.  You may need to increase the maximum number
     #   of retries if you have a low provisioned throughput.
+    #
     # @option options [String] :ec2_endpoint ('ec2.amazonaws.com') The 
     #   service endpoint for Amazon EC2.
+    #
+    # @option options [String] :elb_endpoint ('elasticloadbalancing.us-east-1.amazonaws.com')
+    #   The server endpoint for Elastic Load Balancing.
+    #
     # @option options [Object] :http_handler (AWS::HTTPartyHandler) The 
     #   http handler that sends requests to AWS.
+    #
     # @option options [String] :iam_endpoint ('iam.amazonaws.com') The 
     #   service endpoint for AWS Idenity Access Management (IAM).
+    #
     # @option options [Object,nil] :logger (nil) A logger instance that 
     #   should receive log messages generated by service requets.  
     #   A logger needs to respond to #log and must accept a 
     #   severity (e.g. :info, :error, etc) and a string message.
+    #
     # @option options [Integer] :max_retries (3) The maximum number of times
     #   service errors (500) should be retried.  There is an exponential 
     #   backoff in between service request retries, so the more retries the
     #   longer it can take to fail.
+    #
     # @option options [String, URI, nil] :proxy_uri (nil) The URI of the proxy 
     #    to send service requests through.  You can pass a URI object or a 
     #    URI string:
@@ -241,6 +254,8 @@ module AWS
     #   The AWS SDK for Ruby ships with a CA cert bundle, which is the
     #   default value for this option.
     #
+    # @option options [String] :ssl_ca_path The path the a CA cert directory.
+    #
     # @option options [Boolean] :ssl_verify_peer (true) When +true+ 
     #   the HTTP handler validate server certificates for HTTPS requests.
     #

data/lib/aws/core/client.rb

@@ -335,9 +335,11 @@ module AWS
               response.request_type = name
               response.request_options = options
   
-              if self.class::CACHEABLE_REQUESTS.include?(name) and
-                  cache = AWS.response_cache and
-                  cached_response = cache.cached(response)
+              if 
+                cacheable_request?(name, options) and
+                cache = AWS.response_cache and
+                cached_response = cache.cached(response)
+              then
                 cached_response.cached = true
                 cached_response
               else
@@ -363,6 +365,11 @@ module AWS
           end
         end
       end
+
+      private
+      def cacheable_request? name, options
+        self.class::CACHEABLE_REQUESTS.include?(name)
+      end
   
       private
       def build_request(name, options, &block)
@@ -377,7 +384,8 @@ module AWS
         http_request.proxy_uri = config.proxy_uri
         http_request.use_ssl = config.use_ssl?
         http_request.ssl_verify_peer = config.ssl_verify_peer?
-        http_request.ssl_ca_file = config.ssl_ca_file
+        http_request.ssl_ca_file = config.ssl_ca_file if config.ssl_ca_file
+        http_request.ssl_ca_path = config.ssl_ca_path if config.ssl_ca_path
   
         send("configure_#{name}_request", http_request, opts, &block)
         http_request.headers["user-agent"] = user_agent_string