fog-aliyun 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91aa2154dd185e6481eff2429ffc9c04e8651764dd8d6cf196c2b689a38c461b
-  data.tar.gz: a7aff361e70ead42b81f2d07aff5cbb92c5dcf6624f6dbfd0e0e1e80cc888a1e
+  metadata.gz: 7e69954ae4115e7137286fe738da6423b1898a522f463ac65526ca4c692ce40e
+  data.tar.gz: 991d52c7f3688fc0417b037266480f800f189a9de8d0af421d139829ddde6121
 SHA512:
-  metadata.gz: bdc525d0d99894eb5e0dd63a6e0f4eff5fc9ebddce5c2eecbed0559010bfe25db134076d1f8a6bacc5f72d3efe4772efd02925e27481e8f3a413a6c5eb13ed01
-  data.tar.gz: f4726017f3fd50a33d4015adf8c1f5870645f2401acb79ab43b88fd845cef67fc838fb7a0044eed53c7007aa4ee2705819ecbe04e3f7eca3b12c78d90d6fbed8
+  metadata.gz: 6a53c7749c71417451ae19d72834c3cabfa8f6a13fe4a68f0c1c05515429444c799ccc410241cfbbbfdebbe3b51496a35607f25869eebb09d2b99d9325114a4c
+  data.tar.gz: 165d735915b2cf6e7887a0f5b5205afef604bfa6d6c9bdc5471203811d6c1f4d19ca6fcd45388a01672983e6c03489354c99745e1376f0da9015334f68133b85

data/CHANGELOG.md

@@ -1,4 +1,30 @@
 ## 0.3.17 (Unreleased)
+## 0.3.17 (July 06, 2020)
+
+IMPROVEMENTS:
+- adater oss_sdk_log_path [GH-125](https://github.com/fog/fog-aliyun/pull/125)
+- update ruby sdk to 0.7.3 [GH-124](https://github.com/fog/fog-aliyun/pull/124)
+- adapter maxkeys conversion problem [GH-123](https://github.com/fog/fog-aliyun/pull/123)
+- [Enhance tests][Auth & Connectivity scenarios] Test that API cannot be accessed using incorrect credentials [GH-117](https://github.com/fog/fog-aliyun/pull/117)
+- [Enhance tests][Auth & Connectivity scenarios] Test that API can be accessed using valid credentials [GH-116](https://github.com/fog/fog-aliyun/pull/116)
+- adapter custom log environment variable [GH-114](https://github.com/fog/fog-aliyun/pull/114)
+- [Enhance tests][Buckets scenarios] (NEGATIVE TEST) Test that error is thrown when trying to access non-existing bucket [GH-110](https://github.com/fog/fog-aliyun/pull/110)
+- [Enhance tests][Buckets scenarios] (NEGATIVE TEST) Test that error is thrown when trying to create already existing bucket [GH-109](https://github.com/fog/fog-aliyun/pull/109)
+- [Enhance tests][Buckets scenarios] Test that it is possible to destroy a bucket [GH-108](https://github.com/fog/fog-aliyun/pull/108)
+- [Enhance tests][Buckets scenarios] Test that it is possible to create a new bucket [GH-107](https://github.com/fog/fog-aliyun/pull/107)
+- [Enhance tests][Buckets scenarios] Test that it is possible to list all buckets [GH-105](https://github.com/fog/fog-aliyun/pull/105)
+- [Enhance tests][Files & Directory scenarios] Test getting bucket when directory exists named with the same name as a bucket [GH-101](https://github.com/fog/fog-aliyun/pull/101)
+- [Enhance tests][Files & Directory scenarios] Test file copy operations [GH-100](https://github.com/fog/fog-aliyun/pull/100)
+- reset the last PR [GH-133](https://github.com/fog/fog-aliyun/pull/133)
+- improve put_object_with_body and head_object using sdk do_request [GH-131](https://github.com/fog/fog-aliyun/pull/131)
+
+BUG FIXES:
+- fix max key again [GH-128](https://github.com/fog/fog-aliyun/pull/128)
+- fix downloading object when pushing app twice [GH-127](https://github.com/fog/fog-aliyun/pull/127)
+- fix max key [GH-126](https://github.com/fog/fog-aliyun/pull/126)
+- fix max-keys conversion problem [GH-121](https://github.com/fog/fog-aliyun/pull/121)
+- fix @aliyun_oss_sdk_log_path is nil  [GH-132](https://github.com/fog/fog-aliyun/pull/132)
+
 ## 0.3.16 (June 18, 2020)
 
 IMPROVEMENTS:

data/fog-aliyun.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'memory_profiler'
-  spec.add_development_dependency 'aliyun-sdk', '~> 0.7.2'
+  spec.add_development_dependency 'aliyun-sdk', '~> 0.7.3'
 
-  spec.add_dependency 'aliyun-sdk', '~> 0.7.2'
+  spec.add_dependency 'aliyun-sdk', '~> 0.7.3'
   spec.add_dependency 'fog-core'
   spec.add_dependency 'fog-json'
   spec.add_dependency 'ipaddress', '~> 0.8'

data/lib/fog/aliyun/models/storage/files.rb

@@ -85,7 +85,7 @@ module Fog
           end
         end
 
-        def get(key)
+        def get(key, options = {}, &block)
           requires :directory
           bucket_name, directory_key = check_directory_key(directory.key)
           object = if directory_key == ''
@@ -94,24 +94,25 @@ module Fog
                      directory_key + '/' + key
                    end
           begin
-            data = service.get_object(object, nil, bucket: bucket_name)
-            lastModified = data['headers'][:last_modified]
+            data = service.get_object(object, options.merge({bucket: bucket_name}), &block)
+            headers = data.headers
+            lastModified = headers[:last_modified]
             last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
 
-            date = data['headers'][:date]
+            date = headers[:date]
             date = (Time.parse(date).localtime if !date.nil? && date != '')
             file_data = {
-                body: data[:body],
-                content_length: data['headers'][:content_length].to_i,
+                body: data.body,
+                content_length: headers[:content_length].to_i,
                 key: key,
                 last_modified: last_modified,
-                content_type: data['headers'][:content_type],
-                etag: data['headers'][:etag],
+                content_type: headers[:content_type],
+                etag: headers[:etag],
                 date: date,
-                connection: data['headers'][:connection],
-                accept_ranges: data['headers'][:accept_ranges],
-                server: data['headers'][:server],
-                object_type: data['headers'][:x_oss_object_type]
+                connection: headers[:connection],
+                accept_ranges: headers[:accept_ranges],
+                server: headers[:server],
+                object_type: headers[:x_oss_object_type]
             }
 
             new(file_data)

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

@@ -13,22 +13,23 @@ module Fog
           marker = options['marker']
           # Set the GetBucket max limitation to 1000
           maxKeys = options['max-keys'] || 1000
-          maxKeys = [maxKeys, 1000].min
+          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.to_s if maxKeys
+            path += '&max-keys=' + maxKeys if maxKeys
             path += '&delimiter=' + delimiter if delimiter
 
           elsif marker
             path += '/?marker=' + marker
-            path += '&max-keys=' + maxKeys.to_s if maxKeys
+            path += '&max-keys=' + maxKeys if maxKeys
             path += '&delimiter=' + delimiter if delimiter
 
           elsif maxKeys
-            path += '/?max-keys=' + maxKeys.to_s
+            path += '/?max-keys=' + maxKeys
             path += '&delimiter=' + delimiter if delimiter
           elsif delimiter
             path += '/?delimiter=' + delimiter

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

@@ -11,7 +11,9 @@ module Fog
           bucket ||= @aliyun_oss_bucket
 
           marker = options[:marker]
-          maxKeys = options[:maxKeys]
+          maxKeys = options[:maxKeys]||1000
+          maxKeys = maxKeys.to_i
+          maxKeys = [maxKeys,1000].min.to_s
           delimiter = '/'
 
           path = ''

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

@@ -19,7 +19,9 @@ module Fog
           bucket ||= @aliyun_oss_bucket
           prefix = options[:prefix]
           marker = options[:marker]
-          maxKeys = options[:maxKeys]
+          maxKeys = options[:maxKeys]||1000
+          maxKeys = maxKeys.to_i
+          maxKeys = [maxKeys,1000].min.to_s
           delimiter = '/'
 
           path = ''

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

@@ -9,19 +9,29 @@ module Fog
         # ==== Parameters
         # * object<~String> - Name of object to look for
         #
-        def get_object(object, range = nil, options = {})
+        def get_object(object, options = {}, &block)
           options = options.reject { |_key, value| value.nil? }
           bucket_name = options[:bucket]
           bucket_name ||= @aliyun_oss_bucket
+          options.delete(: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
+          params = { :headers => {} }
+          params[:query] = options.delete('query') || {}
+
+          params[: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
+          end
+          if options['If-Unmodified-Since']
+            params[: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
           end
-          response = {}
-          obj.instance_variables.each {|var| response[var.to_s.delete("@")] = obj.instance_variable_get(var) }
-          response.merge({:body => body.join('')})
+
+          @oss_http.get({:bucket => bucket_name, :object => object}, params, &block)
+
         end
       end
     end

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

@@ -10,14 +10,14 @@ module Fog
         # * object<~String> - Name of object to look for
         #
         def head_object(object, options = {})
-          bucket = options[:bucket]
-          bucket ||= @aliyun_oss_bucket
-          resource = bucket + '/' + object
+          bucket_name = options[:bucket]
+          bucket_name ||= @aliyun_oss_bucket
+          resource = bucket_name + '/' + object
           ret = request(
             expects: [200, 404],
             method: 'HEAD',
             path: object,
-            bucket: bucket,
+            bucket: bucket_name,
             resource: resource
           )
           ret

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

@@ -7,7 +7,9 @@ module Fog
         def list_buckets(options = {})
           prefix = options[:prefix]
           marker = options[:marker]
-          maxKeys = options[:maxKeys]
+          maxKeys = options[:maxKeys] || 1000
+          maxKeys = maxKeys.to_i
+          maxKeys =[maxKeys,1000].min.to_s
 
           path = ''
           if prefix

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

@@ -10,24 +10,25 @@ module Fog
           prefix = options['prefix']
           marker = options['marker']
           # Set the ListObjects max limitation to 1000
-          maxKeys = options['max-keys'] || 1000
-          maxKeys = [maxKeys, 1000].min
+          maxKeys = options[:maxKeys]||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.to_s if maxKeys
+            path += '&max-keys=' + maxKeys if maxKeys
             path += '&delimiter=' + delimiter if delimiter
 
           elsif marker
             path += '/?marker=' + marker
-            path += '&max-keys=' + maxKeys.to_s if maxKeys
+            path += '&max-keys=' + maxKeys if maxKeys
             path += '&delimiter=' + delimiter if delimiter
 
           elsif maxKeys
-            path += '/?max-keys=' + maxKeys.to_s
+            path += '/?max-keys=' + maxKeys
             path += '&delimiter=' + delimiter if delimiter
           elsif delimiter
             path += '/?delimiter=' + delimiter

data/lib/fog/aliyun/storage.rb

@@ -19,7 +19,9 @@ module Fog
 
       recognizes :aliyun_oss_endpoint,
                  :aliyun_oss_location,
-                 :aliyun_region_id
+                 :aliyun_region_id,
+                 :aliyun_oss_sdk_log_path
+
       requires :aliyun_accesskey_id,
                :aliyun_accesskey_secret,
                :aliyun_oss_bucket
@@ -72,6 +74,7 @@ module Fog
         attr_reader :aliyun_oss_endpoint
         attr_reader :aliyun_region_id
         attr_reader :aliyun_oss_bucket
+        attr_reader :aliyun_oss_sdk_log_path
 
         def initialize(options = {})
           # initialize the parameters
@@ -80,7 +83,11 @@ module Fog
           @aliyun_accesskey_id = options[:aliyun_accesskey_id]
           @aliyun_accesskey_secret = options[:aliyun_accesskey_secret]
           @aliyun_oss_bucket = options[:aliyun_oss_bucket]
-
+          @aliyun_oss_sdk_log_path=options[:aliyun_oss_sdk_log_path]
+          if @aliyun_oss_sdk_log_path && !::File.exist?(@aliyun_oss_sdk_log_path)
+            `touch #{@aliyun_oss_sdk_log_path}`
+          end
+          ENV["ALIYUN_OSS_SDK_LOG_PATH"] = @aliyun_oss_sdk_log_path
           # check for the parameters
           missing_credentials = []
           missing_credentials << :aliyun_oss_bucket unless @aliyun_oss_bucket
@@ -106,6 +113,14 @@ module Fog
                                      :access_key_id => @aliyun_accesskey_id,
                                      :access_key_secret => @aliyun_accesskey_secret
           )
+
+          # initiate a aliyun oss ruby sdk config and using sdk http to invoke the OSS openapi
+          @oss_config = AliyunOssSdk::Config.new(
+              :endpoint => @aliyun_oss_endpoint,
+              :access_key_id => @aliyun_accesskey_id,
+              :access_key_secret => @aliyun_accesskey_secret
+          )
+          @oss_http = AliyunOssSdk::HTTP.new(@oss_config)
         end
 
         def reload

data/lib/fog/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Fog
   module Aliyun
-    VERSION = '0.3.16'
+    VERSION = '0.3.17'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han, Guimin He
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,28 +134,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: aliyun-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement