From ee145c9314a029ddf4b8eb4861f584f989f5478c Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 11:23:26 +0200 Subject: [PATCH 01/15] Add folio-module-descriptor-validator --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index fae5620..6f4eb97 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ UTF-8 17 35.2.2 + 1.0.0 ${project.parent.basedir}/ramls /counter-reports/multipartupload/provider/{id} 4.5.7 @@ -139,6 +140,18 @@ + + org.folio + folio-module-descriptor-validator + ${folio-module-descriptor-validator.version} + + + + validate + + + + org.apache.maven.plugins maven-resources-plugin From b5e38db004b245bd4bedf220a5257fc7c1d511b0 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 11:23:43 +0200 Subject: [PATCH 02/15] Remove unused permission set: eusage.user --- descriptors/ModuleDescriptor-template.json | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index ea77d06..5537adc 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -505,33 +505,6 @@ "erm-usage.files.item.post", "erm-usage.files.item.delete" ] - }, - { - "permissionName": "eusage.user", - "displayName": "eusage user", - "description": "Permission set for a standard erm user. Cannot edit aggregator settings.", - "subPermissions": [ - "usagedataproviders.collection.get", - "usagedataproviders.item.get", - "usagedataproviders.item.post", - "usagedataproviders.item.put", - "usagedataproviders.item.delete", - "aggregatorsettings.collection.get", - "aggregatorsettings.item.get", - "counterreports.collection.get", - "counterreports.item.get", - "counterreports.item.post", - "counterreports.item.put", - "counterreports.item.delete", - "customreports.collection.get", - "customreports.item.get", - "customreports.item.post", - "customreports.item.put", - "customreports.item.delete", - "erm-usage.files.item.get", - "erm-usage.files.item.post", - "erm-usage.files.item.delete" - ] } ], "launchDescriptor": { From 90c5e67c986a1892f9f1efe321681dd92bc6e382 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 12:10:51 +0200 Subject: [PATCH 03/15] Add new permission: aggregatorsettings.exportcredentials.item.get --- descriptors/ModuleDescriptor-template.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 5537adc..fd23a85 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -117,8 +117,7 @@ ], "pathPattern": "/aggregator-settings/{id}/exportcredentials", "permissionsRequired": [ - "usagedataproviders.item.get", - "aggregatorsettings.item.get" + "aggregatorsettings.exportcredentials.item.get" ] } ] @@ -411,6 +410,11 @@ "displayName": "aggregator settings item get", "description": "Delete an aggregator setting" }, + { + "permissionName": "aggregatorsettings.exportcredentials.item.get", + "displayName": "aggregator settings export credentials item get", + "description": "Export credentials for an aggregator setting" + }, { "permissionName": "counterreports.collection.get", "displayName": "counter reports collection get", @@ -491,6 +495,7 @@ "aggregatorsettings.item.post", "aggregatorsettings.item.put", "aggregatorsettings.item.delete", + "aggregatorsettings.exportcredentials.item.get", "counterreports.collection.get", "counterreports.item.get", "counterreports.item.post", From 3191f8b32784e77c4f029ca7d5337736c148f82c Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 12:54:29 +0200 Subject: [PATCH 04/15] Fix existing permissions displayName and description --- descriptors/ModuleDescriptor-template.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index fd23a85..20f3ee5 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -377,12 +377,12 @@ }, { "permissionName": "usagedataproviders.item.put", - "displayName": "usage data providers item get", + "displayName": "usage data providers item put", "description": "Edit an usage data provider" }, { "permissionName": "usagedataproviders.item.delete", - "displayName": "usage data providers item get", + "displayName": "usage data providers item delete", "description": "Delete an usage data provider" }, { @@ -402,12 +402,12 @@ }, { "permissionName": "aggregatorsettings.item.put", - "displayName": "aggregator settings item get", + "displayName": "aggregator settings item put", "description": "Edit an aggregator setting" }, { "permissionName": "aggregatorsettings.item.delete", - "displayName": "aggregator settings item get", + "displayName": "aggregator settings item delete", "description": "Delete an aggregator setting" }, { @@ -433,12 +433,12 @@ { "permissionName": "counterreports.item.put", "displayName": "counter reports item put", - "description": "Edit an counter report" + "description": "Edit a counter report" }, { "permissionName": "counterreports.item.delete", "displayName": "counter reports item delete", - "description": "Delete an counter report" + "description": "Delete a counter report" }, { "permissionName": "customreports.collection.get", @@ -457,13 +457,13 @@ }, { "permissionName": "customreports.item.put", - "displayName": "custom reports item get", - "description": "Edit an custom report" + "displayName": "custom reports item put", + "description": "Edit a custom report" }, { "permissionName": "customreports.item.delete", "displayName": "custom reports item delete", - "description": "Delete an custom report" + "description": "Delete a custom report" }, { "permissionName": "erm-usage.files.item.get", @@ -483,7 +483,7 @@ { "permissionName": "eusage.all", "displayName": "eusage all", - "description": "All permissions for the mod-erm-usage module. An admin should get all permission, e.g. to edit aggregators.", + "description": "All permissions for the mod-erm-usage module", "subPermissions": [ "usagedataproviders.collection.get", "usagedataproviders.item.get", From d7a18da2fa257ac62cbddd5c0866555fee353acb Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 15:06:29 +0200 Subject: [PATCH 05/15] Add new permission: counterreports.collection.delete --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 20f3ee5..fd20b07 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -249,7 +249,7 @@ ], "pathPattern": "/counter-reports/reports/delete", "permissionsRequired": [ - "counterreports.item.delete" + "counterreports.collection.delete" ] } ] @@ -415,6 +415,11 @@ "displayName": "aggregator settings export credentials item get", "description": "Export credentials for an aggregator setting" }, + { + "permissionName": "counterreports.collection.delete", + "displayName": "counter reports collection delete", + "description": "Delete a collection of counter reports" + }, { "permissionName": "counterreports.collection.get", "displayName": "counter reports collection get", @@ -496,6 +501,7 @@ "aggregatorsettings.item.put", "aggregatorsettings.item.delete", "aggregatorsettings.exportcredentials.item.get", + "counterreports.collection.delete", "counterreports.collection.get", "counterreports.item.get", "counterreports.item.post", From fa5872f84815f30760aad296b39335f1fa78d1c3 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 15:10:48 +0200 Subject: [PATCH 06/15] Add new permission: counterreports.errorcodes.collection.get --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index fd20b07..a17c357 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -222,7 +222,7 @@ ], "pathPattern": "/counter-reports/errors/codes", "permissionsRequired": [ - "counterreports.collection.get" + "counterreports.errorcodes.collection.get" ] }, { @@ -425,6 +425,11 @@ "displayName": "counter reports collection get", "description": "Get a collection of counter reports" }, + { + "permissionName": "counterreports.errorcodes.collection.get", + "displayName": "counter reports error codes collection get", + "description": "Get a collection of counter report error codes" + }, { "permissionName": "counterreports.item.get", "displayName": "counter reports item get", @@ -503,6 +508,7 @@ "aggregatorsettings.exportcredentials.item.get", "counterreports.collection.delete", "counterreports.collection.get", + "counterreports.errorcodes.collection.get", "counterreports.item.get", "counterreports.item.post", "counterreports.item.put", From a59d6a9a0d290f2f7996c56c30df192fd1a2b320 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 15:13:14 +0200 Subject: [PATCH 07/15] Add new permission: counterreports.reporttypes.collection.get --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index a17c357..e12d8a1 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -231,7 +231,7 @@ ], "pathPattern": "/counter-reports/reports/types", "permissionsRequired": [ - "counterreports.collection.get" + "counterreports.reporttypes.collection.get" ] }, { @@ -450,6 +450,11 @@ "displayName": "counter reports item delete", "description": "Delete a counter report" }, + { + "permissionName": "counterreports.reporttypes.collection.get", + "displayName": "counter reports report types collection get", + "description": "Get a counter report report types collection" + }, { "permissionName": "customreports.collection.get", "displayName": "custom reports collection get", @@ -513,6 +518,7 @@ "counterreports.item.post", "counterreports.item.put", "counterreports.item.delete", + "counterreports.reporttypes.collection.get", "customreports.collection.get", "customreports.item.get", "customreports.item.post", From b5d3b7d17f66fe8534fc57c6a2c7a6cff9c7ec70 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 15:19:19 +0200 Subject: [PATCH 08/15] Add new permission: counterreports.reportreleases.collection.get, --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index e12d8a1..53e8c71 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -240,7 +240,7 @@ ], "pathPattern": "/counter-reports/reports/releases", "permissionsRequired": [ - "counterreports.collection.get" + "counterreports.reportreleases.collection.get" ] }, { @@ -450,6 +450,11 @@ "displayName": "counter reports item delete", "description": "Delete a counter report" }, + { + "permissionName": "counterreports.reportreleases.collection.get", + "displayName": "counter reports report releases collection get", + "description": "Get a counter report report releases collection" + }, { "permissionName": "counterreports.reporttypes.collection.get", "displayName": "counter reports report types collection get", @@ -518,6 +523,7 @@ "counterreports.item.post", "counterreports.item.put", "counterreports.item.delete", + "counterreports.reportreleases.collection.get", "counterreports.reporttypes.collection.get", "customreports.collection.get", "customreports.item.get", From 3b04625299a8aa8f655a42df7ff88da3f9e2d61c Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 15:49:35 +0200 Subject: [PATCH 09/15] Add new permission: counterreports.download.item.get --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 53e8c71..43a7ef0 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -150,7 +150,7 @@ ], "pathPattern": "/counter-reports/{id}/download", "permissionsRequired": [ - "counterreports.item.get" + "counterreports.download.item.get" ] }, { @@ -430,6 +430,11 @@ "displayName": "counter reports error codes collection get", "description": "Get a collection of counter report error codes" }, + { + "permissionName": "counterreports.download.item.get", + "displayName": "counter reports download item get", + "description": "Download a counter report" + }, { "permissionName": "counterreports.item.get", "displayName": "counter reports item get", @@ -519,6 +524,7 @@ "counterreports.collection.delete", "counterreports.collection.get", "counterreports.errorcodes.collection.get", + "counterreports.download.item.get", "counterreports.item.get", "counterreports.item.post", "counterreports.item.put", From 7c0f5125e1cb96f5a99d2e9040ef3a9bd1be10a6 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 15:52:41 +0200 Subject: [PATCH 10/15] Add new permission: counterreports.sorted.collection.get --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 43a7ef0..be00eec 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -186,7 +186,7 @@ ], "pathPattern": "/counter-reports/sorted/{udpId}", "permissionsRequired": [ - "counterreports.item.get" + "counterreports.sorted.collection.get" ] }, { @@ -465,6 +465,11 @@ "displayName": "counter reports report types collection get", "description": "Get a counter report report types collection" }, + { + "permissionName": "counterreports.sorted.collection.get", + "displayName": "counter reports sorted collection get", + "description": "Get a sorted counter report collection for a provider" + }, { "permissionName": "customreports.collection.get", "displayName": "custom reports collection get", @@ -531,6 +536,7 @@ "counterreports.item.delete", "counterreports.reportreleases.collection.get", "counterreports.reporttypes.collection.get", + "counterreports.sorted.collection.get", "customreports.collection.get", "customreports.item.get", "customreports.item.post", From e51585f6e6509d7f781b731d233c92453913d112 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 15:57:35 +0200 Subject: [PATCH 11/15] Add new permission: counterreports.export.item.get --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index be00eec..64f8964 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -195,7 +195,7 @@ ], "pathPattern": "/counter-reports/export/{id}", "permissionsRequired": [ - "counterreports.item.get" + "counterreports.export.item.get" ] }, { @@ -430,6 +430,11 @@ "displayName": "counter reports error codes collection get", "description": "Get a collection of counter report error codes" }, + { + "permissionName": "counterreports.export.item.get", + "displayName": "counter reports export item get", + "description": "Export a counter report" + }, { "permissionName": "counterreports.download.item.get", "displayName": "counter reports download item get", @@ -529,6 +534,7 @@ "counterreports.collection.delete", "counterreports.collection.get", "counterreports.errorcodes.collection.get", + "counterreports.export.item.get", "counterreports.download.item.get", "counterreports.item.get", "counterreports.item.post", From 79eeb1b1d80c2bde5748f9ef31035cd34b249a38 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 15:59:37 +0200 Subject: [PATCH 12/15] Add new permission: counterreports.export.collection.get --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 64f8964..8c4b275 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -204,7 +204,7 @@ ], "pathPattern": "/counter-reports/export/provider/{id}/report/{name}/version/{version}/from/{begin}/to/{end}", "permissionsRequired": [ - "counterreports.item.get" + "counterreports.export.collection.get" ] }, { @@ -430,6 +430,11 @@ "displayName": "counter reports error codes collection get", "description": "Get a collection of counter report error codes" }, + { + "permissionName": "counterreports.export.collection.get", + "displayName": "counter reports export collection get", + "description": "Export a collection of counter reports" + }, { "permissionName": "counterreports.export.item.get", "displayName": "counter reports export item get", @@ -534,6 +539,7 @@ "counterreports.collection.delete", "counterreports.collection.get", "counterreports.errorcodes.collection.get", + "counterreports.export.collection.get", "counterreports.export.item.get", "counterreports.download.item.get", "counterreports.item.get", From f4a0d9bb209cce37ed22eb30363e6d35db7b7b36 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 22:10:30 +0200 Subject: [PATCH 13/15] Add new permission: counterreports.upload.item.post --- descriptors/ModuleDescriptor-template.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 8c4b275..231338c 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -213,7 +213,7 @@ ], "pathPattern": "/counter-reports/multipartupload/provider/{id}", "permissionsRequired": [ - "counterreports.item.post" + "counterreports.upload.item.post" ] }, { @@ -480,6 +480,11 @@ "displayName": "counter reports sorted collection get", "description": "Get a sorted counter report collection for a provider" }, + { + "permissionName": "counterreports.upload.item.post", + "displayName": "counter reports upload item post", + "description": "Upload a counter report" + }, { "permissionName": "customreports.collection.get", "displayName": "custom reports collection get", @@ -549,6 +554,7 @@ "counterreports.reportreleases.collection.get", "counterreports.reporttypes.collection.get", "counterreports.sorted.collection.get", + "counterreports.upload.item.post", "customreports.collection.get", "customreports.item.get", "customreports.item.post", From 050f5f8ce3c3ab6b4015e4ef76dba6705f949587 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Mon, 14 Oct 2024 22:51:00 +0200 Subject: [PATCH 14/15] Disable plugin execution for child POMs --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 6f4eb97..10c7d0b 100644 --- a/pom.xml +++ b/pom.xml @@ -144,6 +144,7 @@ org.folio folio-module-descriptor-validator ${folio-module-descriptor-validator.version} + false From 2568024e494d102980109e113499c944148f9091 Mon Sep 17 00:00:00 2001 From: alb3rtino Date: Tue, 15 Oct 2024 08:53:41 +0200 Subject: [PATCH 15/15] Increase aggregator-settings interface version to 2.0 --- descriptors/ModuleDescriptor-template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 231338c..f7504d1 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -55,7 +55,7 @@ }, { "id": "aggregator-settings", - "version": "1.2", + "version": "2.0", "handlers": [ { "methods": [