lib/brightbox-cli/vendor/fog/lib/fog/aws/storage.rb in brightbox-cli-0.17.1 vs lib/brightbox-cli/vendor/fog/lib/fog/aws/storage.rb in brightbox-cli-0.17.2

@@ -17,15 +17,17 @@
       request_path 'fog/aws/requests/storage'
       request :abort_multipart_upload
       request :complete_multipart_upload
       request :copy_object
       request :delete_bucket
+      request :delete_bucket_lifecycle
       request :delete_bucket_policy
       request :delete_bucket_website
       request :delete_object
       request :get_bucket
       request :get_bucket_acl
+      request :get_bucket_lifecycle
       request :get_bucket_location
       request :get_bucket_logging
       request :get_bucket_object_versions
       request :get_bucket_policy
       request :get_bucket_versioning
@@ -43,10 +45,11 @@
       request :list_multipart_uploads
       request :list_parts
       request :post_object_hidden_fields
       request :put_bucket
       request :put_bucket_acl
+      request :put_bucket_lifecycle
       request :put_bucket_logging
       request :put_bucket_policy
       request :put_bucket_versioning
       request :put_bucket_website
       request :put_object
@@ -187,24 +190,14 @@
           require 'multi_json'
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            's3-ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            's3-ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            's3-eu-west-1.amazonaws.com'
           when 'us-east-1'
             's3.amazonaws.com'
-          when 'us-west-1'
-            's3-us-west-1.amazonaws.com'
-          when 'us-west-2'
-            's3-us-west-2.amazonaws.com'
           else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+            "s3-#{options[:region]}.amazonaws.com"
           end
           @region = options[:region]
         end
 
         def data
@@ -261,24 +254,14 @@
             @port = endpoint.port
             @scheme = endpoint.scheme
           else
             options[:region] ||= 'us-east-1'
             @host = options[:host] || case options[:region]
-            when 'ap-northeast-1'
-              's3-ap-northeast-1.amazonaws.com'
-            when 'ap-southeast-1'
-              's3-ap-southeast-1.amazonaws.com'
-            when 'eu-west-1'
-              's3-eu-west-1.amazonaws.com'
             when 'us-east-1'
               's3.amazonaws.com'
-            when 'us-west-1'
-              's3-us-west-1.amazonaws.com'
-            when 'us-west-2'
-              's3-us-west-2.amazonaws.com'
             else
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+              "s3-#{options[:region]}.amazonaws.com"
             end
             @path       = options[:path]        || '/'
             @persistent = options[:persistent]  || true
             @port       = options[:port]        || 443
             @scheme     = options[:scheme]      || 'https'
@@ -330,9 +313,10 @@
           canonical_resource << params[:path].to_s
           canonical_resource << '?'
           for key in (params[:query] || {}).keys.sort
             if %w{
               acl
+              lifecycle
               location
               logging
               notification
               partNumber
               policy