This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 3402cc8 [DLAB-1935] Audit message (#866)
3402cc8 is described below
commit 3402cc8a12e9ca9d955c46b01acf90741066293a
Author: Pavel Papou <ppapo...@gmail.com>
AuthorDate: Tue Aug 25 09:33:47 2020 -0400
[DLAB-1935] Audit message (#866)
[DLAB-1935] Audit message
---
.../com/epam/dlab/backendapi/resources/BucketResource.java | 14 ++++++++------
.../dlab/backendapi/service/impl/ProjectServiceImpl.java | 11 +++++++++--
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
index bbd1b02..a23e1cc 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
@@ -52,8 +52,10 @@ import java.nio.file.Paths;
@Path("/bucket")
@Slf4j
public class BucketResource {
- private static final String AUDIT_UPLOAD_FOLDER_MESSAGE = "Folder: %s";
- private static final String AUDIT_MESSAGE = "File: %s";
+ private static final String AUDIT_FOLDER_UPLOAD_MESSAGE = "Upload folder:
%s";
+ private static final String AUDIT_FILE_UPLOAD_MESSAGE = "Upload file: %s";
+ private static final String AUDIT_FILE_DOWNLOAD_MESSAGE = "Download file:
%s";
+ private static final String AUDIT_FILE_DELETE_MESSAGE = "Delete file: %s";
private static final String OBJECT_FORM_FIELD = "object";
private static final String BUCKET_FORM_FIELD = "bucket";
private static final String ENDPOINT_FORM_FIELD = "endpoint";
@@ -93,7 +95,7 @@ public class BucketResource {
@Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("/api/bucket/upload")
public Response uploadFolder(@Auth UserInfo userInfo, @Valid
FolderUploadDTO dto) {
- bucketService.uploadFolder(userInfo, dto.getBucket(), dto.getFolder(),
dto.getEndpoint(), String.format(AUDIT_UPLOAD_FOLDER_MESSAGE, dto.getFolder()));
+ bucketService.uploadFolder(userInfo, dto.getBucket(), dto.getFolder(),
dto.getEndpoint(), String.format(AUDIT_FOLDER_UPLOAD_MESSAGE, dto.getFolder()));
return Response.ok().build();
}
@@ -106,7 +108,7 @@ public class BucketResource {
@PathParam("bucket") String bucket,
@PathParam("object") String object,
@PathParam("endpoint") String endpoint) {
- bucketService.downloadObject(userInfo, bucket, object, endpoint, resp,
String.format(AUDIT_MESSAGE, object));
+ bucketService.downloadObject(userInfo, bucket, object, endpoint, resp,
String.format(AUDIT_FILE_DOWNLOAD_MESSAGE, object));
return Response.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment;
filename=\"" + Paths.get(object).getFileName() + "\"")
.build();
@@ -119,7 +121,7 @@ public class BucketResource {
@RolesAllowed("/api/bucket/delete")
public Response deleteObject(@Auth UserInfo userInfo, @Valid
BucketDeleteDTO bucketDto) {
final String listOfDeletedObject = String.join(", ",
bucketDto.getObjects());
- bucketService.deleteObjects(userInfo, bucketDto.getBucket(),
bucketDto.getObjects(), bucketDto.getEndpoint(), String.format(AUDIT_MESSAGE,
listOfDeletedObject));
+ bucketService.deleteObjects(userInfo, bucketDto.getBucket(),
bucketDto.getObjects(), bucketDto.getEndpoint(),
String.format(AUDIT_FILE_DELETE_MESSAGE, listOfDeletedObject));
return Response.ok().build();
}
@@ -146,7 +148,7 @@ public class BucketResource {
fileSize =
Long.parseLong(Streams.asString(stream));
}
} else {
- bucketService.uploadObject(userInfo, bucket, object,
endpoint, stream, item.getContentType(), fileSize, String.format(AUDIT_MESSAGE,
object));
+ bucketService.uploadObject(userInfo, bucket, object,
endpoint, stream, item.getContentType(), fileSize,
String.format(AUDIT_FILE_UPLOAD_MESSAGE, object));
}
} catch (Exception e) {
log.error("Cannot upload object {} to bucket {}. {}",
object, bucket, e.getMessage(), e);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index 79ee3f1..7e902fc 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -79,11 +79,13 @@ public class ProjectServiceImpl implements ProjectService {
private static final String STOP_PRJ_API =
"infrastructure/project/stop";
private static final String STOP_ACTION = "stop";
private static final String TERMINATE_ACTION = "terminate";
+ private static final String TOTAL_BUDGET_PERIOD = "Total";
+ private static final String MONTHLY_BUDGET_PERIOD = "Monthly";
private static final String AUDIT_ADD_ENDPOINT = "Add endpoint(s):
%s\n";
private static final String AUDIT_ADD_GROUP = "Add group(s): %s\n";
private static final String AUDIT_REMOVE_GROUP = "Remove group(s):
%s\n";
- private static final String AUDIT_UPDATE_BUDGET = "Update quota:
%d->%d\nUpdate period: %b";
+ private static final String AUDIT_UPDATE_BUDGET = "Update quota:
%d->%d\nUpdate period: %s->%s";
private static final String AUDIT_ADD_EDGE_NODE = "Create edge node for
endpoint %s, requested in project %s";
private final ProjectDAO projectDAO;
@@ -351,7 +353,12 @@ public class ProjectServiceImpl implements ProjectService {
Boolean monthlyBudget =
Optional.ofNullable(projectDTO.getBudget())
.map(BudgetDTO::isMonthlyBudget)
.orElse(null);
- return String.format(AUDIT_UPDATE_BUDGET, value,
p.getBudget().getValue(), monthlyBudget);
+ return String.format(AUDIT_UPDATE_BUDGET, value,
p.getBudget().getValue(),
+ representBudgetType(monthlyBudget),
representBudgetType(p.getBudget().isMonthlyBudget()));
+ }
+
+ private String representBudgetType(Boolean isMonthlyPeriod) {
+ return (isMonthlyPeriod) ? MONTHLY_BUDGET_PERIOD :
TOTAL_BUDGET_PERIOD;
}
private List<ProjectEndpointDTO> getProjectEndpointDTOS(List<String>
endpoints, @Project String name) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
