Revert [CTM-336] Add zip imports to Describe endpoint

Author: lucymcnatt

CromIAM/src/main/resources/swagger/cromiam.yaml

@@ -867,11 +867,6 @@ paths:
           required: false
           type: file
           in: formData
-        - name: workflowDependencies
-          description: ZIP file containing workflow source files that are used to resolve local imports. This zip bundle will be unpacked in a sandbox accessible to this workflow.
-          required: false
-          type: file
-          in: formData
         - $ref: '#/parameters/workflowTypeParam'
         - $ref: '#/parameters/workflowTypeVersionParam'
       responses:

centaur/src/main/scala/centaur/test/workflow/Workflow.scala

@@ -46,8 +46,7 @@ final case class Workflow private (testName: String,
     workflowUrl = data.workflowUrl,
     workflowType = data.workflowType,
     workflowTypeVersion = data.workflowTypeVersion,
-    inputsJson = data.inputs.map(_.unsafeRunSync()),
-    zippedImports = data.zippedImports
+    inputsJson = data.inputs.map(_.unsafeRunSync())
   )
 
   def secondRun: Workflow =

cromwellApiClient/src/main/scala/cromwell/api/CromwellClient.scala

@@ -271,13 +271,7 @@ object CromwellClient {
       Multipart.FormData.BodyPart(name, HttpEntity(MediaTypes.`application/json`, ByteString(source)))
     }
 
-    val zipBodyParts = Map(
-      "workflowDependencies" -> describeRequest.zippedImports
-    ) collect { case (name, Some(file)) =>
-      Multipart.FormData.BodyPart.fromPath(name, MediaTypes.`application/zip`, file.path)
-    }
-
-    val multipartFormData = Multipart.FormData((sourceBodyParts ++ zipBodyParts).toSeq: _*)
+    val multipartFormData = Multipart.FormData(sourceBodyParts.toSeq: _*)
     multipartFormData.toEntity()
   }
 

cromwellApiClient/src/main/scala/cromwell/api/model/WorkflowDescribeRequest.scala

@@ -1,11 +1,8 @@
 package cromwell.api.model
 
-import better.files.File
-
 final case class WorkflowDescribeRequest(workflowSource: Option[String],
                                          workflowUrl: Option[String],
                                          workflowType: Option[String],
                                          workflowTypeVersion: Option[String],
-                                         inputsJson: Option[String],
-                                         zippedImports: Option[File]
+                                         inputsJson: Option[String]
 )

engine/src/main/resources/swagger/cromwell.yaml

@@ -679,11 +679,6 @@ paths:
           in: formData
         - $ref: '#/parameters/workflowTypeParam'
         - $ref: '#/parameters/workflowTypeVersionParam'
-        - name: workflowDependencies
-          description: ZIP file containing workflow source files that are used to resolve local imports. This zip bundle will be unpacked in a sandbox accessible to this workflow.
-          required: false
-          type: file
-          in: formData
       responses:
         '200':
           description: Workflow description.

engine/src/main/scala/cromwell/engine/workflow/lifecycle/materialization/MaterializeWorkflowDescriptorActor.scala

