brightbox-cli 0.14.1 → 0.15.0

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/sqs/receive_message.rb

@@ -28,7 +28,61 @@ module Fog
         end
 
       end
-
+      
+      class Mock
+        
+        def receive_message(queue_url, options = {})
+          Excon::Response.new.tap do |response|
+            if (queue = data[:queues][queue_url])
+              max_number_of_messages = options['MaxNumberOfMessages'] || 1
+              now = Time.now
+              
+              keys = queue[:messages].keys[0, max_number_of_messages]
+              
+              messages = queue[:messages].values_at(*keys).map do |m|
+                message_id = m['MessageId']
+                
+                invisible = if (received_handles = queue[:receipt_handles][message_id])
+                  visibility_timeout = m['Attributes']['VisibilityTimeout'] || queue['Attributes']['VisibilityTimeout']
+                  received_handles.any? { |handle, time| now < time + visibility_timeout }
+                else
+                  false
+                end
+                
+                if invisible
+                  nil
+                else
+                  receipt_handle = Fog::Mock.random_base64(300)
+                  
+                  queue[:receipt_handles][message_id] ||= {}
+                  queue[:receipt_handles][message_id][receipt_handle] = now
+                  
+                  m['Attributes'].tap do |attrs|
+                    attrs['ApproximateFirstReceiveTimestamp'] ||= now
+                    attrs['ApproximateReceiveCount'] = (attrs['ApproximateReceiveCount'] || 0) + 1
+                  end
+                  
+                  m.merge({
+                    'ReceiptHandle' => receipt_handle
+                  })
+                end
+              end.compact
+              
+              response.body = {
+                'ResponseMetadata' => {
+                  'RequestId' => Fog::AWS::Mock.request_id
+                },
+                'Message' => messages
+              }
+              response.status = 200
+            else
+              response.status = 404
+              raise(Excon::Errors.status_error({:expects => 200}, response))
+            end
+          end
+        end
+        
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/sqs/send_message.rb

@@ -25,7 +25,45 @@ module Fog
         end
 
       end
-
+      
+      class Mock
+        
+        def send_message(queue_url, message)
+          Excon::Response.new.tap do |response|
+            if (queue = data[:queues][queue_url])
+              response.status = 200
+              
+              now        = Time.now
+              message_id = Fog::AWS::Mock.sqs_message_id
+              md5        = Digest::MD5.hexdigest(message)
+              
+              queue[:messages][message_id] = {
+                'MessageId'  => message_id,
+                'Body'       => message,
+                'MD5OfBody'  => md5,
+                'Attributes' => {
+                  'SenderId'      => Fog::AWS::Mock.sqs_message_id,
+                  'SentTimestamp' => now
+                }
+              }
+              
+              queue['Attributes']['LastModifiedTimestamp'] = now
+              
+              response.body = {
+                'ResponseMetadata' => {
+                  'RequestId' => Fog::AWS::Mock.request_id
+                },
+                'MessageId'        => message_id,
+                'MD5OfMessageBody' => md5
+              }
+            else
+              response.status = 404
+              raise(Excon::Errors.status_error({:expects => 200}, response))
+            end
+          end
+        end
+        
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/sqs/set_queue_attributes.rb

@@ -27,7 +27,25 @@ module Fog
         end
 
       end
-
+      
+      class Mock
+        def set_queue_attributes(queue_url, attribute_name, attribute_value)
+          Excon::Response.new.tap do |response|
+            if (queue = data[:queues][queue_url])
+              response.status = 200
+              queue['Attributes'][attribute_name] = attribute_value
+              response.body = {
+                'ResponseMetadata' => {
+                  'RequestId' => Fog::AWS::Mock.request_id
+                }
+              }
+            else
+              response.status = 404
+              raise(Excon::Errors.status_error({:expects => 200}, response))
+            end
+          end
+        end
+      end
     end
   end
 end

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

@@ -55,7 +55,7 @@ module Fog
             response.status = 200
             target_object = source_object.dup
             target_object.merge!({
-              'Name' => target_object_name
+              'Key' => target_object_name
             })
             target_bucket[:objects][target_object_name] = target_object
             response.body = {

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

@@ -59,7 +59,7 @@ module Fog
 
       class Mock # :nodoc:all
 
-        def get_object_acl(bucket_name, object_name)
+        def get_object_acl(bucket_name, object_name, options = {})
           response = Excon::Response.new
           if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name]
             response.status = 200

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

@@ -24,9 +24,8 @@ DATA
               'Group'
             end
             data << "      <Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"#{type}\">\n"
-            for key, value in grant['Grantee']
-              data << "        <#{key}>#{value}</#{key}>\n"
-            end
+            data << "        <ID>#{grant['Grantee']['ID']}</ID>\n"
+            data << "        <DisplayName>#{grant['Grantee']['DisplayName']}</DisplayName>\n"
             data << "      </Grantee>\n"
             data << "      <Permission>#{grant['Permission']}</Permission>\n"
             data << "    </Grant>\n"

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

@@ -19,8 +19,38 @@ module Fog
       request :set_queue_attributes
 
       class Mock
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            owner_id = Fog::AWS::Mock.owner_id
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :owner_id => Fog::AWS::Mock.owner_id,
+                :queues   => {}
+              }
+            end
+          end
+        end
+        
+        def self.reset
+          @data = nil
+        end
 
         def initialize(options={})
+          @aws_access_key_id = options[:aws_access_key_id]
+
+          @region = options[:region] || 'us-east-1'
+
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1'].include?(@region)
+            raise ArgumentError, "Unknown region: #{@region.inspect}"
+          end
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
         end
 
       end

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

@@ -229,7 +229,8 @@ module Fog
         # :aws_secret_access_key in order to create a connection
         #
         # ==== Examples
-        #   s3 = S3.new(
+        #   s3 = Fog::Storage.new(
+        #     :provider => "AWS",
         #     :aws_access_key_id => your_aws_access_key_id,
         #     :aws_secret_access_key => your_aws_secret_access_key
         #   )

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

@@ -5,20 +5,21 @@ module Fog
 
     extend Fog::Provider
 
-    service(:auto_scaling,    'aws/auto_scaling')
-    service(:cdn,             'aws/cdn')
-    service(:compute,         'aws/compute')
-    service(:cloud_formation, 'aws/cloud_formation')
-    service(:cloud_watch,     'aws/cloud_watch')
-    service(:dns,             'aws/dns')
-    service(:elb,             'aws/elb')
-    service(:iam,             'aws/iam')
-    service(:rds,             'aws/rds')
-    service(:ses,             'aws/ses')
-    service(:simpledb,        'aws/simpledb')
-    service(:sns,             'aws/sns')
-    service(:sqs,             'aws/sqs')
-    service(:storage,         'aws/storage')
+    service(:auto_scaling,    'aws/auto_scaling',     'AutoScaling')
+    service(:cdn,             'aws/cdn',              'CDN')
+    service(:compute,         'aws/compute',          'Compute')
+    service(:cloud_formation, 'aws/cloud_formation',  'CloudFormation')
+    service(:cloud_watch,     'aws/cloud_watch',      'CloudWatch')
+    service(:dns,             'aws/dns',              'DNS')
+    service(:elasticache,     'aws/elasticache',      'Elasticache')
+    service(:elb,             'aws/elb',              'ELB')
+    service(:iam,             'aws/iam',              'IAM')
+    service(:rds,             'aws/rds',              'RDS')
+    service(:ses,             'aws/ses',              'SES')
+    service(:simpledb,        'aws/simpledb',         'SimpleDB')
+    service(:sns,             'aws/sns',              'SNS')
+    service(:sqs,             'aws/sqs',              'SQS')
+    service(:storage,         'aws/storage',          'Storage')
 
     def self.indexed_param(key, values)
       params = {}
@@ -177,6 +178,8 @@ module Fog
       class << self
         alias :reserved_instances_id :request_id
         alias :reserved_instances_offering_id :request_id
+        alias :sqs_message_id :request_id
+        alias :sqs_sender_id :request_id
       end
 
       def self.reservation_id

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

@@ -15,6 +15,8 @@ class AWS < Fog::Bin
         Fog::Compute::AWS
       when :dns
         Fog::DNS::AWS
+      when :elasticache
+        Fog::AWS::Elasticache
       when :elb
         Fog::AWS::ELB
       when :iam
@@ -57,6 +59,8 @@ class AWS < Fog::Bin
         when :dns
           Fog::Logger.warning("AWS[:dns] is deprecated, use DNS[:aws] instead")
           Fog::DNS.new(:provider => 'AWS')
+        when :elasticache
+          Fog::AWS::Elasticache.new
         when :elb
           Fog::AWS::ELB.new
         when :iam

data/lib/brightbox-cli/vendor/fog/lib/fog/bin/openstack.rb

@@ -0,0 +1,31 @@
+class OpenStack < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::OpenStack
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Logger.warning("OpenStack[:compute] is deprecated, use Compute[:rackspace] instead")
+          Fog::Compute.new(:provider => 'OpenStack')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::OpenStack.services
+    end
+
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/bin.rb

@@ -68,6 +68,7 @@ require 'fog/bin/local'
 require 'fog/bin/new_servers'
 require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
+require 'fog/bin/openstack'
 require 'fog/bin/slicehost'
 require 'fog/bin/stormondemand'
 require 'fog/bin/terremark'

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

@@ -21,7 +21,7 @@ module Fog
         attribute :storage
         attribute :template
 
-        attr_accessor :password, :lb_applications, :lb_services, :lb_backends
+        attr_accessor :hostname, :password, :lb_applications, :lb_services, :lb_backends
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})

data/lib/brightbox-cli/vendor/fog/lib/fog/bluebox/requests/compute/create_template.rb

@@ -14,7 +14,7 @@ module Fog
         # TODO
         def create_template(block_id, options={})
           request(
-            :expects  => 200,
+            :expects  => 202,
             :method   => 'POST',
             :path     => "api/block_templates.json",
             :query    => {'id' => block_id}.merge!(options)

data/lib/brightbox-cli/vendor/fog/lib/fog/bluebox.rb

@@ -5,8 +5,8 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'bluebox/compute')
-    service(:dns,     'bluebox/dns')
+    service(:compute, 'bluebox/compute',  'Compute')
+    service(:dns,     'bluebox/dns',      'DNS')
 
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/brightbox/compute.rb

@@ -16,6 +16,10 @@ module Fog
       model       :server
       collection  :server_groups
       model       :server_group
+      collection  :firewall_policies
+      model       :firewall_policy
+      collection  :firewall_rules
+      model       :firewall_rule
       collection  :flavors
       model       :flavor
       collection  :images
@@ -35,6 +39,7 @@ module Fog
       request :add_nodes_load_balancer
       request :add_servers_server_group
       request :apply_to_firewall_policy
+      request :remove_firewall_policy
       request :create_api_client
       request :create_cloud_ip
       request :create_firewall_policy

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

@@ -60,4 +60,4 @@ module Fog
 
     end
   end
-end
+end

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

