fog-aliyun 0.3.0 → 0.3.1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -9,7 +11,7 @@ module Fog
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           if vswitch_id
             parameters['VSwitchId'] = vswitch_id
@@ -30,6 +32,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end

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

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/disk&detachdisk]
         def detach_disk(instanceId, diskId, _options = {})
-          action   = 'DetachDisk'
+          action = 'DetachDisk'
           sigNonce = randonStr
-          time     = Time.new.utc
+          time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['InstanceId'] = instanceId
           pathUrl += '&InstanceId='
@@ -18,7 +20,7 @@ module Fog
           parameters['DiskId'] = diskId
           pathUrl += '&DiskId='
           pathUrl += diskId
-          
+
           device = _options[:device]
           if device
             parameters['Device'] = device

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -33,10 +35,10 @@ module Fog
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]
+          pageSize = options[:pageSize]
           instanceId = options[:instanceId]
           diskIds = options[:diskIds]
           diskType = options[:diskType]
@@ -129,7 +131,7 @@ module Fog
           end
 
           pageSize = options[:pageSize]
-          pageSize = '50' unless pageSize
+          pageSize ||= '50'
           parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
           pathUrl += pageSize

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -36,7 +38,7 @@ module Fog
           end
 
           _PageSize = options[:page_size]
-          _PageSize = '50' unless _PageSize
+          _PageSize ||= '50'
           _parameters['PageSize'] = _PageSize
           _pathURL += '&PageSize=' + _PageSize
 
@@ -50,6 +52,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
+    end
+  end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -9,7 +11,7 @@ module Fog
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           pageNumber = options[:pageNumber]
           if pageNumber
@@ -19,7 +21,7 @@ module Fog
           end
 
           pageSize = options[:pageSize]
-          pageSize = '50' unless pageSize
+          pageSize ||= '50'
           parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
           pathUrl += pageSize
@@ -70,7 +72,7 @@ module Fog
           data = list_images_detail.body['images']
           images = []
           for image in data
-            images << image.reject { |key, _value| !%w(id name links).include?(key) }
+            images << image.select { |key, _value| %w[id name links].include?(key) }
           end
           response.status = [200, 203][rand(1)]
           response.body = { 'images' => images }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -9,14 +11,14 @@ module Fog
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           parameters['VRouterId'] = vrouterid
           pathUrl += '&VRouterId='
           pathUrl += vrouterid
 
           pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]
+          pageSize = options[:pageSize]
           routeTableId = options[:routeTableId]
           if routeTableId
             parameters['RouteTableId'] = routeTableId
@@ -29,7 +31,7 @@ module Fog
             pathUrl += pageNumber
           end
 
-          pageSize = '50' unless pageSize
+          pageSize ||= '50'
           parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
           pathUrl += pageSize
@@ -52,7 +54,7 @@ module Fog
           data = list_images_detail.body['images']
           images = []
           for image in data
-            images << image.reject { |key, _value| !%w(id name links).include?(key) }
+            images << image.select { |key, _value| %w[id name links].include?(key) }
           end
           response.status = [200, 203][rand(1)]
           response.body = { 'images' => images }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -22,7 +24,7 @@ module Fog
             pathUrl += nicType
           end
           pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]
+          pageSize = options[:pageSize]
           if pageNumber
             parameters['PageNumber'] = pageNumber
             pathUrl += '&PageNumber='
@@ -67,7 +69,7 @@ module Fog
           end
           response
         end
-      end # mock
-    end # aliyun
-  end # compute
-end # fog
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -9,11 +11,11 @@ module Fog
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]
-          vpcId      = options[:vpcId]
+          pageSize = options[:pageSize]
+          vpcId = options[:vpcId]
 
           if vpcId
             parameters['VpcId'] = vpcId
@@ -28,7 +30,7 @@ module Fog
           end
 
           pageSize = options[:pageSize]
-          pageSize = '50' unless pageSize
+          pageSize ||= '50'
           parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
           pathUrl += pageSize
@@ -72,7 +74,7 @@ module Fog
             status: 200
           )
         end
-      end # mock
-    end # aliyun
-  end # compute
-end # fog
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -26,7 +28,7 @@ module Fog
           #  _InstanceType[[instanceType["CpuCoreCount"], instanceType["MemorySize"]]] = instanceType["InstanceTypeId"]
           # end
           # _InstanceType
-        end # end list_server_types
+        end list_server_types
 
         def get_instance_type(cpuCount, memorySize)
           _action = 'DescribeInstanceTypes'
@@ -53,10 +55,10 @@ module Fog
             puts '_instanceTypeId: ' + _InstanceTypeId
             break
             # end if
-          end # end each
+          end each
           _InstanceTypeId
