fog-aliyun 0.3.17 → 0.4.0

data/lib/fog/aliyun/requests/compute/create_vswitch.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -19,7 +21,7 @@ module Fog
 
           parameters['CidrBlock'] = cidrBlock
           pathUrl += '&CidrBlock='
-          pathUrl += URI.encode(cidrBlock, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(cidrBlock, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           parameters['ZoneId'] = @aliyun_zone_id
           pathUrl += '&ZoneId='

data/lib/fog/aliyun/requests/compute/delete_security_group_egress_ip_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -19,7 +21,7 @@ module Fog
 
           parameters['DestCidrIp'] = destCidrIp
           pathUrl += '&DestCidrIp='
-          pathUrl += URI.encode(destCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(destCidrIp, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           nicType ||= 'intranet'
           parameters['NicType'] = nicType
           pathUrl += '&NicType='
@@ -29,7 +31,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'

data/lib/fog/aliyun/requests/compute/delete_security_group_egress_sg_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -30,7 +32,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'

data/lib/fog/aliyun/requests/compute/delete_security_group_ip_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -19,7 +21,7 @@ module Fog
 
           parameters['SourceCidrIp'] = sourceCidrIp
           pathUrl += '&SourceCidrIp='
-          pathUrl += URI.encode(sourceCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(sourceCidrIp, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           nicType ||= 'intranet'
           parameters['NicType'] = nicType
           pathUrl += '&NicType='
@@ -29,7 +31,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'

data/lib/fog/aliyun/requests/compute/delete_security_group_sg_rule.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -30,7 +32,7 @@ module Fog
           portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
-          pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(portRange, Addressable::URI::CharacterClasses::UNRESERVED + '|')
 
           protocol = option[:protocol]
           protocol ||= 'all'

data/lib/fog/aliyun/requests/compute/detach_disk.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -25,7 +27,7 @@ module Fog
           if device
             parameters['Device'] = device
             pathUrl += '&Device='
-            pathUrl += URI.encode(device, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+            pathUrl += Addressable::URI.encode_component(device, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           end
           signature = sign(@aliyun_accesskey_secret, parameters)
           pathUrl += '&Signature='

data/lib/fog/aliyun/requests/compute/modify_vpc.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -15,7 +17,7 @@ module Fog
 
           parameters['VpcId'] = vpcId
           pathUrl += '&VpcId='
-          pathUrl += URI.encode(vpcId, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(vpcId, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           name = options[:name]
           desc = options[:description]
 

data/lib/fog/aliyun/requests/compute/modify_vswitch.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun
@@ -15,7 +17,7 @@ module Fog
 
           parameters['VSwitchId'] = vSwitchId
           pathUrl += '&VSwitchId='
-          pathUrl += URI.encode(vpcId, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          pathUrl += Addressable::URI.encode_component(vpcId, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           name = options[:name]
           desc = options[:description]
 

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

@@ -0,0 +1,22 @@
+
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+        #
+        # Abort a multipart upload
+        #
+        # @param [String] bucket_name Name of bucket to abort multipart upload on
+        # @param [String] object_name Name of object to abort multipart upload on
+        # @param [String] upload_id Id of upload to add part to
+        #
+        # @see https://help.aliyun.com/document_detail/31996.html
+        #
+        def abort_multipart_upload(bucket_name, object_name, upload_id)
+          @oss_protocol.abort_multipart_upload(bucket_name, object_name, upload_id)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+        # Complete a multipart upload
+        #
+        # @param [String] bucket_name Name of bucket to complete multipart upload for
+        # @param [String] object_name Name of object to complete multipart upload for
+        # @param [String] upload_id Id of upload to add part to
+        # @param [Array] parts Array of etag and number as Strings for parts
+        #
+        # @see https://help.aliyun.com/document_detail/31995.html
+        #
+        def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
+          @oss_protocol.complete_multipart_upload(bucket_name, object_name, upload_id, parts)
+        end
+      end
+    end
+  end
+end

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

@@ -7,25 +7,21 @@ module Fog
         # Copy object
         #
         # ==== Parameters
-        # * source_bucket<~String> - Name of source bucket
-        # * source_object<~String> - Name of source object
-        # * target_bucket<~String> - Name of bucket to create copy in
-        # * target_object<~String> - Name for new copy of object
+        # * source_bucket_name<~String> - Name of source bucket
+        # * source_object_name<~String> - Name of source object
+        # * target_bucket_name<~String> - Name of bucket to create copy in
+        # * target_object_name<~String> - Name for new copy of object
         # * options<~Hash> - Additional headers options={}
-        def copy_object(source_bucket, source_object, target_bucket, target_object, options = {})
-          options = options.reject { |_key, value| value.nil? }
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          source_bucket ||= bucket
-          target_bucket ||= bucket
-          headers = { 'x-oss-copy-source' => "/#{source_bucket}/#{source_object}" }
-          resource = target_bucket + '/' + target_object
-          request(expects: [200, 203],
-                  headers: headers,
-                  method: 'PUT',
-                  path: target_object,
-                  bucket: target_bucket,
-                  resource: resource)
+        def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
+          headers = { 'x-oss-copy-source' => "/#{source_bucket_name}#{object_to_path(source_object_name)}" }.merge!(options)
+          resources = {
+              :bucket => target_bucket_name,
+              :object => target_object_name
+          }
+          http_options = {
+              :headers => headers
+          }
+          @oss_http.put(resources, http_options)
         end
       end
     end

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

@@ -7,16 +7,10 @@ module Fog
         # Delete an existing bucket
         #
         # ==== Parameters
-        # * bucket<~String> - Name of bucket to delete
+        # * bucket_name<~String> - Name of bucket to delete
         #
-        def delete_bucket(bucket)
-          resource = bucket + '/'
-          request(
-            expects: 204,
-            method: 'DELETE',
-            bucket: bucket,
-            resource: resource
-          )
+        def delete_bucket(bucket_name)
+          @oss_protocol.delete_bucket(bucket_name)
         end
       end
     end

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

@@ -0,0 +1,20 @@
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+
+        # Delete multiple objects from OSS
+        #
+        # @param bucket_name [String] Name of bucket containing object to delete
+        # @param object_names [Array]  Array of object names to delete
+        #
+        # @see https://help.aliyun.com/document_detail/31983.html
+
+        def delete_multiple_objects(bucket_name, object_names, options = {})
+          bucket = @oss_client.get_bucket(bucket_name)
+          bucket.batch_delete_objects(object_names, options)
+        end
+      end
+    end
+  end
+end

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

@@ -7,18 +7,17 @@ module Fog
         # Delete an existing object
         #
         # ==== Parameters
-        # * object<~String> - Name of object to delete
+        # * bucket_name<~String> - Name of bucket to delete
+        # * object_name<~String> - Name of object to delete
         #
-        def delete_object(object, options = {})
-          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_name, object, upload_id)
-          bucket = @oss_client.get_bucket(bucket_name)
-          bucket.abort_upload(upload_id, object)
+        def delete_object(bucket_name, object_name, options = {})
+          # TODO Support versionId
+          # if version_id = options.delete('versionId')
+          #   query = {'versionId' => version_id}
+          # else
+          #   query = {}
+          # end
+          @oss_http.delete({:bucket => bucket_name, :object => object_name}, {:headers => options})
         end
       end
     end

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

@@ -8,121 +8,44 @@ module Fog
           @oss_client.bucket_exists?(bucket_name)
         end
 
-        def get_bucket(bucket, options = {})
-          prefix = options['prefix']
-          marker = options['marker']
+        def get_bucket(bucket_name, options = {})
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+
           # Set the GetBucket max limitation to 1000
-          maxKeys = options['max-keys'] || 1000
+          maxKeys = options[:max_keys] || 1000
           maxKeys = maxKeys.to_i
-          maxKeys = [maxKeys, 1000].min.to_s
-          delimiter = options['delimiter']
-          path = ''
-          if prefix
-            path += '/?prefix=' + prefix
-            path += '&marker=' + marker if marker
-            path += '&max-keys=' + maxKeys if maxKeys
-            path += '&delimiter=' + delimiter if delimiter
+          maxKeys = [maxKeys, 1000].min
 
-          elsif marker
-            path += '/?marker=' + marker
-            path += '&max-keys=' + maxKeys if maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-
-          elsif maxKeys
-            path += '/?max-keys=' + maxKeys
-            path += '&delimiter=' + delimiter if delimiter
-          elsif delimiter
-            path += '/?delimiter=' + delimiter
-          end
+          options[:limit] = maxKeys
+          options.delete(:max_keys)
 
-          resource = bucket + '/'
-          ret = request(
-            expects: [200, 203, 404],
-            method: 'GET',
-            bucket: bucket,
-            resource: resource,
-            path: path
-          )
-          xml = ret.data[:body]
-          XmlSimple.xml_in(xml)
+          @oss_protocol.list_objects(bucket_name, options)
         end
 
-        def get_bucket_acl(bucket)
-          attribute = '?acl'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])['AccessControlList'][0]['Grant'][0]
+        def get_bucket_acl(bucket_name)
+          @oss_protocol.get_bucket_acl(bucket_name)
         end
 
-        def get_bucket_CORSRules(bucket)
-          attribute = '?cors'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203, 404],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])['CORSRule'][0] if ret.data[:status] != 404
+        def get_bucket_CORSRules(bucket_name)
+          @oss_protocol.get_bucket_cors(bucket_name)
         end
 
-        def get_bucket_lifecycle(bucket)
-          attribute = '?lifecycle'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203, 404],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])['Rule'][0] if ret.data[:status] != 404
+        def get_bucket_lifecycle(bucket_name)
+          @oss_protocol.get_bucket_lifecycle(bucket_name)
         end
 
-        def get_bucket_logging(bucket)
-          attribute = '?logging'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])['LoggingEnabled'][0]['TargetPrefix']
+        def get_bucket_logging(bucket_name)
+          @oss_protocol.get_bucket_logging(bucket_name)
         end
 
-        def get_bucket_referer(bucket)
-          attribute = '?referer'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body])
+        def get_bucket_referer(bucket_name)
+          @oss_protocol.get_bucket_referer(bucket_name)
         end
 
