diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/QuiltObserver.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/QuiltObserver.groovy index 50138913..d40ad544 100644 --- a/plugins/nf-quilt/src/main/nextflow/quilt/QuiltObserver.groovy +++ b/plugins/nf-quilt/src/main/nextflow/quilt/QuiltObserver.groovy @@ -85,8 +85,8 @@ class QuiltObserver implements TraceObserver { println('\tonFilePublish.QuiltPathify') QuiltPathify pathify = new QuiltPathify(destination) println("\tonFilePublish.pathify: $pathify") - if (!pathify.bucketExists()) { - log.debug("onFilePublish.bucketExists[false]: $pathify") + if (!pathify.isBucketAccessible()) { + log.debug("onFilePublish.isBucketAccessible[false]: $pathify") return } println("\tonFilePublish.isOverlay: ${pathify.isOverlay}") diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/QuiltPathify.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/QuiltPathify.groovy index 64415133..1a771351 100644 --- a/plugins/nf-quilt/src/main/nextflow/quilt/QuiltPathify.groovy +++ b/plugins/nf-quilt/src/main/nextflow/quilt/QuiltPathify.groovy @@ -155,8 +155,8 @@ class QuiltPathify { return true } - boolean bucketExists() { - return pkg.bucketExists() + boolean isBucketAccessible() { + return pkg.isBucketAccessible() } String pkgKey() { diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy index f3c49584..537305ac 100644 --- a/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy +++ b/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltPackage.groovy @@ -216,12 +216,12 @@ class QuiltPackage { return installed } - boolean bucketExists() { + boolean isBucketAccessible() { S3PhysicalKey key = new S3PhysicalKey(bucket, '', null) try { key.listRecursively() } catch (Exception e) { - log.error("bucketExists: failed to check $bucket", e) + log.error("isBucketAccessible: failed to check $bucket", e) return false } return true diff --git a/plugins/nf-quilt/src/test/nextflow/quilt/QuiltObserverTest.groovy b/plugins/nf-quilt/src/test/nextflow/quilt/QuiltObserverTest.groovy index 84e09614..b7e05243 100644 --- a/plugins/nf-quilt/src/test/nextflow/quilt/QuiltObserverTest.groovy +++ b/plugins/nf-quilt/src/test/nextflow/quilt/QuiltObserverTest.groovy @@ -69,7 +69,7 @@ class QuiltObserverTest extends QuiltSpecification { // uninitialized observer.onFilePublish(validPath, validPath.localPath()) then: - validPath.pkg().bucketExists() == true + validPath.pkg().isBucketAccessible() == true observer.publishedPaths.size() == 0 } @@ -104,7 +104,7 @@ class QuiltObserverTest extends QuiltSpecification { observer.onFilePublish(validPath, validPath.localPath()) observer.onFlowComplete() then: - validPath.pkg().bucketExists() == true + validPath.pkg().isBucketAccessible() == true observer.publishedPaths.size() == 1 }