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 2021/03/15 10:37:35 UTC
[camel] branch master updated (1dcf310 -> 934e067)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1dcf310 CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - getSecret operation
new fd39c44 CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - listSecrets operation refactor
new a3969ab CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - listSecrets operation refactor
new 9e7d367 CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - getSecret operation refactor
new 934e067 CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - getSecret operation refactor
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../aws/secretsmanager/SecretsManagerProducer.java | 79 +++++++++-------------
1 file changed, 32 insertions(+), 47 deletions(-)
[camel] 02/04: CAMEL-16323 - Create a Camel-AWS-Secret-Manager
component - listSecrets operation refactor
Posted by ac...@apache.org.
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 a3969abf7af5e2bb8fbc7c48774a022a61f0bce5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 15 11:30:18 2021 +0100
CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - listSecrets operation refactor
---
.../aws/secretsmanager/SecretsManagerProducer.java | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
index 43dbd5b..eca6459 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
@@ -55,17 +55,17 @@ public class SecretsManagerProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
switch (determineOperation(exchange)) {
- case listSecrets:
- listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- case createSecret:
- createSecret(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- case getSecret:
- getSecret(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- default:
- throw new IllegalArgumentException("Unsupported operation");
+ case listSecrets:
+ listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ case createSecret:
+ createSecret(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ case getSecret:
+ getSecret(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported operation");
}
}
@@ -86,7 +86,7 @@ public class SecretsManagerProducer extends DefaultProducer {
public String toString() {
if (secretsManagerProducerToString == null) {
secretsManagerProducerToString = "SecretsManagerProducer["
- + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
+ + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
}
return secretsManagerProducerToString;
}
[camel] 04/04: CAMEL-16323 - Create a Camel-AWS-Secret-Manager
component - getSecret operation refactor
Posted by ac...@apache.org.
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 934e06747269ed3fc5332a00e65f46143417974c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 15 11:36:26 2021 +0100
CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - getSecret operation refactor
---
.../aws/secretsmanager/SecretsManagerProducer.java | 27 +++++++++++-----------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
index 40ab15e..7d0ebda 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
@@ -55,17 +55,17 @@ public class SecretsManagerProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
switch (determineOperation(exchange)) {
- case listSecrets:
- listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- case createSecret:
- createSecret(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- case getSecret:
- getSecret(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- default:
- throw new IllegalArgumentException("Unsupported operation");
+ case listSecrets:
+ listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ case createSecret:
+ createSecret(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ case getSecret:
+ getSecret(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported operation");
}
}
@@ -86,7 +86,7 @@ public class SecretsManagerProducer extends DefaultProducer {
public String toString() {
if (secretsManagerProducerToString == null) {
secretsManagerProducerToString = "SecretsManagerProducer["
- + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
+ + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
}
return secretsManagerProducerToString;
}
@@ -179,6 +179,7 @@ public class SecretsManagerProducer extends DefaultProducer {
} else {
throw new IllegalArgumentException("Secret Id must be specified");
}
+ request = builder.build();
}
try {
result = secretsManagerClient.getSecretValue(request);
@@ -194,8 +195,6 @@ public class SecretsManagerProducer extends DefaultProducer {
}
}
- }
-
public static Message getMessageForResponse(final Exchange exchange) {
return exchange.getMessage();
}
[camel] 03/04: CAMEL-16323 - Create a Camel-AWS-Secret-Manager
component - getSecret operation refactor
Posted by ac...@apache.org.
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 9e7d3672ef1ec36963fcc7b01d3589e9d191474e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 15 11:33:33 2021 +0100
CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - getSecret operation refactor
---
.../aws/secretsmanager/SecretsManagerProducer.java | 72 ++++++++++------------
1 file changed, 33 insertions(+), 39 deletions(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
index eca6459..40ab15e 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
@@ -55,17 +55,17 @@ public class SecretsManagerProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
switch (determineOperation(exchange)) {
- case listSecrets:
- listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- case createSecret:
- createSecret(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- case getSecret:
- getSecret(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- default:
- throw new IllegalArgumentException("Unsupported operation");
+ case listSecrets:
+ listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ case createSecret:
+ createSecret(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ case getSecret:
+ getSecret(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported operation");
}
}
@@ -86,7 +86,7 @@ public class SecretsManagerProducer extends DefaultProducer {
public String toString() {
if (secretsManagerProducerToString == null) {
secretsManagerProducerToString = "SecretsManagerProducer["
- + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
+ + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
}
return secretsManagerProducerToString;
}
@@ -164,42 +164,36 @@ public class SecretsManagerProducer extends DefaultProducer {
private void getSecret(SecretsManagerClient secretsManagerClient, Exchange exchange)
throws InvalidPayloadException {
+ GetSecretValueRequest request = null;
+ GetSecretValueResponse result;
if (getConfiguration().isPojoRequest()) {
Object payload = exchange.getIn().getMandatoryBody();
if (payload instanceof GetSecretValueRequest) {
- GetSecretValueResponse result;
- try {
- GetSecretValueRequest request = (GetSecretValueRequest) payload;
- result = secretsManagerClient.getSecretValue(request);
- } catch (AwsServiceException ase) {
- LOG.trace("Get Secret Value command returned the error code {}", ase.awsErrorDetails().errorCode());
- throw ase;
- }
- Message message = getMessageForResponse(exchange);
- message.setBody(result);
+ request = (GetSecretValueRequest) payload;
}
} else {
GetSecretValueRequest.Builder builder = GetSecretValueRequest.builder();
- GetSecretValueResponse result;
- try {
- if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(SecretsManagerConstants.SECRET_ID))) {
- String secretId = exchange.getIn().getHeader(SecretsManagerConstants.SECRET_ID, String.class);
- builder.secretId(secretId);
- } else {
- throw new IllegalArgumentException("Secret Id must be specified");
- }
- result = secretsManagerClient.getSecretValue(builder.build());
- } catch (AwsServiceException ase) {
- LOG.trace("Get Secret value command returned the error code {}", ase.awsErrorDetails().errorCode());
- throw ase;
- }
- Message message = getMessageForResponse(exchange);
- if (getConfiguration().isBinaryPayload()) {
- message.setBody(new String(Base64.getDecoder().decode(result.secretBinary().asByteBuffer()).array()));
+ if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(SecretsManagerConstants.SECRET_ID))) {
+ String secretId = exchange.getIn().getHeader(SecretsManagerConstants.SECRET_ID, String.class);
+ builder.secretId(secretId);
} else {
- message.setBody(result.secretString());
+ throw new IllegalArgumentException("Secret Id must be specified");
}
}
+ try {
+ result = secretsManagerClient.getSecretValue(request);
+ } catch (AwsServiceException ase) {
+ LOG.trace("Get Secret value command returned the error code {}", ase.awsErrorDetails().errorCode());
+ throw ase;
+ }
+ Message message = getMessageForResponse(exchange);
+ if (getConfiguration().isBinaryPayload()) {
+ message.setBody(new String(Base64.getDecoder().decode(result.secretBinary().asByteBuffer()).array()));
+ } else {
+ message.setBody(result.secretString());
+ }
+ }
+
}
public static Message getMessageForResponse(final Exchange exchange) {
[camel] 01/04: CAMEL-16323 - Create a Camel-AWS-Secret-Manager
component - listSecrets operation refactor
Posted by ac...@apache.org.
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 fd39c44868594ea14fbd919106fe5b28cc9d3028
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 15 11:29:07 2021 +0100
CAMEL-16323 - Create a Camel-AWS-Secret-Manager component - listSecrets operation refactor
---
.../aws/secretsmanager/SecretsManagerProducer.java | 56 ++++++++++------------
1 file changed, 24 insertions(+), 32 deletions(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
index 3bed29a..43dbd5b 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java
@@ -55,17 +55,17 @@ public class SecretsManagerProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
switch (determineOperation(exchange)) {
- case listSecrets:
- listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- case createSecret:
- createSecret(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- case getSecret:
- getSecret(getEndpoint().getSecretsManagerClient(), exchange);
- break;
- default:
- throw new IllegalArgumentException("Unsupported operation");
+ case listSecrets:
+ listSecrets(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ case createSecret:
+ createSecret(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ case getSecret:
+ getSecret(getEndpoint().getSecretsManagerClient(), exchange);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported operation");
}
}
@@ -86,7 +86,7 @@ public class SecretsManagerProducer extends DefaultProducer {
public String toString() {
if (secretsManagerProducerToString == null) {
secretsManagerProducerToString = "SecretsManagerProducer["
- + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
+ + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
}
return secretsManagerProducerToString;
}
@@ -98,19 +98,12 @@ public class SecretsManagerProducer extends DefaultProducer {
private void listSecrets(SecretsManagerClient secretsManagerClient, Exchange exchange)
throws InvalidPayloadException {
+ ListSecretsRequest request = null;
+ ListSecretsResponse result;
if (getConfiguration().isPojoRequest()) {
Object payload = exchange.getIn().getMandatoryBody();
if (payload instanceof ListSecretsRequest) {
- ListSecretsResponse result;
- try {
- ListSecretsRequest request = (ListSecretsRequest) payload;
- result = secretsManagerClient.listSecrets(request);
- } catch (AwsServiceException ase) {
- LOG.trace("List Secrets command returned the error code {}", ase.awsErrorDetails().errorCode());
- throw ase;
- }
- Message message = getMessageForResponse(exchange);
- message.setBody(result);
+ request = (ListSecretsRequest) payload;
}
} else {
Builder builder = ListSecretsRequest.builder();
@@ -118,17 +111,16 @@ public class SecretsManagerProducer extends DefaultProducer {
int maxRes = exchange.getIn().getHeader(SecretsManagerConstants.MAX_RESULTS, Integer.class);
builder.maxResults(maxRes);
}
- ListSecretsResponse result;
- try {
- ListSecretsRequest request = builder.build();
- result = secretsManagerClient.listSecrets(request);
- } catch (AwsServiceException ase) {
- LOG.trace("List Secrets command returned the error code {}", ase.awsErrorDetails().errorCode());
- throw ase;
- }
- Message message = getMessageForResponse(exchange);
- message.setBody(result);
+ request = builder.build();
}
+ try {
+ result = secretsManagerClient.listSecrets(request);
+ } catch (AwsServiceException ase) {
+ LOG.trace("List Secrets command returned the error code {}", ase.awsErrorDetails().errorCode());
+ throw ase;
+ }
+ Message message = getMessageForResponse(exchange);
+ message.setBody(result);
}
private void createSecret(SecretsManagerClient secretsManagerClient, Exchange exchange)