aws-sdk-core 2.1.21 → 2.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7937e7acff5f5ad0fc15ab35fad9c340823d3d70
-  data.tar.gz: 287b8405d091d13d0d66acd3d9bf46953d10bf73
+  metadata.gz: 927236e19189222860215b607d5c6a881bc6107b
+  data.tar.gz: f2ea6f950e6acee96c7173362c38e7751393bbd5
 SHA512:
-  metadata.gz: cd5e89f2326689b92be689e580745bd4b5281d4bc09fbf9cbe796432218d6b8761812121b38bbd7ef32bcd7f409e14e70bfa66c82721952f1463a9e181c52079
-  data.tar.gz: ca7c631b1e339568c3c9d483e3a1b75cb725d803e4f1f9c8446c70e6216ecf3333e1c51af85b431e4480eb4ad01a48480727320d1c521a58ed147ed188667b66
+  metadata.gz: b2d8777f7b46f310120c7815725fe02bfa1ec2028bf3207b24b30196c9e5b08de160bfcbe3bc1cb01c37cfcbf15dcf3f5e900f5501f30a8eb7adbf1310e71914
+  data.tar.gz: 73148dd23d3329937f26e026e2fbb38c4c846620956da8fe8cbfa06c377c6f39fd228a434824c0488b1a38d99e0b84a83d1bead174744d9da2b811afa9143622

data/apis/s3/2006-03-01/api-2.json

@@ -194,8 +194,18 @@
       },
       "input":{"shape":"GetBucketLifecycleRequest"},
       "output":{"shape":"GetBucketLifecycleOutput"},
+      "deprecated":true,
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlifecycle.html"
     },
+    "GetBucketLifecycleConfiguration":{
+      "name":"GetBucketLifecycleConfiguration",
+      "http":{
+        "method":"GET",
+        "requestUri":"/{Bucket}?lifecycle"
+      },
+      "input":{"shape":"GetBucketLifecycleConfigurationRequest"},
+      "output":{"shape":"GetBucketLifecycleConfigurationOutput"}
+    },
     "GetBucketLocation":{
       "name":"GetBucketLocation",
       "http":{
@@ -451,8 +461,17 @@
         "requestUri":"/{Bucket}?lifecycle"
       },
       "input":{"shape":"PutBucketLifecycleRequest"},
+      "deprecated":true,
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlifecycle.html"
     },
+    "PutBucketLifecycleConfiguration":{
+      "name":"PutBucketLifecycleConfiguration",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/{Bucket}?lifecycle"
+      },
+      "input":{"shape":"PutBucketLifecycleConfigurationRequest"}
+    },
     "PutBucketLogging":{
       "name":"PutBucketLogging",
       "http":{
@@ -690,6 +709,16 @@
         "authenticated-read"
       ]
     },
+    "BucketLifecycleConfiguration":{
+      "type":"structure",
+      "required":["Rules"],
+      "members":{
+        "Rules":{
+          "shape":"LifecycleRules",
+          "locationName":"Rule"
+        }
+      }
+    },
     "BucketLocationConstraint":{
       "type":"string",
       "enum":[
@@ -736,6 +765,7 @@
     },
     "CORSConfiguration":{
       "type":"structure",
+      "required":["CORSRules"],
       "members":{
         "CORSRules":{
           "shape":"CORSRules",
@@ -745,6 +775,10 @@
     },
     "CORSRule":{
       "type":"structure",
+      "required":[
+        "AllowedMethods",
+        "AllowedOrigins"
+      ],
       "members":{
         "AllowedHeaders":{
           "shape":"AllowedHeaders",
@@ -1363,7 +1397,8 @@
     },
     "CreationDate":{"type":"timestamp"},
     "Date":{
-      "type":"timestamp"
+      "type":"timestamp",
+      "timestampFormat":"iso8601"
     },
     "Days":{"type":"integer"},
     "Delete":{
@@ -1589,7 +1624,8 @@
       "type":"structure",
       "required":["Bucket"],
       "members":{
-        "Bucket":{"shape":"BucketName"}
+        "Bucket":{"shape":"BucketName"},
+        "StorageClass":{"shape":"StorageClass"}
       }
     },
     "DisplayName":{"type":"string"},
@@ -1715,6 +1751,26 @@
         }
       }
     },
+    "GetBucketLifecycleConfigurationOutput":{
+      "type":"structure",
+      "members":{
+        "Rules":{
+          "shape":"LifecycleRules",
+          "locationName":"Rule"
+        }
+      }
+    },
+    "GetBucketLifecycleConfigurationRequest":{
+      "type":"structure",
+      "required":["Bucket"],
+      "members":{
+        "Bucket":{
+          "shape":"BucketName",
+          "location":"uri",
+          "locationName":"Bucket"
+        }
+      }
+    },
     "GetBucketLifecycleOutput":{
       "type":"structure",
       "members":{
@@ -2522,6 +2578,33 @@
         "Days":{"shape":"Days"}
       }
     },
+    "LifecycleRule":{
+      "type":"structure",
+      "required":[
+        "Prefix",
+        "Status"
+      ],
+      "members":{
+        "Expiration":{"shape":"LifecycleExpiration"},
+        "ID":{"shape":"ID"},
+        "Prefix":{"shape":"Prefix"},
+        "Status":{"shape":"ExpirationStatus"},
+        "Transitions":{
+          "shape":"TransitionList",
+          "locationName":"Transition"
+        },
+        "NoncurrentVersionTransitions":{
+          "shape":"NoncurrentVersionTransitionList",
+          "locationName":"NoncurrentVersionTransition"
+        },
+        "NoncurrentVersionExpiration":{"shape":"NoncurrentVersionExpiration"}
+      }
+    },
+    "LifecycleRules":{
+      "type":"list",
+      "member":{"shape":"LifecycleRule"},
+      "flattened":true
+    },
     "ListBucketsOutput":{
       "type":"structure",
       "members":{
@@ -2868,6 +2951,11 @@
         "StorageClass":{"shape":"TransitionStorageClass"}
       }
     },
+    "NoncurrentVersionTransitionList":{
+      "type":"list",
+      "member":{"shape":"NoncurrentVersionTransition"},
+      "flattened":true
+    },
     "NotificationConfiguration":{
       "type":"structure",
       "members":{
@@ -2944,7 +3032,10 @@
       "member":{"shape":"ObjectIdentifier"},
       "flattened":true
     },
-    "ObjectKey":{"type":"string"},
+    "ObjectKey":{
+      "type":"string",
+      "min":1
+    },
     "ObjectList":{
       "type":"list",
       "member":{"shape":"Object"},
@@ -3090,7 +3181,10 @@
     },
     "PutBucketCorsRequest":{
       "type":"structure",
-      "required":["Bucket"],
+      "required":[
+        "Bucket",
+        "CORSConfiguration"
+      ],
       "members":{
         "Bucket":{
           "shape":"BucketName",
@@ -3110,6 +3204,23 @@
       },
       "payload":"CORSConfiguration"
     },
+    "PutBucketLifecycleConfigurationRequest":{
+      "type":"structure",
+      "required":["Bucket"],
+      "members":{
+        "Bucket":{
+          "shape":"BucketName",
+          "location":"uri",
+          "locationName":"Bucket"
+        },
+        "LifecycleConfiguration":{
+          "shape":"BucketLifecycleConfiguration",
+          "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"},
+          "locationName":"LifecycleConfiguration"
+        }
+      },
+      "payload":"LifecycleConfiguration"
+    },
     "PutBucketLifecycleRequest":{
       "type":"structure",
       "required":["Bucket"],
@@ -3860,7 +3971,8 @@
       "type":"string",
       "enum":[
         "STANDARD",
-        "REDUCED_REDUNDANCY"
+        "REDUCED_REDUNDANCY",
+        "STANDARD_IA"
       ]
     },
     "Suffix":{"type":"string"},
@@ -3953,9 +4065,17 @@
         "StorageClass":{"shape":"TransitionStorageClass"}
       }
     },
+    "TransitionList":{
+      "type":"list",
+      "member":{"shape":"Transition"},
+      "flattened":true
+    },
     "TransitionStorageClass":{
       "type":"string",
-      "enum":["GLACIER"]
+      "enum":[
+        "GLACIER",
+        "STANDARD_IA"
+      ]
     },
     "Type":{
       "type":"string",

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

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.1.21'
+  VERSION = '2.1.22'
 end

data/lib/aws-sdk-core/xml/parser/frame.rb

@@ -12,7 +12,7 @@ module Aws
 
           def new(parent, ref, result = nil)
             if self == Frame
-              frame = frame_class(ref && ref.shape).allocate
+              frame = frame_class(ref).allocate
               frame.send(:initialize, parent, ref, result)
               frame
             else
@@ -22,11 +22,11 @@ module Aws
 
           private
 
-          def frame_class(shape)
-            klass = FRAME_CLASSES[shape.class]
-            if ListFrame == klass && shape[:flattened]
+          def frame_class(ref)
+            klass = FRAME_CLASSES[ref.shape.class]
+            if ListFrame == klass && ref[:flattened]
               FlatListFrame
-            elsif MapFrame == klass && shape[:flattened]
+            elsif MapFrame == klass && ref[:flattened]
               MapEntryFrame
             else
               klass

data/lib/seahorse/model/shapes.rb

@@ -24,12 +24,6 @@ module Seahorse
         # @return [Shape]
         attr_accessor :shape
 
-        # @return [String, nil]
-        attr_accessor :location
-
-        # @return [String, nil]
-        attr_accessor :location_name
-
         # @return [Boolean]
         attr_accessor :required
 
@@ -39,6 +33,24 @@ module Seahorse
         # @return [Boolean]
         attr_accessor :deprecated
 
+        # @return [String, nil]
+        def location
+          @location || (shape && shape[:location])
+        end
+
+        def location= location
+          @location = location
+        end
+
+        # @return [String, nil]
+        def location_name
+          @location_name || (shape && shape[:location_name])
+        end
+
+        def location_name= location_name
+          @location_name = location_name
+        end
+
         # Gets metadata for the given `key`.
         def [](key)
           if @metadata.key?(key.to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.1.21
+  version: 2.1.22
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath