fog 1.3.1 → 1.4.0

data/lib/fog/aws/emr.rb

@@ -1,13 +1,14 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class EMR < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       class IdentifierTaken < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/emr'
 
@@ -42,7 +43,7 @@ module Fog
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to EMR
         #
         # ==== Notes
@@ -62,10 +63,9 @@ module Fog
         # ==== Returns
         # * EMR object with connection to AWS.
         def initialize(options={})
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
 
           options[:region] ||= 'us-east-1'
           @host = options[:host] || "elasticmapreduce.#{options[:region]}.amazonaws.com"
@@ -83,7 +83,18 @@ module Fog
 
         private
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
@@ -91,6 +102,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
@@ -109,20 +121,8 @@ module Fog
               :method     => 'POST',
               :parser     => parser
             })
-          rescue Excon::Errors::HTTPStatusError => error
-            if match = error.message.match(/<Code>(.*)<\/Code>[\s\\\w]+<Message>(.*)<\/Message>/m)
-              # case match[1].split('.').last
-              # when 'DBInstanceNotFound', 'DBParameterGroupNotFound', 'DBSnapshotNotFound', 'DBSecurityGroupNotFound'
-              #   raise Fog::AWS::RDS::NotFound.slurp(error, match[2])
-              # when 'DBParameterGroupAlreadyExists'
-              #   raise Fog::AWS::RDS::IdentifierTaken.slurp(error, match[2])
-              # else
-              #   raise
-              # end
-              raise
-            else
-              raise
-            end
+          rescue Excon::Errors::HTTPStatusError
+            raise
           end
 
           response

data/lib/fog/aws/iam.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
@@ -15,24 +15,33 @@ module Fog
 
       request_path 'fog/aws/requests/iam'
       request :add_user_to_group
+      request :add_role_to_instance_profile
       request :create_access_key
       request :create_account_alias
       request :create_group
+      request :create_instance_profile
       request :create_login_profile
+      request :create_role
       request :create_user
       request :delete_access_key
       request :delete_account_alias
       request :delete_group
       request :delete_group_policy
+      request :delete_instance_profile
       request :delete_login_profile
+      request :delete_role
+      request :delete_role_policy
       request :delete_server_certificate
       request :delete_signing_certificate
       request :delete_user
       request :delete_user_policy
       request :get_group
       request :get_group_policy
+      request :get_instance_profile
+      request :get_role_policy
       request :get_login_profile
       request :get_server_certificate
+      request :get_role
       request :get_user
       request :get_user_policy
       request :list_access_keys
@@ -40,12 +49,18 @@ module Fog
       request :list_group_policies
       request :list_groups
       request :list_groups_for_user
+      request :list_instance_profiles
+      request :list_instance_profiles_for_role
+      request :list_roles
+      request :list_role_policies
       request :list_server_certificates
       request :list_signing_certificates
       request :list_user_policies
       request :list_users
       request :put_group_policy
+      request :put_role_policy
       request :put_user_policy
+      request :remove_role_from_instance_profile
       request :remove_user_from_group
       request :update_access_key
       request :update_group
@@ -55,6 +70,15 @@ module Fog
       request :update_user
       request :upload_server_certificate
       request :upload_signing_certificate
+      
+      model_path 'fog/aws/models/iam'
+      model       :user
+      collection  :users
+      model       :policy
+      collection  :policies      
+      model       :access_key
+      collection  :access_keys
+      
 
       class Mock
         def self.data
@@ -123,7 +147,6 @@ module Fog
         # * IAM 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]

data/lib/fog/aws/models/beanstalk/environment.rb

@@ -45,6 +45,12 @@ module Fog
           data
         end
 
+        # Returns the load balancer object associated with the environment.
+        def load_balancer(elb_connection = Fog::AWS[:elb])
+          requires :resources
+          elb_connection.load_balancers.get(resources['LoadBalancer']['LoadBalancerName'])
+        end
+
         # Return events related to this version
         def events
           requires :id
@@ -65,6 +71,16 @@ module Fog
           reload
         end
 
