Merge branch 'release-2.4.0'2.4.0

1 files changed, 101 insertions, 34 deletions

diff --git a/boto/swf/layer1.py b/boto/swf/layer1.py
index d39c3d13..73e67ec0 100644
--- a/boto/swf/layer1.py
+++ b/boto/swf/layer1.py
@@ -25,7 +25,8 @@
 import boto
 from boto.connection import AWSAuthConnection
 from boto.provider import Provider
-from boto.exception import DynamoDBResponseError
+from boto.exception import SWFResponseError
+from boto.swf import exceptions as swf_exceptions
 
 import time
 try:
@@ -37,7 +38,7 @@ except ImportError:
 # To get full debug output, uncomment the following line and set the
 # value of Debug to be 2
 #
-#boto.set_stream_logger('dynamodb')
+#boto.set_stream_logger('swf')
 Debug=0
 
 class Layer1(AWSAuthConnection):
@@ -46,16 +47,29 @@ class Layer1(AWSAuthConnection):
     """
 
     DefaultRegionName = 'us-east-1'
-    """The default region name for DynamoDB API."""
+    """The default region name for Simple Workflow."""
 
     ServiceName = 'com.amazonaws.swf.service.model.SimpleWorkflowService'
     """The name of the Service"""
-    
-    ResponseError = DynamoDBResponseError
+
+    # In some cases, the fault response __type value is mapped to
+    # an exception class more specific than SWFResponseError.
+    _fault_excp = {
+        'com.amazonaws.swf.base.model#DomainAlreadyExistsFault':
+            swf_exceptions.SWFDomainAlreadyExistsError,
+        'com.amazonaws.swf.base.model#LimitExceededFault':
+            swf_exceptions.SWFLimitExceededError,
+        'com.amazonaws.swf.base.model#OperationNotPermittedFault':
+            swf_exceptions.SWFOperationNotPermittedError,
+        'com.amazonaws.swf.base.model#TypeAlreadyExistsFault':
+            swf_exceptions.SWFTypeAlreadyExistsError ,
+    }
+
+    ResponseError = SWFResponseError
 
     def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
                  is_secure=True, port=None, proxy=None, proxy_port=None,
-                 host=None, debug=0, session_token=None, region=None):
+                 debug=0, session_token=None, region=None):
         if not region:
             region_name = boto.config.get('SWF', 'region',
                                           self.DefaultRegionName)
@@ -75,9 +89,10 @@ class Layer1(AWSAuthConnection):
 
     def make_request(self, action, body='', object_hook=None):
         """
-        :raises: ``DynamoDBExpiredTokenError`` if the security token expires.
+        :raises: ``SWFResponseError`` if response status is not 200.
         """
         headers = {'X-Amz-Target': '%s.%s' % (self.ServiceName, action),
+                   'Host': self.region.endpoint,
                    'Content-Type': 'application/json; charset=UTF-8',
                    'Content-Encoding': 'amz-1.0',
                    'Content-Length': str(len(body))}
@@ -87,10 +102,19 @@ class Layer1(AWSAuthConnection):
                               override_num_retries=10)
         response_body = response.read()
         boto.log.debug(response_body)
-        if response_body:
-            return json.loads(response_body, object_hook=object_hook)
+        if response.status == 200:
+            if response_body:
+                return json.loads(response_body, object_hook=object_hook)
+            else:
+                return None
         else:
-            return None
+            json_body = json.loads(response_body)
+            fault_name = json_body.get('__type', None)
+            # Certain faults get mapped to more specific exception classes.
+            excp_cls = self._fault_excp.get(fault_name, self.ResponseError)
+            raise excp_cls(response.status, response.reason, body=json_body)
+
+
 
     # Actions related to Activities
         
@@ -655,7 +679,8 @@ class Layer1(AWSAuthConnection):
 
 ## Workflow Management
 
-    def register_workflow_type(self, domain, name, task_list=None,
+    def register_workflow_type(self, domain, name, version,
+                               task_list=None,
                                default_child_policy=None,
                                default_execution_start_to_close_timeout=None,
                                default_task_start_to_close_timeout=None,
@@ -671,6 +696,9 @@ class Layer1(AWSAuthConnection):
         :type name: string
         :param name: The name of the workflow type.
 
+        :type version: string
+        :param version: The version of the workflow type.
+
         :type task_list: list of name, version of tasks
         :param name: If set, specifies the default task list to use
             for scheduling decision tasks for executions of this workflow
@@ -721,7 +749,7 @@ class Layer1(AWSAuthConnection):
         :raises: TypeAlreadyExistsFault, LimitExceededFault,
             UnknownResourceFault, OperationNotPermittedFault
         """
