You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2021/10/22 11:38:10 UTC
[incubator-datalab] branch develop updated: [DATALAB] -- update
jackson dependency for azure
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new f7dc5c4 [DATALAB] -- update jackson dependency for azure
f7dc5c4 is described below
commit f7dc5c47ba2430d8308e7b6b4b0005bf806467c5
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Fri Oct 22 14:37:58 2021 +0300
[DATALAB] -- update jackson dependency for azure
---
.../deploy_repository/scripts/addUpdateScript.groovy | 8 ++++----
integration-tests-cucumber/pom.xml | 6 +++---
integration-tests/pom.xml | 6 +++---
services/billing-aws/pom.xml | 2 +-
services/billing-azure/pom.xml | 4 ++--
services/provisioning-service/pom.xml | 2 +-
.../datalab/backendapi/resources/BucketResource.java | 12 ++++++------
.../service/impl/azure/BucketServiceAzureImpl.java | 20 ++++++++++++++++++++
.../datalab/backendapi/resources/BucketResource.java | 1 +
.../backendapi/service/impl/BucketServiceImpl.java | 3 ++-
10 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_repository/scripts/addUpdateScript.groovy b/infrastructure-provisioning/scripts/deploy_repository/scripts/addUpdateScript.groovy
index f799074..b8018a9 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/scripts/addUpdateScript.groovy
+++ b/infrastructure-provisioning/scripts/deploy_repository/scripts/addUpdateScript.groovy
@@ -22,10 +22,10 @@
@Grab('org.sonatype.nexus:nexus-script:3.9.0-01')
@Grab('org.codehaus.groovy:groovy-backports-compat23:2.4.5')
@Grab('org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec:1.0.0.Final')
-@Grab('com.fasterxml.jackson.core:jackson-core:2.8.6')
-@Grab('com.fasterxml.jackson.core:jackson-databind:2.8.6')
-@Grab('com.fasterxml.jackson.core:jackson-annotations:2.8.6')
-@Grab('com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.8.6')
+@Grab('com.fasterxml.jackson.core:jackson-core:2.11.0')
+@Grab('com.fasterxml.jackson.core:jackson-databind:2.11.0')
+@Grab('com.fasterxml.jackson.core:jackson-annotations:2.11.0')
+@Grab('com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.11.0')
@Grab('org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.1.Beta1')
@Grab('org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final')
@Grab('javax.activation:activation:1.1.1')
diff --git a/integration-tests-cucumber/pom.xml b/integration-tests-cucumber/pom.xml
index 4d00132..143bad0 100644
--- a/integration-tests-cucumber/pom.xml
+++ b/integration-tests-cucumber/pom.xml
@@ -37,17 +37,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.9</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.9</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.9.9</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 37ad85c..3534788 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -58,19 +58,19 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.9.7</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.7</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.7</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
diff --git a/services/billing-aws/pom.xml b/services/billing-aws/pom.xml
index 7a4d762..36b6e7e 100644
--- a/services/billing-aws/pom.xml
+++ b/services/billing-aws/pom.xml
@@ -110,7 +110,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.9.5</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
diff --git a/services/billing-azure/pom.xml b/services/billing-azure/pom.xml
index 340157a..c87698d 100644
--- a/services/billing-azure/pom.xml
+++ b/services/billing-azure/pom.xml
@@ -124,12 +124,12 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-guava</artifactId>
- <version>2.9.5</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
- <version>2.9.5</version>
+ <version>2.11.0</version>
</dependency>
</dependencies>
diff --git a/services/provisioning-service/pom.xml b/services/provisioning-service/pom.xml
index f883ac3..13eb127 100644
--- a/services/provisioning-service/pom.xml
+++ b/services/provisioning-service/pom.xml
@@ -104,7 +104,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
- <version>12.14.0</version>
+ <version>12.14.1</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/BucketResource.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/BucketResource.java
index 71716b0..298ff93 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/BucketResource.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/BucketResource.java
@@ -35,12 +35,7 @@ import org.apache.commons.fileupload.util.Streams;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -66,6 +61,7 @@ public class BucketResource {
@Produces(MediaType.APPLICATION_JSON)
public Response getListOfObjects(@Auth UserInfo userInfo,
@PathParam("bucket") String bucket) {
+ log.info("Trying to get list of the objects: {}, for user: {}", bucket, userInfo);
return Response.ok(bucketService.getObjects(bucket)).build();
}
@@ -74,6 +70,7 @@ public class BucketResource {
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON)
public Response uploadObject(@Auth UserInfo userInfo, @Context HttpServletRequest request) {
+ log.info("Trying to upload for user: {}", userInfo);
upload(request);
return Response.ok().build();
}
@@ -83,6 +80,7 @@ public class BucketResource {
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response uploadFolder(@Auth UserInfo userInfo, @Valid FolderUploadDTO dto) {
+ log.info("Trying to upload folder in bucket: {}, for user: {}", dto.getBucket(), userInfo);
bucketService.uploadFolder(userInfo, dto.getBucket(), dto.getFolder());
return Response.ok().build();
}
@@ -103,6 +101,7 @@ public class BucketResource {
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response uploadObject(@Auth UserInfo userInfo, BucketDeleteDTO bucketDeleteDTO) {
+ log.info("Trying to delete from bucket: {}, for user: {}", bucketDeleteDTO.getBucket(), userInfo);
bucketService.deleteObjects(bucketDeleteDTO.getBucket(), bucketDeleteDTO.getObjects());
return Response.ok().build();
}
@@ -129,6 +128,7 @@ public class BucketResource {
fileSize = Long.parseLong(Streams.asString(stream));
}
} else {
+ log.info("Trying to upload in bucket: {}, object: {}", bucket, object);
bucketService.uploadObject(bucket, object, stream, item.getContentType(), fileSize);
}
} catch (Exception e) {
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/azure/BucketServiceAzureImpl.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
index 0782aa8..28bea5a 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/service/impl/azure/BucketServiceAzureImpl.java
@@ -35,6 +35,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Inject;
import lombok.AllArgsConstructor;
import lombok.Getter;
+import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.ServletOutputStream;
@@ -60,9 +61,17 @@ public class BucketServiceAzureImpl implements BucketService {
@Override
public List<BucketDTO> getObjects(String bucket) {
try {
+ log.info("TEST LOG!!!: bucket: {}", bucket);
+
AzureStorageAccount account = getAzureStorageAccount(bucket);
+ log.info("TEST LOG!!!: account: {}", account);
+
BlobServiceClient blobServiceClient = getBlobServiceClient(account.getStorageAccount());
+ log.info("TEST LOG!!!: blobServiceClient: {}", blobServiceClient);
+
BlobContainerClient blobContainerClient = blobServiceClient.getBlobContainerClient(account.getContainer());
+ log.info("TEST LOG!!!: blobContainerClient: {}", blobContainerClient);
+
return blobContainerClient.listBlobs()
.stream()
.map(blob -> toBucketDTO(account.getContainer(), blob))
@@ -124,6 +133,11 @@ public class BucketServiceAzureImpl implements BucketService {
}
private BucketDTO toBucketDTO(String bucket, BlobItem blob) {
+ log.info("TEST LOG!!!: toBucketDTO: ");
+
+ log.info("TEST LOG!!!: bucket: {}", bucket);
+ log.info("TEST LOG!!!: blob: {}", blob);
+
return BucketDTO.builder()
.bucket(bucket)
.object(blob.getName())
@@ -152,6 +166,7 @@ public class BucketServiceAzureImpl implements BucketService {
private BlobServiceClient getBlobServiceClient(String storageAccount) {
final String endpoint = String.format("https://%s.blob.core.windows.net", storageAccount);
+ log.info("TEST LOG!!!: endpoint: {}", endpoint);
return new BlobServiceClientBuilder()
.endpoint(endpoint)
.credential(new ClientSecretCredentialBuilder()
@@ -160,6 +175,10 @@ public class BucketServiceAzureImpl implements BucketService {
.tenantId(azureAuthFile.getTenantId())
.build())
.buildClient();
+// return new BlobClientBuilder()
+// .endpoint()
+// .sasToken()
+// .containerName()
}
private AzureStorageAccount getAzureStorageAccount(String bucket) {
@@ -169,6 +188,7 @@ public class BucketServiceAzureImpl implements BucketService {
@Getter
@AllArgsConstructor
+ @ToString
private static class AzureStorageAccount {
private final String storageAccount;
private final String container;
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/BucketResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/BucketResource.java
index 26494a0..2d34209 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/BucketResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/BucketResource.java
@@ -76,6 +76,7 @@ public class BucketResource {
public Response getListOfObjects(@Auth UserInfo userInfo,
@PathParam("bucket") String bucket,
@PathParam("endpoint") String endpoint) {
+ log.info("Trying to get list of the objects: {}, for user: {}", bucket, userInfo);
return Response.ok(bucketService.getObjects(userInfo, bucket, endpoint)).build();
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/BucketServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/BucketServiceImpl.java
index 7729dea..f52497f 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/BucketServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/BucketServiceImpl.java
@@ -78,8 +78,9 @@ public class BucketServiceImpl implements BucketService {
}
@Override
- public List<BucketDTO> getObjects(UserInfo userInfo, String bucket, String endpoint) {
+ public List<BucketDTO> getObjects(@User UserInfo userInfo, String bucket, String endpoint) {
try {
+ log.info("Trying to get list of the objects: {}, for user: {}", bucket, userInfo);
EndpointDTO endpointDTO = endpointService.get(endpoint);
return provisioningService.get(String.format(BUCKET_GET_OBJECTS, endpointDTO.getUrl(), bucket), userInfo.getAccessToken(), new GenericType<List<BucketDTO>>() {
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org