feat(specs): update predict client API URL (#1010)

Author: bengreenbank

generators/src/main/java/com/algolia/codegen/cts/AlgoliaCTSGenerator.java

@@ -88,9 +88,16 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
 
       Object lambda = objs.get("lambda");
       List<CodegenServer> servers = (List<CodegenServer>) objs.get("servers");
-      boolean hasRegionalHost = servers
-        .stream()
-        .anyMatch(server -> server.variables.stream().anyMatch(variable -> variable.name.equals("region")));
+      CodegenServerVariable regionVariable = null;
+      outerLoop:for (CodegenServer server : servers) {
+        for (CodegenServerVariable var : server.variables) {
+          if (var.name.equals("region")) {
+            regionVariable = var;
+            break outerLoop;
+          }
+        }
+      }
+      boolean hasRegionalHost = regionVariable != null;
 
       Map<String, Object> bundle = objs;
       bundle.clear();
@@ -106,7 +113,9 @@ public Map<String, Object> postProcessSupportingFileData(Map<String, Object> obj
       bundle.put("client", Utils.createClientName(importClientName, language) + "Client");
       bundle.put("clientPrefix", Utils.createClientName(importClientName, language));
       bundle.put("hasRegionalHost", hasRegionalHost);
-      bundle.put("defaultRegion", client.equals("predict") ? "ew" : "us");
+      if (hasRegionalHost) {
+        bundle.put("defaultRegion", regionVariable.defaultValue);
+      }
       bundle.put("lambda", lambda);
 
       ctsManager.addDataToBundle(bundle);

playground/javascript/node/predict.ts

@@ -10,7 +10,7 @@ const apiKey =
 const userId = process.env.ALGOLIA_PREDICT_USER_ID || 'user1';
 
 // Init client with appId and apiKey
-const client = predictClient(appId, apiKey, 'ew');
+const client = predictClient(appId, apiKey, 'eu');
 
 async function testPredict() {
   try {

specs/predict/spec.yml

@@ -10,17 +10,17 @@ components:
     apiKey:
       $ref: '../common/securitySchemes.yml#/apiKey'
 servers:
-  - url: https://predict-api-432xa6wemq-{region}.a.run.app
+  - url: https://predict.{region}.algolia.com
     variables:
       region:
         enum:
-          - ue
-          - ew
-        default: ew
+          - eu
+          - us
+        default: eu
         description: >
           Region where your Predict data is stored and processed:
-            * `ew` - europe-west
-            * `ue` - us-east.
+            * `eu` - Europe
+            * `us` - United States.
 security:
   - appId: []
     apiKey: []

tests/CTS/client/predict/parameters.json

@@ -11,7 +11,7 @@
           "region": ""
         },
         "expected": {
-          "error": "`region` is required and must be one of the following: ue, ew"
+          "error": "`region` is required and must be one of the following: eu, us"
         }
       }
     ]
@@ -28,7 +28,7 @@
           "region": "not_a_region"
         },
         "expected": {
-          "error": "`region` is required and must be one of the following: ue, ew"
+          "error": "`region` is required and must be one of the following: eu, us"
         }
       }
     ]
@@ -42,7 +42,7 @@
         "parameters": {
           "appId": "my-app-id",
           "apiKey": "my-api-key",
-          "region": "ew"
+          "region": "eu"
         },
         "expected": {}
       }