aws-sdk-core 2.0.3 → 2.0.4

data/apis/IAM.resources.json

@@ -199,7 +199,7 @@
         { "name": "UserName" },
         { "name": "Id" }
       ],
-      "shape": "AccessKeyMetadata",
+      "shape": "AccessKey",
       "actions": {
         "Activate": {
           "request": {
@@ -233,33 +233,6 @@
         }
       }
     },
-    "AccessKeyPair": {
-      "identifiers": [
-        { "name": "UserName" },
-        { "name": "Id" }
-      ],
-      "shape": "AccessKey",
-      "hasOne": {
-        "AccessKey": {
-          "resource": {
-            "type": "AccessKey",
-            "identifiers": [
-              { "target":"UserName", "sourceType":"identifier", "source":"UserName" },
-              { "target":"Id", "sourceType":"identifier", "source":"Id" }
-            ]
-          }
-        },
-        "User": {
-          "resource": {
-            "type": "AccessKey",
-            "identifiers": [
-              { "target":"UserName", "sourceType":"identifier", "source":"UserName" },
-              { "target":"Id", "sourceType":"identifier", "source":"Id" }
-            ]
-          }
-        }
-      }
-    },
     "AccountAlias": {
       "identifiers": [
         { "name": "Name" }
@@ -830,7 +803,7 @@
             ]
           },
           "resource": {
-            "type": "AccessKeyPair",
+            "type": "AccessKey",
             "identifiers": [
               { "target":"UserName", "sourceType":"identifier", "source":"Name" },
               { "target":"Id", "sourceType":"responsePath", "source":"AccessKey.AccessKeyId" }

data/apis/Route53Domains.api.json

@@ -30,6 +30,22 @@
         }
       ]
     },
+    "DisableDomainAutoRenew":{
+      "name":"DisableDomainAutoRenew",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisableDomainAutoRenewRequest"},
+      "output":{"shape":"DisableDomainAutoRenewResponse"},
+      "errors":[
+        {
+          "shape":"InvalidInput",
+          "error":{"httpStatusCode":400},
+          "exception":true
+        }
+      ]
+    },
     "DisableDomainTransferLock":{
       "name":"DisableDomainTransferLock",
       "http":{
@@ -61,6 +77,22 @@
         }
       ]
     },
+    "EnableDomainAutoRenew":{
+      "name":"EnableDomainAutoRenew",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"EnableDomainAutoRenewRequest"},
+      "output":{"shape":"EnableDomainAutoRenewResponse"},
+      "errors":[
+        {
+          "shape":"InvalidInput",
+          "error":{"httpStatusCode":400},
+          "exception":true
+        }
+      ]
+    },
     "EnableDomainTransferLock":{
       "name":"EnableDomainTransferLock",
       "http":{
@@ -646,6 +678,18 @@
       ]
     },
     "DNSSec":{"type":"string"},
+    "DisableDomainAutoRenewRequest":{
+      "type":"structure",
+      "required":["DomainName"],
+      "members":{
+        "DomainName":{"shape":"DomainName"}
+      }
+    },
+    "DisableDomainAutoRenewResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DisableDomainTransferLockRequest":{
       "type":"structure",
       "required":["DomainName"],
@@ -726,6 +770,18 @@
       "type":"string",
       "max":254
     },
+    "EnableDomainAutoRenewRequest":{
+      "type":"structure",
+      "required":["DomainName"],
+      "members":{
+        "DomainName":{"shape":"DomainName"}
+      }
+    },
+    "EnableDomainAutoRenewResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "EnableDomainTransferLockRequest":{
       "type":"structure",
       "required":["DomainName"],

data/apis/S3.api.json

@@ -7,7 +7,7 @@
     "serviceAbbreviation":"Amazon S3",
     "serviceFullName":"Amazon Simple Storage Service",
     "signatureVersion":"v4",
