CLOUDP 306294: Add x-xgen-method-verb-override extension logic

package.json

@@ -20,7 +20,8 @@
         "testPathIgnorePatterns": [
             "__helpers__",
             "metrics/data",
-            "IPA\\d+ValidOperationID\\.test\\.js$" 
+            "IPA\\d+ValidOperationID\\.test\\.js$",
+            "operationIdGeneration.test.js"
         ]
     },
     "dependencies": {

tools/spectral/ipa/__tests__/utils/extensions.test.js

@@ -0,0 +1,69 @@
+import { describe, it, expect, toBe } from '@jest/globals';
+import {
+  hasMethodWithVerbOverride,
+  hasCustomMethodOverride,
+  hasMethodVerbOverride,
+} from '../../rulesets/functions/utils/extensions';
+
+const methodWithExtension = {
+  'x-xgen-method-verb-override': {
+    verb: 'get',
+    customMethod: false,
+  },
+};
+
+const customMethod = {
+  'x-xgen-method-verb-override': {
+    verb: 'add',
+    customMethod: true,
+  },
+};
+
+const endpointWithMethodExtension = {
+  delete: {
+    'x-xgen-method-verb-override': { verb: '‘remove’', customMethod: true },
+  },
+};
+
+const endpointWithNoMethodExtension = {
+  exception: true,
+};
+
+describe('tools/spectral/ipa/rulesets/functions/utils/extensions.js', () => {
+  describe('hasMethodWithVerbOverride', () => {
+    it('returns true if endpoint has method with the extension', () => {
+      expect(hasMethodWithVerbOverride(endpointWithMethodExtension)).toBe(true);
+    });
+    it('returns false if object does not a method with the extension', () => {
+      expect(hasMethodWithVerbOverride(endpointWithNoMethodExtension)).toBe(false);
+    });
+  });
+});
+
+describe('tools/spectral/ipa/rulesets/functions/utils/extensions.js', () => {
+  describe('hasCustomMethodOverride', () => {
+    it('returns true if the method has the extension with the cusotmMethod boolean set to true', () => {
+      expect(hasCustomMethodOverride(customMethod)).toBe(true);
+    });
+    it('returns false if the method does not have the extension', () => {
+      expect(hasCustomMethodOverride({})).toBe(false);
+    });
+    it('returns false if the method has the extension but is not a custom method', () => {
+      expect(hasCustomMethodOverride(methodWithExtension)).toBe(false);
+    });
+  });
+});
+
+describe('tools/spectral/ipa/rulesets/functions/utils/extensions.js', () => {
+  describe('hasMethodVerbOverride', () => {
+    it('returns true if the method has the extension with the expected verb', () => {
+      expect(hasMethodVerbOverride(methodWithExtension, 'get')).toBe(true);
+    });
+    it('returns false if the method does not have the extension', () => {
+      expect(hasMethodVerbOverride({}, 'get')).toBe(false);
+    });
+    it('returns false if the method has the extension but with an unexpected verb', () => {
+      expect(hasMethodVerbOverride(methodWithExtension, 'put')).toBe(false);
+    });
+  });
+});

tools/spectral/ipa/__tests__/utils/operationIdGeneration.test.js

@@ -28,7 +28,7 @@ describe('tools/spectral/ipa/utils/operationIdGeneration.js', () => {
     expect(generateOperationID('addNode', '/groups/{groupId}/clusters/{clusterName}')).toEqual('addGroupClusterNode');
     expect(generateOperationID('get', '/api/atlas/v2/groups/byName/{groupName}')).toEqual('getGroupByName');
     expect(generateOperationID('', '/api/atlas/v2/groups/{groupId}/backup/exportBuckets/{exportBucketId}')).toEqual(
-      'exportGroupBackupBuckets'
+      'exportGroupBackupBucket'
     );
   });
 

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

@@ -1,13 +1,9 @@
 import { generateOperationID } from './utils/operationIdGeneration.js';
 import { collectAdoption, collectAndReturnViolation, collectException } from './utils/collectionUtils.js';
 import { hasException } from './utils/exceptions.js';
-import {
-  isSingleResourceIdentifier,
-  isResourceCollectionIdentifier,
-  isSingletonResource,
-  getResourcePathItems,
-  isCustomMethodIdentifier,
-} from './utils/resourceEvaluation.js';
+import { getResourcePathItems, isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
+import { hasCustomMethodOverride, hasMethodVerbOverride } from './utils/extensions.js';
+import { invalidGetMethod } from './utils/methodLogic.js';
 
 const RULE_NAME = 'xgen-IPA-104-valid-operation-id';
 const ERROR_MESSAGE = 'Invalid OperationID.';
@@ -18,9 +14,10 @@ export default (input, { methodName }, { path, documentInventory }) => {
   const resourcePaths = getResourcePathItems(resourcePath, oas.paths);
 
   if (
+    hasCustomMethodOverride(input) ||
     isCustomMethodIdentifier(resourcePath) ||
-    (!isSingleResourceIdentifier(resourcePath) &&
-      !(isResourceCollectionIdentifier(resourcePath) && isSingletonResource(resourcePaths)))
+    hasMethodVerbOverride(input, 'list') ||
+    (invalidGetMethod(resourcePath, resourcePaths) && !hasMethodVerbOverride(input, methodName))
   ) {
     return;
   }

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

@@ -1,24 +1,23 @@
 import { hasException } from './utils/exceptions.js';
 import { collectAdoption, collectAndReturnViolation, collectException } from './utils/collectionUtils.js';
-import {
-  getResourcePathItems,
-  isCustomMethodIdentifier,
-  isResourceCollectionIdentifier,
-  isSingletonResource,
-} from './utils/resourceEvaluation.js';
+import { getResourcePathItems, isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
 import { generateOperationID } from './utils/operationIdGeneration.js';
+import { invalidListMethod } from './utils/methodLogic.js';
+import { hasCustomMethodOverride, hasMethodVerbOverride } from './utils/extensions.js';
 
 const RULE_NAME = 'xgen-IPA-105-valid-operation-id';
 const ERROR_MESSAGE = 'Invalid OperationID.';
 
 export default (input, { methodName }, { path, documentInventory }) => {
   const resourcePath = path[1];
   const oas = documentInventory.resolved;
+  const resourcePaths = getResourcePathItems(resourcePath, oas.paths);
 
   if (
+    hasCustomMethodOverride(input) ||
     isCustomMethodIdentifier(resourcePath) ||
-    !isResourceCollectionIdentifier(resourcePath) ||
-    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
+    hasMethodVerbOverride(input, 'get') ||
+    (invalidListMethod(resourcePath, resourcePaths) && !hasMethodVerbOverride(input, methodName))
   ) {
     return;
   }

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

@@ -1,23 +1,16 @@
 import { hasException } from './utils/exceptions.js';
 import { collectAdoption, collectException, collectAndReturnViolation } from './utils/collectionUtils.js';
-import {
-  isCustomMethodIdentifier,
-  isResourceCollectionIdentifier,
-  isSingletonResource,
-  getResourcePathItems,
-} from './utils/resourceEvaluation.js';
+import { isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
 import { generateOperationID } from './utils/operationIdGeneration.js';
+import { hasCustomMethodOverride } from './utils/extensions.js';
 
 const RULE_NAME = 'xgen-IPA-106-valid-operation-id';
 const ERROR_MESSAGE = 'Invalid OperationID.';
 
-export default (input, { methodName }, { path, documentInventory }) => {
+export default (input, { methodName }, { path }) => {
   const resourcePath = path[1];
-  const oas = documentInventory.resolved;
-  const resourcePaths = getResourcePathItems(resourcePath, oas.paths);
 
-  const isResourceCollection = isResourceCollectionIdentifier(resourcePath) && !isSingletonResource(resourcePaths);
-  if (isCustomMethodIdentifier(resourcePath) || !isResourceCollection) {
+  if (hasCustomMethodOverride(input) || isCustomMethodIdentifier(resourcePath)) {
     return;
   }
 

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

@@ -1,27 +1,16 @@
 import { hasException } from './utils/exceptions.js';
 import { collectAdoption, collectException, collectAndReturnViolation } from './utils/collectionUtils.js';
-import {
-  isSingleResourceIdentifier,
-  isResourceCollectionIdentifier,
-  isSingletonResource,
-  getResourcePathItems,
-  isCustomMethodIdentifier,
-} from './utils/resourceEvaluation.js';
+import { isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
 import { generateOperationID } from './utils/operationIdGeneration.js';
+import { hasCustomMethodOverride } from './utils/extensions.js';
 
 const RULE_NAME = 'xgen-IPA-107-valid-operation-id';
 const ERROR_MESSAGE = 'Invalid OperationID.';
 
-export default (input, { methodName }, { path, documentInventory }) => {
+export default (input, { methodName }, { path }) => {
   const resourcePath = path[1];
-  const oas = documentInventory.resolved;
-  const resourcePaths = getResourcePathItems(resourcePath, oas.paths);
 
-  if (
-    isCustomMethodIdentifier(resourcePath) ||
-    (!isSingleResourceIdentifier(resourcePath) &&
-      !(isResourceCollectionIdentifier(resourcePath) && isSingletonResource(resourcePaths)))
-  ) {
+  if (isCustomMethodIdentifier(resourcePath) || hasCustomMethodOverride(input)) {
     return;
   }
 

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

@@ -1,15 +1,16 @@
 import { hasException } from './utils/exceptions.js';
 import { collectAdoption, collectException, collectAndReturnViolation } from './utils/collectionUtils.js';
-import { isCustomMethodIdentifier, isSingleResourceIdentifier } from './utils/resourceEvaluation.js';
+import { isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
 import { generateOperationID } from './utils/operationIdGeneration.js';
+import { hasCustomMethodOverride } from './utils/extensions.js';
 
 const RULE_NAME = 'xgen-IPA-108-valid-operation-id';
 const ERROR_MESSAGE = 'Invalid OperationID.';
 
 export default (input, { methodName }, { path }) => {
   const resourcePath = path[1];
 
-  if (isCustomMethodIdentifier(resourcePath) || !isSingleResourceIdentifier(resourcePath)) {
+  if (isCustomMethodIdentifier(resourcePath) || hasCustomMethodOverride(input)) {
     return;
   }
 

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

@@ -2,43 +2,67 @@ import { hasException } from './utils/exceptions.js';
 import { collectAdoption, collectException, collectAndReturnViolation } from './utils/collectionUtils.js';
 import { isCustomMethodIdentifier, getCustomMethodName, stripCustomMethodName } from './utils/resourceEvaluation.js';
 import { generateOperationID } from './utils/operationIdGeneration.js';
+import { hasMethodWithVerbOverride, hasCustomMethodOverride } from './utils/extensions.js';
 
 const RULE_NAME = 'xgen-IPA-109-valid-operation-id';
 const ERROR_MESSAGE = 'Invalid OperationID.';
 
 export default (input, _, { path }) => {
   let resourcePath = path[1];
-  const methodName = getCustomMethodName(resourcePath);
 
-  if (!isCustomMethodIdentifier(resourcePath)) {
+  if (!isCustomMethodIdentifier(resourcePath) && !hasMethodWithVerbOverride(input)) {
     return;
   }
 
-  // TODO detect custom method extension - CLOUDP-306294
+  let errors = [];
+  let expectedOperationID = '';
+  if (isCustomMethodIdentifier(resourcePath)) {
+    expectedOperationID = generateOperationID(getCustomMethodName(resourcePath), stripCustomMethodName(resourcePath));
 
-  let obj;
-  if (input.post) {
-    obj = input.post;
-  } else if (input.get) {
-    obj = input.get;
-  } else {
-    return;
-  }
+    let obj;
+    if (input.post) {
+      obj = input.post;
+    } else if (input.get) {
+      obj = input.get;
+    } else {
+      return;
+    }
 
-  if (hasException(obj, RULE_NAME)) {
-    collectException(obj, RULE_NAME, path);
+    if (hasException(obj, RULE_NAME)) {
+      collectException(obj, RULE_NAME, path);
+      return;
+    }
+
+    const operationId = obj.operationId;
+    if (operationId !== expectedOperationID) {
+      const errors = [
+        {
+          path,
+          message: `${ERROR_MESSAGE} Found ${operationId}, expected ${expectedOperationID}.`,
+        },
+      ];
+      return collectAndReturnViolation(path, RULE_NAME, errors);
+    }
+  } else if (hasMethodWithVerbOverride(input)) {
+    const methods = Object.keys(input);
+    for (let i = 0; i < methods.length; i++) {
+      let obj = input[methods[i]];
+      const operationId = obj.operationId;
+      if (hasCustomMethodOverride(obj)) {
+        expectedOperationID = generateOperationID(obj['x-xgen-method-verb-override'].verb, resourcePath);
+        if (operationId !== expectedOperationID) {
+          errors.push({
+            path,
+            message: `${ERROR_MESSAGE} Found ${operationId}, expected ${expectedOperationID}.`,
+          });
+        }
+      }
+    }
+  } else {
     return;
   }
 
-  const operationId = obj.operationId;
-  const expectedOperationID = generateOperationID(methodName, stripCustomMethodName(resourcePath));
-  if (expectedOperationID !== operationId) {
-    const errors = [
-      {
-        path,
-        message: `${ERROR_MESSAGE} Found ${operationId}, expected ${expectedOperationID}.`,
-      },
-    ];
+  if (errors.length !== 0) {
     return collectAndReturnViolation(path, RULE_NAME, errors);
   }
 

tools/spectral/ipa/rulesets/functions/utils/extensions.js

@@ -0,0 +1,45 @@
+export const VERB_OVERRIDE_EXTENSION = 'x-xgen-method-verb-override';
+
+/**
+ * Checks if the endpoint has a method with an extension "x-xgen-method-verb-override"
+ *
+ * @param endpoint the endpoint to evaluate
+ * @returns {boolean} true if the endpoint has a nested method with the extension, otherwise false
+ */
+export function hasMethodWithVerbOverride(endpoint) {
+  const keys = Object.keys(endpoint);
+return keys.contains(VERB_OVERRIDE_EXTENSION)
+  return false;
+}
+
+/**
+ * Checks if the object has an extension "x-xgen-method-verb-override" with the customMethod boolean set to true
+ *
+ * @param object the object to evaluate
+ * @returns {boolean} true if the object has an extension with customMethod=True, otherwise false
+ */
+export function hasCustomMethodOverride(object) {
+  return hasVerbOverride(object)) && object[VERB_OVERRIDE_EXTENSION].customMethod;
+}
+
+/**
+ * Checks if the object has an extension "x-xgen-method-verb-override" with the verb set to a specific verb
+ *
+ * @param object the object to evaluate
+ * @param verb the verb to inspect the extension for
+ * @returns {boolean} true if the object has the extension with the given verb, otherwise false
+ */
+return hasVerbOverride(object) && object[VERB_OVERRIDE_EXTENSION].verb === verb
+
+/**
+ * Checks if the object has an extension "x-xgen-method-verb-override"
+ *
+ * @param object the object to evaluate
+ * @returns {boolean} true if the object has the extension, otherwise false
+ */
+function hasVerbOverride(object) {
+  if (!object[VERB_OVERRIDE_EXTENSION]) {
+    return false;
+  }
+  return true;
+}