brightbox-cli 0.17.1 → 0.17.2

data/lib/brightbox-cli/vendor/fog/lib/fog/zerigo/requests/dns/update_host.rb

@@ -24,9 +24,9 @@ module Fog
           options.each { |option, value|
             case option
             when :host_type
-              optional_tags+= "<host-type>#{host_type}</host-type>"
+              optional_tags+= "<host-type>#{value}</host-type>"
             when :data
-              optional_tags+= "<data>#{data}</data>"
+              optional_tags+= "<data>#{value}</data>"
             when :hostname
               optional_tags+= "<hostname>#{value}</hostname>"
             when :notes

data/lib/brightbox-cli/vendor/fog/spec/ecloud/spec_helper.rb

@@ -327,7 +327,7 @@ end
 Spec::Matchers.define :have_keys_with_values do |expected|
   match do |actual|
     actual.each_pair.all? do |key, value|
-      expected.keys.include?(key) && expected[key] == value
+      expected.has_key?(key) && expected[key] == value
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/models/elb/model_tests.rb

@@ -1,4 +1,5 @@
 Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
+  require 'fog'
   @availability_zones = Fog::Compute[:aws].describe_availability_zones('state' => 'available').body['availabilityZoneInfo'].collect{ |az| az['zoneName'] }
   @key_name = 'fog-test-model'
 
@@ -13,15 +14,17 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       tests("default attributes") do
         listener = Fog::AWS[:elb].listeners.new
         tests('instance_port is 80').returns(80) { listener.instance_port }
+        tests('instance_protocol is HTTP').returns('HTTP') { listener.instance_protocol }
         tests('lb_port is 80').returns(80) { listener.lb_port }
         tests('protocol is HTTP').returns('HTTP') { listener.protocol }
         tests('policy_names is empty').returns([]) { listener.policy_names }
       end
 
       tests("specifying attributes") do
-        attributes = {:instance_port => 2000, :lb_port => 2001, :protocol => 'SSL', :policy_names => ['fake'] }
+        attributes = {:instance_port => 2000, :instance_protocol => 'SSL', :lb_port => 2001, :protocol => 'SSL', :policy_names => ['fake'] }
         listener = Fog::AWS[:elb].listeners.new(attributes)
         tests('instance_port is 2000').returns(2000) { listener.instance_port }
+        tests('instance_protocol is SSL').returns('SSL') { listener.instance_protocol }
         tests('lb_port is 2001').returns(2001) { listener.lb_port }
         tests('protocol is SSL').returns('SSL') { listener.protocol }
         tests('policy_names is [ fake ]').returns(['fake']) { listener.policy_names }
@@ -62,7 +65,7 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
             'PolicyNames' => []
           }, {
             'Listener' => {
-              'LoadBalancerPort' => 443, 'InstancePort' => 443, 'Protocol' => 'HTTPS',
+              'LoadBalancerPort' => 443, 'InstancePort' => 443, 'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS',
               'SSLCertificateId' => @certificate['Arn']
             },
             'PolicyNames' => []
@@ -73,13 +76,14 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
         tests('lb_port is 2030').returns(2030) { elb3.listeners.first.lb_port }
         tests('protocol is HTTP').returns('HTTP') { elb3.listeners.first.protocol }
         tests('protocol is HTTPS').returns('HTTPS') { elb3.listeners.last.protocol }
+        tests('instance_protocol is HTTPS').returns('HTTPS') { elb3.listeners.last.instance_protocol }
         elb3.destroy
       end
 
       tests('with invalid Server Cert ARN').raises(Fog::AWS::IAM::NotFound) do
         listeners = [{
           'Listener' => {
-          'LoadBalancerPort' => 443, 'InstancePort' => 80, 'Protocol' => 'HTTPS', "SSLCertificateId" => "fakecert"}
+          'LoadBalancerPort' => 443, 'InstancePort' => 80, 'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS', "SSLCertificateId" => "fakecert"}
         }]
         Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-4", "ListenerDescriptions" => listeners, :availability_zones => @availability_zones)
       end
@@ -178,7 +182,7 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
         returns(1) { elb.listeners.size }
 
         listener = elb.listeners.first
-        returns([80,80,'HTTP', []]) { [listener.instance_port, listener.lb_port, listener.protocol, listener.policy_names] }
+        returns([80,80,'HTTP','HTTP', []]) { [listener.instance_port, listener.lb_port, listener.protocol, listener.instance_protocol, listener.policy_names] }
       end
 
       tests('#get') do
@@ -186,8 +190,8 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       end
 
       tests('create') do