-        data = {'domain': domain, 'name': name}
+        data = {'domain': domain, 'name': name, 'version': version}
         if task_list:
             data['defaultTaskList'] = {'name': task_list}
         if default_child_policy:
@@ -1119,53 +1147,88 @@ class Layer1(AWSAuthConnection):
         json_input = json.dumps(data)
         return self.make_request('CountOpenWorkflowExecutions', json_input)
 
-    def list_open_workflow_executions(self, domain, name, oldest_date, tag, workflow_id, latest_date=None, maximum_page_size=None, next_page_token=None, reverse_order=None, version=None):
-        """
-        No documentation supplied.
+    def list_open_workflow_executions(self, domain,
+                                      latest_date=None,
+                                      oldest_date=None,
+                                      tag=None, workflow_id=None,
+                                      workflow_name=None,
+                                      workflow_version=None,
+                                      maximum_page_size=None,
+                                      next_page_token=None,
+                                      reverse_order=None):
+        """
+        Returns the list of open workflow executions within the
+        given domain that meet the specified filtering criteria.
+
+        .. note:
+            workflow_id, workflow_name/workflow_version
+            and tag are mutually exclusive. You can specify at most
+            one of these in a request.
 
         :type domain: string
-        :param domain: no docs
+        :param domain: The name of the domain containing the
+            workflow executions to count.
 
-        :type name: string
-        :param name: no docs
+        :type latest_date: timestamp
+        :param latest_date: Specifies the latest start or close date
+            and time to return.
 
         :type oldest_date: timestamp
-        :param oldest_date: no docs
+        :param oldest_date: Specifies the oldest start or close date
+            and time to return.
 
         :type tag: string
-        :param tag: no docs
+        :param tag: If specified, only executions that have a tag
+            that matches the filter are counted.
 
         :type workflow_id: string
-        :param workflow_id: no docs
+        :param workflow_id: If specified, only workflow executions
+            matching the workflow_id are counted.
 
-        :type latest_date: timestamp
-        :param latest_date: no docs
+        :type workflow_name: string
+        :param workflow_name: Name of the workflow type to filter on.
+
+        :type workflow_version: string
+        :param workflow_version: Version of the workflow type to filter on.
 
         :type maximum_page_size: integer
-        :param maximum_page_size: no docs
+        :param maximum_page_size: The maximum number of results
+            returned in each page. The default is 100, but the caller can
+            override this value to a page size smaller than the
+            default. You cannot specify a page size greater than 100.
 
         :type next_page_token: string
-        :param next_page_token: no docs
+        :param next_page_token: If on a previous call to this method a
+            NextPageToken was returned, the results are being
+            paginated. To get the next page of results, repeat the call
+            with the returned token and all other arguments unchanged.
 
         :type reverse_order: boolean
-        :param reverse_order: no docs
+        :param reverse_order: When set to true, returns the results in
+            reverse order. By default the results are returned in
+            descending order of the start or the close time of the
+            executions.
 
-        :type version: string
-        :param version: no docs
+        :raises: UnknownResourceFault, OperationNotPermittedFault
 
-        :raises: #UnknownResourceFault, #OperationNotPermittedFault
         """
-        data = {'domain': domain, 'name': name, 'oldestDate': oldest_date, 'tag': tag, 'workflowId': workflow_id}
-        if latest_date:
-            data['latestDate'] = latest_date
+        data = {'domain': domain}
+        data['startTimeFilter'] = {'oldestDate': oldest_date,
+                                   'latestDate': latest_date}
+        if tag:
+            data['tagFilter'] = {'tag': tag}
+        if workflow_name and workflow_version:
+            data['typeFilter'] = {'name': workflow_name,
+                                  'version': workflow_version}
+        if workflow_id:
+            data['executionFilter'] = {'workflowId': workflow_id}
+
         if maximum_page_size:
             data['maximumPageSize'] = maximum_page_size
         if next_page_token:
             data['nextPageToken'] = next_page_token
         if reverse_order:
             data['reverseOrder'] = 'true'
-        if version:
-            data['version'] = version
         json_input = json.dumps(data)
         return self.make_request('ListOpenWorkflowExecutions', json_input)
 
@@ -1356,6 +1419,10 @@ class Layer1(AWSAuthConnection):
         if close_latest_date and close_oldest_date:
             data['closeTimeFilter'] = {'oldestDate': close_oldest_date,
                                        'latestDate': close_latest_date}
+
+        if workflow_id:
+            data['executionFilter'] = {'workflowId': workflow_id}
+
         if close_status:
             data['closeStatusFilter'] = {'status': close_status}
         if tag: