Update opID override error case logic and tests

Author: Sophia Marie Terry

tools/spectral/ipa/__tests__/utils/validations/validateOperationIdAndReturnErrors.test.js

@@ -202,6 +202,19 @@ describe('tools/spectral/ipa/rulesets/functions/utils/validations/validateOperat
         ['paths', '/some/{id}/resource/{resourceId}/long/{id}/childResource/{id}', 'get']
       )
     ).toHaveLength(0);
+
+    // valid override on short opID
+    expect(
+      validateOperationIdAndReturnErrors(
+        'get',
+        '/some/{id}/resource/{resourceId}',
+        {
+          operationId: 'getSomeResource',
+          'x-xgen-operation-id-override': 'getResource',
+        },
+        ['paths', '/some/{id}/resource/{resourceId}', 'get']
+      )
+    ).toHaveLength(0);
   });
 
   it('should return errors for invalid operation ID', () => {
@@ -258,26 +271,6 @@ describe('tools/spectral/ipa/rulesets/functions/utils/validations/validateOperat
     ]);
   });
 
-  it('should return errors for valid operation ID with unnecessary override', () => {
-    expect(
-      validateOperationIdAndReturnErrors(
-        'get',
-        '/some/{id}/resource/{resourceId}',
-        {
-          operationId: 'getSomeResource',
-          'x-xgen-operation-id-override': 'getResource',
-        },
-        ['paths', '/some/{id}/resource/{resourceId}', 'get']
-      )
-    ).toEqual([
-      {
-        path: ['paths', '/some/{id}/resource/{resourceId}', 'get', 'x-xgen-operation-id-override'],
-        message:
-          "Please remove the 'x-xgen-operation-id-override' extension from the operation. The Operation ID already has a valid length (<=4 words).",
-      },
-    ]);
-  });
-
   it('should return errors for operation ID override with wrong verb', () => {
     expect(
       validateOperationIdAndReturnErrors(

tools/spectral/ipa/rulesets/functions/utils/validations/validateOperationIdAndReturnErrors.js

@@ -8,10 +8,6 @@ const TOO_LONG_OP_ID_ERROR_MESSAGE =
   "The Operation ID is longer than 4 words. Please add an '" +
   OPERATION_ID_OVERRIDE_EXTENSION +
   "' extension to the operation with a shorter operation ID.";
-const REMOVE_OP_ID_OVERRIDE_ERROR_MESSAGE =
-  "Please remove the '" +
-  OPERATION_ID_OVERRIDE_EXTENSION +
-  "' extension from the operation. The Operation ID already has a valid length (<=4 words).";
 
 /**
  * Validates the operationId of an operation object and returns errors if it does not match the expected format. Also validates that the operationId override, if present, follows the expected rules.
@@ -37,26 +33,23 @@ export function validateOperationIdAndReturnErrors(methodName, resourcePath, ope
   }
 
   const operationIdOverridePath = path.concat([OPERATION_ID_OVERRIDE_EXTENSION]);
-  if (numberOfWords(operationId) > 4) {
-    if (!hasOperationIdOverride(operationObject)) {
-      errors.push({
-        path: operationIdPath,
-        message: TOO_LONG_OP_ID_ERROR_MESSAGE + " For example: '" + shortenOperationId(expectedOperationId) + "'.",
-      });
-      return errors;
-    }
+  if (numberOfWords(operationId) > 4 && !hasOperationIdOverride(operationObject)) {
+    errors.push({
+      path: operationIdPath,
+      message: TOO_LONG_OP_ID_ERROR_MESSAGE + " For example: '" + shortenOperationId(expectedOperationId) + "'.",
+    });
+    return errors;
+  }
+
+  if (hasOperationIdOverride(operationObject)) {
     const overrideErrors = validateOperationIdOverride(
       operationIdOverridePath,
       getOperationIdOverride(operationObject),
       expectedOperationId
     );
     errors.push(...overrideErrors);
-  } else if (hasOperationIdOverride(operationObject)) {
-    errors.push({
-      path: operationIdOverridePath,
-      message: REMOVE_OP_ID_OVERRIDE_ERROR_MESSAGE,
-    });
   }
+
   return errors;
 }