CLOUDP-303615: IPA - Update check if resource is singleton/standard

Author: lovisaberggren

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

@@ -43,9 +43,6 @@ testRule('xgen-IPA-104-resource-has-GET', [
         '/custom:method': {
           post: {},
         },
-        '/singleton': {
-          get: {},
-        },
       },
     },
     errors: [],
@@ -87,8 +84,8 @@ testRule('xgen-IPA-104-resource-has-GET', [
         '/custom:method': {
           post: {},
         },
-        '/singleton': {
-          patch: {},
+        '/standardWithoutSubResource': {
+          get: {},
         },
       },
     },
@@ -120,7 +117,7 @@ testRule('xgen-IPA-104-resource-has-GET', [
       {
         code: 'xgen-IPA-104-resource-has-GET',
         message: 'APIs must provide a get method for resources. http://go/ipa/104',
-        path: ['paths', '/singleton'],
+        path: ['paths', '/standardWithoutSubResource'],
         severity: DiagnosticSeverity.Warning,
       },
     ],

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

@@ -73,7 +73,7 @@ testRule('xgen-IPA-104-get-method-returns-single-resource', [
             },
           },
         },
-        '/singleton': {
+        '/resource/{id}/singleton': {
           get: {
             responses: {
               200: {
@@ -127,7 +127,7 @@ testRule('xgen-IPA-104-get-method-returns-single-resource', [
             },
           },
         },
-        '/arraySingleton': {
+        '/resource/{id}/arraySingleton': {
           get: {
             responses: {
               200: {
@@ -142,7 +142,7 @@ testRule('xgen-IPA-104-get-method-returns-single-resource', [
             },
           },
         },
-        '/paginatedSingleton': {
+        '/resource/{id}/paginatedSingleton': {
           get: {
             responses: {
               200: {
@@ -197,7 +197,7 @@ testRule('xgen-IPA-104-get-method-returns-single-resource', [
           'Get methods should return data for a single resource. This method returns an array or a paginated response. http://go/ipa/104',
         path: [
           'paths',
-          '/arraySingleton',
+          '/resource/{id}/arraySingleton',
           'get',
           'responses',
           '200',
@@ -212,7 +212,7 @@ testRule('xgen-IPA-104-get-method-returns-single-resource', [
           'Get methods should return data for a single resource. This method returns an array or a paginated response. http://go/ipa/104',
         path: [
           'paths',
-          '/paginatedSingleton',
+          '/resource/{id}/paginatedSingleton',
           'get',
           'responses',
           '200',
@@ -245,7 +245,7 @@ testRule('xgen-IPA-104-get-method-returns-single-resource', [
             },
           },
         },
-        '/paginatedSingleton': {
+        '/resource/{id}/paginatedSingleton': {
           get: {
             responses: {
               200: {

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

@@ -47,7 +47,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
           patch: {},
           delete: {},
         },
-        '/singleton1': {
+        '/standard/{exampleId}/singleton1': {
           get: {
             responses: {
               200: {
@@ -65,7 +65,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
             },
           },
         },
-        '/singleton2': {
+        '/standard/{exampleId}/singleton2': {
           get: {
             responses: {
               200: {
@@ -92,7 +92,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
     name: 'invalid resources',
     document: {
       paths: {
-        '/singleton1': {
+        '/standard/{exampleId}/singleton1': {
           get: {
             responses: {
               200: {
@@ -111,7 +111,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
             },
           },
         },
-        '/singleton2': {
+        '/standard/{exampleId}/singleton2': {
           get: {
             responses: {
               200: {
@@ -130,7 +130,7 @@ testRule('xgen-IPA-113-singleton-must-not-have-id', [
             },
           },
         },
-        '/singleton3': {
+        '/standard/{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', '/singleton1'],
+        path: ['paths', '/standard/{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', '/singleton2'],
+        path: ['paths', '/standard/{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', '/singleton3'],
+        path: ['paths', '/standard/{exampleId}/singleton3'],
         severity: DiagnosticSeverity.Warning,
       },
     ],