This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 9518a1bd93b Regen for commit dfcf9983c023c67e31db7abf99f31dcb1dcd61ac
(#7796)
9518a1bd93b is described below
commit 9518a1bd93b77e140629991d2f24edd9ceec0a45
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 15 21:19:31 2022 +0200
Regen for commit dfcf9983c023c67e31db7abf99f31dcb1dcd61ac (#7796)
Signed-off-by: GitHub <[email protected]>
Co-authored-by: orpiske <[email protected]>
---
.../apache/camel/catalog/components/hashicorp-vault.json | 2 +-
.../component/hashicorp/vault/HashicorpVaultProducer.java | 2 +-
.../operations/HashicorpProducerCreateSecretIT.java | 8 ++++----
.../operations/HashicorpProducerCreateSecretPOJOIT.java | 12 ++++++------
.../operations/HashicorpProducerDeleteSecretIT.java | 15 ++++++---------
5 files changed, 18 insertions(+), 21 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hashicorp-vault.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hashicorp-vault.json
index c622121c0ec..f86f89f016a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hashicorp-vault.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hashicorp-vault.json
@@ -33,7 +33,7 @@
"secretsEngine": { "kind": "path", "displayName": "Secrets Engine",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultConfiguration",
"configurationField": "configuration", "description": "Vault Name to be used" },
"host": { "kind": "parameter", "displayName": "Host", "group": "producer",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultConfiguration",
"configurationField": "configuration", "description": "Hashicorp Vault instance
host to be used" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during sta [...]
- "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultOperation", "enum": [
"createSecret", "getSecret" ], "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultConfiguration",
"configurationField": "configuration", "description": "Operation to [...]
+ "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultOperation", "enum": [
"createSecret", "getSecret", "deleteSecret" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultConfiguration",
"configurationField": "configuration", "description" [...]
"port": { "kind": "parameter", "displayName": "Port", "group": "producer",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "8200", "configurationClass":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultConfiguration",
"configurationField": "configuration", "description": "Hashicorp Vault instance
port to be used" },
"scheme": { "kind": "parameter", "displayName": "Scheme", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "https", "configurationClass":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultConfiguration",
"configurationField": "configuration", "description": "Hashicorp Vault instance
scheme to be used" },
"secretPath": { "kind": "parameter", "displayName": "Secret Path",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultConfiguration",
"configurationField": "configuration", "description": "Hashicorp Vault instance
secret Path to be used" },
diff --git
a/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
b/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
index a366f484b48..a880d9c3437 100644
---
a/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
+++
b/components/camel-hashicorp-vault/src/main/java/org/apache/camel/component/hashicorp/vault/HashicorpVaultProducer.java
@@ -86,7 +86,7 @@ public class HashicorpVaultProducer extends DefaultProducer {
private void deleteSecret(Exchange exchange) throws
InvalidPayloadException {
VaultKeyValueOperations keyValue
=
getEndpoint().getVaultTemplate().opsForKeyValue(getEndpoint().getConfiguration().getSecretsEngine(),
- VaultKeyValueOperationsSupport.KeyValueBackend.versioned());
+
VaultKeyValueOperationsSupport.KeyValueBackend.versioned());
keyValue.delete(getEndpoint().getConfiguration().getSecretPath());
}
diff --git
a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerCreateSecretIT.java
b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerCreateSecretIT.java
index c7c3fe31ede..47dbe07cb08 100644
---
a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerCreateSecretIT.java
+++
b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerCreateSecretIT.java
@@ -26,8 +26,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hashicorp.vault.HashicorpVaultConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -73,11 +71,13 @@ public class HashicorpProducerCreateSecretIT extends
HashicorpVaultBase {
@Override
public void configure() {
from("direct:createSecret")
-
.toF("hashicorp-vault://secret?operation=createSecret&token=RAW(%s)&host=%s&port=%s&scheme=http&secretPath=test",
service.token(), service.host(), service.port())
+
.toF("hashicorp-vault://secret?operation=createSecret&token=RAW(%s)&host=%s&port=%s&scheme=http&secretPath=test",
+ service.token(), service.host(),
service.port())
.to("mock:result-write");
from("direct:readSecret")
-
.toF("hashicorp-vault://secret?operation=getSecret&token=RAW(%s)&host=%s&port=%s&scheme=http",
service.token(), service.host(), service.port())
+
.toF("hashicorp-vault://secret?operation=getSecret&token=RAW(%s)&host=%s&port=%s&scheme=http",
+ service.token(), service.host(),
service.port())
.to("mock:result-read");
}
};
diff --git
a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerCreateSecretPOJOIT.java
b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerCreateSecretPOJOIT.java
index a2d2f0edf1a..06e20ade7f5 100644
---
a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerCreateSecretPOJOIT.java
+++
b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerCreateSecretPOJOIT.java
@@ -17,18 +17,16 @@
package org.apache.camel.component.hashicorp.vault.integration.operations;
+import java.util.Map;
+
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hashicorp.vault.HashicorpVaultConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import java.util.Map;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -74,10 +72,12 @@ public class HashicorpProducerCreateSecretPOJOIT extends
HashicorpVaultBase {
@Override
public void configure() {
from("direct:createSecret")
-
.toF("hashicorp-vault://secret?operation=createSecret&token=RAW(%s)&host=%s&port=%s&scheme=http&secretPath=test",
service.token(), service.host(), service.port())
+
.toF("hashicorp-vault://secret?operation=createSecret&token=RAW(%s)&host=%s&port=%s&scheme=http&secretPath=test",
+ service.token(), service.host(),
service.port())
.to("mock:result-write");
from("direct:readSecret")
-
.toF("hashicorp-vault://secret?operation=getSecret&token=RAW(%s)&host=%s&port=%s&scheme=http",
service.token(), service.host(), service.port())
+
.toF("hashicorp-vault://secret?operation=getSecret&token=RAW(%s)&host=%s&port=%s&scheme=http",
+ service.token(), service.host(),
service.port())
.to("mock:result-read");
}
};
diff --git
a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerDeleteSecretIT.java
b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerDeleteSecretIT.java
index 7d488d771b7..5c451724c75 100644
---
a/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerDeleteSecretIT.java
+++
b/components/camel-hashicorp-vault/src/test/java/org/apache/camel/component/hashicorp/vault/integration/operations/HashicorpProducerDeleteSecretIT.java
@@ -17,20 +17,15 @@
package org.apache.camel.component.hashicorp.vault.integration.operations;
+import java.util.HashMap;
+
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.hashicorp.vault.HashicorpVaultConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class HashicorpProducerDeleteSecretIT extends HashicorpVaultBase {
@EndpointInject("mock:result-write")
@@ -67,11 +62,13 @@ public class HashicorpProducerDeleteSecretIT extends
HashicorpVaultBase {
@Override
public void configure() {
from("direct:createSecret")
-
.toF("hashicorp-vault://secret?operation=createSecret&token=RAW(%s)&host=%s&port=%s&scheme=http&secretPath=test",
service.token(), service.host(), service.port())
+
.toF("hashicorp-vault://secret?operation=createSecret&token=RAW(%s)&host=%s&port=%s&scheme=http&secretPath=test",
+ service.token(), service.host(),
service.port())
.to("mock:result-write");
from("direct:deleteSecret")
-
.toF("hashicorp-vault://secret?operation=deleteSecret&token=RAW(%s)&host=%s&port=%s&scheme=http&secretPath=test",
service.token(), service.host(), service.port())
+
.toF("hashicorp-vault://secret?operation=deleteSecret&token=RAW(%s)&host=%s&port=%s&scheme=http&secretPath=test",
+ service.token(), service.host(),
service.port())
.to("mock:result-delete");
}
};
