This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit d600682b6fd6863eb2c9cb4232fcc88e2f3d2a41
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Thu Oct 26 01:30:42 2023 -0700

    RANGER-4497: updated service-defs to assign category to access-types
---
 .../service-defs/ranger-servicedef-abfs.json       |  6 ++-
 .../service-defs/ranger-servicedef-atlas.json      | 57 +++++++++++++++-------
 .../ranger-servicedef-elasticsearch.json           | 19 ++++++--
 .../service-defs/ranger-servicedef-gds.json        |  3 +-
 .../service-defs/ranger-servicedef-hbase.json      | 15 ++++--
 .../service-defs/ranger-servicedef-hdfs.json       |  9 ++--
 .../service-defs/ranger-servicedef-hive.json       | 39 ++++++++++-----
 .../service-defs/ranger-servicedef-kafka.json      | 24 ++++++---
 .../service-defs/ranger-servicedef-kms.json        | 31 +++++++-----
 .../service-defs/ranger-servicedef-knox.json       |  3 +-
 .../service-defs/ranger-servicedef-kudu.json       | 10 +++-
 .../service-defs/ranger-servicedef-kylin.json      | 12 +++--
 .../ranger-servicedef-nestedstructure.json         |  4 +-
 .../ranger-servicedef-nifi-registry.json           |  9 ++--
 .../service-defs/ranger-servicedef-nifi.json       |  6 ++-
 .../service-defs/ranger-servicedef-ozone.json      | 21 +++++---
 .../service-defs/ranger-servicedef-presto.json     | 36 +++++++++-----
 .../ranger-servicedef-schema-registry.json         | 12 +++--
 .../service-defs/ranger-servicedef-solr.json       |  6 ++-
 .../service-defs/ranger-servicedef-sqoop.json      |  6 ++-
 .../service-defs/ranger-servicedef-storm.json      | 34 ++++++++-----
 .../service-defs/ranger-servicedef-trino.json      | 36 +++++++++-----
 .../service-defs/ranger-servicedef-wasb.json       |  6 ++-
 .../service-defs/ranger-servicedef-yarn.json       |  4 +-
 24 files changed, 279 insertions(+), 129 deletions(-)

diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-abfs.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-abfs.json
index 879df6b9f..5dc5fccca 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-abfs.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-abfs.json
@@ -66,12 +66,14 @@
     {
       "itemId": 1,
       "name": "read",
-      "label": "Read"
+      "label": "Read",
+      "category": "READ"
     },
     {
       "itemId": 2,
       "name": "write",
-      "label": "Write"
+      "label": "Write",
+      "category": "UPDATE"
     }
   ],
   "configs":
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-atlas.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-atlas.json
index 960f10123..c98da315d 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-atlas.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-atlas.json
@@ -323,6 +323,7 @@
                        "itemId": 1,
                        "name": "type-create",
                        "label": "Create Type",
