fog-aws 0.1.2 → 0.2.0

data/lib/fog/aws/models/elasticache/cluster.rb

@@ -23,6 +23,7 @@ module Fog
         attribute :cache_subnet_group_name, :aliases => 'CacheSubnetGroupName'
         attribute :vpc_security_groups, :aliases => 'VpcSecurityGroups', :type => :array
         attribute :s3_snapshot_location, :aliases => 'SnapshotArns', :type => :array
+        attribute :configuration_endpoint, :aliases => 'ConfigurationEndpoint'
 
         attr_accessor :parameter_group_name
 

data/lib/fog/aws/models/kms/key.rb

@@ -0,0 +1,34 @@
+module Fog
+  module AWS
+    class KMS
+      class Key < Fog::Model
+        identity :id, :aliases => 'KeyId'
+
+        attribute :account_id,  :aliases => 'AWSAccountId'
+        attribute :arn,         :aliases => 'KeyArn'
+        attribute :created_at,  :aliases => 'CreationDate', :type => :time
+        attribute :description, :aliases => 'Description'
+        attribute :enabled,     :aliases => 'Enabled', :type => :boolean
+        attribute :usage,       :aliases => 'KeyUsage'
+
+        attr_writer :policy
+
+        def reload
+          requires :identity
+
+          data = service.describe_key(self.identity)
+          merge_attributes(data.body['KeyMetadata'])
+
+          self
+        end
+
+        def save
+          data = service.create_key(@policy, description, usage)
+
+          merge_attributes(data.body['KeyMetadata'])
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/kms/keys.rb

@@ -0,0 +1,29 @@
+require 'fog/aws/models/kms/key'
+
+module Fog
+  module AWS
+    class KMS
+      class Keys < Fog::PagedCollection
+        attribute :filters
+        attribute :truncated
+
+        model Fog::AWS::KMS::Key
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # This method deliberately returns only a single page of results
+        def all(filters_arg = filters)
+          filters.merge!(filters_arg)
+
+          result = service.list_keys(filters).body
+          filters[:marker] = result['Marker']
+          self.truncated = result['Truncated']
+          load(result['Keys'])
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/rds/server.rb

@@ -3,33 +3,40 @@ module Fog
     class RDS
       class Server < Fog::Model
         identity  :id, :aliases => 'DBInstanceIdentifier'
