From 3bba44fd92e680b604ee8564e7b8f5c261213cc0 Mon Sep 17 00:00:00 2001
From: Debdatta Kunda <dkunda@microsoft.com>
Date: Thu, 9 Nov 2023 13:23:00 -0800
Subject: [PATCH 1/2] Code changes to enable replica validation for preview.

---
 Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs b/Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs
index 0b7786d8c3..2efaa86bff 100644
--- a/Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs
+++ b/Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs
@@ -46,6 +46,10 @@ public static bool IsReplicaAddressValidationEnabled(
         {
             bool replicaValidationDefaultValue = false;
 
+#if PREVIEW
+            replicaValidationDefaultValue = true;
+#endif
+
             if (connectionPolicy != null
                 && connectionPolicy.EnableAdvancedReplicaSelectionForTcp.HasValue)
             {

From 515ab0527ac11367e04f7aa7af74362164dc9db5 Mon Sep 17 00:00:00 2001
From: Debdatta Kunda <dkunda@microsoft.com>
Date: Tue, 14 Nov 2023 15:56:15 -0800
Subject: [PATCH 2/2] Code changes to enable replica validation for preview and
 GA.

---
 Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs b/Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs
index 2efaa86bff..3c48b1f5ab 100644
--- a/Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs
+++ b/Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs
@@ -44,12 +44,6 @@ public static T GetEnvironmentVariable<T>(string variable, T defaultValue)
         public static bool IsReplicaAddressValidationEnabled(
             ConnectionPolicy connectionPolicy)
         {
-            bool replicaValidationDefaultValue = false;
-
-#if PREVIEW
-            replicaValidationDefaultValue = true;
-#endif
-
             if (connectionPolicy != null
                 && connectionPolicy.EnableAdvancedReplicaSelectionForTcp.HasValue)
             {
@@ -59,7 +53,7 @@ public static bool IsReplicaAddressValidationEnabled(
             return ConfigurationManager
                     .GetEnvironmentVariable(
                         variable: ConfigurationManager.ReplicaConnectivityValidationEnabled,
-                        defaultValue: replicaValidationDefaultValue);
+                        defaultValue: true);
         }
 
         /// <summary>