aws-sdk-core 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90a3bc1726f74fb0442e17e58b62560404d125db
-  data.tar.gz: 439984a4771811ab02d6b4dab48cb9f87c9421fe
+  metadata.gz: 71145cbff6dcace64034b04f8cdf0029543398f5
+  data.tar.gz: 1a3870c6828d9d128aa162fc23beffed947446fe
 SHA512:
-  metadata.gz: 0c1ae4f922236290215f8741b88c40764e8fc88529366f30109fe392c0e148a18896bbfa6d0c13b7f7807c110c29c9bb3def701bab03a5ca77a49bbfedc7f55c
-  data.tar.gz: e031d35218126b706bcb8142eb95c8e2a82f329138d9a0e0accb6a197ef3f3b703090ebad8f8b41a42393f96fbcfd37e47b9b829b2e3b040354945710c99a134
+  metadata.gz: c047ffd9255f311f4dc76043c41c133a35e3e0eeee823c6a69192d6c5ddeb1f0a86ee0bf393faaf060dc5f559a38d645ac8bac9448631e89ad4a80ede7931229
+  data.tar.gz: 6861935b6fa7de9e8e6857497f613ee2b02ba355fbc90466742ba90aab780bdb5bca137164686ff283a95470a28de0a2ea3f1b88447081d941669330e7d61bd4

data/apis/CloudFormation.resources.json

@@ -0,0 +1,150 @@
+{
+  "service": {
+    "hasMany": {
+      "Stacks": {
+        "request": { "operation": "DescribeStacks" },
+          "resource": {
+            "type":"Stack",
+            "identifiers": [
+            { "target": "Name",  "sourceType": "responsePath", "source":"Stacks[].StackName" }
+            ]
+          }
+      }
+    },
+
+    "actions": {
+      "CreateStack": {
+        "request": { "operation": "CreateStack" },
+          "resource": {
+            "type": "Stack",
+            "identifiers": [
+              {"target": "Name", "sourceType": "requestParameter", "source":"StackName" }
+            ]
+          }
+      }
+    }
+  },
+
+  "resources": {
+    "Stack": {
+      "shape":"Stack",
+      "identifiers": [ {"name":"Name"} ],
+      "load": {
+        "request": {
+          "operation": "DescribeStacks",
+          "params": [
+            { "target":"StackName", "sourceType":"identifier", "source":"Name" }
+          ]
+        },
+        "path": "Stacks[0]"
+      },
+      "actions": {
+
+        "Update": {
+          "request": {
+            "operation": "UpdateStack",
+            "params": [
+            { "target":"StackName", "sourceType":"identifier", "source":"Name" }
+            ]
+          }
+        },
+
+        "CancelUpdate": {
+          "request": {
+            "operation": "CancelUpdateStack",
+            "params": [
+              { "target":"StackName", "sourceType":"identifier", "source":"Name" }
+            ]
+          }
+        },
+
+        "Delete": {
+          "request": {
+            "operation": "DeleteStack",
+            "params": [
+              { "target":"StackName", "sourceType":"identifier", "source":"Name" }
+            ]
+          }
+        }
+      },
+
+      "subResources": {
+        "resources": ["StackResource"],
+        "identifiers": {"Name": "StackName"}
+      },
+
+      "hasMany": {
+        "ResourceSummaries": {
+          "request": {
+            "operation": "ListStackResources",
+            "params": [
+              { "target":"StackName", "sourceType":"identifier", "source":"Name" }
+            ]
+          },
+          "resource": {
+            "type": "StackResourceSummary",
+            "identifiers": [
+              { "target":"LogicalId", "sourceType":"responsePath", "source":"StackResourceSummaries[].LogicalResourceId" },
+              { "target":"StackName", "sourceType":"requestParameter", "source":"StackName" }
+            ]
+          },
+          "path": "StackResourceSummaries[]"
+        },
+
+        "Events": {
+          "request": {
+            "operation": "DescribeStackEvents",
+            "params": [
+              { "target":"StackName", "sourceType":"identifier", "source":"Name" }
+            ]
+          },
+          "resource": {
+            "type":"Event",
+            "identifiers": [
+              { "target": "Id", "sourceType": "responsePath", "source": "StackEvents[].EventId"}
+]
+          },
+          "path": "StackEvents[]"
+        }
+      }
+    },
+
+    "StackResource" : {
+      "identifiers": [{"name": "LogicalId"}, {"name": "StackName"}],
+      "shape": "StackResourceDetail",
+      "load": {
+        "request": {
+          "operation": "DescribeStackResource",
+          "params": [
+            { "target":"LogicalResourceId", "sourceType": "identifier", "source": "LogicalId" },
+            { "target":"StackName", "sourceType": "identifier", "source": "StackName" }
+          ]
+        },
+        "path": "StackResourceDetail"
+      }
+    },
+
+    "StackResourceSummary": {
+      "identifiers": [{"name": "LogicalId"}, {"name": "StackName"}],
+      "shape": "StackResourceSummary",
+
+      "hasOne": {
+        "Resource": {
+          "resource": {
+            "type": "StackResource",
+            "identifiers": [
+            { "target":"LogicalId", "sourceType":"identifier", "source":"LogicalId" },
+            { "target":"StackName", "sourceType":"identifier", "source":"StackName" }
+            ]
+          }
+        }
+      }
+    },
+
+
+    "Event": {
+      "identifiers": [{"name": "Id"}],
+      "shape": "StackEvent"
+    }
+  }
+}

