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 2020/04/14 09:35:51 UTC
[camel] 06/10: CAMEL-14868 - Camel-AWS2-*: Where possible,
give the possiblity to the end user to pass an AWS Request pojo as
body, aws2-kms enable key
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 971c6919ddd197cc11aa238498b5299c4f301e2d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 14 11:15:11 2020 +0200
CAMEL-14868 - Camel-AWS2-*: Where possible, give the possiblity to the end user to pass an AWS Request pojo as body, aws2-kms enable key
---
.../apache/camel/component/aws2/kms/KMS2Producer.java | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
index 8bf4631..e768187 100644
--- a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
+++ b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
@@ -26,8 +26,6 @@ import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.services.ec2.model.RunInstancesRequest;
-import software.amazon.awssdk.services.ec2.model.RunInstancesResponse;
import software.amazon.awssdk.services.kms.KmsClient;
import software.amazon.awssdk.services.kms.model.CreateKeyRequest;
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
@@ -281,7 +279,21 @@ public class KMS2Producer extends DefaultProducer {
}
}
- private void enableKey(KmsClient kmsClient, Exchange exchange) {
+ private void enableKey(KmsClient kmsClient, Exchange exchange) throws InvalidPayloadException {
+ if (getConfiguration().isPojoRequest()) {
+ Object payload = exchange.getIn().getMandatoryBody();
+ if (payload instanceof EnableKeyRequest) {
+ EnableKeyResponse result;
+ try {
+ result = kmsClient.enableKey((EnableKeyRequest) payload);
+ } catch (AwsServiceException ase) {
+ LOG.trace("Enable Key command returned the error code {}", ase.awsErrorDetails().errorCode());
+ throw ase;
+ }
+ Message message = getMessageForResponse(exchange);
+ message.setBody(result);
+ }
+ } else {
EnableKeyRequest.Builder builder = EnableKeyRequest.builder();
if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.KEY_ID))) {
String keyId = exchange.getIn().getHeader(KMS2Constants.KEY_ID, String.class);
@@ -298,6 +310,7 @@ public class KMS2Producer extends DefaultProducer {
}
Message message = getMessageForResponse(exchange);
message.setBody(result);
+ }
}
public static Message getMessageForResponse(final Exchange exchange) {