fog-aliyun 0.3.0 → 0.3.1

data/lib/fog/aliyun/requests/compute/create_image.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)
 
           parameters['SnapshotId'] = snapshotId
           pathUrl += '&SnapshotId='

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

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
       class Real
         # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.201.106.DGkmH7#/pub/ecs/open-api/securitygroup&createsecuritygroup]
         def create_security_group(options = {})
-          action   = 'CreateSecurityGroup'
+          action = 'CreateSecurityGroup'
           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)
 
-          name  = options[:name]
-          desc  = options[:description]
+          name = options[:name]
+          desc = options[:description]
           vpcid = options[:vpcId]
 
           if name
@@ -71,7 +73,7 @@ module Fog
           }
           response
         end
-      end # mock
-    end # aliyun
-  end # compute
-end # fog
+      end
+    end
+  end
+end

data/lib/fog/aliyun/requests/compute/create_security_group_egress_ip_rule.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/securitygroup&authorizesecuritygroup]
         def create_security_group_egress_ip_rule(securitygroup_id, destCidrIp, nicType, option = {})
-          action   = 'AuthorizeSecurityGroupEgress'
+          action = 'AuthorizeSecurityGroupEgress'
           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['SecurityGroupId'] = securitygroup_id
           pathUrl += '&SecurityGroupId='
@@ -18,31 +20,31 @@ module Fog
           parameters['DestCidrIp'] = destCidrIp
           pathUrl += '&DestCidrIp='
           pathUrl += URI.encode(destCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
-          nicType = 'intranet' unless nicType
+          nicType ||= 'intranet'
           parameters['NicType'] = nicType
           pathUrl += '&NicType='
           pathUrl += nicType
 
           portRange = option[:portRange]
-          portRange = '-1/-1' unless portRange
+          portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
           pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
 
           protocol = option[:protocol]
-          protocol = 'all' unless protocol
+          protocol ||= 'all'
           parameters['IpProtocol'] = protocol
           pathUrl += '&IpProtocol='
           pathUrl += protocol
 
           policy = option[:policy]
-          policy = 'accept' unless policy
+          policy ||= 'accept'
           parameters['Policy'] = policy
           pathUrl += '&Policy='
           pathUrl += policy
 
           priority = option[:priority]
-          priority = '1' unless priority
+          priority ||= '1'
           parameters['Priority'] = priority
           pathUrl += '&Priority='
           pathUrl += priority
@@ -58,6 +60,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end

data/lib/fog/aliyun/requests/compute/create_security_group_egress_sg_rule.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/securitygroup&authorizesecuritygroup]
         def create_security_group_egress_sg_rule(securitygroup_id, dest_group_id, option = {})
-          action   = 'AuthorizeSecurityGroupEgress'
+          action = 'AuthorizeSecurityGroupEgress'
           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['SecurityGroupId'] = securitygroup_id
           pathUrl += '&SecurityGroupId='
@@ -25,13 +27,13 @@ module Fog
           pathUrl += nicType
 
           portRange = option[:portRange]
-          portRange = '-1/-1' unless portRange
+          portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
           pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
 
           protocol = option[:protocol]
-          protocol = 'all' unless protocol
+          protocol ||= 'all'
           parameters['IpProtocol'] = protocol
           pathUrl += '&IpProtocol='
           pathUrl += protocol
@@ -44,13 +46,13 @@ module Fog
           end
 
           policy = option[:policy]
-          policy = 'accept' unless policy
+          policy ||= 'accept'
           parameters['Policy'] = policy
           pathUrl += '&Policy='
           pathUrl += policy
 
           priority = option[:priority]
-          priority = '1' unless priority
+          priority ||= '1'
           parameters['Priority'] = priority
           pathUrl += '&Priority='
           pathUrl += priority
@@ -66,6 +68,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end

data/lib/fog/aliyun/requests/compute/create_security_group_ip_rule.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/securitygroup&authorizesecuritygroup]
         def create_security_group_ip_rule(securitygroup_id, sourceCidrIp, nicType, option = {})
-          action   = 'AuthorizeSecurityGroup'
+          action = 'AuthorizeSecurityGroup'
           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['SecurityGroupId'] = securitygroup_id
           pathUrl += '&SecurityGroupId='
@@ -18,31 +20,31 @@ module Fog
           parameters['SourceCidrIp'] = sourceCidrIp
           pathUrl += '&SourceCidrIp='
           pathUrl += URI.encode(sourceCidrIp, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
-          nicType = 'intranet' unless nicType
+          nicType ||= 'intranet'
           parameters['NicType'] = nicType
           pathUrl += '&NicType='
           pathUrl += nicType
 
           portRange = option[:portRange]
-          portRange = '-1/-1' unless portRange
+          portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
           pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
 
           protocol = option[:protocol]
-          protocol = 'all' unless protocol
+          protocol ||= 'all'
           parameters['IpProtocol'] = protocol
           pathUrl += '&IpProtocol='
           pathUrl += protocol
 
           policy = option[:policy]
-          policy = 'accept' unless policy
+          policy ||= 'accept'
           parameters['Policy'] = policy
           pathUrl += '&Policy='
           pathUrl += policy
 
           priority = option[:priority]
-          priority = '1' unless priority
+          priority ||= '1'
           parameters['Priority'] = priority
           pathUrl += '&Priority='
           pathUrl += priority
@@ -58,6 +60,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end

data/lib/fog/aliyun/requests/compute/create_security_group_sg_rule.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/securitygroup&authorizesecuritygroup]
         def create_security_group_sg_rule(securitygroup_id, source_securitygroup_id, option = {})
-          action   = 'AuthorizeSecurityGroup'
+          action = 'AuthorizeSecurityGroup'
           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['SecurityGroupId'] = securitygroup_id
           pathUrl += '&SecurityGroupId='
@@ -25,13 +27,13 @@ module Fog
           pathUrl += nicType
 
           portRange = option[:portRange]
-          portRange = '-1/-1' unless portRange
+          portRange ||= '-1/-1'
           parameters['PortRange'] = portRange
           pathUrl += '&PortRange='
           pathUrl += URI.encode(portRange, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
 
           protocol = option[:protocol]
-          protocol = 'all' unless protocol
+          protocol ||= 'all'
           parameters['IpProtocol'] = protocol
           pathUrl += '&IpProtocol='
           pathUrl += protocol
@@ -44,13 +46,13 @@ module Fog
           end
 
           policy = option[:policy]
-          policy = 'accept' unless policy
+          policy ||= 'accept'
           parameters['Policy'] = policy
           pathUrl += '&Policy='
           pathUrl += policy
 
           priority = option[:priority]
-          priority = '1' unless priority
+          priority ||= '1'
           parameters['Priority'] = priority
           pathUrl += '&Priority='
           pathUrl += priority
@@ -66,6 +68,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -140,15 +142,15 @@ module Fog
           end
 
           response_data = {}
-          if options['return_reservation_id'] == 'True'
-            response_data = { 'reservation_id' => "r-#{Fog::Mock.random_numbers(6)}" }
-          else
-            response_data = {
-              'adminPass'       => 'password',
-              'id'              => server_id,
-              'links'           => mock_data['links']
-            }
-          end
+          response_data = if options['return_reservation_id'] == 'True'
+                            { 'reservation_id' => "r-#{Fog::Mock.random_numbers(6)}" }
+                          else
+                            {
+                              'adminPass'       => 'password',
+                              'id'              => server_id,
+                              'links'           => mock_data['links']
+                            }
+                          end
 
           if block_devices = options['block_device_mapping_v2']
             block_devices.each { |bd| compute.volumes.get(bd[:uuid]).attach(server_id, bd[:device_name]) }

data/lib/fog/aliyun/requests/compute/create_snapshot.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)
 
           parameters['DiskId'] = diskId
           pathUrl += '&DiskId='

data/lib/fog/aliyun/requests/compute/create_vpc.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)
 
           parameters['CidrBlock'] = cidrBlock
           pathUrl += '&CidrBlock='
@@ -41,6 +43,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end

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

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
       class Real
-        def create_vpn_connection(customergatewayId, vpngatewayId, localsubnet, remotesubnet,options = {})
+        def create_vpn_connection(customergatewayId, vpngatewayId, localsubnet, remotesubnet, options = {})
           # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&createvswitch]
           action = 'CreateVpnConnection'
           sigNonce = randonStr
           time = Time.new.utc
 
           parameters = defalutVPCParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+          pathUrl = defaultAliyunVPCUri(action, sigNonce, time)
 
           parameters['CustomerGatewayId'] = customergatewayId
           pathUrl += '&CustomerGatewayId='
@@ -22,7 +24,7 @@ module Fog
           parameters['LocalSubnet'] = localsubnet
           pathUrl += '&LocalSubnet='
           pathUrl += localsubnet
-          
+
           parameters['RemoteSubnet'] = remotesubnet
           pathUrl += '&RemoteSubnet='
           pathUrl += remotesubnet
@@ -53,6 +55,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fog
   module Compute
     class Aliyun
@@ -9,14 +11,12 @@ module Fog
           time = Time.new.utc
 
           parameters = defalutVPCParameters(action, sigNonce, time)
-          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+          pathUrl = defaultAliyunVPCUri(action, sigNonce, time)
 
           parameters['IpAddress'] = ipaddress
           pathUrl += '&IpAddress='
           pathUrl += ipaddress
 
-
-
           name = options[:name]
           desc = options[:description]
 
@@ -43,6 +43,6 @@ module Fog
           )
         end
       end
-    end # aliyun
-  end # compute
-end # fog
+    end
+  end
+end