fog 1.0.0 → 1.1.0

data/lib/fog/aws/requests/emr/run_job_flow.rb

@@ -0,0 +1,106 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/run_job_flow'
+
+        # creates and starts running a new job flow
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_RunJobFlow.html
+        # ==== Parameters
+        # * AdditionalInfo <~String> - A JSON string for selecting additional features.
+        # * BootstrapActions <~Array> - A list of bootstrap actions that will be run before Hadoop is started on the cluster nodes.
+        #   * 'Name'<~String> - The name of the bootstrap action
+        #   * 'ScriptBootstrapAction'<~Array> - The script run by the bootstrap action
+        #     * 'Args' <~Array> - A list of command line arguments to pass to the bootstrap action script
+        #     * 'Path' <~String> - Location of the script to run during a bootstrap action. Can be either a location in Amazon S3 or on a local file system.
+        # * Instances <~Array> - A specification of the number and type of Amazon EC2 instances on which to run the job flow.
+        #   * 'Ec2KeyName'<~String> - Specifies the name of the Amazon EC2 key pair that can be used to ssh to the master node as the user called "hadoop.
+        #   * 'HadoopVersion'<~String> - "0.18" | "0.20" Specifies the Hadoop version for the job flow
+        #   * 'InstanceCount'<~Integer> - The number of Amazon EC2 instances used to execute the job flow
+        #   * 'InstanceGroups'<~Array> - Configuration for the job flow's instance groups
+        #     * 'BidPrice' <~String> - Bid price for each Amazon EC2 instance in the instance group when launching nodes as Spot Instances, expressed in USD.
+        #     * 'InstanceCount'<~Integer> - Target number of instances for the instance group
+        #     * 'InstanceRole'<~String> - MASTER | CORE | TASK The role of the instance group in the cluster
+        #     * 'InstanceType'<~String> - The Amazon EC2 instance type for all instances in the instance group
+        #     * 'MarketType'<~String> - ON_DEMAND | SPOT Market type of the Amazon EC2 instances used to create a cluster node
+        #     * 'Name'<~String> - Friendly name given to the instance group.
+        #   * 'KeepJobFlowAliveWhenNoSteps' <~Boolean> - Specifies whether the job flow should terminate after completing all steps
+        #   * 'MasterInstanceType'<~String> - The EC2 instance type of the master node
+        #   * 'Placement'<~Array> - Specifies the Availability Zone the job flow will run in
+        #     * 'AvailabilityZone' <~String> - The Amazon EC2 Availability Zone for the job flow.
+        #   * 'SlaveInstanceType'<~String> - The EC2 instance type of the slave nodes
+        #   * 'TerminationProtected'<~Boolean> - Specifies whether to lock the job flow to prevent the Amazon EC2 instances from being terminated by API call, user intervention, or in the event of a job flow error
+        # * LogUri <~String> - Specifies the location in Amazon S3 to write the log files of the job flow. If a value is not provided, logs are not created
+        # * Name <~String> - The name of the job flow
+        # * Steps <~Array> - A list of steps to be executed by the job flow
+        #   * 'ActionOnFailure'<~String> - TERMINATE_JOB_FLOW | CANCEL_AND_WAIT | CONTINUE Specifies the action to take if the job flow step fails
+        #   * 'HadoopJarStep'<~Array> - Specifies the JAR file used for the job flow step
+        #     * 'Args'<~String list> - A list of command line arguments passed to the JAR file's main function when executed.
+        #     * 'Jar'<~String> - A path to a JAR file run during the step.
+        #     * 'MainClass'<~String> - The name of the main class in the specified Java file. If not specified, the JAR file should specify a Main-Class in its manifest file
+        #     * 'Properties'<~Array> - A list of Java properties that are set when the step runs. You can use these properties to pass key value pairs to your main function
+        #       * 'Key'<~String> - The unique identifier of a key value pair
+        #       * 'Value'<~String> - The value part of the identified key
+        #   * 'Name'<~String> - The name of the job flow step
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def run_job_flow(name, options={})
+          
+          if bootstrap_actions = options.delete('BootstrapActions')
+            options.merge!(Fog::AWS.serialize_keys('BootstrapActions', bootstrap_actions))
+          end
+          
+          if instances = options.delete('Instances')
+            options.merge!(Fog::AWS.serialize_keys('Instances', instances))
+          end
+          
+          if steps = options.delete('Steps')
+            options.merge!(Fog::AWS.serialize_keys('Steps', steps))
+          end
+    
+          request({
+            'Action'  => 'RunJobFlow',
+            'Name' => name,
+            :parser   => Fog::Parsers::AWS::EMR::RunJobFlow.new,
+          }.merge(options))
+        end
+        
+        def run_hive(name, options={})
+          steps = []
+          steps << {
+            'Name' => 'Setup Hive',
+            'HadoopJarStep' => {
+              'Jar' => 's3://us-east-1.elasticmapreduce/libs/script-runner/script-runner.jar',
+              'Args' => ['s3://us-east-1.elasticmapreduce/libs/hive/hive-script', '--base-path', 's3://us-east-1.elasticmapreduce/libs/hive/', '--install-hive']},
+            'ActionOnFailure' => 'TERMINATE_JOB_FLOW'
+          }
+          steps << {
+            'Name' => 'Install Hive Site Configuration',
+            'HadoopJarStep' => {
+              'Jar' => 's3://us-east-1.elasticmapreduce/libs/script-runner/script-runner.jar',
+              'Args' => ['s3://us-east-1.elasticmapreduce/libs/hive/hive-script', '--base-path',  's3://us-east-1.elasticmapreduce/libs/hive/', '--install-hive-site', '--hive-site=s3://raybeam.okl/prod/hive/hive-site.xml']},
+            'ActionOnFailure' => 'TERMINATE_JOB_FLOW'
+          }
+          options['Steps'] = steps
+          
+          if not options['Instances'].nil?
+            options['Instances']['KeepJobFlowAliveWhenNoSteps'] = true
+          end
+          
+          run_job_flow name, options
+        end
+      end
+
+      class Mock
+
+        def run_job_flow(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/emr/set_termination_protection.rb

@@ -0,0 +1,39 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/set_termination_protection'
+
+        # locks a job flow so the Amazon EC2 instances in the cluster cannot be terminated by user intervention.
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_SetTerminationProtection.html
+        # ==== Parameters
+        # * JobFlowIds <~String list> - list of strings that uniquely identify the job flows to protect
+        # * TerminationProtected <~Boolean> - indicates whether to protect the job flow
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def set_termination_protection(is_protected, options={})
+          
+          if job_ids = options.delete('JobFlowIds')
+            options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids))
+          end
+          request({
+            'Action'  => 'SetTerminationProtection',
+            'TerminationProtected' => is_protected,
+            :parser   => Fog::Parsers::AWS::EMR::SetTerminationProtection.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def set_termination_protection(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/emr/terminate_job_flows.rb

@@ -0,0 +1,37 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/terminate_job_flows'
+
+        # shuts a list of job flows down.
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_TerminateJobFlows.html
+        # ==== Parameters
+        # * JobFlowIds <~String list> - list of strings that uniquely identify the job flows to protect
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def terminate_job_flows(options={})
+          
+          if job_ids = options.delete('JobFlowIds')
+            options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids))
+          end
+          request({
+            'Action'  => 'TerminateJobFlows',
+            :parser   => Fog::Parsers::AWS::EMR::TerminateJobFlows.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def terminate_job_flows(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/iam/get_server_certificate.rb

@@ -18,10 +18,10 @@ module Fog
         # ==== See Also
         # http://docs.amazonwebservices.com/IAM/latest/APIReference/API_GetServerCertificate.html
         #
-        def get_server_certificate(server_certificate_name)
+        def get_server_certificate(name)
           request({
             'Action'                => 'GetServerCertificate',
-            'ServerCertificateName' => server_certificate_name,
+            'ServerCertificateName' => name,
             :parser                 => Fog::Parsers::AWS::IAM::UploadServerCertificate.new
           })
         end
@@ -29,18 +29,16 @@ module Fog
       end
 
       class Mock
-        def get_server_certificate(server_certificate_name)
-          raise Fog::AWS::IAM::NotFound unless self.data[:server_certificates].key?(server_certificate_name)
+        def get_server_certificate(name)
+          raise Fog::AWS::IAM::NotFound unless certificate = self.data[:server_certificates][name]
 
           response = Excon::Response.new
           response.status = 200
           response.body = {
-            'Certificate' => self.data[:server_certificates][server_certificate_name],
+            'Certificate' => certificate,
             'RequestId' => Fog::AWS::Mock.request_id
           }
 
-          self.data[:server_certificates]
-
           response
         end
       end

data/lib/fog/aws/requests/iam/upload_server_certificate.rb

@@ -52,6 +52,7 @@ module Fog
           # Validate cert and key
           begin
             cert = OpenSSL::X509::Certificate.new(certificate)
+            chain = OpenSSL::X509::Certificate.new(options['CertificateChain']) if options['CertificateChain']
             key = OpenSSL::PKey::RSA.new(private_key)
           rescue OpenSSL::X509::CertificateError, OpenSSL::PKey::RSAError => e
             message = if e.is_a?(OpenSSL::X509::CertificateError)

data/lib/fog/aws/requests/simpledb/get_attributes.rb

@@ -29,7 +29,7 @@ module Fog
         #     * 'RequestId'
         def get_attributes(domain_name, item_name, options = {})
           if options.is_a?(Array)
-            Fog::Logger.warning("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options = {'AttributeName' => options}
           end
           options['AttributeName'] ||= []
@@ -49,7 +49,7 @@ module Fog
 
         def get_attributes(domain_name, item_name, options = {})
           if options.is_a?(Array)
-            Fog::Logger.warning("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options['AttributeName'] ||= options if options.is_a?(Array)
           end
           options['AttributeName'] ||= []

data/lib/fog/aws/requests/simpledb/select.rb

@@ -23,7 +23,7 @@ module Fog
         #     * 'NextToken'<~String> - offset to start with if there are are more domains to list
         def select(select_expression, options = {})
           if options.is_a?(String)
-            Fog::Logger.warning("get_attributes with string next_token param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with string next_token param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options = {'NextToken' => options}
           end
           options['NextToken'] ||= nil

data/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/fog/aws/requests/storage/get_object_url.rb

@@ -18,7 +18,7 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         def get_object_url(bucket_name, object_name, expires)
-          Fog::Logger.warning("Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead [light_black](#{caller.first})[/]")
           get_object_https_url(bucket_name, object_name, expires)
         end
 
@@ -27,7 +27,7 @@ module Fog
       class Mock # :nodoc:all
 
         def get_object_url(bucket_name, object_name, expires)
-          Fog::Logger.warning("Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead [light_black](#{caller.first})[/]")
           get_object_https_url(bucket_name, object_name, expires)
         end
 

data/lib/fog/aws/requests/storage/hash_to_acl.rb

@@ -1,44 +1,54 @@
 module Fog
   module Storage
     class AWS
+
       private
         def self.hash_to_acl(acl)
-          data =
-<<-DATA
-<AccessControlPolicy>
-  <Owner>
-    <ID>#{acl['Owner']['ID']}</ID>
-    <DisplayName>#{acl['Owner']['DisplayName']}</DisplayName>
-  </Owner>
-  <AccessControlList>
-DATA
-
-          acl['AccessControlList'].each do |grant|
+          data =  "<AccessControlPolicy>\n"
+
+          if acl['Owner'] && (acl['Owner']['ID'] || acl['Owner']['DisplayName'])
+            data << "  <Owner>\n"
+            data << "    <ID>#{acl['Owner']['ID']}</ID>\n" if acl['Owner']['ID']
+            data << "    <DisplayName>#{acl['Owner']['DisplayName']}</DisplayName>\n" if acl['Owner']['DisplayName']
+            data << "  </Owner>\n"
+          end
+
+          grants = [acl['AccessControlList']].flatten.compact
+
+          data << "  <AccessControlList>\n" if grants.any?
+          grants.each do |grant|
             data << "    <Grant>\n"
-            type = case grant['Grantee'].keys.sort
-            when ['DisplayName', 'ID']
+            grantee = grant['Grantee']
+            type = case
+            when grantee.has_key?('ID')
               'CanonicalUser'
-            when ['EmailAddress']
+            when grantee.has_key?('EmailAddress')
               'AmazonCustomerByEmail'
-            when ['URI']
+            when grantee.has_key?('URI')
               'Group'
             end
+
             data << "      <Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"#{type}\">\n"
-            data << "        <ID>#{grant['Grantee']['ID']}</ID>\n"
-            data << "        <DisplayName>#{grant['Grantee']['DisplayName']}</DisplayName>\n"
+            case type
+            when 'CanonicalUser'
+              data << "        <ID>#{grantee['ID']}</ID>\n" if grantee['ID']
+              data << "        <DisplayName>#{grantee['DisplayName']}</DisplayName>\n" if grantee['DisplayName']
+            when 'AmazonCustomerByEmail'
+              data << "        <EmailAddress>#{grantee['EmailAddress']}</EmailAddress>\n" if grantee['EmailAddress']
+            when 'Group'
+              data << "        <URI>#{grantee['URI']}</URI>\n" if grantee['URI']
+            end
             data << "      </Grantee>\n"
             data << "      <Permission>#{grant['Permission']}</Permission>\n"
             data << "    </Grant>\n"
           end
-          
-          data <<
-<<-DATA
-  </AccessControlList>
-</AccessControlPolicy>
-DATA
+          data << "  </AccessControlList>\n" if grants.any?
+
+          data << "</AccessControlPolicy>"
+
           data
         end
+
     end
-  end      
+  end
 end
-

data/lib/fog/aws/ses.rb

@@ -40,7 +40,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
         # * SES object with connection to AWS.

data/lib/fog/aws/simpledb.rb

@@ -86,6 +86,8 @@ module Fog
             'sdb.amazonaws.com'
           when 'us-west-1'
             'sdb.us-west-1.amazonaws.com'
+          when 'us-west-2'
+            'sdb.us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end

data/lib/fog/aws/sns.rb

@@ -5,7 +5,7 @@ module Fog
     class SNS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent
+      recognizes :host, :path, :port, :scheme, :persistent, :region
 
       request_path 'fog/aws/requests/sns'
       request :add_permission
@@ -65,6 +65,8 @@ module Fog
             'sns.us-east-1.amazonaws.com'
           when 'us-west-1'
             'sns.us-west-1.amazonaws.com'
+          when 'us-west-2'
+            'sns.us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end

data/lib/fog/aws/sqs.rb

@@ -40,7 +40,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end
@@ -71,7 +71,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', '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
         # * SQS object with connection to AWS.
@@ -90,6 +90,8 @@ module Fog
             'queue.amazonaws.com'
           when 'us-west-1'
             'us-west-1.queue.amazonaws.com'
+          when 'us-west-2'
+            'us-west-2.queue.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end

data/lib/fog/aws/storage.rb

@@ -76,7 +76,7 @@ module Fog
         end
 
         def url(params, expires)
-          Fog::Logger.warning("Fog::Storage::AWS => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Storage::AWS => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
           https_url(params, expires)
         end
 
@@ -199,6 +199,8 @@ module Fog
             's3.amazonaws.com'
           when 'us-west-1'
             's3-us-west-1.amazonaws.com'
+          when 'us-west-2'
+            's3-us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
@@ -229,7 +231,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
         #   )
@@ -250,7 +253,11 @@ module Fog
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
-            @path = endpoint.path
+            @path = if endpoint.path.empty?
+              '/'
+            else
+              endpoint.path
+            end
             @port = endpoint.port
             @scheme = endpoint.scheme
           else
@@ -266,6 +273,8 @@ module Fog
               's3.amazonaws.com'
             when 'us-west-1'
               's3-us-west-1.amazonaws.com'
+            when 'us-west-2'
+              's3-us-west-2.amazonaws.com'
             else
               raise ArgumentError, "Unknown region: #{options[:region].inspect}"
             end