From fc80c3eaba83f2d93cf81248a67c6ae078f68244 Mon Sep 17 00:00:00 2001
From: Marco Ziccardi <marco.ziccard@gmail.com>
Date: Mon, 17 Oct 2016 11:39:31 +0200
Subject: [PATCH] Add support for PubSub emulator host variable

---
 .../src/main/java/com/google/cloud/pubsub/PubSubOptions.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java
index c504a46292a6..e1693ee3cd38 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java
@@ -32,6 +32,7 @@ public class PubSubOptions extends GrpcServiceOptions<PubSub, PubSubRpc, PubSubO
   private static final long serialVersionUID = 5640180400046623305L;
   private static final String PUBSUB_SCOPE = "https://www.googleapis.com/auth/pubsub";
   private static final Set<String> SCOPES = ImmutableSet.of(PUBSUB_SCOPE);
+  private static final String EMULATOR_HOST_ENV_VAR = "PUBSUB_EMULATOR_HOST";
   private static final String DEFAULT_HOST = PublisherSettings.getDefaultServiceAddress()
       + ':' + PublisherSettings.getDefaultServicePort();
 
@@ -66,7 +67,8 @@ public PubSubRpc create(PubSubOptions options) {
 
   @Override
   protected String defaultHost() {
-    return DEFAULT_HOST;
+    String host = System.getProperty(EMULATOR_HOST_ENV_VAR, System.getenv(EMULATOR_HOST_ENV_VAR));
+    return host != null ? host : DEFAULT_HOST;
   }
 
   public static class Builder extends