Merge pull request #100 from Clever/fix-default-queue

Fix default queue
Clever · Nov 30, 2017 · 0f78714 · 0f78714
2 parents 88dc637 + 9ac93f5
commit 0f78714
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/docs/definitions.md b/docs/definitions.md
@@ -194,12 +194,12 @@
 <a name="startworkflowrequest"></a>
 ### StartWorkflowRequest
 
-|Name|Description|Schema|
-|---|---|---|
-|**input**  <br>*optional*||string|
-|**namespace**  <br>*optional*||string|
-|**queue**  <br>*optional*|**Default** : `"default"`|string|
-|**workflowDefinition**  <br>*optional*||[WorkflowDefinitionRef](#workflowdefinitionref)|
+|Name|Schema|
+|---|---|
+|**input**  <br>*optional*|string|
+|**namespace**  <br>*optional*|string|
+|**queue**  <br>*optional*|string|
+|**workflowDefinition**  <br>*optional*|[WorkflowDefinitionRef](#workflowdefinitionref)|
 
 
 <a name="stateresource"></a>

diff --git a/docs/overview.md b/docs/overview.md
@@ -7,7 +7,7 @@ Orchestrator for AWS Step Functions
 
 
 ### Version information
-*Version* : 0.6.12
+*Version* : 0.7.0
 
 
 ### URI scheme

diff --git a/gen-go/models/start_workflow_request.go b/gen-go/models/start_workflow_request.go
diff --git a/gen-js/package.json b/gen-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "workflow-manager",
-  "version": "0.6.12",
+  "version": "0.7.0",
   "description": "Orchestrator for AWS Step Functions",
   "main": "index.js",
   "dependencies": {

diff --git a/handler.go b/handler.go
@@ -153,15 +153,16 @@ func (h Handler) StartWorkflow(ctx context.Context, req *models.StartWorkflowReq
 		return &models.Workflow{}, err
 	}
 
-	if req.Queue == nil {
-		return &models.Workflow{}, fmt.Errorf("workflow queue cannot be nil")
+	if req.Queue == "" {
+		req.Queue = "default"
 	}
+
 	// verify request's tags (map[string]interface{}) are actually map[string]string
 	if err := validateTagsMap(req.Tags); err != nil {
 		return &models.Workflow{}, err
 	}
 
-	return h.manager.CreateWorkflow(workflowDefinition, req.Input, req.Namespace, *req.Queue, req.Tags)
+	return h.manager.CreateWorkflow(workflowDefinition, req.Input, req.Namespace, req.Queue, req.Tags)
 }
 
 // GetWorkflows returns a summary of all workflows matching the given query.

diff --git a/swagger.yml b/swagger.yml
@@ -4,7 +4,7 @@ info:
   description: Orchestrator for AWS Step Functions
   # when changing the version here, make sure to
   # re-run `make generate` to generate clients and server
-  version: 0.6.12
+  version: 0.7.0
   x-npm-package: workflow-manager
 schemes:
   - http
@@ -508,15 +508,18 @@ definitions:
     type: object
     properties:
       workflowDefinition:
+        # required
         $ref: '#/definitions/WorkflowDefinitionRef'
       input:
+        # required
         # format: json
         type: string
       namespace:
+        # required
         type: string
       queue:
+        # not required (defaults to "default")
         type: string
-        default: "default"
       tags:
         description: "tags: object with key-value pairs; keys and values should be strings"
         additionalProperties: