fog 0.0.56 → 0.0.57

data/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/basic'
 
         # Add permissions to a security group
         #
@@ -25,29 +26,32 @@ unless Fog.mocking?
         #     * 'return'<~Boolean> - success?
         def authorize_security_group_ingress(options = {})
           request({
-            'Action' => 'AuthorizeSecurityGroupIngress'
-          }.merge!(options), Fog::Parsers::AWS::EC2::Basic.new)
+            'Action'  => 'AuthorizeSecurityGroupIngress',
+            :parser   => Fog::Parsers::AWS::EC2::Basic.new
+          }.merge!(options))
         end
 
       end
-    end
-  end
 
-else
+      class Mock
 
-  module Fog
-    module AWS
-      class EC2
-
-        # TODO: handle the GroupName/Source/Source case
         def authorize_security_group_ingress(options = {})
+          response = Excon::Response.new
+          group = @data[:security_groups][options['GroupName']]
+          group['ipPermissions'] ||= []
+
           if options['GroupName'] && options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId']
-            raise MockNotImplemented.new("Contributions welcome!")
+            owner = Fog::AWS::Mock.owner_id
+            ['icmp', 'tcp', 'udp'].each do |protocol|
+              group['ipPermissions'] << {
+                'groups'      => [{'groupName' => options['GroupName'], 'userId' => owner}],
+                'fromPort'    => 1,
+                'ipRanges'    => [],
+                'ipProtocol'  => protocol,
+                'toPort'      => 65535
+              }
+            end
           else
-            response = Excon::Response.new
-            group = Fog::AWS::EC2.data[:security_groups][options['GroupName']]
-
-            group['ipPermissions'] ||= []
             group['ipPermissions'] << {
               'groups'      => [],
               'fromPort'    => options['FromPort'],
@@ -55,18 +59,16 @@ else
               'ipProtocol'  => options['IpProtocol'],
               'toPort'      => options['ToPort']
             }
-
-            response.status = 200
-            response.body = {
-              'requestId' => Fog::AWS::Mock.request_id,
-              'return'    => true
-            }
-            response
           end
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'return'    => true
+          }
+          response
         end
 
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/create_key_pair.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/create_key_pair'
 
         # Create a new key pair
         #
@@ -17,32 +18,27 @@ unless Fog.mocking?
         #     * 'keyName'<~String> - Name of key
         #     * 'requestId'<~String> - Id of request
         def create_key_pair(key_name)
-          request({
-            'Action' => 'CreateKeyPair',
-            'KeyName' => key_name
-          }, Fog::Parsers::AWS::EC2::CreateKeyPair.new)
+          request(
+            'Action'  => 'CreateKeyPair',
+            'KeyName' => key_name,
+            :parser   => Fog::Parsers::AWS::EC2::CreateKeyPair.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def create_key_pair(key_name)
           response = Excon::Response.new
-          unless Fog::AWS::EC2.data[:key_pairs][key_name]
+          unless @data[:key_pairs][key_name]
             response.status = 200
             data = {
               'keyFingerprint'  => Fog::AWS::Mock.key_fingerprint,
               'keyMaterial'     => Fog::AWS::Mock.key_material,
               'keyName'         => key_name
             }
-            Fog::AWS::EC2.data[:key_pairs][key_name] = data
+            @data[:key_pairs][key_name] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
             }.merge!(data)
@@ -56,5 +52,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/create_security_group.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/basic'
 
         # Create a new security group
         #
@@ -16,33 +17,28 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
         def create_security_group(name, description)
