aws-sdk 1.6.3 → 1.6.4

data/lib/aws/simple_email_service/identity.rb

@@ -26,6 +26,16 @@ module AWS
     #   notifications will not be forwarded via email.  Can only be set to
     #   +false+ when there is both a +bounce_topic+ and +complaint_topic+.
     #
+    # @attr [Boolean] dkim_enabled When set to +true+, Easy DKIM signing will
+    #   be enabled for email sent from this identity.
+    #
+    # @attr_reader [Array<String>] dkim_tokens Returns a set of DNS records,
+    #   or tokens, that must be published in the domain name's DNS to 
+    #   complete the DKIM verification process.  Call {#verify_dkim} if this
+    #   returns an empty list.
+    #
+    # @attr_reader [String] dkim_verification_status
+    #
     class Identity < Core::Resource
 
       # @private
@@ -42,6 +52,12 @@ module AWS
 
       attribute :verification_token, :static => true
 
+      mutable_attribute :dkim_enabled, :alias => :dkim_enabled?
+
+      attribute :dkim_tokens
+
+      attribute :dkim_verification_status
+
       mutable_attribute :bounce_topic_arn, :from => :bounce_topic
 
       mutable_attribute :complaint_topic_arn, :from => :complaint_topic
@@ -53,14 +69,31 @@ module AWS
       provider(:get_identity_verification_attributes) do |provider|
         provider.provides :verification_token
         provider.provides :verification_status
-        provider.find{|resp| resp.data[:verification_attributes][identity] }
+        provider.find{|resp| resp[:verification_attributes][identity] }
       end
 
       provider(:get_identity_notification_attributes) do |provider|
         provider.provides :bounce_topic_arn
         provider.provides :complaint_topic_arn
         provider.provides :forwarding_enabled
-        provider.find{|resp| resp.data[:notification_attributes][identity] }
+        provider.find{|resp| resp[:notification_attributes][identity] }
+      end
+
+      provider(:get_identity_dkim_attributes) do |provider|
+        provider.provides :dkim_enabled
+        provider.provides :dkim_verification_status
+        provider.provides :dkim_tokens
+        provider.find{|resp| resp[:dkim_attributes][identity] }
+      end
+
+      # @return [Array<String>] Returns an array of DKIM tokens.
+      def verify_dkim
+        if domain?
+          resp = client.verify_domain_dkim(:domain => identity)
+          reps[:dkim_tokens]
+        else
+          raise "unable to verify dkim for an email address"
+        end
       end
 
       # @param [String,SNS::Topic] topic The topic (ARN string or topic
@@ -94,7 +127,7 @@ module AWS
       # @return [Boolean] Returns +true+ if this {Identity} represents an
       #   email address.
       def email_address?
-        identity =~ /@/ ? true : false
+        identity.match(/@/) ? true : false
       end
 
       # @return [Boolean] Returns +true+ if this {Identity} represents a
@@ -136,13 +169,16 @@ module AWS
       end
 
       def get_resource attr
-        client_opts = {}
-        client_opts[:identities] = [identity]
-        if attr.name.to_s.match(/verification/)
-          client.get_identity_verification_attributes(client_opts)
-        else
-          client.get_identity_notification_attributes(client_opts)
-        end
+
+        method_name =
+          case attr.name.to_s
+          when /dkim/         then :get_identity_dkim_attributes
+          when /verification/ then :get_identity_verification_attributes
+          else                     :get_identity_notification_attributes
+          end
+
+        client.send(method_name, :identities => [identity])
+
       end
 
       def update_resource attr, value
@@ -160,6 +196,9 @@ module AWS
         when :forwarding_enabled
           method = :set_identity_feedback_forwarding_enabled
           client_opts[:forwarding_enabled] = value
+        when :dkim_enabled
+          method = :set_identity_dkim_enabled
+          client_opts[:dkim_enabled] = value
         else raise "unhandled attribute: #{attr.name}"
         end
         client.send(method, client_opts)

data/lib/aws/simple_email_service/identity_collection.rb

@@ -25,7 +25,7 @@ module AWS
 
       # Request verification for an email address or a domain.
       # @param [String] email_or_domain
-      # @return [Identity] Returns an {Identity} object.  Identities for 
+      # @return [Identity] Returns an {Identity} object.  Identities for
       #   domains will have a #verification_token.
       def verify email_or_domain
 
