transport/grpc: Fix check of GOOGLE_CLOUD_ENABLE_DIRECT_PATH

When GOOGLE_CLOUD_ENABLE_DIRECT_PATH is empty and split is called a slice with a single empty string is then looped and matched with strings.Contains. This means that without that environment variable set every single endpoint is matched. Instead check to make sure the match isn't against an empty string first. Change-Id: I7382c7997098a9f77db44bc8e1fb10942caeaa61 Reviewed-on: https://code-review.googlesource.com/c/google-api-go-client/+/41670 Reviewed-by: Jean de Klerk <[email protected]>
Slim1222b · Jun 6, 2019 · ba71ec0 · ba71ec0
1 parent 321c6e0
commit ba71ec0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/transport/grpc/dial.go b/transport/grpc/dial.go
@@ -185,7 +185,8 @@ func isDirectPathEnabled(endpoint string) bool {
  // Only try direct path if the user has opted in via the environment variable.
  whitelist := strings.Split(os.Getenv("GOOGLE_CLOUD_ENABLE_DIRECT_PATH"), ",")
  for _, api := range whitelist {
- if strings.Contains(endpoint, api) {
+ // Ignore empty string since an empty env variable splits into [""]
+ if api != "" && strings.Contains(endpoint, api) {
  return true
  }
  }