@@ -0,0 +1,29 @@
+require 'fog/core/collection'
+require 'fog/brightbox/models/compute/firewall_policy'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallPolicies < Fog::Collection
+
+        model Fog::Compute::Brightbox::FirewallPolicy
+
+        def all
+          data = connection.list_firewall_policies
+          load(data)
+        end
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = connection.get_firewall_policy(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallPolicy < Fog::Model
+
+        identity :id
+        attribute :url
+        attribute :resource_type
+
+        attribute :name
+        attribute :description
+
+        attribute :default
+
+        attribute :server_group_id, :aliases => "server_group", :squash => "id"
+        attribute :created_at, :type => :time
+        attribute :rules
+
+        # Sticking with existing Fog behaviour, save does not update but creates a new resource
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          options = {
+            :server_group => server_group_id,
+            :name => name,
+            :description => description
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_firewall_policy(options)
+          merge_attributes(data)
+          true
+        end
+
+        def apply_to(server_group_id)
+          requires :identity
+          options = {
+            :server_group => server_group_id
+          }
+          data = connection.apply_to_firewall_policy(identity, options)
+          merge_attributes(data)
+          true
+        end
+
+        def remove(server_group_id)
+          requires :identity
+          options = {
+            :server_group => server_group_id
+          }
+          data = connection.remove_firewall_policy(identity, options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          data = connection.destroy_firewall_policy(identity)
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallRule < Fog::Model
+
+        identity :id
+        attribute :url
+        attribute :resource_type
+
+        attribute :description
+
+        attribute :source
+        attribute :source_port
+        attribute :destination
+        attribute :destination_port
+        attribute :protocol
+        attribute :icmp_type_name
+        attribute :created_at, :type => :time
+
+        attribute :firewall_policy_id, :aliases => "firewall_policy", :squash => "id"
+
+        # Sticking with existing Fog behaviour, save does not update but creates a new resource
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          requires :firewall_policy_id
+          options = {
+            :firewall_policy => firewall_policy_id,
+            :protocol => protocol,
+            :description => description,
+            :source => source,
+            :source_port => source_port,
+            :destination => destination,
+            :destination_port => destination_port,
+            :icmp_type_name => icmp_type_name
+          }.delete_if {|k,v| v.nil? || v == "" }
+          data = connection.create_firewall_rule(options)
+          merge_attributes(data)
+          true
+        end
+
+        def destroy
+          requires :identity
+          connection.destroy_firewall_rule(identity)
+          true
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'fog/core/collection'
+require 'fog/brightbox/models/compute/firewall_rule'
+
+module Fog
+  module Compute
+    class Brightbox
+
+      class FirewallRules < Fog::Collection
+
+        model Fog::Compute::Brightbox::FirewallRule
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = connection.get_firewall_rule(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module Fog
         attribute :resource_type
 
         attribute :name
+        attribute :username
         attribute :status
         attribute :description
 
@@ -43,6 +44,7 @@ module Fog
             :source => source,
             :arch => arch,
             :name => name,
+            :username => username,
             :description => description
           }.delete_if {|k,v| v.nil? || v == "" }
           data = connection.create_image(options)

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

@@ -27,18 +27,43 @@ module Fog
         # Links - to be replaced
         attribute :account_id,  :aliases => "account",      :squash => "id"
         attribute :image_id,    :aliases => "image",        :squash => "id"
-        attribute :flavor_id,   :aliases => "server_type",  :squash => "id"
-        attribute :zone_id,     :aliases => "zone",         :squash => "id"
+
         attribute :snapshots
         attribute :cloud_ips
         attribute :interfaces
         attribute :server_groups
+        attribute :zone
+        attribute :server_type
 
         def initialize(attributes={})
           self.image_id   ||= 'img-2ab98' # Ubuntu Lucid 10.04 server (i686)
           super
         end
 
+        def zone_id
+          if t_zone_id = attributes[:zone_id]
+            t_zone_id
+          elsif zone
+            zone[:id] || zone['id']
+          end
+        end
+
+        def flavor_id
+          if t_flavour_id = attributes[:flavor_id]
+            t_flavour_id
+          elsif server_type
+            server_type[:id] || server_type['id']
+          end
+        end
+
+        def zone_id=(incoming_zone_id)
+          attributes[:zone_id] = incoming_zone_id
+        end
+
+        def flavor_id=(incoming_flavour_id)
+          attributes[:flavor_id] = incoming_flavour_id
+        end
+
         def snapshot
           requires :identity
           connection.snapshot_server(identity)

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

@@ -16,9 +16,9 @@ module Fog
         attribute :name
         attribute :description
         attribute :default
+        attribute :created_at, :type => :time
 
         def save
-          requires :name
           options = {
             :name => name,
             :description => description

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

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        def remove_firewall_policy(identifier, options)
+          return nil if identifier.nil? || identifier == ""
+          request("post", "/1.0/firewall_policies/#{identifier}/remove", [202], options)
+        end
+
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Fog
   module Brightbox
     extend Fog::Provider
 
-    service(:compute, 'brightbox/compute')
+    service(:compute, 'brightbox/compute', 'Compute')
 
   end
 end