fog 1.1.2 → 1.2.0

data/lib/fog/aws/requests/dynamodb/get_item.rb

@@ -0,0 +1,43 @@
+module Fog
+  module AWS
+    class DynamoDB
+      class Real
+
+        # Get DynamoDB item
+        #
+        # ==== Parameters
+        # * 'table_name'<~String> - name of table for item
+        # * 'key'<~Hash>:
+        #   * 'HashKeyElement'<~Hash>: info for primary key
+        #     * 'AttributeType'<~String> - type of attribute
+        #     * 'AttributeName'<~String> - name of attribute
+        #   * 'RangeKeyElement'<~Hash>: optional, info for range key
+        #     * 'AttributeType'<~String> - type of attribute
+        #     * 'AttributeName'<~String> - name of attribute
+        # * 'options'<~Hash>:
+        #   * 'AttributesToGet'<~Array>: list of array names to return, defaults to returning all
+        #   * 'ConsistentRead'<~Boolean>: whether to wait for updates, defaults to false
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ConsumedCapacityUnits'<~Float> - Capacity units used in read
+        #     * 'Item':<~Hash>:
+        #       * 'AttributeName'<~Hash>: in form of {"type":value}
+        def get_item(table_name, key, options = {})
+          body = {
+            'Key'               => key,
+            'TableName'         => table_name
+          }.merge(options)
+
+          request(
+            :body       => MultiJson.encode(body),
+            :headers    => {'x-amz-target' => 'DynamoDB_20111205.GetItem'},
+            :idempotent => true
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dynamodb/list_tables.rb

@@ -0,0 +1,29 @@
+module Fog
+  module AWS
+    class DynamoDB
+      class Real
+
+        # List DynamoDB tables
+        #
+        # ==== Parameters
+        # * 'options'<~Hash> - options, defaults to {}
+        #   * 'ExclusiveStartTableName'<~String> - name of table to begin listing with
+        #   * 'Limit'<~Integer> - limit number of tables to return
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'LastEvaluatedTableName'<~String> - last table name, for pagination
+        #     * 'TableNames'<~Array> - table names
+        def list_tables(options = {})
+          request(
+            :body       => MultiJson.encode(options),
+            :headers    => {'x-amz-target' => 'DynamoDB_20111205.ListTables'},
+            :idempotent => true
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dynamodb/put_item.rb

@@ -0,0 +1,41 @@
+module Fog
+  module AWS
+    class DynamoDB
+      class Real
+
+        # Update DynamoDB item
+        #
+        # ==== Parameters
+        # * 'table_name'<~String> - name of table for item
+        # * 'item'<~Hash>: data to update, must include primary key
+        #   * 'AttributeName'<~String> - Attribute to update
+        #     * 'Value'<~Hash> - formated as {type => value}
+        #     * 'Action'<~String> - action to take if expects matches, in %w{ADD DELETE PUT}, defaults to PUT
+        # * 'options'<~Hash>:
+        #   * 'Expected'<~Hash>: data to check against
+        #     * 'AttributeName'<~String> - name of attribute
+        #     * 'Value'<~Hash> - a value to check for the value of
+        #     or
+        #     * 'Exists'<~Boolean> - set as false to only allow update if attribute doesn't exist
+        #   * 'ReturnValues'<~String> - data to return in %w{ALL_NEW ALL_OLD NONE UPDATED_NEW UPDATED_OLD}, defaults to NONE
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     varies based on ReturnValues param, see: http://docs.amazonwebservices.com/amazondynamodb/latest/developerguide/API_UpdateItem.html
+        def put_item(table_name, item, options = {})
+          body = {
+            'Item'      => item,
+            'TableName' => table_name
+          }.merge(options)
+
+          request(
+            :body       => MultiJson.encode(body),
+            :headers    => {'x-amz-target' => 'DynamoDB_20111205.PutItem'}
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dynamodb/query.rb

@@ -0,0 +1,44 @@
+module Fog
+  module AWS
+    class DynamoDB
+      class Real
+
+        # Query DynamoDB items
+        #
+        # ==== Parameters
+        # * 'table_name'<~String> - name of table to query
+        # * 'hash_key'<~Hash> - hash key to query
+        # * options<~Hash>:
+        #   * 'AttributesToGet'<~Array> - Array of attributes to get for each item, defaults to all
+        #   * 'ConsistentRead'<~Boolean> - Whether to wait for consistency, defaults to false
+        #   * 'Count'<~Boolean> - If true, returns only a count of such items rather than items themselves, defaults to false
+        #   * 'Limit'<~Integer> - limit of total items to return
+        #   * 'RangeKeyCondition'<~Hash>: value to compare against range key
+        #     * 'AttributeValueList'<~Hash>: one or more values to compare against
+        #     * 'ComparisonOperator'<~String>: comparison operator to use with attribute value list, in %w{BETWEEN BEGINS_WITH EQ LE LT GE GT}
+        #   * 'ScanIndexForward'<~Boolean>: Whether to scan from start or end of index, defaults to start
+        #   * 'ExclusiveStartKey'<~Hash>: Key to start listing from, can be taken from LastEvaluatedKey in response
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ConsumedCapacityUnits'<~Integer> - number of capacity units used for query
+        #     * 'Count'<~Integer> - number of items in response
+        #     * 'Items'<~Array> - array of items returned
+        #     * 'LastEvaluatedKey'<~Hash> - last key scanned, can be passed to ExclusiveStartKey for pagination
+        def query(table_name, hash_key, options = {})
+          body = {
+            'TableName'     => table_name,
+            'HashKeyValue'  => hash_key
+          }.merge(options)
+
+          request(
+            :body     => MultiJson.encode(body),
+            :headers  => {'x-amz-target' => 'DynamoDB_20111205.Query'}
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dynamodb/scan.rb

@@ -0,0 +1,45 @@
+module Fog
+  module AWS
+    class DynamoDB
+      class Real
+
+        # Scan DynamoDB items
+        #
+        # ==== Parameters
+        # * 'table_name'<~String> - name of table to query
+        # * options<~Hash>:
+        #   * 'AttributesToGet'<~Array> - Array of attributes to get for each item, defaults to all
+        #   * 'ConsistentRead'<~Boolean> - Whether to wait for consistency, defaults to false
+        #   * 'Count'<~Boolean> - If true, returns only a count of such items rather than items themselves, defaults to false
+        #   * 'Limit'<~Integer> - limit of total items to return
+        #   * 'ScanFilter'<~Hash>: value to compare against
+        #     * attribute_name<~Hash>:
+        #       * 'AttributeValueList'<~Hash>: one or more values to compare against
+        #       * 'ComparisonOperator'<~String>: comparison operator to use with attribute value list, in %w{BETWEEN BEGINS_WITH EQ LE LT GE GT}
+        #   * 'ScanIndexForward'<~Boolean>: Whether to scan from start or end of index, defaults to start
+        #   * 'ExclusiveStartKey'<~Hash>: Key to start listing from, can be taken from LastEvaluatedKey in response
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ConsumedCapacityUnits'<~Integer> - number of capacity units used for scan
+        #     * 'Count'<~Integer> - number of items in response
+        #     * 'Items'<~Array> - array of items returned
+        #     * 'LastEvaluatedKey'<~Hash> - last key scanned, can be passed to ExclusiveStartKey for pagination
+        #     * 'ScannedCount'<~Integer> - number of items scanned before applying filters
+        def scan(table_name, options = {})
+          body = {
+            'TableName'     => table_name
+          }.merge(options)
+
+          request(
+            :body     => MultiJson.encode(body),
+            :headers  => {'x-amz-target' => 'DynamoDB_20111205.Scan'},
+            :idempotent => true
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dynamodb/update_item.rb

@@ -0,0 +1,49 @@
+module Fog
+  module AWS
+    class DynamoDB
+      class Real
+
+        # Update DynamoDB item
+        #
+        # ==== Parameters
+        # * 'table_name'<~String> - name of table for item
+        # * 'key'<~Hash>:
+        #   * 'HashKeyElement'<~Hash>: info for primary key
+        #     * 'AttributeName'<~String> - name of attribute
+        #     * 'AttributeType'<~String> - type of attribute
+        #   * 'RangeKeyElement'<~Hash>: optional, info for range key
+        #     * 'AttributeName'<~String> - name of attribute
+        #     * 'AttributeType'<~String> - type of attribute
+        # * 'attribute_updates'<~Hash>:
+        #   * 'AttributeName'<~String> - Attribute to update
+        #     * 'Value'<~Hash> - formated as {type => value}
+        #     * 'Action'<~String> - action to take if expects matches, in %w{ADD DELETE PUT}, defaults to PUT
+        # * 'options'<~Hash>:
+        #   * 'Expected'<~Hash>: data to check against
+        #     * 'AttributeName'<~String> - name of attribute
+        #     * 'Value'<~Hash> - a value to check for the value of
+        #     or
+        #     * 'Exists'<~Boolean> - set as false to only allow update if attribute doesn't exist
+        #   * 'ReturnValues'<~String> - data to return in %w{ALL_NEW ALL_OLD NONE UPDATED_NEW UPDATED_OLD}, defaults to NONE
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     varies based on ReturnValues param, see: http://docs.amazonwebservices.com/amazondynamodb/latest/developerguide/API_UpdateItem.html
+        def update_item(table_name, key, attribute_updates, options = {})
+          body = {
+            'AttributeUpdates'  => attribute_updates,
+            'Key'               => key,
+            'TableName'         => table_name
+          }.merge(options)
+
+          request(
+            :body     => MultiJson.encode(body),
+            :headers  => {'x-amz-target' => 'DynamoDB_20111205.UpdateItem'}
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dynamodb/update_table.rb

@@ -0,0 +1,46 @@
+module Fog
+  module AWS
+    class DynamoDB
+      class Real
+
+        # Update DynamoDB table throughput
+        #
+        # ==== Parameters
+        # * 'table_name'<~String> - name of table to describe
+        # * 'provisioned_throughput'<~Hash>:
+        #   * 'ReadCapacityUnits'<~Integer> - read capacity for table, in 5..10000
+        #   * 'WriteCapacityUnits'<~Integer> - write capacity for table, in 5..10000
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'Table'<~Hash>
+        #       * 'KeySchema'<~Hash> - schema for table
+        #         * 'HashKeyElement'<~Hash>: info for primary key
+        #           * 'AttributeName'<~String> - name of attribute
+        #           * 'AttributeType'<~String> - type of attribute, in %w{N NS S SS} for number, number set, string, string set
+        #         * 'RangeKeyElement'<~Hash>: optional, info for range key
+        #           * 'AttributeName'<~String> - name of attribute
+        #           * 'AttributeType'<~String> - type of attribute, in %w{N NS S SS} for number, number set, string, string set
+        #       * 'ProvisionedThroughput'<~Hash>:
+        #         * 'ReadCapacityUnits'<~Integer> - read capacity for table, in 5..10000
+        #         * 'WriteCapacityUnits'<~Integer> - write capacity for table, in 5..10000
+        #       * 'TableName'<~String> - name of table
+        #       * 'TableStatus'<~String> - status of table
+        def update_table(table_name, provisioned_throughput)
+          body = {
+            'ProvisionedThroughput' => provisioned_throughput,
+            'TableName'             => table_name
+          }
+
+          request(
+            :body       => MultiJson.encode(body),
+            :headers    => {'x-amz-target' => 'DynamoDB_20111205.UpdateTable'},
+            :idempotent => true
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elasticache/create_cache_cluster.rb

@@ -36,14 +36,14 @@ module Fog
           # Merge the Cache Security Group parameters with the normal options
           request(sec_group_params.merge(
             'Action'          => 'CreateCacheCluster',
-            'CacheClusterId'  => id,
+            'CacheClusterId'  => id.strip,
             'CacheNodeType'   => options[:node_type]  || 'cache.m1.large',
             'Engine'          => options[:engine]     || 'memcached',
             'NumCacheNodes'   => options[:num_nodes]  || 1,
             'AutoMinorVersionUpgrade'     => options[:auto_minor_version_upgrade],
             'CacheParameterGroupName'     => options[:parameter_group_name],
             'EngineVersion'               => options[:engine_version],
-            'NotificationTopicArn'        => options[:notification_topic_arn],
+            'NotificationTopicArn'        => (options[:notification_topic_arn]).strip,
             'Port'                        => options[:port],
             'PreferredAvailabilityZone'   => options[:preferred_availablility_zone],
             'PreferredMaintenanceWindow'  => options[:preferred_maintenance_window],

data/lib/fog/aws/requests/elasticache/modify_cache_cluster.rb

@@ -45,13 +45,13 @@ module Fog
           # Merge the Cache Security Group parameters with the normal options
           request(node_id_params.merge(sec_group_params.merge(
             'Action'                      => 'ModifyCacheCluster',
-            'CacheClusterId'              => id,
+            'CacheClusterId'              => id.strip,
             'ApplyImmediately'            => options[:apply_immediately],
             'NumCacheNodes'               => options[:num_nodes],
             'AutoMinorVersionUpgrade'     => options[:auto_minor_version_upgrade],
             'CacheParameterGroupName'     => options[:parameter_group_name],
             'EngineVersion'               => options[:engine_version],
-            'NotificationTopicArn'        => options[:notification_topic_arn],
+            'NotificationTopicArn'        => (options[:notification_topic_arn]).strip,
             'NotificationTopicStatus'     => options[:notification_topic_status],
             'PreferredMaintenanceWindow'  => options[:preferred_maintenance_window],
             :parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new

data/lib/fog/aws/requests/elb/create_app_cookie_stickiness_policy.rb

@@ -37,6 +37,8 @@ module Fog
 
             load_balancer['Policies']['AppCookieStickinessPolicies'] << { 'CookieName' => cookie_name, 'PolicyName' => policy_name }
 
+            create_load_balancer_policy(lb_name, policy_name, 'AppCookieStickinessPolicyType', {'CookieName' => cookie_name})
+
             response.body = {
               'ResponseMetadata' => {
                 'RequestId' => Fog::AWS::Mock.request_id

data/lib/fog/aws/requests/elb/create_lb_cookie_stickiness_policy.rb

@@ -37,7 +37,9 @@ module Fog
             response = Excon::Response.new
             response.status = 200
 
-            load_balancer['Policies']['LBCookieStickinessPolicies'] << { 'PolicyName' => policy_name, 'CookieExpirationPeriod' => cookie_expiration_period }
+            load_balancer['Policies']['LBCookieStickinessPolicies'] << { 'CookieExpirationPeriod' => cookie_expiration_period, 'PolicyName' => policy_name }
+
+            create_load_balancer_policy(lb_name, policy_name, 'LBCookieStickinessPolicyType', {'CookieExpirationPeriod' => cookie_expiration_period})
 
             response.body = {
               'ResponseMetadata' => {

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -11,9 +11,10 @@ module Fog
         # * availability_zones<~Array> - List of availability zones for the ELB
         # * lb_name<~String> - Name for the new ELB -- must be unique
         # * listeners<~Array> - Array of Hashes describing ELB listeners to assign to the ELB
-        #   * 'Protocol'<~String> - Protocol to use. Either HTTP or TCP.
+        #   * 'Protocol'<~String> - Protocol to use. Either HTTP, HTTPS, TCP or SSL.
         #   * 'LoadBalancerPort'<~Integer> - The port that the ELB will listen to for outside traffic
         #   * 'InstancePort'<~Integer> - The port on the instance that the ELB will forward traffic to
+        #   * 'InstanceProtocol'<~String> - Protocol for sending traffic to an instance. Either HTTP, HTTPS, TCP or SSL.
         #   * 'SSLCertificateId'<~String> - ARN of the server certificate
         # ==== Returns
         # * response<~Excon::Response>:
@@ -28,17 +29,20 @@ module Fog
           listener_protocol = []
           listener_lb_port = []
           listener_instance_port = []
+          listener_instance_protocol = []
           listener_ssl_certificate_id = []
           listeners.each do |listener|
             listener_protocol.push(listener['Protocol'])
             listener_lb_port.push(listener['LoadBalancerPort'])
             listener_instance_port.push(listener['InstancePort'])
+            listener_instance_protocol.push(listener['InstanceProtocol'])
             listener_ssl_certificate_id.push(listener['SSLCertificateId'])
           end
 
           params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol))
           params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port))
           params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.InstanceProtocol', listener_instance_protocol))
           params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.SSLCertificateId', listener_ssl_certificate_id))
 
           request({
@@ -83,8 +87,9 @@ module Fog
             'ListenerDescriptions' => listeners,
             'LoadBalancerName' => lb_name,
             'Policies' => {
+              'AppCookieStickinessPolicies' => [],
               'LBCookieStickinessPolicies' => [],
-              'AppCookieStickinessPolicies' => []
+              'Proper' => []
             },
             'SourceSecurityGroup' => {
               'GroupName' => '',

data/lib/fog/aws/requests/elb/create_load_balancer_listeners.rb

@@ -10,9 +10,10 @@ module Fog
         # ==== Parameters
         # * lb_name<~String> - Name for the new ELB -- must be unique
         # * listeners<~Array> - Array of Hashes describing ELB listeners to add to the ELB
-        #   * 'Protocol'<~String> - Protocol to use. Either HTTP or TCP.
+        #   * 'Protocol'<~String> - Protocol to use. Either HTTP, HTTPS, TCP or SSL.
         #   * 'LoadBalancerPort'<~Integer> - The port that the ELB will listen to for outside traffic
         #   * 'InstancePort'<~Integer> - The port on the instance that the ELB will forward traffic to
+        #   * 'InstanceProtocol'<~String> - Protocol for sending traffic to an instance. Either HTTP, HTTPS, TCP or SSL.
         #   * 'SSLCertificateId'<~String> - ARN of the server certificate
         # ==== Returns
         # * response<~Excon::Response>:
@@ -25,17 +26,20 @@ module Fog
           listener_protocol = []
           listener_lb_port = []
           listener_instance_port = []
+          listener_instance_protocol = []
           listener_ssl_certificate_id = []
           listeners.each do |listener|
             listener_protocol.push(listener['Protocol'])
             listener_lb_port.push(listener['LoadBalancerPort'])
             listener_instance_port.push(listener['InstancePort'])
+            listener_instance_protocol.push(listener['InstanceProtocol'])
             listener_ssl_certificate_id.push(listener['SSLCertificateId'])
           end
 
           params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol))
           params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port))
           params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.InstanceProtocol', listener_instance_protocol))
           params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.SSLCertificateId', listener_ssl_certificate_id))
 
           request({
@@ -58,6 +62,11 @@ module Fog
               if listener['SSLCertificateId'] and !certificate_ids.include? listener['SSLCertificateId']
                 raise Fog::AWS::IAM::NotFound.new('CertificateNotFound')
               end
+
+              if (%w( HTTP HTTPS).include?(listener['Protocol']) && !%w( HTTP HTTPS ).include?(listener['InstanceProtocol'])) ||
+                  (%w( TCP SSL).include?(listener['Protocol']) && !%w( TCP SSL ).include?(listener['InstanceProtocol']))
+                raise Fog::AWS::ELB::ValidationError
+              end if listener['Protocol'] && listener['InstanceProtocol']
               load_balancer['ListenerDescriptions'] << {'Listener' => listener, 'PolicyNames' => []}
             end