Declaration evaluation (#2119)

* Coerce decalarations:

* update wdl4s + custom centaur

* fix dependency

* be more patient..

* centaur develop

backend/src/test/scala/cromwell/backend/BackendSpec.scala

@@ -18,7 +18,7 @@ import wdl4s.values.WdlValue
 
 trait BackendSpec extends ScalaFutures with Matchers with Mockito {
 
-  implicit val defaultPatience = PatienceConfig(timeout = Span(5, Seconds), interval = Span(500, Millis))
+  implicit val defaultPatience = PatienceConfig(timeout = Span(10, Seconds), interval = Span(500, Millis))
 
   def testWorkflow(workflow: TestWorkflow, backend: BackendJobExecutionActor, inputs: Map[String, WdlValue] = Map.empty) = {
     executeJobAndAssertOutputs(backend, workflow.expectedResponse)

engine/src/main/scala/cromwell/engine/workflow/lifecycle/execution/WorkflowExecutionActor.scala

@@ -22,6 +22,8 @@ import lenthall.exception.ThrowableAggregation
 import lenthall.util.TryUtil
 import net.ceedubs.ficus.Ficus._
 import org.apache.commons.lang3.StringUtils
+import wdl4s.WdlExpression.ScopedLookupFunction
+import wdl4s.expression.WdlFunctions
 import wdl4s.values.{WdlArray, WdlBoolean, WdlOptionalValue, WdlString, WdlValue}
 import wdl4s.{Scope, _}
 
@@ -463,7 +465,7 @@ case class WorkflowExecutionActor(workflowDescriptor: EngineWorkflowDescriptor,
       scatterMap
     )
 
-    declaration.requiredExpression.evaluate(lookup, data.expressionLanguageFunctions) match {
+    declaration.evaluate(lookup, data.expressionLanguageFunctions) match {
       case Success(result) => self ! DeclarationEvaluationSucceededResponse(declaration, result)
       case Failure(ex) => self ! DeclarationEvaluationFailedResponse(declaration, ex)
     }
@@ -764,7 +766,11 @@ object WorkflowExecutionActor {
 
   case class StaticDeclarationKey(scope: Declaration, index: ExecutionIndex, value: WdlValue) extends DeclarationKey
 
-  case class DynamicDeclarationKey(scope: Declaration, index: ExecutionIndex, requiredExpression: WdlExpression) extends DeclarationKey
+  case class DynamicDeclarationKey(scope: Declaration, index: ExecutionIndex, requiredExpression: WdlExpression) extends DeclarationKey {
+    def evaluate(lookup: ScopedLookupFunction, wdlFunctions: WdlFunctions[WdlValue]) = {
+      requiredExpression.evaluate(lookup, wdlFunctions) flatMap scope.wdlType.coerceRawValue
+    }
+  }
 
   case class WorkflowExecutionException[T <: Throwable](exceptions: NonEmptyList[T]) extends ThrowableAggregation {
     override val throwables = exceptions.toList

project/Dependencies.scala

@@ -2,7 +2,7 @@ import sbt._
 
 object Dependencies {
   lazy val lenthallV = "0.23-0bebf0c-SNAP"
-  lazy val wdl4sV = "0.11-777de0c-SNAP"
+  lazy val wdl4sV = "0.11-f32b35d-SNAP"
   lazy val sprayV = "1.3.3"
   /*
   spray-json is an independent project from the "spray suite"