(camel) branch main updated: CAMEL-21324 - Camel-AWS-Secret-Manager: for context reloading on secret refresh we should check also UpdateSecret Event (#15867)

[acosentino]

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


The following commit(s) were added to refs/heads/main by this push:
     new 95b33015cdb CAMEL-21324 - Camel-AWS-Secret-Manager: for context 
reloading on secret refresh we should check also UpdateSecret Event (#15867)
95b33015cdb is described below

commit 95b33015cdb34567950368725163f4e3a8252a21
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Oct 7 15:24:28 2024 +0200

    CAMEL-21324 - Camel-AWS-Secret-Manager: for context reloading on secret 
refresh we should check also UpdateSecret Event (#15867)
    
    Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
 .../aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java
 
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java
index 5d038ea8112..6c40c3f0c5b 100644
--- 
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java
+++ 
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/vault/CloudTrailReloadTriggerTask.java
@@ -90,6 +90,8 @@ public class CloudTrailReloadTriggerTask extends 
ServiceSupport implements Camel
 
     private static final String SECRETSMANAGER_UPDATE_EVENT = "PutSecretValue";
 
+    private static final String SECRETSMANAGER_UPDATE_SECRET_EVENT = 
"UpdateSecret";
+
     private CamelContext camelContext;
     private boolean reloadEnabled = true;
     private String secrets;
@@ -286,7 +288,8 @@ public class CloudTrailReloadTriggerTask extends 
ServiceSupport implements Camel
                 LOG.debug("Found {} events", events.size());
                 for (Event event : events) {
                     if 
(event.eventSource().equalsIgnoreCase(SECRETSMANAGER_AMAZONAWS_COM)) {
-                        if 
(event.eventName().equalsIgnoreCase(SECRETSMANAGER_UPDATE_EVENT)) {
+                        if 
(event.eventName().equalsIgnoreCase(SECRETSMANAGER_UPDATE_EVENT)
+                                || 
event.eventName().equalsIgnoreCase(SECRETSMANAGER_UPDATE_SECRET_EVENT)) {
                             List<Resource> a = event.resources();
                             for (Resource res : a) {
                                 String name = res.resourceName();
@@ -332,7 +335,9 @@ public class CloudTrailReloadTriggerTask extends 
ServiceSupport implements Camel
                     if (ObjectHelper.isNotEmpty(event.get("detail"))) {
                         JsonNode innerDetail = event.get("detail");
                         if 
(innerDetail.get("eventSource").asText().equalsIgnoreCase(SECRETSMANAGER_AMAZONAWS_COM))
 {
-                            if 
(innerDetail.get("eventName").asText().equalsIgnoreCase(SECRETSMANAGER_UPDATE_EVENT))
 {
+                            if 
(innerDetail.get("eventName").asText().equalsIgnoreCase(SECRETSMANAGER_UPDATE_EVENT)
+                                    || innerDetail.get("eventName").asText()
+                                            
.equalsIgnoreCase(SECRETSMANAGER_UPDATE_SECRET_EVENT)) {
                                 String name = 
innerDetail.get("requestParameters").get("secretId").asText();
                                 if (matchSecret(name)) {
                                     updates.put(name, 
Instant.parse(innerDetail.get("eventTime").asText()));