+        def swap_cnames(source)
+          requires :name
+          connection.swap_environment_cnames({
+              'SourceEnvironmentName' => source.name,
+              'DestinationEnvironmentName' => name
+                                             })
+          source.reload
+          reload
+        end
+
         # Return the version object for this environment
         def version
           requires :application_name, :version_label

data/lib/fog/aws/models/beanstalk/template.rb

@@ -55,6 +55,22 @@ module Fog
           merge_attributes(data)
           true
         end
+
+        def modify(new_attributes)
+          requires :name, :application_name
+
+          options = {
+              'ApplicationName' => application_name,
+              'Description' => new_attributes[:description],
+              'OptionSettings' => new_attributes[:option_settings],
+              'TemplateName' => name
+          }
+          options.delete_if {|key, value| value.nil?}
+
+          data = connection.update_configuration_template(options).body['UpdateConfigurationTemplateResult']
+          merge_attributes(data)
+          true
+        end
       end
 
     end

data/lib/fog/aws/models/compute/address.rb

@@ -33,6 +33,10 @@ module Fog
             disassociate
           end
         end
+        
+        def server
+          connection.servers.get(server_id)
+        end
 
         def save
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity

data/lib/fog/aws/models/compute/dhcp_option.rb

@@ -0,0 +1,68 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class DhcpOption < Fog::Model
+
+        identity  :id,                          :aliases => 'dhcpOptionsId'
+        attribute :dhcp_configuration_set,      :aliases => 'dhcpConfigurationSet'
+        attribute :tag_set,                     :aliases => 'tagSet'
+
+        def initialize(attributes={})
+          super
+        end
+
+        # Associates an existing dhcp configration set with a VPC
+        #
+        # dhcp_option.attach(dopt-id, vpc-id)
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def associate(vpc_id)
+          requires :id
+          connection.attach_dhcp_option(id, vpc_id)
+          #reload
+        end
+
+        # Removes an existing dhcp configuration set
+        #
+        # dhcp_option.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+
+        def destroy
+          requires :id
+          connection.delete_dhcp_options(id)
+          true
+        end
+
+        # Create a dhcp configuration set
+        #
+        #  >> g = AWS.dhcp_options.new()
+        #  >> g.save
+        #
+        # == Returns:
+        #
+        # requestId and a dhcpOptions object
+        #
+
+        def save
+          requires :dhcp_configuration_set
+          data = connection.create_dhcp_options(dhcp_configuration_set).body['dhcpOptionsSet'].first
+          new_attributes = data.reject {|key,value| key == 'requestId'}
+          merge_attributes(new_attributes)
+          true
+
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/dhcp_options.rb

