Merge pull request #329 from ajkannan/fix-config-loc

aozarov · aozarov · commit 0e32a4ba0674 · 2015-11-05T16:33:06.000-08:00
Update location to look for gcloud SDK config file where we look for config file
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -30,6 +30,7 @@
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -387,8 +388,18 @@ protected static String googleCloudProjectId() {
     } else {
       configDir = new File(System.getProperty("user.home"), ".config/gcloud");
     }
-    try (BufferedReader reader =
-        new BufferedReader(new FileReader(new File(configDir, "properties")))) {
+    FileReader fileReader;
+    try {
+      fileReader = new FileReader(new File(configDir, "configurations/config_default"));
+    } catch (FileNotFoundException newConfigFileNotFoundEx) {
+      try {
+        fileReader = new FileReader(new File(configDir, "properties"));
+      } catch (FileNotFoundException oldConfigFileNotFoundEx) {
+        // return null if we can't find config file
+        return null;
+      }
+    }
+    try (BufferedReader reader = new BufferedReader(fileReader)) {
       String line;
       String section = null;
       Pattern projectPattern = Pattern.compile("^project\\s*=\\s*(.*)$");