-        def get_bucket_website(bucket)
-          attribute = '?website'
-          resource = bucket + '/' + attribute
-          ret = request(
-            expects: [200, 203, 404],
-            method: 'GET',
-            path: attribute,
-            bucket: bucket,
-            resource: resource
-          )
-          XmlSimple.xml_in(ret.data[:body]) if ret.data[:status] != 404
+        def get_bucket_website(bucket_name)
+          @oss_protocol.get_bucket_website(bucket_name)
         end
       end
     end

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

@@ -0,0 +1,33 @@
+require 'nokogiri'
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+
+        # Get location constraint for an OSS bucket
+        #
+        # @param bucket_name [String] name of bucket to get location constraint for
+        #
+        # @see https://help.aliyun.com/document_detail/31967.html
+        #
+        # note: The OSS Ruby sdk does not support get_bucket_location and there needs to parse response
+
+        def get_bucket_location(bucket_name)
+          data = @oss_http.get({:bucket => bucket_name, :sub_res => { 'location' => nil} }, {})
+          doc = parse_xml(data.body)
+          doc.at_css("LocationConstraint").text
+        end
+
+        private
+
+        def parse_xml(content)
+          doc = Nokogiri::XML(content) do |config|
+            config.options |= Nokogiri::XML::ParseOptions::NOBLANKS
+          end
+
+          doc
+        end
+      end
+    end
+  end
+end

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

