(camel) 01/01: CAMEL-20798: EndpointServiceLocation on components to make it possible to know which remote system Camel connects to to assist for monitoring and observability - AWS S3

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch CAMEL-20798-aws-s3
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fa2b4d1410a5a130e333030c96f5cd5e5b237e8a
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed May 29 12:16:08 2024 +0200

    CAMEL-20798: EndpointServiceLocation on components to make it possible to 
know which remote system Camel connects to to assist for monitoring and 
observability - AWS S3
    
    Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
 .../camel/component/aws2/s3/AWS2S3Endpoint.java    | 33 ++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git 
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
 
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
index 0e137a18853..11d0beb60bb 100644
--- 
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
+++ 
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.aws2.s3;
 
+import java.util.Map;
+
 import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
@@ -23,10 +25,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.component.aws2.s3.client.AWS2S3ClientFactory;
 import org.apache.camel.component.aws2.s3.stream.AWS2S3StreamUploadProducer;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
+import org.apache.camel.spi.*;
 import org.apache.camel.support.ScheduledPollEndpoint;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
@@ -43,7 +42,7 @@ import 
software.amazon.awssdk.services.s3.model.PutBucketPolicyRequest;
 @UriEndpoint(firstVersion = "3.2.0", scheme = "aws2-s3", title = "AWS S3 
Storage Service",
              syntax = "aws2-s3://bucketNameOrArn", category = { 
Category.CLOUD, Category.FILE },
              headersClass = AWS2S3Constants.class)
-public class AWS2S3Endpoint extends ScheduledPollEndpoint {
+public class AWS2S3Endpoint extends ScheduledPollEndpoint implements 
EndpointServiceLocation {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(AWS2S3Endpoint.class);
 
@@ -64,6 +63,30 @@ public class AWS2S3Endpoint extends ScheduledPollEndpoint {
         this.configuration = configuration;
     }
 
+    @Override
+    public String getServiceUrl() {
+        if (!configuration.isOverrideEndpoint()) {
+            return configuration.getBucketName() + "." + getServiceProtocol() 
+ ".amazonaws.com";
+        } else {
+            if 
(ObjectHelper.isNotEmpty(configuration.getUriEndpointOverride()))
+                return configuration.getUriEndpointOverride();
+        }
+        return null;
+    }
+
+    @Override
+    public String getServiceProtocol() {
+        return "s3";
+    }
+
+    @Override
+    public Map<String, String> getServiceMetadata() {
+        if (configuration.getRegion() != null) {
+            return Map.of("region", configuration.getRegion());
+        }
+        return null;
+    }
+
     @Override
     public Consumer createConsumer(Processor processor) throws Exception {
         AWS2S3Consumer s3Consumer = new AWS2S3Consumer(this, processor);