@@ -33,7 +33,7 @@ module AWS
           client.verify_email_identity(:email_address => email_or_domain) :
           client.verify_domain_identity(:domain => email_or_domain)
 
-        Identity.new(email_or_domain, 
+        Identity.new(email_or_domain,
           :verification_token => resp.data[:verification_token],
           :config => config)
 
@@ -41,8 +41,8 @@ module AWS
       alias_method :create, :verify
 
       # @param [String] email_or_domain
-      # @return [Identity] Returns an {Identity} with the given
-      #   email address or domain name.
+      # @return [DomainIdentity,EmailIdentity] Returns an {Identity} with
+      #   the given email address or domain name.
       def [] email_or_domain
         Identity.new(email_or_domain, :config => config)
       end

data/lib/aws/simple_workflow/client.rb

@@ -15,14 +15,9 @@ module AWS
   class SimpleWorkflow
 
     # Client class for Amazon Simple Workflow Service (SWF).
-    class Client < Core::Client
+    class Client < Core::JSONClient
 
-      API_VERSION = '2012-01-25'
-
-      extend Core::JSONClient
-
-      # @private
-      TARGET_PREFIX = "SimpleWorkflowService."
+      define_client_methods('2012-01-25')
 
       # @private
       CACHEABLE_REQUESTS = Set[
@@ -69,7 +64,6 @@ module AWS
       #   a hash with the following structure:
       #   * +count+ - (Integer)
       #   * +truncated+ - (Boolean)
-      define_client_method :count_closed_workflow_executions, 'CountClosedWorkflowExecutions'
 
       # Calls the CountOpenWorkflowExecutions API operation.
       # @method count_open_workflow_executions(options = {})
@@ -90,7 +84,6 @@ module AWS
       #   a hash with the following structure:
       #   * +count+ - (Integer)
       #   * +truncated+ - (Boolean)
-      define_client_method :count_open_workflow_executions, 'CountOpenWorkflowExecutions'
 
       # Calls the CountPendingActivityTasks API operation.
       # @method count_pending_activity_tasks(options = {})
@@ -103,7 +96,6 @@ module AWS
       #   a hash with the following structure:
       #   * +count+ - (Integer)
       #   * +truncated+ - (Boolean)
-      define_client_method :count_pending_activity_tasks, 'CountPendingActivityTasks'
 
       # Calls the CountPendingDecisionTasks API operation.
       # @method count_pending_decision_tasks(options = {})
@@ -116,7 +108,6 @@ module AWS
       #   a hash with the following structure:
       #   * +count+ - (Integer)
       #   * +truncated+ - (Boolean)
-      define_client_method :count_pending_decision_tasks, 'CountPendingDecisionTasks'
 
       # Calls the DeprecateActivityType API operation.
       # @method deprecate_activity_type(options = {})
@@ -126,14 +117,12 @@ module AWS
       #     * +:name+ - *required* - (String)
       #     * +:version+ - *required* - (String)
       # @return [Core::Response]
-      define_client_method :deprecate_activity_type, 'DeprecateActivityType'
 
       # Calls the DeprecateDomain API operation.
       # @method deprecate_domain(options = {})
       # @param [Hash] options
       #   * +:name+ - *required* - (String)
       # @return [Core::Response]
-      define_client_method :deprecate_domain, 'DeprecateDomain'
 
       # Calls the DeprecateWorkflowType API operation.
       # @method deprecate_workflow_type(options = {})
@@ -143,7 +132,6 @@ module AWS
       #     * +:name+ - *required* - (String)
       #     * +:version+ - *required* - (String)
       # @return [Core::Response]
-      define_client_method :deprecate_workflow_type, 'DeprecateWorkflowType'
 
       # Calls the DescribeActivityType API operation.
       # @method describe_activity_type(options = {})
@@ -170,7 +158,6 @@ module AWS
       #       * +name+ - (String)
       #     * +defaultTaskScheduleToStartTimeout+ - (String)
       #     * +defaultTaskScheduleToCloseTimeout+ - (String)
-      define_client_method :describe_activity_type, 'DescribeActivityType'
 
       # Calls the DescribeDomain API operation.
       # @method describe_domain(options = {})
@@ -185,7 +172,6 @@ module AWS
       #     * +description+ - (String)
       #   * +configuration+ - (Hash)
       #     * +workflowExecutionRetentionPeriodInDays+ - (String)
-      define_client_method :describe_domain, 'DescribeDomain'
 
       # Calls the DescribeWorkflowExecution API operation.
       # @method describe_workflow_execution(options = {})
@@ -226,7 +212,6 @@ module AWS
       #     * +openChildWorkflowExecutions+ - (Integer)
       #   * +latestActivityTaskTimestamp+ - (Time)
       #   * +latestExecutionContext+ - (String)
-      define_client_method :describe_workflow_execution, 'DescribeWorkflowExecution'
 
       # Calls the DescribeWorkflowType API operation.
       # @method describe_workflow_type(options = {})
@@ -252,7 +237,6 @@ module AWS
       #     * +defaultTaskList+ - (Hash)
       #       * +name+ - (String)
       #     * +defaultChildPolicy+ - (String)
-      define_client_method :describe_workflow_type, 'DescribeWorkflowType'
 
       # Calls the GetWorkflowExecutionHistory API operation.
       # @method get_workflow_execution_history(options = {})
@@ -547,7 +531,6 @@ module AWS
       #       * +initiatedEventId+ - (Integer)
       #       * +decisionTaskCompletedEventId+ - (Integer)
       #   * +nextPageToken+ - (String)
-      define_client_method :get_workflow_execution_history, 'GetWorkflowExecutionHistory'
 
       # Calls the ListActivityTypes API operation.
       # @method list_activity_types(options = {})
@@ -570,7 +553,6 @@ module AWS
       #     * +creationDate+ - (Time)
       #     * +deprecationDate+ - (Time)
       #   * +nextPageToken+ - (String)
-      define_client_method :list_activity_types, 'ListActivityTypes'
 
       # Calls the ListClosedWorkflowExecutions API operation.
       # @method list_closed_workflow_executions(options = {})
@@ -614,7 +596,6 @@ module AWS
       #     * +tagList+ - (Array<String>)
       #     * +cancelRequested+ - (Boolean)
       #   * +nextPageToken+ - (String)
-      define_client_method :list_closed_workflow_executions, 'ListClosedWorkflowExecutions'
 
       # Calls the ListDomains API operation.
       # @method list_domains(options = {})
@@ -631,7 +612,6 @@ module AWS
       #     * +status+ - (String)
       #     * +description+ - (String)
       #   * +nextPageToken+ - (String)
-      define_client_method :list_domains, 'ListDomains'
 
       # Calls the ListOpenWorkflowExecutions API operation.
       # @method list_open_workflow_executions(options = {})
@@ -670,7 +650,6 @@ module AWS
       #     * +tagList+ - (Array<String>)
       #     * +cancelRequested+ - (Boolean)
       #   * +nextPageToken+ - (String)
-      define_client_method :list_open_workflow_executions, 'ListOpenWorkflowExecutions'
 
       # Calls the ListWorkflowTypes API operation.
       # @method list_workflow_types(options = {})
@@ -693,7 +672,6 @@ module AWS
       #     * +creationDate+ - (Time)
       #     * +deprecationDate+ - (Time)
       #   * +nextPageToken+ - (String)
-      define_client_method :list_workflow_types, 'ListWorkflowTypes'
 
       # Calls the PollForActivityTask API operation.
       # @method poll_for_activity_task(options = {})
@@ -715,7 +693,6 @@ module AWS
       #     * +name+ - (String)
       #     * +version+ - (String)
       #   * +input+ - (String)
-      define_client_method :poll_for_activity_task, 'PollForActivityTask'
 
       # Calls the PollForDecisionTask API operation.
       # @method poll_for_decision_task(options = {})
@@ -1019,7 +996,6 @@ module AWS
       #       * +decisionTaskCompletedEventId+ - (Integer)
       #   * +nextPageToken+ - (String)
       #   * +previousStartedEventId+ - (Integer)
-      define_client_method :poll_for_decision_task, 'PollForDecisionTask'
 
       # Calls the RecordActivityTaskHeartbeat API operation.
       # @method record_activity_task_heartbeat(options = {})
@@ -1030,7 +1006,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +cancelRequested+ - (Boolean)
-      define_client_method :record_activity_task_heartbeat, 'RecordActivityTaskHeartbeat'
 
       # Calls the RegisterActivityType API operation.
       # @method register_activity_type(options = {})
@@ -1046,7 +1021,6 @@ module AWS
       #   * +:default_task_schedule_to_start_timeout+ - (String)
       #   * +:default_task_schedule_to_close_timeout+ - (String)
       # @return [Core::Response]
-      define_client_method :register_activity_type, 'RegisterActivityType'
 
       # Calls the RegisterDomain API operation.
       # @method register_domain(options = {})
@@ -1055,7 +1029,6 @@ module AWS
       #   * +:description+ - (String)
       #   * +:workflow_execution_retention_period_in_days+ - *required* - (String)
       # @return [Core::Response]
-      define_client_method :register_domain, 'RegisterDomain'
 
       # Calls the RegisterWorkflowType API operation.
       # @method register_workflow_type(options = {})
@@ -1070,7 +1043,6 @@ module AWS
       #     * +:name+ - *required* - (String)
       #   * +:default_child_policy+ - (String)
       # @return [Core::Response]
-      define_client_method :register_workflow_type, 'RegisterWorkflowType'
 
       # Calls the RequestCancelWorkflowExecution API operation.
       # @method request_cancel_workflow_execution(options = {})
@@ -1079,7 +1051,6 @@ module AWS
       #   * +:workflow_id+ - *required* - (String)
       #   * +:run_id+ - (String)
       # @return [Core::Response]
-      define_client_method :request_cancel_workflow_execution, 'RequestCancelWorkflowExecution'
 
       # Calls the RespondActivityTaskCanceled API operation.
       # @method respond_activity_task_canceled(options = {})
@@ -1087,7 +1058,6 @@ module AWS
       #   * +:task_token+ - *required* - (String)
       #   * +:details+ - (String)
       # @return [Core::Response]
-      define_client_method :respond_activity_task_canceled, 'RespondActivityTaskCanceled'
 
       # Calls the RespondActivityTaskCompleted API operation.
       # @method respond_activity_task_completed(options = {})
@@ -1095,7 +1065,6 @@ module AWS
       #   * +:task_token+ - *required* - (String)
       #   * +:result+ - (String)
       # @return [Core::Response]
-      define_client_method :respond_activity_task_completed, 'RespondActivityTaskCompleted'
 
       # Calls the RespondActivityTaskFailed API operation.
       # @method respond_activity_task_failed(options = {})
@@ -1104,7 +1073,6 @@ module AWS
       #   * +:reason+ - (String)
       #   * +:details+ - (String)
       # @return [Core::Response]
-      define_client_method :respond_activity_task_failed, 'RespondActivityTaskFailed'
 
       # Calls the RespondDecisionTaskCompleted API operation.
       # @method respond_decision_task_completed(options = {})
@@ -1177,7 +1145,6 @@ module AWS
       #       * +:tag_list+ - (Array<String>)
       #   * +:execution_context+ - (String)
       # @return [Core::Response]
-      define_client_method :respond_decision_task_completed, 'RespondDecisionTaskCompleted'
 
       # Calls the SignalWorkflowExecution API operation.
       # @method signal_workflow_execution(options = {})
@@ -1188,7 +1155,6 @@ module AWS
       #   * +:signal_name+ - *required* - (String)
       #   * +:input+ - (String)
       # @return [Core::Response]
-      define_client_method :signal_workflow_execution, 'SignalWorkflowExecution'
 
       # Calls the StartWorkflowExecution API operation.
       # @method start_workflow_execution(options = {})
@@ -1209,7 +1175,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +runId+ - (String)
-      define_client_method :start_workflow_execution, 'StartWorkflowExecution'
 
       # Calls the TerminateWorkflowExecution API operation.
       # @method terminate_workflow_execution(options = {})
@@ -1221,7 +1186,6 @@ module AWS
       #   * +:details+ - (String)
       #   * +:child_policy+ - (String)
       # @return [Core::Response]
-      define_client_method :terminate_workflow_execution, 'TerminateWorkflowExecution'
 
       ## end client methods ##
 

data/lib/aws/sns/client.rb

@@ -15,11 +15,9 @@ module AWS
   class SNS
 
     # Client class for Amazon Simple Notifications Service (SNS).
-    class Client < Core::Client
+    class Client < Core::QueryClient
 
-      API_VERSION = '2010-03-31'
-
-      extend Core::QueryClient
+      define_client_methods('2010-03-31')
 
       # @private
       CACHEABLE_REQUESTS = Set[]
@@ -41,7 +39,6 @@ module AWS
       #     to allow for the specified principal(s). Valid values: any Amazon
       #     SNS action name.
       # @return [Core::Response]
-      define_client_method :add_permission, 'AddPermission'
 
       # Calls the ConfirmSubscription API operation.
       # @method confirm_subscription(options = {})
@@ -59,7 +56,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:subscription_arn+ - (String)
-      define_client_method :confirm_subscription, 'ConfirmSubscription'
 
       # Calls the CreateTopic API operation.
       # @method create_topic(options = {})
@@ -72,7 +68,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:topic_arn+ - (String)
-      define_client_method :create_topic, 'CreateTopic'
 
       # Calls the DeleteTopic API operation.
       # @method delete_topic(options = {})
@@ -90,7 +85,6 @@ module AWS
       #     <RequestId>fba800b9-3765-11df-8cf3-c58c53254dfb</RequestId>
       #     </ResponseMetadata> </DeleteTopicResponse>
       # @return [Core::Response]
-      define_client_method :delete_topic, 'DeleteTopic'
 
       # Calls the GetSubscriptionAttributes API operation.
       # @method get_subscription_attributes(options = {})
@@ -101,7 +95,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:attributes+ - (Hash<String,String>)
-      define_client_method :get_subscription_attributes, 'GetSubscriptionAttributes'
 
       # Calls the GetTopicAttributes API operation.
       # @method get_topic_attributes(options = {})
@@ -112,7 +105,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:attributes+ - (Hash<String,String>)
-      define_client_method :get_topic_attributes, 'GetTopicAttributes'
 
       # Calls the ListSubscriptions API operation.
       # @method list_subscriptions(options = {})
@@ -129,7 +121,6 @@ module AWS
       #     * +:endpoint+ - (String)
       #     * +:topic_arn+ - (String)
       #   * +:next_token+ - (String)
-      define_client_method :list_subscriptions, 'ListSubscriptions'
 
       # Calls the ListSubscriptionsByTopic API operation.
       # @method list_subscriptions_by_topic(options = {})
@@ -148,7 +139,6 @@ module AWS
       #     * +:endpoint+ - (String)
       #     * +:topic_arn+ - (String)
       #   * +:next_token+ - (String)
-      define_client_method :list_subscriptions_by_topic, 'ListSubscriptionsByTopic'
 
       # Calls the ListTopics API operation.
       # @method list_topics(options = {})
@@ -161,7 +151,6 @@ module AWS
       #   * +:topics+ - (Array<Hash>)
       #     * +:topic_arn+ - (String)
       #   * +:next_token+ - (String)
-      define_client_method :list_topics, 'ListTopics'
 
       # Calls the Publish API operation.
       # @method publish(options = {})
@@ -203,7 +192,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:message_id+ - (String)
-      define_client_method :publish, 'Publish'
 
       # Calls the RemovePermission API operation.
       # @method remove_permission(options = {})
@@ -213,7 +201,6 @@ module AWS
       #   * +:label+ - *required* - (String) The unique label of the statement
       #     you want to remove.
       # @return [Core::Response]
-      define_client_method :remove_permission, 'RemovePermission'
 
       # Calls the SetSubscriptionAttributes API operation.
       # @method set_subscription_attributes(options = {})
@@ -226,7 +213,6 @@ module AWS
       #   * +:attribute_value+ - *required* - (String) The new value for the
       #     attribute.
       # @return [Core::Response]
-      define_client_method :set_subscription_attributes, 'SetSubscriptionAttributes'
 
       # Calls the SetTopicAttributes API operation.
       # @method set_topic_attributes(options = {})
@@ -239,7 +225,6 @@ module AWS
       #   * +:attribute_value+ - *required* - (String) The new value for the
       #     attribute.
       # @return [Core::Response]
-      define_client_method :set_topic_attributes, 'SetTopicAttributes'
 
       # Calls the Subscribe API operation.
       # @method subscribe(options = {})
@@ -266,7 +251,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:subscription_arn+ - (String)
-      define_client_method :subscribe, 'Subscribe'
 
       # Calls the Unsubscribe API operation.
       # @method unsubscribe(options = {})
@@ -274,7 +258,6 @@ module AWS
       #   * +:subscription_arn+ - *required* - (String) The ARN of the
       #     subscription to be deleted.
       # @return [Core::Response]
-      define_client_method :unsubscribe, 'Unsubscribe'
 
       ## end client methods ##