-        new_listener = { 'InstancePort' => 443, 'LoadBalancerPort' => 443, 'Protocol' => 'TCP'}
-        elb.listeners.create(:instance_port => 443, :lb_port => 443, :protocol => 'TCP')
+        new_listener = { 'InstancePort' => 443, 'LoadBalancerPort' => 443, 'Protocol' => 'TCP', 'InstanceProtocol' => 'TCP'}
+        elb.listeners.create(:instance_port => 443, :lb_port => 443, :protocol => 'TCP', :instance_protocol => 'TCP')
         returns(2) { elb.listeners.size }
         returns(443) { elb.listeners.get(443).lb_port }
       end
@@ -244,6 +248,11 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       end
     end
 
+    tests('setting a new ssl certificate id') do
+      elb.listeners.create(:instance_port => 443, :lb_port => 443, :protocol => 'HTTPS', :instance_protocol => 'HTTPS', :ssl_id => @certificate['Arn'])
+      elb.set_listener_ssl_certificate(443, @certificate['Arn'])
+    end
+
     tests('destroy') do
       elb.destroy
     end

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

@@ -122,6 +122,39 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
     'requestId'     => String
   }
 
+  @describe_instance_status_format = {
+    'requestId' => String,
+    'instanceStatusSet' => [{
+                              'instanceId' => String,
+                              'availabilityZone' => String,
+                              'instanceState' => {
+                                'code' => Integer,
+                                'name' => String
+                              },
+                              'systemStatus' => {
+                                'status' => String,
+                                'details' => [{
+                                  'name' => String,
+                                  'status' => String
+                                }]
+                              },
+                              'instanceStatus' => {
+                                'status' => String,
+                                'details' => [{
+                                  'name' => String,
+                                  'status' => String
+                                }]
+                              },
+                              'event' => {
+                                                'code' => String,
+                                                'description' => String,
+                                                'notBefore' => Time,
+                                                'notAfter' => Time
+                                              }
+                            }]
+
+  }
+
   tests('success') do
 
     @instance_id = nil
@@ -214,6 +247,10 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       @reserved_instances
     end
 
+    tests('#describe_instance_status').formats(@describe_instance_status_format) do
+      Fog::Compute[:aws].describe_instance_status.body
+    end
+
     if Fog.mocking?
       @reserved_instance_offering_id = @reserved_instances["reservedInstancesOfferingsSet"].first["reservedInstancesOfferingId"]
       tests("#purchase_reserved_instances_offering('#{@reserved_instance_offering_id}')").formats(@purchase_reserved_instances_offering_format) do

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

@@ -4,16 +4,18 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     'requestId'           => String,
     'securityGroupInfo' => [{
       'groupDescription'  => String,
+      'groupId'           => Fog::Nullable::String,
       'groupName'         => String,
       'ipPermissions'     => [{
-        'fromPort'    => Integer,
-        'groups'      => [{ 'groupName' => String, 'userId' => String }],
+        'fromPort'    => Fog::Nullable::Integer,
+        'groups'      => [{ 'groupName' => Fog::Nullable::String, 'userId' => String }],
         'ipProtocol'  => String,
         'ipRanges'    => [],
-        'toPort'      => Integer,
+        'toPort'      => Fog::Nullable::Integer,
       }],
       'ipPermissionsEgress' => [],
-      'ownerId'           => String
+      'ownerId'           => String,
+      'vpcId'             => Fog::Nullable::String
     }]
   }
 

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

@@ -28,6 +28,39 @@ class AWS
         'DescribeLoadBalancersResult' => {'LoadBalancerDescriptions' => [LOAD_BALANCER]}
       })
 
