fog 1.6.0 → 1.7.0

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

@@ -0,0 +1,53 @@
+module Fog
+  module AWS
+    class AutoScaling
+
+      class Real
+
+        require 'fog/aws/parsers/auto_scaling/describe_termination_policy_types'
+
+        # Returns a list of all termination policies supported by Auto Scaling.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DescribeTerminationPolicyTypesResult'<~Hash>:
+        #       * 'TerminationPolicyTypes'<~Array>:
+        #         * terminationtype<~String>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_DescribeTerminationPolicyTypes.html
+        #
+        def describe_termination_policy_types()
+          request({
+            'Action'    => 'DescribeTerminationPolicyTypes',
+            :idempotent => true,
+            :parser     => Fog::Parsers::AWS::AutoScaling::DescribeTerminationPolicyTypes.new
+          })
+        end
+
+      end
+
+      class Mock
+
+        def describe_termination_policy_types()
+          results = { 'TerminationPolicyTypes' => [] }
+          self.data[:termination_policy_types].each do |termination_policy_type|
+            results['TerminationPolicyTypes'] << termination_policy_type
+          end
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'DescribeTerminationPolicyTypesResult' => results,
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -42,7 +42,7 @@ module Fog
       class Mock
 
         def disable_metrics_collection(auto_scaling_group_name, options = {})
-          unless data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+          unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
             Fog::AWS::AutoScaling::ValidationError.new("Group #{auto_scaling_group_name} not found")
           end
 

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

@@ -49,10 +49,10 @@ module Fog
       class Mock
 
         def enable_metrics_collection(auto_scaling_group_name, granularity, options = {})
-          unless data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+          unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
             Fog::AWS::AutoScaling::ValidationError.new("Group #{auto_scaling_group_name} not found")
           end
-          unless data[:metric_collection_types][:granularities].include?(granularity)
+          unless self.data[:metric_collection_types][:granularities].include?(granularity)
             Fog::AWS::AutoScaling::ValidationError.new('Valid metrics granularity type is: [1Minute].')
           end
 

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

@@ -6,15 +6,16 @@ module Fog
 
         require 'fog/aws/parsers/auto_scaling/put_notification_configuration'
 
-        # Creates a notification configuration for an Auto Scaling group. To update an
-        # existing policy, overwrite the existing notification configuration name 
-        # and set the parameter(s) you want to change. 
+        # Creates a notification configuration for an Auto Scaling group. To
+        # update an existing policy, overwrite the existing notification
+        # configuration name  and set the parameter(s) you want to change.
         #
         # ==== Parameters
-        # * auto_scaling_group_name<~String> - The name of the Auto Scaling group.
-        # * notification_types<~Array> - The type of events that will trigger the 
-        #   notification.
-        # * topic_arn<~String> - The Amazon Resource Name (ARN) of the Amazon 
+        # * auto_scaling_group_name<~String> - The name of the Auto Scaling
+        #   group.
+        # * notification_types<~Array> - The type of events that will trigger
+        #   the notification.
+        # * topic_arn<~String> - The Amazon Resource Name (ARN) of the Amazon
         #   Simple Notification Service (SNS) topic.
         # ==== Returns
         # * response<~Excon::Response>:
@@ -26,14 +27,13 @@ module Fog
         # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_PutNotificationConfiguration.html
         #
         def put_notification_configuration(auto_scaling_group_name, notification_types, topic_arn)
-          options = {}
-          options.merge!(AWS.indexed_param('NotificationTypes.member.%d', [*notification_types]))
+          params = AWS.indexed_param('NotificationTypes.member.%d', [*notification_types])
           request({
             'Action'               => 'PutNotificationConfiguration',
             'AutoScalingGroupName' => auto_scaling_group_name,
             'TopicARN'             => topic_arn,
             :parser                => Fog::Parsers::AWS::AutoScaling::PutNotificationConfiguration.new
-          }.merge!(options))
+          }.merge!(params))
         end
 
       end
@@ -41,7 +41,26 @@ module Fog
       class Mock
 
         def put_notification_configuration(auto_scaling_group_name, notification_types, topic_arn)