-    "v3Regions": [
+    "sigv2Regions": [
       "us-east-1",
       "us-west-1",
       "us-west-2",

data/endpoints.json

@@ -1,77 +1,63 @@
-[
-  {
-    "priority": 500,
-    "regionPrefix": "cn-",
-    "rules": [
-      {
-        "services": ["iam", "sts"],
-        "config": {
-          "endpoint": "{scheme}://{service}.cn-north-1.amazonaws.com.cn"
-        }
-      },
-      {
-        "config": {
-          "endpoint": "{scheme}://{service}.{region}.amazonaws.com.cn"
-        }
-      }
-    ]
-  },
-  {
-    "priority": 600,
-    "regionPrefix": "us-gov-",
-    "rules": [
-      {
-        "services": ["iam"],
-        "config": {
-          "endpoint": "{scheme}://{service}.us-gov.amazonaws.com"
-        }
-      },
-      {
-        "services": ["s3"],
-        "config": {
-          "endpoint": "{scheme}://{service}-{region}.amazonaws.com"
-        }
-      },
-      {
-        "config": {
-          "endpoint": "{scheme}://{service}.{region}.amazonaws.com"
-        }
-      }
-    ]
-  },
-  {
-    "priority": 900,
-    "regionPrefix": "us-east-1",
-    "rules": [
-      {
-        "services": ["s3", "sdb"],
-        "config": {
-          "endpoint": "{scheme}://{service}.amazonaws.com"
-        }
-      }
-    ]
-  },
-  {
-    "priority": 999,
-    "regionPrefix": "",
-    "rules": [
-      {
-        "services": ["s3"],
-        "config": {
-          "endpoint": "{scheme}://{service}-{region}.amazonaws.com"
-        }
-      },
-      {
-        "services": ["cloudfront", "iam", "importexport", "route53", "sts"],
-        "config": {
-          "endpoint": "{scheme}://{service}.amazonaws.com"
-        }
-      },
-      {
-        "config": {
-          "endpoint": "{scheme}://{service}.{region}.amazonaws.com"
-        }
-      }
-    ]
+{
+  "version": 2,
+  "endpoints": {
+    "*/*": {
+      "endpoint": "{service}.{region}.amazonaws.com"
+    },
+    "cn-north-1/*": {
+      "endpoint": "{service}.{region}.amazonaws.com.cn",
+      "signatureVersion": "v4"
+    },
+    "us-gov-west-1/iam": {
+      "endpoint": "iam.us-gov.amazonaws.com"
+    },
+    "us-gov-west-1/sts": {
+      "endpoint": "sts.us-gov.amazonaws.com"
+    },
+    "us-gov-west-1/s3": {
+      "endpoint": "s3-{region}.amazonaws.com"
+    },
+    "*/cloudfront": {
+      "endpoint": "cloudfront.amazonaws.com"
+    },
+    "*/iam": {
+      "endpoint": "iam.amazonaws.com"
+    },
+    "*/importexport": {
+      "endpoint": "importexport.amazonaws.com"
+    },
+    "*/route53": {
+      "endpoint": "route53.amazonaws.com"
+    },
+    "*/sts": {
+      "endpoint": "sts.amazonaws.com"
+    },
+    "us-east-1/sdb": {
+      "endpoint": "sdb.amazonaws.com"
+    },
+    "us-east-1/s3": {
+      "endpoint": "s3.amazonaws.com"
+    },
+    "us-west-1/s3": {
+      "endpoint": "s3-{region}.amazonaws.com"
+    },
+    "us-west-2/s3": {
+      "endpoint": "s3-{region}.amazonaws.com"
+    },
+    "eu-west-1/s3": {
+      "endpoint": "s3-{region}.amazonaws.com"
+    },
+    "ap-southeast-1/s3": {
+      "endpoint": "s3-{region}.amazonaws.com"
+    },
+    "ap-southeast-2/s3": {
+      "endpoint": "s3-{region}.amazonaws.com"
+    },
+    "ap-northeast-1/s3": {
+      "endpoint": "s3-{region}.amazonaws.com"
+    },
+    "sa-east-1/s3": {
+      "endpoint": "s3-{region}.amazonaws.com"
+    }
   }
-]
+}

data/lib/aws-sdk-core.rb

@@ -12,10 +12,7 @@ Seahorse::Util.irregular_inflections({
 module Aws
 
   # @api private
-  GEM_ROOT = File.dirname(File.dirname(__FILE__))
-
-  # @api private
-  APIS_DIR = File.join(GEM_ROOT, 'apis')
+  API_DIR = File.join(File.dirname(File.dirname(__FILE__)), 'apis')
 
   # @api private
   # services
@@ -67,6 +64,7 @@ module Aws
     autoload const_name, "aws-sdk-core/#{const_name.downcase}"
   end
 
+  autoload :AssumeRoleCredentials, 'aws-sdk-core/assume_role_credentials'
   autoload :Client, 'aws-sdk-core/client'
   autoload :ClientPaging, 'aws-sdk-core/client_paging'
   autoload :ClientStubs, 'aws-sdk-core/client_stubs'
@@ -79,6 +77,7 @@ module Aws
   autoload :InstanceProfileCredentials, 'aws-sdk-core/instance_profile_credentials'
   autoload :PageableResponse, 'aws-sdk-core/pageable_response'
   autoload :RestBodyHandler, 'aws-sdk-core/rest_body_handler'
+  autoload :RefreshingCredentials, 'aws-sdk-core/refreshing_credentials'
   autoload :Service, 'aws-sdk-core/service'
   autoload :SharedCredentials, 'aws-sdk-core/shared_credentials'
   autoload :Structure, 'aws-sdk-core/structure'
@@ -137,6 +136,7 @@ module Aws
     autoload :S3LocationConstraint, 'aws-sdk-core/plugins/s3_location_constraint'
     autoload :S3Md5s, 'aws-sdk-core/plugins/s3_md5s'
     autoload :S3Redirects, 'aws-sdk-core/plugins/s3_redirects'
+    autoload :S3RegionDetection, 'aws-sdk-core/plugins/s3_region_detection'
     autoload :S3SseCpk, 'aws-sdk-core/plugins/s3_sse_cpk'
     autoload :S3UrlEncodedKeys, 'aws-sdk-core/plugins/s3_url_encoded_keys'
     autoload :SQSQueueUrls, 'aws-sdk-core/plugins/sqs_queue_urls'
@@ -261,18 +261,8 @@ module Aws
 
   # build service client classes
   service_added do |name, svc_module, options|
-
     svc_module.const_set(:Client, Client.define(name, options))
     svc_module.const_set(:Errors, Module.new { extend Errors::DynamicErrors })
-
-    # temporary workaround for issue with S3 waiter definition
-    if name == 'S3'
-      defs = svc_module::Client.waiters.instance_variable_get("@definitions")
-      defs[:bucket_exists]['ignore_errors'] = ['NotFound']
-      defs[:object_exists]['ignore_errors'] = ['NotFound']
-      defs[:bucket_not_exists]['success_value'] = 'NotFound'
-      defs[:object_not_exists]['success_value'] = 'NotFound'
-    end
   end
 
 end

data/lib/aws-sdk-core/api/documenter.rb

@@ -173,7 +173,7 @@ Constructs an API client.
         m.scope = :instance
         m.parameters << ['waiter_name', nil]
         m.parameters << ['params', '{}']
-        m.docstring = YARD::Registry['Aws::Client#wait_until'].docstring
+        m.docstring = YARD::Registry['Aws::ClientWaiters#wait_until'].docstring
 
         waiters = @client_class.waiters.waiter_names.sort.inject('') do |w,name|
           operation = @client_class.waiters.waiter(name).send(:operation_name)

data/lib/aws-sdk-core/api/service_customizations.rb

@@ -102,6 +102,7 @@ module Aws
         add_plugin 'Aws::Plugins::S3Redirects'
         add_plugin 'Aws::Plugins::S3SseCpk'
         add_plugin 'Aws::Plugins::S3UrlEncodedKeys'
+        add_plugin 'Aws::Plugins::S3RegionDetection'
         defs = client_class.waiters.instance_variable_get("@definitions")
         defs[:bucket_exists]['ignore_errors'] = ['NotFound']
         defs[:object_exists]['ignore_errors'] = ['NotFound']

data/lib/aws-sdk-core/assume_role_credentials.rb

@@ -0,0 +1,46 @@
+module Aws
+
+  # An auto-refreshing credential provider that works by assuming
+  # a role via {Aws::STS::Client#assume_role}.
+  #
+  #    role_credentials = Aws::AssumeRoleCredentials.new(
+  #      client: Aws::STS::Client.new(...),
+  #      role_arn: "linked::account::arn",
+  #      role_session_name: "session-name"
+  #    )
+  #
+  #    ec2 = Aws::EC2::Client.new(credentials: role_credentials)
+  #
+  # If you omit `:client` option, a new {STS::Client} object will be
+  # constructed.
+  class AssumeRoleCredentials < Credentials
+
+    include RefreshingCredentials
+
+    # @option options [required, String] :role_arn
+    # @option options [required, String] :role_session_name
+    # @option options [String] :policy
+    # @option options [Integer] :duration_seconds
+    # @option options [String] :external_id
+    # @option opitons [STS::Client] :client
+    def initialize(options = {})
+      @options = options.dup
+      @client = @options.delete(:client) || STS::Client.new
+      super
+    end
+
+    # @return [STS::Client]
+    attr_reader :client
+
+    private
+
+    def refresh
+      creds = @client.assume_role(@options).credentials
+      @access_key_id = creds.access_key_id
+      @secret_access_key = creds.secret_access_key
+      @session_token = creds.session_token
+      @expiration = creds.expiration
+    end
+
+  end
+end

data/lib/aws-sdk-core/autoscaling.rb

@@ -1,5 +1,5 @@
 Aws.add_service(:AutoScaling, {
-  api: File.join(Aws::APIS_DIR, 'AutoScaling.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'AutoScaling.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'AutoScaling.paginators.json'),
+  api: File.join(Aws::API_DIR, 'AutoScaling.api.json'),
+  docs: File.join(Aws::API_DIR, 'AutoScaling.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'AutoScaling.paginators.json'),
 })

data/lib/aws-sdk-core/cloudformation.rb

@@ -1,5 +1,5 @@
 Aws.add_service(:CloudFormation, {
-  api: File.join(Aws::APIS_DIR, 'CloudFormation.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CloudFormation.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'CloudFormation.paginators.json'),
+  api: File.join(Aws::API_DIR, 'CloudFormation.api.json'),
+  docs: File.join(Aws::API_DIR, 'CloudFormation.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'CloudFormation.paginators.json'),
 })

data/lib/aws-sdk-core/cloudfront.rb

@@ -1,6 +1,6 @@
 Aws.add_service(:CloudFront, {
-  api: File.join(Aws::APIS_DIR, 'CloudFront.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CloudFront.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'CloudFront.paginators.json'),
-  waiters: File.join(Aws::APIS_DIR, 'CloudFront.waiters.json'),
+  api: File.join(Aws::API_DIR, 'CloudFront.api.json'),
+  docs: File.join(Aws::API_DIR, 'CloudFront.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'CloudFront.paginators.json'),
+  waiters: File.join(Aws::API_DIR, 'CloudFront.waiters.json'),
 })

data/lib/aws-sdk-core/cloudsearch.rb

@@ -1,5 +1,5 @@
 Aws.add_service(:CloudSearch, {
-  api: File.join(Aws::APIS_DIR, 'CloudSearch.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CloudSearch.docs.json'),
-  paginators: File.join(Aws::APIS_DIR, 'CloudSearch.paginators.json'),
+  api: File.join(Aws::API_DIR, 'CloudSearch.api.json'),
+  docs: File.join(Aws::API_DIR, 'CloudSearch.docs.json'),
+  paginators: File.join(Aws::API_DIR, 'CloudSearch.paginators.json'),
 })

data/lib/aws-sdk-core/cloudsearchdomain.rb

@@ -1,4 +1,4 @@
 Aws.add_service(:CloudSearchDomain, {
-  api: File.join(Aws::APIS_DIR, 'CloudSearchDomain.api.json'),
-  docs: File.join(Aws::APIS_DIR, 'CloudSearchDomain.docs.json'),
+  api: File.join(Aws::API_DIR, 'CloudSearchDomain.api.json'),
+  docs: File.join(Aws::API_DIR, 'CloudSearchDomain.docs.json'),
 })