fog-aliyun 0.3.7 → 0.3.12

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

@@ -1,34 +1,36 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         def list_objects(options = {})
-          bucket = options[:bucket]
+          bucket = options['bucket']
           bucket ||= @aliyun_oss_bucket
-          prefix = options[:prefix]
-          marker = options[:marker]
-          maxKeys = options[:maxKeys]
-          delimiter = options[:delimiter]
+          prefix = options['prefix']
+          marker = options['marker']
+          # Set the ListObjects max limitation to 1000
+          maxKeys = options['max-keys'] || 1000
+          maxKeys = [maxKeys, 1000].min
+          delimiter = options['delimiter']
 
           path = ''
           if prefix
-            path += '?prefix=' + prefix
+            path += '/?prefix=' + prefix
             path += '&marker=' + marker if marker
-            path += '&max-keys=' + maxKeys if maxKeys
+            path += '&max-keys=' + maxKeys.to_s if maxKeys
             path += '&delimiter=' + delimiter if delimiter
 
           elsif marker
-            path += '?marker=' + marker
-            path += '&max-keys=' + maxKeys if maxKeys
+            path += '/?marker=' + marker
+            path += '&max-keys=' + maxKeys.to_s if maxKeys
             path += '&delimiter=' + delimiter if delimiter
 
           elsif maxKeys
-            path += '?max-keys=' + maxKeys
+            path += '/?max-keys=' + maxKeys.to_s
             path += '&delimiter=' + delimiter if delimiter
           elsif delimiter
-            path += '?delimiter=' + delimiter
+            path += '/?delimiter=' + delimiter
           end
 
           resource = bucket + '/'
@@ -43,11 +45,9 @@ module Fog
           XmlSimple.xml_in(xml)
         end
 
-        def list_multipart_uploads(bucket, endpoint, _options = {})
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def list_multipart_uploads(bucket, location, _options = {})
+          location ||= get_bucket_location(bucket)
+
           path = '?uploads'
           resource = bucket + '/' + path
 
@@ -57,16 +57,14 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: location
           )
           XmlSimple.xml_in(ret.data[:body])['Upload']
         end
 
-        def list_parts(bucket, object, endpoint, uploadid, _options = {})
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def list_parts(bucket, object, location, uploadid, _options = {})
+          location ||= get_bucket_location(bucket)
+
           path = object + '?uploadId=' + uploadid
           resource = bucket + '/' + path
 
@@ -76,7 +74,7 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: location
           )
           XmlSimple.xml_in(ret.data[:body])['Part']
         end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         def put_bucket(bucketName)
           resource = bucketName + '/'

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Create a new container
         #
