---

aozarov · aozarov · commit b3ad20f1cd07 · 2015-05-04T12:31:40.000-07:00
yaml --- r: 5965 b: refs/heads/tswast-patch-1 c: 648ae8d h: refs/heads/master i: 5963: a82ea68
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: d9b994bccf49a33707fa15b3ffc4020bcf935913
+refs/heads/tswast-patch-1: 648ae8d389f3a7b72153b2724b8ed2ef3d0f780b
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -27,14 +27,19 @@
 import com.google.gcloud.spi.ServiceRpcFactory;
 
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.Objects;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public abstract class ServiceOptions<R, O extends ServiceOptions<R, O>> implements Serializable {
 
@@ -168,16 +173,36 @@ protected static String appEngineAppId() {
   protected static String googleCloudProjectId() {
     try {
       URL url = new URL("http://metadata/computeMetadata/v1/project/project-id");
-      URLConnection connection = url.openConnection();
+      HttpURLConnection connection = (HttpURLConnection) url.openConnection();
       connection.setRequestProperty("X-Google-Metadata-Request", "True");
-      try (BufferedReader reader =
-          new BufferedReader(new InputStreamReader(connection.getInputStream(), UTF_8))) {
-        return reader.readLine();
+      InputStream input = connection.getInputStream();
+      if (connection.getResponseCode() == 200) {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(input, UTF_8))) {
+          return reader.readLine();
+        }
       }
     } catch (IOException ignore) {
-      // return null if can't determine
-      return null;
+      // ignore
+    }
+    String configDir = System.getenv("CLOUDSDK_CONFIG");
+    if (configDir == null) {
+      configDir = new File(System.getProperty("user.home"), "/.config/gcloud/").getPath();
+    }
+    try (BufferedReader reader =
+        new BufferedReader(new FileReader(new File(configDir, "properties")))) {
+      String line;
+      Pattern pattern = Pattern.compile("^\\s*project\\s*=\\s*(.*?)\\s*$");
+      while((line = reader.readLine()) != null) {
+        Matcher matcher = pattern.matcher(line);
+        if (matcher.matches()) {
+          return matcher.group(1);
+        }
+      }
+    } catch (IOException ex) {
+      // ignore
     }
+    // return null if can't determine
+    return null;
   }
 
   protected static String getAppEngineProjectId() {
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/examples/StorageExample.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/examples/StorageExample.java
@@ -46,7 +46,7 @@
  * <li>compile using maven - {@code mvn compile}</li>
  * <li>run using maven -
  * {@code mvn exec:java -Dexec.mainClass="com.google.gcloud.examples.StorageExample"
- * -Dexec.args="project_id list [<bucket>]| info [<bucket> [<file>]]| get <bucket> <path>|
+ * -Dexec.args="[<project_id>] list [<bucket>]| info [<bucket> [<file>]]| get <bucket> <path>|
  *  upload <local_file> <bucket> [<path>]| delete <bucket> <path>+|
  *  cp <from_bucket> <from_path> <to_bucket> <to_path>| compose <bucket> <from_path>+ <to_path>"}
  * </li>
@@ -300,20 +300,27 @@ public static void printUsage() {
 
   @SuppressWarnings("unchecked")
   public static void main(String... args) throws Exception {
-    if (args.length < 2) {
+    if (args.length < 1) {
       System.out.println("Missing required project id and action");
       printUsage();
       return;
     }
-    StorageAction action = ACTIONS.get(args[1]);
+    StorageServiceOptions.Builder optionsBuilder = StorageServiceOptions.builder();
+    StorageAction action;
+    if (args.length >= 2 && !ACTIONS.containsKey(args[0])) {
+      optionsBuilder.project(args[0]);
+      action = ACTIONS.get(args[1]);
+      args = Arrays.copyOfRange(args, 2, args.length);
+    } else {
+      action = ACTIONS.get(args[0]);
+      args = Arrays.copyOfRange(args, 1, args.length);
+    }
     if (action == null) {
       System.out.println("Unrecognized action '" + args[1] + "'");
       printUsage();
       return;
     }
-    StorageServiceOptions options = StorageServiceOptions.builder().project(args[0]).build();
-    StorageService storage = StorageServiceFactory.instance().get(options);
-    args = args.length > 2 ? Arrays.copyOfRange(args, 2, args.length) : new String[] {};
+    StorageService storage = StorageServiceFactory.instance().get(optionsBuilder.build());
     Object request;
     try {
       request = action.parse(args);
