fog 1.4.0 → 1.5.0

data/lib/fog/aws/models/compute/address.rb

@@ -22,7 +22,7 @@ module Fog
         def destroy
           requires :public_ip
 
-          connection.release_address(public_ip)
+          connection.release_address(allocation_id || public_ip)
           true
         end
 
@@ -33,7 +33,7 @@ module Fog
             disassociate
           end
         end
-        
+
         def server
           connection.servers.get(server_id)
         end

data/lib/fog/aws/models/dns/records.rb

@@ -44,6 +44,11 @@ module Fog
         def all!
           data = []
 
+          merge_attributes({'NextRecordName' => nil,
+                            'NextRecordType' => nil,
+                            'NextRecordIdentifier' => nil,
+                            'IsTruncated' => nil})
+
           begin
             options = {
                 :name => next_record_name,

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

@@ -53,7 +53,7 @@ module Fog
               :auto_minor_version_upgrade   => auto_upgrade,
               :engine                       => engine,
               :engine_version               => engine_version,
-              :notification_topic_arn       => (notification_config['TopicArn']).strip,
+              :notification_topic_arn       => notification_config['TopicArn'],
               :port                         => port,
               :preferred_availablility_zone => zone,
               :preferred_maintenance_window => maintenance_window,

data/lib/fog/aws/models/iam/users.rb

@@ -7,11 +7,16 @@ module Fog
 
       class Users < Fog::Collection
 
+        attribute :is_truncated,    :aliases => 'IsTruncated'
+        attribute :marker,          :aliases => 'Marker'
+
         model Fog::AWS::IAM::User
 
-        def all
-          data = connection.list_users.body['Users']
-          load(data) # data is an array of attribute hashes
+        def all(options = {})
+          merge_attributes(options)
+          data = connection.list_users(options).body
+          merge_attributes('IsTruncated' => data['IsTruncated'], 'Marker' => data['Marker'])
+          load(data['Users']) # data is an array of attribute hashes
         end
 
         def get(identity)
@@ -21,7 +26,24 @@ module Fog
           nil
         end
 
+        alias :each_user_this_page :each
+
+        def each
+          if !block_given?
+            self
+          else
+            subset = dup.all
+
+            subset.each_user_this_page {|f| yield f}
+            while subset.is_truncated
+              subset = subset.all('Marker' => subset.marker, 'MaxItems' => 1000)
+              subset.each_user_this_page {|f| yield f}
+            end
+
+            self
+          end
+        end
       end
     end
   end
-end
+end

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

@@ -49,13 +49,15 @@ module Fog
               @response['DescribePoliciesResult'] = @results
             
             when 'Alarms'
-              if @in_alarms == true
+              @in_alarms = false
+            when 'member'
+              if @in_alarms
                 @scaling_policy['Alarms'] << @alarm
                 reset_alarm
-              end            
-            when 'member'
-              @results['ScalingPolicies'] << @scaling_policy
-              reset_scaling_policy              
+              else
+                @results['ScalingPolicies'] << @scaling_policy
+                reset_scaling_policy
+              end
             end
           end
 

data/lib/fog/aws/parsers/elb/describe_load_balancers.rb

@@ -83,7 +83,7 @@ module Fog
               @in_listeners = false
             when 'PolicyNames'
               @in_policy_names = false
-            when 'Protocol', 'SSLCertificateId'
+            when 'Protocol', 'SSLCertificateId', 'InstanceProtocol'
               @listener_description['Listener'][name] = value
             when 'LoadBalancerPort', 'InstancePort'
               @listener_description['Listener'][name] = value.to_i

data/lib/fog/aws/rds.rb

@@ -90,7 +90,7 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           @region = options[:region] || 'us-east-1'
         
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         

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

@@ -49,9 +49,17 @@ module Fog
         #
         def create_auto_scaling_group(auto_scaling_group_name, availability_zones, launch_configuration_name, max_size, min_size, options = {})
           options.merge!(AWS.indexed_param('AvailabilityZones.member.%d', [*availability_zones]))
+          options.delete('AvailabilityZones')
           if load_balancer_names = options.delete('LoadBalancerNames')
             options.merge!(AWS.indexed_param('LoadBalancerNames.member.%d', [*load_balancer_names]))
           end
+          if tags = options.delete('Tags')
+            tags.each_with_index do |tag, i|
+              tag.each do |key, value|
+                options["Tags.member.#{i + 1}.#{key.to_s.capitalize}"] = value
+              end
+            end
+          end
           request({
             'Action'                  => 'CreateAutoScalingGroup',
             'AutoScalingGroupName'    => auto_scaling_group_name,

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

@@ -78,9 +78,8 @@ module Fog
           data[:launch_configurations][launch_configuration_name] = {
             'BlockDeviceMappings'     => [],
             'CreatedTime'             => Time.now.utc,
-            'IamInstanceProfile'      => nil,
             'ImageId'                 => image_id,
-            'InstanceMonitoring.Enabled'      => true,
+            'InstanceMonitoring'      => {'Enabled' => true},
             'InstanceType'            => instance_type,
             'KernelId'                => nil,
             'KeyName'                 => nil,

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

@@ -35,9 +35,17 @@ module Fog
       class Mock
 
         def delete_auto_scaling_group(auto_scaling_group_name)
-          Fog::Mock.not_implemented
+          unless self.data[:auto_scaling_groups].delete(auto_scaling_group_name)
+            raise Fog::AWS::Autoscaling::NotFound, "The auto scaling group '#{auto_scaling_group_name}' does not exist."
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
-
       end
 
     end

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

@@ -39,7 +39,7 @@ module Fog
 
         def delete_launch_configuration(launch_configuration_name)
           unless self.data[:launch_configurations].delete(launch_configuration_name)
-            raise Fog::AWS::AutoScaling::ValidationError, "Launch configuration name not found - Launch configuration #{launch_configuration_name} not found"
+            raise Fog::AWS::AutoScaling::NotFound, "The launch configuration '#{launch_configuration_name}' does not exist."
           end
 
           response = Excon::Response.new

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

@@ -37,7 +37,16 @@ module Fog
       class Mock
 
         def delete_policy(auto_scaling_group_name, policy_name)
-          Fog::Mock.not_implemented
+          unless data[:scaling_policies].delete(policy_name)
+            raise Fog::AWS::AutoScaling::NotFound, "The scaling policy '#{policy_name}' does not exist."
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
 
       end

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

@@ -73,7 +73,6 @@ module Fog
         def describe_auto_scaling_instances(options = {})
           results = { 'AutoScalingInstances' => [] }
           data[:auto_scaling_groups].each do |asg_name, asg_data|
-            lc_name = data[asg_data][lc_name]
             asg_data['Instances'].each do |instance|
               results['AutoScalingInstances'] << {
                 'AutoScalingGroupName' => asg_name

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

@@ -75,7 +75,19 @@ module Fog
       class Mock
 
         def describe_policies(options = {})
-          Fog::Mock.not_implemented
+          results = { 'ScalingPolicies' => [] }
+          data[:scaling_policies].each do |asp_name, asp_data|
+            results['ScalingPolicies'] << {
+              'PolicyName' => asp_name
+            }.merge!(asp_data)
+          end
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'DescribePoliciesResult' => results,
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
 
       end

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

@@ -56,7 +56,26 @@ module Fog
       class Mock
 
         def put_scaling_policy(adjustment_type, auto_scaling_group_name, policy_name, scaling_adjustment, options = {})
-          Fog::Mock.not_implemented
+          unless data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('Auto Scaling Group name not found - null')
+          end
+          data[:scaling_policies][policy_name] = {
+            'AdjustmentType'       => adjustment_type,
+            'Alarms'               => [],
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            'Cooldown'             => 0,
+            'MinAdjustmentStep'    => 0,
+            'PolicyARN'            => "arn:aws:autoscaling:eu-west-1:000000000000:scalingPolicy:00000000-0000-0000-0000-000000000000:autoScalingGroupName/#{auto_scaling_group_name}:policyName/#{policy_name}",
+            'PolicyName'           => policy_name,
+            'ScalingAdjustment'    => scaling_adjustment
+          }.merge!(options)
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
 
       end

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

@@ -62,7 +62,7 @@ module Fog
           unless data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
             raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
           end
-          data[:auto_scaling_group_name][auto_scaling_group_name].merge!(options)
+          data[:auto_scaling_groups][auto_scaling_group_name].merge!(options)
 
           response = Excon::Response.new
           response.status = 200

data/lib/fog/aws/requests/cloud_watch/delete_alarms.rb

@@ -24,7 +24,25 @@ module Fog
               :parser     => Fog::Parsers::AWS::CloudWatch::DeleteAlarms.new
             }.merge(options))
         end
-      end       
+      end
+
+      class Mock
+        def delete_alarms(alarm_names)
+          [*alarm_names].each do |alarm_name|
+            unless data[:metric_alarms].has_key?(alarm_name)
+              raise Fog::AWS::AutoScaling::NotFound, "The alarm '#{alarm_name}' does not exist."
+            end
+          end
+
+          [*alarm_names].each { |alarm_name| data[:metric_alarms].delete(alarm_name) }
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
     end
   end
 end

data/lib/fog/aws/requests/cloud_watch/describe_alarms.rb

@@ -1,7 +1,7 @@
 module Fog
   module AWS
     class CloudWatch
-      class Real     
+      class Real
 
         require 'fog/aws/parsers/cloud_watch/describe_alarms'
 
@@ -32,7 +32,25 @@ module Fog
               :parser     => Fog::Parsers::AWS::CloudWatch::DescribeAlarms.new
             }.merge(options))
         end
-      end     
+      end
+
+      class Mock
+        def describe_alarms(options={})
+          results = { 'MetricAlarms' => [] }
+          data[:metric_alarms].each do |alarm_name, alarm_data|
+            results['MetricAlarms'] << {
+              'AlarmName' => alarm_name
+            }.merge!(alarm_data)
+          end
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'DescribeAlarmsResult' => results,
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
     end
   end
 end

data/lib/fog/aws/requests/cloud_watch/put_metric_alarm.rb

@@ -71,6 +71,15 @@ module Fog
             end
           end
 
+          data[:metric_alarms][options['AlarmName']] = {
+            'AlarmARN' => "arn:aws:cloudwatch:eu-west-1:000000000000:metricAlarm:00000000-0000-0000-0000-000000000000:alarmName/#{options['AlarmName']}",
+            'ActionsEnabled' => false,
+            'AlarmActions' => [],
+            'AlarmConfigurationUpdatedTimestamp' => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
+            'Dimensions' => [],
+            'OKActions' => [],
+          }.merge!(options)
+
           response = Excon::Response.new
           response.status = 200
           response.body = {

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

@@ -40,12 +40,11 @@ module Fog
               'publicIp'   => public_ip,
               'domain'     => domain
             }
+            if domain == 'vpc'
+              data['allocationId'] = "eipalloc-#{Fog::Mock.random_hex(8)}"
+            end
             self.data[:addresses][public_ip] = data
-            response.body = {
-              'domain'    => domain,
-              'publicIp'  => public_ip,
-              'requestId' => Fog::AWS::Mock.request_id
-            }
+            response.body = data.reject {|k, v| k == 'instanceId' }.merge('requestId' => Fog::AWS::Mock.request_id)
             response
           else
             response.status = 400

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

@@ -45,13 +45,14 @@ module Fog
           params.merge!(indexed_multidimensional_params(dhcp_configurations))
           Excon::Response.new.tap do |response|
             response.status = 200
+            self.data[:dhcp_options].push({
+              'dhcpOptionsId' => Fog::AWS::Mock.dhcp_options_id,
+              'dhcpConfigurationSet'  => {},
+              'tagSet'             => {}
+            })
             response.body = {
               'requestId'    => Fog::AWS::Mock.request_id,
-              'dhcpOptionsSet'      => [
-                'dhcpOptionsId' => Fog::AWS::Mock.dhcp_options_id,
-                'dhcpConfigurationSet'  => {},
-                'tagSet'             => {}
-              ]
+              'dhcpOptionsSet'      => self.data[:dhcp_options]
             }
           end
         end

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

@@ -33,15 +33,16 @@ module Fog
 
       class Mock
         def create_internet_gateway()
-          Excon::Response.new(
+        self.data[:internet_gateways].push({
+          'internetGatewayId' => Fog::AWS::Mock.request_id,
+          'attachmentSet'     => {},
+          'tagSet'            => {}
+        })
+         Excon::Response.new(
             :status => 200,
             :body   => {
               'requestId' => Fog::AWS::Mock.request_id,
-              'internetGatewaySet' => [
-                'internetGatewayId' => Fog::AWS::Mock.request_id,
-                'attachmentSet'     => {},
-                'tagSet'            => {}
-              ]
+              'internetGatewaySet' => self.data[:internet_gateways]
             }
           )
         end

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

@@ -46,18 +46,19 @@ module Fog
           Excon::Response.new.tap do |response|
             if cidrBlock  && vpcId
               response.status = 200
-            
+              self.data[:subnets].push({
+                'subnetId'                 => Fog::AWS::Mock.request_id,
+                'state'                    => 'pending',
+                'vpcId'                    => Fog::AWS::Mock.request_id,
+                'cidrBlock'                => cidrBlock,
+                'availableIpAddressCount'  => "255",
+                'availabilityZone'         => av_zone,
+                'tagSet'                   => {}
+              })
+
               response.body = {
                 'requestId'    => Fog::AWS::Mock.request_id,
-                'subnetSet'    => [
-                  'subnetId'                 => Fog::AWS::Mock.request_id,
-                  'state'                    => 'pending',
-                  'vpcId'                    => Fog::AWS::Mock.request_id,
-                  'cidrBlock'                => cidrBlock,
-                  'availableIpAddressCount'  => 16,
-                  'availabilityZone'         => av_zone,
-                  'tagSet'                   => {}
-                ]
+                'subnetSet'    => self.data[:subnets]
               }
             else
               response.status = 400