brightbox-cli 0.16.0 → 0.17.0

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/security_groups.rb

@@ -57,7 +57,7 @@ module Fog
 
         def all(filters = filters)
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('group-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("all with #{filters.class} param is deprecated, use all('group-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'group-name' => [*filters]}
           end
           self.filters = filters

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/server.rb

@@ -169,8 +169,10 @@ module Fog
           data = connection.run_instances(image_id, 1, 1, options)
           merge_attributes(data.body['instancesSet'].first)
 
-          if self.tags
-            for key, value in self.tags
+          if tags = self.tags
+            # expect eventual consistency
+            Fog.wait_for { self.reload rescue nil }
+            for key, value in (self.tags = tags)
               connection.tags.create(
                 :key          => key,
                 :resource_id  => self.identity,

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/servers.rb

@@ -57,7 +57,7 @@ module Fog
 
         def all(filters = self.filters)
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('instance-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("all with #{filters.class} param is deprecated, use all('instance-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'instance-id' => [*filters]}
           end
           self.filters = filters

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/snapshots.rb

@@ -19,7 +19,7 @@ module Fog
 
         def all(filters = filters, options = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('snapshot-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("all with #{filters.class} param is deprecated, use all('snapshot-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'snapshot-id' => [*filters]}
           end
           self.filters = filters

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/spot_request.rb

@@ -55,6 +55,27 @@ module Fog
           super
         end
 
+        def destroy
+          requires :id
+
+          connection.cancel_spot_instance_requests(id)
+          true
+        end
+
+        def key_pair
+          requires :key_name
+
+          connection.key_pairs.all(key_name).first
+        end
+
+        def key_pair=(new_keypair)
+          self.key_name = new_keypair && new_keypair.name
+        end
+
+        def ready?
+          state == 'active'
+        end
+
         def save
           requires :image_id, :flavor_id, :price
 
@@ -83,10 +104,6 @@ module Fog
           merge_attributes( spot_instance_request )
         end
 
-        def ready?
-          state == 'active'
-        end
-
       end
     end
   end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/spot_requests.rb

@@ -17,7 +17,7 @@ module Fog
 
         def all(filters = self.filters)
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('spot-instance-request-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("all with #{filters.class} param is deprecated, use all('spot-instance-request-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'spot-instance-request-id' => [*filters]}
           end
           self.filters = filters
@@ -34,6 +34,50 @@ module Fog
           )
         end
 
+        def bootstrap(new_attributes = {})
+          spot_request = connection.spot_requests.new(new_attributes)
+
+          unless new_attributes[:key_name]
+            # first or create fog_#{credential} keypair
+            name = Fog.respond_to?(:credential) && Fog.credential || :default
+            unless spot_request.key_pair = connection.key_pairs.get("fog_#{name}")
+              spot_request.key_pair = connection.key_pairs.create(
+                :name => "fog_#{name}",
+                :public_key => server.public_key
+              )
+            end
+          end
+
+          # make sure port 22 is open in the first security group
+          security_group = connection.security_groups.get(spot_request.groups.first)
+          authorized = security_group.ip_permissions.detect do |ip_permission|
+            ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
+            ip_permission['fromPort'] == 22 &&
+            ip_permission['ipProtocol'] == 'tcp' &&
+            ip_permission['toPort'] == 22
+          end
+          unless authorized
+            security_group.authorize_port_range(22..22)
+          end
+
+          spot_request.save
+          spot_request.wait_for { ready? }
+          Fog.wait_for { server = connection.servers.get(spot_request.instance_id) }
+          server = connection.servers.get(spot_request.instance_id)
+          if spot_request.tags
+            for key, value in spot_request.tags
+              connection.tags.create(
+                :key          => key,
+                :resource_id  => spot_request.instance_id,
+                :value        => value
+              )
+            end
+          end
+          server.wait_for { ready? }
+          server.setup(:key_data => [server.private_key])
+          server
+        end
+
         def get(spot_request_id)
           if spot_request_id
             self.class.new(:connection => connection).all('spot-instance-request-id' => spot_request_id).first

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/compute/volumes.rb

@@ -64,7 +64,7 @@ module Fog
 
         def all(filters = filters)
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('volume-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("all with #{filters.class} param is deprecated, use all('volume-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'volume-id' => [*filters]}
           end
           self.filters = filters

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

@@ -12,6 +12,8 @@ module Fog
         attribute :health_check,          :aliases => 'HealthCheck'
         attribute :instances,             :aliases => 'Instances'
         attribute :source_group,          :aliases => 'SourceSecurityGroup'
+        attribute :hosted_zone_name,      :aliases => 'CanonicalHostedZoneName'
+        attribute :hosted_zone_name_id,   :aliases => 'CanonicalHostedZoneNameID'
 
         def initialize(attributes={})
           attributes[:availability_zones] ||= attributes['AvailabilityZones'] || %w(us-east-1a us-east-1b us-east-1c us-east-1d)

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/models/storage/file.rb

@@ -104,7 +104,7 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           if options != {}
-            Fog::Logger.warning("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
           end
           options['x-amz-acl'] ||= @acl if @acl
           options['Cache-Control'] = cache_control if cache_control

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/cdn/get_invalidation_list.rb

@@ -15,7 +15,6 @@ module Fog
           end
 
           def end_element(name)
-            puts name
             case name
             when 'InvalidationSummary'
               @response['InvalidationSummary'] << @invalidation_summary

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/cloud_formation/update_stack.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class UpdateStack < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'RequestId', 'StackId'
+              @response[name] = value
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/emr/add_instance_groups.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class AddInstanceGroups < Fog::Parsers::Base
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'InstanceGroupIds'
+              @response['InstanceGroupIds'] = []
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'JobFlowId'
+              @response[name] = value
+            when 'member'
+              @response['InstanceGroupIds'] << value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/emr/add_job_flow_steps.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class AddJobFlowSteps < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/emr/describe_job_flows.rb

@@ -0,0 +1,140 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class DescribeJobFlows < Fog::Parsers::Base
+
+          def reset
+            @context = []
+            @contexts = ['BootstrapActions', 'ExecutionStatusDetail', 'Instances', 'Steps', 'InstanceGroups', 'Args']
+            
+            @response = { 'JobFlows' => [] }
+            @bootstrap_actions = {'ScriptBootstrapActionConfig' => {'Args' => []}}
+            @instance = { 'InstanceGroups' => [], 'Placement' => {}}
+            @step = {
+              'ExecutionStatusDetail' => {}, 
+              'StepConfig' => {
+                'HadoopJarStepConfig' =>  {
+                  'Args' => [],
+                  'Properties' => []
+                }
+              }
+            }
+            @flow = {'Instances' => [], 'ExecutionStatusDetail' => {}, 'BootstrapActions' => [], 'Steps' => []}
+            @instance_group_detail = {}
+            @execution_status_detail = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if @contexts.include?(name)
+              @context.push(name)
+            end
+          end
+
+          def end_element(name)
+            if @context.last == 'BootstrapActions'
+              case name
+              when 'Name'
+                @bootstrap_actions[name] = value
+              when 'Path'
+                @bootstrap_actions['ScriptBootstrapActionConfig'][name] = value
+              when 'BootstrapActions'
+                @flow['BootstrapActions'] = @bootstrap_actions
+                @bootstrap_actions = {'ScriptBootstrapActionConfig' => {'Args' => []}}
+              end
+            end
+            
+            if @context.last == 'ExecutionStatusDetail'
+              case name
+              when 'CreationDateTime', 'EndDateTime', 'LastStateChangeReason', 
+                  'ReadyDateTime', 'StartDateTime', 'State'
+                @execution_status_detail[name] = value             
+              when 'ExecutionStatusDetail'
+                if @context.include?('Steps')
+                  @step['ExecutionStatusDetail'] = @execution_status_detail
+                else
+                  @flow['ExecutionStatusDetail'] = @execution_status_detail
+                end
+                @execution_status_detail = {}
+              end
+            end
+            
+            if @context.last == 'Instances'
+              case name
+              when 'AvailabilityZone'
+                @instance['Placement'][name] = value
+              when 'Ec2KeyName', 'HadoopVersion', 'InstanceCount', 'KeepJobFlowAliveWhenNoSteps',
+                    'MasterInstanceId', 'MasterInstanceType', 'MasterPublicDnsName', 'NormalizedInstanceHours',
+                    'SlaveInstanceType', 'TerminationProtected'
+                @instance[name] = value
+              when 'member'
+                @instance['InstanceGroups'] << @instance_group_detail
+                @instance_group_detail = {}      
+              when 'Instances'
+                @flow['Instances'] = @instance
+                @instance = { 'InstanceGroups' => [], 'Placement' => {}}
+              end
+            end
+            
+            if @context.last == 'InstanceGroups'
+              case name
+              when 'member'
+                @instance['InstanceGroups'] << @instance_group_detail
+                @instance_group_detail = {}
+              else
+                @instance_group_detail[name] = value
+              end
+            end
+            
+            if @context.last == 'Args'
+              if name == 'member'
+                if @context.include?('Steps')
+                  @step['StepConfig']['HadoopJarStepConfig']['Args'] << value.strip
+                else
+                  @bootstrap_actions['ScriptBootstrapActionConfig']['Args'] << value
+                end
+              end
+            end
+            
+            if @context.last == 'Steps'
+              case name
+              when 'ActionOnFailure', 'Name'
+                @step[name] = value
+              when 'Jar', 'MainClass'
+                @step['StepConfig']['HadoopJarStepConfig'][name] = value
+              when 'member'
+                @flow['Steps'] << @step
+                @step = {
+                  'ExecutionStatusDetail' => {}, 
+                  'StepConfig' => {
+                    'HadoopJarStepConfig' =>  {
+                      'Args' => [],
+                      'Properties' => []
+                    }
+                  }
+                }
+              end
+            end
+            
+            if @context.empty?
+              case name
+              when 'AmiVersion', 'JobFlowId', 'LogUri', 'Name'
+                @flow[name] = value
+              when 'member'
+                @response['JobFlows'] << @flow
+                @flow = {'Instances' => [], 'ExecutionStatusDetail' => {}, 'BootstrapActions' => [], 'Steps' => []}
+              end
+            end
+            
+            if @context.last == name
+              @context.pop
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/emr/modify_instance_groups.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class ModifyInstanceGroups < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/emr/run_job_flow.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class RunJobFlow < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'JobFlowId'
+              @response[name] = value
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/emr/set_termination_protection.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class SetTerminationProtection < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/parsers/emr/terminate_job_flows.rb

@@ -0,0 +1,17 @@
+module Fog
+  module Parsers
+    module AWS
+      module EMR
+
+        class TerminateJobFlows < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -79,7 +79,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1'i, 'ap-southeast-1']
+        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
         #
         # ==== Returns
         # * ELB object with connection to AWS.
@@ -101,6 +101,8 @@ module Fog
             'rds.us-east-1.amazonaws.com'
           when 'us-west-1'
             'rds.us-west-1.amazonaws.com'
+          when 'us-west-2'
+            'rds.us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/cloud_formation/create_stack.rb

@@ -17,6 +17,8 @@ module Fog
         #   * NotificationARNs<~Array>: List of SNS topics to publish events to
         #   * Parameters<~Hash>: Hash of providers to supply to template
         #   * TimeoutInMinutes<~Integer>: Minutes to wait before status is set to CREATE_FAILED
+        #   * Capabilities<~Array>: List of capabilties the stack is granted. Currently CAPABILITY_IAM
+        #     for allowing the creation of IAM resources
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -58,6 +60,10 @@ module Fog
           if options['TimeoutInMinutes']
             params['TimeoutInMinutes'] = options['TimeoutInMinutes']
           end
+          
+          if options['Capabilities']
+            params.merge!(Fog::AWS.indexed_param("Capabilities.member", [*options['Capabilities']]))
+          end
 
           request({
             'Action'    => 'CreateStack',

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/cloud_formation/update_stack.rb

@@ -0,0 +1,62 @@
+module Fog
+  module AWS
+    class CloudFormation
+      class Real
+
+        require 'fog/aws/parsers/cloud_formation/update_stack'
+
+        # Update a stack
+        #
+        # ==== Parameters
+        # * stack_name<~String>: name of the stack to update
+        # * options<~Hash>:
+        #   * TemplateBody<~String>: structure containing the template body
+        #   or (one of the two Template parameters is required)
+        #   * TemplateURL<~String>: URL of file containing the template body
+        #   * Parameters<~Hash>: Hash of providers to supply to template
+        #   * Capabilities<~Array>: List of capabilties the stack is granted. Currently CAPABILITY_IAM
+        #     for allowing the creation of IAM resources
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'StackId'<~String> - Id of the stack being updated
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AWSCloudFormation/latest/APIReference/API_UpdateStack.html
+        #
+        def update_stack(stack_name, options = {})
+          params = {
+            'StackName' => stack_name,
+          }
+
+          if options['Parameters']
+            options['Parameters'].keys.each_with_index do |key, index|
+              index += 1 # params are 1-indexed
+              params.merge!({
+                "Parameters.member.#{index}.ParameterKey"   => key,
+                "Parameters.member.#{index}.ParameterValue" => options['Parameters'][key]
+              })
+            end
+          end
+
+          if options['TemplateBody']
+            params['TemplateBody'] = options['TemplateBody']
+          elsif options['TemplateURL']
+            params['TemplateURL'] = options['TemplateURL']
+          end
+
+          if options['Capabilities']
+            params.merge!(Fog::AWS.indexed_param("Capabilities.member", [*options['Capabilities']]))
+          end
+
+          request({
+            'Action'    => 'UpdateStack',
+            :parser     => Fog::Parsers::AWS::CloudFormation::UpdateStack.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end