brightbox-cli 0.17.1 → 0.17.2

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/rds/helper.rb

@@ -19,7 +19,39 @@ class AWS
           'DBParameterGroup' => DB_PARAMETER_GROUP
         }
       }
-
+      
+      DB_SECURITY_GROUP = {
+        'DBSecurityGroupDescription' => String,
+        'DBSecurityGroupName' => String,
+        'EC2SecurityGroups' => [Fog::Nullable::Hash],
+        'IPRanges' => [Fog::Nullable::Hash],
+        'OwnerId' => Fog::Nullable::String
+      }
+      
+      CREATE_DB_SECURITY_GROUP = BASIC.merge({
+        'CreateDBSecurityGroupResult' => {          
+          'DBSecurityGroup' => DB_SECURITY_GROUP
+        }
+      })
+      
+      AUTHORIZE_DB_SECURITY_GROUP = BASIC.merge({
+        'AuthorizeDBSecurityGroupIngressResult' => {          
+          'DBSecurityGroup' => DB_SECURITY_GROUP
+        }
+      })
+      
+      REVOKE_DB_SECURITY_GROUP = BASIC.merge({
+        'RevokeDBSecurityGroupIngressResult' => {          
+          'DBSecurityGroup' => DB_SECURITY_GROUP
+        }
+      })
+      
+      DESCRIBE_DB_SECURITY_GROUP = BASIC.merge({
+        'DescribeDBSecurityGroupsResult' => {          
+          'DBSecurityGroups' => [DB_SECURITY_GROUP]
+        }
+      })
+      
       DESCRIBE_DB_PARAMETER_GROUP = {
         'ResponseMetadata' => {'RequestId' => String},
         'DescribeDBParameterGroupsResult' =>{
@@ -33,6 +65,8 @@ class AWS
         }
       })
       
+
+      
       DB_PARAMETER = {
         'ParameterValue' => Fog::Nullable::String,
         'DataType' => String,
@@ -41,8 +75,9 @@ class AWS
         'IsModifiable' => Fog::Boolean,
         'Description' => String,
         'ParameterName' => String,
-        'ApplyType' => String,
+        'ApplyType' => String
       }
+      
       DESCRIBE_DB_PARAMETERS = BASIC.merge({
         'DescribeDBParametersResult' => {
           'Marker' => Fog::Nullable::String,
@@ -51,7 +86,6 @@ class AWS
       
       })
       
-      
       SNAPSHOT={
         'AllocatedStorage' => Integer,
         'AvailabilityZone' => String,
@@ -105,6 +139,7 @@ class AWS
         'PreferredBackupWindow'=> String,
         'PreferredMaintenanceWindow'=> String,
         'ReadReplicaDBInstanceIdentifiers'=> [String],
+        'ReadReplicaDBInstanceIdentifiers'=> [Fog::Nullable::String],
         'ReadReplicaSourceDBInstanceIdentifier'=> Fog::Nullable::String
       }
       

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/rds/instance_tests.rb

@@ -10,7 +10,7 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
   @db_final_snapshot_id = "fog-final-snapshot"
 
   tests('success') do
-    pending if Fog.mocking?
+#    
 
     tests("#create_db_instance").formats(AWS::RDS::Formats::CREATE_DB_INSTANCE) do
       result = Fog::AWS[:rds].create_db_instance(@db_instance_id, 'AllocatedStorage' => 5,
@@ -59,6 +59,8 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
     server.reload.wait_for { state == 'rebooting' }
     server.reload.wait_for { state == 'available'}
 
+    pending if Fog.mocking?
+
     tests("#create_db_snapshot").formats(AWS::RDS::Formats::CREATE_DB_SNAPSHOT) do
       body = Fog::AWS[:rds].create_db_snapshot(@db_instance_id, @db_snapshot_id).body
       returns('creating'){ body['CreateDBSnapshotResult']['DBSnapshot']['Status']}

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

@@ -117,7 +117,6 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
     end
 
     tests("#put_bucket_website('#{@aws_bucket_name}', 'index.html')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:aws].put_bucket_website(@aws_bucket_name, 'index.html')
     end
 
@@ -180,6 +179,68 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
       Fog::Storage[:aws].delete_bucket_website(@aws_bucket_name)
     end
 
+    tests('bucket lifecycle') do
+      pending if Fog.mocking?
+
+      lifecycle = {'Rules' => [{'ID' => 'test rule', 'Prefix' => '/prefix', 'Enabled' => true, 'Days' => 42}]}
+      tests('non-existant bucket') do
+        tests('#put_bucket_lifecycle').returns([404, 'NoSuchBucket']) do
+          begin
+            Fog::Storage[:aws].put_bucket_lifecycle('fognonbucket', lifecycle)
+          rescue Excon::Errors::NotFound => e
+            [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
+          end
+        end
+        tests('#get_bucket_lifecycle').returns([404, 'NoSuchBucket']) do
+          begin
+            Fog::Storage[:aws].get_bucket_lifecycle('fognonbucket')
+          rescue Excon::Errors::NotFound => e
+            [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
+          end
+        end
+        tests('#delete_bucket_lifecycle').returns([404, 'NoSuchBucket']) do
+          begin
+            Fog::Storage[:aws].delete_bucket_lifecycle('fognonbucket')
+          rescue Excon::Errors::NotFound => e
+            [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
+          end
+        end
+      end
+      tests('no lifecycle') do
+        tests('#get_bucket_lifecycle').returns([404, 'NoSuchLifecycleConfiguration']) do
+          begin
+            Fog::Storage[:aws].get_bucket_lifecycle(@aws_bucket_name)
+          rescue Excon::Errors::NotFound => e
+            [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
+          end
+        end
+        tests('#delete_bucket_lifecycle').succeeds do
+          Fog::Storage[:aws].delete_bucket_lifecycle(@aws_bucket_name)
+        end
+      end
+      tests('create').succeeds do
+        Fog::Storage[:aws].put_bucket_lifecycle(@aws_bucket_name, lifecycle)
+      end
+      tests('read').returns(lifecycle) do
+        Fog::Storage[:aws].get_bucket_lifecycle(@aws_bucket_name).body
+      end
+      lifecycle = { 'Rules' => 5.upto(6).map { |i| {'ID' => "rule\##{i}", 'Prefix' => i.to_s, 'Enabled' => true, 'Days' => i} } }
+      tests('update').returns(lifecycle) do
+        Fog::Storage[:aws].put_bucket_lifecycle(@aws_bucket_name, lifecycle)
+        Fog::Storage[:aws].get_bucket_lifecycle(@aws_bucket_name).body
+      end
+      tests('delete').succeeds do
+          Fog::Storage[:aws].delete_bucket_lifecycle(@aws_bucket_name)
+      end
+      tests('read').returns([404, 'NoSuchLifecycleConfiguration']) do
+        begin
+          Fog::Storage[:aws].get_bucket_lifecycle(@aws_bucket_name)
+        rescue Excon::Errors::NotFound => e
+          [e.response.status, e.response.body.match(%r{<Code>(.*)</Code>})[1]]
+        end
+      end
+    end
+
     tests("#delete_bucket('#{@aws_bucket_name}')").succeeds do
       Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
     end
@@ -222,6 +283,10 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
       Fog::Storage[:aws].put_bucket_acl('fognonbucket', 'invalid')
     end
 
+    tests("#put_bucket_website('fognonbucket', 'index.html')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:aws].put_bucket_website('fognonbucket', 'index.html')
+    end
+
   end
 
   # don't keep the bucket around

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

@@ -5,7 +5,7 @@ Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do
     tests("#get_account") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_account
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT) { result }
+      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
       test("ftp password is blanked") { result["library_ftp_password"].nil?  }
     end
 
@@ -13,13 +13,13 @@ Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do
     tests("#update_account(#{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_account(update_options)
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT) { result }
+      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
     end
 
     tests("#reset_ftp_password_account") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_ftp_password_account
-      formats(Brightbox::Compute::Formats::Full::ACCOUNT) { result }
+      formats(Brightbox::Compute::Formats::Full::ACCOUNT, false) { result }
       test("new ftp password is visible") { ! result["library_ftp_password"].nil?  }
     end
 

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

@@ -11,39 +11,39 @@ Shindo.tests('Fog::Compute[:brightbox] | api client requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_api_client(create_options)
       @api_client_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
     end
 
     tests("#list_api_clients") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_api_clients
-      formats(Brightbox::Compute::Formats::Collection::API_CLIENTS) { result }
+      formats(Brightbox::Compute::Formats::Collection::API_CLIENTS, false) { result }
     end
 
     tests("#get_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
     tests("#update_api_client('#{@api_client_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_api_client(@api_client_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
     end
 
     tests("#reset_secret_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].reset_secret_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
       test("new secret is visible") { ! result["secret"].nil?  }
     end
 
     tests("#destroy_api_client('#{@api_client_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
-      formats(Brightbox::Compute::Formats::Full::API_CLIENT) { result }
+      formats(Brightbox::Compute::Formats::Full::API_CLIENT, false) { result }
     end
 
   end

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

@@ -10,26 +10,29 @@ Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_cloud_ip
       @cloud_ip_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
     end
 
     tests("#list_cloud_ips") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_cloud_ips
-      formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS) { result }
+      formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS, false) { result }
     end
 
     tests("#get_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_cloud_ip(@cloud_ip_id)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
+    end
+
+    unless Fog.mocking?
+      map_options = {:destination => @server.interfaces.first["id"]}
     end
 
-    map_options = {:destination => @server.interfaces.first["id"]}
     tests("#map_cloud_ip('#{@cloud_ip_id}', #{map_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].map_cloud_ip(@cloud_ip_id, map_options)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
     end
 
     unless Fog.mocking?
@@ -39,21 +42,24 @@ Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do
     tests("#unmap_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].unmap_cloud_ip(@cloud_ip_id)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
+    end
+
+    unless Fog.mocking?
+      update_options = {:reverse_dns => "public.#{@server.id}.gb1.brightbox.com"}
     end
 
-    update_options = {:reverse_dns => "public.#{@server.id}.gb1.brightbox.com"}
     tests("#update_cloud_ip('#{@cloud_ip_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
       result = Fog::Compute[:brightbox].update_cloud_ip(@cloud_ip_id, {:reverse_dns => ""})
     end
 
     tests("#destroy_cloud_ip('#{@cloud_ip_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_cloud_ip(@cloud_ip_id)
-      formats(Brightbox::Compute::Formats::Full::CLOUD_IP) { result }
+      formats(Brightbox::Compute::Formats::Full::CLOUD_IP, false) { result }
     end
 
     unless Fog.mocking?

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

@@ -64,7 +64,8 @@ class Brightbox
         LB_LISTENER = {
           "in"              => Integer,
           "out"             => Integer,
-          "protocol"        => String
+          "protocol"        => String,
+          "timeout"         => Integer
         }
         LB_HEALTHCHECK = {
           "type"            => String,
@@ -111,7 +112,7 @@ class Brightbox
           "name"            => String,
           "default"         => Fog::Boolean,
           "created_at"      => String,
-          "description"     => String
+          "description"     => Fog::Nullable::String
         }
 
         FIREWALL_RULE = {
@@ -279,6 +280,7 @@ class Brightbox
           "compatibility_mode" => Fog::Boolean,
           "virtual_size"    => Integer,
           "disk_size"       => Integer,
+          "min_ram"         => Fog::Nullable::Integer,
           "ancestor"        => Fog::Brightbox::Nullable::Image,
           "username"        => Fog::Nullable::String
         }
@@ -293,6 +295,7 @@ class Brightbox
           "deleted_at"      => Fog::Nullable::String,
           "cloud_ips"       => [Brightbox::Compute::Formats::Nested::CLOUD_IP],
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
+          "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
           "nodes"           => [Brightbox::Compute::Formats::Nested::SERVER]
         }
 
@@ -471,6 +474,7 @@ class Brightbox
           "compatibility_mode"   => Fog::Boolean,
           "virtual_size"    => Integer,
           "disk_size"       => Integer,
+          "min_ram"         => Fog::Nullable::Integer,
           "ancestor"        => Fog::Brightbox::Nullable::Image,
           "username"        => Fog::Nullable::String
         }

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

@@ -19,13 +19,13 @@ Shindo.tests('Fog::Compute[:brightbox] | image requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_images
       @image_id = result.first["id"]
-      formats(Brightbox::Compute::Formats::Collection::IMAGES) { result }
+      formats(Brightbox::Compute::Formats::Collection::IMAGES, false) { result }
     end
 
     tests("#get_image('#{@image_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_image(@image_id)
-      formats(Brightbox::Compute::Formats::Full::IMAGE) { result }
+      formats(Brightbox::Compute::Formats::Full::IMAGE, false) { result }
     end
 
     ## Until Image creation can be automated, we shouldn't be updating Images randomly

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

@@ -10,7 +10,7 @@ Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
     tests("#get_interface('#{@interface_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_interface(@interface_id)
-      formats(Brightbox::Compute::Formats::Full::INTERFACE) { result }
+      formats(Brightbox::Compute::Formats::Full::INTERFACE, false) { result }
     end
 
   end

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

@@ -26,7 +26,7 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_load_balancer(create_options)
       @load_balancer_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) { result }
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     unless Fog.mocking?
@@ -36,34 +36,34 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
     tests("#list_load_balancers()") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_load_balancers
-      formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS) { result }
+      formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS, false) { result }
     end
 
     tests("#get_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_load_balancer(@load_balancer_id)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) { result }
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     update_options = {:name => "New name"}
     tests("#update_load_balancer('#{@load_balancer_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_load_balancer(@load_balancer_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) { result }
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     add_listeners_options = {:listeners=>[{:out=>28080, :in=>8080, :protocol=>"http"}]}
     tests("#add_listeners_load_balancer('#{@load_balancer_id}', #{add_listeners_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_listeners_load_balancer(@load_balancer_id, add_listeners_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) { result }
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     remove_listeners_options = {:listeners=>[{:out=>28080, :in=>8080, :protocol=>"http"}]}
     tests("#remove_listeners_load_balancer('#{@load_balancer_id}', #{remove_listeners_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_listeners_load_balancer(@load_balancer_id, remove_listeners_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) { result }
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     unless Fog.mocking?
@@ -76,7 +76,7 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
     tests("#add_nodes_load_balancer('#{@load_balancer_id}', #{add_nodes_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_nodes_load_balancer(@load_balancer_id, add_nodes_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) { result }
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     # ...before we can attempt to remove either
@@ -84,13 +84,13 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
     tests("#remove_nodes_load_balancer('#{@load_balancer_id}', #{remove_nodes_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_nodes_load_balancer(@load_balancer_id, remove_nodes_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) { result }
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     tests("#destroy_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_load_balancer(@load_balancer_id)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) { result }
+      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
     end
 
     unless Fog.mocking?