fog-aliyun 0.3.8 → 0.3.13

data/lib/fog/aliyun/requests/storage/copy_object.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Copy object
         #
@@ -19,8 +19,6 @@ module Fog
           source_bucket ||= bucket
           target_bucket ||= bucket
           headers = { 'x-oss-copy-source' => "/#{source_bucket}/#{source_object}" }
-          location = get_bucket_location(target_bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           resource = target_bucket + '/' + target_object
           request(expects: [200, 203],
                   headers: headers,
@@ -28,7 +26,7 @@ module Fog
                   path: target_object,
                   bucket: target_bucket,
                   resource: resource,
-                  endpoint: endpoint)
+                  location: get_bucket_location(bucket))
         end
       end
     end

data/lib/fog/aliyun/requests/storage/delete_bucket.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Delete an existing bucket
         #
@@ -10,15 +10,13 @@ module Fog
         # * bucket<~String> - Name of bucket to delete
         #
         def delete_bucket(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           resource = bucket + '/'
           request(
             expects: 204,
             method: 'DELETE',
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
       end

data/lib/fog/aliyun/requests/storage/delete_container.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Delete an existing container
         #
@@ -13,8 +13,6 @@ module Fog
         def delete_container(container, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           object = container + '/'
           resource = bucket + '/' + object
 
@@ -24,7 +22,7 @@ module Fog
             path: object,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
       end

data/lib/fog/aliyun/requests/storage/delete_object.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Delete an existing object
         #
@@ -10,37 +10,15 @@ module Fog
         # * object<~String> - Name of object to delete
         #
         def delete_object(object, options = {})
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          resource = bucket + '/' + object
-          request(
-            expects: 204,
-            method: 'DELETE',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
+          bucket_name = options[:bucket]
+          bucket_name ||= @aliyun_oss_bucket
+          bucket = @oss_client.get_bucket(bucket_name)
+          bucket.delete_object(object)
         end
 
-        def abort_multipart_upload(bucket, object, endpoint, uploadid)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
-          path = object + '?uploadId=' + uploadid
-          resource = bucket + '/' + path
-
-          ret = request(
-            expects: 204,
-            method: 'DELETE',
-            path: path,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          )
+        def abort_multipart_upload(bucket_name, object, upload_id)
+          bucket = @oss_client.get_bucket(bucket_name)
+          bucket.abort_upload(upload_id, object)
         end
       end
     end

data/lib/fog/aliyun/requests/storage/get_bucket.rb

@@ -1,27 +1,43 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
-        def get_bucket(bucket)
-          location = get_bucket_location(bucket)
-          # If there is an error, it will return a Hash with error code, host id and others
-          # If can not get a valid location, will return one using region
-          if location.class == Hash && location.key?('HostId')
-            value = location['HostId']
-            location = value[0].split('.')[1]
-          else
-            location = 'oss-' + @aliyun_region_id
+        def get_bucket(bucket, options = {})
+          prefix = options['prefix']
+          marker = options['marker']
+          # Set the GetBucket max limitation to 1000
+          maxKeys = options['max-keys'] || 1000
+          maxKeys = [maxKeys, 1000].min
+          delimiter = options['delimiter']
+          path = ''
+          if prefix
+            path += '/?prefix=' + prefix
+            path += '&marker=' + marker if marker
+            path += '&max-keys=' + maxKeys.to_s if maxKeys
+            path += '&delimiter=' + delimiter if delimiter
+
+          elsif marker
+            path += '/?marker=' + marker
+            path += '&max-keys=' + maxKeys.to_s if maxKeys
+            path += '&delimiter=' + delimiter if delimiter
+
+          elsif maxKeys
+            path += '/?max-keys=' + maxKeys.to_s
+            path += '&delimiter=' + delimiter if delimiter
+          elsif delimiter
+            path += '/?delimiter=' + delimiter
           end
-          endpoint = 'http://' + location + '.aliyuncs.com'
+
           resource = bucket + '/'
           ret = request(
             expects: [200, 203, 404],
             method: 'GET',
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket),
+            path: path
           )
           xml = ret.data[:body]
           XmlSimple.xml_in(xml)
@@ -37,12 +53,17 @@ module Fog
             bucket: bucket,
             resource: resource
           )
-          XmlSimple.xml_in(ret.data[:body])
+          # If there is an error, it will return a Hash with error code, host id and others
+          # If can not get a valid location, will return one using region
+          location = XmlSimple.xml_in(ret.data[:body])
+          if location.class == Hash && location.key?('HostId')
+            value = location['HostId']
+            location = value[0].split('.')[1]
+          end
+          location ||= 'oss-' + @aliyun_region_id
         end
 
         def get_bucket_acl(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?acl'
           resource = bucket + '/' + attribute
           ret = request(
@@ -51,14 +72,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])['AccessControlList'][0]['Grant'][0]
         end
 
         def get_bucket_CORSRules(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?cors'
           resource = bucket + '/' + attribute
           ret = request(
@@ -67,14 +86,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])['CORSRule'][0] if ret.data[:status] != 404
         end
 
         def get_bucket_lifecycle(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?lifecycle'
           resource = bucket + '/' + attribute
           ret = request(
@@ -83,14 +100,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])['Rule'][0] if ret.data[:status] != 404
         end
 
         def get_bucket_logging(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?logging'
           resource = bucket + '/' + attribute
           ret = request(
@@ -99,14 +114,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])['LoggingEnabled'][0]['TargetPrefix']
         end
 
         def get_bucket_referer(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?referer'
           resource = bucket + '/' + attribute
           ret = request(
@@ -115,14 +128,12 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body])
         end
 
         def get_bucket_website(bucket)
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           attribute = '?website'
           resource = bucket + '/' + attribute
           ret = request(
@@ -131,7 +142,7 @@ module Fog
             path: attribute,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           XmlSimple.xml_in(ret.data[:body]) if ret.data[:status] != 404
         end

data/lib/fog/aliyun/requests/storage/get_container.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         def get_container(container, options = {})
           options = options.reject { |_key, value| value.nil? }

data/lib/fog/aliyun/requests/storage/get_containers.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # List existing storage containers
         #
@@ -42,13 +42,18 @@ module Fog
             path += '?delimiter=' + delimiter
           end
 
-          location = get_bucket_location(bucket)
+          endpoint = options[:endpoint]
+          if endpoint.nil?
+            location = get_bucket_location(bucket)
+          end
           resource = bucket + '/'
           ret = request(
             expects: [200, 203, 400],
             method: 'GET',
             path: path,
             resource: resource,
+            endpoint: endpoint,
+            location: location,
             bucket: bucket
           )
           xml = ret.data[:body]

data/lib/fog/aliyun/requests/storage/get_object.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Get details for object
         #
@@ -11,30 +11,17 @@ module Fog
         #
         def get_object(object, range = nil, options = {})
           options = options.reject { |_key, value| value.nil? }
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          endpoint = options[:endpoint]
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
+          bucket_name = options[:bucket]
+          bucket_name ||= @aliyun_oss_bucket
+          # Using OSS ruby SDK to fix performance issue
+          bucket = @oss_client.get_bucket(bucket_name)
+          body = Array.new
+          obj = bucket.get_object(object) do |chunk|
+            body << chunk
           end
-          resource = bucket + '/' + object
-          para = {
-            expects: [200, 206, 404],
-            method: 'GET',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
-          }
-
-          if range
-            rangeStr = 'bytes=' + range
-            para[:headers] = { 'Range' => rangeStr }
-          end
-
-          response = request(para)
-          response.data
+          response = {}
+          obj.instance_variables.each {|var| response[var.to_s.delete("@")] = obj.instance_variable_get(var) }
+          response.merge({:body => body.join('')})
         end
       end
     end

data/lib/fog/aliyun/requests/storage/get_object_http_url.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Get an expiring object http url
         #

data/lib/fog/aliyun/requests/storage/get_object_https_url.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Get an expiring object https url from Cloud Files
         #

data/lib/fog/aliyun/requests/storage/head_object.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Get headers for object
         #
@@ -12,8 +12,6 @@ module Fog
         def head_object(object, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
           resource = bucket + '/' + object
           ret = request(
             expects: [200, 404],
@@ -21,7 +19,7 @@ module Fog
             path: object,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
           ret
         end