diff --git a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java index bb1af8b..30ef705 100644 --- a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java +++ b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java @@ -220,7 +220,7 @@ public class TestRules extends ContextTest { allRules(); File rulesDirectory = getRulesDirectory(); File rulesDirFile = new File(rulesDirectory, "StorageHub"); - File ruleFile = new File(rulesDirFile, "StorageHub-getHistory.json"); + File ruleFile = new File(rulesDirFile, "StorageHub-findChildrenByNamePattern.json"); testRule(ruleFile); } diff --git a/src/test/resources/rules/StorageHub/StorageHub-findChildrenByNamePattern.csv b/src/test/resources/rules/StorageHub/StorageHub-findChildrenByNamePattern.csv new file mode 100644 index 0000000..a144aa7 --- /dev/null +++ b/src/test/resources/rules/StorageHub/StorageHub-findChildrenByNamePattern.csv @@ -0,0 +1,6 @@ +DataAccess,StorageHub,findChildrenByNamePattern +DataAccess,StorageHub,/workspace/items/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/firstcopy +DataAccess,StorageHub,/workspace/items/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/item/Data* +DataAccess,StorageHub,/workspace/items/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/item/DataMiner +DataAccess,StorageHub,/workspace/items/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/item/tes* +DataAccess,StorageHub,/workspace/items/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/items/DataMiner \ No newline at end of file diff --git a/src/test/resources/rules/StorageHub/StorageHub-findChildrenByNamePattern.json b/src/test/resources/rules/StorageHub/StorageHub-findChildrenByNamePattern.json new file mode 100644 index 0000000..48937f0 --- /dev/null +++ b/src/test/resources/rules/StorageHub/StorageHub-findChildrenByNamePattern.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "DataAccess", + "serviceNameRegex": "StorageHub", + "calledMethodRegex": "(^\/workspace\/item(s){0,1}\/[0-9a-zA-Z\\-_]*\/(firstcopy|(item(s){0,1})\/.*$))|findChildrenByNamePattern" + }, + "replace": { + "serviceClass": "DataAccess", + "serviceName": "StorageHub", + "calledMethod": "findChildrenByNamePattern" + } +} \ No newline at end of file diff --git a/src/test/resources/rules/StorageHub/StorageHub-getById.csv b/src/test/resources/rules/StorageHub/StorageHub-getById.csv index 0fef1ac..167c60a 100644 --- a/src/test/resources/rules/StorageHub/StorageHub-getById.csv +++ b/src/test/resources/rules/StorageHub/StorageHub-getById.csv @@ -5,4 +5,5 @@ DataAccess,StorageHub,/workspace/item/40a3dd6c-2c47-4848-bb7b-462e532954a9/ DataAccess,StorageHub,/workspace/item/c99d26b6-e0bb-4a48-b32a-77056f49ddeb DataAccess,StorageHub,/workspace/item/da558346-7d1a-4159-8780-a22e63f3c7dc/ DataAccess,StorageHub,/workspace/items/87bea023-3eed-445b-8c27-4d9d4e5921cc +DataAccess,StorageHub,/workspace/items/790e4c52-fbca-48e9-b267-67ea2ce708c0 DataAccess,StorageHub,getById \ No newline at end of file diff --git a/src/test/resources/rules/StorageHub/StorageHub-getById.json b/src/test/resources/rules/StorageHub/StorageHub-getById.json index ef56e84..5c7a803 100644 --- a/src/test/resources/rules/StorageHub/StorageHub-getById.json +++ b/src/test/resources/rules/StorageHub/StorageHub-getById.json @@ -2,7 +2,7 @@ "match": { "serviceClassRegex": "DataAccess", "serviceNameRegex": "StorageHub", - "calledMethodRegex": "^\/workspace(\/item(s){0,1}){0,1}\/(?!(i$)|count|groups|paged|v(re|ere|er)fo(ld|dl)ers{0,1}|((C|c)hi(dl|ld|d)ren))[0-9a-zA-Z\\-_]{1,}(\/){0,1}$|getById" + "calledMethodRegex": "^\/workspace(\/item(s){0,1}){0,1}\/(?!(i$)|count|i{0,1}t(h){0,1}rash|groups|paged|v(re|ere|er)fo(ld|dl)ers{0,1}|((C|c)hi(dl|ld|d)ren))[0-9a-zA-Z\\-_]{1,}(\/){0,1}$|getById" }, "replace": { "serviceClass": "DataAccess", diff --git a/src/test/resources/rules/StorageHub/StorageHub-getGroups.json b/src/test/resources/rules/StorageHub/StorageHub-getGroups.json index 75b3117..6768e0c 100644 --- a/src/test/resources/rules/StorageHub/StorageHub-getGroups.json +++ b/src/test/resources/rules/StorageHub/StorageHub-getGroups.json @@ -2,7 +2,7 @@ "match": { "serviceClassRegex": "DataAccess", "serviceNameRegex": "StorageHub", - "calledMethodRegex": "^\/workspace\/group(s){0,1}\/{0,1}.*" + "calledMethodRegex": "^\/workspace\/group(s){0,1}\/{0,1}.*|getGroups" }, "replace": { "serviceClass": "DataAccess", diff --git a/src/test/resources/rules/StorageHub/StorageHub-getTrashFolder.csv b/src/test/resources/rules/StorageHub/StorageHub-getTrashFolder.csv new file mode 100644 index 0000000..40eb17d --- /dev/null +++ b/src/test/resources/rules/StorageHub/StorageHub-getTrashFolder.csv @@ -0,0 +1,5 @@ +DataAccess,StorageHub,/workspace/ithrash +DataAccess,StorageHub,/workspace/thrash +DataAccess,StorageHub,/workspace/trash +DataAccess,StorageHub,getTrashRootFolder +DataAccess,StorageHub,getTrashFolder \ No newline at end of file diff --git a/src/test/resources/rules/StorageHub/StorageHub-getTrashFolder.json b/src/test/resources/rules/StorageHub/StorageHub-getTrashFolder.json new file mode 100644 index 0000000..0a1d6fc --- /dev/null +++ b/src/test/resources/rules/StorageHub/StorageHub-getTrashFolder.json @@ -0,0 +1,12 @@ +{ + "match": { + "serviceClassRegex": "DataAccess", + "serviceNameRegex": "StorageHub", + "calledMethodRegex": "(^\/workspace\/i{0,1}t(h){0,1}rash\/{0,1}.*)|getTrashFolder|getTrashRootFolder" + }, + "replace": { + "serviceClass": "DataAccess", + "serviceName": "StorageHub", + "calledMethod": "getTrashFolder" + } +} \ No newline at end of file