fix: forward hosts to ingestion transporter

Author: shortcuts

scripts/cts/testServer/pushMock.ts

@@ -39,8 +39,6 @@ function addRoutes(app: Express): void {
     const helper = match?.[1] as string;
     const lang = match?.[2] as string;
 
-    console.log(match, helper, lang);
-
     if (!pushMockState[lang]) {
       pushMockState[lang] = {};
     }
@@ -49,9 +47,10 @@ function addRoutes(app: Express): void {
     switch (helper) {
       case 'saveObjectsWithTransformation':
         expect(req.body).to.deep.equal({
-          requests: [
-            { action: 'addObject', body: { objectID: '1', name: 'Adam' } },
-            { action: 'addObject', body: { objectID: '2', name: 'Benoit' } },
+          action: 'addObject',
+          records: [
+            { objectID: '1', name: 'Adam' },
+            { objectID: '2', name: 'Benoit' },
           ],
         });
 
@@ -65,9 +64,10 @@ function addRoutes(app: Express): void {
         break;
       case 'partialUpdateObjectsWithTransformation':
         expect(req.body).to.deep.equal({
-          requests: [
-            { action: 'partialUpdateObject', body: { objectID: '1', name: 'Adam' } },
-            { action: 'partialUpdateObject', body: { objectID: '2', name: 'Benoit' } },
+          action: 'partialUpdateObject',
+          records: [
+            { objectID: '1', name: 'Adam' },
+            { objectID: '2', name: 'Benoit' },
           ],
         });
 

templates/go/client.mustache

@@ -85,14 +85,26 @@ func NewClientWithConfig(cfg {{#lambda.titlecase}}{{#lambda.camelcase}}{{client}
 	}
 
   {{#isSearchClient}}
-  if cfg.Transformation != nil && cfg.Transformation.Region != "" {
-		ingestionClient, err := ingestion.NewClient(apiClient.appID, cfg.ApiKey, cfg.Transformation.Region)
-    if err != nil {
-      return nil, err //nolint:wrapcheck
+	if cfg.Transformation != nil && cfg.Transformation.Region != "" {
+    ingestionConfig := ingestion.IngestionConfiguration{
+      Configuration: transport.Configuration{
+        AppID: cfg.AppID,
+        ApiKey: cfg.ApiKey,
+      },
+      Region: cfg.Transformation.Region,
     }
 
-    apiClient.ingestionTransporter = ingestionClient
-  }
+	  if len(cfg.Hosts) > 0 {
+	  	ingestionConfig.Hosts = cfg.Hosts
+	  }
+
+		ingestionClient, err := ingestion.NewClientWithConfig(ingestionConfig)
+		if err != nil {
+			return nil, err //nolint:wrapcheck
+		}
+
+		apiClient.ingestionTransporter = ingestionClient
+	}
   {{/isSearchClient}}
 
 	return &apiClient, nil

templates/python/api.mustache

@@ -54,10 +54,6 @@ class {{classname}}{{#isSyncClient}}Sync{{/isSyncClient}}:
             config = {{#lambda.pascalcase}}{{client}}Config{{/lambda.pascalcase}}(transporter.config.app_id, transporter.config.api_key{{#hasRegionalHost}}, region{{/hasRegionalHost}})
         elif config is None:
             config = {{#lambda.pascalcase}}{{client}}Config{{/lambda.pascalcase}}(app_id, api_key{{#hasRegionalHost}}, region{{/hasRegionalHost}})
-        {{#isSearchClient}}
-        elif config.region is not None:
-            self._ingestion_transporter = IngestionClient{{#isSyncClient}}Sync{{/isSyncClient}}.create_with_config(IngestionConfig(config.app_id, config.api_key, config.region))
-        {{/isSearchClient}}
 
         self._config = config
         self._request_options = RequestOptions(config)
@@ -84,7 +80,19 @@ class {{classname}}{{#isSyncClient}}Sync{{/isSyncClient}}:
         if transporter is None:
             transporter = Transporter{{#isSyncClient}}Sync{{/isSyncClient}}(config)
 
-        return {{classname}}{{#isSyncClient}}Sync{{/isSyncClient}}(app_id=config.app_id, api_key=config.api_key, {{#hasRegionalHost}}region=config.region, {{/hasRegionalHost}}transporter=transporter, config=config)
+        client = {{classname}}{{#isSyncClient}}Sync{{/isSyncClient}}(app_id=config.app_id, api_key=config.api_key, {{#hasRegionalHost}}region=config.region, {{/hasRegionalHost}}transporter=transporter, config=config)
+
+        {{#isSearchClient}}
+        if config.region is not None:
+            ingestion_config = IngestionConfig(config.app_id, config.api_key, config.region)
+
+            if config.hosts is not None:
+                ingestion_config.hosts = config.hosts
+
+            client._ingestion_transporter = IngestionClient{{#isSyncClient}}Sync{{/isSyncClient}}.create_with_config(ingestion_config)
+        {{/isSearchClient}}
+
+        return client
 
     {{^isSyncClient}}
     async def __aenter__(self) -> Self:

tests/CTS/client/search/partialUpdateObjectsWithTransformation.json

@@ -35,14 +35,12 @@
         },
         "expected": {
           "type": "response",
-          "match": [
-            {
+          "match": {
               "runID": "b1b7a982-524c-40d2-bb7f-48aab075abda",
               "eventID": "113b2068-6337-4c85-b5c2-e7b213d82925",
               "message": "OK",
               "createdAt": "2022-05-12T06:24:30.049Z"
             }
-          ]
         }
       }
     ]

tests/CTS/client/search/saveObjectsWithTransformation.json

@@ -34,14 +34,12 @@
         },
         "expected": {
           "type": "response",
-          "match": [
-            {
+          "match": {
               "runID": "b1b7a982-524c-40d2-bb7f-48aab075abda",
               "eventID": "113b2068-6337-4c85-b5c2-e7b213d82925",
               "message": "OK",
               "createdAt": "2022-05-12T06:24:30.049Z"
             }
-          ]
         }
       }
     ]