Merge branch 'main' into chore/renovateBaseBranch

Author: millotp

.github/ISSUE_TEMPLATE/Bug_report.yml

@@ -43,7 +43,7 @@ body:
     id: client
     attributes:
       label: Client
-      description: Which API are you targetting?
+      description: Which API are you targeting?
       options:
         - All
         - AB testing

config/clients.config.json

@@ -168,7 +168,6 @@
     "packageVersion": "5.5.3",
     "modelFolder": "model",
     "apiFolder": "src",
-    "dockerImage": "apic_base",
     "tests": {
       "extension": ".test.ts",
       "outputFolder": "src"

docker-compose.yml

@@ -13,7 +13,8 @@ services:
         - PHP_VERSION=${PHP_VERSION}
         - PYTHON_VERSION=${PYTHON_VERSION}
     command: tail -f /dev/null
-    volumes: [./:/app]
+    volumes: [ ./:/app ]
+
   ruby:
     container_name: apic_ruby
     build:
@@ -24,7 +25,8 @@ services:
         - NODE_VERSION=${NODE_VERSION}
         - RUBY_VERSION=${RUBY_VERSION}
     command: tail -f /dev/null
-    volumes: [./:/app]
+    volumes: [ ./:/app ]
+
   swift:
     container_name: apic_swift
     build:
@@ -35,4 +37,4 @@ services:
         - NODE_VERSION=${NODE_VERSION}
         - SWIFT_VERSION=${SWIFT_VERSION}
     command: tail -f /dev/null
-    volumes: [./:/app]
+    volumes: [ ./:/app ]

generators/src/main/java/com/algolia/codegen/cts/tests/TestsGenerator.java

@@ -95,20 +95,11 @@ protected <T> Map<String, T[]> loadFullCTS(Class<T[]> jsonType) throws Exception
 
   private String injectVariables(String json) {
     long threeDays = 3 * 24 * 60 * 60 * 1000;
-    json = json
+    return json
       .replace("${{language}}", language)
       .replace("${{languageCased}}", ctsManager.getLanguageCased())
       .replace("${{languageVersion}}", ctsManager.getVersion())
       .replace("${{clientPascalCase}}", Helpers.capitalize(Helpers.camelize(client)))
       .replace("\"${{nowRounded}}\"", String.valueOf(Math.round(System.currentTimeMillis() / threeDays) * threeDays));
-
-    if (!language.equals("javascript") && !"true".equals(System.getenv("CI"))) {
-      // hack for docker on mac, the `network=host` does not work so we need to use
-      // another local IP
-      json = json.replace("${{localhost}}", "host.docker.internal");
-    } else {
-      json = json.replace("${{localhost}}", "localhost");
-    }
-    return json;
   }
 }

scripts/buildClients.ts

@@ -25,12 +25,12 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
       await run('go build ./...', { cwd, language });
       break;
     case 'javascript':
-      await run('YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install', { cwd });
+      await run('YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install', { cwd, language });
       if (buildType === 'client') {
         const packageNames = gens.map(({ additionalProperties: { packageName } }) =>
           packageName === 'algoliasearch' ? packageName : `@algolia/${packageName}`,
         );
-        await run(`yarn build:many '{${packageNames.join(',')},}'`, { cwd });
+        await run(`yarn build:many '{${packageNames.join(',')},}'`, { cwd, language });
       }
 
       break;

scripts/cts/runCts.ts

@@ -57,10 +57,13 @@ async function runCtsOne(language: Language, suites: Record<CTSType, boolean>):
       });
       break;
     case 'go':
-      await run(`go test -race -count 1 ${isVerbose() ? '-v' : ''} ${filter((f) => `gotests/tests/${f}/...`)}`, {
-        cwd,
-        language,
-      });
+      await run(
+        `go test ${suites.benchmark ? '' : '-race'} -count 1 ${isVerbose() ? '-v' : ''} ${filter((f) => `gotests/tests/${f}/...`)}`,
+        {
+          cwd,
+          language,
+        },
+      );
       break;
     case 'java':
       await run(`./gradle/gradlew -p tests/output/java test --rerun ${filter((f) => `--tests 'com.algolia.${f}*'`)}`, {
@@ -70,6 +73,7 @@ async function runCtsOne(language: Language, suites: Record<CTSType, boolean>):
     case 'javascript':
       await run(`YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install && yarn test ${filter((f) => `src/${f}`)}`, {
         cwd,
+        language,
       });
       break;
     case 'kotlin':

scripts/cts/testServer/benchmark.ts

@@ -22,8 +22,9 @@ export function printBenchmarkReport(): void {
   const times: Array<{ lang: string; rate: number }> = [];
   for (const lang of Object.keys(benchmarkStatus)) {
     const status = benchmarkStatus[lang];
-    expect(status.requestTimes).to.have.length(1000);
-    const rate = 1000000 / (status.requestTimes.at(-1)! - status.requestTimes[0]);
+    expect(status.requestTimes).to.have.length(2000);
+    status.requestTimes.sort((a, b) => a - b);
+    const rate = (status.requestTimes.length * 1000) / (status.requestTimes.at(-1)! - status.requestTimes[0]);
     times.push({ lang, rate });
   }
 

scripts/cts/testServer/timeout.ts

@@ -42,7 +42,7 @@ export function assertValidTimeouts(expectedCount: number): void {
           break;
         default:
           // the delay should be the same, because the `retryCount` is per host instead of global
-          expect(state.duration[3 * i]).to.be.closeTo(state.duration[3 * i + 1], 100);
+          expect(state.duration[3 * i]).to.be.closeTo(state.duration[3 * i + 1], 150);
           break;
       }
     }

scripts/formatter.ts

@@ -37,7 +37,7 @@ export async function formatter(language: string, cwd: string): Promise<void> {
       );
       break;
     case 'javascript':
-      await run(`yarn eslint --ext=ts,json ${cwd} --fix --no-error-on-unmatched-pattern`);
+      await run(`yarn eslint --ext=ts,json ${cwd} --fix --no-error-on-unmatched-pattern`, { language });
       break;
     case 'kotlin':
       await run(`./gradle/gradlew -p ${cwd} spotlessApply`, { language });

scripts/playground.ts

@@ -13,7 +13,7 @@ export async function playground({ language, client }: { language: AllLanguage;
       });
       break;
     case 'javascript':
-      await run(`yarn workspace javascript-playground start ${client}`);
+      await run(`yarn workspace javascript-playground start ${client}`, { language });
       break;
     case 'java':
       await run(