fog 1.10.0 → 1.10.1

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

@@ -5,29 +5,25 @@ module Fog
 
         require 'fog/aws/parsers/cloud_formation/create_stack'
 
-        # Create a stack
-        #
-        # ==== Parameters
-        # * stack_name<~String>: name of the stack to create
-        # * options<~Hash>:
-        #   * TemplateBody<~String>: structure containing the template body
+        # Create a stack.
+        # 
+        # * stack_name [String] Name of the stack to create.
+        # * options [Hash]:
+        #   * TemplateBody [String] Structure containing the template body.
         #   or (one of the two Template parameters is required)
-        #   * TemplateURL<~String>: URL of file containing the template body
-        #   * DisableRollback<~Boolean>: Controls rollback on stack creation failure, defaults to false
-        #   * NotificationARNs<~Array>: List of SNS topics to publish events to
-        #   * Parameters<~Hash>: Hash of providers to supply to template
-        #   * TimeoutInMinutes<~Integer>: Minutes to wait before status is set to CREATE_FAILED
-        #   * Capabilities<~Array>: List of capabilties the stack is granted. Currently CAPABILITY_IAM
-        #     for allowing the creation of IAM resources
-        #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'StackId'<~String> - Id of the new stack
+        #   * TemplateURL [String] URL of file containing the template body.
+        #   * DisableRollback [Boolean] Controls rollback on stack creation failure, defaults to false.
+        #   * NotificationARNs [Array] List of SNS topics to publish events to.
+        #   * Parameters [Hash] Hash of providers to supply to template
+        #   * TimeoutInMinutes [Integer] Minutes to wait before status is set to CREATE_FAILED
+        #   * Capabilities [Array] List of capabilties the stack is granted. Currently CAPABILITY_IAM for allowing the creation of IAM resources
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html
+        # @return [Excon::Response]:
+        #   * body [Hash:
+        #     * StackId [String] - Id of the new stack
         #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_CreateStack.html
