fix tests

broadinstitute · Dec 16, 2024 · a4111d3 · a4111d3
1 parent 37a9ef6
commit a4111d3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/firecloud/service/FireCloudDirectives.scala b/src/main/scala/org/broadinstitute/dsde/firecloud/service/FireCloudDirectives.scala
@@ -41,7 +41,7 @@ object FireCloudDirectiveUtils {
 trait FireCloudDirectives extends Directives with RequestBuilding with RestJsonClient {
 
   @deprecated(message = "Use streamingPassthrough instead", since = "2024-11-16")
-  // 8 usages + 2 usages in test
+  // 5 usages + 2 usages in test
   def passthrough(unencodedPath: String, methods: HttpMethod*): Route =
     passthrough(Uri(unencodedPath), methods: _*)
 

diff --git a/...in/scala/org/broadinstitute/dsde/firecloud/webservice/MethodConfigurationApiService.scala b/...in/scala/org/broadinstitute/dsde/firecloud/webservice/MethodConfigurationApiService.scala
@@ -12,6 +12,12 @@ import org.broadinstitute.dsde.rawls.model.WorkspaceName
 import org.slf4j.LoggerFactory
 
 object MethodConfigurationApiService {
+  val remoteTemplatePath = FireCloudConfig.Rawls.authPrefix + "/methodconfigs/template"
+  val remoteTemplateURL = FireCloudConfig.Rawls.baseUrl + remoteTemplatePath
+
+  val remoteInputsOutputsPath = FireCloudConfig.Rawls.authPrefix + "/methodconfigs/inputsOutputs"
+  val remoteInputsOutputsURL = FireCloudConfig.Rawls.baseUrl + remoteInputsOutputsPath
+
   val remoteCopyFromMethodRepoConfigPath = FireCloudConfig.Rawls.authPrefix + "/methodconfigs/copyFromMethodRepo"
   val remoteCopyFromMethodRepoConfigUrl = FireCloudConfig.Rawls.baseUrl + remoteCopyFromMethodRepoConfigPath
 

diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/webservice/CromIamApiServiceSpec.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/webservice/CromIamApiServiceSpec.scala
@@ -37,16 +37,6 @@ class CromIamApiServiceSpec extends BaseServiceSpec with CromIamApiService with
     lazy val engineRoot: String = "/engine/v1"
     lazy val womtoolRoot: String = "/api/womtool/v1"
 
-    "/api/womtool/{version}/describe" - {
-
-      val endpoint = s"$womtoolRoot/describe"
-
-      "should pass through my methods" in {
-        checkIfPassedThrough(testableRoutes, HttpMethods.POST, endpoint, toBeHandled = true)
-      }
-
-    }
-
     "/api/workflows/{version}/abort" - {
 
       val endpoint = workflowRoot + "/my-bogus-workflow-id-565656/abort"

diff --git a/...cala/org/broadinstitute/dsde/firecloud/webservice/MethodConfigurationApiServiceSpec.scala b/...cala/org/broadinstitute/dsde/firecloud/webservice/MethodConfigurationApiServiceSpec.scala
@@ -159,17 +159,6 @@ class MethodConfigurationApiServiceSpec extends ServiceSpec with MethodConfigura
           }
         }
 
-        s"GET, PUT, DELETE on $path" - {
-          "should receive a MethodNotAllowed" in {
-            List(HttpMethods.GET, HttpMethods.PUT, HttpMethods.DELETE) foreach { method =>
-              new RequestBuilder(method)(path) ~> dummyUserIdHeaders("1234") ~> sealRoute(
-                methodConfigurationRoutes
-              ) ~> check {
-                status should equal(MethodNotAllowed)
-              }
-            }
-          }
-        }
       }
 
       val localMethodConfigPath = "/workspaces/%s/%s/method_configs/%s/%s".format(mockWorkspace.namespace,