@@ -7,30 +7,38 @@ module Fog
         # Get details for object
         #
         # ==== Parameters
-        # * object<~String> - Name of object to look for
+        # * object_name<~String> - Name of object to look for
         #
-        def get_object(object, options = {}, &block)
+        def get_object(bucket_name, object_name, options = {}, &block)
           options = options.reject { |_key, value| value.nil? }
-          bucket_name = options[:bucket]
-          bucket_name ||= @aliyun_oss_bucket
-          options.delete(:bucket)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
           # Using OSS ruby SDK to fix performance issue
-          params = { :headers => {} }
-          params[:query] = options.delete('query') || {}
+          http_options = { :headers => {} }
+          http_options[:query] = options.delete('query') || {}
 
-          params[:headers].merge!(options)
+          http_options[:headers].merge!(options)
           if options['If-Modified-Since']
-            params[:headers]['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header
+            http_options[:headers]['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header
           end
           if options['If-Unmodified-Since']
-            params[:headers]['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header
+            http_options[:headers]['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header
           end
 
           if block_given?
-            params[:response_block] = Proc.new
+            http_options[:response_block] = Proc.new {}
           end
 
-          @oss_http.get({:bucket => bucket_name, :object => object}, params, &block)
+          resources = {
+              :bucket => bucket_name,
+              :object => object_name
+          }
+
+          @oss_http.get(resources, http_options, &block)
 
         end
       end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Aliyun
+    class Storage
+      class Real
+
+        # Get access control list for an S3 object
+        #
+        # @param bucket_name [String] name of bucket containing object
+        # @param object_name [String] name of object to get access control list for
+        # @param options [Hash]
+        # @option options versionId [String] specify a particular version to retrieve
+
+        def get_object_acl(bucket_name, object_name, options = {})
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+
+          # At present, sdk does not support versionId
+          # if version_id = options.delete('versionId')
+          #   query['versionId'] = version_id
+          # end
+          @oss_protocol.get_object_acl(bucket_name, object_name)
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Aliyun
     class Storage
@@ -7,29 +9,26 @@ module Fog
         # Get an expiring object http url
         #
         # ==== Parameters
-        # * container<~String> - Name of container containing object
-        # * object<~String> - Name of object to get expiring url for
+        # * bucket_name<~String> - Name of bucket
+        # * object_name<~String> - Name of object to get expiring url for
         # * expires<~Integer> - An expiry time for this url
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
-        def get_object_http_url_public(object, expires, options = {})
-          options = options.reject { |_key, value| value.nil? }
-          bucket_name = options[:bucket]
-          bucket_name ||= @aliyun_oss_bucket
+        def get_object_http_url_public(bucket_name, object_name, expires)
           bucket = @oss_client.get_bucket(bucket_name)
           acl = bucket.acl()
 
           if acl == 'private'
             expires_time = (Time.now.to_i + (expires.nil? ? 0 : expires.to_i)).to_s
-            resource = bucket_name + '/' + object
+            resource = bucket_name + '/' + object_name
             signature = sign('GET', expires_time, nil, resource)
-            'http://' + bucket_name + '.' + @host + '/' + object +
+            'http://' + bucket_name + '.' + @host + '/' + object_name +
               '?OSSAccessKeyId=' + @aliyun_accesskey_id + '&Expires=' + expires_time +
-              '&Signature=' + URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+              '&Signature=' + Addressable::URI.encode_component(signature, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           elsif acl == 'public-read' || acl == 'public-read-write'
-            'http://' + bucket_name + '.' + @host + '/' + object
+            'http://' + bucket_name + '.' + @host + '/' + object_name
           else
             'acl is wrong with value:' + acl
           end