+                       "category": "MANAGE",
                        "impliedGrants":
                        [
                                "type-read"
@@ -332,6 +333,7 @@
                        "itemId": 2,
                        "name": "type-update",
                        "label": "Update Type",
+                       "category": "MANAGE",
                        "impliedGrants":
                        [
                                "type-read"
@@ -341,6 +343,7 @@
                        "itemId": 3,
                        "name": "type-delete",
                        "label": "Delete Type",
+                       "category": "MANAGE",
                        "impliedGrants":
                        [
                                "type-read"
@@ -349,92 +352,110 @@
                {
                        "itemId": 4,
                        "name": "entity-read",
-                       "label": "Read Entity"
+                       "label": "Read Entity",
+                       "category": "READ"
                },
                {
                        "itemId": 5,
                        "name": "entity-create",
-                       "label": "Create Entity"
+                       "label": "Create Entity",
+                       "category": "CREATE"
                },
                {
                        "itemId": 6,
                        "name": "entity-update",
-                       "label": "Update Entity"
+                       "label": "Update Entity",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 7,
                        "name": "entity-delete",
-                       "label": "Delete Entity"
+                       "label": "Delete Entity",
+                       "category": "DELETE"
                },
                {
                        "itemId": 8,
                        "name": "entity-add-classification",
-                       "label": "Add Classification"
+                       "label": "Add Classification",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 9,
                        "name": "entity-update-classification",
-                       "label": "Update Classification"
+                       "label": "Update Classification",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 10,
                        "name": "entity-remove-classification",
-                       "label": "Remove Classification"
+                       "label": "Remove Classification",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 11,
                        "name": "admin-export",
-                       "label": "Admin Export"
+                       "label": "Admin Export",
+                       "category": "MANAGE"
                },
                {
                        "itemId": 12,
                        "name": "admin-import",
-                       "label": "Admin Import"
+                       "label": "Admin Import",
+                       "category": "MANAGE"
                },
                {
                        "itemId": 13,
                        "name": "add-relationship",
-                       "label": "Add Relationship"
+                       "label": "Add Relationship",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 14,
                        "name": "update-relationship",
-                       "label": "Update Relationship"
+                       "label": "Update Relationship",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 15,
                        "name": "remove-relationship",
-                       "label": "Remove Relationship"
+                       "label": "Remove Relationship",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 16,
                        "name": "admin-purge",
-                       "label": "Admin Purge"
+                       "label": "Admin Purge",
+                       "category": "MANAGE"
                },
                {
                        "itemId": 17,
                        "name": "entity-add-label",
-                       "label": "Add Label"
+                       "label": "Add Label",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 18,
                        "name": "entity-remove-label",
-                       "label": "Remove Label"
+                       "label": "Remove Label",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 19,
                        "name": "entity-update-business-metadata",
-                       "label": "Update Business Metadata"
+                       "label": "Update Business Metadata",
+                       "category": "UPDATE"
                },
                {
                        "itemId": 20,
                        "name": "type-read",
-                       "label": "Read Type"
+                       "label": "Read Type",
+                       "category": "READ"
                },
                {
                        "itemId": 21,
                        "name": "admin-audits",
-                       "label": "Admin Audits"
+                       "label": "Admin Audits",
+                       "category": "MANAGE"
                }
        ],
        "configs": [
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-elasticsearch.json
 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-elasticsearch.json
index da621c748..96cabe865 100644
--- 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-elasticsearch.json
+++ 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-elasticsearch.json
@@ -57,13 +57,15 @@
                {
                        "itemId": 2,
                        "name": "monitor",
-                       "label": "monitor"
+                       "label": "monitor",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 3,
                        "name": "manage",
                        "label": "manage",
+                       "category": "MANAGE",
                        "impliedGrants":
                        [
                                "monitor"
@@ -74,6 +76,7 @@
                        "itemId": 4,
                        "name": "view_index_metadata",
                        "label": "view_index_metadata",
+                       "category": "MANAGE",
                        "impliedGrants":
                        [
                                "indices_search_shards"
@@ -83,13 +86,15 @@
                {
                        "itemId": 5,
                        "name": "read",
-                       "label": "read"
+                       "label": "read",
+                       "category": "READ"
                },
 
                {
                        "itemId": 6,
                        "name": "read_cross_cluster",
                        "label": "read_cross_cluster",
+                       "category": "READ",
                        "impliedGrants":
                        [
                                "indices_search_shards"
@@ -100,6 +105,7 @@
                        "itemId": 7,
                        "name": "index",
                        "label": "index",
+                       "category": "MANAGE",
                        "impliedGrants":
                        [
                                "indices_put",
@@ -112,6 +118,7 @@
                        "itemId": 8,
                        "name": "create",
                        "label": "create",
+                       "category": "CREATE",
                        "impliedGrants":
                        [
                                "indices_put",
@@ -124,6 +131,7 @@
                        "itemId": 9,
                        "name": "delete",
                        "label": "delete",
+                       "category": "DELETE",
                        "impliedGrants":
                        [
                                "indices_bulk"
@@ -134,6 +142,7 @@
                        "itemId": 10,
                        "name": "write",
                        "label": "write",
+                       "category": "UPDATE",
                        "impliedGrants":
                        [
                                "indices_put"
@@ -143,13 +152,15 @@
                {
                        "itemId": 11,
                        "name": "delete_index",
-                       "label": "delete_index"
+                       "label": "delete_index",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 12,
                        "name": "create_index",
-                       "label": "create_index"
+                       "label": "create_index",
+                       "category": "MANAGE"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-gds.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-gds.json
index da6c0bcdf..515326931 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-gds.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-gds.json
@@ -47,7 +47,8 @@
     { "itemId": 2, "name": "_READ",    "label": "_READ" },
     { "itemId": 3, "name": "_UPDATE",  "label": "_UPDATE" },
     { "itemId": 4, "name": "_DELETE",  "label": "_DELETE" },
-    { "itemId": 5, "name": "_MANAGE",  "label": "_MANAGE" }
+    { "itemId": 5, "name": "_MANAGE",  "label": "_MANAGE" },
+    { "itemId": 6, "name": "_ALL",     "label": "_ALL" }
   ],
 
   "configs": [
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-hbase.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-hbase.json
index f94e73a5e..7e5cfa1a6 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-hbase.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-hbase.json
@@ -71,26 +71,30 @@
                {
                        "itemId": 1,
                        "name": "read",
-                       "label": "Read"
+                       "label": "Read",
+                       "category": "READ"
                },
 
                {
                        "itemId": 2,
                        "name": "write",
-                       "label": "Write"
+                       "label": "Write",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 3,
                        "name": "create",
-                       "label": "Create"
+                       "label": "Create",
+                       "category": "CREATE"
                },
 
                {
                        "itemId": 4,
                        "name": "admin",
                        "label": "Admin",
-                       "impliedGrants": 
+                       "category": "MANAGE",
+                       "impliedGrants":
                        [
                                "read",
                                "write",
@@ -100,7 +104,8 @@
                {
                        "itemId": 5,
                        "name": "execute",
-                       "label": "Execute"
+                       "label": "Execute",
+                       "category": "READ"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json
index bc021a0dd..8ed321649 100755
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-hdfs.json
@@ -33,19 +33,22 @@
                {
                        "itemId": 1,
                        "name": "read",
-                       "label": "Read"
+                       "label": "Read",
+                       "category": "READ"
                },
 
                {
                        "itemId": 2,
                        "name": "write",
-                       "label": "Write"
+                       "label": "Write",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 3,
                        "name": "execute",
-                       "label": "Execute"
+                       "label": "Execute",
+                       "category": "READ"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-hive.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-hive.json
index ab8ca5c92..214cedf56 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-hive.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-hive.json
@@ -150,43 +150,50 @@
                {
                        "itemId": 1,
                        "name": "select",
-                       "label": "select"
+                       "label": "select",
+                       "category": "READ"
                },
 
                {
                        "itemId": 2,
                        "name": "update",
-                       "label": "update"
+                       "label": "update",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 3,
                        "name": "create",
-                       "label": "Create"
+                       "label": "Create",
+                       "category": "CREATE"
                },
 
                {
                        "itemId": 4,
                        "name": "drop",
-                       "label": "Drop"
+                       "label": "Drop",
+                       "category": "DELETE"
                },
 
                {
                        "itemId": 5,
                        "name": "alter",
-                       "label": "Alter"
+                       "label": "Alter",
+                       "category": "CREATE"
                },
 
                {
                        "itemId": 6,
                        "name": "index",
-                       "label": "Index"
+                       "label": "Index",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 7,
                        "name": "lock",
-                       "label": "Lock"
+                       "label": "Lock",
+                       "category": "MANAGE"
                },
 
                {
@@ -213,37 +220,43 @@
                {
                        "itemId": 9,
                        "name": "read",
-                       "label": "Read"
+                       "label": "Read",
+                       "category": "READ"
                },
 
                {
                        "itemId": 10,
                        "name": "write",
-                       "label": "Write"
+                       "label": "Write",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 11,
                        "name": "repladmin",
-                       "label": "ReplAdmin"
+                       "label": "ReplAdmin",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 12,
                        "name": "serviceadmin",
-                       "label": "Service Admin"
+                       "label": "Service Admin",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 13,
                        "name": "tempudfadmin",
-                       "label": "Temporary UDF Admin"
+                       "label": "Temporary UDF Admin",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 14,
                        "name": "refresh",
-                       "label": "Refresh"
+                       "label": "Refresh",
+                       "category": "MANAGE"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-kafka.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-kafka.json
index a131ed08b..d99819f55 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-kafka.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-kafka.json
@@ -97,6 +97,7 @@
                        "itemId":1,
                        "name":"publish",
                        "label":"Publish",
+                       "category": "UPDATE",
                        "impliedGrants":[
                                "describe"
                        ]
@@ -105,6 +106,7 @@
                        "itemId":2,
                        "name":"consume",
                        "label":"Consume",
+                       "category": "READ",
                        "impliedGrants":[
                                "describe"
                        ]
@@ -113,6 +115,7 @@
                        "itemId":5,
                        "name":"configure",
                        "label":"Configure",
+                       "category": "MANAGE",
                        "impliedGrants":[
                                "describe"
                        ]
@@ -120,12 +123,14 @@
                {
                        "itemId":6,
                        "name":"describe",
-                       "label":"Describe"
+                       "label":"Describe",
+                       "category": "READ"
                },
                {
                        "itemId":7,
                        "name":"kafka_admin",
                        "label":"Kafka Admin",
+                       "category": "MANAGE",
                        "impliedGrants":[
                                "publish",
                                "consume",
@@ -143,12 +148,14 @@
                {
                        "itemId":8,
                        "name":"create",
-                       "label":"Create"
+                       "label":"Create",
+                       "category": "CREATE"
                },
                {
                        "itemId":9,
                        "name":"delete",
                        "label":"Delete",
+                       "category": "DELETE",
                        "impliedGrants":[
                                "describe"
                        ]
@@ -156,17 +163,20 @@
                {
                        "itemId":10,
                        "name":"idempotent_write",
-                       "label":"Idempotent Write"
+                       "label":"Idempotent Write",
+                       "category": "UPDATE"
                },
                {
                        "itemId":11,
                        "name":"describe_configs",
-                       "label":"Describe Configs"
+                       "label":"Describe Configs",
+                       "category": "READ"
                },
                {
                        "itemId":12,
                        "name":"alter_configs",
                        "label":"Alter Configs",
+                       "category": "MANAGE",
                        "impliedGrants":[
                                "describe_configs"
                        ]
@@ -174,12 +184,14 @@
                {
                        "itemId":13,
                        "name":"cluster_action",
-                       "label":"Cluster Action"
+                       "label":"Cluster Action",
+                       "category": "MANAGE"
                },
                {
                        "itemId":14,
                        "name":"alter",
-                       "label":"Alter"
+                       "label":"Alter",
+                       "category": "MANAGE"
                }
        ],
        "configs":[
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-kms.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-kms.json
index abd28f034..48ba6b9d5 100755
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-kms.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-kms.json
@@ -37,56 +37,65 @@
                {
                        "itemId": 1,
                        "name": "create",
-                       "label": "Create"
+                       "label": "Create",
+                       "category": "CREATE"
                },
 
                {
                        "itemId": 2,
                        "name": "delete",
-                       "label": "Delete"
+                       "label": "Delete",
+                       "category": "DELETE"
                },
 
                {
                        "itemId": 3,
                        "name": "rollover",
-                       "label": "Rollover"
+                       "label": "Rollover",
+                       "category": "UPDATE"
                },
                
                {
                        "itemId": 4,
                        "name": "setkeymaterial",
-                       "label": "Set Key Material"
-               },      
+                       "label": "Set Key Material",
+                       "category": "UPDATE"
+               },
                
                {
                        "itemId": 5,
                        "name": "get",
-                       "label": "Get"
+                       "label": "Get",
+                       "category": "READ"
                },
                
                {
                        "itemId": 6,
                        "name": "getkeys",
-                       "label": "Get Keys"
+                       "label": "Get Keys",
+                       "category": "READ"
                },
                
                {
                        "itemId": 7,
                        "name": "getmetadata",
-                       "label": "Get Metadata"
+                       "label": "Get Metadata",
+                       "category": "READ"
                },
                
                {
                        "itemId": 8,
                        "name": "generateeek",
-                       "label": "Generate EEK"
+                       "label": "Generate EEK",
+                       "category": "UPDATE"
                },
                
                {
                        "itemId": 9,
                        "name": "decrypteek",
-                       "label": "Decrypt EEK"
-               }       
+                       "label": "Decrypt EEK",
+                       "category": "UPDATE"
+               }
        ],
 
        "configs": 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-knox.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-knox.json
index ee44687b4..d1832ecce 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-knox.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-knox.json
@@ -52,7 +52,8 @@
                {
                        "itemId": 1,
                        "name": "allow",
-                       "label": "Allow"
+                       "label": "Allow",
+                       "category": "READ"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-kudu.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-kudu.json
index 51fd9f8a2..284c18d8d 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-kudu.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-kudu.json
@@ -72,6 +72,7 @@
       "itemId": 1,
       "name": "select",
       "label": "SELECT",
+      "category": "READ",
       "impliedGrants":
       [
         "metadata"
@@ -82,6 +83,7 @@
       "itemId": 2,
       "name": "insert",
       "label": "INSERT",
+      "category": "UPDATE",
       "impliedGrants":
       [
         "metadata"
@@ -91,6 +93,7 @@
       "itemId": 3,
       "name": "update",
       "label": "UPDATE",
+      "category": "UPDATE",
       "impliedGrants":
       [
         "metadata"
@@ -100,6 +103,7 @@
       "itemId": 4,
       "name": "delete",
       "label": "DELETE",
+      "category": "DELETE",
       "impliedGrants":
       [
         "metadata"
@@ -109,6 +113,7 @@
       "itemId": 5,
       "name": "alter",
       "label": "ALTER",
+      "category": "CREATE",
       "impliedGrants":
       [
         "metadata"
@@ -118,6 +123,7 @@
       "itemId": 6,
       "name": "create",
       "label": "CREATE",
+      "category": "UPDATE",
       "impliedGrants":
       [
         "metadata"
@@ -127,6 +133,7 @@
       "itemId": 7,
       "name": "drop",
       "label": "DROP",
+      "category": "DELETE",
       "impliedGrants":
       [
         "metadata"
@@ -135,7 +142,8 @@
     {
       "itemId": 8,
       "name": "metadata",
-      "label": "METADATA"
+      "label": "METADATA",
+      "category": "MANAGE"
     },
     {
       "itemId": 9,
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json
index 70566dfd6..f852947b5 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-kylin.json
@@ -33,25 +33,29 @@
                {
                        "itemId": 1,
                        "name": "QUERY",
-                       "label": "QUERY"
+                       "label": "QUERY",
+                       "category": "READ"
                },
 
                {
                        "itemId": 2,
                        "name": "OPERATION",
-                       "label": "OPERATION"
+                       "label": "OPERATION",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 3,
                        "name": "MANAGEMENT",
-                       "label": "MANAGEMENT"
+                       "label": "MANAGEMENT",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 4,
                        "name": "ADMIN",
-                       "label": "ADMIN"
+                       "label": "ADMIN",
+                       "category": "MANAGE"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-nestedstructure.json
 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-nestedstructure.json
index dc6b1d32d..f60715ff6 100644
--- 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-nestedstructure.json
+++ 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-nestedstructure.json
@@ -47,8 +47,8 @@
     }
   ],
   "accessTypes": [
-    { "itemId": 1, "name": "read",  "label": "Read" },
-    { "itemId": 2, "name": "write", "label": "Write" }
+    { "itemId": 1, "name": "read",  "label": "Read", "category": "READ" },
+    { "itemId": 2, "name": "write", "label": "Write", "category": "WRITE" }
   ],
   "policyConditions": [],
   "contextEnrichers": [],
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-nifi-registry.json
 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-nifi-registry.json
index 3db268bb8..60babc6f7 100644
--- 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-nifi-registry.json
+++ 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-nifi-registry.json
@@ -33,17 +33,20 @@
     {
       "itemId":100,
       "name":"READ",
-      "label":"Read"
+      "label":"Read",
+      "category": "READ"
     },
     {
       "itemId":200,
       "name":"WRITE",
-      "label":"Write"
+      "label":"Write",
+      "category": "UPDATE"
     },
     {
       "itemId":300,
       "name":"DELETE",
-      "label":"Delete"
+      "label":"Delete",
+      "category": "DELETE"
     }
   ],
   "configs":[
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-nifi.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-nifi.json
index 30680083f..b481efd8e 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-nifi.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-nifi.json
@@ -33,12 +33,14 @@
     {
       "itemId":100,
       "name":"READ",
-      "label":"Read"
+      "label":"Read",
+      "category": "READ"
     },
     {
       "itemId":200,
       "name":"WRITE",
-      "label":"Write"
+      "label":"Write",
+      "category": "UPDATE"
     }
   ],
   "configs":[
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-ozone.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-ozone.json
index 13915130c..2bff90d47 100755
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-ozone.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-ozone.json
@@ -88,41 +88,48 @@
                {
                        "itemId": 1,
                        "name": "read",
-                       "label": "Read"
+                       "label": "Read",
+                       "category": "READ"
                },
 
                {
                        "itemId": 2,
                        "name": "write",
-                       "label": "Write"
+                       "label": "Write",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 3,
                        "name": "create",
-                       "label": "Create"
+                       "label": "Create",
+                       "category": "CREATE"
                },
 
                {
                        "itemId": 4,
                        "name": "list",
-                       "label": "List"
+                       "label": "List",
+                       "category": "READ"
                },
 
                {
                        "itemId": 5,
                        "name": "delete",
-                       "label": "Delete"
+                       "label": "Delete",
+                       "category": "DELETE"
                },
                {
                        "itemId": 6,
                        "name": "read_acl",
-                       "label": "Read_ACL"
+                       "label": "Read_ACL",
+                       "category": "READ"
                },
                {
                        "itemId": 7,
                        "name": "write_acl",
-                       "label": "Write_ACL"
+                       "label": "Write_ACL",
+                       "category": "UPDATE"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-presto.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-presto.json
index b16b02a7b..330ff1485 100644
--- 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-presto.json
+++ 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-presto.json
@@ -209,57 +209,68 @@
     {
       "itemId": 1,
       "name": "select",
-      "label": "Select"
+      "label": "Select",
+      "category": "READ"
     },
     {
       "itemId": 2,
       "name": "insert",
-      "label": "Insert"
+      "label": "Insert",
+      "category": "UPDATE"
     },
     {
       "itemId": 3,
       "name": "create",
-      "label": "Create"
+      "label": "Create",
+      "category": "CREATE"
     },
     {
       "itemId": 4,
       "name": "drop",
-      "label": "Drop"
+      "label": "Drop",
+      "category": "DELETE"
     },
     {
       "itemId": 5,
       "name": "delete",
-      "label": "Delete"
+      "label": "Delete",
+      "category": "DELETE"
     },
     {
       "itemId": 6,
       "name": "use",
-      "label": "Use"
+      "label": "Use",
+      "category": "READ"
     },
     {
       "itemId": 7,
       "name": "alter",
-      "label": "Alter"
+      "label": "Alter",
+      "category": "CREATE"
     },
     {
       "itemId": 8,
       "name": "grant",
-      "label": "Grant"
+      "label": "Grant",
+      "category": "MANAGE"
     },
     {
       "itemId": 9,
       "name": "revoke",
-      "label": "Revoke"
+      "label": "Revoke",
+      "category": "MANAGE"
     },
     {
       "itemId": 10,
       "name": "show",
-      "label": "Show"
+      "label": "Show",
+      "category": "READ"
     },
     {
       "itemId": 11,
       "name": "impersonate",
-      "label": "Impersonate"
+      "label": "Impersonate",
+      "category": "READ"
     },
     {
       "itemId": 12,
@@ -283,7 +294,8 @@
     {
       "itemId": 13,
       "name": "execute",
-      "label": "execute"
+      "label": "execute",
+      "category": "READ"
     }
   ],
   "configs": [
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-schema-registry.json
 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-schema-registry.json
index bdebf406d..250f9da70 100644
--- 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-schema-registry.json
+++ 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-schema-registry.json
@@ -149,25 +149,29 @@
     {
       "itemId": 1,
       "name": "create",
-      "label": "Create"
+      "label": "Create",
+      "category": "CREATE"
     },
 
     {
       "itemId": 2,
       "name": "read",
-      "label": "Read"
+      "label": "Read",
+      "category": "READ"
     },
 
     {
       "itemId": 3,
       "name": "update",
-      "label": "Update"
+      "label": "Update",
+      "category": "UPDATE"
     },
 
     {
       "itemId": 4,
       "name": "delete",
-      "label": "Delete"
+      "label": "Delete",
+      "category": "DELETE"
     }
   ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json
index 50545f744..315c03803 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-solr.json
@@ -96,12 +96,14 @@
                {
                        "itemId":100,
                        "name":"query",
-                       "label":"Query"
+                       "label":"Query",
+                       "category": "READ"
                },
                {
                        "itemId":200,
                        "name":"update",
-                       "label":"Update"
+                       "label":"Update",
+                       "category": "UPDATE"
                }
        ],
        "configs":[
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-sqoop.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-sqoop.json
index 544276e9a..edbb619b2 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-sqoop.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-sqoop.json
@@ -71,13 +71,15 @@
                {
                        "itemId": 1,
                        "name": "READ",
-                       "label": "READ"
+                       "label": "READ",
+                       "category": "READ"
                },
 
                {
                        "itemId": 2,
                        "name": "WRITE",
-                       "label": "WRITE"
+                       "label": "WRITE",
+                       "category": "UPDATE"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-storm.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-storm.json
index 4db4a7431..b29c5ebc0 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-storm.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-storm.json
@@ -33,6 +33,7 @@
                        "itemId": 1,
                        "name": "submitTopology",
                        "label": "Submit Topology",
+                       "category": "UPDATE",
                        "impliedGrants":
                        [
                                "fileUpload",
@@ -43,67 +44,78 @@
                {
                        "itemId": 2,
                        "name": "fileUpload",
-                       "label": "File Upload"
+                       "label": "File Upload",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 5,
                        "name": "fileDownload",
-                       "label": "File Download"
+                       "label": "File Download",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 6,
                        "name": "killTopology",
-                       "label": "Kill Topology"
+                       "label": "Kill Topology",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 7,
                        "name": "rebalance",
-                       "label": "Rebalance"
+                       "label": "Rebalance",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 8,
                        "name": "activate",
-                       "label": "Activate"
+                       "label": "Activate",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 9,
                        "name": "deactivate",
-                       "label": "Deactivate"
+                       "label": "Deactivate",
+                       "category": "MANAGE"
                },
 
                {
                        "itemId": 10,
                        "name": "getTopologyConf",
-                       "label": "Get Topology Conf"
+                       "label": "Get Topology Conf",
+                       "category": "READ"
                },
 
                {
                        "itemId": 11,
                        "name": "getTopology",
-                       "label": "Get Topology"
+                       "label": "Get Topology",
+                       "category": "READ"
                },
 
                {
                        "itemId": 12,
                        "name": "getUserTopology",
-                       "label": "Get User Topology"
+                       "label": "Get User Topology",
+                       "category": "READ"
                },
 
                {
                        "itemId": 13,
                        "name": "getTopologyInfo",
-                       "label": "Get Topology Info"
+                       "label": "Get Topology Info",
+                       "category": "READ"
                },
 
                {
                        "itemId": 14,
                        "name": "uploadNewCredentials",
-                       "label": "Upload New Credential"
+                       "label": "Upload New Credential",
+                       "category": "MANAGE"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-trino.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-trino.json
index 88a57e1f0..802c72c7a 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-trino.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-trino.json
@@ -209,57 +209,68 @@
     {
       "itemId": 1,
       "name": "select",
-      "label": "Select"
+      "label": "Select",
+      "category": "READ"
     },
     {
       "itemId": 2,
       "name": "insert",
-      "label": "Insert"
+      "label": "Insert",
+      "category": "UPDATE"
     },
     {
       "itemId": 3,
       "name": "create",
-      "label": "Create"
+      "label": "Create",
+      "category": "CREATE"
     },
     {
       "itemId": 4,
       "name": "drop",
-      "label": "Drop"
+      "label": "Drop",
+      "category": "DELETE"
     },
     {
       "itemId": 5,
       "name": "delete",
-      "label": "Delete"
+      "label": "Delete",
+      "category": "DELETE"
     },
     {
       "itemId": 6,
       "name": "use",
-      "label": "Use"
+      "label": "Use",
+      "category": "READ"
     },
     {
       "itemId": 7,
       "name": "alter",
-      "label": "Alter"
+      "label": "Alter",
+      "category": "CREATE"
     },
     {
       "itemId": 8,
       "name": "grant",
-      "label": "Grant"
+      "label": "Grant",
+      "category": "MANAGE"
     },
     {
       "itemId": 9,
       "name": "revoke",
-      "label": "Revoke"
+      "label": "Revoke",
+      "category": "MANAGE"
     },
     {
       "itemId": 10,
       "name": "show",
-      "label": "Show"
+      "label": "Show",
+      "category": "READ"
     },
     {
       "itemId": 11,
       "name": "impersonate",
-      "label": "Impersonate"
+      "label": "Impersonate",
+      "category": "READ"
     },
     {
       "itemId": 12,
@@ -283,7 +294,8 @@
     {
       "itemId": 13,
       "name": "execute",
-      "label": "execute"
+      "label": "execute",
+      "category": "READ"
     }
   ],
   "configs": [
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-wasb.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-wasb.json
index fd30c51d8..b8e55c8a4 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-wasb.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-wasb.json
@@ -66,13 +66,15 @@
                {
                        "itemId": 1,
                        "name": "read",
-                       "label": "Read"
+                       "label": "Read",
+                       "category": "READ"
                },
 
                {
                        "itemId": 2,
                        "name": "write",
-                       "label": "Write"
+                       "label": "Write",
+                       "category": "UPDATE"
                }
        ],
 
diff --git 
a/agents-common/src/main/resources/service-defs/ranger-servicedef-yarn.json 
b/agents-common/src/main/resources/service-defs/ranger-servicedef-yarn.json
index b102641ee..fd78e284a 100644
--- a/agents-common/src/main/resources/service-defs/ranger-servicedef-yarn.json
+++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-yarn.json
@@ -31,13 +31,15 @@
                {
                        "itemId": 1,
                        "name": "submit-app",
-                       "label": "submit-app"
+                       "label": "submit-app",
+                       "category": "UPDATE"
                },
 
                {
                        "itemId": 2,
                        "name": "admin-queue",
                        "label": "admin-queue",
+                       "category": "MANAGE",
                        "impliedGrants":
                        [
                                "submit-app"

Reply via email to