added handle * too and update snaps again

elastic · Oct 29, 2024 · 12f989f · 12f989f
1 parent 291bf48
commit 12f989f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/packages/kbn-router-to-openapispec/src/__snapshots__/generate_oas.test.ts.snap b/packages/kbn-router-to-openapispec/src/__snapshots__/generate_oas.test.ts.snap
diff --git a/packages/kbn-router-to-openapispec/src/generate_oas.test.fixture.ts b/packages/kbn-router-to-openapispec/src/generate_oas.test.fixture.ts
@@ -35,7 +35,7 @@ export const sharedOas = {
       get: {
         deprecated: true,
         'x-discontinued': 'route discontinued version or date',
-        operationId: '%2Fbar#0',
+        operationId: 'get-bar',
         parameters: [
           {
             description: 'The version of the API to use',
@@ -154,7 +154,7 @@ export const sharedOas = {
     '/foo/{id}/{path*}': {
       get: {
         description: 'route description',
-        operationId: '%2Ffoo%2F%7Bid%7D%2F%7Bpath*%7D#0',
+        operationId: 'get-foo-id-path',
         parameters: [
           {
             description: 'The version of the API to use',
@@ -278,7 +278,7 @@ export const sharedOas = {
       },
       post: {
         description: 'route description',
-        operationId: '%2Ffoo%2F%7Bid%7D%2F%7Bpath*%7D#1',
+        operationId: 'post-foo-id-path',
         parameters: [
           {
             description: 'The version of the API to use',

diff --git a/packages/kbn-router-to-openapispec/src/util.test.ts b/packages/kbn-router-to-openapispec/src/util.test.ts
@@ -305,6 +305,13 @@ describe('getOpId', () => {
       },
       output: 'get-my-resource-id',
     },
+    {
+      input: {
+        method: 'get',
+        path: '/api/my/resource/{path*}',
+      },
+      output: 'get-my-resource-path',
+    },
   ])('$input.method $input.path -> $output', ({ input, output }) => {
     expect(getOpId(input)).toBe(output);
   });

diff --git a/packages/kbn-router-to-openapispec/src/util.ts b/packages/kbn-router-to-openapispec/src/util.ts
@@ -201,8 +201,6 @@ export const getOpId = ({ path, method }: { path: string; method: string }): str
   return `${method.toLocaleLowerCase()}-${path
     .replace(/^\//, '')
     .replace(/\/$/, '')
-    .replace(/\{/g, '')
-    .replace(/\}/g, '')
-    .replace(/\?/g, '')
+    .replace(/[\{\}\?\*]/g, '')
     .replace(/\//g, '-')}`;
 };