fix(execute): handle Server Objects overrides for OpenAPI 3.1.0 (#3223)

Refs #2967
swagger-api · Nov 3, 2023 · 13fed9c · 13fed9c
1 parent 7b69c04
commit 13fed9c
Show file tree

Hide file tree

Showing 5 changed files with 161 additions and 69 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -109,10 +109,10 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.22.15",
-    "@swagger-api/apidom-core": ">=0.82.0 <1.0.0",
-    "@swagger-api/apidom-json-pointer": ">=0.82.0 <1.0.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=0.82.0 <1.0.0",
-    "@swagger-api/apidom-reference": ">=0.82.0 <1.0.0",
+    "@swagger-api/apidom-core": ">=0.82.2 <1.0.0",
+    "@swagger-api/apidom-json-pointer": ">=0.82.2 <1.0.0",
+    "@swagger-api/apidom-ns-openapi-3-1": ">=0.82.2 <1.0.0",
+    "@swagger-api/apidom-reference": ">=0.82.2 <1.0.0",
     "cookie": "~0.5.0",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",

diff --git a/src/execute/index.js b/src/execute/index.js
@@ -346,7 +346,7 @@ function oas3BaseUrl({ spec, pathName, method, server, contextUrl, serverVariabl
 
   // default to the first server if we don't have one by now
   if (!selectedServerUrl) {
-    selectedServerObj = servers.at(0);
+    [selectedServerObj] = servers;
     selectedServerUrl = selectedServerObj.url;
   }
 

diff --git a/test/resolver/strategies/openapi-3-1-apidom/__snapshots__/index.js.snap b/test/resolver/strategies/openapi-3-1-apidom/__snapshots__/index.js.snap
@@ -647,6 +647,11 @@ exports[`resolve OpenAPI 3.1.0 strategy given OpenAPI 3.1.0 definition via URL a
       },
     },
     "openapi": "3.1.0",
+    "servers": [
+      {
+        "url": "/",
+      },
+    ],
   },
 }
 `;
@@ -694,6 +699,11 @@ exports[`resolve OpenAPI 3.1.0 strategy given OpenAPI 3.1.0 definition via URL a
       },
     },
     "openapi": "3.1.0",
+    "servers": [
+      {
+        "url": "/",
+      },
+    ],
   },
 }
 `;
@@ -1639,6 +1649,11 @@ exports[`resolve OpenAPI 3.1.0 strategy given OpenAPI 3.1.0 definition via spec
     "version": "1.0.0",
   },
   "openapi": "3.1.0",
+  "servers": [
+    {
+      "url": "/",
+    },
+  ],
 }
 `;
 
@@ -1725,6 +1740,11 @@ exports[`resolve OpenAPI 3.1.0 strategy given OpenAPI 3.1.0 definition via spec
       "version": "1.0.0",
     },
     "openapi": "3.1.0",
+    "servers": [
+      {
+        "url": "/",
+      },
+    ],
   },
 }
 `;
@@ -2507,6 +2527,11 @@ exports[`resolve OpenAPI 3.1.0 strategy given OpenAPI 3.1.0 definition via spec
       "version": "1.0.0",
     },
     "openapi": "3.1.0",
+    "servers": [
+      {
+        "url": "/",
+      },
+    ],
   },
 }
 `;