okay ?

Author: millotp

clients/algoliasearch-client-csharp/algoliasearch/Utils/SearchClientExtensions.cs

@@ -498,7 +498,7 @@ public async Task<ReplaceAllObjectsResponse> ReplaceAllObjectsAsync<T>(string in
     {
       var copyResponse = await OperationIndexAsync(indexName,
           new OperationIndexParams(OperationType.Copy, tmpIndexName)
-            { Scope = [ScopeType.Settings, ScopeType.Rules, ScopeType.Synonyms] }, options, cancellationToken)
+          { Scope = [ScopeType.Settings, ScopeType.Rules, ScopeType.Synonyms] }, options, cancellationToken)
         .ConfigureAwait(false);
 
       var batchResponse = await ChunkedBatchAsync(tmpIndexName, objects, Action.AddObject, true, batchSize,
@@ -509,7 +509,7 @@ await WaitForTaskAsync(tmpIndexName, copyResponse.TaskID, requestOptions: option
 
       copyResponse = await OperationIndexAsync(indexName,
           new OperationIndexParams(OperationType.Copy, tmpIndexName)
-            { Scope = [ScopeType.Settings, ScopeType.Rules, ScopeType.Synonyms] }, options, cancellationToken)
+          { Scope = [ScopeType.Settings, ScopeType.Rules, ScopeType.Synonyms] }, options, cancellationToken)
         .ConfigureAwait(false);
       await WaitForTaskAsync(tmpIndexName, copyResponse.TaskID, requestOptions: options, ct: cancellationToken)
         .ConfigureAwait(false);

clients/algoliasearch-client-swift/Sources/Search/Extra/SearchClientExtension.swift

@@ -610,6 +610,8 @@ public extension SearchClient {
 
             throw error
         }
+
+        _ = try? await deleteIndex(indexName: tmpIndexName)
     }
 
     /// Generate a secured API key

scripts/cts/testServer/index.ts

@@ -59,7 +59,7 @@ export async function setupServer(name: string, port: number, addRoutes: (app: E
 
   // 404 handler
   app.use((req, res) => {
-    console.error('endpoint not implemented for', req.method, req.url);
+    console.error(`[PORT ${port}] endpoint not implemented for`, req.method, req.url);
     res.status(404).json({ message: 'not found' });
   });
 

scripts/cts/testServer/replaceAllObjects.ts

@@ -14,12 +14,13 @@ const raoState: Record<
     waitTaskCount: number;
     tmpIndexName: string;
     waitingForFinalWaitTask: boolean;
+    tmpIndexDeleted: boolean;
     successful: boolean;
   }
 > = {};
 
 export function assertValidReplaceAllObjects(expectedCount: number): void {
-  const count = Object.values(raoState).filter((s) => s.successful).length;
+  const count = Object.values(raoState).filter((s) => s.successful && s.tmpIndexDeleted).length;
   if (count !== expectedCount) {
     throw new Error(`Expected ${expectedCount} call to replaceAllObjects, got ${count} instead.`);
   }
@@ -50,6 +51,7 @@ function addRoutes(app: Express): void {
             waitTaskCount: 0,
             tmpIndexName: req.body.destination,
             waitingForFinalWaitTask: false,
+            tmpIndexDeleted: false,
             successful: false,
           };
         } else {
@@ -68,6 +70,7 @@ function addRoutes(app: Express): void {
           waitTaskCount: 6,
           tmpIndexName: req.params.indexName,
           waitingForFinalWaitTask: false,
+          tmpIndexDeleted: false,
           successful: false,
         });
 
@@ -113,6 +116,16 @@ function addRoutes(app: Express): void {
 
     res.json({ status: 'published', updatedAt: '2021-01-01T00:00:00.000Z' });
   });
+
+  app.delete('/1/indexes/:indexName', (req, res) => {
+    const lang = req.params.indexName.match(/^cts_e2e_replace_all_objects_(.*)_tmp_\d+$/)?.[1] as string;
+    expect(raoState).to.include.keys(lang);
+    expect(raoState[lang].tmpIndexName).to.equal(req.params.indexName);
+
+    raoState[lang].tmpIndexDeleted = true;
+
+    res.json({ taskID: 456, deletedAt: '2021-01-01T00:00:00.000Z' });
+  });
 }
 
 export function replaceAllObjectsServer(): Promise<Server> {

templates/java/api_helpers.mustache

@@ -653,24 +653,6 @@ public <T> List<BatchResponse> chunkedBatch(
   return chunkedBatch(indexName, objects, action, waitForTasks, 1000, requestOptions);
 }
 
-/**
- * Push a new set of objects and remove all previous ones. Settings, synonyms and query rules are
- * untouched. Replace all records in an index without any downtime. See
- * https://api-clients-automation.netlify.app/docs/add-new-api-client#5-helpers for implementation
- * details.
- *
- * @param indexName The `indexName` to replace `objects` in.
- * @param objects The array of `objects` to store in the given Algolia `indexName`.
- * @param batchSize The size of the chunk of `objects`. The number of `batch` calls will be equal
- *     to `length(objects) / batchSize`.
- * @throws AlgoliaRetryException When the retry has failed on all hosts
- * @throws AlgoliaApiException When the API sends an http error code
- * @throws AlgoliaRuntimeException When an error occurred during the serialization
- */
-public <T> ReplaceAllObjectsResponse replaceAllObjects(String indexName, Iterable<T> objects, int batchSize) {
-  return replaceAllObjects(indexName, objects, batchSize, null);
-}
-
 /**
  * Helper: Saves the given array of objects in the given index. The `chunkedBatch` helper is used
  * under the hood, which creates a `batch` requests with at most 1000 objects in it.
@@ -891,6 +873,40 @@ public <T> List<BatchResponse> partialUpdateObjects(
   );
 }
 
+/**
+ * Push a new set of objects and remove all previous ones. Settings, synonyms and query rules are
+ * untouched. Replace all records in an index without any downtime. See
+ * https://api-clients-automation.netlify.app/docs/add-new-api-client#5-helpers for implementation
+ * details.
+ *
+ * @param indexName The `indexName` to replace `objects` in.
+ * @param objects The array of `objects` to store in the given Algolia `indexName`.
+ * @throws AlgoliaRetryException When the retry has failed on all hosts
+ * @throws AlgoliaApiException When the API sends an http error code
+ * @throws AlgoliaRuntimeException When an error occurred during the serialization
+ */
+public <T> ReplaceAllObjectsResponse replaceAllObjects(String indexName, Iterable<T> objects) {
+  return replaceAllObjects(indexName, objects, -1);
+}
+
+/**
+ * Push a new set of objects and remove all previous ones. Settings, synonyms and query rules are
+ * untouched. Replace all records in an index without any downtime. See
+ * https://api-clients-automation.netlify.app/docs/add-new-api-client#5-helpers for implementation
+ * details.
+ *
+ * @param indexName The `indexName` to replace `objects` in.
+ * @param objects The array of `objects` to store in the given Algolia `indexName`.
+ * @param batchSize The size of the chunk of `objects`. The number of `batch` calls will be equal
+ *     to `length(objects) / batchSize`.
+ * @throws AlgoliaRetryException When the retry has failed on all hosts
+ * @throws AlgoliaApiException When the API sends an http error code
+ * @throws AlgoliaRuntimeException When an error occurred during the serialization
+ */
+public <T> ReplaceAllObjectsResponse replaceAllObjects(String indexName, Iterable<T> objects, int batchSize) {
+  return replaceAllObjects(indexName, objects, batchSize, null);
+}
+
 /**
  * Push a new set of objects and remove all previous ones. Settings, synonyms and query rules are
  * untouched. Replace all records in an index without any downtime. See
@@ -916,6 +932,10 @@ public <T> ReplaceAllObjectsResponse replaceAllObjects(
   Random rnd = new Random();
   String tmpIndexName = indexName + "_tmp_" + rnd.nextInt(100);
 
+  if (batchSize == -1) {
+    batchSize = 1000;
+  }
+
   try {
     // Copy settings, synonyms and rules
     UpdatedAtResponse copyOperationResponse = operationIndex(
@@ -958,10 +978,8 @@ public <T> ReplaceAllObjectsResponse replaceAllObjects(
       .setCopyOperationResponse(copyOperationResponse)
       .setBatchResponses(batchResponses)
       .setMoveOperationResponse(moveOperationResponse);
-  } catch (Exception e) {
+  } finally {
     deleteIndex(tmpIndexName);
-
-    throw e;
   }
 }
 

tests/CTS/client/ingestion/api.json

@@ -28,7 +28,7 @@
             "go": "API error [429] Too Many Requests",
             "java": "Status Code: 429 - Too Many Requests",
             "javascript": "Too Many Requests",
-            "kotlin": "Client request(GET http://%localhost%:6676/1/html-error) invalid: 429 Too Many Requests. Text: \\\"<html><body>429 Too Many Requests</body></html>\\\"",
+            "kotlin": "Client request\\\\(GET http://%localhost%:6676/1/html-error\\\\) invalid: 429 Too Many Requests. Text: \\\"<html><body>429 Too Many Requests</body></html>\\\"",
             "php": "429: Too Many Requests",
             "python": "Too Many Requests",
             "ruby": "429: Too Many Requests",

tests/CTS/client/search/api.json

@@ -137,7 +137,7 @@
             "go": "failed to do request: all hosts have been contacted unsuccessfully, it can either be a server or a network error or wrong appID/key credentials were used. You can use 'ExposeIntermediateNetworkErrors: true' in the config to investigate.",
             "java": "Error(s) while processing the retry strategy\\nCaused by: java.net.SocketTimeoutException: timeout",
             "javascript": "Unreachable hosts - your application id may be incorrect. If the error persists, please reach out to the Algolia Support team: https://alg.li/support.",
-            "kotlin": "Error(s) while processing the retry strategy",
+            "kotlin": "Error\\\\(s\\\\) while processing the retry strategy",
             "php": "Impossible to connect, please check your Algolia Application Id.",
             "python": "Unreachable hosts",
             "ruby": "Unreachable hosts. Last error for %localhost%: Net::ReadTimeout with #<TCPSocket:(closed)>",

tests/CTS/client/search/indexExists.json

@@ -85,7 +85,7 @@
             "go": "API error [403] Invalid API key",
             "java": "Status Code: 403 - {\\\"message\\\":\\\"Invalid API key\\\"}",
             "javascript": "Invalid API key",
-            "kotlin": "Client request(GET http://%localhost%:6681/1/indexes/indexExistsERROR/settings) invalid: 403 Forbidden. Text: \\\"{\\\"message\\\":\\\"Invalid API key\\\"}\\\"",
+            "kotlin": "Client request\\\\(GET http://%localhost%:6681/1/indexes/indexExistsERROR/settings\\\\) invalid: 403 Forbidden. Text: \\\"\\\\{\\\"message\\\":\\\"Invalid API key\\\"\\\\}\\\"",
             "php": "Invalid API key",
             "python": "Invalid API key",
             "ruby": "403: Invalid API key",

tests/CTS/client/search/replaceAllObjects.json

@@ -123,7 +123,6 @@
           "apiKey": "test-api-key",
           "customHosts": [
             {
-              "host": "${{localhost}}",
               "port": 6684
             }
           ]
@@ -148,13 +147,13 @@
         "expected": {
           "error": {
             "csharp": "{\\\"message\\\":\\\"Record is too big\\\",\\\"status\\\":400}",
-            "go": "API error [400] {\\\"message\\\":\\\"Record is too big\\\",\\\"status\\\":400}",
+            "go": "API error [400] Record is too big",
             "java": "Status Code: 400 - {\\\"message\\\":\\\"Record is too big\\\",\\\"status\\\":400}",
             "javascript": "Record is too big",
-            "kotlin": "Client request(POST http://${{localhost}}:6684/1/indexes/cts_e2e_replace_all_objects_too_big_${{language}}/batch) invalid: 400 Bad Request. Text: \\\"{\\\"message\\\":\\\"Record is too big\\\",\\\"status\\\":400}\\\"",
+            "kotlin": "Client request\\\\(POST http://%localhost%:6684/1/indexes/cts_e2e_replace_all_objects_too_big_${{language}}_tmp_\\\\d+/batch\\\\) invalid: 400 Bad Request. Text: \\\"\\\\{\\\"message\\\":\\\"Record is too big\\\",\\\"status\\\":400\\\\}\\\"",
             "php": "Record is too big",
             "python": "Record is too big",
-            "ruby": "Record is too big",
+            "ruby": "400: Record is too big",
             "swift": "HTTP error: Status code: 400 Message: Record is too big"
           }
         }

tests/CTS/client/search/saveObjects.json

@@ -84,7 +84,7 @@
             "go": "API error [403] Invalid Application-ID or API key",
             "java": "Status Code: 403 - {\\\"message\\\":\\\"Invalid Application-ID or API key\\\",\\\"status\\\":403}",
             "javascript": "Invalid Application-ID or API key",
-            "kotlin": "Client request(POST http://%localhost%:6680/1/indexes/cts_e2e_saveObjects_kotlin/batch) invalid: 403 Forbidden. Text: \\\"{\\\"message\\\":\\\"Invalid Application-ID or API key\\\",\\\"status\\\":403}\\\"",
+            "kotlin": "Client request\\\\(POST http://%localhost%:6680/1/indexes/cts_e2e_saveObjects_kotlin/batch\\\\) invalid: 403 Forbidden. Text: \\\"\\\\{\\\"message\\\":\\\"Invalid Application-ID or API key\\\",\\\"status\\\":403\\\\}\\\"",
             "php": "Invalid Application-ID or API key",
             "python": "Invalid Application-ID or API key",
             "ruby": "403: Invalid Application-ID or API key",