feat(rulesets): fix oas3_1-servers-in-webhook and oas3_1-callbacks-in…

…-webhook rules
stoplightio · Jan 22, 2024 · b89dd2d · b89dd2d
1 parent 97ef9f5
commit b89dd2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/packages/rulesets/src/oas/__tests__/oas3_1-callbacks-in-webhook.test.ts b/packages/rulesets/src/oas/__tests__/oas3_1-callbacks-in-webhook.test.ts
@@ -1,7 +1,7 @@
 import { DiagnosticSeverity } from '@stoplight/types';
 import testRule from '../../__tests__/__helpers__/tester';
 
-testRule('oas3_1-servers-in-webhook', [
+testRule('oas3_1-callbacks-in-webhook', [
   {
     name: 'callbacks defined in webhook',
     document: {

diff --git a/packages/rulesets/src/oas/index.ts b/packages/rulesets/src/oas/index.ts
@@ -711,24 +711,18 @@ const ruleset = {
       message: 'Servers should not be defined in a webhook.',
       formats: [oas3_1],
       recommended: true,
-      given: ['$.webhooks[*]'],
+      given: ['$.webhooks.servers'],
       then: {
         function: undefined,
-        functionOptions: {
-          properties: ['servers'],
-        },
       },
     },
     'oas3_1-callbacks-in-webhook': {
       message: 'Callbacks should not be defined in a webhook.',
       formats: [oas3_1],
       recommended: true,
-      given: ['$.webhooks[*][*]'],
+      given: ['$.webhooks[*][*].callbacks'],
       then: {
         function: undefined,
-        functionOptions: {
-          properties: ['callbacks'],
-        },
       },
     },
   },