fog-aliyun 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8112e65fc18f3f89cf72ff352d04598767cd95e
-  data.tar.gz: b066bbda00dd2dca8ce98df46390a96d7cc84796
+SHA256:
+  metadata.gz: 902530b35b7b3b8213965642cb9994b53399a02e65cf75270fc30f9f4a662ad2
+  data.tar.gz: 9a413e6577adbed08130870c7e7aa751ceb80aec8bb53d42eb43f694cff56a0e
 SHA512:
-  metadata.gz: fe59bca5c4b8831600e06588444637efd12426a88535d742b140b44cdb05dde0049bf1af41cd06fd307137327c50c3d6ad2265cc7ba8e8d8c1ecbb6e6b5722b5
-  data.tar.gz: 96e3d984bba498615c0939a75182ff8d0d0f290642307e646bcb3c4d4c965f5c60483b01003d195ae8d6034027092192cfda40ef860777bdf1b17e4b77967e00
+  metadata.gz: 3d8a867a2cd5be94ec813a8ee11371eed34530aff2554227590c5fdcae9b0ebb197f421ecd7716c38fd9cc930f91f5b2390b28b247fd9dca2cc87f08c4d3311f
+  data.tar.gz: dc7c248af9cb3388bf2453f8c4096935dafa3ca251c86d75da251c61feda0980d36fd01241a53b4bbff97f0460df609e9634062bc73df851e8510b6368d6e653

data/.gitignore