-        attribute :engine, :aliases => 'Engine'
-        attribute :engine_version, :aliases => 'EngineVersion'
-        attribute :state, :aliases => 'DBInstanceStatus'
-        attribute :allocated_storage, :aliases => 'AllocatedStorage', :type => :integer
-        attribute :iops, :aliases => 'Iops'
-        attribute :availability_zone , :aliases => 'AvailabilityZone'
-        attribute :flavor_id, :aliases => 'DBInstanceClass'
-        attribute :endpoint, :aliases => 'Endpoint'
-        attribute :read_replica_source, :aliases => 'ReadReplicaSourceDBInstanceIdentifier'
-        attribute :read_replica_identifiers, :aliases => 'ReadReplicaDBInstanceIdentifiers', :type => :array
-        attribute :master_username, :aliases => 'MasterUsername'
-        attribute :multi_az, :aliases => 'MultiAZ'
-        attribute :created_at, :aliases => 'InstanceCreateTime', :type => :time
-        attribute :last_restorable_time, :aliases => 'LatestRestorableTime', :type => :time
-        attribute :auto_minor_version_upgrade, :aliases => 'AutoMinorVersionUpgrade'
-        attribute :pending_modified_values, :aliases => 'PendingModifiedValues'
-        attribute :preferred_backup_window, :aliases => 'PreferredBackupWindow'
+
+        attribute :allocated_storage,            :aliases => 'AllocatedStorage', :type => :integer
+        attribute :auto_minor_version_upgrade,   :aliases => 'AutoMinorVersionUpgrade'
+        attribute :availability_zone,            :aliases => 'AvailabilityZone'
+        attribute :backup_retention_period,      :aliases => 'BackupRetentionPeriod', :type => :integer
+        attribute :ca_certificate_id,            :aliases => 'CACertificateIdentifier'
+        attribute :character_set_name,           :aliases => 'CharacterSetName'
+        attribute :created_at,                   :aliases => 'InstanceCreateTime', :type => :time
+        attribute :db_name,                      :aliases => 'DBName'
+        attribute :db_parameter_groups,          :aliases => 'DBParameterGroups'
+        attribute :db_security_groups,           :aliases => 'DBSecurityGroups', :type => :array
+        attribute :db_subnet_group_name,         :aliases => 'DBSubnetGroupName'
+        attribute :dbi_resource_id,              :aliases => 'DbiResourceId'
+        attribute :endpoint,                     :aliases => 'Endpoint'
+        attribute :engine,                       :aliases => 'Engine'
+        attribute :engine_version,               :aliases => 'EngineVersion'
+        attribute :flavor_id,                    :aliases => 'DBInstanceClass'
+        attribute :iops,                         :aliases => 'Iops', :type => :integer
+        attribute :kms_key_id,                   :aliases => 'KmsKeyId'
+        attribute :last_restorable_time,         :aliases => 'LatestRestorableTime', :type => :time
+        attribute :license_model,                :aliases => 'LicenseModel'
+        attribute :master_username,              :aliases => 'MasterUsername'
+        attribute :multi_az,                     :aliases => 'MultiAZ', :type => :boolean
+        attribute :pending_modified_values,      :aliases => 'PendingModifiedValues'
+        attribute :preferred_backup_window,      :aliases => 'PreferredBackupWindow'
         attribute :preferred_maintenance_window, :aliases => 'PreferredMaintenanceWindow'
-        attribute :db_name, :aliases => 'DBName'
-        attribute :db_security_groups, :aliases => 'DBSecurityGroups', :type => :array
-        attribute :db_parameter_groups, :aliases => 'DBParameterGroups'
-        attribute :backup_retention_period, :aliases => 'BackupRetentionPeriod', :type => :integer
-        attribute :license_model, :aliases => 'LicenseModel'
-        attribute :db_subnet_group_name, :aliases => 'DBSubnetGroupName'
-        attribute :publicly_accessible, :aliases => 'PubliclyAccessible'
-        attribute :vpc_security_groups, :aliases => 'VpcSecurityGroups', :type => :array
-        attribute :storage_type, :aliases => 'StorageType'
+        attribute :publicly_accessible,          :aliases => 'PubliclyAccessible'
+        attribute :read_replica_identifiers,     :aliases => 'ReadReplicaDBInstanceIdentifiers', :type => :array
+        attribute :read_replica_source,          :aliases => 'ReadReplicaSourceDBInstanceIdentifier'
+        attribute :state,                        :aliases => 'DBInstanceStatus'
+        attribute :storage_encrypted,            :aliases => 'StorageEncrypted', :type => :boolean
+        attribute :storage_type,                 :aliases => 'StorageType'
+        attribute :tde_credential_arn,           :aliases => 'TdeCredentialArn'
+        attribute :vpc_security_groups,          :aliases => 'VpcSecurityGroups', :type => :array
 
         attr_accessor :password, :parameter_group_name, :security_group_names, :port
 

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

@@ -26,7 +26,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesId', 'state', 'offeringType'
+            when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesId', 'state', 'offeringType', 'instanceTenancy'
               @reserved_instance[name] = value
             when 'duration', 'instanceCount'
               @reserved_instance[name] = value.to_i

data/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb

@@ -14,7 +14,8 @@ module Fog
             @cache_cluster = {
               'CacheSecurityGroups' => [],
               'CacheNodes' => [],
-              'CacheParameterGroup' => {}
+              'CacheParameterGroup' => {},
+              'ConfigurationEndpoint' => {}
             }
           end
 
