Update Search to enable live testing in sovereign clouds for multiple… (Azure#23005)

* Update Search to enable live testing in sovereign clouds for multiple services

* resolve ci error

* update

* update

* update

Author: v-xuto

sdk/search/azure-search-documents/tests/search_service_preparer.py

@@ -18,10 +18,9 @@
 from azure.core.credentials import AzureKeyCredential
 from azure.core.exceptions import ResourceNotFoundError
 
-
-SERVICE_URL_FMT = "https://{}.search.windows.net/indexes?api-version=2021-04-30-Preview"
+SERVICE_URL_FMT = "https://{}.{}/indexes?api-version=2021-04-30-Preview"
 TIME_TO_SLEEP = 3
-
+SEARCH_ENDPOINT_SUFFIX = environ.get("SEARCH_ENDPOINT_SUFFIX", "servicebus.windows.net")
 
 SearchEnvVarPreparer = functools.partial(
     EnvironmentVariableLoader,
@@ -82,7 +81,7 @@ def _set_up_index(service_name, endpoint, api_key, schema, index_batch):
     if schema:
         index_name = json.loads(schema)["name"]
         response = requests.post(
-            SERVICE_URL_FMT.format(service_name),
+            SERVICE_URL_FMT.format(service_name, SEARCH_ENDPOINT_SUFFIX),
             headers={"Content-Type": "application/json", "api-key": api_key},
             data=schema,
         )
@@ -207,7 +206,7 @@ def create_resource(self, name, **kwargs):
         else:
             schema = None
         self.service_name = self.create_random_name()
-        self.endpoint = "https://{}.search.windows.net".format(self.service_name)
+        self.endpoint = "https://{}.{}".format(self.service_name, SEARCH_ENDPOINT_SUFFIX)
 
         if not self.is_live:
             return {
@@ -254,7 +253,7 @@ def create_resource(self, name, **kwargs):
 
         if self.schema:
             response = requests.post(
-                SERVICE_URL_FMT.format(self.service_name),
+                SERVICE_URL_FMT.format(self.service_name, SEARCH_ENDPOINT_SUFFIX),
                 headers={"Content-Type": "application/json", "api-key": api_key},
                 data=self.schema,
             )
@@ -357,7 +356,7 @@ def create_resource(self, name, **kwargs):
         else:
             schema = None
         self.service_name = self.create_random_name()
-        self.endpoint = "https://{}.search.windows.net".format(self.service_name)
+        self.endpoint = "https://{}.{}".format(self.service_name, SEARCH_ENDPOINT_SUFFIX)
 
         if not self.is_live:
             return {
@@ -404,7 +403,7 @@ def create_resource(self, name, **kwargs):
 
         if self.schema:
             response = requests.post(
-                SERVICE_URL_FMT.format(self.service_name),
+                SERVICE_URL_FMT.format(self.service_name, SEARCH_ENDPOINT_SUFFIX),
                 headers={"Content-Type": "application/json", "api-key": api_key},
                 data=self.schema,
             )
@@ -507,7 +506,7 @@ def create_resource(self, name, **kwargs):
         else:
             schema = None
         self.service_name = self.create_random_name()
-        self.endpoint = "https://{}.search.windows.net".format(self.service_name)
+        self.endpoint = "https://{}.{}".format(self.service_name, SEARCH_ENDPOINT_SUFFIX)
 
         if not self.is_live:
             return {
@@ -554,7 +553,7 @@ def create_resource(self, name, **kwargs):
 
         if self.schema:
             response = requests.post(
-                SERVICE_URL_FMT.format(self.service_name),
+                SERVICE_URL_FMT.format(self.service_name, SEARCH_ENDPOINT_SUFFIX),
                 headers={"Content-Type": "application/json", "api-key": api_key},
                 data=self.schema,
             )
@@ -657,7 +656,7 @@ def create_resource(self, name, **kwargs):
         else:
             schema = None
         self.service_name = self.create_random_name()
-        self.endpoint = "https://{}.search.windows.net".format(self.service_name)
+        self.endpoint = "https://{}.{}".format(self.service_name, SEARCH_ENDPOINT_SUFFIX)
 
         if not self.is_live:
             return {
@@ -704,7 +703,7 @@ def create_resource(self, name, **kwargs):
 
         if self.schema:
             response = requests.post(
-                SERVICE_URL_FMT.format(self.service_name),
+                SERVICE_URL_FMT.format(self.service_name, SEARCH_ENDPOINT_SUFFIX),
                 headers={"Content-Type": "application/json", "api-key": api_key},
                 data=self.schema,
             )

sdk/search/test-resources.bicep

@@ -1,3 +1,4 @@
+param isPublicCloud bool = environment().name == 'AzureCloud'
 param searchEndpointSuffix string = 'search.windows.net'
 param storageEndpointSuffix string = 'core.windows.net'
 param location string = '${resourceGroup().location}'
@@ -8,15 +9,16 @@ param storageAccountName string = 'storage${uniqueString(resourceGroup().id)}'
 param storageContainerName string = 'storage-container-${resourceGroup().name}'
 param storageApiVersion string = '2021-06-01'
 
+
 resource searchService 'Microsoft.Search/searchServices@2021-04-01-Preview' = {
   name: searchServiceName
-  location: 'eastus2' // semantic search is available here
+  location: location // semantic search is available here
   sku: {
     name: searchSku
   }
-  properties: {
+  properties:  isPublicCloud ? {
     semanticSearch: 'standard'
-  }
+  } : {}
 }
 
 resource storageService 'Microsoft.Storage/storageAccounts@2021-06-01' = {
@@ -46,3 +48,4 @@ output search_query_api_key string = searchService.listQueryKeys(searchApiVersio
 output search_service_name string = searchServiceName
 output search_storage_connection_string string = 'DefaultEndpointsProtocol=https;AccountName=${storageAccountName};AccountKey=${storageService.listKeys(storageApiVersion).keys[0].value};EndpointSuffix=${storageEndpointSuffix}'
 output search_storage_container_name string = storageContainerName
+output search_endpoint_suffix string = searchEndpointSuffix

sdk/search/tests.yml

@@ -6,7 +6,15 @@ stages:
       BuildTargetingString: azure-search-documents
       # TODO: change/remove location back to default westus2 after search RP fixes deletion metadata issue
       # https://github.com/Azure/azure-sdk-tools/issues/2216
-      Location: 'eastus2'
+      SupportedClouds: 'Public,UsGov,China'
+      CloudConfig:
+        Public:
+          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+          Location: 'eastus2'
+        UsGov:
+          SubscriptionConfiguration: $(sub-config-gov-test-resources)
+        China:
+          SubscriptionConfiguration: $(sub-config-cn-test-resources)
       ServiceDirectory: search
       EnvVars:
         AZURE_CLIENT_ID: $(SEARCH_CLIENT_ID)