Use CopySettingsForEmulator in PubSub clients

googleapis · Apr 28, 2021 · 5022a1e · 5022a1e
1 parent 6f8b4e0
commit 5022a1e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/apis/Google.Cloud.PubSub.V1/Google.Cloud.PubSub.V1/PublisherServiceApiClientBuilder.cs b/apis/Google.Cloud.PubSub.V1/Google.Cloud.PubSub.V1/PublisherServiceApiClientBuilder.cs
@@ -56,16 +56,21 @@ public new EmulatorDetection EmulatorDetection
         private PublisherServiceApiClientBuilder MaybeCreateEmulatorClientBuilder()
         {
             var emulatorEnvironment = GetEmulatorEnvironment(s_emulatorEnvironmentVariables, s_emulatorEnvironmentVariables);
-            return emulatorEnvironment is null ? null :
-                // We don't set the EmulatorDetection property here to avoid recursively calling
-                // MaybeCreateEmulatorClientBuilder().
-                new PublisherServiceApiClientBuilder
-                {
-                    Settings = Settings,
-                    Endpoint = emulatorEnvironment[s_emulatorHostEnvironmentVariable],
-                    ChannelCredentials = ChannelCredentials.Insecure,
-                    ChannelOptions = ChannelOptions
-                };
+            if (emulatorEnvironment is null)
+            {
+                return null;
+            }
+            // We don't set the EmulatorDetection property here to avoid recursively calling
+            // MaybeCreateEmulatorClientBuilder().
+            var builder =  new PublisherServiceApiClientBuilder
+            {
+                Settings = Settings,
+                Endpoint = emulatorEnvironment[s_emulatorHostEnvironmentVariable],
+                ChannelCredentials = ChannelCredentials.Insecure,
+                ChannelOptions = ChannelOptions
+            };
+            builder.CopySettingsForEmulator(this);
+            return builder;
         }
 
         /// <summary>

diff --git a/apis/Google.Cloud.PubSub.V1/Google.Cloud.PubSub.V1/SubscriberServiceApiClientBuilder.cs b/apis/Google.Cloud.PubSub.V1/Google.Cloud.PubSub.V1/SubscriberServiceApiClientBuilder.cs
@@ -56,16 +56,21 @@ public new EmulatorDetection EmulatorDetection
         private SubscriberServiceApiClientBuilder MaybeCreateEmulatorClientBuilder()
         {
             var emulatorEnvironment = GetEmulatorEnvironment(s_emulatorEnvironmentVariables, s_emulatorEnvironmentVariables);
-            return emulatorEnvironment is null ? null :
-                // We don't set the EmulatorDetection property here to avoid recursively calling
-                // MaybeCreateEmulatorClientBuilder().
-                new SubscriberServiceApiClientBuilder
-                {
-                    Settings = Settings,
-                    Endpoint = emulatorEnvironment[s_emulatorHostEnvironmentVariable],
-                    ChannelCredentials = ChannelCredentials.Insecure,
-                    ChannelOptions = ChannelOptions
-                };
+            if (emulatorEnvironment is null)
+            {
+                return null;
+            }
+            // We don't set the EmulatorDetection property here to avoid recursively calling
+            // MaybeCreateEmulatorClientBuilder().
+            var builder = new SubscriberServiceApiClientBuilder
+            {
+                Settings = Settings,
+                Endpoint = emulatorEnvironment[s_emulatorHostEnvironmentVariable],
+                ChannelCredentials = ChannelCredentials.Insecure,
+                ChannelOptions = ChannelOptions
+            };
+            builder.CopySettingsForEmulator(this);
+            return builder;
         }
 
         /// <summary>