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 2022/10/27 12:10:03 UTC

[camel] branch main updated (146de76abc4 -> 066f2174bb3)

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

acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 146de76abc4 Regen for commit 83c90c1e23eace710af6e19beb742cb69afda74f
     new 06e242f10d8 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Athena
     new a8e721d3d4e CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Athena
     new 066f2174bb3 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Kinesis

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel/component/aws2/athena/Athena2ClientHealthCheck.java | 11 +++++++----
 .../component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java   | 10 ++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)


[camel] 03/03: CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Kinesis

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 066f2174bb377a67a97196f08a3745abe31f63af
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 27 13:59:34 2022 +0200

    CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Kinesis
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
index f866ccabe1b..2321ff9aff8 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
@@ -50,10 +50,12 @@ public class Kinesis2ConsumerHealthCheck extends AbstractHealthCheck {
 
         try {
             Kinesis2Configuration configuration = kinesis2Consumer.getConfiguration();
-            if (!KinesisClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
-                builder.message("The service is not supported in this region");
-                builder.down();
-                return;
+            if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+                if (!KinesisClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
+                    builder.message("The service is not supported in this region");
+                    builder.down();
+                    return;
+                }
             }
             KinesisClient client;
             if (!configuration.isUseDefaultCredentialsProvider()) {


[camel] 02/03: CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Athena

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a8e721d3d4eeb77f44adc79f4ac8cc0ffb7f2221
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 27 13:19:54 2022 +0200

    CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Athena
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
index c8b70b02c8f..3aac0d79e8a 100644
--- a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
@@ -51,7 +51,8 @@ public class Athena2ClientHealthCheck extends AbstractHealthCheck {
 
         try {
             if (ObjectHelper.isNotEmpty(athena2Endpoint.getConfiguration().getRegion())) {
-                if (!AthenaClient.serviceMetadata().regions().contains(Region.of(athena2Endpoint.getConfiguration().getRegion()))) {
+                if (!AthenaClient.serviceMetadata().regions()
+                        .contains(Region.of(athena2Endpoint.getConfiguration().getRegion()))) {
                     builder.message("The service is not supported in this region");
                     builder.down();
                     return;


[camel] 01/03: CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Athena

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 06e242f10d8d24da113fa01c633703c5f925b86a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 27 13:16:10 2022 +0200

    CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - Fix check for region before looking for enabled services - Athena
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../camel/component/aws2/athena/Athena2ClientHealthCheck.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
index 2c3402d4b28..c8b70b02c8f 100644
--- a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
@@ -50,10 +50,12 @@ public class Athena2ClientHealthCheck extends AbstractHealthCheck {
     protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
 
         try {
-            if (!AthenaClient.serviceMetadata().regions().contains(Region.of(athena2Endpoint.getConfiguration().getRegion()))) {
-                builder.message("The service is not supported in this region");
-                builder.down();
-                return;
+            if (ObjectHelper.isNotEmpty(athena2Endpoint.getConfiguration().getRegion())) {
+                if (!AthenaClient.serviceMetadata().regions().contains(Region.of(athena2Endpoint.getConfiguration().getRegion()))) {
+                    builder.message("The service is not supported in this region");
+                    builder.down();
+                    return;
+                }
             }
             AthenaClient client;
             if (!athena2Endpoint.getConfiguration().isUseDefaultCredentialsProvider()) {