-          request({
-            'Action' => 'CreateSecurityGroup',
-            'GroupName' => name,
-            'GroupDescription' => CGI.escape(description)
-          }, Fog::Parsers::AWS::EC2::Basic.new)
+          request(
+            'Action'            => 'CreateSecurityGroup',
+            'GroupName'         => name,
+            'GroupDescription'  => CGI.escape(description),
+            :parser             => Fog::Parsers::AWS::EC2::Basic.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def create_security_group(name, description)
           response = Excon::Response.new
-          unless Fog::AWS::EC2.data[:security_groups][name]
+          unless @data[:security_groups][name]
             data = {
               'groupDescription'  => description,
               'groupName'         => name,
               'ipPermissions'     => [],
               'ownerId'           => Fog::AWS::Mock.owner_id
             }
-            Fog::AWS::EC2.data[:security_groups][name] = data
+            @data[:security_groups][name] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
               'return'    => true
@@ -57,5 +53,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/create_snapshot.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/create_snapshot'
 
         # Create a snapshot of an EBS volume and store it in S3
         #
@@ -19,25 +20,20 @@ unless Fog.mocking?
         #     * 'status'<~String> - state of snapshot
         #     * 'volumeId'<~String> - id of volume snapshot targets
         def create_snapshot(volume_id)
-          request({
-            'Action' => 'CreateSnapshot',
-            'VolumeId' => volume_id
-          }, Fog::Parsers::AWS::EC2::CreateSnapshot.new)
+          request(
+            'Action'    => 'CreateSnapshot',
+            'VolumeId'  => volume_id,
+            :parser     => Fog::Parsers::AWS::EC2::CreateSnapshot.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def create_snapshot(volume_id)
           response = Excon::Response.new
-          if Fog::AWS::EC2.data[:volumes][volume_id]
+          if @data[:volumes][volume_id]
             response.status = 200
             snapshot_id = Fog::AWS::Mock.snapshot_id
             data = {
@@ -47,7 +43,7 @@ else
               'status'      => 'pending',
               'volumeId'    => volume_id
             }
-            Fog::AWS::EC2.data[:snapshots][snapshot_id] = data
+            @data[:snapshots][snapshot_id] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
             }.merge!(data)
@@ -61,5 +57,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/create_volume.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/create_volume'
 
         # Create an EBS volume
         #
@@ -21,23 +22,18 @@ unless Fog.mocking?
         #     * 'status's<~String> - State of volume
         #     * 'volumeId'<~String> - Reference to volume
         def create_volume(availability_zone, size, snapshot_id = nil)
-          request({
-            'Action' => 'CreateVolume',
-            'AvailabilityZone' => availability_zone,
-            'Size' => size,
-            'SnapshotId' => snapshot_id
-          }, Fog::Parsers::AWS::EC2::CreateVolume.new)
+          request(
+            'Action'            => 'CreateVolume',
+            'AvailabilityZone'  => availability_zone,
+            'Size'              => size,
+            'SnapshotId'        => snapshot_id,
+            :parser             => Fog::Parsers::AWS::EC2::CreateVolume.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def create_volume(availability_zone, size, snapshot_id = nil)
           response = Excon::Response.new
@@ -53,7 +49,7 @@ else
               'status'            => 'creating',
               'volumeId'          => volume_id
             }
-            Fog::AWS::EC2.data[:volumes][volume_id] = data
+            @data[:volumes][volume_id] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
             }.merge!(data.reject {|key,value| !['availabilityZone','createTime','size','snapshotId','status','volumeId'].include?(key) })
@@ -74,5 +70,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/delete_key_pair.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/basic'
 
         # Delete a key pair that you own
         #
@@ -15,25 +16,20 @@ unless Fog.mocking?
         #     * 'requestId'<~String> id of request
         #     * 'return'<~Boolean> - success?
         def delete_key_pair(key_name)
-          request({
-            'Action' => 'DeleteKeyPair',
-            'KeyName' => key_name
-          }, Fog::Parsers::AWS::EC2::Basic.new)
+          request(
+            'Action'  => 'DeleteKeyPair',
+            'KeyName' => key_name,
+            :parser   => Fog::Parsers::AWS::EC2::Basic.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def delete_key_pair(key_name)
           response = Excon::Response.new
-          Fog::AWS::EC2.data[:key_pairs].delete(key_name)
+          @data[:key_pairs].delete(key_name)
           response.status = 200
           response.body = {
             'requestId' => Fog::AWS::Mock.request_id,
@@ -45,5 +41,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/delete_security_group.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/basic'
 
         # Delete a security group that you own
         #
@@ -15,25 +16,20 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
         def delete_security_group(name)
-          request({
-            'Action' => 'DeleteSecurityGroup',
-            'GroupName' => name
-          }, Fog::Parsers::AWS::EC2::Basic.new)
+          request(
+            'Action'    => 'DeleteSecurityGroup',
+            'GroupName' => name,
+            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
         def delete_security_group(name)
           response = Excon::Response.new
-          if Fog::AWS::EC2.data[:security_groups][name]
-            Fog::AWS::EC2.data[:security_groups].delete(name)
+          if @data[:security_groups][name]
+            @data[:security_groups].delete(name)
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
@@ -48,5 +44,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/delete_snapshot.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/basic'
 
         # Delete a snapshot of an EBS volume that you own
         #
@@ -15,25 +16,20 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
         def delete_snapshot(snapshot_id)
-          request({
-            'Action' => 'DeleteSnapshot',
-            'SnapshotId' => snapshot_id
-          }, Fog::Parsers::AWS::EC2::Basic.new)
+          request(
+            'Action'      => 'DeleteSnapshot',
+            'SnapshotId'  => snapshot_id,
+            :parser       => Fog::Parsers::AWS::EC2::Basic.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def delete_snapshot(snapshot_id)
           response = Excon::Response.new
-          if snapshot = Fog::AWS::EC2.data[:snapshots].delete(snapshot_id)
+          if snapshot = @data[:snapshots].delete(snapshot_id)
             response.status = true
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
@@ -49,5 +45,4 @@ else
       end
     end
   end
-
 end