brightbox-cli 0.16.0 → 0.17.0

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/emr/job_flow_tests.rb

@@ -0,0 +1,88 @@
+Shindo.tests('AWS::EMR | job flows', ['aws', 'emr']) do
+
+  pending if Fog.mocking?
+
+  @job_flow_name = "fog_job_flow_#{Time.now.to_f.to_s.gsub('.','')}"
+
+  @job_flow_options = {
+    'Instances' => {
+      'MasterInstanceType' => 'm1.small',
+      'SlaveInstanceType' => 'm1.small',
+      'InstanceCount' => 2,
+      'Placement' => {
+        'AvailabilityZone' => 'us-east-1a'
+      },
+      'KeepJobFlowAliveWhenNoSteps' => false,
+      'TerminationProtected' => false,
+      'HadoopVersion' => '0.20'
+    }
+  }
+
+  @step_name = "fog_job_flow_step_#{Time.now.to_f.to_s.gsub('.','')}"
+
+  @job_flow_steps = {
+    'Steps' => [{
+      'Name' => @step_name,
+      'ActionOnFailure' => 'CONTINUE',
+      'HadoopJarStep' => {
+        'Jar' => 'FakeJar',
+        'MainClass' => 'FakeMainClass',
+        'Args' => ['arg1', 'arg2']
+      }
+    }]
+  }
+
+  @job_flow_id = nil
+
+  tests('success') do
+
+    tests("#run_job_flow").formats(AWS::EMR::Formats::RUN_JOB_FLOW) do
+      pending if Fog.mocking?
+
+      result = AWS[:emr].run_job_flow(@job_flow_name, @job_flow_options).body
+      @job_flow_id = result['JobFlowId']
+
+      result
+    end
+
+    tests("#add_job_flow_steps").formats(AWS::EMR::Formats::BASIC) do
+      pending if Fog.mocking?
+
+      result = AWS[:emr].add_job_flow_steps(@job_flow_id, @job_flow_steps).body
+
+      result
+    end
+
+    tests("#set_termination_protection").formats(AWS::EMR::Formats::BASIC) do
+
+      result = AWS[:emr].set_termination_protection(true, 'JobFlowIds' => [@job_flow_id]).body
+
+      test("protected?") do
+        res = AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body
+        jf = res['JobFlows'].first
+
+        jf['Instances']['TerminationProtected'] == 'true'
+      end
+
+      result
+    end
+
+    tests("#terminate_job_flow").formats(AWS::EMR::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:emr].set_termination_protection(false, 'JobFlowIds' => [@job_flow_id])
+
+      result = AWS[:emr].terminate_job_flows('JobFlowIds' => [@job_flow_id]).body
+
+      result
+    end
+
+    tests("#describe_job_flows").formats(AWS::EMR::Formats::SIMPLE_DESCRIBE_JOB_FLOW) do
+      pending if Fog.mocking?
+
+      result = AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body
+
+      result
+    end
+
+  end
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/storage/acl_utils_tests.rb

@@ -0,0 +1,209 @@
+require 'fog/aws/requests/storage/acl_utils'
+
+Shindo.tests('Fog::Storage::AWS | ACL utils', [:aws]) do
+  tests(".hash_to_acl") do
+    tests(".hash_to_acl({}) at xpath //AccessControlPolicy").returns("", "has an empty AccessControlPolicy") do
+      xml = Fog::Storage::AWS.hash_to_acl({})
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy").first.content.chomp
+    end
+
+    tests(".hash_to_acl({}) at xpath //AccessControlPolicy/Owner").returns(nil, "does not have an Owner element") do
+      xml = Fog::Storage::AWS.hash_to_acl({})
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner").first
+    end
+
+    tests(".hash_to_acl('Owner' => {}) at xpath //AccessControlPolicy/Owner").returns(nil, "does not have an Owner element") do
+      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {})
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner").first
+    end
+
+    tests(".hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'}) at xpath //AccessControlPolicy/Owner/ID").returns("abcdef0123456789", "returns the Owner ID") do
+      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/ID").first.content
+    end
+
+    tests(".hash_to_acl('Owner' => {'DisplayName' => 'bob'}) at xpath //AccessControlPolicy/Owner/ID").returns(nil, "does not have an Owner ID element") do
+      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/ID").first
+    end
+
+    tests(".hash_to_acl('Owner' => {'DisplayName' => 'bob'}) at xpath //AccessControlPolicy/Owner/DisplayName").returns("bob", "returns the Owner DisplayName") do
+      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'DisplayName' => 'bob'})
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/DisplayName").first.content
+    end
+
+    tests(".hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'}) at xpath //AccessControlPolicy/Owner/DisplayName").returns(nil, "does not have an Owner DisplayName element") do
+      xml = Fog::Storage::AWS.hash_to_acl('Owner' => {'ID' => 'abcdef0123456789'})
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/Owner/DisplayName").first
+    end
+
+    tests(".hash_to_acl({}) at xpath //AccessControlPolicy/AccessControlList").returns(nil, "has no AccessControlList") do
+      xml = Fog::Storage::AWS.hash_to_acl({})
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlPolicy").first
+    end
+
+    acl = {
+      'AccessControlList' => [
+        {
+          'Grantee' => {
+            'ID' => 'abcdef0123456789',
+            'DisplayName' => 'bob'
+          },
+          'Permission' => 'READ'
+        }
+      ]
+    }
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("CanonicalUser", "has an xsi:type of CanonicalUser") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/ID").returns("abcdef0123456789", "returns the Grantee ID") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/ID").first.content
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/DisplayName").returns("bob", "returns the Grantee DisplayName") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/DisplayName").first.content
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("READ", "returns the Grantee Permission") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
+    end
+
+    acl = {
+      'AccessControlList' => [
+        {
+          'Grantee' => {
+            'EmailAddress' => 'user@example.com'
+          },
+          'Permission' => 'FULL_CONTROL'
+        }
+      ]
+    }
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("AmazonCustomerByEmail", "has an xsi:type of AmazonCustomerByEmail") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").returns("user@example.com", "returns the Grantee EmailAddress") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").first.content
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("FULL_CONTROL", "returns the Grantee Permission") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
+    end
+
+    acl = {
+      'AccessControlList' => [
+        {
+          'Grantee' => {
+            'URI' => 'http://acs.amazonaws.com/groups/global/AllUsers'
+          },
+          'Permission' => 'WRITE'
+        }
+      ]
+    }
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee").returns("Group", "has an xsi:type of Group") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee").first.attributes["type"].value
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/URI").returns("http://acs.amazonaws.com/groups/global/AllUsers", "returns the Grantee URI") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/URI").first.content
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Permission").returns("WRITE", "returns the Grantee Permission") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Permission").first.content
+    end
+
+    acl = {
+      'AccessControlList' => [
+        {
+          'Grantee' => {
+            'ID' => 'abcdef0123456789',
+            'DisplayName' => 'bob'
+          },
+          'Permission' => 'READ'
+        },
+        {
+          'Grantee' => {
+            'EmailAddress' => 'user@example.com'
+          },
+          'Permission' => 'FULL_CONTROL'
+        },
+        {
+          'Grantee' => {
+            'URI' => 'http://acs.amazonaws.com/groups/global/AllUsers'
+          },
+          'Permission' => 'WRITE'
+        }
+      ]
+    }
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant").returns(3, "has three elements") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant").size
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/ID").returns("abcdef0123456789", "returns the first Grant's Grantee ID") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/ID").first.content
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").returns("user@example.com", "returns the second Grant's Grantee EmailAddress") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/EmailAddress").first.content
+    end
+
+    tests(".hash_to_acl(#{acl.inspect}) at xpath //AccessControlPolicy/AccessControlList/Grant/Grantee/URI").returns("http://acs.amazonaws.com/groups/global/AllUsers", "returns the third Grant's Grantee URI") do
+      xml = Fog::Storage::AWS.hash_to_acl(acl)
+      Nokogiri::XML(xml).xpath("//AccessControlPolicy/AccessControlList/Grant/Grantee/URI").first.content
+    end
+  end
+
+  tests(".acl_to_hash") do
+    acl_xml = <<-XML
+<AccessControlPolicy>
+  <Owner>
+    <ID>2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0</ID>
+    <DisplayName>me</DisplayName>
+  </Owner>
+  <AccessControlList>
+    <Grant>
+      <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser">
+        <ID>2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0</ID>
+        <DisplayName>me</DisplayName>
+      </Grantee>
+      <Permission>FULL_CONTROL</Permission>
+    </Grant>
+  </AccessControlList>
+</AccessControlPolicy>
+XML
+
+    tests(".acl_to_hash(#{acl_xml.inspect})").returns({
+      "Owner" => {
+        "DisplayName" => "me",
+        "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"
+      },
+      "AccessControlList" => [{
+        "Grantee" => {
+          "DisplayName" => "me",
+          "ID" => "2744ccd10c7533bd736ad890f9dd5cab2adb27b07d500b9493f29cdc420cb2e0"
+        },
+        "Permission" => "FULL_CONTROL"
+      }]
+    }, 'returns hash of ACL XML') do
+      Fog::Storage::AWS.acl_to_hash(acl_xml)
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/storage/bucket_tests.rb

@@ -1,4 +1,5 @@
 Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
+  @aws_bucket_name = 'fogbuckettests-' + Time.now.to_i.to_s(32)
 
   tests('success') do
 
@@ -33,30 +34,31 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
       }
     }
 
-    tests("#put_bucket('fogbuckettests')").succeeds do
-      Fog::Storage[:aws].put_bucket('fogbuckettests')
+    tests("#put_bucket('#{@aws_bucket_name}')").succeeds do
+      Fog::Storage[:aws].put_bucket(@aws_bucket_name)
+      @aws_owner = Fog::Storage[:aws].get_bucket_acl(Fog::Storage[:aws].directories.first.key).body['Owner']
     end
 
     tests("#get_service").formats(@service_format) do
       Fog::Storage[:aws].get_service.body
     end
 
-    file = Fog::Storage[:aws].directories.get('fogbuckettests').files.create(:body => 'y', :key => 'x')
+    file = Fog::Storage[:aws].directories.get(@aws_bucket_name).files.create(:body => 'y', :key => 'x')
 
-    tests("#get_bucket('fogbuckettests)").formats(@bucket_format) do
-      Fog::Storage[:aws].get_bucket('fogbuckettests').body
+    tests("#get_bucket('#{@aws_bucket_name}')").formats(@bucket_format) do
+      Fog::Storage[:aws].get_bucket(@aws_bucket_name).body
     end
 
     file.destroy
 
-    file1 = Fog::Storage[:aws].directories.get('fogbuckettests').files.create(:body => 'a',    :key => 'a/a1/file1')
-    file2 = Fog::Storage[:aws].directories.get('fogbuckettests').files.create(:body => 'ab',   :key => 'a/file2')
-    file3 = Fog::Storage[:aws].directories.get('fogbuckettests').files.create(:body => 'abc',  :key => 'b/file3')
-    file4 = Fog::Storage[:aws].directories.get('fogbuckettests').files.create(:body => 'abcd', :key => 'file4')
+    file1 = Fog::Storage[:aws].directories.get(@aws_bucket_name).files.create(:body => 'a',    :key => 'a/a1/file1')
+    file2 = Fog::Storage[:aws].directories.get(@aws_bucket_name).files.create(:body => 'ab',   :key => 'a/file2')
+    file3 = Fog::Storage[:aws].directories.get(@aws_bucket_name).files.create(:body => 'abc',  :key => 'b/file3')
+    file4 = Fog::Storage[:aws].directories.get(@aws_bucket_name).files.create(:body => 'abcd', :key => 'file4')
 
-    tests("#get_bucket('fogbuckettests')") do
+    tests("#get_bucket('#{@aws_bucket_name}')") do
       before do
-        @bucket = Fog::Storage[:aws].get_bucket('fogbuckettests')
+        @bucket = Fog::Storage[:aws].get_bucket(@aws_bucket_name)
       end
 
       tests(".body['Contents'].map{|n| n['Key']}").returns(["a/a1/file1", "a/file2", "b/file3", "file4"]) do
@@ -72,9 +74,9 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
       end
     end
 
-    tests("#get_bucket('fogbuckettests', 'delimiter' => '/')") do
+    tests("#get_bucket('#{@aws_bucket_name}', 'delimiter' => '/')") do
       before do
-        @bucket = Fog::Storage[:aws].get_bucket('fogbuckettests', 'delimiter' => '/')
+        @bucket = Fog::Storage[:aws].get_bucket(@aws_bucket_name, 'delimiter' => '/')
       end
 
       tests(".body['Contents'].map{|n| n['Key']}").returns(['file4']) do
@@ -86,9 +88,9 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
       end
     end
 
-    tests("#get_bucket('fogbuckettests', 'delimiter' => '/', 'prefix' => 'a/')") do
+    tests("#get_bucket('#{@aws_bucket_name}', 'delimiter' => '/', 'prefix' => 'a/')") do
       before do
-        @bucket = Fog::Storage[:aws].get_bucket('fogbuckettests', 'delimiter' => '/', 'prefix' => 'a/')
+        @bucket = Fog::Storage[:aws].get_bucket(@aws_bucket_name, 'delimiter' => '/', 'prefix' => 'a/')
       end
 
       tests(".body['Contents'].map{|n| n['Key']}").returns(['a/file2']) do
@@ -102,63 +104,84 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
 
     file1.destroy; file2.destroy; file3.destroy; file4.destroy
 
-    tests("#get_bucket_location('fogbuckettests)").formats('LocationConstraint' => NilClass) do
-      Fog::Storage[:aws].get_bucket_location('fogbuckettests').body
+    tests("#get_bucket_location('#{@aws_bucket_name}')").formats('LocationConstraint' => NilClass) do
+      Fog::Storage[:aws].get_bucket_location(@aws_bucket_name).body
     end
 
-    tests("#get_request_payment('fogbuckettests')").formats('Payer' => String) do
-      Fog::Storage[:aws].get_request_payment('fogbuckettests').body
+    tests("#get_request_payment('#{@aws_bucket_name}')").formats('Payer' => String) do
+      Fog::Storage[:aws].get_request_payment(@aws_bucket_name).body
     end
 
-    tests("#put_request_payment('fogbuckettests', 'Requester')").succeeds do
-      Fog::Storage[:aws].put_request_payment('fogbuckettests', 'Requester')
+    tests("#put_request_payment('#{@aws_bucket_name}', 'Requester')").succeeds do
+      Fog::Storage[:aws].put_request_payment(@aws_bucket_name, 'Requester')
     end
 
-    tests("#put_bucket_website('fogbuckettests', 'index.html')").succeeds do
+    tests("#put_bucket_website('#{@aws_bucket_name}', 'index.html')").succeeds do
       pending if Fog.mocking?
-      Fog::Storage[:aws].put_bucket_website('fogbuckettests', 'index.html')
+      Fog::Storage[:aws].put_bucket_website(@aws_bucket_name, 'index.html')
     end
 
-    tests("#delete_bucket_website('fogbuckettests')").succeeds do
-      pending if Fog.mocking?
-      Fog::Storage[:aws].delete_bucket_website('fogbuckettests')
-    end
-
-    tests("#delete_bucket('fogbuckettests')").succeeds do
-      Fog::Storage[:aws].delete_bucket('fogbuckettests')
+    tests("#put_bucket_acl('#{@aws_bucket_name}', 'private')").succeeds do
+      Fog::Storage[:aws].put_bucket_acl(@aws_bucket_name, 'private')
     end
 
-    tests("#put_bucket_acl('fogbuckettests', 'private')").succeeds do
-      Fog::Storage[:aws].put_bucket_acl('fogbuckettests', 'private')
+    acl = {
+      'Owner' => @aws_owner,
+      'AccessControlList' => [
+        {
+          'Grantee' => @aws_owner,
+          'Permission' => "FULL_CONTROL"
+        }
+      ]
+    }
+    tests("#put_bucket_acl('#{@aws_bucket_name}', hash with id)").returns(acl) do
+      Fog::Storage[:aws].put_bucket_acl(@aws_bucket_name, acl)
+      Fog::Storage[:aws].get_bucket_acl(@aws_bucket_name).body
     end
 
-    tests("#put_bucket_acl('fogbuckettests', hash)").returns(true) do
-      Fog::Storage[:aws].put_bucket_acl('fogbuckettests', {
-        'Owner' => { 'ID' => "8a6925ce4adf5f21c32aa379004fef", 'DisplayName' => "mtd@amazon.com" },
+    tests("#put_bucket_acl('#{@aws_bucket_name}', hash with email)").returns({
+        'Owner' => @aws_owner,
+        'AccessControlList' => [
+          {
+            'Grantee' => { 'ID' => 'f62f0218873cfa5d56ae9429ae75a592fec4fd22a5f24a20b1038a7db9a8f150', 'DisplayName' => 'mtd' },
+            'Permission' => "FULL_CONTROL"
+          }
+        ]
+    }) do
+      pending if Fog.mocking?
+      Fog::Storage[:aws].put_bucket_acl(@aws_bucket_name, {
+        'Owner' => @aws_owner,
         'AccessControlList' => [
-          { 
-            'Grantee' => { 'ID' => "8a6925ce4adf588a4532142d3f74dd8c71fa124b1ddee97f21c32aa379004fef", 'DisplayName' => "mtd@amazon.com" }, 
-            'Permission' => "FULL_CONTROL" 
+          {
+            'Grantee' => { 'EmailAddress' => 'mtd@amazon.com' },
+            'Permission' => "FULL_CONTROL"
           }
         ]
       })
-      Fog::Storage[:aws].get_bucket_acl('fogbuckettests').body == <<-BODY
-<AccessControlPolicy>
-  <Owner>
-    <ID>8a6925ce4adf5f21c32aa379004fef</ID>
-    <DisplayName>mtd@amazon.com</DisplayName>
-  </Owner>
-  <AccessControlList>
-    <Grant>
-      <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser">
-        <ID>8a6925ce4adf588a4532142d3f74dd8c71fa124b1ddee97f21c32aa379004fef</ID>
-        <DisplayName>mtd@amazon.com</DisplayName>
-      </Grantee>
-      <Permission>FULL_CONTROL</Permission>
-    </Grant>
-  </AccessControlList>
-</AccessControlPolicy>
-BODY
+      Fog::Storage[:aws].get_bucket_acl(@aws_bucket_name).body
+    end
+
+    acl = {
+      'Owner' => @aws_owner,
+      'AccessControlList' => [
+        {
+          'Grantee' => { 'URI' => 'http://acs.amazonaws.com/groups/global/AllUsers' },
+          'Permission' => "FULL_CONTROL"
+        }
+      ]
+    }
+    tests("#put_bucket_acl('#{@aws_bucket_name}', hash with uri)").returns(acl) do
+      Fog::Storage[:aws].put_bucket_acl(@aws_bucket_name, acl)
+      Fog::Storage[:aws].get_bucket_acl(@aws_bucket_name).body
+    end
+
+    tests("#delete_bucket_website('#{@aws_bucket_name}')").succeeds do
+      pending if Fog.mocking?
+      Fog::Storage[:aws].delete_bucket_website(@aws_bucket_name)
+    end
+
+    tests("#delete_bucket('#{@aws_bucket_name}')").succeeds do
+      Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
     end
 
   end
@@ -201,4 +224,6 @@ BODY
 
   end
 
+  # don't keep the bucket around
+  Fog::Storage[:aws].delete_bucket(@aws_bucket_name) rescue nil
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/storage/object_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('AWS::Storage | object requests', ['aws']) do
-
-  @directory = Fog::Storage[:aws].directories.create(:key => 'fogobjecttests')
+  @directory = Fog::Storage[:aws].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32))
+  @aws_owner = Fog::Storage[:aws].get_bucket_acl(@directory.key).body['Owner']
 
   tests('success') do
 
@@ -34,32 +34,50 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
       Fog::Storage[:aws].put_object_acl(@directory.identity, 'fog_object', 'private')
     end
 
-    tests("#put_object_acl('#{@directory.identity}', 'fog_object', hash)").returns(true) do
+    acl = {
+      'Owner' => @aws_owner,
+      'AccessControlList' => [
+        {
+          'Grantee' => @aws_owner,
+          'Permission' => "FULL_CONTROL"
+        }
+      ]}
+    tests("#put_object_acl('#{@directory.identity}', 'fog_object', hash with id)").returns(acl) do
+      Fog::Storage[:aws].put_object_acl(@directory.identity, 'fog_object', acl)
+      Fog::Storage[:aws].get_object_acl(@directory.identity, 'fog_object').body
+    end
+
+    tests("#put_object_acl('#{@directory.identity}', 'fog_object', hash with email)").returns({
+        'Owner' => @aws_owner,
+        'AccessControlList' => [
+          {
+            'Grantee' => { 'ID' => 'f62f0218873cfa5d56ae9429ae75a592fec4fd22a5f24a20b1038a7db9a8f150', 'DisplayName' => 'mtd' },
+            'Permission' => "FULL_CONTROL"
+          }
+        ]}) do
+      pending if Fog.mocking?
       Fog::Storage[:aws].put_object_acl(@directory.identity, 'fog_object', {
-        'Owner' => { 'ID' => "8a6925ce4adf5f21c32aa379004fef", 'DisplayName' => "mtd@amazon.com" },
+        'Owner' => @aws_owner,
         'AccessControlList' => [
-          { 
-            'Grantee' => { 'ID' => "8a6925ce4adf588a4532142d3f74dd8c71fa124b1ddee97f21c32aa379004fef", 'DisplayName' => "mtd@amazon.com" }, 
-            'Permission' => "FULL_CONTROL" 
+          {
+            'Grantee' => { 'EmailAddress' => 'mtd@amazon.com' },
+            'Permission' => "FULL_CONTROL"
           }
         ]})
-      Fog::Storage[:aws].get_object_acl(@directory.identity, 'fog_object').body == <<-BODY
-<AccessControlPolicy>
-  <Owner>
-    <ID>8a6925ce4adf5f21c32aa379004fef</ID>
-    <DisplayName>mtd@amazon.com</DisplayName>
-  </Owner>
-  <AccessControlList>
-    <Grant>
-      <Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser">
-        <ID>8a6925ce4adf588a4532142d3f74dd8c71fa124b1ddee97f21c32aa379004fef</ID>
-        <DisplayName>mtd@amazon.com</DisplayName>
-      </Grantee>
-      <Permission>FULL_CONTROL</Permission>
-    </Grant>
-  </AccessControlList>
-</AccessControlPolicy>
-BODY
+      Fog::Storage[:aws].get_object_acl(@directory.identity, 'fog_object').body
+    end
+
+    acl = {
+      'Owner' => @aws_owner,
+      'AccessControlList' => [
+        {
+          'Grantee' => { 'URI' => 'http://acs.amazonaws.com/groups/global/AllUsers' },
+          'Permission' => "FULL_CONTROL"
+        }
+      ]}
+    tests("#put_object_acl('#{@directory.identity}', 'fog_object', hash with uri)").returns(acl) do
+      Fog::Storage[:aws].put_object_acl(@directory.identity, 'fog_object', acl)
+      Fog::Storage[:aws].get_object_acl(@directory.identity, 'fog_object').body
     end
 
     tests("#delete_object('#{@directory.identity}', 'fog_object')").succeeds do

data/lib/brightbox-cli/vendor/fog/tests/brightbox/requests/compute/account_tests.rb

@@ -2,20 +2,25 @@ Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do
 
   tests('success') do
 
-    tests("#get_account").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
+    tests("#get_account") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].get_account
+      result = Fog::Compute[:brightbox].get_account
+      formats(Brightbox::Compute::Formats::Full::ACCOUNT) { result }
+      test("ftp password is blanked") { result["library_ftp_password"].nil?  }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
-    tests("#update_account(#{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
+    tests("#update_account(#{update_options.inspect})") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].update_account(update_options)
+      result = Fog::Compute[:brightbox].update_account(update_options)
+      formats(Brightbox::Compute::Formats::Full::ACCOUNT) { result }
     end
 
-    tests("#reset_ftp_password_account").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
+    tests("#reset_ftp_password_account") do
       pending if Fog.mocking?
-      Fog::Compute[:brightbox].reset_ftp_password_account
+      result = Fog::Compute[:brightbox].reset_ftp_password_account
+      formats(Brightbox::Compute::Formats::Full::ACCOUNT) { result }
+      test("new ftp password is visible") { ! result["library_ftp_password"].nil?  }
     end
 
   end