fog 1.6.0 → 1.7.0

data/tests/aws/models/cdn/invalidation_tests.rb

@@ -0,0 +1,32 @@
+Shindo.tests("Fog::CDN[:aws] | invalidation", ['aws', 'cdn']) do
+
+  tests("distributions#create").succeeds do
+    @distribution = Fog::CDN[:aws].distributions.create(:s3_origin => {'DNSName' => 'fog_test.s3.amazonaws.com'}, :enabled => true)
+  end
+
+  params = { :paths => [ '/index.html', '/path/to/index.html' ] }
+
+  model_tests(@distribution.invalidations, params, true) do
+
+    tests("#id") do
+      returns(true) { @instance.identity != nil }
+    end
+
+    tests("#paths") do
+      returns([ '/index.html', '/path/to/index.html' ].sort) { @instance.paths.sort }
+    end
+
+    tests("#ready? - may take 15 minutes to complete...").succeeds do
+      @instance.wait_for { ready? }
+    end
+  end
+
+  tests("distribution#destroy - may take around 15/20 minutes to complete...").succeeds do
+    @distribution.wait_for { ready? }
+    @distribution.disable
+    @distribution.wait_for { ready? }
+    @distribution.destroy
+  end
+
+end
+

data/tests/aws/models/cdn/invalidations_tests.rb

@@ -0,0 +1,15 @@
+Shindo.tests("Fog::CDN[:aws] | invalidations", ['aws', 'cdn']) do
+  tests("distributions#create").succeeds do
+    @distribution = Fog::CDN[:aws].distributions.create(:s3_origin => {'DNSName' => 'fog_test.s3.amazonaws.com'}, :enabled => true)
+  end
+
+  collection_tests(@distribution.invalidations, { :paths => [ '/index.html' ]}, true)
+
+  tests("distribution#destroy - may take 15/20 minutes to complete").succeeds do
+    @distribution.wait_for { ready? }
+    @distribution.disable
+    @distribution.wait_for { ready? }
+    @distribution.destroy
+  end
+end
+

data/tests/aws/models/cdn/streaming_distribution_tests.rb

@@ -0,0 +1,15 @@
+Shindo.tests("Fog::CDN[:aws] | streaming_distribution", ['aws', 'cdn']) do
+  params = { :s3_origin => { 'DNSName' => 'fog_test_cdn.s3.amazonaws.com'}, :enabled => true }
+  model_tests(Fog::CDN[:aws].streaming_distributions, params, true) do
+    # distribution needs to be ready before being disabled
+    tests("#ready? - may take 15 minutes to complete...").succeeds do
+      @instance.wait_for { ready? }
+    end
+
+    # and disabled before being distroyed
+    tests("#disable - may take 15 minutes to complete...").succeeds do
+      @instance.disable
+      @instance.wait_for { ready? }
+    end
+  end
+end

data/tests/aws/models/cdn/streaming_distributions_tests.rb

@@ -0,0 +1,15 @@
+Shindo.tests("Fog::CDN[:aws] | streaming_distributions", ['aws', 'cdn']) do
+  params = { :s3_origin => { 'DNSName' => 'fog_test_cdn.s3.amazonaws.com'}, :enabled => true}
+  collection_tests(Fog::CDN[:aws].streaming_distributions, params, true) do
+    # distribution needs to be ready before being disabled
+    tests("#ready? - may take 15 minutes to complete...").succeeds do
+      @instance.wait_for { ready? }
+    end
+
+    # and disabled before being distroyed
+    tests("#disable - may take 15 minutes to complete...").succeeds do
+      @instance.disable
+      @instance.wait_for { ready? }
+    end
+  end
+end

data/tests/aws/models/rds/tagging_tests.rb

@@ -0,0 +1,20 @@
+Shindo.tests("AWS::RDS | tagging", ['aws', 'rds']) do
+
+  @server = Fog::AWS[:rds].servers.create(rds_default_server_params)
+  Formatador.display_line "Creating RDS instance #{@server.id}"
+  Formatador.display_line "Waiting for instance #{@server.id} to be ready"
+  @server.wait_for { ready? }
+
+  tags1 = {'key1' => 'val1'}
+  tags2 = {'key2' => 'val2'}
+
+  tests "add and remove tags from a running RDS model" do
+    returns({})                 { @server.tags }
+    returns(tags1)              { @server.add_tags tags1 }
+    returns(tags1.merge tags2)  { @server.add_tags tags2 }
+    returns(tags2)              { @server.remove_tags tags1.keys  }
+    returns(tags2)              { @server.tags }
+  end
+
+  @server.destroy
+end

data/tests/aws/requests/auto_scaling/auto_scaling_tests.rb

@@ -3,16 +3,6 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
   @lc_name = 'fog-test-lc'
 
   tests('success') do
-    tests("#describe_adjustment_types").formats(AWS::AutoScaling::Formats::DESCRIBE_ADJUSTMENT_TYPES) do
-      Fog::AWS[:auto_scaling].describe_adjustment_types.body
-    end
-    tests("#describe_metric_collection_types").formats(AWS::AutoScaling::Formats::DESCRIBE_METRIC_COLLECTION_TYPES) do
-      Fog::AWS[:auto_scaling].describe_metric_collection_types.body
-    end
-    tests("#describe_scaling_process_types").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_PROCESS_TYPES) do
-      Fog::AWS[:auto_scaling].describe_scaling_process_types.body
-    end
-
     tests("#create_launch_configuration").formats(AWS::AutoScaling::Formats::BASIC) do
       image_id = 'ami-8c1fece5'
       instance_type = 't1.micro'
@@ -73,7 +63,7 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
       Fog::AWS[:auto_scaling].set_desired_capacity(@asg_name, desired_capacity).body
     end
     tests("#delete_auto_scaling_group").formats(AWS::AutoScaling::Formats::BASIC) do
-      Fog::AWS[:auto_scaling].delete_auto_scaling_group(@asg_name).body
+      Fog::AWS[:auto_scaling].delete_auto_scaling_group(@asg_name, 'ForceDelete' => true).body
     end
 
     tests("#delete_auto_scaling_group that does not exists").raises(Fog::AWS::AutoScaling::ValidationError) do

data/tests/aws/requests/auto_scaling/describe_types_tests.rb

@@ -0,0 +1,102 @@
+Shindo.tests('AWS::AutoScaling | describe types requests', ['aws', 'auto_scaling']) do
+
+  tests('success') do
+
+    tests("#describe_adjustment_types").formats(AWS::AutoScaling::Formats::DESCRIBE_ADJUSTMENT_TYPES) do
+      body = Fog::AWS[:auto_scaling].describe_adjustment_types.body
+
+      [ 'ChangeInCapacity',
+        'ExactCapacity',
+        'PercentChangeInCapacity'
+      ].each do |v|
+        returns(true, "AdjustmentTypes contains #{v}") do
+          body['DescribeAdjustmentTypesResult']['AdjustmentTypes'].any? {|t| t['AdjustmentType'] == v}
+        end
+      end
+
+      body
+    end
+
+    tests("#describe_auto_scaling_notification_types").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_NOTIFICATION_TYPES) do
+      body = Fog::AWS[:auto_scaling].describe_auto_scaling_notification_types.body
+
+      [ 'autoscaling:EC2_INSTANCE_LAUNCH',
+        'autoscaling:EC2_INSTANCE_LAUNCH_ERROR',
+        'autoscaling:EC2_INSTANCE_TERMINATE',
+        'autoscaling:EC2_INSTANCE_TERMINATE_ERROR',
+        'autoscaling:TEST_NOTIFICATION'
+      ].each do |v|
+        returns(true, "AutoScalingNotificationTypes contains #{v}") do
+          body['DescribeAutoScalingNotificationTypesResult']['AutoScalingNotificationTypes'].include?(v)
+        end
+      end
+
+      body
+    end
+
+    tests("#describe_metric_collection_types").formats(AWS::AutoScaling::Formats::DESCRIBE_METRIC_COLLECTION_TYPES) do
+      body = Fog::AWS[:auto_scaling].describe_metric_collection_types.body
+
+      [ 'GroupDesiredCapacity',
+        'GroupInServiceInstances',
+        'GroupMaxSize',
+        'GroupMinSize',
+        'GroupPendingInstances',
+        'GroupTerminatingInstances',
+        'GroupTotalInstances'
+      ].each do |v|
+        returns(true, "Metrics contains #{v}") do
+          body['DescribeMetricCollectionTypesResult']['Metrics'].any? {|t| t['Metric'] == v}
+        end
+      end
+
+      [ '1Minute'
+      ].each do |v|
+        returns(true, "Granularities contains #{v}") do
+          body['DescribeMetricCollectionTypesResult']['Granularities'].any? {|t| t['Granularity'] == v}
+        end
+      end
+
+      body
+    end
+
+    tests("#describe_scaling_process_types").formats(AWS::AutoScaling::Formats::DESCRIBE_SCALING_PROCESS_TYPES) do
+      body = Fog::AWS[:auto_scaling].describe_scaling_process_types.body
+
+      [ 'AZRebalance',
+        'AddToLoadBalancer',
+        'AlarmNotification',
+        'HealthCheck',
+        'Launch',
+        'ReplaceUnhealthy',
+        'ScheduledActions',
+        'Terminate'
+      ].each do |v|
+        returns(true, "Processes contains #{v}") do
+          body['DescribeScalingProcessTypesResult']['Processes'].any? {|t| t['ProcessName'] == v}
+        end
+      end
+
+      body
+    end
+
+    tests("#describe_termination_policy_types").formats(AWS::AutoScaling::Formats::DESCRIBE_TERMINATION_POLICY_TYPES) do
+      body = Fog::AWS[:auto_scaling].describe_termination_policy_types.body
+
+      [ 'ClosestToNextInstanceHour',
+        'Default',
+        'NewestInstance',
+        'OldestInstance',
+        'OldestLaunchConfiguration'
+      ].each do |v|
+        returns(true, "TerminationPolicyTypes contains #{v}") do
+          body['DescribeTerminationPolicyTypesResult']['TerminationPolicyTypes'].include?(v)
+        end
+      end
+
+      body
+    end
+
+  end
+
+end

data/tests/aws/requests/auto_scaling/helper.rb

@@ -46,14 +46,22 @@ class AWS
         'LifecycleState' => String
       }
 
+      NOTIFICATION_CONFIGURATION = {
+        'AutoScalingGroupName' => String,
+        'NotificationType' => String,
+        'TopicARN' => String
+      }
+
       SCHEDULED_UPDATE_GROUP_ACTION = {
         'AutoScalingGroupName' => String,
         'DesiredCapacity' => Integer,
+        'EndTime' => Time,
         'MaxSize' => Integer,
         'MinSize' => Integer,
+        'Recurrence' => String,
         'ScheduledActionARN' => String,
         'ScheduledActionName' => String,
-        'Time' => Time
+        'StartTime' => Time,
       }
 
       PROCESS_TYPE = {
@@ -64,6 +72,14 @@ class AWS
         'SuspensionReason' => String
       })
 
+      TAG_DESCRIPTION = {
+        'Key' => String,
+        'PropagateAtLaunch' => Fog::Boolean,
+        'ResourceId' => String,
+        'ResourceType' => String,
+        'Value' => Fog::Nullable::String
+      }
+
       AUTO_SCALING_GROUP = {
         'AutoScalingGroupARN' => String,
         'AutoScalingGroupName' => String,
@@ -80,9 +96,11 @@ class AWS
         'MaxSize' => Integer,
         'MinSize' => Integer,
         'PlacementGroup' => Fog::Nullable::String,
+        'Status' => Fog::Nullable::String,
         'SuspendedProcesses' => [SUSPENDED_PROCESS],
-        'VPCZoneIdentifier' => Fog::Nullable::String,
-        'TerminationPolicies' => [String]
+        'Tags' => [TAG_DESCRIPTION],
+        'TerminationPolicies' => [String],
+        'VPCZoneIdentifier' => Fog::Nullable::String
       }
 
       AUTO_SCALING_INSTANCE_DETAILS = INSTANCE.merge({
@@ -100,6 +118,7 @@ class AWS
         'LaunchConfigurationARN' => String,
         'LaunchConfigurationName' => String,
         'RamdiskId' => Fog::Nullable::String,
+        'SpotPrice' => Fog::Nullable::String,
         'SecurityGroups' => Array,
         'UserData' => Fog::Nullable::String
       }
@@ -109,6 +128,7 @@ class AWS
         'Alarms' => [ALARM],
         'AutoScalingGroupName' => String,
         'Cooldown' => Integer,
+        'MinAdjustmentStep' => Integer,
         'PolicyARN' => String,
         'PolicyName' => String,
         'ScalingAdjustment' => Integer
@@ -132,6 +152,12 @@ class AWS
         })
       })
 
+      DESCRIBE_AUTO_SCALING_NOTIFICATION_TYPES = BASIC.merge({
+        'DescribeAutoScalingNotificationTypesResult' => {
+          'AutoScalingNotificationTypes' => [String]
+        }
+      })
+
       DESCRIBE_LAUNCH_CONFIGURATIONS = BASIC.merge({
         'DescribeLaunchConfigurationsResult' => PAGINATED.merge({
           'LaunchConfigurations' => [LAUNCH_CONFIGURATION],
@@ -145,6 +171,12 @@ class AWS
         }
       })
 
+      DESCRIBE_NOTIFICATION_CONFIGURATIONS = BASIC.merge({
+        'DescribeNotificationConfigurationsResult' => PAGINATED.merge({
+          'NotificationConfigurations' => [NOTIFICATION_CONFIGURATION]
+        })
+      })
+
       DESCRIBE_POLICIES = BASIC.merge({
         'DescribePoliciesResult' => PAGINATED.merge({
           'ScalingPolicies' => [SCALING_POLICY]
@@ -169,6 +201,18 @@ class AWS
         })
       })
 
+      DESCRIBE_TAGS = BASIC.merge({
+        'DescribeTagsResult' => PAGINATED.merge({
+          'Tags' => [TAG_DESCRIPTION]
+        })
+      })
+
+      DESCRIBE_TERMINATION_POLICY_TYPES = BASIC.merge({
+        'DescribeTerminationPolicyTypesResult' => {
+          'TerminationPolicyTypes' => [String]
+        }
+      })
+
       PUT_SCALING_POLICY = BASIC.merge({
         'PutScalingPolicyResult' => {
           'PolicyARN' => String

data/tests/aws/requests/auto_scaling/notification_configuration_tests.rb

@@ -0,0 +1,123 @@
+Shindo.tests('AWS::AutoScaling | notification configuration requests', ['aws', 'auto_scaling']) do
+
+  image_id = {  # Ubuntu 12.04 LTS 64-bit EBS
+    'ap-northeast-1' => 'ami-60c77761',
+    'ap-southeast-1' => 'ami-a4ca8df6',
+    'eu-west-1'      => 'ami-e1e8d395',
+    'sa-east-1'      => 'ami-8cd80691',
+    'us-east-1'      => 'ami-a29943cb',
+    'us-west-1'      => 'ami-87712ac2',
+    'us-west-2'      => 'ami-20800c10'
+  }
+
+  now = Time.now.utc.to_i
+  lc_name = "fog-test-#{now}"
+  asg_name = "fog-test-#{now}"
+
+  topic_name = "fog-test-#{now}"
+  begin
+    topic = Fog::AWS[:sns].create_topic(topic_name).body
+    topic_arn = topic['TopicArn']
+  rescue Fog::Errors::MockNotImplemented
+    topic_arn = Fog::AWS::Mock.arn('sns', Fog::AWS[:auto_scaling].data[:owner_id], "fog-test-#{now}", Fog::AWS[:auto_scaling].region)
+  end
+
+  lc = Fog::AWS[:auto_scaling].create_launch_configuration(image_id[Fog::AWS[:auto_scaling].region], 't1.micro', lc_name)
+  asg = Fog::AWS[:auto_scaling].create_auto_scaling_group(asg_name, "#{Fog::AWS[:auto_scaling].region}a", lc_name, 0, 0)
+
+  tests('raises') do
+    tests("#put_notification_configuration(non-existent-group)").raises(Fog::AWS::AutoScaling::ValidationError) do
+      Fog::AWS[:auto_scaling].put_notification_configuration('fog-test-nonexistent-group', 'autoscaling:TEST_NOTIFICATION', topic_arn)
+    end
+
+    tests("#put_notification_configuration(null-types)").raises(Fog::AWS::AutoScaling::ValidationError) do
+      Fog::AWS[:auto_scaling].put_notification_configuration(asg_name, [], topic_arn)
+    end
+  end
+
+  tests('success') do
+    tests("#put_notification_configuration(string)").formats(AWS::AutoScaling::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:auto_scaling].put_notification_configuration(asg_name, 'autoscaling:TEST_NOTIFICATION', topic_arn).body
+    end
+
+    tests("#describe_notification_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:auto_scaling].describe_notification_configurations('AutoScalingGroupNames' => asg_name).body
+      notification_configurations = body['DescribeNotificationConfigurationsResult']['NotificationConfigurations']
+      returns(true, 'exactly 1 configurations') do
+        notification_configurations.size == 1
+      end
+      returns(true) do
+        config = notification_configurations.first
+        config['AutoScalingGroupName'] == asg_name && config['TopicARN'] == topic_arn && config['NotificationType'] == 'autoscaling:TEST_NOTIFICATION'
+      end
+      body
+    end
+
+    tests("#put_notification_configuration(array)").formats(AWS::AutoScaling::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:auto_scaling].put_notification_configuration(asg_name, ['autoscaling:EC2_INSTANCE_LAUNCH', 'autoscaling:EC2_INSTANCE_TERMINATE'], topic_arn).body
+    end
+
+    tests("#describe_notification_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:auto_scaling].describe_notification_configurations('AutoScalingGroupName' => asg_name).body
+      notification_configurations = body['DescribeNotificationConfigurationsResult']['NotificationConfigurations']
+      returns(true, 'exactly 2 configurations') do
+        notification_configurations.size == 2
+      end
+      [ 'autoscaling:EC2_INSTANCE_LAUNCH', 'autoscaling:EC2_INSTANCE_TERMINATE'].each do |type|
+        returns(true) do
+          notification_configurations.any? do |config|
+            config['AutoScalingGroupName'] == asg_name && config['TopicARN'] == topic_arn && config['NotificationType'] == type
+          end
+        end
+      end
+      body
+    end
+
+    tests("#describe_notification_configurations(all)").formats(AWS::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:auto_scaling].describe_notification_configurations().body
+      notification_configurations = body['DescribeNotificationConfigurationsResult']['NotificationConfigurations']
+      returns(true, 'at least 2 configurations') do
+        notification_configurations.size >= 2
+      end
+      [ 'autoscaling:EC2_INSTANCE_LAUNCH', 'autoscaling:EC2_INSTANCE_TERMINATE'].each do |type|
+        returns(true) do
+          notification_configurations.any? do |config|
+            config['AutoScalingGroupName'] == asg_name && config['TopicARN'] == topic_arn && config['NotificationType'] == type
+          end
+        end
+      end
+
+      body
+    end
+
+    tests("#delete_notification_configuration").formats(AWS::AutoScaling::Formats::BASIC) do
+      pending if Fog.mocking?
+      Fog::AWS[:auto_scaling].delete_notification_configuration(asg_name, topic_arn).body
+    end
+
+    tests("#describe_notification_configurations").formats(AWS::AutoScaling::Formats::DESCRIBE_NOTIFICATION_CONFIGURATIONS) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:auto_scaling].describe_notification_configurations('AutoScalingGroupNames' => asg_name).body
+      returns(true) do
+        body['DescribeNotificationConfigurationsResult']['NotificationConfigurations'].empty?
+      end
+      body
+    end
+  end
+
+  Fog::AWS[:auto_scaling].delete_auto_scaling_group(asg_name)
+  Fog::AWS[:auto_scaling].delete_launch_configuration(lc_name)
+
+  if topic
+    begin
+      Fog::AWS[:sns].delete_topic(topic_arn)
+    rescue Fog::Errors::MockNotImplemented
+    end
+  end
+
+end