Merge 3c2fa1d into fbaa5f8

src/main/resources/swagger/api-docs.yaml

@@ -2351,6 +2351,29 @@ paths:
         500:
           description: Internal Error
 
+  /api/staticNotebooks/convert:
+    post:
+      x-passthrough: true
+      x-passthrough-target: calhoun
+      tags:
+        - Static Notebooks
+      operationId: convertNotebook
+      summary: |
+        Convert a Notebook ipynb file to a static HTML representation
+      description: |
+        Convert a Notebook ipynb file to a static HTML representation
+      parameters:
+        - name: notebook
+          description: Notebook ipynb file
+          required: true
+          in: body
+          type: string
+      responses:
+        200:
+          description: Success
+        500:
+          description: Internal Error
+
   /api/storage/{bucket}/{object}:
     get:
       x-passthrough: false

src/main/scala/org/broadinstitute/dsde/firecloud/FireCloudConfig.scala

@@ -214,4 +214,9 @@ object FireCloudConfig {
     private val notification = config.getConfig("notification")
     val fullyQualifiedNotificationTopic: String = notification.getString("fullyQualifiedNotificationTopic")
   }
+
+  object StaticNotebooks {
+    private val staticNotebooks = config.getConfig("staticNotebooks")
+    val baseUrl: String = staticNotebooks.getString("baseUrl")
+  }
 }

src/main/scala/org/broadinstitute/dsde/firecloud/FireCloudServiceActor.scala

@@ -41,6 +41,7 @@ class FireCloudServiceActor extends HttpServiceActor with FireCloudDirectives
   with ShareLogApiService
   with ManagedGroupApiService
   with CromIamApiService
+  with StaticNotebooksApiService
 {
 
   override lazy val log = LoggerFactory.getLogger(getClass)
@@ -125,7 +126,8 @@ class FireCloudServiceActor extends HttpServiceActor with FireCloudDirectives
   val billingService = new BillingService with ActorRefFactoryContext
   val apiRoutes = methodsApiServiceRoutes ~ profileRoutes ~ cromIamApiServiceRoutes ~
     methodConfigurationService.routes ~ submissionsService.routes ~
-    nihRoutes ~ billingService.routes ~ trialApiServiceRoutes ~ shareLogServiceRoutes
+    nihRoutes ~ billingService.routes ~ trialApiServiceRoutes ~ shareLogServiceRoutes ~
+    staticNotebooksRoutes
 
   val healthService = new HealthService with ActorRefFactoryContext
 

src/main/scala/org/broadinstitute/dsde/firecloud/webservice/StaticNotebooksApiService.scala

@@ -0,0 +1,26 @@
+package org.broadinstitute.dsde.firecloud.webservice
+
+import org.broadinstitute.dsde.firecloud.FireCloudConfig
+import org.broadinstitute.dsde.firecloud.service._
+import org.broadinstitute.dsde.firecloud.utils.StandardUserInfoDirectives
+import spray.http.HttpMethods
+import spray.routing._
+
+trait StaticNotebooksApiService extends HttpService
+  with FireCloudDirectives
+  with StandardUserInfoDirectives {
+
+  private implicit val executionContext = actorRefFactory.dispatcher
+
+  val calhounStaticNotebooksRoot: String = FireCloudConfig.StaticNotebooks.baseUrl
+
+  val staticNotebooksRoutes: Route = {
+    path("staticNotebooks" / "convert") {
+      requireUserInfo() { _ =>
+        post {
+          passthrough(s"$calhounStaticNotebooksRoot/api/convert", HttpMethods.POST)
+        }
+      }
+    }
+  }
+}

src/test/resources/reference.conf

@@ -108,3 +108,8 @@ spray.can.host-connector {
 notification {
   fullyQualifiedNotificationTopic = "dummy"
 }
+
+staticNotebooks {
+  # OK to call deployed GAE dev for unit tests?
+  baseUrl = "https://terra-calhoun-dev.appspot.com"
+}