fog-aws 0.12.0 → 0.13.0

data/lib/fog/aws/models/efs/mount_targets.rb

@@ -0,0 +1,25 @@
+require 'fog/aws/models/efs/mount_target'
+
+module Fog
+  module AWS
+    class EFS
+      class MountTargets < Fog::Collection
+        attribute :file_system_id
+
+        model Fog::AWS::EFS::MountTarget
+
+        def all
+          data = service.describe_mount_targets(:file_system_id => self.file_system_id).body["MountTargets"]
+          load(data)
+        end
+
+        def get(identity)
+          data = service.describe_mount_targets(:id => identity).body["MountTargets"].first
+          new(data)
+        rescue Fog::AWS::EFS::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb

@@ -21,6 +21,7 @@ module Fog
               'LoadBalancerNames' => [],
               'SuspendedProcesses' => [],
               'Tags' => [],
+              'TargetGroupARNs' => [],
               'TerminationPolicies' => []
             }
           end
@@ -57,6 +58,8 @@ module Fog
               @in_suspended_processes = true
             when 'Tags'
               @in_tags = true
+            when 'TargetGroupARNs'
+              @in_target_groups = true
             when 'TerminationPolicies'
               @in_termination_policies = true
             end
@@ -81,6 +84,8 @@ module Fog
               elsif @in_tags
                 @auto_scaling_group['Tags'] << @tag
                 reset_tag
+              elsif @in_target_groups
+                @auto_scaling_group['TargetGroupARNs'] << value
               elsif @in_termination_policies
                 @auto_scaling_group['TerminationPolicies'] << value
               else
@@ -116,6 +121,9 @@ module Fog
             when 'Tags'
               @in_tags = false
 
+            when 'TargetGroupARNs'
+              @in_target_groups = false
+
             when 'TerminationPolicies'
               @in_termination_policies = false
 

data/lib/fog/aws/parsers/cloud_formation/describe_change_set.rb

@@ -62,7 +62,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'ChangeSetId', 'ChangeSetName', 'Description', 'ExecutionStatus', 'StackId', 'StackName', 'StatusReason'
+            when 'ChangeSetId', 'ChangeSetName', 'Description', 'ExecutionStatus', 'StackId', 'StackName', 'StatusReason', 'Status'
               @response[name] = value
             when 'CreationTime'
               @response[name] = Time.parse(value)

data/lib/fog/aws/parsers/compute/describe_images.rb

@@ -68,12 +68,14 @@ module Fog
               case name
               when 'architecture', 'description', 'hypervisor', 'imageId', 'imageLocation', 'imageOwnerAlias', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'name', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName','virtualizationType'
                 @image[name] = value
-              when 'isPublic'
+              when 'isPublic','enaSupport'
                 if value == 'true'
                   @image[name] = true
                 else
                   @image[name] = false
                 end
+              when 'creationDate'
+                @image[name] = Time.parse(value)
               when 'item'
                 @response['imagesSet'] << @image
                 @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }

data/lib/fog/aws/parsers/rds/modify_db_subnet_group.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        class ModifyDBSubnetGroup < Fog::Parsers::Base
+          def reset
+            @response = { 'ModifyDBSubnetGrouptAttributeResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/rds.rb

@@ -51,7 +51,7 @@ module Fog
       request :create_db_subnet_group
       request :describe_db_subnet_groups
       request :delete_db_subnet_group
-      # TODO: :modify_db_subnet_group
+      request :modify_db_subnet_group
 
       request :describe_orderable_db_instance_options
 

data/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb

@@ -123,6 +123,7 @@ module Fog
             'PlacementGroup'          => nil,
             'SuspendedProcesses'      => [],
             'Tags'                    => [],
+            'TargetGroupARNs'         => [],
             'TerminationPolicies'     => ['Default'],
             'VPCZoneIdentifier'       => nil
           }.merge!(options)

data/lib/fog/aws/requests/auto_scaling/put_scaling_policy.rb

@@ -23,7 +23,7 @@ module Fog
         #   Auto Scaling group size). A positive increment adds to the current
         #   capacity and a negative value removes from the current capacity.
         # * options<~Hash>:
-        #   * 'CoolDown'<~Integer> - The amount of time, in seconds, after a
+        #   * 'Cooldown'<~Integer> - The amount of time, in seconds, after a
         #     scaling activity completes before any further trigger-related
         #     scaling activities can start
         #

data/lib/fog/aws/requests/cloud_formation/create_change_set.rb

@@ -16,6 +16,7 @@ module Fog
         #   * UsePreviousTemplate [Boolean] Reuse the template that is associated with the stack to create the change set.
         #   * NotificationARNs [Array] List of SNS topics to publish events to.
         #   * Parameters [Hash] Hash of providers to supply to template.
+        #   * Capabilities [Array] List of capabilties the stack is granted. Currently CAPABILITY_IAM for allowing the creation of IAM resources.
         #
         # @return [Excon::Response]:
         #   * body [Hash:
@@ -59,6 +60,10 @@ module Fog
             params['TemplateURL'] = options['TemplateURL']
           end
 
