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 c1f5ba3993c3b1a8f1cf3f8433d200eb6e8b4a22 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Wed Apr 22 12:10:26 2020 +0200 CAMEL-14868 - Camel-AWS2-*: Where possible, give the possiblity to the end user to pass an AWS Request pojo as body, aws2-iam operations --- .../camel/component/aws2/iam/IAM2Producer.java | 35 ++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/components/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Producer.java b/components/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Producer.java index ad1eab8..d7403b8 100644 --- a/components/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Producer.java +++ b/components/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Producer.java @@ -45,6 +45,7 @@ import software.amazon.awssdk.services.iam.model.GetUserRequest; import software.amazon.awssdk.services.iam.model.GetUserResponse; import software.amazon.awssdk.services.iam.model.ListAccessKeysRequest; import software.amazon.awssdk.services.iam.model.ListAccessKeysResponse; +import software.amazon.awssdk.services.iam.model.ListGroupsRequest; import software.amazon.awssdk.services.iam.model.ListGroupsResponse; import software.amazon.awssdk.services.iam.model.ListUsersRequest; import software.amazon.awssdk.services.iam.model.ListUsersResponse; @@ -481,7 +482,21 @@ public class IAM2Producer extends DefaultProducer { } } - private void listGroups(IamClient iamClient, Exchange exchange) { + private void listGroups(IamClient iamClient, Exchange exchange) throws InvalidPayloadException { + if (getConfiguration().isPojoRequest()) { + Object payload = exchange.getIn().getMandatoryBody(); + if (payload instanceof ListGroupsRequest) { + ListGroupsResponse result; + try { + result = iamClient.listGroups((ListGroupsRequest) payload); + } catch (AwsServiceException ase) { + LOG.trace("List Groups command returned the error code {}", ase.awsErrorDetails().errorCode()); + throw ase; + } + Message message = getMessageForResponse(exchange); + message.setBody(result); + } + } else { ListGroupsResponse result; try { result = iamClient.listGroups(); @@ -491,9 +506,24 @@ public class IAM2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); + } } - private void addUserToGroup(IamClient iamClient, Exchange exchange) { + private void addUserToGroup(IamClient iamClient, Exchange exchange) throws InvalidPayloadException { + if (getConfiguration().isPojoRequest()) { + Object payload = exchange.getIn().getMandatoryBody(); + if (payload instanceof AddUserToGroupRequest) { + AddUserToGroupResponse result; + try { + result = iamClient.addUserToGroup((AddUserToGroupRequest) payload); + } catch (AwsServiceException ase) { + LOG.trace("Add User To Group command returned the error code {}", ase.awsErrorDetails().errorCode()); + throw ase; + } + Message message = getMessageForResponse(exchange); + message.setBody(result); + } + } else { AddUserToGroupRequest.Builder builder = AddUserToGroupRequest.builder(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(IAM2Constants.GROUP_NAME))) { String groupName = exchange.getIn().getHeader(IAM2Constants.GROUP_NAME, String.class); @@ -516,6 +546,7 @@ public class IAM2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); + } } private void removeUserFromGroup(IamClient iamClient, Exchange exchange) {