fog-aliyun 0.3.10 → 0.3.16

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,16 +12,13 @@ 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],
             method: 'HEAD',
             path: object,
             bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
+            resource: resource
           )
           ret
         end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         def list_buckets(options = {})
           prefix = options[:prefix]

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

@@ -1,18 +1,18 @@
 # 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]
+          prefix = options['prefix']
+          marker = options['marker']
           # Set the ListObjects max limitation to 1000
-          maxKeys = options[:maxKeys] || 1000
+          maxKeys = options['max-keys'] || 1000
           maxKeys = [maxKeys, 1000].min
-          delimiter = options[:delimiter]
+          delimiter = options['delimiter']
 
           path = ''
           if prefix
@@ -45,11 +45,7 @@ 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, _options = {})
           path = '?uploads'
           resource = bucket + '/' + path
 
@@ -58,17 +54,12 @@ module Fog
             method: 'GET',
             path: path,
             bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
+            resource: resource
           )
           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, uploadid, _options = {})
           path = object + '?uploadId=' + uploadid
           resource = bucket + '/' + path
 
@@ -77,8 +68,7 @@ module Fog
             method: 'GET',
             path: path,
             bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
+            resource: resource
           )
           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 + '/'
@@ -22,8 +20,7 @@ module Fog
             method: 'PUT',
             path: path,
             bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
+            resource: resource
           )
         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
         #
@@ -10,52 +10,33 @@ module Fog
         # * object<~String> - Name of object to look for
         #
         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?
-
-          # put multiparts if object's size is over 100m
-          return put_multipart_object(bucket, object, file) if file.size > 104_857_600
-
-          body = file.read
-
-          resource = bucket + '/' + object
-          request(
-            expects: [200, 203],
-            method: 'PUT',
-            path: object,
-            bucket: bucket,
-            resource: resource,
-            body: body,
-            endpoint: endpoint
-          )
+          bucket_name = options[:bucket]
+          bucket_name ||= @aliyun_oss_bucket
+          bucket = @oss_client.get_bucket(bucket_name)
+          return bucket.put_object(object) if file.nil?
+          # With a single PUT operation you can upload objects up to 5 GB in size.
+          if file.size > 5_368_709_120
+            bucket.resumable_upload(object, file.path)
+          end
+          bucket.put_object(object, :file => file.path)
         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'
+          bucket_name = options[:bucket]
+          bucket_name ||= @aliyun_oss_bucket
 
-          resource = bucket + '/' + object
+          resource = bucket_name + '/' + object
           request(
             expects: [200, 203],
             method: 'PUT',
             path: object,
-            bucket: bucket,
+            bucket: bucket_name,
             resource: resource,
-            body: body,
-            endpoint: endpoint
+            body: body
           )
         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(
@@ -63,28 +44,24 @@ module Fog
             method: 'PUT',
             path: path,
             bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
+            resource: resource
           )
         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)
           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, 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, uploadId)
                 return
               end
               uploadedSize = (parts[0]['Size'][0].to_i * (parts.size - 1)) + parts[-1]['Size'][0].to_i
@@ -92,11 +69,11 @@ module Fog
             end
           else
             # create upload ID
-            uploadId = initiate_multipart_upload(bucket, object, endpoint)
+            uploadId = initiate_multipart_upload(bucket, object)
           end
 
           if file.size <= uploadedSize
-            complete_multipart_upload(bucket, object, endpoint, uploadId)
+            complete_multipart_upload(bucket, object, uploadId)
             return
           end
 
@@ -105,17 +82,13 @@ 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, i.to_s, uploadId, body)
           end
 
-          complete_multipart_upload(bucket, object, endpoint, uploadId)
+          complete_multipart_upload(bucket, object, 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)
           path = object + '?uploads'
           resource = bucket + '/' + path
           ret = request(
@@ -123,17 +96,12 @@ module Fog
             method: 'POST',
             path: path,
             bucket: bucket,
-            resource: resource,
-            endpoint: endpoint
+            resource: resource
           )
           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, partNumber, uploadId, body)
           path = object + '?partNumber=' + partNumber + '&uploadId=' + uploadId
           resource = bucket + '/' + path
           request(
@@ -142,17 +110,12 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            body: body,
-            endpoint: endpoint
+            body: body
           )
         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, uploadId)
+          parts = list_parts(bucket, object, uploadId, options = {})
           request_part = []
           return if parts.empty?
           for i in 0..(parts.size - 1)
@@ -169,7 +132,6 @@ module Fog
             path: path,
             bucket: bucket,
             resource: resource,
-            endpoint: endpoint,
             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
@@ -117,34 +126,22 @@ module Fog
           time = Time.new.utc
           date = time.strftime('%a, %d %b %Y %H:%M:%S GMT')
 
-          endpoint = params[:endpoint]
-          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
-          end
-
           bucket = params[:bucket]
           tmpHost = if bucket
-                      bucket + '.' + host
+                      bucket + '.' + @host
                     else
-                      host
+                      @host
                     end
 
-          @connection = Fog::Core::Connection.new("#{scheme}://#{tmpHost}", @persistent, @connection_options)
+          @connection = Fog::Core::Connection.new("#{@scheme}://#{tmpHost}", @persistent, @connection_options)
           contentType = params[:contentType]
 
           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: {
@@ -152,12 +149,12 @@ module Fog
               'Authorization' => 'OSS ' + @aliyun_accesskey_id + ':' + signature,
               'Date' => date
             }.merge!(params[:headers] || {}),
-                                                        path: "#{path}/#{params[:path]}",
+                                                        path: "#{@path}/#{params[:path]}",
                                                         query: params[:query]))
           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.10'
+    VERSION = '0.3.16'
   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