data/apis/EC2.resources.json

@@ -508,6 +508,87 @@
           }
         }
       },
+      "batchActions": {
+        "CreateTags": {
+          "request": {
+            "operation": "CreateTags",
+            "params": [
+              { "target":"Resources[]", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        },
+        "Monitor": {
+          "request": {
+            "operation": "MonitorInstances",
+            "params": [
+              { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        },
+        "Start": {
+          "request": {
+            "operation": "StartInstances",
+            "params": [
+              { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        },
+        "Stop": {
+          "request": {
+            "operation": "StopInstances",
+            "params": [
+              { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        },
+        "Reboot": {
+          "request": {
+            "operation": "RebootInstances",
+            "params": [
+              { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        },
+        "Terminate": {
+          "request": {
+            "operation": "TerminateInstances",
+            "params": [
+              { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        },
+        "Unmonitor": {
+          "request": {
+            "operation": "UnmonitorInstances",
+            "params": [
+              { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        }
+      },
+      "waiters": {
+        "Stopped": {
+          "waiterName": "InstanceStopped",
+          "params": [
+            { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+          ],
+          "path": "Reservations[0].Instances[0]"
+        },
+        "Running": {
+          "waiterName": "InstanceRunning",
+          "params": [
+            { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+          ],
+          "path": "Reservations[0].Instances[0]"
+        },
+        "Terminated": {
+          "waiterName": "InstanceTerminated",
+          "params": [
+            { "target":"InstanceIds[]", "sourceType":"identifier", "source":"Id" }
+          ],
+          "path": "Reservations[0].Instances[0]"
+        }
+      },
       "hasOne": {
         "Subnet": {
           "resource": {
@@ -1891,6 +1972,18 @@
             ]
           }
         }
+      },
+      "batchActions": {
+        "Delete": {
+          "request": {
+            "operation": "DeleteTags",
+            "params": [
+              { "target":"Resources[]", "sourceType":"identifier", "source":"ResourceId" },
+              { "target":"Tags[*].Key", "sourceType":"identifier", "source":"Key" },
+              { "target":"Tags[*].Value", "sourceType":"identifier", "source":"Value" }
+            ]
+          }
+        }
       }
     }
   }

data/apis/S3.api.json

@@ -2285,7 +2285,7 @@
           "locationName":"Version"
         },
         "DeleteMarkers":{
-          "shape":"DeleteMarkers",
+          "shape":"ObjectVersionList",
           "locationName":"DeleteMarker"
         },
         "Name":{"shape":"BucketName"},

data/apis/S3.resources.json

@@ -101,6 +101,23 @@
             ]
           }
         },
+        "ObjectVersions": {
+          "request": {
+            "operation": "ListObjectVersions",
+            "params": [
+              { "target":"Bucket", "sourceType":"identifier", "source":"Name" }
+            ]
+          },
+          "resource": {
+            "type": "ObjectVersion",
+            "identifiers": [
+              { "target":"BucketName", "sourceType":"identifier", "source":"Name" },
+              { "target":"ObjectKey", "sourceType":"responsePath", "source":"[Versions,DeleteMarkers]|[].Key" },
+              { "target":"Id", "sourceType":"responsePath", "source":"[Versions,DeleteMarkers]|[].VersionId" }
+            ]
+          },
+          "path":"[Versions,DeleteMarkers]|[]"
+        },
         "MultipartUploads": {
           "request": {
             "operation":"ListMultipartUploads",
@@ -472,6 +489,13 @@
               { "target":"Key", "sourceType":"identifier", "source":"ObjectKey" },
               { "target":"UploadId", "sourceType":"identifier", "source":"Id" }
             ]
+          },
+          "resource": {
+            "type": "Object",
+            "identifiers": [
+              { "target":"BucketName", "sourceType":"identifier", "source":"BucketName" },
+              { "target":"Key", "sourceType":"identifier", "source":"ObjectKey" }
+            ]
           }
         },
         "Parts": {
@@ -608,6 +632,7 @@
       "subResources": {
         "resources": [
           "ObjectAcl",
+          "ObjectVersion",
           "MultipartUpload"
         ],
         "identifiers": {
@@ -643,6 +668,58 @@
           }
         }
       }
+    },
+    "ObjectVersion": {
+      "identifiers": [
+        { "name": "BucketName" },
+        { "name": "ObjectKey" },
+        { "name": "Id" }
+      ],
+      "shape": "ObjectVersion",
+      "actions": {
+        "Delete": {
+          "request": {
+            "operation": "DeleteObject",
+            "params": [
+              { "target":"Bucket", "sourceType":"identifier", "source":"BucketName" },
+              { "target":"Key", "sourceType":"identifier", "source":"ObjectKey" },
+              { "target":"VersionId", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        }
+      },
+      "batchActions": {
+        "Get": {
+          "request": {
+            "operation": "GetObject",
+            "params": [
+              { "target":"Bucket", "sourceType":"identifier", "source":"BucketName" },
+              { "target":"Key", "sourceType":"identifier", "source":"ObjectKey" },
+              { "target":"VersionId", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        },
+        "Head": {
+          "request": {
+            "operation": "HeadObject",
+            "params": [
+              { "target":"Bucket", "sourceType":"identifier", "source":"BucketName" },
+              { "target":"Key", "sourceType":"identifier", "source":"ObjectKey" },
+              { "target":"VersionId", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        },
+        "Delete": {
+          "request": {
+            "operation": "DeleteObjects",
+            "params": [
+              { "target":"Bucket", "sourceType":"identifier", "source":"BucketName" },
+              { "target":"Delete.Objects[*].Key", "sourceType":"identifier", "source":"ObjectKey" },
+              { "target":"Delete.Objects[*].VersionId", "sourceType":"identifier", "source":"Id" }
+            ]
+          }
+        }
+      }
     }
   }
 }

data/apis/SQS.resources.json

@@ -169,6 +169,18 @@
             ]
           }
         }
+      },
+      "batchActions": {
+        "Delete": {
+          "request": {
+            "operation":"DeleteMessageBatch",
+            "params": [
+              { "target":"QueueUrl", "sourceType":"identifier", "source":"QueueUrl" },
+              { "target":"Entries[*].Id", "sourceType":"dataMember", "source":"MessageId" },
+              { "target":"Entries[*].ReceiptHandle", "sourceType":"identifier", "source":"ReceiptHandle" }
+            ]
+          }
+        }
       }
     }
   }

data/lib/aws-sdk-core.rb

@@ -226,20 +226,19 @@ module Aws
     #     Aws.add_service('SvcName',
     #       api: '/path/to/svc.api.json',
     #       paginators: '/path/to/svc.paginators.json',
+    #       waiters: '/path/to/svc.waiters.json',
     #       resources: '/path/to/svc.resources.json')
     #
     #     Aws::SvcName::Client.new
     #     #=> #<Aws::SvcName::Client>
     #
     # @param [String] svc_name The name of the service. This will also be
-    #   the namespace under {Aws}.
-    # @option options[required,String,Hash,Seahorse::Model::Api] :api
-    # @option options[String,Hash,Paging::Provider] :paginators
-    # @option options[String] :resources
-    # @yieldparam [String] svc_name
-    # @yieldparam [Module<Service>] svc_module
-    # @yieldparam [Hash<String,String>] svc_files
-    # @return [Module<Service>]
+    #   the namespace under {Aws}. This must be a valid constant name.
+    # @option options[String,Pathname,Hash,Seahorse::Model::Api,nil] :api
+    # @option options[String,Pathname,Hash,Paging::Provider,nil] :paginators
+    # @option options[String,Pathname,Hash,Waiters::Provider,nil] :waiters
+    # @option options[String,Pathname,Hash,Resources::Definition,nil] :resources
+    # @return [Module<Service>] Returns the new service module.
     def add_service(svc_name, options = {})
       svc_module = Module.new { extend Service }
       const_set(svc_name, svc_module)

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

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Aws
   # @api private
   module ClientPaging
@@ -13,7 +15,7 @@ module Aws
           @paginators = case paginators
             when Paging::Provider then paginators
             when Hash then Paging::Provider.new(paginators)
-            when String then Paging::Provider.new(Aws.load_json(paginators))
+            when String, Pathname then Paging::Provider.new(Aws.load_json(paginators))
             when nil then Paging::NullProvider.new
             else raise ArgumentError, 'invalid paginators'
           end

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

@@ -10,7 +10,7 @@ module Aws
             case waiters
             when Waiters::Provider then waiters
             when Hash then Waiters::Provider.new(waiters)
-            when String then Waiters::Provider.new(Aws.load_json(waiters))
+            when String, Pathname then Waiters::Provider.new(Aws.load_json(waiters))
             when nil then Waiters::NullProvider.new
             else raise ArgumentError, 'invalid waiters'
             end

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

@@ -2,4 +2,5 @@ Aws.add_service(:CloudFormation, {
   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'),
+  resources: File.join(Aws::API_DIR, 'CloudFormation.resources.json'),
 })

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

@@ -1,5 +1,3 @@
-require 'jamespath'
-
 module Aws
 
   # Decorates a {Seahorse::Client::Response} with paging methods:

data/lib/aws-sdk-core/paging/pager.rb

@@ -1,3 +1,5 @@
+require 'jmespath'
+
 module Aws
   module Paging
     class Pager
@@ -19,7 +21,7 @@ module Aws
       # @return [Hash]
       def next_tokens(response)
         @tokens.each.with_object({}) do |(source, target), next_tokens|
-          value = Jamespath.search(source, response.data)
+          value = JMESPath.search(source, response.data)
           next_tokens[target.to_sym] = value unless value.nil?
         end
       end
@@ -28,7 +30,7 @@ module Aws
       # @return [Boolean]
       def truncated?(response)
         if @more_results
-          Jamespath.search(@more_results, response.data)
+          JMESPath.search(@more_results, response.data)
         else
           !next_tokens(response).empty?
         end

data/lib/aws-sdk-core/plugins/s3_region_detection.rb

@@ -23,7 +23,7 @@ module Aws
           if region == 'us-east-1'
             "#{bucket}.s3-external-1.amazonaws.com"
           else
-            "#{bucket}.s3.#{region}.amazonaws.com"
+            bucket + '.' + URI.parse(EndpointProvider.resolve(region, 's3')).host
           end
         end
 
@@ -45,8 +45,7 @@ module Aws
           if cached_region && cached_region != context.config.region
             context.http_request.endpoint.host = new_hostname(context, cached_region)
             context[:sigv4_region] = cached_region
-            context[:signature_version] =
-              S3.sigv2_region?(cached_region) ? 's3' : 'v4'
+            context[:signature_version] = 'v4'
           end
         end
 
@@ -66,10 +65,7 @@ module Aws
             detect_region_and_retry(response)
           elsif wrong_sigv4_region?(response)
             extract_body_region_and_retry(response.context)
-          elsif moved_permanently?(response) and dns_style?(response.context)
-            # region detection not supported for 301 moved permanently
-            # when using path style
-            detect_region_and_retry(response) else
+          else
             response
           end
         end
@@ -85,10 +81,6 @@ module Aws
           resp.context.http_response.body_contents.match(/<Region>.+?<\/Region>/)
         end
 
-        def moved_permanently?(resp)
-          resp.context.http_response.status_code == 301
-        end
-
         def extract_body_region_and_retry(context)
           actual_region = region_from_body(context)
           updgrade_to_v4(context, actual_region)
@@ -120,14 +112,9 @@ module Aws
           signer.sign(context.http_request)
         end
 
-        def dns_style?(context)
-          bucket = context.params[:bucket]
-          context.http_request.endpoint.host.match(/^#{Regexp.escape(bucket)}\.s3/)
-        end
-
         def region_from_location_header(context)
           location = context.http_response.headers['location']
-          location.match(/s3\.(.+?)\.amazonaws\.com/)[1]
+          location.match(/s3.(.+?)\.amazonaws\.com/)[1]
         end
 
         def log_warning(context, actual_region)

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

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

data/lib/aws-sdk-core/waiters/errors.rb

@@ -1,5 +1,3 @@
-require 'jamespath'
-
 module Aws
   module Waiters
     module Errors

data/lib/aws-sdk-core/waiters/waiter.rb

@@ -1,4 +1,4 @@
-require 'jamespath'
+require 'jmespath'
 
 module Aws
   module Waiters
@@ -150,7 +150,7 @@ module Aws
         if resp.error
           false
         elsif path
-          output_value_matches?(value, Jamespath.search(path, resp.data))
+          output_value_matches?(value, JMESPath.search(path, resp.data))
         else
           true
         end

data/lib/seahorse/client/base.rb

@@ -184,7 +184,7 @@ module Seahorse
             when nil then Model::Api.new({})
             when Model::Api then api
             when Hash then Model::Api.new(api)
-            when String then Model::Api.new(Util.load_json(api))
+            when String, Pathname then Model::Api.new(Util.load_json(api))
             else raise ArgumentError, "invalid api definition #{api}"
             end
           define_operation_methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: jamespath
+  name: jmespath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '1.0'
 description: Provides API clients for AWS.
 email: 
 executables:
@@ -249,6 +249,7 @@ files:
 - apis/AutoScaling.paginators.json
 - apis/CloudFormation.api.json
 - apis/CloudFormation.paginators.json
+- apis/CloudFormation.resources.json
 - apis/CloudFront.api.json
 - apis/CloudFront.paginators.json
 - apis/CloudFront.waiters.json