CLOUDP-303615: Address comments

Author: lovisaberggren

tools/spectral/ipa/__tests__/singletonHasNoId.test.js

@@ -6,7 +6,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
     name: 'valid resources',
     document: {
       paths: {
-        '/standard': {
+        '/resource': {
           post: {},
           get: {
             responses: {
@@ -26,7 +26,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
             },
           },
         },
-        '/standard/{exampleId}': {
+        '/resource/{exampleId}': {
           get: {
             responses: {
               200: {
@@ -47,7 +47,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
           patch: {},
           delete: {},
         },
-        '/standard/{exampleId}/singleton1': {
+        '/resource/{exampleId}/singleton1': {
           get: {
             responses: {
               200: {
@@ -65,7 +65,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
             },
           },
         },
-        '/standard/{exampleId}/singleton2': {
+        '/resource/{exampleId}/singleton2': {
           get: {
             responses: {
               200: {
@@ -92,7 +92,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
     name: 'invalid resources',
     document: {
       paths: {
-        '/standard/{exampleId}/singleton1': {
+        '/resource/{exampleId}/singleton1': {
           get: {
             responses: {
               200: {
@@ -111,7 +111,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
             },
           },
         },
-        '/standard/{exampleId}/singleton2': {
+        '/resource/{exampleId}/singleton2': {
           get: {
             responses: {
               200: {
@@ -130,7 +130,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
             },
           },
         },
-        '/standard/{exampleId}/singleton3': {
+        '/resource/{exampleId}/singleton3': {
           get: {
             responses: {
               200: {
@@ -164,19 +164,19 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
       {
         code: 'xgen-IPA-113-singleton-must-not-have-id',
         message: 'Singleton resources must not have a user-provided or system-generated ID. http://go/ipa/113',
-        path: ['paths', '/standard/{exampleId}/singleton1'],
+        path: ['paths', '/resource/{exampleId}/singleton1'],
         severity: DiagnosticSeverity.Warning,
       },
       {
         code: 'xgen-IPA-113-singleton-must-not-have-id',
         message: 'Singleton resources must not have a user-provided or system-generated ID. http://go/ipa/113',
-        path: ['paths', '/standard/{exampleId}/singleton2'],
+        path: ['paths', '/resource/{exampleId}/singleton2'],
         severity: DiagnosticSeverity.Warning,
       },
       {
         code: 'xgen-IPA-113-singleton-must-not-have-id',
         message: 'Singleton resources must not have a user-provided or system-generated ID. http://go/ipa/113',
-        path: ['paths', '/standard/{exampleId}/singleton3'],
+        path: ['paths', '/resource/{exampleId}/singleton3'],
         severity: DiagnosticSeverity.Warning,
       },
     ],
@@ -185,7 +185,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
     name: 'invalid resources with exceptions',
     document: {
       paths: {
-        '/singleton1': {
+        '/resource/{exampleId}/singleton1': {
           'x-xgen-IPA-exception': {
             'xgen-IPA-113-singleton-must-not-have-id': 'reason',
           },

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

@@ -5,23 +5,28 @@ import {
   isStandardResource,
 } from '../../rulesets/functions/utils/resourceEvaluation';
 
-const standardResourcePaths = ['/standard', '/standard/{exampleId}'];
+const standardResourcePaths = ['/resource', '/resource/{exampleId}'];
 
-const nestedStandardResourcePaths = ['/standard/{exampleId}/nested', '/standard/{exampleId}/nested/{exampleId}'];
+const nestedStandardResourcePaths = ['/resource/{exampleId}/nested', '/resource/{exampleId}/nested/{exampleId}'];
 
-const standardResourceWithCustomPaths = ['/customStandard', '/customStandard/{exampleId}', '/customStandard:method'];
+const standardResourceWithCustomPaths = [
+  '/customStandard',
+  '/customStandard/{exampleId}',
+  '/customStandard/{id}:method',
+  '/customStandard:method',
+];
 
 const standardResourceMissingSubPath = ['/standardMissingSub'];
 
 const standardResourceMissingSubPathInvalidFormat = ['/standard/nestedStandardMissingSub'];
 
 const standardResourcePathsInvalidFormat = ['/resource1/resource2', '/resource1/resource2/{exampleId}'];
 
-const singletonResourcePaths = ['/standard/{exampleId}/singleton'];
+const singletonResourcePaths = ['/resource/{exampleId}/singleton'];
 
 const singletonResourceWithCustomPaths = [
-  '/standard/{exampleId}/customSingleton',
-  '/standard/{exampleId}/customSingleton:method',
+  '/resource/{exampleId}/customSingleton',
+  '/resource/{exampleId}/customSingleton:method',
 ];
 
 const allPaths = standardResourcePaths.concat(
@@ -39,12 +44,12 @@ describe('tools/spectral/ipa/rulesets/functions/utils/resourceEvaluation.js', ()
     const testCases = [
       {
         description: 'standard resource',
-        resourceCollectionPath: '/standard',
+        resourceCollectionPath: '/resource',
         expectedPaths: standardResourcePaths,
       },
       {
         description: 'nested standard resource',
-        resourceCollectionPath: '/standard/{exampleId}/nested',
+        resourceCollectionPath: '/resource/{exampleId}/nested',
         expectedPaths: nestedStandardResourcePaths,
       },
       {
@@ -69,12 +74,12 @@ describe('tools/spectral/ipa/rulesets/functions/utils/resourceEvaluation.js', ()
       },
       {
         description: 'singleton resource',
-        resourceCollectionPath: '/standard/{exampleId}/singleton',
+        resourceCollectionPath: '/resource/{exampleId}/singleton',
         expectedPaths: singletonResourcePaths,
       },
       {
         description: 'singleton resource with custom methods',
-        resourceCollectionPath: '/standard/{exampleId}/customSingleton',
+        resourceCollectionPath: '/resource/{exampleId}/customSingleton',
         expectedPaths: singletonResourceWithCustomPaths,
       },
     ];