fog 0.11.0 → 1.0.0

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

@@ -1,7 +1,7 @@
 Shindo.tests('AWS::IAM | access key requests', ['aws']) do
 
   unless Fog.mocking?
-    AWS[:iam].create_user('fog_access_key_tests')
+    Fog::AWS[:iam].create_user('fog_access_key_tests')
   end
 
   tests('success') do
@@ -18,7 +18,7 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
 
     tests("#create_access_key('UserName' => 'fog_access_key_tests')").formats(@access_key_format) do
       pending if Fog.mocking?
-      data = AWS[:iam].create_access_key('UserName' => 'fog_access_key_tests').body
+      data = Fog::AWS[:iam].create_access_key('UserName' => 'fog_access_key_tests').body
       @access_key_id = data['AccessKey']['AccessKeyId']
       data
     end
@@ -34,17 +34,17 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
 
     tests("#list_access_keys('Username' => 'fog_access_key_tests')").formats(@access_keys_format) do
       pending if Fog.mocking?
-      AWS[:iam].list_access_keys('UserName' => 'fog_access_key_tests').body
+      Fog::AWS[:iam].list_access_keys('UserName' => 'fog_access_key_tests').body
     end
 
     tests("#update_access_key('#{@access_key_id}', 'Inactive', 'UserName' => 'fog_access_key_tests')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].update_access_key(@access_key_id, 'Inactive', 'UserName' => 'fog_access_key_tests').body
+      Fog::AWS[:iam].update_access_key(@access_key_id, 'Inactive', 'UserName' => 'fog_access_key_tests').body
     end
 
     tests("#delete_access_key('#{@access_key_id}', 'UserName' => 'fog_access_key_tests)").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].delete_access_key(@access_key_id, 'UserName' => 'fog_access_key_tests').body
+      Fog::AWS[:iam].delete_access_key(@access_key_id, 'UserName' => 'fog_access_key_tests').body
     end
 
   end
@@ -54,7 +54,7 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
   end
 
   unless Fog.mocking?
-    AWS[:iam].delete_user('fog_access_key_tests')
+    Fog::AWS[:iam].delete_user('fog_access_key_tests')
   end
 
 end

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

@@ -1,7 +1,7 @@
 Shindo.tests('AWS::IAM | group policy requests', ['aws']) do
 
   unless Fog.mocking?
-    AWS[:iam].create_group('fog_group_policy_tests')
+    Fog::AWS[:iam].create_group('fog_group_policy_tests')
   end
 
   tests('success') do
@@ -10,7 +10,7 @@ Shindo.tests('AWS::IAM | group policy requests', ['aws']) do
 
     tests("#put_group_policy('fog_group_policy_tests', 'fog_policy', #{@policy.inspect})").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].put_group_policy('fog_group_policy_tests', 'fog_policy', @policy).body
+      Fog::AWS[:iam].put_group_policy('fog_group_policy_tests', 'fog_policy', @policy).body
     end
 
     @group_policies_format = {
@@ -21,12 +21,12 @@ Shindo.tests('AWS::IAM | group policy requests', ['aws']) do
 
     tests("list_group_policies('fog_group_policy_tests')").formats(@group_policies_format) do
       pending if Fog.mocking?
-      AWS[:iam].list_group_policies('fog_group_policy_tests').body
+      Fog::AWS[:iam].list_group_policies('fog_group_policy_tests').body
     end
 
     tests("#delete_group_policy('fog_group_policy_tests', 'fog_policy')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].delete_group_policy('fog_group_policy_tests', 'fog_policy').body
+      Fog::AWS[:iam].delete_group_policy('fog_group_policy_tests', 'fog_policy').body
     end
 
   end
@@ -36,7 +36,7 @@ Shindo.tests('AWS::IAM | group policy requests', ['aws']) do
   end
 
   unless Fog.mocking?
-    AWS[:iam].delete_group('fog_group_policy_tests')
+    Fog::AWS[:iam].delete_group('fog_group_policy_tests')
   end
 
 end

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

@@ -14,7 +14,7 @@ Shindo.tests('AWS::IAM | group requests', ['aws']) do
 
     tests("#create_group('fog_group')").formats(@group_format) do
       pending if Fog.mocking?
-      AWS[:iam].create_group('fog_group').body
+      Fog::AWS[:iam].create_group('fog_group').body
     end
 
     @groups_format = {
@@ -30,12 +30,12 @@ Shindo.tests('AWS::IAM | group requests', ['aws']) do
 
     tests("#list_groups").formats(@groups_format) do
       pending if Fog.mocking?
-      AWS[:iam].list_groups.body
+      Fog::AWS[:iam].list_groups.body
     end
 
     tests("#delete_group('fog_group')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].delete_group('fog_group').body
+      Fog::AWS[:iam].delete_group('fog_group').body
     end
 
   end

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

@@ -1,7 +1,7 @@
 Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
   unless Fog.mocking?
-    AWS[:iam].create_user('fog_user')    
+    Fog::AWS[:iam].create_user('fog_user')
   end
 
 
@@ -17,12 +17,12 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
     
     tests("#create_login_profile('fog_user')").formats(@login_profile_format) do
       pending if Fog.mocking?
-      AWS[:iam].create_login_profile('fog_user', 'somepassword').body
+      Fog::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
+      result = Fog::AWS[:iam].get_login_profile('fog_user').body
       returns('fog_user') {result['LoginProfile']['UserName']}
       result
     end
@@ -30,7 +30,7 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
     tests("#update_login_profile('fog_user')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
       begin
-        AWS[:iam].update_login_profile('fog_user', 'otherpassword').body
+        Fog::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
@@ -39,12 +39,12 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
     tests("#delete_login_profile('fog_user')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].delete_login_profile('fog_user').body
+      Fog::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')}
+      raises(Excon::Errors::NotFound) {Fog::AWS[:iam].get_login_profile('fog_user')}
     end
 
   end
@@ -52,13 +52,13 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
   tests('failure') do
     tests('get login profile for non existing user') do
       pending if Fog.mocking?
-      raises(Fog::AWS::IAM::NotFound) { AWS[:iam].get_login_profile('idontexist')}
-      raises(Fog::AWS::IAM::NotFound) { AWS[:iam].delete_login_profile('fog_user')}
+      raises(Fog::AWS::IAM::NotFound) { Fog::AWS[:iam].get_login_profile('idontexist')}
+      raises(Fog::AWS::IAM::NotFound) { Fog::AWS[:iam].delete_login_profile('fog_user')}
     end
   end
 
 
   unless Fog.mocking?
-    AWS[:iam].delete_user('fog_user')
+    Fog::AWS[:iam].delete_user('fog_user')
   end
 end

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

@@ -19,44 +19,52 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
     private_key_mismatch = AWS::IAM::SERVER_CERT_PRIVATE_KEY_MISMATCHED
 
     tests('empty public key').raises(Fog::AWS::IAM::ValidationError) do
-      AWS[:iam].upload_server_certificate('', private_key, @key_name)
+      Fog::AWS::IAM.new.upload_server_certificate('', private_key, @key_name)
     end
 
     tests('empty private key').raises(Fog::AWS::IAM::ValidationError) do
-      AWS[:iam].upload_server_certificate(public_key, '', @key_name)
+      Fog::AWS::IAM.new.upload_server_certificate(public_key, '', @key_name)
     end
 
     tests('invalid public key').raises(Fog::AWS::IAM::MalformedCertificate) do
-      AWS[:iam].upload_server_certificate('abcde', private_key, @key_name)
+      Fog::AWS::IAM.new.upload_server_certificate('abcde', private_key, @key_name)
     end
 
     tests('invalid private key').raises(Fog::AWS::IAM::MalformedCertificate) do
-      AWS[:iam].upload_server_certificate(public_key, 'abcde', @key_name)
+      Fog::AWS::IAM.new.upload_server_certificate(public_key, 'abcde', @key_name)
     end
 
     tests('mismatched private key').raises(Fog::AWS::IAM::KeyPairMismatch) do
-      AWS[:iam].upload_server_certificate(public_key, private_key_mismatch, @key_name)
+      Fog::AWS::IAM.new.upload_server_certificate(public_key, private_key_mismatch, @key_name)
     end
 
     tests('format').formats(@upload_format) do
-      AWS[:iam].upload_server_certificate(public_key, private_key, @key_name).body
+      Fog::AWS::IAM.new.upload_server_certificate(public_key, private_key, @key_name).body
     end
 
     tests('duplicate name').raises(Fog::AWS::IAM::EntityAlreadyExists) do
-      AWS[:iam].upload_server_certificate(public_key, private_key, @key_name)
+      Fog::AWS::IAM.new.upload_server_certificate(public_key, private_key, @key_name)
     end
   end
 
   tests('#get_server_certificate').formats(@upload_format) do
     tests('raises NotFound').raises(Fog::AWS::IAM::NotFound) do
-      AWS[:iam].get_server_certificate("#{@key_name}fake")
+      Fog::AWS::IAM.new.get_server_certificate("#{@key_name}fake")
     end
-    AWS[:iam].get_server_certificate(@key_name).body
+    Fog::AWS::IAM.new.get_server_certificate(@key_name).body
   end
 
   @list_format = { 'Certificates' => [@certificate_format] }
   tests('#list_server_certificates').formats(@list_format) do
-    result = AWS[:iam].list_server_certificates.body
+    result = Fog::AWS::IAM.new.list_server_certificates.body
+    tests('includes key name') do
+      returns(true) { result['Certificates'].any?{|c| c['ServerCertificateName'] == @key_name} }
+    end
+    result
+  end
+
+  tests("#list_server_certificates('path-prefix' => '/'").formats(@list_format) do
+    result = Fog::AWS::IAM.new.list_server_certificates('PathPrefix' => '/').body
     tests('includes key name') do
       returns(true) { result['Certificates'].any?{|c| c['ServerCertificateName'] == @key_name} }
     end
@@ -64,6 +72,6 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
   end
 
   tests('#delete_server_certificate').formats(AWS::IAM::Formats::BASIC) do
-    AWS[:iam].delete_server_certificate(@key_name).body
+    Fog::AWS::IAM.new.delete_server_certificate(@key_name).body
   end
 end

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

@@ -1,7 +1,7 @@
 Shindo.tests('AWS::IAM | user policy requests', ['aws']) do
 
   unless Fog.mocking?
-    AWS[:iam].create_user('fog_user_policy_tests')
+    Fog::AWS[:iam].create_user('fog_user_policy_tests')
   end
 
   tests('success') do
@@ -10,7 +10,7 @@ Shindo.tests('AWS::IAM | user policy requests', ['aws']) do
 
     tests("#put_user_policy('fog_user_policy_tests', 'fog_policy', #{@policy.inspect})").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].put_user_policy('fog_user_policy_tests', 'fog_policy', @policy).body
+      Fog::AWS[:iam].put_user_policy('fog_user_policy_tests', 'fog_policy', @policy).body
     end
 
     @user_policies_format = {
@@ -21,12 +21,12 @@ Shindo.tests('AWS::IAM | user policy requests', ['aws']) do
 
     tests("list_user_policies('fog_user_policy_tests')").formats(@user_policies_format) do
       pending if Fog.mocking?
-      AWS[:iam].list_user_policies('fog_user_policy_tests').body
+      Fog::AWS[:iam].list_user_policies('fog_user_policy_tests').body
     end
 
     tests("#delete_user_policy('fog_user_policy_tests', 'fog_policy')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].delete_user_policy('fog_user_policy_tests', 'fog_policy').body
+      Fog::AWS[:iam].delete_user_policy('fog_user_policy_tests', 'fog_policy').body
     end
 
   end
@@ -36,7 +36,7 @@ Shindo.tests('AWS::IAM | user policy requests', ['aws']) do
   end
 
   unless Fog.mocking?
-    AWS[:iam].delete_user('fog_user_policy_tests')
+    Fog::AWS[:iam].delete_user('fog_user_policy_tests')
   end
 
 end

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

@@ -1,7 +1,7 @@
 Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
   unless Fog.mocking?
-    AWS[:iam].create_group('fog_user_tests')
+    Fog::AWS[:iam].create_group('fog_user_tests')
   end
 
   tests('success') do
@@ -18,7 +18,7 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
     tests("#create_user('fog_user')").formats(@user_format) do
       pending if Fog.mocking?
-      AWS[:iam].create_user('fog_user').body
+      Fog::AWS[:iam].create_user('fog_user').body
     end
 
     @users_format = {
@@ -34,22 +34,22 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
     tests("#list_users").formats(@users_format) do
       pending if Fog.mocking?
-      AWS[:iam].list_users.body
+      Fog::AWS[:iam].list_users.body
     end
 
     tests("#add_user_to_group('fog_user_tests', 'fog_user')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].add_user_to_group('fog_user_tests', 'fog_user').body
+      Fog::AWS[:iam].add_user_to_group('fog_user_tests', 'fog_user').body
     end
 
     tests("#remove_user_from_group('fog_user_tests', 'fog_user')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].remove_user_from_group('fog_user_tests', 'fog_user').body
+      Fog::AWS[:iam].remove_user_from_group('fog_user_tests', 'fog_user').body
     end
 
     tests("#delete_user('fog_user')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:iam].delete_user('fog_user').body
+      Fog::AWS[:iam].delete_user('fog_user').body
     end
 
   end
@@ -59,7 +59,7 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
   end
 
   unless Fog.mocking?
-    AWS[:iam].delete_group('fog_user_tests')
+    Fog::AWS[:iam].delete_group('fog_user_tests')
   end
 
 end

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

@@ -13,7 +13,7 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) 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,
+      result = Fog::AWS[:rds].create_db_instance(@db_instance_id, 'AllocatedStorage' => 5,
                                             'DBInstanceClass' => 'db.m1.small',
                                             'Engine' => 'mysql',
                                             'EngineVersion' => '5.1.50',
@@ -27,15 +27,15 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
     end
 
     tests("#describe_db_instances").formats(AWS::RDS::Formats::DESCRIBE_DB_INSTANCES) do
-      AWS[:rds].describe_db_instances.body
+      Fog::AWS[:rds].describe_db_instances.body
     end
 
-    server = AWS[:rds].servers.get(@db_instance_id)
+    server = Fog::AWS[:rds].servers.get(@db_instance_id)
     server.wait_for {ready?}
 
     new_storage = 6
     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'=> new_storage).body
+      body = Fog::AWS[:rds].modify_db_instance(@db_instance_id, true, 'AllocatedStorage'=> new_storage).body
       tests 'pending storage' do
         instance = body['ModifyDBInstanceResult']['DBInstance']
         returns(new_storage){instance['PendingModifiedValues']['AllocatedStorage']}
@@ -52,7 +52,7 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
 
     tests("reboot db instance") do
       tests("#reboot").formats(AWS::RDS::Formats::REBOOT_DB_INSTANCE) do
-        AWS[:rds].reboot_db_instance(@db_instance_id).body
+        Fog::AWS[:rds].reboot_db_instance(@db_instance_id).body
       end
     end
 
@@ -60,22 +60,22 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
     server.reload.wait_for { state == 'available'}
 
     tests("#create_db_snapshot").formats(AWS::RDS::Formats::CREATE_DB_SNAPSHOT) do
-      body = AWS[:rds].create_db_snapshot(@db_instance_id, @db_snapshot_id).body
+      body = Fog::AWS[:rds].create_db_snapshot(@db_instance_id, @db_snapshot_id).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
+      body = Fog::AWS[:rds].describe_db_snapshots.body
     end
 
     server.reload.wait_for { state == 'available' }
 
     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
+      Fog::AWS[:rds].create_db_instance_read_replica(@db_replica_id, @db_instance_id).body
     end
 
-    replica = AWS[:rds].servers.get(@db_replica_id)
+    replica = Fog::AWS[:rds].servers.get(@db_replica_id)
     replica.wait_for {ready?}
 
     tests("replica source") do
@@ -89,25 +89,25 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
 
     tests("#delete_db_instance").formats(AWS::RDS::Formats::DELETE_DB_INSTANCE) do
       #server.wait_for { state == 'available'}
-      AWS[:rds].delete_db_instance(@db_replica_id, nil, true)
-      body = AWS[:rds].delete_db_instance(@db_instance_id, @db_final_snapshot_id).body
+      Fog::AWS[:rds].delete_db_instance(@db_replica_id, nil, true)
+      body = Fog::AWS[:rds].delete_db_instance(@db_instance_id, @db_final_snapshot_id).body
 
       tests "final snapshot" do
-        returns('creating'){AWS[:rds].describe_db_snapshots(:snapshot_id => @db_final_snapshot_id).body['DescribeDBSnapshotsResult']['DBSnapshots'].first['Status']}
+        returns('creating'){Fog::AWS[:rds].describe_db_snapshots(:snapshot_id => @db_final_snapshot_id).body['DescribeDBSnapshotsResult']['DBSnapshots'].first['Status']}
       end
       body
     end
 
     tests("#delete_db_snapshot").formats(AWS::RDS::Formats::DELETE_DB_SNAPSHOT) do
-      AWS[:rds].snapshots.get(@db_snapshot_id).wait_for { ready? }
-      AWS[:rds].delete_db_snapshot(@db_snapshot_id).body
+      Fog::AWS[:rds].snapshots.get(@db_snapshot_id).wait_for { ready? }
+      Fog::AWS[:rds].delete_db_snapshot(@db_snapshot_id).body
     end
 
     tests("snapshot.destroy") do
-      snapshot = AWS[:rds].snapshots.get(@db_final_snapshot_id)
+      snapshot = Fog::AWS[:rds].snapshots.get(@db_final_snapshot_id)
       snapshot.wait_for { ready? }
       snapshot.destroy
-      returns(nil) { AWS[:rds].snapshots.get(@db_final_snapshot_id) }
+      returns(nil) { Fog::AWS[:rds].snapshots.get(@db_final_snapshot_id) }
     end
 
   end
@@ -116,13 +116,13 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
     pending if Fog.mocking?
 
     tests "deleting nonexisting instance" do
-      raises(Fog::AWS::RDS::NotFound) {AWS[:rds].delete_db_instance('doesnexist', 'irrelevant')}
+      raises(Fog::AWS::RDS::NotFound) {Fog::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')}
+      raises(Fog::AWS::RDS::NotFound) {Fog::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}
+      raises(Fog::AWS::RDS::NotFound) { Fog::AWS[:rds].modify_db_instance 'doesntexit', true, 'AllocatedStorage'=> 10}
     end
   end
 end