@@ -24,6 +25,7 @@ module Fog
             when 'CacheSecurityGroup'; then @security_group = {}
             when 'CacheNode'; then @cache_node = {}
             when 'PendingModifiedValues'; then @pending_values = {}
+            when 'ConfigurationEndpoint'; then @configuration_endpoint = {} 
             end
           end
 
@@ -49,6 +51,8 @@ module Fog
               @cache_cluster[name] = DateTime.parse(value)
             when 'CacheSecurityGroup'
               @cache_cluster["#{name}s"] << @security_group unless @security_group.empty?
+            when 'ConfigurationEndpoint'
+              @cache_cluster['ConfigurationEndpoint'] = @configuration_endpoint
             when 'CacheSecurityGroupName', 'Status', 'CacheSubnetGroupName'
               @cache_cluster[name] = value
             when 'CacheNode'
@@ -57,8 +61,16 @@ module Fog
             when'PendingModifiedValues'
               @cache_cluster[name] = @pending_values
               @pending_values = nil
-            when 'CacheNodeCreateTime', 'CacheNodeStatus', 'Address',
-              'ParameterGroupStatus', 'Port', 'CacheNodeId'
+            when 'Port', 'Address'
+              if @cache_node
+                @cache_node[name] = value ? value.strip : name                
+              elsif @pending_values
+                @pending_values[name] = value ? value.strip : name
+              elsif @configuration_endpoint
+                @configuration_endpoint[name] = value ? value.strip : name
+              end
+            when 'CacheNodeCreateTime', 'CacheNodeStatus',
+              'ParameterGroupStatus', 'CacheNodeId'
               if @cache_node
                 @cache_node[name] = value ? value.strip : name
               elsif @pending_values