-        end # end get_instance_type
-      end # end class Real
+        end get_instance_type
+      end class Real
 
       #      class Mock
       #        def list_servers(options = {})
@@ -71,7 +73,7 @@ module Fog
       #          response
       #        end
       #      end
-    end # end class Aliyun
-  end # end module Compute
+    end class Aliyun
+  end module Compute
   # end module Fog
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -38,7 +40,7 @@ module Fog
             _pathURL += '&PageNumber=' + _PageNumber
           end
 
-          _PageSize = '50' unless _PageSize
+          _PageSize ||= '50'
           _parameters['PageSize'] = _PageSize
           _pathURL += '&PageSize=' + _PageSize
 
@@ -59,7 +61,7 @@ module Fog
           data = list_servers_detail.body['servers']
           servers = []
           for server in data
-            servers << server.reject { |key, _value| !%w(id name links).include?(key) }
+            servers << server.select { |key, _value| %w[id name links].include?(key) }
           end
           response.status = [200, 203][rand(1)]
           response.body = { 'servers' => servers }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -9,7 +11,7 @@ module Fog
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           pageNumber = options[:pageNumber]
           pageSize = options[:pageSize]
@@ -76,7 +78,7 @@ module Fog
             pathUrl += pageNumber
           end
 
-          pageSize = '50' unless pageSize
+          pageSize ||= '50'
           parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
           pathUrl += pageSize

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -9,7 +11,7 @@ module Fog
           time = Time.new.utc
 
           parameters = defalutParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunUri(action, sigNonce, time)
+          pathUrl = defaultAliyunUri(action, sigNonce, time)
 
           _VpcId = options[:vpcId]
           if _VpcId
@@ -19,14 +21,14 @@ module Fog
           end
 
           pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]
+          pageSize = options[:pageSize]
           if pageNumber
             parameters['PageNumber'] = pageNumber
             pathUrl += '&PageNumber='
             pathUrl += pageNumber
           end
 
-          pageSize = '50' unless pageSize
+          pageSize ||= '50'
           parameters['PageSize'] = pageSize
           pathUrl += '&PageSize='
           pathUrl += pageSize

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

@@ -1,49 +1,49 @@
-module Fog
-  module Compute
-    class Aliyun
-      class Real
-        # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&describevpcs]
-        def list_vpn_connections(options = {})
-          action = 'DescribeVpnConnections'
-          sigNonce = randonStr
-          time = Time.new.utc
-
-          parameters = defalutVPCParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
-
-          _VpnGatewayId = options[:vpngatewayId]
-          if _VpnGatewayId
-            parameters['VpnGatewayId'] = _VpnGatewayId
-            pathUrl += '&VpnGatewayId='
-            pathUrl += _VpnGatewayId
-          end
-
-          pageNumber = options[:pageNumber]
-          pageSize   = options[:pageSize]
-          if pageNumber
-            parameters['PageNumber'] = pageNumber
-            pathUrl += '&PageNumber='
-            pathUrl += pageNumber
-          end
-
-          pageSize = '50' unless pageSize
-          parameters['PageSize'] = pageSize
-          pathUrl += '&PageSize='
-          pathUrl += pageSize
-
-          signature = sign(@aliyun_accesskey_secret, parameters)
-          pathUrl += '&Signature='
-          pathUrl += signature
-
-          VPCrequest(
-            expects: [200, 203],
-            method: 'GET',
-            path: pathUrl
-          )
-        end
-      end
-
-
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Fog
+  module Compute
+    class Aliyun
+      class Real
+        # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&describevpcs]
+        def list_vpn_connections(options = {})
+          action = 'DescribeVpnConnections'
+          sigNonce = randonStr
+          time = Time.new.utc
+
+          parameters = defalutVPCParameters(action, sigNonce, time)
+          pathUrl = defaultAliyunVPCUri(action, sigNonce, time)
+
+          _VpnGatewayId = options[:vpngatewayId]
+          if _VpnGatewayId
+            parameters['VpnGatewayId'] = _VpnGatewayId
+            pathUrl += '&VpnGatewayId='
+            pathUrl += _VpnGatewayId
+          end
+
+          pageNumber = options[:pageNumber]
+          pageSize = options[:pageSize]
+          if pageNumber
+            parameters['PageNumber'] = pageNumber
+            pathUrl += '&PageNumber='
+            pathUrl += pageNumber
+          end
+
+          pageSize ||= '50'
+          parameters['PageSize'] = pageSize
+          pathUrl += '&PageSize='
+          pathUrl += pageSize
+
+          signature = sign(@aliyun_accesskey_secret, parameters)
+          pathUrl += '&Signature='
+          pathUrl += signature
+
+          VPCrequest(
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
+          )
+        end
+      end
+    end
+  end
+end