CosmosPatchTransformationPolicy Not Applied in Sovereign Clouds (Azure#44682)

* Fixing cosmos patch bug for tables

* Fixing cosmos patch bug for tables

* Fixing cosmos patch bug for tables

Author: jairmyree

sdk/tables/azure-data-tables/src/main/java/com/azure/data/tables/BuilderHelper.java

@@ -51,7 +51,7 @@ final class BuilderHelper {
     private static final Map<String, String> PROPERTIES = CoreUtils.getProperties("azure-data-tables.properties");
     private static final String CLIENT_NAME = PROPERTIES.getOrDefault("name", "UnknownName");
     private static final String CLIENT_VERSION = PROPERTIES.getOrDefault("version", "UnknownVersion");
-    private static final String COSMOS_ENDPOINT_SUFFIX = "cosmos.azure.com";
+    private static final String COSMOS_ENDPOINT_SUFFIX = "cosmos.azure.";
     private static final String TABLES_TRACING_NAMESPACE_VALUE = "Microsoft.Tables";
 
     public static final ClientOptions DEFAULT_CLIENT_OPTIONS = new ClientOptions();

sdk/tables/azure-data-tables/src/test/java/com/azure/data/tables/TableServiceClientBuilderTest.java

@@ -17,6 +17,7 @@
 import com.azure.core.test.utils.MockTokenCredential;
 import com.azure.core.util.ClientOptions;
 import com.azure.core.util.Header;
+import com.azure.data.tables.implementation.CosmosPatchTransformPolicy;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
@@ -36,6 +37,10 @@
 public class TableServiceClientBuilderTest {
 
     private static final String ENDPOINT = "https://myAccount.table.core.windows.net";
+    private static final String[] COSMOS_ENDPOINTS = {
+        "https://myAccount.table.cosmos.azure.com",
+        "https://myAccount.table.cosmos.azure.us",
+        "https://myAccount.table.cosmos.azure.cn" };
     private static final String CONNECTION_STRING
         = "DefaultEndpointsProtocol=https;AccountName=myAccount;AccountKey=myKey;EndpointSuffix=core.windows.net";
     private static final TokenCredential CREDENTIAL = new MockTokenCredential();
@@ -316,4 +321,25 @@ public void buildWithDifferentEndpointInConnectionStringThrows() {
                 "DefaultEndpointsProtocol=https;AccountName=myOtherAccount;AccountKey=myKey;EndpointSuffix=core.windows.net")
             .buildAsyncClient());
     }
+
+    @Test
+    public void cosmosEndpointsResultsInCosmosPatchPolicyAppliedToBuilder() {
+        for (String endpoint : COSMOS_ENDPOINTS) {
+            TableServiceClient client = new TableServiceClientBuilder().endpoint(endpoint)
+                .credential(CREDENTIAL)
+                .serviceVersion(serviceVersion)
+                .buildClient();
+
+            int policyCount = client.getHttpPipeline().getPolicyCount();
+            assertTrue(client.getHttpPipeline().getPolicyCount() > 0);
+            boolean detectedCosmosPatchPolicy = false;
+            for (int i = 0; i < policyCount; i++) {
+                if (client.getHttpPipeline().getPolicy(i) instanceof CosmosPatchTransformPolicy) {
+                    detectedCosmosPatchPolicy = true;
+                    break;
+                }
+            }
+            assertTrue(detectedCosmosPatchPolicy);
+        }
+    }
 }

sdk/tables/test-resources.json

@@ -6,7 +6,12 @@
             "type": "String"
         },
         "endpointType": {
-            "type": "String"
+            "type": "String",
+            "allowedValues": [
+                "storage",
+                "cosmos"
+            ],
+            "defaultValue": "cosmos"
         },
         "testApplicationOid": {
             "type": "string",
@@ -17,7 +22,7 @@
     },
     "variables": {
         "storageMgmtApiVersion": "2022-05-01",
-        "cosmosMgmtApiVersion": "2024-05-15",
+        "cosmosMgmtApiVersion": "2024-11-15",
         "cosmosAuthorizationApiVersion": "2023-07-01-preview",
         "storageAuthorizationApiVersion": "2018-09-01-preview",
         "blobDataContributorRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/0a9a7e1f-b9d0-4cc4-a60d-0319b160aaa3')]",