@@ -343,7 +343,7 @@ class MaterializeWorkflowDescriptorActor(override val serviceRegistryActor: Acto
     val zippedResolverCheck: IOChecked[Option[DirectoryResolver]] =
       fromEither[IO](sourceFiles.importsZipFileOption match {
         case None => None.validNelCheck
-        case Some(zipContent) => zippedImportResolver(zipContent).toEither.map(Option.apply)
+        case Some(zipContent) => zippedImportResolver(zipContent, workflowId).toEither.map(Option.apply)
       })
 
     val labels = convertJsonToLabels(sourceFiles.labelsJson)

engine/src/main/scala/cromwell/webservice/routes/WomtoolRouteSupport.scala

@@ -60,7 +60,6 @@ trait WomtoolRouteSupport extends WebServiceUtils with GithubAuthVendingSupport
     val workflowInputs = data.get("workflowInputs").map(_.utf8String)
     val workflowType = data.get("workflowType").map(_.utf8String)
     val workflowVersion = data.get("workflowTypeVersion").map(_.utf8String)
-    val workflowDependencies = data.get("workflowDependencies").map(_.toArray)
 
     val wsfc = WorkflowSourceFilesCollection(
       workflowSource,
@@ -71,7 +70,7 @@ trait WomtoolRouteSupport extends WebServiceUtils with GithubAuthVendingSupport
       workflowInputs.getOrElse(""),
       workflowOptions = WorkflowOptions.empty,
       labelsJson = "",
-      importsFile = workflowDependencies,
+      importsFile = None,
       workflowOnHold = false,
       warnings = Seq.empty,
       requestedWorkflowId = None

languageFactories/language-factory-core/src/main/scala/cromwell/languages/util/ImportResolver.scala

@@ -21,6 +21,7 @@ import net.ceedubs.ficus.Ficus._
 
 import java.nio.file.{Path => NioPath}
 import java.security.MessageDigest
+import cromwell.core.WorkflowId
 import wom.ResolvedImportRecord
 import wom.core.{WorkflowSource, WorkflowUrl}
 import wom.values._
@@ -175,10 +176,10 @@ object ImportResolver {
       directoryHash.map(_.validNel).getOrElse("No hashKey available for directory importer".invalidNel)
   }
 
-  def zippedImportResolver(zippedImports: Array[Byte]): ErrorOr[DirectoryResolver] = {
+  def zippedImportResolver(zippedImports: Array[Byte], workflowId: WorkflowId): ErrorOr[DirectoryResolver] = {
 
     val zipHash = new String(MessageDigest.getInstance("MD5").digest(zippedImports))
-    LanguageFactoryUtil.createImportsDirectory(zippedImports) map { dir =>
+    LanguageFactoryUtil.createImportsDirectory(zippedImports, workflowId) map { dir =>
       DirectoryResolver(dir,
                         Option(dir.toJava.getCanonicalPath),
                         None,

languageFactories/language-factory-core/src/main/scala/cromwell/languages/util/LanguageFactoryUtil.scala

@@ -7,7 +7,7 @@ import common.transforms.CheckedAtoB
 import common.validation.Checked._
 import common.validation.ErrorOr.ErrorOr
 import cromwell.core.CromwellGraphNode.CromwellEnhancedOutputPort
-import cromwell.core.WorkflowSourceFilesCollection
+import cromwell.core.{WorkflowId, WorkflowSourceFilesCollection}
 import cromwell.core.path.BetterFileMethods.OpenOptions
 import cromwell.core.path.{DefaultPathBuilder, Path}
 import cromwell.languages.config.CromwellLanguages
@@ -29,14 +29,11 @@ object LanguageFactoryUtil {
     * @param zipContents the zip contents
     * @return where the imports were unzipped to
     */
-  def createImportsDirectory(zipContents: Array[Byte]): ErrorOr[Path] = {
+  def createImportsDirectory(zipContents: Array[Byte], workflowId: WorkflowId): ErrorOr[Path] = {
 
     def makeZipFile: Try[Path] = Try {
-      // need the unique suffix to avoid collisions in concurrent scenarios
-      // cant use workflowId because this method is used in validation phase before workflowId is assigned
-      val uniqueSuffix = java.util.UUID.randomUUID().toString
       DefaultPathBuilder
-        .createTempFile(s"imports_workflow_${uniqueSuffix}_", ".zip")
+        .createTempFile(s"imports_workflow_${workflowId}_", ".zip")
         .writeByteArray(zipContents)(OpenOptions.default)
     }
 

languageFactories/language-factory-core/src/test/scala/cromwell/languages/util/ImportResolverSpec.scala

@@ -5,6 +5,7 @@ import com.softwaremill.sttp._
 import java.nio.file.{Files, Paths}
 import common.assertion.CromwellTimeoutSpec
 import common.assertion.ErrorOrAssertions._
+import cromwell.core.WorkflowId
 import cromwell.core.path.DefaultPath
 import cromwell.languages.util.ImportResolver.{
   DirectoryResolver,
@@ -385,7 +386,7 @@ class ImportResolverSpec extends AnyFlatSpec with CromwellTimeoutSpec with Match
   it should "resolve paths in zips" in {
     val zipResource = getClass.getResource("/QC.zip").toURI
     val zipBytes = Files.readAllBytes(Paths.get(zipResource))
-    val resolvers = ImportResolver.zippedImportResolver(zipBytes)
+    val resolvers = ImportResolver.zippedImportResolver(zipBytes, WorkflowId.randomId())
 
     // Not the most elegant way to get the paths, but gets the job done.
     val resolver = resolvers.toList.head