-          Fog::Mock.not_implemented
+          unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new("AutoScalingGroup name not found - #{auto_scaling_group_name}")
+          end
+          if notification_types.to_a.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("1 validation error detected: Value null at 'notificationTypes' failed to satisfy constraint: Member must not be null")
+          end
+          invalid_types = notification_types.to_a - self.data[:notification_types]
+          unless invalid_types.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("&quot;#{invalid_types.first}&quot; is not a valid Notification Type.")
+          end
+
+          self.data[:notification_configurations][auto_scaling_group_name] ||= {}
+          self.data[:notification_configurations][auto_scaling_group_name][topic_arn] = notification_types.to_a.uniq
+
+          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/put_scaling_policy.rb

@@ -46,7 +46,7 @@ module Fog
             'AdjustmentType'       => adjustment_type,
             'AutoScalingGroupName' => auto_scaling_group_name,
             'PolicyName'           => policy_name,
-            'ScalingAdjustment'     => scaling_adjustment,
+            'ScalingAdjustment'    => scaling_adjustment,
             :parser                => Fog::Parsers::AWS::AutoScaling::PutScalingPolicy.new
           }.merge!(options))
         end
@@ -56,16 +56,16 @@ module Fog
       class Mock
 
         def put_scaling_policy(adjustment_type, auto_scaling_group_name, policy_name, scaling_adjustment, options = {})
-          unless data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+          unless self.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] = {
+          self.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}",
+            'PolicyARN'            => Fog::AWS::Mock.arn('autoscaling', self.data[:owner_id], "scalingPolicy:00000000-0000-0000-0000-000000000000:autoScalingGroupName/#{auto_scaling_group_name}:policyName/#{policy_name}", self.region),
             'PolicyName'           => policy_name,
             'ScalingAdjustment'    => scaling_adjustment
           }.merge!(options)

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

@@ -14,7 +14,8 @@ module Fog
         # * auto_scaling_group_name<~String> - The name or ARN of the Auto
         #   Scaling Group.
         # * scheduled_action_name<~String> - Name of this scaling action.
-        # * time<~Datetime> - The time for this action to start (deprecated use StartTime EndTime and Recurrence)
+        # * time<~Datetime> - The time for this action to start (deprecated:
+        #   use StartTime, EndTime and Recurrence).
         # * options<~Hash>:
         #   * 'DesiredCapacity'<~Integer> - The number of EC2 instances that
         #     should be running in this group.
@@ -23,9 +24,11 @@ module Fog
         #     group.
         #   * 'MinSize'<~Integer> - The minimum size for the Auto Scaling
         #     group.
-        #   * 'Recurrence'<~String> - The time when recurring future actions will start. Start time is specified 
-        #     by the user following the Unix cron syntax format. When StartTime and EndTime are specified with 
-        #     Recurrence, they form the boundaries of when the recurring action will start and stop.
+        #   * 'Recurrence'<~String> - The time when recurring future actions
+        #     will start. Start time is specified by the user following the
+        #     Unix cron syntax format. When StartTime and EndTime are specified
+        #     with Recurrence, they form the boundaries of when the recurring
+        #     action will start and stop.
         #   * 'StartTime'<~DateTime> - The time for this action to start
         #
         # ==== Returns
@@ -38,7 +41,7 @@ module Fog
         # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_PutScheduledUpdateGroupAction.html
         #
         def put_scheduled_update_group_action(auto_scaling_group_name, scheduled_action_name, time=nil, options = {})
-          # The 'Time' paramenter is now an alias for StartTime and needs to be identical if specified.  
+          # The 'Time' paramenter is now an alias for StartTime and needs to be identical if specified.
           time = options['StartTime'].nil? ? time : options['StartTime']
           if !time.nil?
             time = time.class == Time ? time.utc.iso8601 : Time.parse(time).utc.iso8601

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

@@ -67,10 +67,10 @@ module Fog
       class Mock
 
         def set_desired_capacity(auto_scaling_group_name, desired_capacity, options = {})
-          unless data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+          unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
             Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
           end
