fog 1.1.1 → 1.1.2

data/lib/fog/aws/sts.rb

@@ -0,0 +1,137 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+
+module Fog
+  module AWS
+    class STS < Fog::Service
+
+      class EntityAlreadyExists < Fog::AWS::STS::Error; end
+      class ValidationError < Fog::AWS::STS::Error; end
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :persistent
+
+      request_path 'fog/aws/requests/sts'
+      request :get_federation_token
+      request :get_session_token
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :owner_id => Fog::AWS::Mock.owner_id,
+              :server_certificates => {}
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def self.server_certificate_id
+          Fog::Mock.random_hex(16)
+        end
+
+        def initialize(options={})
+          @aws_access_key_id = options[:aws_access_key_id]
+        end
+
+        def data
+          self.class.data[@aws_access_key_id]
+        end
+
+        def reset_data
+          self.class.data.delete(@aws_access_key_id)
+        end
+      end
+
+      class Real
+
+        # Initialize connection to STS
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   iam = STS.new(
+        #    :aws_access_key_id => your_aws_access_key_id,
+        #    :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #
+        # ==== Returns
+        # * STS object with connection to AWS.
+        def initialize(options={})
+          require 'fog/core/parser'
+          require 'multi_json'
+
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @connection_options     = options[:connection_options] || {}
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @host       = options[:host]        || 'sts.amazonaws.com'
+          @path       = options[:path]        || '/'
+          @persistent = options[:persistent]  || false
+          @port       = options[:port]        || 443
+          @scheme     = options[:scheme]      || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def request(params)
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body = Fog::AWS.signed_params(
+            params,
+            {
+              :aws_access_key_id  => @aws_access_key_id,
+              :hmac               => @hmac,
+              :host               => @host,
+              :path               => @path,
+              :port               => @port,
+              :version            => '2011-06-15'
+            }
+          )
+
+          begin
+            response = @connection.request({
+              :body       => body,
+              :expects    => 200,
+              :idempotent => idempotent,
+              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :host       => @host,
+              :method     => 'POST',
+              :parser     => parser
+            })
+
+            response
+          rescue Excon::Errors::HTTPStatusError => error
+            if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
+              case match[1]
+              when 'EntityAlreadyExists', 'KeyPairMismatch', 'LimitExceeded', 'MalformedCertificate', 'ValidationError'
+                raise Fog::AWS::STS.const_get(match[1]).slurp(error, match[2])
+              else
+                raise Fog::AWS::STS::Error.slurp(error, "#{match[1]} => #{match[2]}") if match[1]
+                raise
+              end
+            else
+              raise
+            end
+          end
+
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/bin.rb

@@ -55,6 +55,7 @@ end
 require 'fog/bin/aws'
 require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
+require 'fog/bin/clodo'
 require 'fog/bin/dnsimple'
 require 'fog/bin/dnsmadeeasy'
 require 'fog/bin/dynect'

data/lib/fog/bin/aws.rb

@@ -35,6 +35,8 @@ class AWS < Fog::Bin
         Fog::AWS::RDS
       when :sns
         Fog::AWS::SNS
+      when :sts
+        Fog::AWS::STS
       else
         # @todo Replace most instances of ArgumentError with NotImplementedError
         # @todo For a list of widely supported Exceptions, see:

data/lib/fog/bin/clodo.rb

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

data/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
@@ -80,6 +85,7 @@ module Fog
       request :remove_nodes_load_balancer
       request :remove_servers_server_group
       request :reset_ftp_password_account
+      request :reset_secret_api_client
       request :resize_server
       request :shutdown_server
       request :snapshot_server
@@ -88,6 +94,7 @@ module Fog
       request :unmap_cloud_ip
       request :update_account
       request :update_api_client
+      request :update_cloud_ip
       request :update_image
       request :update_load_balancer
       request :update_server

data/lib/fog/brightbox/models/compute/cloud_ip.rb

@@ -23,9 +23,17 @@ module Fog
         attribute :server_id, :aliases => "server", :squash => "id"
         attribute :load_balancer, :alias => "load_balancer", :squash => "id"
 
-        def map(interface_to_map)
+        def map(destination)
           requires :identity
-          connection.map_cloud_ip(identity, :interface => interface_to_map)
+          case destination
+          when Fog::Compute::Brightbox::Server
+            final_destination = destination.interfaces.first["id"]
+          when Fog::Compute::Brightbox::LoadBalancer
+            final_destination = destination.id
+          else
+            final_destination = destination
+          end
+          connection.map_cloud_ip(identity, :destination => final_destination)
         end
 
         def mapped?

data/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/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/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/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/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/fog/brightbox/models/compute/server.rb

@@ -27,17 +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)
+          self.image_id   ||= 'img-4gqhs' # 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)
@@ -82,11 +108,19 @@ module Fog
         end
 
         def private_ip_address
-          interfaces.first
+          unless interfaces.empty?
+            interfaces.first["ipv4_address"]
+          else
+            nil
+          end
         end
 
         def public_ip_address
-          cloud_ips.first
+          unless cloud_ips.empty?
+            cloud_ips.first["public_ip"]
+          else
+            nil
+          end
         end
 
         def ready?
@@ -106,7 +140,8 @@ module Fog
             :image => image_id,
             :name => name,
             :zone => zone_id,
-            :user_data => user_data
+            :user_data => user_data,
+            :server_groups => server_groups
           }.delete_if {|k,v| v.nil? || v == "" }
           unless flavor_id.nil? || flavor_id == ""
             options.merge!(:server_type => flavor_id)