code review

broadinstitute · Jul 21, 2015 · c4cca6f · c4cca6f
1 parent 5ddb421
commit c4cca6f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -32,12 +32,24 @@ backend {
   jes {
     applicationName = "cromwell"
     project = "broad-dsde-dev"
+    baseExecutionBucket = "gs://cromwell-dev/cromwell-executions"
   }
 }
 
 google {
   authScheme = "service" // Either "service" for service account or "user" for user-based, case insensitive
 
+  // If "user" you must supply:
+  //      userAuth
+  //           user
+  //           secretsFile
+  //           dataStoreDir (dir to cache oauth credentials)
+  // You will be asked to do the oauth browser dance
+
+  // If "service" you must supply:
+  //        p12File
+  //        serviceAccountId
+
   userAuth {
     user = "jgentry"
     secretsFile = "/Users/jgentry/.google_client_secret.json"

diff --git a/src/main/scala/cromwell/engine/backend/jes/JesBackend.scala b/src/main/scala/cromwell/engine/backend/jes/JesBackend.scala
@@ -22,6 +22,7 @@ object JesBackend {
   private lazy val JesConf = ConfigFactory.load.getConfig("backend").getConfig("jes")
   lazy val GoogleProject = JesConf.getString("project")
   lazy val GoogleApplicationName = JesConf.getString("applicationName")
+  lazy val CromwellExecutionBucket = JesConf.getString("baseExecutionBucket")
 
   lazy val JesConnection = JesInterface(GoogleApplicationName)
 
@@ -36,8 +37,6 @@ object JesBackend {
   val LocalStdoutValue = "job.stdout.txt"
   val LocalStderrValue = "job.stderr.txt"
 
-  val CromwellExecutionBucket = "gs://cromwell-dev/cromwell-executions"
-
   // Decoration around WorkflowDescriptor to generate bucket names and the like
   implicit class JesWorkflowDescriptor(val descriptor: WorkflowDescriptor) extends AnyVal {
     def bucket = s"$CromwellExecutionBucket/${descriptor.name}/${descriptor.id.toString}"