fog-aliyun 0.3.17 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e69954ae4115e7137286fe738da6423b1898a522f463ac65526ca4c692ce40e
-  data.tar.gz: 991d52c7f3688fc0417b037266480f800f189a9de8d0af421d139829ddde6121
+  metadata.gz: 902530b35b7b3b8213965642cb9994b53399a02e65cf75270fc30f9f4a662ad2
+  data.tar.gz: 9a413e6577adbed08130870c7e7aa751ceb80aec8bb53d42eb43f694cff56a0e
 SHA512:
-  metadata.gz: 6a53c7749c71417451ae19d72834c3cabfa8f6a13fe4a68f0c1c05515429444c799ccc410241cfbbbfdebbe3b51496a35607f25869eebb09d2b99d9325114a4c
-  data.tar.gz: 165d735915b2cf6e7887a0f5b5205afef604bfa6d6c9bdc5471203811d6c1f4d19ca6fcd45388a01672983e6c03489354c99745e1376f0da9015334f68133b85
+  metadata.gz: 3d8a867a2cd5be94ec813a8ee11371eed34530aff2554227590c5fdcae9b0ebb197f421ecd7716c38fd9cc930f91f5b2390b28b247fd9dca2cc87f08c4d3311f
+  data.tar.gz: dc7c248af9cb3388bf2453f8c4096935dafa3ca251c86d75da251c61feda0980d36fd01241a53b4bbff97f0460df609e9634062bc73df851e8510b6368d6e653

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+3.0.4

data/CHANGELOG.md

@@ -1,4 +1,37 @@
-## 0.3.17 (Unreleased)
+## 0.4.1 (Unreleased)
+## 0.4.0 (August 17, 2022)
+
+IMPROVEMENTS:
+- Ruby 3 [GH-158](https://github.com/fog/fog-aliyun/pull/158)
+
+## 0.3.19 (August 17, 2020)
+
+IMPROVEMENTS:
+
+- Upgrade oss ruby sdk to support setting log level [GH-152](https://github.com/fog/fog-aliyun/pull/152)
+
+## 0.3.18 (August 03, 2020)
+
+IMPROVEMENTS:
+
+- reconstruct perform test [GH-148](https://github.com/fog/fog-aliyun/pull/148)
+- Reconstruct fog-aliyun by using oss [GH-147](https://github.com/fog/fog-aliyun/pull/147)
+- reconstruct cover case test [GH-146](https://github.com/fog/fog-aliyun/pull/146)
+- reconstruct case test [GH-144](https://github.com/fog/fog-aliyun/pull/144)
+- reconstruct parts two of file [GH-143](https://github.com/fog/fog-aliyun/pull/143)
+- implement blobstore for cloud_controller_ng [GH-142](https://github.com/fog/fog-aliyun/pull/142)
+- reconstruct parts of file [GH-141](https://github.com/fog/fog-aliyun/pull/141)
+- reconstruct the files [GH-140](https://github.com/fog/fog-aliyun/pull/140)
+- reconstruct the directory [GH-139](https://github.com/fog/fog-aliyun/pull/139)
+- reconstruct the directories [GH-138](https://github.com/fog/fog-aliyun/pull/138)
+- improve files.get code [GH-137](https://github.com/fog/fog-aliyun/pull/137)
+- add testcase for testing head notexistfile [GH-136](https://github.com/fog/fog-aliyun/pull/136)
+- improve head_object using oss sdk [GH-135](https://github.com/fog/fog-aliyun/pull/135)
+
+BUG FIXES:
+
+- fix files all options problem [GH-149](https://github.com/fog/fog-aliyun/pull/149)
+
 ## 0.3.17 (July 06, 2020)
 
 IMPROVEMENTS:
@@ -78,4 +111,4 @@ IMPROVEMENTS:
 ## 0.3.9 (May 07, 2020)
 
 BUG FIXES:
-- diectories.get supports options to filter the specified objects [GH-62](https://github.com/fog/fog-aliyun/pull/62)
+- diectories.get supports options to filter the specified objects [GH-62](https://github.com/fog/fog-aliyun/pull/62)

data/fog-aliyun.gemspec

@@ -21,16 +21,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'mime-types', '~> 2.6', '>= 2.6.2'
+  spec.add_development_dependency 'mime-types', '~> 3.4'
   spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'memory_profiler'
-  spec.add_development_dependency 'aliyun-sdk', '~> 0.7.3'
+  spec.add_development_dependency 'aliyun-sdk', '~> 0.8.0'
 
-  spec.add_dependency 'aliyun-sdk', '~> 0.7.3'
+  spec.add_dependency 'addressable', '~> 2.8.0'
+  spec.add_dependency 'aliyun-sdk', '~> 0.8.0'
   spec.add_dependency 'fog-core'
   spec.add_dependency 'fog-json'
   spec.add_dependency 'ipaddress', '~> 0.8'

data/lib/fog/aliyun/compute.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
+
 module Fog
   module Compute
     class Aliyun < Fog::Service
@@ -350,7 +352,7 @@ module Fog
         # operation compute-- default URL
         def defaultAliyunUri(action, sigNonce, time)
           parTimeFormat = time.strftime('%Y-%m-%dT%H:%M:%SZ')
-          urlTimeFormat = URI.encode(parTimeFormat, ':')
+          urlTimeFormat = Addressable::URI.encode_component(parTimeFormat, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           '?Format=JSON&AccessKeyId=' + @aliyun_accesskey_id + '&Action=' + action + '&SignatureMethod=HMAC-SHA1&RegionId=' + @aliyun_region_id + '&SignatureNonce=' + sigNonce + '&SignatureVersion=1.0&Version=2014-05-26&Timestamp=' + urlTimeFormat
         end
 
@@ -370,7 +372,7 @@ module Fog
 
         def defaultAliyunVPCUri(action, sigNonce, time)
           parTimeFormat = time.strftime('%Y-%m-%dT%H:%M:%SZ')
-          urlTimeFormat = URI.encode(parTimeFormat, ':')
+          urlTimeFormat = Addressable::URI.encode_component(parTimeFormat, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           '?Format=JSON&AccessKeyId=' + @aliyun_accesskey_id + '&Action=' + action + '&SignatureMethod=HMAC-SHA1&RegionId=' + @aliyun_region_id + '&SignatureNonce=' + sigNonce + '&SignatureVersion=1.0&Version=2016-04-28&Timestamp=' + urlTimeFormat
         end
 
@@ -420,18 +422,18 @@ module Fog
         # building querystrings with string concatination.
         def sign(accessKeySecret, parameters)
           signature = sign_without_encoding(accessKeySecret, parameters)
-          URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          Addressable::URI.encode_component(signature, Addressable::URI::CharacterClasses::UNRESERVED + '|')
         end
 
         def sign_without_encoding(accessKeySecret, parameters)
           sortedParameters = parameters.sort
           canonicalizedQueryString = ''
           sortedParameters.each do |k, v|
-            canonicalizedQueryString += '&' + URI.encode(k, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ') + '=' + URI.encode(v, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+            canonicalizedQueryString += '&' + Addressable::URI.encode_component(k, Addressable::URI::CharacterClasses::UNRESERVED + '|') + '=' + Addressable::URI.encode_component(v, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           end
 
           canonicalizedQueryString[0] = ''
-          stringToSign = 'GET&%2F&' + URI.encode(canonicalizedQueryString, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+          stringToSign = 'GET&%2F&' + Addressable::URI.encode_component(canonicalizedQueryString, Addressable::URI::CharacterClasses::UNRESERVED + '|')
           key = accessKeySecret + '&'
 
           digVer = OpenSSL::Digest.new('sha1')

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

@@ -10,70 +10,47 @@ module Fog
         model Fog::Aliyun::Storage::Directory
 
         def all
-          containers = service.get_containers
-          return nil if containers.nil?
+          buckets = service.get_service[0]
+          return nil if buckets.size < 1
           data = []
           i = 0
-          containers.each do |entry|
-            key = entry['Prefix'][0]
-            key[-1] = ''
-            data[i] = { key: key }
+          buckets.each do |b|
+            data[i] = { key: b.name }
             i += 1
           end
-
           load(data)
         end
 
-        # get method used to get a specified directory.
-        # If the directory is not exist, this method will create a new with 'key'
-        # In order to support multi-buckets scenario which making bucket as a solo directory, it have been expanded.
-        # If key is a directory(including /), return an existed or a new one;
-        # If key does not contain /, if bucket, return '', else return an existed or a new one directory;
+
         def get(key, options = {})
-          if key.is_a? Array
-            key = key[0]
+          data = service.get_bucket(key, options)
+
+          directory = new(:key => key, :is_persisted => true)
+
+          options = data[1]
+          options[:max_keys] = options[:limit]
+          directory.files.merge_attributes(options)
+
+          objects = []
+          i = 0
+          data[0].each do |o|
+            objects[i] = {
+                'Key' => o.key,
+                'Type' => o.type,
+                'Size' => o.size,
+                'ETag' => o.etag,
+                'LastModified' => o.last_modified
+            }
+            i += 1
           end
-          if !key.nil? && key != '' && key != '.'
-            key = key.chomp('/')
-            if key.include? '/'
-              dir = key + '/'
-              ret = service.head_object(dir, options)
-              new(key: key) if ret.data[:status] == 200
-            else
-              remap_attributes(options, {
-                  :delimiter  => 'delimiter',
-                  :marker     => 'marker',
-                  :max_keys   => 'max-keys',
-                  :prefix     => 'prefix'
-              })
-              data = service.get_bucket(key, options)
-              directory = new(:key => data['Name'], :is_persisted => true)
-              options = {}
-              for k, v in data
-                if ['CommonPrefixes', 'Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(k)
-                  # Sometimes, the v will be a Array, like "Name"=>["blobstore-droplet1"], "Prefix"=>[{}], "Marker"=>[{}], "MaxKeys"=>["100"], "Delimiter"=>[{}], "IsTruncated"=>["false"]
-                  # and there needs to parse them
-                  if !v.nil? && (v.is_a? Array) && (v.size > 0)
-                    if v[0].is_a? Hash
-                      v = nil
-                    else
-                      v = v[0]
-                    end
-                  end
-                  options[k] = v
-                end
-              end
-              directory.files.merge_attributes(options)
-              if data.key?('Contents') && !data['Contents'].nil?
-                directory.files.load(data['Contents'])
-              end
-              directory
-            end
+          directory.files.load(objects)
+          directory
+        rescue AliyunOssSdk::ServerError => error
+          if error.error_code == "NoSuchBucket"
+            nil
           else
-            new(key: '')
+            raise(error)
           end
-        rescue Fog::Aliyun::Storage::NotFound
-          nil
         end
       end
     end

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

@@ -7,24 +7,62 @@ module Fog
   module Aliyun
     class Storage
       class Directory < Fog::Model
+        VALID_ACLS = ['private', 'public-read', 'public-read-write']
+
+        attr_reader :acl
         identity :key, :aliases => ['Key', 'Name', 'name']
 
+        attribute :creation_date, :aliases => 'CreationDate', :type => 'time'
+
+        def acl=(new_acl)
+          unless VALID_ACLS.include?(new_acl)
+            raise ArgumentError.new("acl must be one of [#{VALID_ACLS.join(', ')}]")
+          else
+            @acl = new_acl
+          end
+        end
+
         def destroy
           requires :key
-          prefix = key + '/'
-          ret = service.list_objects(prefix: prefix)['Contents']
-
-          if ret.nil?
+          service.delete_bucket(key)
+          true
+        rescue AliyunOssSdk::ServerError => error
+          if error.error_code == "NoSuchBucket"
             false
-          elsif ret.size == 1
-            service.delete_container(key)
-            true
           else
-            raise Fog::Aliyun::Storage::Error, ' Forbidden: Direction not empty!'
+            raise(error)
+          end
+        end
+
+        def destroy!(options = {})
+          requires :key
+          options = {
+              timeout: Fog.timeout,
+              interval: Fog.interval,
+          }.merge(options)
+
+          begin
+            clear!
+            Fog.wait_for(options[:timeout], options[:interval]) { objects_keys.size == 0 }
+            service.delete_bucket(key)
+            true
+          rescue AliyunOssSdk::ServerError
             false
           end
         end
 
+        def location
+          region = @aliyun_region_id
+          region ||= Storage::DEFAULT_REGION
+          @location = (bucket_location || 'oss-' + region)
+        end
+
+        # NOTE: you can't change the region once the bucket is created
+        def location=(new_location)
+          new_location = 'oss-' + new_location unless new_location.start_with?('oss-')
+          @location = new_location
+        end
+
         def files
           @files ||= begin
             Fog::Aliyun::Storage::Files.new(
@@ -34,6 +72,12 @@ module Fog
           end
         end
 
+        # TODO
+        def public=(new_public)
+          nil
+        end
+
+        # TODO
         def public_url
           nil
         end
@@ -41,18 +85,53 @@ module Fog
         def save
           requires :key
 
-          # Checking whether the key is a bucket and meet the multi-bucket scenario.
-          # If the key is a existing bucket, return it directly.
-          key = key.chomp('/')
-          if !key.nil? && key != '' && key != '.' && !(key.include? '/')
-            data = service.get_bucket(key)
-            if data.class == Hash && data.key?('Code') && !data['Code'].nil? && !data['Code'].empty?
-              service.put_container(key)
-            end
-          end
+          options = {}
+
+          options['x-oss-acl'] = acl if acl
+
+          # https://help.aliyun.com/document_detail/31959.html
+          # if !persisted?
+          #   # There is a sdk bug that location can not be set
+          #   options[:location] = location
+          # end
+
+          service.put_bucket(key, options)
+          attributes[:is_persisted] = true
 
           true
         end
+
+        def persisted?
+          # is_persisted is true in case of directories.get or after #save
+          # creation_date is set in case of directories.all
+          attributes[:is_persisted] || !!attributes[:creation_date]
+        end
+
+        private
+
+        def bucket_location
+          requires :key
+          return nil unless persisted?
+          service.get_bucket_location(key)
+        end
+
+        def objects_keys
+          requires :key
+          bucket_query = service.get_bucket(key)
+
+          object_keys = []
+          i = 0
+          bucket_query[0].each do |o|
+            object_keys[i] = o.key
+            i += 1
+          end
+          object_keys
+        end
+
+        def clear!
+          requires :key
+          service.delete_multiple_objects(key, objects_keys) if objects_keys.size > 0
+        end
       end
     end
   end