+      POLICY_ATTRIBUTE_DESCRIPTION = {
+        "AttributeName" => String,
+        "AttributeValue" => String
+      }
+
+      POLICY = {
+        "PolicyAttributeDescriptions" => [POLICY_ATTRIBUTE_DESCRIPTION],
+        "PolicyName" => String,
+        "PolicyTypeName" => String
+      }
+
+      DESCRIBE_LOAD_BALANCER_POLICIES = BASIC.merge({
+        'DescribeLoadBalancerPoliciesResult' => { 'PolicyDescriptions' => [POLICY] }
+      })
+
+      POLICY_ATTRIBUTE_TYPE_DESCRIPTION = {
+        "AttributeName" => String,
+        "AttributeType" => String,
+        "Cardinality" => String,
+        "DefaultValue" => String,
+        "Description" => String
+      }
+
+      POLICY_TYPE = {
+        "Description" => String,
+        "PolicyAttributeTypeDescriptions" => [POLICY_ATTRIBUTE_TYPE_DESCRIPTION],
+        "PolicyTypeName" => String
+      }
+
+      DESCRIBE_LOAD_BALANCER_POLICY_TYPES = BASIC.merge({
+        'DescribeLoadBalancerPolicyTypesResult' => { 'PolicyTypeDescriptions' => [POLICY_TYPE] }
+      })
+
       CONFIGURE_HEALTH_CHECK = BASIC.merge({
         'ConfigureHealthCheckResult' => {'HealthCheck' => {
         'Target' => String,

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/elb/listener_tests.rb

@@ -8,7 +8,7 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
 
     tests("#create_load_balancer_listeners").formats(AWS::ELB::Formats::BASIC) do
       listeners = [
-        {'Protocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
+        {'Protocol' => 'TCP','InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
         {'Protocol' => 'HTTP', 'LoadBalancerPort' => 80, 'InstancePort' => 80}
       ]
       response = Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
@@ -22,7 +22,7 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
 
     tests("#create_load_balancer_listeners with non-existant SSL certificate") do
       listeners = [
-        {'Protocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => 'non-existant'},
+        {'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => 'non-existant'},
       ]
       raises(Fog::AWS::IAM::NotFound) { Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners) }
     end
@@ -30,7 +30,7 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
     tests("#create_load_balancer_listeners with invalid SSL certificate").raises(Fog::AWS::IAM::NotFound) do
       sleep 8 unless Fog.mocking?
       listeners = [
-        {'Protocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => "#{@certificate['Arn']}fake"},
+        {'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => "#{@certificate['Arn']}fake"},
       ]
       Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
     end
@@ -39,7 +39,25 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
     tests("#create_load_balancer_listeners with SSL certificate").formats(AWS::ELB::Formats::BASIC) do
       sleep 8 unless Fog.mocking?
       listeners = [
-        {'Protocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
+        {'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
+      ]
+      Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
+    end
+
+    tests("#set_load_balancer_listener_ssl_certificate").formats(AWS::ELB::Formats::BASIC) do
+      Fog::AWS[:elb].set_load_balancer_listener_ssl_certificate(@load_balancer_id, 443, @certificate['Arn']).body
+    end
+
+    tests("#create_load_balancer_listeners with invalid Protocol and InstanceProtocol configuration").raises(Fog::AWS::ELB::ValidationError) do
+      listeners = [
+        {'Protocol' => 'HTTP', 'InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 80, 'InstancePort' => 80},
+      ]
+      Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
+    end
+
+    tests("#create_load_balancer_listeners with valid Protocol and InstanceProtocol configuration").formats(AWS::ELB::Formats::BASIC) do
+      listeners = [
+        {'Protocol' => 'HTTP', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 80, 'InstancePort' => 80},
       ]
       Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
     end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/elb/policy_tests.rb

@@ -21,6 +21,19 @@ Shindo.tests('AWS::ELB | policy_tests', ['aws', 'elb']) do
       Fog::AWS[:elb].create_lb_cookie_stickiness_policy(@load_balancer_id, policy).body
     end
 
+    tests("#describe_load_balancer_policy_types").formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICY_TYPES) do
+      @policy_types = Fog::AWS[:elb].describe_load_balancer_policy_types.body
+    end
+
+    tests("#create_load_balancer_policy").formats(AWS::ELB::Formats::BASIC) do
+      policy = 'fog-policy'
+      Fog::AWS[:elb].create_load_balancer_policy(@load_balancer_id, policy, 'PublicKeyPolicyType', {'PublicKey' => AWS::IAM::SERVER_CERT_PUBLIC_KEY}).body
+    end
+
+    tests("#describe_load_balancer_policies").formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICIES) do
+      Fog::AWS[:elb].describe_load_balancer_policies(@load_balancer_id).body
+    end
+
     tests("#delete_load_balancer_policy").formats(AWS::ELB::Formats::BASIC) do
       policy = 'fog-lb-no-expiry'
       Fog::AWS[:elb].delete_load_balancer_policy(@load_balancer_id, policy).body

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/iam/access_key_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests('AWS::IAM | access key requests', ['aws']) do
 
-  unless Fog.mocking?
-    Fog::AWS[:iam].create_user('fog_access_key_tests')
-  end
+  Fog::AWS[:iam].create_user('fog_access_key_tests')
 
   tests('success') do
 
@@ -17,7 +15,6 @@ 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 = Fog::AWS[:iam].create_access_key('UserName' => 'fog_access_key_tests').body
       @access_key_id = data['AccessKey']['AccessKeyId']
       data
@@ -33,7 +30,6 @@ 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?
       Fog::AWS[:iam].list_access_keys('UserName' => 'fog_access_key_tests').body
     end
 
@@ -43,7 +39,6 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
     end
 
     tests("#delete_access_key('#{@access_key_id}', 'UserName' => 'fog_access_key_tests)").formats(AWS::IAM::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].delete_access_key(@access_key_id, 'UserName' => 'fog_access_key_tests').body
     end
 
@@ -57,4 +52,4 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
     Fog::AWS[:iam].delete_user('fog_access_key_tests')
   end
 
-end
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/iam/group_tests.rb

@@ -13,7 +13,6 @@ Shindo.tests('AWS::IAM | group requests', ['aws']) do
     }
 
     tests("#create_group('fog_group')").formats(@group_format) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].create_group('fog_group').body
     end
 
@@ -29,12 +28,10 @@ Shindo.tests('AWS::IAM | group requests', ['aws']) do
     }
 
     tests("#list_groups").formats(@groups_format) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].list_groups.body
     end
 
     tests("#delete_group('fog_group')").formats(AWS::IAM::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].delete_group('fog_group').body
     end
 
@@ -44,4 +41,4 @@ Shindo.tests('AWS::IAM | group requests', ['aws']) do
     test('failing conditions')
   end
 
-end
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/iam/user_policy_tests.rb

@@ -1,15 +1,12 @@
 Shindo.tests('AWS::IAM | user policy requests', ['aws']) do
 
-  unless Fog.mocking?
-    Fog::AWS[:iam].create_user('fog_user_policy_tests')
-  end
+  Fog::AWS[:iam].create_user('fog_user_policy_tests')
 
   tests('success') do
 
     @policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]}
 
     tests("#put_user_policy('fog_user_policy_tests', 'fog_policy', #{@policy.inspect})").formats(AWS::IAM::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].put_user_policy('fog_user_policy_tests', 'fog_policy', @policy).body
     end
 
@@ -19,13 +16,11 @@ Shindo.tests('AWS::IAM | user policy requests', ['aws']) do
       'RequestId'   => String
     }
 
-    tests("list_user_policies('fog_user_policy_tests')").formats(@user_policies_format) do
-      pending if Fog.mocking?
+    tests("#list_user_policies('fog_user_policy_tests')").formats(@user_policies_format) do
       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?
       Fog::AWS[:iam].delete_user_policy('fog_user_policy_tests', 'fog_policy').body
     end
 
@@ -35,8 +30,6 @@ Shindo.tests('AWS::IAM | user policy requests', ['aws']) do
     test('failing conditions')
   end
 
-  unless Fog.mocking?
-    Fog::AWS[:iam].delete_user('fog_user_policy_tests')
-  end
+  Fog::AWS[:iam].delete_user('fog_user_policy_tests')
 
-end
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/iam/user_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
-  unless Fog.mocking?
-    Fog::AWS[:iam].create_group('fog_user_tests')
-  end
+  Fog::AWS[:iam].create_group('fog_user_tests')
 
   tests('success') do
 
@@ -17,7 +15,6 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
     }
 
     tests("#create_user('fog_user')").formats(@user_format) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].create_user('fog_user').body
     end
 
@@ -33,33 +30,43 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
     }
 
     tests("#list_users").formats(@users_format) do
-      pending if Fog.mocking?
       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?
       Fog::AWS[:iam].add_user_to_group('fog_user_tests', 'fog_user').body
     end
 
+    @groups_format = {
+      'GroupsForUser' => [{
+        'Arn'       => String,
+        'GroupId'   => String,
+        'GroupName' => String,
+        'Path'      => String
+      }],
+      'IsTruncated' => Fog::Boolean,
+      'RequestId'   => String
+    }
+
+    tests("#list_groups_for_user('fog_user')").formats(@groups_format) do
+      Fog::AWS[:iam].list_groups_for_user('fog_user').body
+    end
+
     tests("#remove_user_from_group('fog_user_tests', 'fog_user')").formats(AWS::IAM::Formats::BASIC) do
-      pending if Fog.mocking?
       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?
       Fog::AWS[:iam].delete_user('fog_user').body
     end
 
+
   end
 
   tests('failure') do
     test('failing conditions')
   end
 
-  unless Fog.mocking?
-    Fog::AWS[:iam].delete_group('fog_user_tests')
-  end
+  Fog::AWS[:iam].delete_group('fog_user_tests')
 
-end
+end