fog-aliyun 0.3.3 → 0.4.0

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
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securitygroup_id
@@ -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
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securitygroup_id
@@ -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
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securitygroup_id
@@ -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_server.rb

@@ -10,7 +10,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SnapshotId'] = snapshotId

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           if vpc_id

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           if vswitch_id

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
@@ -10,7 +12,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['InstanceId'] = instanceId
@@ -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/join_security_group.rb

@@ -10,7 +10,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

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

@@ -10,7 +10,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

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

@@ -34,7 +34,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           pageNumber = options[:pageNumber]

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

@@ -10,7 +10,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _Status = options[:state]

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           pageNumber = options[:pageNumber]

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['VRouterId'] = vrouterid

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['SecurityGroupId'] = securityGroupId

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           pageNumber = options[:pageNumber]

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

@@ -10,7 +10,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _signature = sign(@aliyun_accesskey_secret, _parameters)
@@ -28,7 +28,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _signature = sign(@aliyun_accesskey_secret, _parameters)
@@ -41,7 +41,7 @@ module Fog
           )
 
           _InstanceTypeId = nil
-          _InstanceTypeList = Fog::JSON.decode(response.body)['InstanceTypes']['InstanceType']
+          _InstanceTypeList = response.body['InstanceTypes']['InstanceType']
           _InstanceTypeList.each do |instance_type|
             next unless (instance_type['CpuCoreCount'] == cpuCount) && (instance_type['MemorySize'] == memorySize)
             _InstanceTypeId = instance_type['InstanceTypeId']

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

@@ -10,8 +10,8 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
-          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
+          _query_parameters = defaultAliyunQueryParameters(_action, _sigNonce, _time)
 
           _InstanceId = options[:instanceId]
           _VpcId = options[:vpcId]
@@ -22,35 +22,35 @@ module Fog
           unless _InstanceId.nil?
             _InstanceStr = "[\"#{_InstanceId}\"]"
             _parameters['InstanceIds'] = _InstanceStr
-            _pathURL += '&InstanceIds=' + _InstanceStr
+            _query_parameters[:InstanceIds] = _InstanceStr
           end
 
           unless _VpcId.nil?
             _parameters['VpcId'] = _VpcId
-            _pathURL += '&VpcId=' + _VpcId
+            _query_parameters[:VpcId] = _VpcId
           end
 
           unless _SecurityGroupId.nil?
             _parameters['SecurityGroupId'] = _SecurityGroupId
-            _pathURL += '&SecurityGroupId=' + _SecurityGroupId
+            _query_parameters[:SecurityGroupId] = _SecurityGroupId
           end
 
           unless _PageNumber.nil?
             _parameters['PageNumber'] = _PageNumber
-            _pathURL += '&PageNumber=' + _PageNumber
+            _query_parameters[:PageNumber] = _PageNumber
           end
 
           _PageSize ||= '50'
           _parameters['PageSize'] = _PageSize
-          _pathURL += '&PageSize=' + _PageSize
+          _query_parameters[:PageSize] = _PageSize
 
-          _signature = sign(@aliyun_accesskey_secret, _parameters)
-          _pathURL += '&Signature=' + _signature
+          _signature = sign_without_encoding(@aliyun_accesskey_secret, _parameters)
+          _query_parameters[:Signature] = _signature
 
           request(
             expects: [200, 203],
             method: 'GET',
-            path: _pathURL
+            query: _query_parameters
           )
         end
       end

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           pageNumber = options[:pageNumber]

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           _VpcId = options[:vpcId]

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           _VRouterId = options[:vRouterId]

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['VpcId'] = vpcid

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

@@ -10,7 +10,7 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           signature = sign(@aliyun_accesskey_secret, parameters)

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
@@ -10,12 +12,12 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           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
@@ -10,12 +12,12 @@ module Fog
           sigNonce = randonStr
           time = Time.new.utc
 
-          parameters = defalutParameters(action, sigNonce, time)
+          parameters = defaultParameters(action, sigNonce, time)
           pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           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/compute/reboot_server.rb

@@ -10,7 +10,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

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

@@ -10,7 +10,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['AllocationId'] = allocationId

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

@@ -16,7 +16,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

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

@@ -16,7 +16,7 @@ module Fog
           _sigNonce = randonStr
           _time = Time.new.utc
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

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

@@ -22,7 +22,7 @@ module Fog
 
           type = options['instance_type']
 
-          _parameters = defalutParameters(_action, _sigNonce, _time)
+          _parameters = defaultParameters(_action, _sigNonce, _time)
           _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
 
           _parameters['InstanceId'] = server_id

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

@@ -1,34 +1,27 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # 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}" }
-          location = get_bucket_location(target_bucket)
-          endpoint = 'http://' + location + '.aliyuncs.com'
-          resource = target_bucket + '/' + target_object
-          request(expects: [200, 203],
-                  headers: headers,
-                  method: 'PUT',
-                  path: target_object,
-                  bucket: target_bucket,
-                  resource: resource,
-                  endpoint: endpoint)
+        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

@@ -1,25 +1,16 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Real
         # Delete an existing bucket
         #
         # ==== Parameters
-        # * bucket<~String> - Name of bucket to delete
+        # * bucket_name<~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
-          )
+        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