This is an automated email from the ASF dual-hosted git repository.
oscerd 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 fd94df444f86 CAMEL-24194: camel-aws-config - removeConformancePack
reads the correct header (#24854)
fd94df444f86 is described below
commit fd94df444f86c13f23a640cbe78d0426973de2a7
Author: Andrea Cosentino <[email protected]>
AuthorDate: Fri Jul 17 17:59:28 2026 +0200
CAMEL-24194: camel-aws-config - removeConformancePack reads the correct
header (#24854)
removeConformancePack now reads the value from CONFORMACE_PACK_NAME instead
of RULE_NAME. Adds AWSConfigRemoveConformancePackTest.
Co-authored-by: Claude Fable 5 <[email protected]>
---
components/camel-aws/camel-aws-config/pom.xml | 6 ++
.../component/aws/config/AWSConfigProducer.java | 3 +-
.../config/AWSConfigRemoveConformancePackTest.java | 66 ++++++++++++++++++++++
3 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws-config/pom.xml
b/components/camel-aws/camel-aws-config/pom.xml
index ab70ea7b7ecb..2bdfb7a53256 100644
--- a/components/camel-aws/camel-aws-config/pom.xml
+++ b/components/camel-aws/camel-aws-config/pom.xml
@@ -70,6 +70,12 @@
<artifactId>camel-test-junit6</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito-version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- test infra -->
<dependency>
diff --git
a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java
b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java
index b7a6793caa1e..909fe3c7f3e6 100644
---
a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java
+++
b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java
@@ -280,7 +280,8 @@ public class AWSConfigProducer extends DefaultProducer {
} else {
DeleteConformancePackRequest.Builder builder =
DeleteConformancePackRequest.builder();
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(AWSConfigConstants.CONFORMACE_PACK_NAME)))
{
- String conformancePackName =
exchange.getIn().getHeader(AWSConfigConstants.RULE_NAME, String.class);
+ String conformancePackName
+ =
exchange.getIn().getHeader(AWSConfigConstants.CONFORMACE_PACK_NAME,
String.class);
builder.conformancePackName(conformancePackName);
} else {
throw new IllegalArgumentException("Conformance Pack Name must
be specified");
diff --git
a/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigRemoveConformancePackTest.java
b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigRemoveConformancePackTest.java
new file mode 100644
index 000000000000..63b14c567755
--- /dev/null
+++
b/components/camel-aws/camel-aws-config/src/test/java/org/apache/camel/component/aws/config/AWSConfigRemoveConformancePackTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.aws.config;
+
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit6.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import software.amazon.awssdk.services.config.ConfigClient;
+import
software.amazon.awssdk.services.config.model.DeleteConformancePackRequest;
+import
software.amazon.awssdk.services.config.model.DeleteConformancePackResponse;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class AWSConfigRemoveConformancePackTest extends CamelTestSupport {
+
+ @BindToRegistry("configClient")
+ private final ConfigClient configClient = mock(ConfigClient.class);
+
+ @Test
+ public void removeConformancePackUsesTheConformancePackNameHeader() throws
Exception {
+
when(configClient.deleteConformancePack(any(DeleteConformancePackRequest.class)))
+ .thenReturn(DeleteConformancePackResponse.builder().build());
+
+ // The conformance pack name comes from CONFORMANCE_PACK_NAME;
RULE_NAME is set to a different value
+ // to prove removeConformancePack no longer reads it by mistake.
+ template.send("direct:start", exchange -> {
+
exchange.getIn().setHeader(AWSConfigConstants.CONFORMACE_PACK_NAME, "my-pack");
+ exchange.getIn().setHeader(AWSConfigConstants.RULE_NAME,
"some-rule");
+ });
+
+ ArgumentCaptor<DeleteConformancePackRequest> captor
+ = ArgumentCaptor.forClass(DeleteConformancePackRequest.class);
+
org.mockito.Mockito.verify(configClient).deleteConformancePack(captor.capture());
+ assertEquals("my-pack", captor.getValue().conformancePackName());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:start")
+
.to("aws-config://test?configClient=#configClient&operation=removeConformancePack");
+ }
+ };
+ }
+}