+        
         def create_stack(stack_name, options = {})
           params = {
             'StackName' => stack_name,

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

@@ -5,17 +5,14 @@ module Fog
 
         require 'fog/aws/parsers/cloud_formation/basic'
 
-        # Delete a stack
+        # Delete a stack.
         #
-        # ==== Parameters
-        # * stack_name<~String>: name of the stack to create
+        # @param stack_name String] Name of the stack to create.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DeleteStack.html
+        # @return [Excon::Response]
         #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DeleteStack.html
+        
         def delete_stack(stack_name)
           request(
             'Action'    => 'DeleteStack',

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

@@ -5,31 +5,28 @@ module Fog
 
         require 'fog/aws/parsers/cloud_formation/describe_stack_events'
 
-        # Describe stack events
+        # Describe stack events.
         #
-        # ==== Parameters
-        # * stack_name<~String>: stack name to return events for
-        # * options<~Hash>:
-        #   * NextToken<~String>: identifies the start of the next list of events, if there is one
+        # @param stack_name [String] stack name to return events for.
+        # @param options [Hash]
+        # @option options NextToken [String] Identifies the start of the next list of events, if there is one.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'StackEvents'<~Array> - Matching resources
-        #       * event<~Hash>:
-        #         * 'EventId'<~String> -
-        #         * 'StackId'<~String> -
-        #         * 'StackName'<~String> -
-        #         * 'LogicalResourceId'<~String> -
-        #         * 'PhysicalResourceId'<~String> -
-        #         * 'ResourceType'<~String> -
-        #         * 'Timestamp'<~Time> -
-        #         * 'ResourceStatus'<~String> -
-        #         * 'ResourceStatusReason'<~String> -
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStackEvents.html
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * StackEvents [Array] - Matching resources
+        #       * event [Hash]:
+        #         * EventId [String] -
+        #         * StackId [String] -
+        #         * StackName [String] -
+        #         * LogicalResourceId [String] -
+        #         * PhysicalResourceId [String] -
+        #         * ResourceType [String] -
+        #         * Timestamp [Time] -
+        #         * ResourceStatus [String] -
+        #         * ResourceStatusReason [String] -
         #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStackEvents.html
+        
         def describe_stack_events(stack_name, options = {})
           request({
             'Action'    => 'DescribeStackEvents',

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

@@ -5,31 +5,28 @@ module Fog
 
         require 'fog/aws/parsers/cloud_formation/describe_stack_resources'
 
-        # Describe stack resources
+        # Describe stack resources.
         #
-        # ==== Parameters
-        # * options<~Hash>:
-        #   * 'PhysicalResourceId'<~String>: name or unique identifier that corresponds to a physical instance ID
+        # @param options Hash]:
+        #   * PhysicalResourceId [String] name or unique identifier that corresponds to a physical instance ID
         #   or (one of PhysicalResourceId and StackName is required)
-        #   * 'StackName'<~String>: only return events related to this stack name
-        #   * 'LogicalResourceId'<~String>: logical name of the resource as specified in the template
+        #   * StackName [String] Only return events related to this stack name
+        #   * LogicalResourceId [String] Logical name of the resource as specified in the template
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'StackResources'<~Array> - Matching resources
-        #       * resource<~Hash>:
-        #         * 'StackId'<~String> -
-        #         * 'StackName'<~String> -
-        #         * 'LogicalResourceId'<~String> -
-        #         * 'PhysicalResourceId'<~String> -
-        #         * 'ResourceType'<~String> -
-        #         * 'Timestamp'<~Time> -
-        #         * 'ResourceStatus'<~String> -
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStackResources.html
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * StackResources [Array] - Matching resources
+        #       * resource [Hash]:
+        #         * StackId [String] -
+        #         * StackName [String] -
+        #         * LogicalResourceId [String] -
+        #         * PhysicalResourceId [String] -
+        #         * ResourceType [String] -
+        #         * Timestamp [Time] -
+        #         * ResourceStatus [String] -
         #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStackResources.html
+        
         def describe_stack_resources(options = {})
           request({
             'Action'    => 'DescribeStackResources',

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

@@ -5,30 +5,27 @@ module Fog
 
         require 'fog/aws/parsers/cloud_formation/describe_stacks'
 
-        # Describe stacks
+        # Describe stacks.
         #
-        # ==== Parameters
-        # * options<~Hash>:
-        #   * 'StackName'<~String>: name of the stack to describe
+        # @param options [Hash]
+        # @option options StackName [String] Name of the stack to describe.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'Stacks'<~Array> - Matching stacks
-        #       * stack<~Hash>:
-        #         * 'StackName'<~String> -
-        #         * 'StackId'<~String> -
-        #         * 'CreationTime'<~String> -
-        #         * 'StackStatus'<~String> -
-        #         * 'DisableRollback'<~String> -
-        #         * 'Outputs'<~Array> -
-        #           * output<~Hash>:
-        #             * 'OutputKey'<~String> -
-        #             * 'OutputValue'<~String> -
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStacks.html
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * Stacks [Array] - Matching stacks
+        #       * stack [Hash]:
+        #         * StackName [String] -
+        #         * StackId [String] -
+        #         * CreationTime [String] -
+        #         * StackStatus [String] -
+        #         * DisableRollback [String] -
+        #         * Outputs [Array] -
+        #           * output [Hash]:
+        #             * OutputKey [String] -
+        #             * OutputValue [String] -
         #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_DescribeStacks.html
+        
         def describe_stacks(options = {})
           request({
             'Action'    => 'DescribeStacks',

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

@@ -5,19 +5,16 @@ module Fog
 
         require 'fog/aws/parsers/cloud_formation/get_template'
 
-        # Describe stacks
+        # Describe stacks.
         #
-        # ==== Parameters
-        # * stack_name<~String> - stack name to get template from
+        # @param stack_name [String] stack name to get template from
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'TemplateBody'<~String> - structure containing the template body (json)
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_GetTemplate.html
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * TemplateBody [String] - structure containing the template body (json)
         #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_GetTemplate.html
+        
         def get_template(stack_name)
           request(
             'Action'    => 'GetTemplate',

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

@@ -5,26 +5,22 @@ module Fog
 
         require 'fog/aws/parsers/cloud_formation/update_stack'
 
-        # Update a stack
+        # Update a stack.
         #
-        # ==== Parameters
-        # * stack_name<~String>: name of the stack to update
-        # * options<~Hash>:
-        #   * TemplateBody<~String>: structure containing the template body
+        # @parm stack_name [String] Name of the stack to update.
+        # @parm options [Hash]
+        #   * TemplateBody [String] Structure containing the template body.
         #   or (one of the two Template parameters is required)
-        #   * TemplateURL<~String>: URL of file containing the template body
-        #   * 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
+        #   * TemplateURL [String] URL of file containing the template body.
+        #   * 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.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'StackId'<~String> - Id of the stack being updated
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_UpdateStack.html
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * StackId [String] - Id of the stack being updated
         #
+        # @see http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_UpdateStack.html
+        
         def update_stack(stack_name, options = {})
           params = {
             'StackName' => stack_name,

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

@@ -5,22 +5,19 @@ module Fog
 
         require 'fog/aws/parsers/cloud_formation/validate_template'
 
-        # Describe stacks
+        # Describe stacks.
         #
-        # ==== Parameters
-        # * options<~Hash>:
-        #   * 'TemplateBody'<~String> - template structure
-        #   * 'TemplateURL'<~String> - template url
+        # @para options [Hash]
+        # @option options TemplateBody [String] template structure
+        # @option options TemplateURL [String] template url
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'Description'<~String> - description found within the template
-        #     * 'Parameters'<~String> - list of template parameter structures
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * Description [String] - description found within the template
+        #     * Parameters [String] - list of template parameter structures
         #
-        # ==== See Also
         # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_ValidateTemplate.html
-        #
+        
         def validate_template(options = {})
           request({
             'Action'    => 'ValidateTemplate',

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

@@ -48,19 +48,25 @@ module Fog
           address = public_ip.nil? ? nil : self.data[:addresses][public_ip]
           if ((instance && address) || (instance &&  !allocation_id.nil?) || (!allocation_id.nil? && !network_interface_id.nil?))
             if !allocation_id.nil?
-              allocation_ip = describe_addresses( 'allocation-id'  => "#{allocation_id}").body['addressesSet']
-              public_ip = allocation_ip['publicIp']
+              allocation_ip = describe_addresses( 'allocation-id'  => "#{allocation_id}").body['addressesSet'].first
+              if !allocation_ip.nil?
+                public_ip = allocation_ip['publicIp']
+              end
             end
-            if current_instance = self.data[:instances][address['instanceId']]
-              current_instance['ipAddress'] = current_instance['originalIpAddress']
+            if !address.nil?
+              if current_instance = self.data[:instances][address['instanceId']]
+                current_instance['ipAddress'] = current_instance['originalIpAddress']
+              end
+              address['instanceId'] = instance_id
             end
-            address['instanceId'] = instance_id
             # detach other address (if any)
             if self.data[:addresses][instance['ipAddress']]
               self.data[:addresses][instance['ipAddress']]['instanceId'] = nil
             end
-            instance['ipAddress'] = public_ip
-            instance['dnsName'] = Fog::AWS::Mock.dns_name_for(public_ip)
+            if !public_ip.nil?
+              instance['ipAddress'] = public_ip
+              instance['dnsName'] = Fog::AWS::Mock.dns_name_for(public_ip)
+            end
             response.status = 200
             if !instance_id.nil? && !public_ip.nil?
               response.body = {

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

@@ -2,13 +2,21 @@ module Fog
   module Compute
     class AWS
       class Real
-
+        
         require 'fog/aws/parsers/compute/describe_reserved_instances_offerings'
 
         # Describe all or specified reserved instances offerings
         #
         # ==== Parameters
         # * filters<~Hash> - List of filters to limit results with
+        #   * filters and/or the following
+        #     * 'AvailabilityZone'<~String> - availability zone of offering
+        #     * 'InstanceType'<~String> - instance type of offering
+        #     * 'InstanceTenancy'<~String> - tenancy of offering in ['default', 'dedicated']
+        #     * 'OfferingType'<~String> - type of offering, in ['Heavy Utilization', 'Medium Utilization', 'Light Utilization']
+        #     * 'ProductDescription'<~String> - description of offering, in ['Linux/UNIX', 'Linux/UNIX (Amazon VPC)', 'Windows', 'Windows (Amazon VPC)']
+        #     * 'MaxDuration'<~Integer> - maximum duration (in seconds) of offering
+        #     * 'MinDuration'<~Integer> - minimum duration (in seconds) of offering 
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -27,7 +35,13 @@ module Fog
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesOfferings.html]
         def describe_reserved_instances_offerings(filters = {})
-          params = Fog::AWS.indexed_filters(filters)
+          options = {}
+          for key in ['AvailabilityZone', 'InstanceType', 'InstanceTenancy', 'OfferingType', 'ProductDescription', 'MaxDuration', 'MinDuration']
+            if filters.is_a?(Hash) && filters.key?(key)
+              options[key] = filters.delete(key)
+            end
+          end
+          params = Fog::AWS.indexed_filters(filters).merge!(options)
           request({
             'Action'    => 'DescribeReservedInstancesOfferings',
             :idempotent => true,

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

@@ -55,7 +55,7 @@ module Fog
 
           response = Excon::Response.new
 
-          security_group_info = self.data[:security_groups].values
+          security_group_info = self.data[:security_groups].reject { |k,v| k['amazon-elb-sg'] }.values
 
           aliases = {
             'description' => 'groupDescription',
@@ -71,7 +71,7 @@ module Fog
           }
           for filter_key, filter_value in filters
             if permission_key = filter_key.split('ip-permission.')[1]
-              if permission_key == 'group-name'	
+              if permission_key == 'group-name'
                 security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions']['groups'].detect {|group| [*filter_value].include?(group['groupName'])}}
               elsif permission_key == 'group-id'
                 security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions']['groups'].detect {|group| [*filter_value].include?(group['groupId'])}}

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

@@ -73,6 +73,16 @@ module Fog
           end
 
           dns_name = Fog::AWS::ELB::Mock.dns_name(lb_name, @region)
+
+          Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:security_groups]['amazon-elb-sg'] ||= {
+            'groupDescription'   => 'amazon-elb-sg',
+            'groupName'          => 'amazon-elb-sg',
+            'groupId'            => 'amazon-elb',
+            'ownerId'            => 'amazon-elb',
+            'ipPermissionsEgree' => [],
+            'ipPermissions'      => [],
+          }
+
           self.data[:load_balancers][lb_name] = {
             'AvailabilityZones' => availability_zones,
             'Subnets' => options[:subnet_ids] || [],

data/lib/fog/aws/requests/iam/update_server_certificate.rb

@@ -32,6 +32,33 @@ module Fog
         end
 
       end
+
+      class Mock
+        def update_server_certificate(server_certificate_name, options = {})
+          new_server_certificate_name = options['NewServerCertificateName']
+          if self.data[:server_certificates][new_server_certificate_name]
+            raise Fog::AWS::IAM::EntityAlreadyExists.new("The Server Certificate with name #{server_certificate_name} already exists.")
+          end
+          unless certificate = self.data[:server_certificates].delete(server_certificate_name)
+            raise Fog::AWS::IAM::NotFound.new("The Server Certificate with name #{server_certificate_name} cannot be found.")
+          end
+
+          if new_server_certificate_name
+            certificate['ServerCertificateName'] = new_server_certificate_name
+          end
+
+          if new_path = options['NewPath']
+            certificate['Path'] = new_path
+          end
+
+          self.data[:server_certificates][certificate['ServerCertificateName']] = certificate
+
+          Excon::Response.new.tap do |response|
+            response.body = { 'RequestId' => Fog::AWS::Mock.request_id }
+            response.status = 200
+          end
+        end
+      end
     end
   end
 end