@@ -0,0 +1,91 @@
+require 'fog/core/collection'
+require 'fog/aws/models/compute/dhcp_option'
+
+module Fog
+  module Compute
+    class AWS
+
+      class DhcpOptions < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Compute::AWS::DhcpOption
+
+        # Creates a new dhcp option
+        #
+        # AWS.dhcp_options.new
+        #
+        # ==== Returns
+        #
+        # Returns the details of the new DHCP options
+        #
+        #>> AWS.dhcp_options.new
+        #=>   <Fog::Compute::AWS::DhcpOption
+        #id=nil,
+        #dhcp_configuration_set=nil,
+        #tag_set=nil
+        #>
+        #
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        # Returns an array of all DhcpOptions that have been created
+        #
+        # AWS.dhcp_options.all
+        #
+        # ==== Returns
+        #
+        # Returns an array of all DhcpOptions
+        #
+        #>> AWS.dhcp_options.all
+        #<Fog::Compute::AWS::DhcpOptions
+        #filters={}
+        #[
+        #<Fog::Compute::AWS::DhcpOption
+        #id="dopt-some-id",
+        #dhcp_configuration_set={"vpcId"=>"vpc-some-id", "state"=>"available"},
+        #tag_set={}
+        #>
+        #]
+        #>
+        #
+
+        def all(filters = filters)
+          unless filters.is_a?(Hash)
+            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('internet-gateway-id' => []) instead [light_black](#{caller.first})[/]")
+            filters = {'dhcp-options-id' => [*filters]}
+          end
+          self.filters = filters
+          data = connection.describe_dhcp_options(filters).body
+          load(data['dhcpOptionsSet'])
+        end
+
+        # Used to retrieve an DhcpOption
+        #
+        # You can run the following command to get the details:
+        # AWS.dhcp_options.get("dopt-12345678")
+        #
+        # ==== Returns
+        #
+        #>> AWS.dhcp_options.get("dopt-12345678")
+        #=>   <Fog::Compute::AWS::DhcpOption
+        #id="dopt-12345678",
+        #dhcp_configuration_set={"vpcId"=>"vpc-12345678", "state"=>"available"},
+        #tag_set={}
+        #>
+        #
+
+        def get(dhcp_options_id)
+          if dhcp_options_id
+            self.class.new(:connection => connection).all('dhcp-options-id' => dhcp_options_id).first
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/compute/flavors.rb

@@ -20,6 +20,7 @@ module Fog
         { :bits => 64, :cores =>   26, :disk => 1690, :id =>  'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
 
         { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552},
+        { :bits => 64, :cores =>   88, :disk => 3370, :id => 'cc2.8xlarge', :name => 'Cluster Compute Eight Extra Large',     :ram => 61952},
         { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cg1.4xlarge', :name => 'Cluster GPU Quadruple Extra Large',     :ram => 22528}
       ]
 
@@ -119,6 +120,14 @@ module Fog
         #        ram=23552
         #      >,
         #      <Fog::AWS::Compute::Flavor
+        #        id="cc2.8xlarge",
+        #        bits=64,
+        #        cores=88,
+        #        disk=3370,
+        #        name="Cluster Compute Eight Extra Large",
+        #        ram=61952
+        #      >,
+        #      <Fog::AWS::Compute::Flavor
         #        id="cg1.4xlarge",
         #        bits=64,
         #        cores=33.5,
@@ -138,7 +147,7 @@ module Fog
         # Used to retrieve a flavor
         # flavor_id is required to get the associated flavor information.
         # flavors available currently:
-        # 't1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cg1.4xlarge'
+        # 't1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge'
         #
         # You can run the following command to get the details:
         # AWS.flavors.get("t1.micro")

data/lib/fog/aws/models/compute/internet_gateway.rb

@@ -0,0 +1,81 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+
+      class InternetGateway < Fog::Model
+
+        identity  :id,                          :aliases => 'internetGatewayId'
+        attribute :attachment_set,              :aliases => 'attachmentSet'
+        attribute :tag_set,                     :aliases => 'tagSet'
+
+        def initialize(attributes={})
+          super
+        end
+
+        # Attaches an existing internet gateway
+        #
+        # internet_gateway.attach(igw-id, vpc-id)
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def attach(vpc_id)
+          requires :id
+          connection.attach_internet_gateway(id, vpc_id)
+          reload
+        end
+
+        # Detaches an existing internet gateway
+        #
+        # internet_gateway.detach(igw-id, vpc-id)
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def detach(vpc_id)
+          requires :id
+          connection.detach_internet_gateway(id, vpc_id)
+          reload
+        end
+
+
+        # Removes an existing internet gateway
+        #
+        # internet_gateway.destroy
+        #
+        # ==== Returns
+        #
+        # True or false depending on the result
+        #
+        def destroy
+          requires :id
+
+          connection.delete_internet_gateway(id)
+          true
+        end
+
+        # Create an internet gateway
+        #
+        #  >> g = AWS.internet_gateways.new()
+        #  >> g.save
+        #
+        # == Returns:
+        #
+        # requestId and a internetGateway object
+        #
+        def save
+          data = connection.create_internet_gateway.body['internetGatewaySet'].first
+          new_attributes = data.reject {|key,value| key == 'requestId'}
+          merge_attributes(new_attributes)
+          true
+
+          true
+        end
+      end
+    end
+  end
+end