New logic for non-custom method overrides

Author: Sophia Marie Terry

tools/spectral/ipa/rulesets/functions/IPA106ValidOperationID.js

@@ -6,7 +6,7 @@ import {
   handleInternalError,
 } from './utils/collectionUtils.js';
 import { isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
-import { hasCustomMethodOverride } from './utils/extensions.js';
+import { hasCustomMethodOverride, hasMethodVerbOverride, VERB_OVERRIDE_EXTENSION } from './utils/extensions.js';
 import { validateOperationIdAndReturnErrors } from './utils/validations/validateOperationIdAndReturnErrors.js';
 
 const RULE_NAME = 'xgen-IPA-106-valid-operation-id';
@@ -23,6 +23,10 @@ export default (input, { methodName }, { path }) => {
     return;
   }
 
+  if (hasMethodVerbOverride(input, methodName)) {
+    methodName = input[VERB_OVERRIDE_EXTENSION].verb;
+  }
+
   try {
     const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path);
 

tools/spectral/ipa/rulesets/functions/IPA107ValidOperationID.js

@@ -6,7 +6,7 @@ import {
   handleInternalError,
 } from './utils/collectionUtils.js';
 import { isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
-import { hasCustomMethodOverride } from './utils/extensions.js';
+import { hasCustomMethodOverride, hasMethodVerbOverride, VERB_OVERRIDE_EXTENSION } from './utils/extensions.js';
 import { validateOperationIdAndReturnErrors } from './utils/validations/validateOperationIdAndReturnErrors.js';
 
 const RULE_NAME = 'xgen-IPA-107-valid-operation-id';
@@ -23,6 +23,10 @@ export default (input, { methodName }, { path }) => {
     return;
   }
 
+  if (hasMethodVerbOverride(input, methodName)) {
+    methodName = input[VERB_OVERRIDE_EXTENSION].verb;
+  }
+
   try {
     const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path);
 

tools/spectral/ipa/rulesets/functions/IPA108ValidOperationID.js

@@ -6,7 +6,7 @@ import {
   handleInternalError,
 } from './utils/collectionUtils.js';
 import { isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
-import { hasCustomMethodOverride } from './utils/extensions.js';
+import { hasCustomMethodOverride, hasMethodVerbOverride, VERB_OVERRIDE_EXTENSION } from './utils/extensions.js';
 import { validateOperationIdAndReturnErrors } from './utils/validations/validateOperationIdAndReturnErrors.js';
 
 const RULE_NAME = 'xgen-IPA-108-valid-operation-id';
@@ -23,6 +23,10 @@ export default (input, { methodName }, { path }) => {
     return;
   }
 
+  if (hasMethodVerbOverride(input, methodName)) {
+    methodName = input[VERB_OVERRIDE_EXTENSION].verb;
+  }
+
   try {
     const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path);