fix: fix GCloud detection on Windows

googleapis · Feb 23, 2021 · 7ca3218 · 7ca3218
1 parent 09fac9d
commit 7ca3218
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java
@@ -47,7 +47,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -275,13 +274,8 @@ public Process getProcess() {
     }
 
     private boolean isGcloudInstalled() {
-      Map<String, String> env = System.getenv();
-      for (String envName : env.keySet()) {
-        if ("PATH".equals(envName)) {
-          return env.get(envName).contains("google-cloud-sdk");
-        }
-      }
-      return false;
+      String path = System.getenv("PATH");
+      return path != null && path.contains("google-cloud-sdk");
     }
 
     private boolean isEmulatorUpToDate() throws IOException, InterruptedException {