+          if options['Capabilities']
+            params.merge!(Fog::AWS.indexed_param("Capabilities.member", [*options['Capabilities']]))
+          end
+
           request({
             'Action'    => 'CreateChangeSet',
             :parser     => Fog::Parsers::AWS::CloudFormation::CreateChangeSet.new

data/lib/fog/aws/requests/compute/describe_availability_zones.rb

@@ -49,6 +49,10 @@ module Fog
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1d", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1e", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "us-east-2", "zoneName" => "us-east-2a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-east-2", "zoneName" => "us-east-2b", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-east-2", "zoneName" => "us-east-2c", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1c", "zoneState" => "available"},

data/lib/fog/aws/requests/compute/describe_images.rb

@@ -36,6 +36,8 @@ module Fog
         #       * 'rootDeviceName'<~String> - Root device name, e.g. /dev/sda1
         #       * 'rootDeviceType'<~String> - Root device type, ebs or instance-store
         #       * 'virtualizationType'<~String> - Type of virtualization
+        #       * 'creationDate'time<~Datetime> - Date and time the image was created
+        #       * 'enaSupport'<~Boolean> - whether or not the image supports enhanced networking
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html]
         def describe_images(filters = {})

data/lib/fog/aws/requests/efs/create_file_system.rb

@@ -0,0 +1,51 @@
+module Fog
+  module AWS
+    class EFS
+      class Real
+        # Create a new, empty file system
+        # http://docs.aws.amazon.com/efs/latest/ug/API_CreateFileSystem.html
+        # ==== Parameters
+        # * CreationToken <~String> - String of up to 64 ASCII characters. Amazon EFS uses this to ensure idempotent creation.
+        # * PerformanceMode <~String> - (Optional) The PerformanceMode of the file system. We recommend generalPurpose performance mode for most file systems. File systems using the maxIO performance mode can scale to higher levels of aggregate throughput and operations per second with a tradeoff of slightly higher latencies for most file operations. This can't be changed after the file system has been created.
+        # ==== Returns
+        # * response<~Excon::Response>
+        #   * body<~Hash>
+        def create_file_system(creation_token, options={})
+          request({
+            :path             => "file-systems",
+            :method           => 'POST',
+            :expects          => 201,
+            'CreationToken'   => creation_token,
+            'PerformanceMode' => options[:peformance_mode] || 'generalPurpose'
+          })
+        end
+      end
+
+      class Mock
+        def create_file_system(creation_token, options={})
+          response = Excon::Response.new
+
+          id = "fs-#{Fog::Mock.random_letters(8)}"
+          file_system = {
+            "OwnerId"              => Fog::AWS::Mock.owner_id,
+            "CreationToken"        => creation_token,
+            "PerformanceMode"      => options[:performance_mode] || "generalPurpose",
+            "FileSystemId"         => id,
+            "CreationTime"         => Time.now.to_i.to_f,
+            "LifeCycleState"       => "creating",
+            "NumberOfMountTargets" => 0,
+            "SizeInBytes"          => {
+              "Value"     => 1024,
+              "Timestamp" => Time.now.to_i.to_f
+            }
+          }
+
+          self.data[:file_systems][id] = file_system
+          response.body = file_system
+          response.status = 201
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/efs/create_mount_target.rb

@@ -0,0 +1,69 @@
+module Fog
+  module AWS
+    class EFS
+      class Real
+        # Create a mount target for a specified file system
+        # http://docs.aws.amazon.com/efs/latest/ug/API_CreateMountTarget.html
+        # ==== Parameters
+        # * FileSystemId <~String> - ID of the file system for which to create the mount target.
+        # * IpAddress <~String> - Valid IPv4 address within the address range of the specified subnet.
+        # * SecurityGroups <~Array> - Up to five VPC security group IDs, of the form sg-xxxxxxxx. These must be for the same VPC as subnet specified.
+        # * SubnetId <~String> - ID of the subnet to add the mount target in.
+        # ==== Returns
+        # * response<~Excon::Response>
+        #   * body<~Hash>
+        def create_mount_target(file_system_id, subnet_id, options={})
+          request({
+            :path          => "mount-targets",
+            :method        => "POST",
+            'FileSystemId' => file_system_id,
+            'SubnetId'     => subnet_id
+          }.merge(options))
+        end
+      end
+
+      class Mock
+        def create_mount_target(file_system_id, subnet_id, options={})
+          response               = Excon::Response.new
+          default_security_group = mock_compute.data[:security_groups]['default']
+          security_groups        = options["SecurityGroups"] || [default_security_group['groupId']]
+
+          unless file_system = self.data[:file_systems][file_system_id]
+            raise Fog::AWS::EFS::NotFound.new("invalid file system ID: #{file_system_id}")
+          end
+
+          unless file_system["LifeCycleState"] == 'available'
+            # this error doesn't include a message for some reason
+            raise Fog::AWS::EFS::IncorrectFileSystemLifeCycleState.new("")
+          end
+
+          unless subnet = mock_compute.subnets.get(subnet_id)
+            raise Fog::AWS::EFS::InvalidSubnet.new("invalid subnet ID: #{subnet_id}")
+          end
+
+          security_groups.each do |sg|
+            raise Fog::AWS::EFS::NotFound.new("invalid security group ID: #{sg}") unless mock_compute.data[:security_groups].values.detect { |sgd| sgd["groupId"] == sg }
+          end
+
+          id = "fsmt-#{Fog::Mock.random_letters(8)}"
+
+          mount_target = {
+            'MountTargetId'      => id,
+            'FileSystemId'       => file_system_id,
+            'IpAddress'          => Fog::AWS::Mock.ip_address,
+            'OwnerId'            => Fog::AWS::Mock.owner_id,
+            'LifeCycleState'     => 'creating',
+            'NetworkInterfaceId' => "eni-#{Fog::Mock.random_hex(8)}",
+            'SubnetId'           => subnet.identity,
+          }
+
+          self.data[:mount_targets][id]   = mount_target
+          self.data[:security_groups][id] = security_groups
+
+          response.body = mount_target
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/efs/delete_file_system.rb

@@ -0,0 +1,41 @@
+module Fog
+  module AWS
+    class EFS
+      class Real
+        # Delete a file system
+        # http://docs.aws.amazon.com/efs/latest/ug/API_DeleteFileSystem.html
+        # ==== Parameters
+        # * FileSystemId <~String> - ID of the file system you want to delete.
+        # ==== Returns
+        # * response<~Excon::Response>
+        #   * body - Empty
+        #   * status - 204
+        def delete_file_system(id)
+          request({
+            :path             => "file-systems/#{id}",
+            :method           => 'DELETE',
+            :expects          => 204,
+          })
+        end
+      end
+
+      class Mock
+        def delete_file_system(id)
+          unless file_system = self.data[:file_systems][id]
+            raise Fog::AWS::EFS::NotFound.new("invalid file system ID: #{id}")
+          end
+
+          if file_system["NumberOfMountTargets"] > 0
+            raise Fog::AWS::EFS::FileSystemInUse.new("")
+          end
+
+          self.data[:file_systems].delete(id)
+
+          response = Excon::Response.new
+          response.status = 204
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/efs/delete_mount_target.rb

@@ -0,0 +1,38 @@
+module Fog
+  module AWS
+    class EFS
+      class Real
+        # Delete a mount target
+        # http://docs.aws.amazon.com/efs/latest/ug/API_DeleteMountTarget.html
+        # ==== Parameters
+        # * MountTargetId <~String> - ID of the mount target you want to delete
+        # ==== Returns
+        # * response<~Excon::Response>
+        #   * body - Empty
+        #   * status - 204
+        def delete_mount_target(id)
+          request(
+            :path    => "mount-targets/#{id}",
+            :method  => "DELETE",
+            :expects => 204
+          )
+        end
+      end
+
+      class Mock
+        def delete_mount_target(id)
+          response = Excon::Response.new
+
+          unless self.data[:mount_targets][id]
+            raise Fog::AWS::EFS::NotFound.new("invalid mount target ID: #{id}")
+          end
+
+          self.data[:mount_targets].delete(id)
+
+          response.status = 204
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/efs/describe_file_systems.rb

@@ -0,0 +1,62 @@
+module Fog
+  module AWS
+    class EFS
+      class Real
+        # Describe all or specified elastic file systems
+        # http://docs.aws.amazon.com/efs/latest/ug/API_DescribeFileSystems.html
+        # ==== Parameters
+        # * CreationToken <~String> - (Optional) Restricts the list to the file system with this creation token (String). You specify a creation token when you create an Amazon EFS file system.
+        # * FileSystemId <~String> - (Optional) ID of the file system whose description you want to retrieve (String).
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def describe_file_systems(options={})
+          params = {}
+          if options[:marker]
+            params['Marker'] = options[:marker]
+          end
+          if options[:max_records]
+            params['MaxRecords'] = options[:max_records]
+          end
+          if options[:id]
+            params['FileSystemId'] = options[:id]
+          end
+          if options[:creation_token]
+            params['CreationToken'] = options[:creation_token]
+          end
+
+          request({
+            :path => "file-systems"
+          }.merge(params))
+        end
+      end
+
+      class Mock
+        def describe_file_systems(options={})
+          response = Excon::Response.new
+
+          file_systems = if id = options[:id]
+                           if fs = self.data[:file_systems][id]
+                             [fs]
+                           else
+                             raise Fog::AWS::EFS::NotFound.new("invalid file system ID: #{id}")
+                           end
+                         elsif creation_token = options[:creation_token]
+                           fs = self.data[:file_systems].values.detect { |file_system| file_system["CreationToken"] == creation_token }
+                           [fs]
+                         else
+                           self.data[:file_systems].values
+                         end
+
+          file_systems.each do |file_system|
+            file_system['LifeCycleState'] = 'available'
+            self.data[:file_systems][file_system['FileSystemId']] = file_system
+          end
+
+          response.body = {"FileSystems" => file_systems}
+          response
+        end
+      end
+    end
+  end
+end