You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/11/19 08:26:10 UTC
[camel] 01/04: CAMEL-15862 - Camel-AWS2-S3: Support Creation of
presignedUrl like downloadLink in Camel-AWS-S3
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 82f46d4c72164bbdfc70f5b6718583644904b422
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 19 08:59:54 2020 +0100
CAMEL-15862 - Camel-AWS2-S3: Support Creation of presignedUrl like downloadLink in Camel-AWS-S3
---
.../camel/component/aws2/s3/AWS2S3Constants.java | 1 +
.../camel/component/aws2/s3/AWS2S3Operations.java | 3 +-
.../camel/component/aws2/s3/AWS2S3Producer.java | 46 +++++++++++
...3CreateDownloadLinkOperationLocalstackTest.java | 90 ++++++++++++++++++++++
.../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 3 +-
5 files changed, 141 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Constants.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Constants.java
index cdd028b..8c17660 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Constants.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Constants.java
@@ -43,4 +43,5 @@ public interface AWS2S3Constants {
String REPLICATION_STATUS = "CamelAwsS3ReplicationStatus";
String RANGE_START = "CamelAwsS3RangeStart";
String RANGE_END = "CamelAwsS3RangeEnd";
+ String DOWNLOAD_LINK_EXPIRATION_TIME = "CamelAwsS3DowloadLinkExpirationTime";
}
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Operations.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Operations.java
index 2a61d86..0b723b1 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Operations.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Operations.java
@@ -24,5 +24,6 @@ public enum AWS2S3Operations {
deleteBucket,
listBuckets,
getObject,
- getObjectRange
+ getObjectRange,
+ createDownloadLink
}
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
index bdd1adf..2808238 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -39,10 +40,13 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.ResponseInputStream;
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.core.sync.ResponseTransformer;
+import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.BucketCannedACL;
@@ -66,6 +70,9 @@ import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
/**
* A Producer which sends messages to the Amazon Web Service Simple Storage Service
@@ -114,6 +121,9 @@ public class AWS2S3Producer extends DefaultProducer {
case getObjectRange:
getObjectRange(getEndpoint().getS3Client(), exchange);
break;
+ case createDownloadLink:
+ createDownloadLink(getEndpoint().getS3Client(), exchange);
+ break;
default:
throw new IllegalArgumentException("Unsupported operation");
}
@@ -498,6 +508,42 @@ public class AWS2S3Producer extends DefaultProducer {
}
}
+ private void createDownloadLink(S3Client s3Client, Exchange exchange) throws InvalidPayloadException {
+ final String bucketName = determineBucketName(exchange);
+ final String key = determineKey(exchange);
+
+ long milliSeconds = 0;
+
+ Long expirationMillis = exchange.getIn().getHeader(AWS2S3Constants.DOWNLOAD_LINK_EXPIRATION_TIME, Long.class);
+ if (expirationMillis != null) {
+ milliSeconds += expirationMillis;
+ } else {
+ milliSeconds += 1000 * 60 * 60; // Default: Add 1 hour.
+ }
+
+ S3Presigner presigner = S3Presigner.builder()
+ .credentialsProvider(StaticCredentialsProvider.create(
+ AwsBasicCredentials.create(getConfiguration().getAccessKey(), getConfiguration().getSecretKey())))
+ .region(Region.of(getConfiguration().getRegion())).build();
+
+ GetObjectRequest getObjectRequest = GetObjectRequest.builder()
+ .bucket(bucketName)
+ .key(key)
+ .build();
+
+ GetObjectPresignRequest getObjectPresignRequest = GetObjectPresignRequest.builder()
+ .signatureDuration(Duration.ofMillis(milliSeconds))
+ .getObjectRequest(getObjectRequest)
+ .build();
+
+ PresignedGetObjectRequest presignedGetObjectRequest = presigner.presignGetObject(getObjectPresignRequest);
+
+ Message message = getMessageForResponse(exchange);
+ message.setBody(presignedGetObjectRequest.url().toString());
+
+ presigner.close();
+ }
+
private AWS2S3Operations determineOperation(Exchange exchange) {
AWS2S3Operations operation = exchange.getIn().getHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.class);
if (operation == null) {
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3CreateDownloadLinkOperationLocalstackTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3CreateDownloadLinkOperationLocalstackTest.java
new file mode 100644
index 0000000..48fa015
--- /dev/null
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3CreateDownloadLinkOperationLocalstackTest.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws2.s3.localstack;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.s3.AWS2S3Constants;
+import org.apache.camel.component.aws2.s3.AWS2S3Operations;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertNotNull;
+
+public class S3CreateDownloadLinkOperationLocalstackTest extends Aws2S3BaseTest {
+
+ @EndpointInject
+ private ProducerTemplate template;
+
+ @EndpointInject("mock:result")
+ private MockEndpoint result;
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void sendIn() throws Exception {
+ result.expectedMessageCount(1);
+
+ template.send("direct:listBucket", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listBuckets);
+ }
+ });
+
+ template.send("direct:addObject", ExchangePattern.InOnly, new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "CamelUnitTest2");
+ exchange.getIn().setBody("This is my bucket content.");
+ exchange.getIn().removeHeader(AWS2S3Constants.S3_OPERATION);
+ }
+ });
+
+ Exchange ex1 = template.request("direct:createDownloadLink", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "CamelUnitTest2");
+ exchange.getIn().setHeader(AWS2S3Constants.BUCKET_NAME, "mycamel2");
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.createDownloadLink);
+ }
+ });
+
+ assertNotNull(ex1.getMessage().getBody());
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ String awsEndpoint = "aws2-s3://mycamel2?autoCreateBucket=true";
+
+ from("direct:listBucket").to(awsEndpoint);
+
+ from("direct:addObject").to(awsEndpoint);
+
+ from("direct:createDownloadLink").to(awsEndpoint + "&accessKey=xxx&secretKey=yyy®ion=eu-west-1")
+ .to("mock:result");
+
+ }
+ };
+ }
+}
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
index b5368fc..16a15b2 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
@@ -2258,7 +2258,8 @@ public interface AWS2S3EndpointBuilderFactory {
deleteBucket,
listBuckets,
getObject,
- getObjectRange;
+ getObjectRange,
+ createDownloadLink;
}
public interface AWS2S3Builders {