Fix unique fingerprint for wave bundle resources

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Feb 18, 2023 · b59fa72 · b59fa72
1 parent cf3fd74
commit b59fa72
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/modules/nextflow/src/main/groovy/nextflow/script/bundle/ResourcesBundle.groovy b/modules/nextflow/src/main/groovy/nextflow/script/bundle/ResourcesBundle.groovy
@@ -165,15 +165,22 @@ class ResourcesBundle {
 
     private List fileMeta(String name, Path file) {
         final attrs = Files.readAttributes(file, BasicFileAttributes)
+        final regular = attrs.isRegularFile()
         final meta = [
                 name,
-                attrs.isRegularFile() ? attrs.size() : 0,
-                attrs.lastModifiedTime().toMillis(),
+                regular ? attrs.size() : 0,
+                regular ? md5(file, attrs) : 0,
                 Integer.toOctalString(file.getPermissionsMode()) ]
         log.trace "Module bundle entry=$meta"
         return meta
     }
 
+    private String md5(Path path, BasicFileAttributes attrs) {
+        return attrs.size() <= MAX_FILE_SIZE.bytes
+                ? Files.readAllBytes(path).md5()
+                : '0'
+    }
+
     String fingerprint() {
         final allMeta = new ArrayList()
         for( String name : getEntries() ) {

diff --git a/modules/nextflow/src/test/groovy/nextflow/script/bundle/ResourcesBundleTest.groovy b/modules/nextflow/src/test/groovy/nextflow/script/bundle/ResourcesBundleTest.groovy
@@ -80,7 +80,7 @@ class ResourcesBundleTest extends Specification {
                 'this/that/ciao.txt' ] as Set
 
         and:
-        bundle.fingerprint() == 'c063b8f42cfd65f4eb8efe7c30c108bc'
+        bundle.fingerprint() == '7404949a73f1707e39f641d9a54261ae'
 
     }
 
@@ -99,19 +99,19 @@ class ResourcesBundleTest extends Specification {
         bundle
         !bundle.hasEntries()
         and:
-        bundle.fingerprint() == 'c8597047abea34f987e6a347dca36823'
+        bundle.fingerprint() == 'c5e75f95b68f5119debd926961ef6abd'
 
         when:
         // changing file permissions, change the fingerprint
         dockerPath.setPermissions(6,0,0)
         then:
-        bundle.fingerprint() == '280d52c24debce950148f4250a34e3ff'
+        bundle.fingerprint() == '7b2200ff24230f76cea22e5eb15b1701'
 
         when:
         // changing the last modified time, change the fingerprint
         dockerPath.setLastModified(LAST_MODIFIED +100)
         then:
-        bundle.fingerprint() == '41bd15592039e3a198bef861800d3cd6'
+        bundle.fingerprint() == '7b2200ff24230f76cea22e5eb15b1701'
 
     }