data/lib/fog/aws/parsers/kms/describe_key.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Parsers
+    module AWS
+      module KMS
+        class DescribeKey < Fog::Parsers::Base
+          def reset
+            @response = { 'KeyMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'KeyMetadata'
+              @key = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'KeyUsage', 'AWSAccountId', 'Description', 'KeyId', 'Arn'
+              @key[name] = value
+            when 'CreationDate'
+              @key[name] = Time.parse(value)
+            when 'Enabled'
+              @key[name] = (value == 'true')
+            when 'KeyMetadata'
+              @response['KeyMetadata'] = @key
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/kms/list_keys.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Parsers
+    module AWS
+      module KMS
+        class ListKeys < Fog::Parsers::Base
+          def reset
+            @response = { 'Keys' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'Keys'
+              @keys = []
+            when 'member'
+              @key = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'KeyId', 'KeyArn'
+              @key[name] = value
+            when 'member'
+              @keys << @key
+            when 'Keys'
+              @response['Keys'] = @keys
+            when 'Truncated'
+              @response['Truncated'] = (value == 'true')
+            when 'NextMarker'
+              @response['Marker'] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -46,14 +46,12 @@ module Fog
             when 'Engine', 'DBInstanceStatus', 'DBInstanceIdentifier',
               'PreferredBackupWindow', 'PreferredMaintenanceWindow',
               'AvailabilityZone', 'MasterUsername', 'DBName', 'LicenseModel',
-              'DBSubnetGroupName', 'StorageType'
+              'DBSubnetGroupName', 'StorageType', 'KmsKeyId', 'TdeCredentialArn',
+              'SecondaryAvailabilityZone', 'DbiResourceId', 'CACertificateIdentifier',
+              'CharacterSetName', 'DbiResourceId', 'LicenseModel', 'KmsKeyId'
               @db_instance[name] = value
-            when 'MultiAZ', 'AutoMinorVersionUpgrade', 'PubliclyAccessible'
-              if value == 'false'
-                @db_instance[name] = false
-              else
-                @db_instance[name] = true
-              end
+            when 'MultiAZ', 'AutoMinorVersionUpgrade', 'PubliclyAccessible', 'StorageEncrypted'
+              @db_instance[name] = (value == 'true')
             when 'DBParameterGroups'
               @in_db_parameter_groups = false
               @db_instance['DBParameterGroups'] = @db_parameter_groups
@@ -64,15 +62,14 @@ module Fog
               if @in_db_parameter_groups
                 @db_parameter_group[name] = value
               end
-
-            when 'BackupRetentionPeriod'
+            when 'BackupRetentionPeriod', 'Iops', 'AllocatedStorage'
               if @in_pending_modified_values
                 @pending_modified_values[name] = value.to_i
               else
                 @db_instance[name] = value.to_i
               end
             when 'DBInstanceClass', 'EngineVersion', 'MasterUserPassword',
-                'MultiAZ', 'Iops', 'AllocatedStorage'
+                'MultiAZ'
               if @in_pending_modified_values
                 @pending_modified_values[name] = value
               else
@@ -86,7 +83,6 @@ module Fog
             when 'DBSecurityGroup'
               @db_security_groups << @db_security_group
               @db_security_group = {}
-
             when 'VpcSecurityGroups'
               @in_vpc_security_groups = false
               @db_instance['VpcSecurityGroups'] = @vpc_security_groups
@@ -95,7 +91,6 @@ module Fog
               @vpc_security_group = {}
             when 'VpcSecurityGroupId'
               @vpc_security_group[name] = value
-
             when 'Status'
               # Unfortunately, status is used in VpcSecurityGroupMemebership and
               # DBSecurityGroups
@@ -105,7 +100,6 @@ module Fog
               if @in_vpc_security_groups
                 @vpc_security_group[name] = value
               end
-
             when 'Address'
               @endpoint[name] = value
             when 'Port'
@@ -114,7 +108,6 @@ module Fog
               elsif @in_endpoint
                 @endpoint[name] = value.to_i
               end
-
             when 'PendingModifiedValues'
               @in_pending_modified_values = false
               @db_instance['PendingModifiedValues'] = @pending_modified_values

data/lib/fog/aws/rds.rb

@@ -197,7 +197,7 @@ module Fog
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
-          @version    = options[:version] || '2013-05-15'
+          @version    = options[:version] || '2014-10-31'
 
           setup_credentials(options)
         end

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

@@ -56,6 +56,65 @@ module Fog
           }.merge!(params))
         end
       end
+
+      class Mock
+        def describe_spot_price_history(filters = {})
+          params = {}
+          spot_price_history_set = []
+
+          response = Excon::Response.new
+          response.status = 200
+
+          for key in %w(StartTime EndTime NextToken)
+            if filters.is_a?(Hash) && filters.key?(key)
+              Fog::Logger.warning("#{key} filters are not yet mocked [light_black](#{caller.first})[/]")
+              Fog::Mock.not_implemented
+            end
+          end
+
+          for key in %w(AvailabilityZone MaxResults)
+            if filters.is_a?(Hash) && filters.key?(key)
+              params[key] = filters.delete(key)
+            end
+          end
+
+          all_zones = describe_availability_zones.body['availabilityZoneInfo'].map { |z| z['zoneName'] }
+          zones = params['AvailabilityZone']
+          if (!zones.nil? && !all_zones.include?([*zones].shuffle.first))
+            az_error = "InvalidParameterValue => Invalid availability zone: [#{zones}]"
+            raise Fog::Compute::AWS::Error, az_error
+          end
+          zones = all_zones if zones.nil?
+
+          max_results = params['MaxResults'] || Fog::Mock.random_numbers(3).to_i
+          if !(max_results.is_a?(Integer) && max_results > 0)
+            max_results_error = "InvalidParameterValue => Invalid value '#{max_results}' for maxResults"
+            raise Fog::Compute::AWS::Error, max_results_error
+          end
+
+          all_instance_types = flavors.map { |f| f.id }
+          instance_types = filters.delete('InstanceType') || all_instance_types
+          product_descriptions = filters.delete('ProductDescription') || Fog::AWS::Mock.spot_product_descriptions
+
+          max_results.times do
+            spot_price_history_set << {
+              'instanceType'       => [*instance_types].shuffle.first,
+              'productDescription' => [*product_descriptions].shuffle.first,
+              'spotPrice'          => ((rand + [0 , 1].shuffle.first) * 10000).round / 10000.0,
+              'timestamp'          => Time.now - (1 + rand(86400)),
+              'availabilityZone'   => [*zones].shuffle.first
+            }
+          end
+          spot_price_history_set.sort! { |x,y| x['timestamp'] <=> y['timestamp'] }
+
+          response.body = {
+            'spotPriceHistorySet' => spot_price_history_set,
+            'requestId'           => Fog::AWS::Mock.request_id,
+            'nextToken'           => nil
+          }
+          response
+        end
+      end
     end
   end
 end

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

@@ -91,6 +91,86 @@ module Fog
           }.merge!(options))
         end
       end
+
+      class Mock
+        def request_spot_instances(image_id, instance_type, spot_price, options = {})
+          response = Excon::Response.new
+
+          if (image_id && instance_type && spot_price)
+            response.status = 200
+
+            all_instance_types = flavors.map { |f| f.id }
+            if !all_instance_types.include?(instance_type)
+              message = "InvalidParameterValue => Invalid value '#{instance_type}' for InstanceType."
+              raise Fog::Compute::AWS::Error.new(message)
+            end
+
+            spot_price = spot_price.to_f
+            if !(spot_price > 0)
+              message = "InvalidParameterValue => Value (#{spot_price}) for parameter price is invalid."
+              message << " \"#{spot_price}\" is an invalid spot instance price"
+              raise Fog::Compute::AWS::Error.new(message)
+            end
+
+            if !image_id.match(/^ami-[a-f0-9]{8}$/)
+              message = "The image id '[#{image_id}]' does not exist"
+              raise Fog::Compute::AWS::NotFound.new(message)
+            end
+
+          else
+            message = 'MissingParameter => '
+            message << 'The request must contain the parameter '
+            if !image_id
+              message << 'image_id'
+            elsif !instance_type
+              message << 'instance_type'
+            else
+              message << 'spot_price'
+            end
+            raise Fog::Compute::AWS::Error.new(message)
+          end
+
+          for key in %w(AvailabilityZoneGroup LaunchGroup)
+            if options.is_a?(Hash) && options.key?(key)
+              Fog::Logger.warning("#{key} filters are not yet mocked [light_black](#{caller.first})[/]")
+              Fog::Mock.not_implemented
+            end
+          end
+
+          launch_spec = {
+            'iamInstanceProfile' => {},
+            'blockDeviceMapping' => [],
+            'groupSet'           => [Fog::AWS::Mock.security_group_id],
+            'imageId'            => image_id,
+            'instanceType'       => instance_type,
+            'monitoring'         => options['MonitoringEnabled'] || false,
+            'subnetId'           => nil,
+            'ebsOptimized'       => false,
+            'keyName'            => options['KeyName'] || nil
+          }
+
+          response.body = {
+            'spotInstanceRequestSet' => [
+              {
+                'launchSpecification'   => launch_spec,
+                'spotInstanceRequestId' => Fog::AWS::Mock.spot_instance_request_id,
+                'spotPrice'             => spot_price,
+                'type'                  => options['Type'] || 'one-time',
+                'state'                 => 'open',
+                'fault'                 => {
+                  'code'    => 'pending-evaluation',
+                  'message' => 'Your Spot request has been submitted for review, and is pending evaluation.'
+                },
+                'createTime'         => Time.now,
+                'productDescription' => 'Linux/UNIX'
+              }
+            ],
+            'requestId' => Fog::AWS::Mock.request_id
+          }
+
+          response
+        end
+      end
     end
   end
 end