This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 22013
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4ca655cd04c7e9c0e5bb1111366936d0817209c9
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu May 8 14:06:19 2025 +0200
CAMEL-22013 - camel-api - Remove all usage of component.extension and the
component.extension package content itself - AWS KMS
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../camel/component/aws2/kms/KMS2Component.java | 2 -
.../aws2/kms/KMS2ComponentVerifierExtension.java | 95 ----------------------
.../kms/KMSComponentVerifierExtensionTest.java | 93 ---------------------
3 files changed, 190 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
index 03fc7476fe6..ed000a7dae6 100644
---
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
+++
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
@@ -38,8 +38,6 @@ public class KMS2Component extends DefaultComponent {
public KMS2Component(CamelContext context) {
super(context);
-
- registerExtension(new KMS2ComponentVerifierExtension());
}
@Override
diff --git
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2ComponentVerifierExtension.java
b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2ComponentVerifierExtension.java
deleted file mode 100644
index bbe7d5e8352..00000000000
---
a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2ComponentVerifierExtension.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.kms;
-
-import java.util.Map;
-
-import
org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
-import org.apache.camel.component.extension.verifier.ResultBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorHelper;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.kms.KmsClient;
-import software.amazon.awssdk.services.kms.KmsClientBuilder;
-
-public class KMS2ComponentVerifierExtension extends
DefaultComponentVerifierExtension {
-
- public KMS2ComponentVerifierExtension() {
- this("aws2-kms");
- }
-
- public KMS2ComponentVerifierExtension(String scheme) {
- super(scheme);
- }
-
- // *********************************
- // Parameters validation
- // *********************************
-
- @Override
- protected Result verifyParameters(Map<String, Object> parameters) {
-
- ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS)
- .error(ResultErrorHelper.requiresOption(parameters,
"accessKey"))
- .error(ResultErrorHelper.requiresOption(parameters,
"secretKey"))
- .error(ResultErrorHelper.requiresOption(parameters, "region"));
-
- // Validate using the catalog
-
- super.verifyParametersAgainstCatalog(builder, parameters);
-
- return builder.build();
- }
-
- // *********************************
- // Connectivity validation
- // *********************************
-
- @Override
- protected Result verifyConnectivity(Map<String, Object> parameters) {
- ResultBuilder builder =
ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY);
-
- try {
- KMS2Configuration configuration = setProperties(new
KMS2Configuration(), parameters);
- if
(!KmsClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion())))
{
- ResultErrorBuilder errorBuilder =
ResultErrorBuilder.withCodeAndDescription(
- VerificationError.StandardCode.ILLEGAL_PARAMETER, "The
service is not supported in this region");
- return builder.error(errorBuilder.build()).build();
- }
- AwsBasicCredentials cred =
AwsBasicCredentials.create(configuration.getAccessKey(),
configuration.getSecretKey());
- KmsClientBuilder clientBuilder = KmsClient.builder();
- try (KmsClient client =
clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred))
- .region(Region.of(configuration.getRegion())).build()) {
- client.listKeys();
- }
- } catch (SdkClientException e) {
- ResultErrorBuilder errorBuilder
- =
ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION,
e.getMessage())
- .detail("aws_kms_exception_message",
e.getMessage())
-
.detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS,
e.getClass().getName())
-
.detail(VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE, e);
-
- builder.error(errorBuilder.build());
- } catch (Exception e) {
- builder.error(ResultErrorBuilder.withException(e).build());
- }
- return builder.build();
- }
-}
diff --git
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentVerifierExtensionTest.java
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentVerifierExtensionTest.java
deleted file mode 100644
index 873335fe730..00000000000
---
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSComponentVerifierExtensionTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.kms;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.Component;
-import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class KMSComponentVerifierExtensionTest extends CamelTestSupport {
-
- // *************************************************
- // Tests (parameters)
- // *************************************************
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
-
- @Test
- public void testParameters() {
- Component component = context().getComponent("aws2-kms");
-
- ComponentVerifierExtension verifier
- =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("secretKey", "l");
- parameters.put("accessKey", "k");
- parameters.put("region", "eu-west-1");
- parameters.put("label", "test");
- parameters.put("operation", KMS2Operations.listKeys);
-
- ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
-
- assertEquals(ComponentVerifierExtension.Result.Status.OK,
result.getStatus());
- }
-
- @Test
- public void testConnectivity() {
- Component component = context().getComponent("aws2-kms");
- ComponentVerifierExtension verifier
- =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("secretKey", "l");
- parameters.put("accessKey", "k");
- parameters.put("region", "US_EAST_1");
- parameters.put("label", "test");
- parameters.put("operation", KMS2Operations.listKeys);
-
- ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
-
- assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- }
-
- @Test
- public void testConnectivityAndRegion() {
- Component component = context().getComponent("aws2-kms");
- ComponentVerifierExtension verifier
- =
component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new);
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("secretKey", "l");
- parameters.put("accessKey", "k");
- parameters.put("region", "l");
- parameters.put("label", "test");
- parameters.put("operation", KMS2Operations.listKeys);
-
- ComponentVerifierExtension.Result result =
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
-
- assertEquals(ComponentVerifierExtension.Result.Status.ERROR,
result.getStatus());
- }
-}