@@ -23,3 +23,5 @@ tmp
 *.a
 mkmf.log
 gemfiles/*.lock
+morethan100m
+*.log

data/.ruby-version

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

data/CHANGELOG.md

@@ -0,0 +1,114 @@
+## 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:
+- 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:
+- [Enhance tests][Files & Directory scenarios] Test get nested directories and files in nested directory [GH-98](https://github.com/fog/fog-aliyun/pull/98)
+- remove get_bucket_location and use ruby sdk to improve performance when uploading object [GH-97](https://github.com/fog/fog-aliyun/pull/97)
+- using bucket_exist to checking bucket [GH-95](https://github.com/fog/fog-aliyun/pull/95)
+- add change log [GH-94](https://github.com/fog/fog-aliyun/pull/94)
+
+BUG FIXES:
+- fix delete all of files bug when specifying a prefix [GH-102](https://github.com/fog/fog-aliyun/pull/102)
+
+## 0.3.15 (June 05, 2020)
+
+BUG FIXES:
+- change dependence ruby sdk to gems [GH-92](https://github.com/fog/fog-aliyun/pull/92)
+
+## 0.3.13 (June 02, 2020)
+
+IMPROVEMENTS:
+- using ruby sdk to delete object [GH-90](https://github.com/fog/fog-aliyun/pull/90)
+
+## 0.3.12 (May 28, 2020 )
+
+BUG FIXES:
+- add missing dependence [GH-88](https://github.com/fog/fog-aliyun/pull/88)
+
+## 0.3.11 (May 25, 2020)
+
+IMPROVEMENTS:
+- using oss ruby sdk to improve downloading object performance [GH-86](https://github.com/fog/fog-aliyun/pull/86)
+- Add performance tests [GH-85](https://github.com/fog/fog-aliyun/pull/85)
+- [Enhance tests][Entity operations]Add tests for each type of entity that validates the CURD operations [GH-84](https://github.com/fog/fog-aliyun/pull/84)
+- [Enhance tests][Auth & Connectivity scenarios] Test region is selected according to provider configuration [GH-83](https://github.com/fog/fog-aliyun/pull/83)
+- [Enhance tests][Files & Directory scenarios] test file listing using parameters such as prefix, marker, delimeter and maxKeys [GH-82](https://github.com/fog/fog-aliyun/pull/82)
+- [Enhance tests][Files & Directory scenarios]test directory listing using parameters such as prefix, marker, delimeter and maxKeys [GH-81](https://github.com/fog/fog-aliyun/pull/81)
+- [Enhance tests][Files & Directory scenarios]Test that it is possible to upload (write) large file (multi part upload) [GH-79](https://github.com/fog/fog-aliyun/pull/79)
+- upgrade deprecated code [GH-78](https://github.com/fog/fog-aliyun/pull/78)
+- improve fog/integration_spec [GH-77](https://github.com/fog/fog-aliyun/pull/77)
+- [Enhance tests][Files & Directory scenarios]Test that it is possible to upload (write) a file [GH-76](https://github.com/fog/fog-aliyun/pull/76)
+- upgrade deprecated code [GH-74](https://github.com/fog/fog-aliyun/pull/74)
+- support https scheme [GH-71](https://github.com/fog/fog-aliyun/pull/71)
+- [Enhance tests][Files & Directory scenarios]Test that it is possible to destroy a file/directory [GH-69](https://github.com/fog/fog-aliyun/pull/69)
+- improve fog/integration_spec [GH-68](https://github.com/fog/fog-aliyun/pull/68)
+- Implement basic integration tests [GH-66](https://github.com/fog/fog-aliyun/pull/66)
+
+## 0.3.10 (May 07, 2020)
+
+IMPROVEMENTS:
+- Set max limitation to 1000 when get objects [GH-64](https://github.com/fog/fog-aliyun/pull/64)
+
+## 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)

data/README.md

@@ -30,9 +30,9 @@ Since it's a bad practice to have your credentials in source code, you should lo
 
 ```
 default:
-  :aliyun_accesskey_id:     <YOUR_ACCESS_KEY_ID>,
-  :aliyun_accesskey_secret: <YOUR_SECRET_ACCESS_KEY>,
-  :aliyun_region_id:        <YOUR_TARGET_REGION>
+  aliyun_accesskey_id:     "<YOUR_ACCESS_KEY_ID>"
+  aliyun_accesskey_secret: "<YOUR_SECRET_ACCESS_KEY>"
+  aliyun_region_id:        "<YOUR_TARGET_REGION>"
 ```
 
 ### Connecting to OSS
@@ -307,6 +307,64 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Testing
+
+
+
+To run test suite use the following command:
+
+```
+rake spec
+```
+
+### Code coverage
+
+To run test suite with code coverage:
+
+```
+export COVERAGE=true
+rake spec
+```
+
+The result will be generated in `coverage` folder.
+
+### Integration tests
+
+To run integration tests please prepare a set of AliCloud credentials to be used by integration tests.
+
+Define the credentials and bucket in `~/.fog` file in using following format:
+
+```
+default:
+  aliyun_accesskey_id:     "...access key..." # You can create a set of credentials  
+  aliyun_accesskey_secret: "...secret..." # using Alicloud console portal
+  aliyun_region_id:        "...region name..." # Example: cn-shanghai
+  aliyun_oss_bucket:       "...name of the bucket..." # Example: fog-integration-test-bucket
+```
+
+WARNING: Do NOT use any productive account credentials and buckets for the testing, it may be harmful to your data!
+
+The tests are using [https://github.com/aliyun/aliyun-cli#installation](Aliyun CLI) to setup integration bucket and content for tests, 
+please install it locally before running integration tests.
+
+Aliyun CLI will be configured automatically as part of test execution using the credentials provided for fog connection.
+
+Then run the test suite with `INTEGRATION` environment variable to activate integration tests:
+
+```
+export INTEGRATION=true
+rake spec
+```
+
+### Performance test
+
+Performance tests are providing memory consumption report for download/upload operations.
+
+```
+export PERFORMANCE=true
+rake spec
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/fog-aliyun.gemspec

@@ -7,10 +7,10 @@ require 'fog/aliyun/version'
 Gem::Specification.new do |spec|
   spec.name = 'fog-aliyun'
   spec.version = Fog::Aliyun::VERSION
-  spec.authors = ['Qinsi Deng, Jianxun Li, Jane Han']
-  spec.email = ['dengqinsi@sina.com']
+  spec.authors = ['Qinsi Deng, Jianxun Li, Jane Han, Guimin He']
+  spec.email = ['dengqinsi@sina.com', 'guimin.hgm@alibaba-inc.com']
 
-  spec.summary = 'Fog provider for Aliyun Web Services.'
+  spec.summary = 'Fog provider for Alibaba Cloud Web Services.'
   spec.description = 'As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will support more aliyun services later.'
   spec.homepage = 'https://github.com/fog/fog-aliyun'
   spec.license = 'MIT'
@@ -21,12 +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.8.0'
 
+  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
@@ -36,7 +38,8 @@ module Fog
       collection :route_tables
       model :route_entry
       collection :route_entrys
-
+      model :flavor
+      collection :flavors
       ## REQUESTS
       #
       request_path 'fog/aliyun/requests/compute'
@@ -117,6 +120,9 @@ module Fog
       request :attach_disk
       request :detach_disk
 
+      # PublicIpAddress
+      request :allocate_public_ip_address
+
       class Mock
         attr_reader :auth_token
         attr_reader :auth_token_expiration
@@ -271,7 +277,6 @@ module Fog
           missing_credentials << :aliyun_accesskey_secret unless @aliyun_accesskey_secret
           missing_credentials << :aliyun_region_id unless @aliyun_region_id
           missing_credentials << :aliyun_url unless @aliyun_url
-          missing_credentials << :aliyun_zone_id unless @aliyun_zone_id
           raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty?
 
           @connection_options = options[:connection_options] || {}
@@ -347,13 +352,27 @@ 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
 
+        def defaultAliyunQueryParameters(action, sigNonce, time)
+          {
+            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: time.strftime('%Y-%m-%dT%H:%M:%SZ')
+          }
+        end
+
         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
 
@@ -366,7 +385,7 @@ module Fog
         end
 
         # operation compute--collection of default parameters
-        def defalutParameters(action, sigNonce, time)
+        def defaultParameters(action, sigNonce, time)
           parTimeFormat = time.strftime('%Y-%m-%dT%H:%M:%SZ')
           para = {
             'Format' => 'JSON',
@@ -399,24 +418,29 @@ module Fog
         end
 
         # compute signature
+        # This method should be considered deprecated and replaced with sign_without_encoding, which is better for using querystring hashes and not
+        # building querystrings with string concatination.
         def sign(accessKeySecret, parameters)
+          signature = sign_without_encoding(accessKeySecret, parameters)
+          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')
           digest = OpenSSL::HMAC.digest(digVer, key, stringToSign)
           signature = Base64.encode64(digest)
           signature[-1] = ''
-          encodedSig = URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
-
-          encodedSig
+          signature
         end
       end
     end

data/lib/fog/aliyun/models/compute/flavor.rb

@@ -0,0 +1,28 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Aliyun
+      class Flavor < Fog::Model
+        attribute :base_line_credit, aliases: 'BaseLineCredit'
+        attribute :cpu_core_count, aliases: 'CpuCoreCount'
+        attribute :eni_private_ip_quantitiy, aliases: 'EniPrivateIpAddressQuantity'
+        attribute :eni_quantity, aliases: 'EniQuantity'
+        attribute :gpu_amount, aliases: 'GPUAmount'
+        attribute :gpu_spec, aliases: 'GPUSpec'
+        attribute :intial_credit, aliases: 'IntialCredit'
+        attribute :instance_bandwidth_rx, aliases: 'InstanceBandwidthRx'
+        attribute :instance_bandwidth_tx, aliases: 'InstanceBandwidthTx'
+        attribute :instance_family_level, aliases: 'InstanceFamilyLevel'
+        attribute :instance_pps_rx, aliases: 'InstancePpsRx'
+        attribute :instance_pps_tx, aliases: 'InstancePpsTx'
+        attribute :instance_type_family, alieses: 'InstanceTypeFamily'
+        attribute :instance_type_id, aliases: 'InstanceTypeId'
+        attribute :local_storage_amount, aliases: 'LocalStorageAmount'
+        attribute :local_storage_capacity, aliases: 'LocalStorageCapacity'
+        attribute :local_storage_category, aliases: 'LocalStorageCategory'
+        attribute :memory_size, alieses: 'MemorySize'
+      end
+    end
+  end
+end

data/lib/fog/aliyun/models/compute/flavors.rb

@@ -0,0 +1,13 @@
+module Fog
+  module Compute
+    class Aliyun
+      class Flavors < Fog::Collection
+        model Fog::Compute::Aliyun::Flavor
+        def all
+          data = Fog::JSON.decode(service.list_server_types.body)['InstanceTypes']['InstanceType']
+          load(data)
+        end
+      end
+    end
+  end
+end

data/lib/fog/aliyun/models/compute/image.rb

@@ -29,7 +29,9 @@ module Fog
         attribute :snapshot_id, aliases: 'SnapshotId'
 
         def initialize(attributes)
-          self.snapshot_id = attributes['DiskDeviceMappings']['DiskDeviceMapping'][0]['SnapshotId']
+          unless attributes['DiskDeviceMappings']['DiskDeviceMapping'].empty?
+            self.snapshot_id = attributes['DiskDeviceMappings']['DiskDeviceMapping'][0]['SnapshotId']
+          end
           super
         end
 

data/lib/fog/aliyun/models/compute/server.rb

@@ -34,9 +34,12 @@ module Fog
         attribute :charge_type, aliases: 'InstanceChargeType'
         attribute :operation_locks, aliases: 'OperationLocks'
         attribute :expired_at, aliases: 'ExpiredTime'
+        attribute :vswitch_id, aliases: 'VSwitchId'
+        attribute :key_pair_name, aliases: 'KeyPairName'
+        attribute :user_data, aliases: 'UserData'
 
         def image
-          requires image_id
+          requires :image_id
           Fog::Compute::Aliyun::Image.new(service: service).all(imageId: image_id)[0]
         end
 
@@ -45,6 +48,15 @@ module Fog
           $vpc = Fog::Compute::Aliyun::Vpcs.new(service: service).all('vpcId' => vpc_id)[0]
         end
 
+        def save(options = {})
+          requires :image_id, :security_group_ids, :type
+          options[:VSwitchId] = vswitch_id if vswitch_id
+          options[:KeyPairName] = key_pair_name if key_pair_name
+          options[:UserData] = user_data if user_data
+          options[:InstanceName] = name if name
+          data = Fog::JSON.decode(service.create_server(image_id, security_group_ids, type, options).body)
+          merge_attributes(data)
+        end
         # {"ImageId"=>"ubuntu1404_32_20G_aliaegis_20150325.vhd", "InnerIpAddress"=>{"IpAddress"=>["10.171.90.171"]},
         #  "VlanId"=>"", "InstanceId"=>"i-25d1ry3jz",
         # "EipAddress"=>{"IpAddress"=>"", "AllocationId"=>"", "InternetChargeType"=>""},

data/lib/fog/aliyun/models/compute/servers.rb

@@ -10,7 +10,8 @@ module Fog
         model Fog::Compute::Aliyun::Server
 
         def all(options = {})
-          Fog::JSON.decode(service.list_servers(options).body)['Instances']['Instance']
+          data = Fog::JSON.decode(service.list_servers(options).body)['Instances']['Instance']
+          load(data)
         end
 
         # Creates a new server and populates ssh keys

data/lib/fog/aliyun/models/compute/vpcs.rb

@@ -72,7 +72,7 @@ module Fog
         #
 
         def get(vpcId)
-          $vpc = self.class.new(service: service).all('vpcId' => vpcId)[0] if vpcId
+          $vpc = self.class.new(service: service).all(:vpcId => vpcId)[0] if vpcId
         end
       end
     end

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

@@ -4,36 +4,53 @@ require 'fog/core/collection'
 require 'fog/aliyun/models/storage/directory'
 
 module Fog
-  module Storage
-    class Aliyun
+  module Aliyun
+    class Storage
       class Directories < Fog::Collection
-        model Fog::Storage::Aliyun::Directory
+        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
 
+
         def get(key, options = {})
-          if !key.nil? && key != '' && key != '.'
-            dir = key + '/'
-            ret = service.head_object(dir, options)
-            new(key: key) if ret.data[:status] == 200
+          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
+          directory.files.load(objects)
+          directory
+        rescue AliyunOssSdk::ServerError => error
+          if error.error_code == "NoSuchBucket"
+            nil
           else
-            new(key: '')
+            raise(error)
           end
-        rescue Fog::Storage::Aliyun::NotFound
-          nil
         end
       end
     end