From 12dd5037eedf1dc0b2ed5fd4233a44c367c3138e Mon Sep 17 00:00:00 2001 From: TomFitzpatrick Date: Thu, 27 Jun 2024 17:14:34 +0100 Subject: [PATCH 1/4] add avro definitions to support Group RestResource Signed-off-by: TomFitzpatrick --- .../management/PermissionManagementRequest.avsc | 3 +++ .../management/PermissionManagementResponse.avsc | 1 + .../management/group/AddRoleToGroupRequest.avsc | 15 +++++++++++++++ .../group/ChangeGroupParentIdRequest.avsc | 15 +++++++++++++++ .../management/group/CreateGroupRequest.avsc | 15 +++++++++++++++ .../management/group/DeleteGroupRequest.avsc | 11 +++++++++++ .../group/RemoveRoleFromGroupRequest.avsc | 15 +++++++++++++++ 7 files changed, 75 insertions(+) create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/AddRoleToGroupRequest.avsc create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/ChangeGroupParentIdRequest.avsc create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/CreateGroupRequest.avsc create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/DeleteGroupRequest.avsc create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/RemoveRoleFromGroupRequest.avsc diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc index c3241812ac..7f71560996 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc @@ -24,6 +24,9 @@ "net.corda.data.permissions.management.user.AddRoleToUserRequest", "net.corda.data.permissions.management.user.RemoveRoleFromUserRequest", "net.corda.data.permissions.management.user.DeleteUserRequest", + "net.corda.data.permissions.management.group.CreateGroupRequest", + "net.corda.data.permissions.management.group.AddRoleToGroupRequest", + "net.corda.data.permissions.management.group.RemoveRoleFromGroupRequest", "net.corda.data.permissions.management.role.CreateRoleRequest", "net.corda.data.permissions.management.permission.CreatePermissionRequest", "net.corda.data.permissions.management.permission.BulkCreatePermissionsRequest", diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementResponse.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementResponse.avsc index 937646ac0c..69356ea577 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementResponse.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementResponse.avsc @@ -9,6 +9,7 @@ "boolean", "net.corda.data.ExceptionEnvelope", "net.corda.data.permissions.User", + "net.corda.data.permissions.Group", "net.corda.data.permissions.Role", "net.corda.data.permissions.Permission", "net.corda.data.permissions.management.permission.BulkCreatePermissionsResponse" diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/AddRoleToGroupRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/AddRoleToGroupRequest.avsc new file mode 100644 index 0000000000..c79a9fedf9 --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/AddRoleToGroupRequest.avsc @@ -0,0 +1,15 @@ +{ + "type": "record", + "name": "AddRoleToGroupRequest", + "namespace": "net.corda.data.permissions.management.group", + "fields": [ + { + "name": "groupId", + "type": "string" + }, + { + "name": "roleId", + "type": "string" + } + ] +} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/ChangeGroupParentIdRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/ChangeGroupParentIdRequest.avsc new file mode 100644 index 0000000000..ae689b837d --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/ChangeGroupParentIdRequest.avsc @@ -0,0 +1,15 @@ +{ + "type": "record", + "name": "ChangeGroupParentIdRequest", + "namespace": "net.corda.data.permissions.management.group", + "fields": [ + { + "name": "groupId", + "type": "string" + }, + { + "name": "newParentGroupId", + "type": [ "null", "string" ] + } + ] +} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/CreateGroupRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/CreateGroupRequest.avsc new file mode 100644 index 0000000000..8859d67c2b --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/CreateGroupRequest.avsc @@ -0,0 +1,15 @@ +{ + "type": "record", + "name": "CreateGroupRequest", + "namespace": "net.corda.data.permissions.management.group", + "fields": [ + { + "name": "groupName", + "type": "string" + }, + { + "name": "parentGroupId", + "type": [ "null", "string" ] + } + ] +} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/DeleteGroupRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/DeleteGroupRequest.avsc new file mode 100644 index 0000000000..cc71917cf0 --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/DeleteGroupRequest.avsc @@ -0,0 +1,11 @@ +{ + "type": "record", + "name": "DeleteGroupRequest", + "namespace": "net.corda.data.permissions.management.group", + "fields": [ + { + "name": "groupId", + "type": "string" + } + ] +} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/RemoveRoleFromGroupRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/RemoveRoleFromGroupRequest.avsc new file mode 100644 index 0000000000..0d7c1bdfc7 --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/group/RemoveRoleFromGroupRequest.avsc @@ -0,0 +1,15 @@ +{ + "type": "record", + "name": "RemoveRoleFromGroupRequest", + "namespace": "net.corda.data.permissions.management.group", + "fields": [ + { + "name": "groupId", + "type": "string" + }, + { + "name": "roleId", + "type": "string" + } + ] +} \ No newline at end of file From 51485982ed6d7b10156db36eb0b3197b4e20884f Mon Sep 17 00:00:00 2001 From: TomFitzpatrick Date: Thu, 27 Jun 2024 17:22:14 +0100 Subject: [PATCH 2/4] add references to new avsc in PermissionManagementRequest Signed-off-by: TomFitzpatrick --- .../permissions/management/PermissionManagementRequest.avsc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc index 7f71560996..ab8cfdd231 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc @@ -24,8 +24,10 @@ "net.corda.data.permissions.management.user.AddRoleToUserRequest", "net.corda.data.permissions.management.user.RemoveRoleFromUserRequest", "net.corda.data.permissions.management.user.DeleteUserRequest", - "net.corda.data.permissions.management.group.CreateGroupRequest", "net.corda.data.permissions.management.group.AddRoleToGroupRequest", + "net.corda.data.permissions.management.group.ChangeGroupParentIdRequest", + "net.corda.data.permissions.management.group.CreateGroupRequest", + "net.corda.data.permissions.management.group.DeleteGroupRequest", "net.corda.data.permissions.management.group.RemoveRoleFromGroupRequest", "net.corda.data.permissions.management.role.CreateRoleRequest", "net.corda.data.permissions.management.permission.CreatePermissionRequest", From 18626214ec35a84bab87c2a70557e2cd2326fd36 Mon Sep 17 00:00:00 2001 From: TomFitzpatrick Date: Fri, 28 Jun 2024 15:28:31 +0100 Subject: [PATCH 3/4] add ChangeUserParentGroupIdRequest avro object Signed-off-by: TomFitzpatrick --- .../management/PermissionManagementRequest.avsc | 11 ++++++----- .../user/ChangeUserParentGroupIdRequest.avsc | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserParentGroupIdRequest.avsc diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc index ab8cfdd231..edb59b44e8 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/PermissionManagementRequest.avsc @@ -19,16 +19,17 @@ { "name": "request", "type": [ - "net.corda.data.permissions.management.user.CreateUserRequest", - "net.corda.data.permissions.management.user.ChangeUserPasswordRequest", - "net.corda.data.permissions.management.user.AddRoleToUserRequest", - "net.corda.data.permissions.management.user.RemoveRoleFromUserRequest", - "net.corda.data.permissions.management.user.DeleteUserRequest", "net.corda.data.permissions.management.group.AddRoleToGroupRequest", "net.corda.data.permissions.management.group.ChangeGroupParentIdRequest", "net.corda.data.permissions.management.group.CreateGroupRequest", "net.corda.data.permissions.management.group.DeleteGroupRequest", "net.corda.data.permissions.management.group.RemoveRoleFromGroupRequest", + "net.corda.data.permissions.management.user.CreateUserRequest", + "net.corda.data.permissions.management.user.ChangeUserParentGroupIdRequest", + "net.corda.data.permissions.management.user.ChangeUserPasswordRequest", + "net.corda.data.permissions.management.user.AddRoleToUserRequest", + "net.corda.data.permissions.management.user.RemoveRoleFromUserRequest", + "net.corda.data.permissions.management.user.DeleteUserRequest", "net.corda.data.permissions.management.role.CreateRoleRequest", "net.corda.data.permissions.management.permission.CreatePermissionRequest", "net.corda.data.permissions.management.permission.BulkCreatePermissionsRequest", diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserParentGroupIdRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserParentGroupIdRequest.avsc new file mode 100644 index 0000000000..50baa00fa1 --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserParentGroupIdRequest.avsc @@ -0,0 +1,15 @@ +{ + "type": "record", + "name": "ChangeUserParentGroupIdRequest", + "namespace": "net.corda.data.permissions.management.group", + "fields": [ + { + "name": "userId", + "type": "string" + }, + { + "name": "newParentGroupId", + "type": [ "null", "string" ] + } + ] +} From 01b0cc08bf649cfafc00fcf9cd53411f204b95aa Mon Sep 17 00:00:00 2001 From: TomFitzpatrick Date: Fri, 28 Jun 2024 17:07:03 +0100 Subject: [PATCH 4/4] fix ChangeUserParentGroupIdRequest namespace Signed-off-by: TomFitzpatrick --- .../management/user/ChangeUserParentGroupIdRequest.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserParentGroupIdRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserParentGroupIdRequest.avsc index 50baa00fa1..706b4add3f 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserParentGroupIdRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/permissions/management/user/ChangeUserParentGroupIdRequest.avsc @@ -1,7 +1,7 @@ { "type": "record", "name": "ChangeUserParentGroupIdRequest", - "namespace": "net.corda.data.permissions.management.group", + "namespace": "net.corda.data.permissions.management.user", "fields": [ { "name": "userId",