fog 0.6.0 → 0.7.0

data/lib/fog/storage/requests/aws/put_object.rb

@@ -30,7 +30,7 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html
         #
         def put_object(bucket_name, object_name, data, options = {})
-          data = parse_data(data)
+          data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)
           request({
             :body       => data[:body],
@@ -56,7 +56,7 @@ module Fog
             @data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
           end
 
-          data = parse_data(data)
+          data = Fog::Storage.parse_data(data)
           unless data[:body].is_a?(String)
             data[:body] = data[:body].read
           end

data/lib/fog/storage/requests/aws/upload_part.rb

@@ -23,7 +23,7 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPart.html
         #
         def upload_part(bucket_name, object_name, upload_id, part_number, data, options = {})
-          data = parse_data(data)
+          data = Fog::Storage.parse_data(data)
           headers = options
           headers['Content-Length'] = data[:headers]['Content-Length']
           request({

data/lib/fog/storage/requests/google/put_object.rb

@@ -24,7 +24,7 @@ module Fog
         #   * headers<~Hash>:
         #     * 'ETag'<~String> - etag of new object
         def put_object(bucket_name, object_name, data, options = {})
-          data = parse_data(data)
+          data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)
           request({
             :body       => data[:body],
@@ -50,7 +50,7 @@ module Fog
             @data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
           end
 
-          data = parse_data(data)
+          data = Fog::Storage.parse_data(data)
           unless data[:body].is_a?(String)
             data[:body] = data[:body].read
           end

data/lib/fog/storage/requests/rackspace/put_object.rb

@@ -9,7 +9,7 @@ module Fog
         # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
         #
         def put_object(container, object, data, options = {})
-          data = parse_data(data)
+          data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)
           response = request(
             :body     => data[:body],

data/tests/aws/requests/cloud_formation/stack_tests.rb

@@ -0,0 +1,130 @@
+Shindo.tests('AWS::CloudFormation | stack requests', ['aws', 'cloudformation']) do
+
+  @validate_template_format = {
+    'Description' => String,
+    'Parameters'  => [
+      {
+        'DefaultValue'  => Fog::Nullable::String,
+        'Description'   => String,
+        'NoEcho'        => Fog::Boolean,
+        'ParameterKey'  => String,
+      }
+    ],
+    'RequestId'   => String
+  }
+
+  @create_stack_format = {
+    'RequestId' => String,
+    'StackId'   => String
+  }
+
+  @get_template_format = {
+    'RequestId'     => String,
+    'TemplateBody'  => String
+  }
+
+  @describe_stacks_format = {
+    'RequestId' => String,
+    'Stacks'    => [
+      {
+        'CreationTime'    => Time,
+        'DisableRollback' => Fog::Boolean,
+        'Outputs'         => [
+          {
+            'OutputKey'   => String,
+            'OutputValue' => String
+          }
+        ],
+        'Parameters'      => [
+          {
+            'ParameterKey'    => String,
+            'ParameterValue'  => String,
+          }
+        ],
+        'StackId'         => String,
+        'StackName'       => String,
+        'StackStatus'     => String,
+      }
+    ]
+  }
+
+  @describe_stack_events_format = {
+    'RequestId'   => String,
+    'StackEvents' => [
+      {
+        'EventId'               => String,
+        'LogicalResourceId'     => String,
+        'PhysicalResourceId'    => String,
+        'ResourceProperties'    => String,
+        'ResourceStatus'        => String,
+        'ResourceStatusReason'  => String,
+        'ResourceType'          => String,
+        'StackId'               => String,
+        'StackName'             => String,
+        'Timestamp'             => Time
+      }
+    ]
+  }
+
+  @describe_stack_resources_format = {
+    'RequestId'       => String,
+    'StackResources'  => [
+      {
+        'LogicalResourceId'     => String,
+        'PhysicalResourceId'    => String,
+        'ResourceStatus'        => String,
+        'ResourceType'          => String,
+        'StackId'               => String,
+        'StackName'             => String,
+        'Timestamp'             => Time
+      }
+    ]
+  }
+
+  tests('success') do
+
+    @stack_name = 'fogstack' << Time.now.to_i.to_s
+    @keypair = AWS[:compute].key_pairs.create(:name => 'cloudformation')
+    @template_url = 'https://s3.amazonaws.com/cloudformation-templates-us-east-1/EC2InstanceSample-1.0.0.template'
+
+    tests("validate_template('TemplateURL' => '#{@template_url}')").formats(@validate_template_format) do
+      AWS[:cloud_formation].validate_template('TemplateURL' => @template_url).body
+    end
+
+    tests("create_stack('#{@stack_name}', 'TemplateURL' => '#{@template_url}', Parameters => {'KeyName' => 'cloudformation'})").formats(@create_stack_format) do
+      AWS[:cloud_formation].create_stack(
+        @stack_name,
+        'TemplateURL' => @template_url,
+        'Parameters'  => {'KeyName' => 'cloudformation'}
+      ).body
+    end
+
+    tests("get_template('#{@stack_name})").formats(@get_template_format) do
+      AWS[:cloud_formation].get_template(@stack_name).body
+    end
+
+    tests("describe_stacks").formats(@describe_stacks_format) do
+      AWS[:cloud_formation].describe_stacks.body
+    end
+
+    tests("describe_stack_events('#{@stack_name}')").formats(@describe_stack_events_format) do
+      AWS[:cloud_formation].describe_stack_events(@stack_name).body
+    end
+
+    tests("describe_stack_resources('StackName' => '#{@stack_name}')").formats(@describe_stack_resources_format) do
+      AWS[:cloud_formation].describe_stack_resources('StackName' => @stack_name).body
+    end
+
+    tests("delete_stack('#{@stack_name}')").succeeds do
+      AWS[:cloud_formation].delete_stack(@stack_name)
+    end
+
+    @keypair.destroy
+
+  end
+
+  tests('failure') do
+
+  end
+
+end

data/tests/aws/requests/iam/login_profile_tests.rb

@@ -0,0 +1,64 @@
+Shindo.tests('AWS::IAM | user requests', ['aws']) do
+
+  unless Fog.mocking?
+    AWS[:iam].create_user('fog_user')    
+  end
+
+
+  tests('success') do
+    @login_profile_format = {
+      'LoginProfile' => {
+        'UserName'  => String,
+        'CreateDate'  => Time
+        
+      },
+      'RequestId' => String
+    }
+    
+    tests("#create_login_profile('fog_user')").formats(@login_profile_format) do
+      pending if Fog.mocking?
+      AWS[:iam].create_login_profile('fog_user', 'somepassword').body
+    end
+
+    tests("#get_login_profile('fog_user')").formats(@login_profile_format) do
+      pending if Fog.mocking?
+      result = AWS[:iam].get_login_profile('fog_user').body
+      returns('fog_user') {result['LoginProfile']['UserName']}
+      result
+    end
+
+    tests("#modify_login_profile('fog_user')").formats(AWS::IAM::Formats::BASIC) do
+      pending if Fog.mocking?
+      begin
+        AWS[:iam].update_login_profile('fog_user', 'otherpassword').body
+      rescue Excon::Errors::Conflict #profile cannot be updated or deleted until it has finished creating; api provides no way of telling whether creation process complete
+        sleep 5
+        retry
+      end
+    end
+
+    tests("#delete_login_profile('fog_user')").formats(AWS::IAM::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:iam].delete_login_profile('fog_user').body
+    end
+
+    tests("#get_login_profile('fog_user')") do
+      pending if Fog.mocking?
+      raises(Excon::Errors::NotFound) {AWS[:iam].get_login_profile('fog_user')}
+    end
+
+  end
+
+  tests('failure') do
+    tests('get login profile for non existing user') do
+      pending if Fog.mocking?
+      raises(Excon::Errors::NotFound) { AWS[:iam].get_login_profile('idontexist')}
+      raises(Excon::Errors::NotFound) { AWS[:iam].delete_login_profile('fog_user')}
+    end
+  end
+
+
+  unless Fog.mocking?
+    AWS[:iam].delete_user('fog_user')
+  end
+end

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

@@ -0,0 +1,169 @@
+class AWS
+
+  module RDS
+
+    module Formats
+
+      BASIC = {
+        'ResponseMetadata' => {'RequestId' => String}
+      }
+      
+      DB_PARAMETER_GROUP = {
+          'DBParameterGroupFamily' => String,
+          'DBParameterGroupName'=> String,
+          'Description'=> String
+      }
+      CREATE_DB_PARAMETER_GROUP = {
+        'ResponseMetadata' => {'RequestId' => String},
+        'CreateDBParameterGroupResult' => {          
+          'DBParameterGroup' => DB_PARAMETER_GROUP
+        }
+      }
+
+      DESCRIBE_DB_PARAMETER_GROUP = {
+        'ResponseMetadata' => {'RequestId' => String},
+        'DescribeDBParameterGroupsResult' =>{
+          'DBParameterGroups' => [DB_PARAMETER_GROUP]
+        }
+      }
+      
+      MODIFY_PARAMETER_GROUP = BASIC.merge({
+        'ModifyDBParameterGroupResult' => {
+          'DBParameterGroupName' => String
+        }
+      })
+      
+      DB_PARAMETER = {
+        'ParameterValue' => Fog::Nullable::String,
+        'DataType' => String,
+        'AllowedValues' => Fog::Nullable::String,
+        'Source' => String,
+        'IsModifiable' => Fog::Boolean,
+        'Description' => String,
+        'ParameterName' => String,
+        'ApplyType' => String,
+      }
+      DESCRIBE_DB_PARAMETERS = BASIC.merge({
+        'DescribeDBParametersResult' => {
+          'Marker' => Fog::Nullable::String,
+          'Parameters' => [DB_PARAMETER]
+        }
+      
+      })
+      
+      
+      SNAPSHOT={
+        'AllocatedStorage' => Integer,
+        'AvailabilityZone' => String,
+        'DBInstanceIdentifier' => String,
+        'DBSnapshotIdentifier' => String,
+        'EngineVersion' => String,
+        'Engine' => String,
+        'InstanceCreateTime' => Time,
+        'MasterUsername' => String,
+        'Port' => Integer,
+        'SnapshotCreateTime' => Fog::Nullable::Time,
+        'Status' => String
+      }
+      INSTANCE = {
+        'AllocatedStorage' => Integer,
+        'AutoMinorVersionUpgrade' => Fog::Boolean,
+        'AvailabilityZone' => Fog::Nullable::String,
+        'BackupRetentionPeriod' => Integer,
+        'DBInstanceClass' => String,
+        'DBInstanceIdentifier' => String,
+        'DBInstanceStatus' => String,
+        'DBName' => Fog::Nullable::String,
+        'DBParameterGroups' => [{
+            'ParameterApplyStatus' => String,
+            'DBParameterGroupName' => String
+          }],
+        'DBSecurityGroups' => [{
+            'Status' => String,
+            'DBSecurityGroupName' => String
+          }],
+        'Endpoint' => {
+          'Address' => Fog::Nullable::String,
+          'Port' => Fog::Nullable::Integer
+        },
+        'Engine' => String,
+        'EngineVersion' => String,
+        'InstanceCreateTime' => Fog::Nullable::Time,
+        'LatestRestorableTime' => Fog::Nullable::Time,
+        'MasterUsername' => String,
+        'MultiAZ' => Fog::Boolean,
+        'PendingModifiedValues' => {
+          'BackupRetentionPeriod' => Fog::Nullable::Integer,
+          'DBInstanceClass'       => Fog::Nullable::String,
+          'EngineVersion'         => Fog::Nullable::String,
+          'MasterUserPassword'    => Fog::Nullable::String,
+          'MultiAZ'               => Fog::Nullable::String,
+          'AllocatedStorage'      => Fog::Nullable::Integer,
+          'Port'                  => Fog::Nullable::Integer
+        },
+        'PreferredBackupWindow'=> String,
+        'PreferredMaintenanceWindow'=> String,
+        'ReadReplicaDBInstanceIdentifiers'=> [String],
+        'ReadReplicaSourceDBInstanceIdentifier'=> Fog::Nullable::String
+      }
+      
+      CREATE_DB_INSTANCE = BASIC.merge({
+        'CreateDBInstanceResult' => {
+          'DBInstance' => INSTANCE
+        }
+      })
+
+      DESCRIBE_DB_INSTANCES = BASIC.merge({
+        'DescribeDBInstancesResult' =>  {
+          'Marker' => Fog::Nullable::String,
+          'DBInstances' => [INSTANCE]
+        }
+      })
+
+      MODIFY_DB_INSTANCE = BASIC.merge({
+        'ModifyDBInstanceResult' => {
+          'DBInstance' => INSTANCE
+        }
+      })
+
+      DELETE_DB_INSTANCE = BASIC.merge({
+        'DeleteDBInstanceResult' => {
+          'DBInstance' => INSTANCE
+        }
+      })
+      
+      REBOOT_DB_INSTANCE = BASIC.merge({
+        'RebootDBInstanceResult' => {
+          'DBInstance' => INSTANCE
+        }
+      })
+      
+      CREATE_READ_REPLICA = BASIC.merge({
+        'CreateDBInstanceReadReplicaResult' => {
+          'DBInstance' => INSTANCE
+        }
+      })
+
+      CREATE_DB_SNAPSHOT = BASIC.merge({
+        'CreateDBSnapshotResult' => {
+          'DBSnapshot' => SNAPSHOT
+        }
+      })
+
+      DESCRIBE_DB_SNAPSHOTS = BASIC.merge({
+        'DescribeDBSnapshotsResult' => {
+          'Marker' => Fog::Nullable::String,
+          'DBSnapshots' => [SNAPSHOT]
+        }
+      })
+      DELETE_DB_SNAPSHOT = BASIC.merge({
+        'DeleteDBSnapshotResult' => {
+          'DBSnapshot' => SNAPSHOT
+        }
+      })
+
+    end
+
+  end
+
+end

data/tests/aws/requests/rds/instance_tests.rb

@@ -0,0 +1,129 @@
+Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
+  @db_instance_id='fog-test'
+  @db_replica_id='fog-replica'
+  
+  tests('success') do
+    pending if Fog.mocking?
+    
+    tests("#create_db_instance").formats(AWS::RDS::Formats::CREATE_DB_INSTANCE) do
+      result = AWS[:rds].create_db_instance(@db_instance_id, 'AllocatedStorage' => 5,
+                                                'DBInstanceClass' => 'db.m1.small',
+                                                'Engine' => 'mysql',
+                                                'EngineVersion' => '5.1.50',
+                                                'MasterUsername' => 'foguser',
+                                                'BackupRetentionPeriod' => 1,
+                                                'MasterUserPassword' => 'fogpassword').body
+    
+      instance = result['CreateDBInstanceResult']['DBInstance']
+      returns('creating'){ instance['DBInstanceStatus']}
+      result
+    end
+       
+    tests("#describe_db_instances").formats(AWS::RDS::Formats::DESCRIBE_DB_INSTANCES) do
+      AWS[:rds].describe_db_instances.body
+    end
+    
+    server = AWS[:rds].servers.get(@db_instance_id)
+    server.wait_for {ready?}
+    
+    
+    tests("#modify_db_instance with immediate apply").formats(AWS::RDS::Formats::MODIFY_DB_INSTANCE) do
+      body = AWS[:rds].modify_db_instance( @db_instance_id, true, 'AllocatedStorage'=> 10).body
+      tests 'pending storage' do
+        instance = body['ModifyDBInstanceResult']['DBInstance']
+        returns(10){instance['PendingModifiedValues']['AllocatedStorage']}
+      end
+      body      
+    end
+    server.wait_for { state == 'modifying'}
+    server.wait_for { state == 'available'}
+  
+    server.reload
+    tests 'new storage' do
+      returns(10){ server.allocated_storage}
+    end
+    
+    tests("reboot db instance") do
+      tests("#reboot").formats(AWS::RDS::Formats::REBOOT_DB_INSTANCE) do
+        AWS[:rds].reboot_db_instance( @db_instance_id).body
+      end
+
+      server.wait_for { state == 'rebooting'}
+      server.wait_for { state == 'available'}
+      server.reload
+    end
+    
+    
+    tests("#create_db_snapshot").formats(AWS::RDS::Formats::CREATE_DB_SNAPSHOT) do
+      body = AWS[:rds].create_db_snapshot(@db_instance_id, 'fog-snapshot').body
+      returns('creating'){ body['CreateDBSnapshotResult']['DBSnapshot']['Status']}
+      body
+    end
+    
+    tests("#describe_db_snapshots").formats(AWS::RDS::Formats::DESCRIBE_DB_SNAPSHOTS) do
+      body = AWS[:rds].describe_db_snapshots().body
+    end
+    
+    Fog.wait_for do
+      data = AWS[:rds].describe_db_snapshots(:snapshot_id => 'fog-snapshot')
+      status = data.body['DescribeDBSnapshotsResult']['DBSnapshots'].first['Status']
+      status =='available'
+    end
+    
+    tests( "#create read replica").formats(AWS::RDS::Formats::CREATE_READ_REPLICA) do
+      AWS[:rds].create_db_instance_read_replica(@db_replica_id, @db_instance_id).body
+    end
+    
+    replica = AWS[:rds].servers.get(@db_replica_id)
+    replica.wait_for {ready?}
+    
+    tests("replica source") do
+      returns(@db_instance_id){replica.read_replica_source}
+    end
+    server.reload
+    
+    tests("replica identifiers") do
+      returns([@db_replica_id]){server.read_replica_identifiers}
+    end
+    
+    tests("#delete_db_instance").formats(AWS::RDS::Formats::DELETE_DB_INSTANCE) do
+      AWS[:rds].delete_db_instance(@db_replica_id, nil, true)
+      body = AWS[:rds].delete_db_instance(@db_instance_id, 'fog-final-snapshot').body
+      Fog.wait_for do
+        AWS[:rds].servers.length == 0
+      end
+      
+      tests "final snapshot" do
+        returns('available'){AWS[:rds].describe_db_snapshots(:snapshot_id => 'fog-final-snapshot').body['DescribeDBSnapshotsResult']['DBSnapshots'].first['Status']}
+      end
+      body
+    end
+    
+    
+    
+    tests("#delete_db_snapshot").formats(AWS::RDS::Formats::DELETE_DB_SNAPSHOT) do
+      AWS[:rds].delete_db_snapshot('fog-snapshot').body
+    end
+    
+    AWS[:rds].delete_db_snapshot('fog-final-snapshot')
+    
+    returns([]){ AWS[:rds].describe_db_snapshots.body['DescribeDBSnapshotsResult']['DBSnapshots']}
+        
+  end
+  
+  tests('failure') do
+    pending if Fog.mocking?
+    
+    tests "deleting nonexisting instance" do
+      raises(Fog::AWS::RDS::NotFound) {AWS[:rds].delete_db_instance('doesnexist', 'irrelevant')}      
+    end
+    tests "deleting non existing snapshot" do
+      raises(Fog::AWS::RDS::NotFound) {AWS[:rds].delete_db_snapshot('doesntexist')}          
+    end
+    tests "modifying non existing instance" do
+      raises(Fog::AWS::RDS::NotFound) { AWS[:rds].modify_db_instance 'doesntexit', true, 'AllocatedStorage'=> 10}
+    end
+  end
+end
+  
+