fix(specs): more flexible custom methods (#2889)

damcou · web-flow · commit 10c9339c86fc · 2024-03-21T00:09:48.000Z
diff --git a/specs/abtesting/spec.yml b/specs/abtesting/spec.yml
@@ -33,7 +33,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   /2/abtests:
diff --git a/specs/analytics/spec.yml b/specs/analytics/spec.yml
@@ -46,7 +46,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   # ##################################
diff --git a/specs/ingestion/spec.yml b/specs/ingestion/spec.yml
@@ -40,7 +40,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   # authentications API.
diff --git a/specs/insights/spec.yml b/specs/insights/spec.yml
@@ -98,7 +98,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   /1/events:
diff --git a/specs/monitoring/spec.yml b/specs/monitoring/spec.yml
@@ -49,7 +49,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   /1/status:
diff --git a/specs/personalization/spec.yml b/specs/personalization/spec.yml
@@ -36,7 +36,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   /1/profiles/personalization/{userToken}:
diff --git a/specs/query-suggestions/spec.yml b/specs/query-suggestions/spec.yml
@@ -44,7 +44,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   /1/configs:
diff --git a/specs/recommend/spec.yml b/specs/recommend/spec.yml
@@ -49,7 +49,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   /1/indexes/*/recommendations:
@@ -62,4 +62,4 @@ paths:
     $ref: 'paths/getRecommendStatus.yml'
 
   /1/indexes/{indexName}/{model}/recommend/rules/search:
-    $ref: 'paths/searchRecommendRules.yml'
+    $ref: 'paths/searchRecommendRules.yml'
diff --git a/specs/search/spec.yml b/specs/search/spec.yml
@@ -225,7 +225,7 @@ paths:
   # ######################
   # ### Custom request ###
   # ######################
-  /1{path}:
+  /{path}:
     $ref: '../common/paths/customRequest.yml'
 
   # ########################
diff --git a/tests/CTS/client/analytics/parameters.json b/tests/CTS/client/analytics/parameters.json
@@ -43,7 +43,7 @@
         "object": "$client",
         "path": "customPost",
         "parameters": {
-          "path": "/test"
+          "path": "test"
         },
         "expected": {
           "type": "host",
diff --git a/tests/CTS/client/common/commonApi.json b/tests/CTS/client/common/commonApi.json
@@ -7,7 +7,7 @@
         "object": "$client",
         "path": "customPost",
         "parameters": {
-          "path": "/test"
+          "path": "1/test"
         },
         "expected": {
           "type": "userAgent",
@@ -24,7 +24,7 @@
         "object": "$client",
         "path": "customGet",
         "parameters": {
-          "path": "/test"
+          "path": "1/test"
         },
         "expected": {
           "type": "timeouts",
@@ -44,7 +44,7 @@
         "object": "$client",
         "path": "customPost",
         "parameters": {
-          "path": "/test"
+          "path": "1/test"
         },
         "expected": {
           "type": "timeouts",
diff --git a/tests/CTS/client/insights/parameters.json b/tests/CTS/client/insights/parameters.json
@@ -61,7 +61,7 @@
         "object": "$client",
         "path": "customDelete",
         "parameters": {
-          "path": "/test"
+          "path": "test"
         },
         "expected": {
           "type": "host",
diff --git a/tests/CTS/client/monitoring/parameters.json b/tests/CTS/client/monitoring/parameters.json
@@ -16,7 +16,7 @@
         "object": "$client",
         "path": "customDelete",
         "parameters": {
-          "path": "/test"
+          "path": "test"
         },
         "expected": {
           "type": "host",
diff --git a/tests/CTS/client/recommend/api.json b/tests/CTS/client/recommend/api.json
@@ -16,7 +16,7 @@
         "object": "$client",
         "path": "customGet",
         "parameters": {
-          "path": "/test"
+          "path": "test"
         },
         "expected": {
           "type": "host",
@@ -42,7 +42,7 @@
         "object": "$client",
         "path": "customPost",
         "parameters": {
-          "path": "/test"
+          "path": "test"
         },
         "expected": {
           "type": "host",
diff --git a/tests/CTS/client/search/api.json b/tests/CTS/client/search/api.json
@@ -16,7 +16,7 @@
         "object": "$client",
         "path": "customGet",
         "parameters": {
-          "path": "/test"
+          "path": "test"
         },
         "expected": {
           "type": "host",
@@ -42,7 +42,7 @@
         "object": "$client",
         "path": "customPost",
         "parameters": {
-          "path": "/test"
+          "path": "test"
         },
         "expected": {
           "type": "host",
@@ -78,7 +78,7 @@
         "object": "$client",
         "path": "customGet",
         "parameters": {
-          "path": "/test/retry"
+          "path": "1/test/retry"
         },
         "expected": {
           "type": "response",
@@ -113,7 +113,7 @@
         "object": "$client",
         "path": "customPost",
         "parameters": {
-          "path": "/test/gzip",
+          "path": "1/test/gzip",
           "parameters": {},
           "body": {
             "message": "this is a compressed body"
diff --git a/tests/CTS/requests/common/customDelete.json b/tests/CTS/requests/common/customDelete.json
@@ -2,23 +2,23 @@
   {
     "testName": "allow del method for a custom path with minimal parameters",
     "parameters": {
-      "path": "/test/minimal"
+      "path": "test/minimal"
     },
     "request": {
-      "path": "/1/test/minimal",
+      "path": "/test/minimal",
       "method": "DELETE"
     }
   },
   {
     "testName": "allow del method for a custom path with all parameters",
     "parameters": {
-      "path": "/test/all",
+      "path": "test/all",
       "parameters": {
         "query": "parameters"
       }
     },
     "request": {
-      "path": "/1/test/all",
+      "path": "/test/all",
       "method": "DELETE",
       "queryParameters": {
         "query": "parameters"
diff --git a/tests/CTS/requests/common/customGet.json b/tests/CTS/requests/common/customGet.json
@@ -2,23 +2,23 @@
   {
     "testName": "allow get method for a custom path with minimal parameters",
     "parameters": {
-      "path": "/test/minimal"
+      "path": "test/minimal"
     },
     "request": {
-      "path": "/1/test/minimal",
+      "path": "/test/minimal",
       "method": "GET"
     }
   },
   {
     "testName": "allow get method for a custom path with all parameters",
     "parameters": {
-      "path": "/test/all",
+      "path": "test/all",
       "parameters": {
         "query": "parameters with space"
       }
     },
     "request": {
-      "path": "/1/test/all",
+      "path": "/test/all",
       "method": "GET",
       "queryParameters": {
         "query": "parameters%20with%20space"
@@ -28,7 +28,7 @@
   {
     "testName": "requestOptions should be escaped too",
     "parameters": {
-      "path": "/test/all",
+      "path": "test/all",
       "parameters": {
         "query": "to be overriden"
       }
@@ -46,7 +46,7 @@
       }
     },
     "request": {
-      "path": "/1/test/all",
+      "path": "/test/all",
       "method": "GET",
       "queryParameters": {
         "query": "parameters%20with%20space",
diff --git a/tests/CTS/requests/common/customPost.json b/tests/CTS/requests/common/customPost.json
diff --git a/tests/CTS/requests/common/customPut.json b/tests/CTS/requests/common/customPut.json
diff --git a/tests/output/javascript/yarn.lock b/tests/output/javascript/yarn.lock