-          data[:auto_scaling_groups][auto_scaling_group_name]['DesiredCapacity'] = desired_capacity
+          self.data[:auto_scaling_groups][auto_scaling_group_name]['DesiredCapacity'] = desired_capacity
 
           response = Excon::Response.new
           response.status = 200

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

@@ -41,8 +41,8 @@ module Fog
       class Mock
 
         def set_instance_health(health_status, instance_id, options = {})
-          unless data[:health_states].include?(health_status)
-            raise Fog::AWS::AutoScaling::ValidationError.new('Valid instance health states are: [#{data[:health_states].join(", ")}].')
+          unless self.data[:health_states].include?(health_status)
+            raise Fog::AWS::AutoScaling::ValidationError.new('Valid instance health states are: [#{self.data[:health_states].join(", ")}].')
           end
 
           Fog::Mock.not_implemented

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

@@ -43,7 +43,7 @@ module Fog
       class Mock
 
         def suspend_processes(auto_scaling_group_name, options = {})
-          unless data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+          unless self.data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
             raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
           end
 

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

@@ -17,22 +17,31 @@ module Fog
         # * auto_scaling_group_name<~String> - The name of the Auto Scaling
         #   group.
         # * options<~Hash>:
-        #   * 'AvailabilityZones'<~Array>: Availability zones for the group
-        #   * 'DefaultCooldown'<~Integer> - Amount of time, in seconds, after a
-        #     scaling activity completes before any further trigger-related
-        #     scaling activities can start
-        #   * 'DesiredCapacity'<~Integer> - Desired capacity for the scaling group
-        #   * 'HealthCheckGracePeriod'<~Integer> - Length of time that Auto
-        #      Scaling waits before checking an instance's health status
-        #   * 'HealthCheckType'<~String> - Service of interest for the health
-        #     status check, either "EC2" or "ELB".
-        #   * 'LaunchConfigurationName'<~String> - Name of the launch configuration
-        #   * 'MaxSize'<~Integer> - Maximum size of the Auto Scaling group
-        #   * 'MinSize'<~Integer> - Minimum size of the Auto Scaling group
-        #   * 'PlacementGroup'<~String> - Name of the cluster placement group,
-        #     if applicable
-        #   * 'VPCZoneIdentifier'<~String> - Identifier for the VPC connection,
-        #     if applicable
+        #   * 'AvailabilityZones'<~Array> - Availability zones for the group.
+        #   * 'DefaultCooldown'<~Integer> - The amount of time, in seconds,
+        #     after a scaling activity completes before any further trigger-
+        #     related scaling activities can start
+        #   * 'DesiredCapacity'<~Integer> - The desired capacity for the Auto
+        #     Scaling group.
+        #   * 'HealthCheckGracePeriod'<~Integer> - The length of time that Auto
+        #      Scaling waits before checking an instance's health status.The
+        #      grace period begins when an instance comes into service.
+        #   * 'HealthCheckType'<~String> - The service of interest for the
+        #     health status check, either "EC2" for Amazon EC2 or "ELB" for
+        #     Elastic Load Balancing.
+        #   * 'LaunchConfigurationName'<~String> - The name of the launch
+        #     configuration.
+        #   * 'MaxSize'<~Integer> - The maximum size of the Auto Scaling group.
+        #   * 'MinSize'<~Integer> - The minimum size of the Auto Scaling group.
+        #   * 'PlacementGroup'<~String> - The name of the cluster placement
+        #     group, if applicable.
+        #   * 'TerminationPolicies'<~Array> - A standalone termination policy
+        #     or a list of termination policies used to select the instance to
+        #     terminate. The policies are executed in the order that they are
+        #     listed.
+        #   * 'VPCZoneIdentifier'<~String> - The subnet identifier for the
+        #     Amazon VPC connection, if applicable. You can specify several
+        #     subnets in a comma-separated list.
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -47,6 +56,9 @@ module Fog
           if availability_zones = options.delete('AvailabilityZones')
             options.merge!(AWS.indexed_param('AvailabilityZones.member.%d', [*availability_zones]))
           end
+          if termination_policies = options.delete('TerminationPolicies')
+            options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
+          end
           request({
             'Action'               => 'UpdateAutoScalingGroup',
             'AutoScalingGroupName' => auto_scaling_group_name,
@@ -59,10 +71,10 @@ module Fog
       class Mock
 
         def update_auto_scaling_group(auto_scaling_group_name, options = {})
-          unless data[:auto_scaling_groups].has_key?(auto_scaling_group_name)
+          unless self.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_groups][auto_scaling_group_name].merge!(options)
+          self.data[:auto_scaling_groups][auto_scaling_group_name].merge!(options)
 
           response = Excon::Response.new
           response.status = 200

data/lib/fog/aws/requests/cdn/delete_distribution.rb

@@ -23,6 +23,37 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def delete_distribution(distribution_id, etag)
+          distribution = self.data[:distributions][distribution_id]
+
+          if distribution
+            if distribution['ETag'] != etag
+              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+            end
+            unless distribution['DistributionConfig']['CallerReference']
+              Fog::CDN::AWS::Mock.error(:illegal_update)
+            end
+            if distribution['DistributionConfig']['Enabled']
+              Fog::CDN::AWS::Mock.error(:distribution_not_disabled)
+            end
+
+            self.data[:distributions].delete(distribution_id)
+            self.data[:invalidations].delete(distribution_id)
+
+            response = Excon::Response.new
+            response.status = 204
+            response.body = "x-amz-request-id: #{Fog::AWS::Mock.request_id}"
+            response
+          else
+            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+          end
+        end
+
+      end
+
     end
   end
 end

data/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb

@@ -23,6 +23,36 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def delete_streaming_distribution(distribution_id, etag)
+          distribution = self.data[:streaming_distributions][distribution_id]
+
+          if distribution
+            if distribution['ETag'] != etag
+              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+            end
+            unless distribution['StreamingDistributionConfig']['CallerReference']
+              Fog::CDN::AWS::Mock.error(:illegal_update)
+            end
+            if distribution['StreamingDistributionConfig']['Enabled']
+              Fog::CDN::AWS::Mock.error(:distribution_not_disabled)
+            end
+
+            self.data[:streaming_distributions].delete(distribution_id)
+
+            response = Excon::Response.new
+            response.status = 204
+            response.body = "x-amz-request-id: #{Fog::AWS::Mock.request_id}"
+            response
+          else
+            Fog::CDN::AWS::Mock.error(:no_such_streaming_distribution)
+          end
+        end
+
+      end
+
     end
   end
 end

data/lib/fog/aws/requests/cdn/get_distribution.rb

@@ -52,6 +52,34 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def get_distribution(distribution_id)
+          response = Excon::Response.new
+
+          distribution = self.data[:distributions][distribution_id]
+          unless distribution
+            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+          end
+
+          if distribution['Status'] == 'InProgress' && (Time.now - Time.parse(distribution['LastModifiedTime']) >= Fog::Mock.delay * 2)
+            distribution['Status'] = 'Deployed'
+          end
+
+          etag = Fog::CDN::AWS::Mock.generic_id
+          response.status = 200
+          response.body = {
+            'InProgressInvalidationBatches' => 0,
+          }.merge(distribution.reject { |k,v| k == 'ETag' })
+
+          response.headers['ETag'] = etag
+          distribution['ETag'] = etag
+
+          response
+        end
+      end
+
     end
   end
 end

data/lib/fog/aws/requests/cdn/get_distribution_list.rb

@@ -54,6 +54,35 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def get_distribution_list(options = {})
+          response = Excon::Response.new
+          response.status = 200
+
+          distributions = self.data[:distributions].values
+
+          response.body = {
+            'Marker' => Fog::Mock.random_hex(16),
+            'IsTruncated' => false,
+            'MaxItems' => 100,
+            'DistributionSummary' => distributions.map { |d| to_distribution_summary(d) }
+          }
+
+          response
+        end
+
+        private
+
+        def to_distribution_summary(d)
+          {
+            'DomainName' => d['DomainName'],
+            'Id' => d['Id'],
+            'LastModifiedTime' => d['LastModifiedTime']
+          }.merge(d['DistributionConfig'])
+        end
+      end
     end
   end
 end