responding to review

broadinstitute · Sep 10, 2022 · 54be805 · 54be805
1 parent d319891
commit 54be805
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/picard/cmdline/CommandLineProgram.java b/src/main/java/picard/cmdline/CommandLineProgram.java
@@ -242,10 +242,13 @@ public int instanceMain(final String[] argv) {
           System.setProperty("ga4gh.client_secrets", GA4GH_CLIENT_SECRETS);
         }
 
-        if (System.getProperty("google_project_requester_pays") == null && REQUESTER_PAYS_PROJECT != null) {
-            System.setProperty("google_project_requester_pays", REQUESTER_PAYS_PROJECT);
+        if (PathProvider.GCS.isAvailable){
+            if (System.getProperty("google_project_requester_pays") == null &&
+                REQUESTER_PAYS_PROJECT != null) {
+                System.setProperty("google_project_requester_pays", REQUESTER_PAYS_PROJECT);
+            }
             Log.getInstance(this.getClass()).info(
-                    String.format("Will use google project %s for gcs requests.", REQUESTER_PAYS_PROJECT));
+                    String.format("Will use google project %s for gcs requests.", System.getProperty("google_project_requester_pays")));
         }
 
         SamReaderFactory.setDefaultValidationStringency(VALIDATION_STRINGENCY);

diff --git a/src/main/java/picard/nio/GoogleStorageUtils.java b/src/main/java/picard/nio/GoogleStorageUtils.java
@@ -49,7 +49,6 @@
 class GoogleStorageUtils {
 
     public static void initialize() {
-        // requester pays support is currently not configured
         final String google_project = System.getProperty("google_project_requester_pays");
 
         CloudStorageFileSystemProvider.setDefaultCloudStorageConfiguration(GoogleStorageUtils.getCloudStorageConfiguration(20, google_project));