build: merge dev/aliyun_202502 into main

build: merge dev/aliyun_202502 into main

Author: LioRoger

pom.xml

@@ -119,7 +119,7 @@
         <mina.version>2.1.6</mina.version>
 
         <!-- data-lifecycle-manager version -->
-        <data-lifecycle-manager.version>1.2.2.bp</data-lifecycle-manager.version>
+        <data-lifecycle-manager.version>1.2.3</data-lifecycle-manager.version>
 
         <!-- plugin version -->
         <formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>

server/integration-test/src/test/java/com/oceanbase/odc/service/audit/AuditEventMapperTest.java

@@ -52,7 +52,9 @@ public void test_EntityToModel_Success() {
                 .organizationId(1L)
                 .taskId("1")
                 .action(AuditEventAction.UPDATE_PERSONAL_CONFIGURATION)
+                .actionName(AuditEventAction.UPDATE_PERSONAL_CONFIGURATION.getLocalizedMessage())
                 .type(AuditEventType.PERSONAL_CONFIGURATION)
+                .typeName(AuditEventType.PERSONAL_CONFIGURATION.getLocalizedMessage())
                 .userId(1L)
                 .username("account")
                 .result(AuditEventResult.SUCCESS)

server/integration-test/src/test/java/com/oceanbase/odc/service/audit/AuditEventMetaMapperTest.java

@@ -39,7 +39,9 @@ public void test_EntityToModel_Success() {
 
         AuditEventMeta expected = AuditEventMeta.builder()
                 .action(AuditEventAction.UPDATE_PERSONAL_CONFIGURATION)
+                .actionName(AuditEventAction.UPDATE_PERSONAL_CONFIGURATION.getLocalizedMessage())
                 .type(AuditEventType.PERSONAL_CONFIGURATION)
+                .typeName(AuditEventType.PERSONAL_CONFIGURATION.getLocalizedMessage())
                 .enabled(true)
                 .inConnection(true)
                 .methodSignature("controller")

server/integration-test/src/test/java/com/oceanbase/odc/service/iam/RoleServiceTest.java

@@ -130,7 +130,7 @@ public void testCreate() {
     @Test(expected = BadRequestException.class)
     public void testCreateDuplicate() {
         CreateRoleReq createRoleReq = buildCreateRoleReq("create");
-        Role createdRole = roleService.create(createRoleReq);
+        roleService.create(createRoleReq);
         roleService.create(createRoleReq);
     }
 
@@ -337,11 +337,11 @@ private CreateRoleReq buildCreateRoleReq(String name) {
         when(resourceGroupRepository.existsById(any())).thenReturn(true);
 
         PermissionConfig roleManagementPermission =
-                new PermissionConfig(null, ResourceType.ODC_ROLE, Arrays.asList("read", "update", "delete"));
+                new PermissionConfig("*", ResourceType.ODC_ROLE, Arrays.asList("read", "update", "delete"));
         PermissionConfig roleManagementPermissionCreate =
-                new PermissionConfig(null, ResourceType.ODC_ROLE, Arrays.asList("create"));
+                new PermissionConfig("*", ResourceType.ODC_ROLE, Arrays.asList("create"));
         PermissionConfig userManagementPermission =
-                new PermissionConfig(null, ResourceType.ODC_USER, Arrays.asList("read", "update", "delete"));
+                new PermissionConfig("*", ResourceType.ODC_USER, Arrays.asList("read", "update", "delete"));
         createRoleReq.setResourceManagementPermissions(Arrays.asList(roleManagementPermission,
                 roleManagementPermissionCreate, userManagementPermission));
         return createRoleReq;