@@ -12,8 +12,6 @@ module Fog
         def put_container(name, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
 
           path = name + '/'
           resource = bucket + '/' + name + '/'
@@ -23,7 +21,7 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
       end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Put details for object
         #
@@ -12,9 +12,7 @@ module Fog
         def put_object(object, file = nil, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          return put_folder(bucket, object, endpoint) if file.nil?
+          return put_folder(bucket, object) if file.nil?
 
           # put multiparts if object's size is over 100m
           return put_multipart_object(bucket, object, file) if file.size > 104_857_600
@@ -29,15 +27,13 @@ module Fog
             bucket: bucket,
             resource: resource,
             body: body,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
 
         def put_object_with_body(object, body, options = {})
           bucket = options[:bucket]
           bucket ||= @aliyun_oss_bucket
-          location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
 
           resource = bucket + '/' + object
           request(
@@ -47,15 +43,11 @@ module Fog
             bucket: bucket,
             resource: resource,
             body: body,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
 
-        def put_folder(bucket, folder, endpoint)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def put_folder(bucket, folder)
           path = folder + '/'
           resource = bucket + '/' + folder + '/'
           request(
@@ -64,27 +56,26 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: get_bucket_location(bucket)
           )
         end
 
         def put_multipart_object(bucket, object, file)
           location = get_bucket_location(bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
 
           # find the right uploadid
-          uploads = list_multipart_uploads(bucket, endpoint)
+          uploads = list_multipart_uploads(bucket, location)
           upload = (uploads&.find { |tmpupload| tmpupload['Key'][0] == object })
 
           uploadedSize = 0
           start_partNumber = 1
           if !upload.nil?
             uploadId = upload['UploadId'][0]
-            parts = list_parts(bucket, object, endpoint, uploadId)
+            parts = list_parts(bucket, object, location, uploadId)
             if !parts.nil? && !parts.empty?
               if parts[-1]['Size'][0].to_i != 5_242_880
                 # the part is the last one, if its size is over 5m, then finish this upload
-                complete_multipart_upload(bucket, object, endpoint, uploadId)
+                complete_multipart_upload(bucket, object, location, uploadId)
                 return
               end
               uploadedSize = (parts[0]['Size'][0].to_i * (parts.size - 1)) + parts[-1]['Size'][0].to_i
@@ -92,11 +83,11 @@ module Fog
             end
           else
             # create upload ID
-            uploadId = initiate_multipart_upload(bucket, object, endpoint)
+            uploadId = initiate_multipart_upload(bucket, object, location)
           end
 
           if file.size <= uploadedSize
-            complete_multipart_upload(bucket, object, endpoint, uploadId)
+            complete_multipart_upload(bucket, object, location, uploadId)
             return
           end
 
@@ -105,17 +96,14 @@ module Fog
 
           for i in start_partNumber..end_partNumber
             body = file.read(5_242_880)
-            upload_part(bucket, object, endpoint, i.to_s, uploadId, body)
+            upload_part(bucket, object, location, i.to_s, uploadId, body)
           end
 
-          complete_multipart_upload(bucket, object, endpoint, uploadId)
+          complete_multipart_upload(bucket, object, location, uploadId)
         end
 
-        def initiate_multipart_upload(bucket, object, endpoint)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def initiate_multipart_upload(bucket, object, location)
+          location ||= get_bucket_location(bucket)
           path = object + '?uploads'
           resource = bucket + '/' + path
           ret = request(
@@ -124,16 +112,13 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint
+            location: location
           )
           XmlSimple.xml_in(ret.data[:body])['UploadId'][0]
         end
 
-        def upload_part(bucket, object, endpoint, partNumber, uploadId, body)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
+        def upload_part(bucket, object, location, partNumber, uploadId, body)
+          location ||= get_bucket_location(bucket)
           path = object + '?partNumber=' + partNumber + '&uploadId=' + uploadId
           resource = bucket + '/' + path
           request(
@@ -143,16 +128,13 @@ module Fog
             bucket: bucket,
             resource: resource,
             body: body,
-            endpoint: endpoint
+            location: location
           )
         end
 
-        def complete_multipart_upload(bucket, object, endpoint, uploadId)
-          if endpoint.nil?
-            location = get_bucket_location(bucket)
-            endpoint = 'http://' + location + '.aliyuncs.com'
-          end
-          parts = list_parts(bucket, object, endpoint, uploadId, options = {})
+        def complete_multipart_upload(bucket, object, location, uploadId)
+          location ||= get_bucket_location(bucket)
+          parts = list_parts(bucket, object, location, uploadId, options = {})
           request_part = []
           return if parts.empty?
           for i in 0..(parts.size - 1)
@@ -169,7 +151,7 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint,
+            location: location,
             body: body
           )
         end

data/lib/fog/aliyun/storage.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 require 'xmlsimple'
+require 'aliyun/oss'
+
+# Using Aliyun OSS Ruby SDK
+AliyunOssSdk= Aliyun::OSS
 
 module Fog
-  module Storage
-    class Aliyun < Fog::Service
+  module Aliyun
+    class Storage < Fog::Service
       DEFAULT_REGION = 'cn-hangzhou'
 
-      DEFAULT_SCHEME = 'http'
+      DEFAULT_SCHEME = 'https'
       DEFAULT_SCHEME_PORT = {
         'http' => 80,
         'https' => 443
@@ -97,6 +101,11 @@ module Fog
           @port = uri.port || DEFAULT_SCHEME_PORT[@scheme]
 
           @persistent = options[:persistent] || false
+          @oss_client = AliyunOssSdk::Client.new(
+                                     :endpoint => @aliyun_oss_endpoint,
+                                     :access_key_id => @aliyun_accesskey_id,
+                                     :access_key_secret => @aliyun_accesskey_secret
+          )
         end
 
         def reload
@@ -118,19 +127,22 @@ module Fog
           date = time.strftime('%a, %d %b %Y %H:%M:%S GMT')
 
           endpoint = params[:endpoint]
+          location = params[:location]
           if endpoint
             uri = URI.parse(endpoint)
             host = uri.host
             path = uri.path
             port = uri.port
             scheme = uri.scheme
-          else
-            host = @host
-            path = @path
-            port = @port
-            scheme = @scheme
+          elsif location
+            host = location + '.aliyuncs.com'
           end
 
+          host ||= @host
+          path ||= @path
+          port ||= @port
+          scheme ||= @scheme
+
           bucket = params[:bucket]
           tmpHost = if bucket
                       bucket + '.' + host
@@ -143,8 +155,10 @@ module Fog
 
           begin
             headers = ''
-            params[:headers]&.each do |k, v|
+            if params[:headers]
+              params[:headers].each do |k, v|
               headers += "#{k}:#{v}\n" if k != 'Range'
+              end
             end
             signature = sign(method, date, contentType, params[:resource], headers)
             response = @connection.request(params.merge(headers: {
@@ -157,7 +171,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
                   when Excon::Errors::NotFound
-                    Fog::Storage::Aliyun::NotFound.slurp(error)
+                    Fog::Aliyun::Storage::NotFound.slurp(error)
                   else
                     error
                   end

data/lib/fog/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Fog
   module Aliyun
-    VERSION = '0.3.7'
+    VERSION = '0.3.12'
   end
 end

data/lib/fog/bin/aliyun.rb

@@ -5,7 +5,7 @@ class Aliyun < Fog::Bin
     def class_for(key)
       case key
       when :storage
-        Fog::Storage::Aliyun
+        Fog::Aliyun::Storage
       when :compute
         Fog::Compute::Aliyun
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.12
 platform: ruby
 authors:
-- Qinsi Deng, Jianxun Li, Jane Han
+- Qinsi Deng, Jianxun Li, Jane Han, Guimin He
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aliyun-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -156,10 +198,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: aliyun-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will support
   more aliyun services later.
 email:
 - dengqinsi@sina.com
+- guimin.hgm@alibaba-inc.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -308,5 +365,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: Fog provider for Aliyun Web Services.
+summary: Fog provider for Alibaba Cloud Web Services.
 test_files: []