Fix test, clearer naming

broadinstitute · Feb 11, 2025 · cc0aba1 · cc0aba1
1 parent 1f036c1
commit cc0aba1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/backend/src/main/scala/cromwell/backend/standard/callcaching/StandardFileHashingActor.scala b/backend/src/main/scala/cromwell/backend/standard/callcaching/StandardFileHashingActor.scala
@@ -99,11 +99,12 @@ abstract class StandardFileHashingActor(standardParams: StandardFileHashingActor
       fsConfigs <- configurationDescriptor.backendConfig.as[Option[Config]]("filesystems").toList
       fsKey <- fsConfigs.root.keySet().asScala
       configKey = s"${fsKey}.caching.hashing-strategy"
-      fileHashStrategyFromList = Try(fsConfigs.as[List[String]](configKey)).toOption
-      fileHashStrategyFromString = Try(fsConfigs.as[String](configKey)).toOption.map(List(_))
-      fileHashStrategy <- fileHashStrategyFromList.orElse(fileHashStrategyFromString)
-      nonEmptyFileHashStrategy <- if (fileHashStrategy.nonEmpty) Option(fileHashStrategy) else None
-    } yield (fsKey, FileHashStrategy.of(nonEmptyFileHashStrategy))
+      fileHashStrategyConfigFromList = Try(fsConfigs.as[List[String]](configKey)).toOption
+      fileHashStrategyConfigFromString = Try(fsConfigs.as[String](configKey)).toOption.map(List(_))
+      fileHashStrategyConfig <- fileHashStrategyConfigFromList.orElse(fileHashStrategyConfigFromString)
+      fileHashStrategy = FileHashStrategy.of(fileHashStrategyConfig)
+      nonEmptyFileHashStrategy <- if (fileHashStrategy.isEmpty) None else Option(fileHashStrategy)
+    } yield (fsKey, nonEmptyFileHashStrategy)
 
     defaultHashingStrategies ++ configuredHashingStrategies
 

diff --git a/core/src/main/scala/cromwell/core/callcaching/FileHashStrategy.scala b/core/src/main/scala/cromwell/core/callcaching/FileHashStrategy.scala
@@ -14,6 +14,8 @@ import java.util.zip.CRC32C
 case class FileHashStrategy(priorityHashList: List[HashType]) {
   override def toString = s"FileHashStrategy(${priorityHashList.map(_.toString).mkString(", ")})"
 
+  def isEmpty: Boolean = priorityHashList.isEmpty
+
   // Lazily evaluate hashes from `priorityList` until we find one that exists
   def getFileHash[A](fileToHash: A, hashFunc: (A, HashType) => Option[String]): Option[FileHash] =
     priorityHashList.to(LazyList).flatMap(ht => hashFunc(fileToHash, ht).map(FileHash(ht, _))).headOption