[GitHub] [camel-quarkus] jamesnetherton opened a new issue #3682: [Camel 3.17.0] Bean introspection is broken
jamesnetherton opened a new issue #3682: URL: https://github.com/apache/camel-quarkus/issues/3682 I've not dug into the underlying cause, but various tests that use the `bean` extension are failing with `ClassCastException` & `AmbiguousMethodCallException`. Likely due to this change in `camel-bean` https://github.com/apache/camel/commit/bedd572232100a657a447415df7e3c5078648a16. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] SubhasmitaSw commented on pull request #3152: Example to show usage of prometheus trait
SubhasmitaSw commented on pull request #3152: URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1082710487 @tadayosi @oscerd the endpoints need not to be configured, right? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on a change in pull request #3153: fix: redirect ouput and errors to appropriate writer
astefanutti commented on a change in pull request #3153:
URL: https://github.com/apache/camel-k/pull/3153#discussion_r838185670
##
File path: e2e/support/test_support.go
##
@@ -1719,9 +1719,9 @@ func UserCleanup() {
command.Stderr = os.Stderr
command.Stdout = os.Stdout
if err := command.Run(); err != nil {
- fmt.Printf("An error occurred during user cleanup
command execution: %v\n", err)
+ fmt.Fprintf(command.Stderr, "An error occurred during
user cleanup command execution: %v\n", err)
Review comment:
Could be replaced with `Fprintln`.
##
File path: pkg/cmd/run_help.go
##
@@ -43,20 +44,20 @@ func hashFrom(contents ...[]byte) string {
return fmt.Sprintf("%x", hash.Sum(nil))
}
-func parseConfigAndGenCm(ctx context.Context, c client.Client, config
*resource.Config, integration *v1.Integration, enableCompression bool)
(*corev1.ConfigMap, error) {
+func parseConfigAndGenCm(ctx context.Context, cmd *cobra.Command, c
client.Client, config *resource.Config, integration *v1.Integration,
enableCompression bool) (*corev1.ConfigMap, error) {
switch config.StorageType() {
case resource.StorageTypeConfigmap:
cm := kubernetes.LookupConfigmap(ctx, c, integration.Namespace,
config.Name())
if cm == nil {
- fmt.Printf("Warn: %s Configmap not found in %s
namespace, make sure to provide it before the Integration can run\n",
+ fmt.Fprintf(cmd.ErrOrStderr(), "Warn: %s Configmap not
found in %s namespace, make sure to provide it before the Integration can
run\n",
config.Name(), integration.Namespace)
} else if config.ContentType() != resource.ContentTypeData &&
cm.BinaryData != nil {
return nil, fmt.Errorf("you cannot provide a binary
config, use a text file instead")
}
case resource.StorageTypeSecret:
secret := kubernetes.LookupSecret(ctx, c,
integration.Namespace, config.Name())
if secret == nil {
- fmt.Printf("Warn: %s Secret not found in %s namespace,
make sure to provide it before the Integration can run\n",
+ fmt.Fprintf(cmd.ErrOrStderr(), "Warn: %s Secret not
found in %s namespace, make sure to provide it before the Integration can
run\n",
Review comment:
Could be replaced with `Fprintln`.
##
File path: pkg/cmd/uninstall.go
##
@@ -209,71 +209,71 @@ func (o *uninstallCmdOptions)
uninstallClusterWideResources(ctx context.Context,
if !o.SkipClusterRoleBindings || o.UninstallAll {
if err := o.uninstallClusterRoleBindings(ctx, c); err != nil {
if k8serrors.IsForbidden(err) {
- return createActionNotAuthorizedError()
+ return createActionNotAuthorizedError(cmd)
}
return err
}
- fmt.Printf("Camel K Cluster Role Bindings removed from
cluster\n")
+ fmt.Fprintf(cmd.OutOrStdout(), "Camel K Cluster Role Bindings
removed from cluster\n")
}
if !o.SkipClusterRoles || o.UninstallAll {
if err := o.uninstallClusterRoles(ctx, c); err != nil {
if k8serrors.IsForbidden(err) {
- return createActionNotAuthorizedError()
+ return createActionNotAuthorizedError(cmd)
}
return err
}
- fmt.Printf("Camel K Cluster Roles removed from cluster\n")
+ fmt.Fprintf(cmd.OutOrStdout(), "Camel K Cluster Roles removed
from cluster\n")
}
return nil
}
-func (o *uninstallCmdOptions) uninstallNamespaceRoles(ctx context.Context, c
client.Client) error {
+func (o *uninstallCmdOptions) uninstallNamespaceRoles(cmd *cobra.Command, ctx
context.Context, c client.Client) error {
if !o.SkipRoleBindings {
if err := o.uninstallRoleBindings(ctx, c); err != nil {
return err
}
- fmt.Printf("Camel K Role Bindings removed from namespace %s\n",
o.Namespace)
+ fmt.Fprintf(cmd.OutOrStdout(), "Camel K Role Bindings removed
from namespace %s\n", o.Namespace)
}
if !o.SkipRoles {
if err := o.uninstallRoles(ctx, c); err != nil {
return err
}
- fmt.Printf("Camel K Roles removed from namespace %s\n",
o.Namespace)
+ fmt.Fprintf(cmd.OutOrStdout(), "Camel K Roles removed from
namespace %s\n", o.Namespace)
}
if !o.SkipServiceAccounts {
if err := o.uninstallServiceAccounts(ctx, c); err != nil {
[GitHub] [camel] orpiske merged pull request #7275: CAMEL-17802: remove the autoCommitOnStop because the consumer already auto-commits on the call to close
orpiske merged pull request #7275: URL: https://github.com/apache/camel/pull/7275 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on pull request #7275: CAMEL-17802: remove the autoCommitOnStop because the consumer already auto-commits on the call to close
orpiske commented on pull request #7275: URL: https://github.com/apache/camel/pull/7275#issuecomment-1082714491 Looking good. Let's merge. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (16fee69 -> 63009a9)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 16fee69 Sync deps
new f9a9f74 CAMEL-17802: remove the autoCommitOnStop because the consumer
already auto-commits on the call to close
new e121490 CAMEL-17802: make sure to unsubscribe before unlocking
new 63009a9 CAMEL-17802: rework the commit management
The 3 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:
.../org/apache/camel/catalog/components/kafka.json | 2 -
.../component/kafka/KafkaComponentConfigurer.java | 6 --
.../component/kafka/KafkaEndpointConfigurer.java | 6 --
.../component/kafka/KafkaEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/kafka/kafka.json| 2 -
.../camel/component/kafka/KafkaComponent.java | 2 +-
.../camel/component/kafka/KafkaConfiguration.java | 15 -
.../camel/component/kafka/KafkaFetchRecords.java | 4 +-
.../kafka/consumer/AbstractCommitManager.java | 4 ++
.../kafka/consumer/AsyncCommitManager.java | 4 ++
.../component/kafka/consumer/CommitManagers.java | 39 +++-
.../consumer/DefaultKafkaManualAsyncCommit.java| 2 +-
.../consumer/DefaultKafkaManualSyncCommit.java | 4 +-
.../kafka/consumer/NoopCommitManager.java | 6 +-
.../integration/BaseManualCommitTestSupport.java} | 70 ++---
.../KafkaConsumerManualAsyncCommitIT.java | 66
...T.java => KafkaConsumerManualNoopCommitIT.java} | 72 ++
.../KafkaConsumerManualSyncCommitIT.java | 66
.../dsl/KafkaComponentBuilderFactory.java | 20 --
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 19 --
20 files changed, 200 insertions(+), 212 deletions(-)
copy
components/{camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerManualCommitTest.java
=>
camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/BaseManualCommitTestSupport.java}
(56%)
create mode 100644
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerManualAsyncCommitIT.java
rename
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/{KafkaConsumerManualCommitIT.java
=> KafkaConsumerManualNoopCommitIT.java} (58%)
create mode 100644
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerManualSyncCommitIT.java
[camel] 02/03: CAMEL-17802: make sure to unsubscribe before unlocking
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e121490a274339c2fb1800699527e8e947c20b48
Author: Otavio Rodolfo Piske
AuthorDate: Tue Mar 29 14:23:55 2022 +0200
CAMEL-17802: make sure to unsubscribe before unlocking
---
.../main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
index d324766..11b1121 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
@@ -333,14 +333,14 @@ class KafkaFetchRecords implements Runnable {
handleAccordingToStrategy(partitionLastOffset, e);
} finally {
-lock.unlock();
-
// only close if not retry
if (!isRetrying()) {
LOG.debug("Closing consumer {}", threadId);
safeUnsubscribe();
IOHelper.close(consumer);
}
+
+lock.unlock();
}
}
[camel] 03/03: CAMEL-17802: rework the commit management
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 63009a92fb5d54e78d070d4b4d18bc07e2f70de6
Author: Otavio Rodolfo Piske
AuthorDate: Tue Mar 29 14:36:11 2022 +0200
CAMEL-17802: rework the commit management
Adjust the commit management code to account for the fact that Kafka
consumer will auto-commit on close.
Also aligns the commit factories to match the commit management policy of
their respective commit managers.
---
.../org/apache/camel/catalog/components/kafka.json | 2 -
.../component/kafka/KafkaEndpointUriFactory.java | 174 ++---
.../camel/component/kafka/KafkaComponent.java | 2 +-
.../camel/component/kafka/KafkaFetchRecords.java | 2 -
.../kafka/consumer/AbstractCommitManager.java | 4 +
.../kafka/consumer/AsyncCommitManager.java | 4 +
.../component/kafka/consumer/CommitManagers.java | 37 +++--
.../consumer/DefaultKafkaManualAsyncCommit.java| 2 +-
.../consumer/DefaultKafkaManualSyncCommit.java | 4 +-
.../kafka/consumer/NoopCommitManager.java | 6 +-
...mitIT.java => BaseManualCommitTestSupport.java} | 96 ++--
.../KafkaConsumerManualAsyncCommitIT.java | 66
...T.java => KafkaConsumerManualNoopCommitIT.java} | 72 +
.../KafkaConsumerManualSyncCommitIT.java | 66
.../dsl/KafkaComponentBuilderFactory.java | 20 ---
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 19 ---
16 files changed, 277 insertions(+), 299 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
index 8e567ff..f3ed143 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
@@ -32,7 +32,6 @@
"allowManualCommit": { "kind": "property", "displayName": "Allow Manual
Commit", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Whether to allow doing manual commits via
KafkaManualCommit. If this option is enabled then [...]
"autoCommitEnable": { "kind": "property", "displayName": "Auto Commit
Enable", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "If true, periodically commit to ZooKeeper the
offset of messages already fetched by the consum [...]
"autoCommitIntervalMs": { "kind": "property", "displayName": "Auto Commit
Interval Ms", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "5000",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The frequency in ms that
the consumer offsets are committed to zookeeper." },
-"autoCommitOnStop": { "kind": "property", "displayName": "Auto Commit On
Stop", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "sync", "async", "none" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"sync", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Whether to perform an explicit auto commit whe
[...]
"autoOffsetReset": { "kind": "property", "displayName": "Auto Offset
Reset", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "latest", "earliest",
"none" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "latest", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "What to do when there is no initial offset
[...]
"breakOnFirstError": { "kind": "property", "displayName": "Break On First
Error", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationF
[camel] 01/03: CAMEL-17802: remove the autoCommitOnStop because the consumer already auto-commits on the call to close
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit f9a9f749fea55c244745da6d4f7e191f47299a85 Author: Otavio Rodolfo Piske AuthorDate: Mon Mar 28 12:27:52 2022 +0200 CAMEL-17802: remove the autoCommitOnStop because the consumer already auto-commits on the call to close --- .../component/kafka/KafkaComponentConfigurer.java | 6 - .../component/kafka/KafkaEndpointConfigurer.java | 6 - .../component/kafka/KafkaEndpointUriFactory.java | 177 ++--- .../org/apache/camel/component/kafka/kafka.json| 2 - .../camel/component/kafka/KafkaConfiguration.java | 15 -- .../camel/component/kafka/KafkaFetchRecords.java | 2 + .../component/kafka/consumer/CommitManagers.java | 8 +- 7 files changed, 91 insertions(+), 125 deletions(-) diff --git a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaComponentConfigurer.java b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaComponentConfigurer.java index 8138ecd..0ac2077 100644 --- a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaComponentConfigurer.java +++ b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaComponentConfigurer.java @@ -36,8 +36,6 @@ public class KafkaComponentConfigurer extends PropertyConfigurerSupport implemen case "autoCommitEnable": getOrCreateConfiguration(target).setAutoCommitEnable(property(camelContext, boolean.class, value)); return true; case "autocommitintervalms": case "autoCommitIntervalMs": getOrCreateConfiguration(target).setAutoCommitIntervalMs(property(camelContext, java.lang.Integer.class, value)); return true; -case "autocommitonstop": -case "autoCommitOnStop": getOrCreateConfiguration(target).setAutoCommitOnStop(property(camelContext, java.lang.String.class, value)); return true; case "autooffsetreset": case "autoOffsetReset": getOrCreateConfiguration(target).setAutoOffsetReset(property(camelContext, java.lang.String.class, value)); return true; case "autowiredenabled": @@ -256,8 +254,6 @@ public class KafkaComponentConfigurer extends PropertyConfigurerSupport implemen case "autoCommitEnable": return boolean.class; case "autocommitintervalms": case "autoCommitIntervalMs": return java.lang.Integer.class; -case "autocommitonstop": -case "autoCommitOnStop": return java.lang.String.class; case "autooffsetreset": case "autoOffsetReset": return java.lang.String.class; case "autowiredenabled": @@ -472,8 +468,6 @@ public class KafkaComponentConfigurer extends PropertyConfigurerSupport implemen case "autoCommitEnable": return getOrCreateConfiguration(target).isAutoCommitEnable(); case "autocommitintervalms": case "autoCommitIntervalMs": return getOrCreateConfiguration(target).getAutoCommitIntervalMs(); -case "autocommitonstop": -case "autoCommitOnStop": return getOrCreateConfiguration(target).getAutoCommitOnStop(); case "autooffsetreset": case "autoOffsetReset": return getOrCreateConfiguration(target).getAutoOffsetReset(); case "autowiredenabled": diff --git a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointConfigurer.java b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointConfigurer.java index 2ee0b05..b36f1d0 100644 --- a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointConfigurer.java +++ b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointConfigurer.java @@ -29,8 +29,6 @@ public class KafkaEndpointConfigurer extends PropertyConfigurerSupport implement case "autoCommitEnable": target.getConfiguration().setAutoCommitEnable(property(camelContext, boolean.class, value)); return true; case "autocommitintervalms": case "autoCommitIntervalMs": target.getConfiguration().setAutoCommitIntervalMs(property(camelContext, java.lang.Integer.class, value)); return true; -case "autocommitonstop": -case "autoCommitOnStop": target.getConfiguration().setAutoCommitOnStop(property(camelContext, java.lang.String.class, value)); return true; case "autooffsetreset": case "autoOffsetReset": target.getConfiguration().setAutoOffsetReset(property(camelContext, java.lang.String.class, value)); return true; case "breakonfirsterror": @@ -233,8 +231,6 @@ public class KafkaEndpointConfigurer extends PropertyConfigurerSupport implement case "autoCommitEnable": return boolean.class; case "autocommitintervalms": case "autoCommitIntervalMs": return java.lang.Integer.class; -case "autocommitons
[GitHub] [camel-k] KuthumiPepple commented on a change in pull request #3153: fix: redirect ouput and errors to appropriate writer
KuthumiPepple commented on a change in pull request #3153:
URL: https://github.com/apache/camel-k/pull/3153#discussion_r838199598
##
File path: e2e/support/test_support.go
##
@@ -1719,9 +1719,9 @@ func UserCleanup() {
command.Stderr = os.Stderr
command.Stdout = os.Stdout
if err := command.Run(); err != nil {
- fmt.Printf("An error occurred during user cleanup
command execution: %v\n", err)
+ fmt.Fprintf(command.Stderr, "An error occurred during
user cleanup command execution: %v\n", err)
Review comment:
Ok. I'd make the change
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] KuthumiPepple commented on a change in pull request #3153: fix: redirect ouput and errors to appropriate writer
KuthumiPepple commented on a change in pull request #3153:
URL: https://github.com/apache/camel-k/pull/3153#discussion_r838201570
##
File path: e2e/support/test_support.go
##
@@ -1719,9 +1719,9 @@ func UserCleanup() {
command.Stderr = os.Stderr
command.Stdout = os.Stdout
if err := command.Run(); err != nil {
- fmt.Printf("An error occurred during user cleanup
command execution: %v\n", err)
+ fmt.Fprintf(command.Stderr, "An error occurred during
user cleanup command execution: %v\n", err)
Review comment:
Yes that makes sense. I'd use the test logger
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel-quarkus] branch camel-main updated (ccb3d54 -> 4bba5fa)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard ccb3d54 Upgrade Camel to 3.17.0 add 2f6575a Create Camel Google Secret Manager Extension add 23e772c Create Camel Google Secret Manager Extension add fcc7015 Create Camel Google Secret Manager Extension add df40b59 Create Camel Google Secret Manager Extension add 18079c3 Create Camel Google Secret Manager Extension add 8b5ea74 Create Camel Google Secret Manager Extension add 9e6c99a paho: fix NullPointerException when MqqtException occurs during reconnect attempt in native mode #3671 add 02ef934 Attempt to fix website build. add de31dec Attempt to fix website build. add ec28e15 Better control what we manage in our BOM #3302 add ef15c62 Updated CHANGELOG.md add 939ada9 Ban javax.validation in favor of jakarta.validation #3504 add 6ed6688 Ban junit 4 #3354 add 5c2b738 Fixup Create Camel Google Secret Manager Extension add 9cfd616 Attempt to fix website build. Again add df8c59c Attempt to fix website build. Again add 9e1eb0c Revert "Attempt to fix website build. Again" add 6ea1e28 Ban the same JBoss spec artifacts like Quarkus add 3f070fe Ban javax.activation:javax.activation-api add d95e985 Ban javax.annotation:javax.annotation-api add f625e34 Update antora.yml to point at 3.16.x branches add 9dbce6a Ban javax.inject:javax.inject add c2d5927 Ban javax.json:javax.json-api add 5880c2e Ban javax.json.bind:javax.json.bind-api add 3ddc2cd Ban org.glassfish:javax.json add 3889a2b Ban org.glassfish:javax.el add 17ab865 Ban javax.persistence:javax.persistence-api and javax.persistence:persistence-api add 12ee5c4 Ban javax.security.enterprise:javax.security.enterprise-api add a701ce7 Ban javax.xml.bind:jaxb-api add 47fc9b0 Ban javax.websocket:javax.websocket-api add 202c9ab Ban javax.ws.rs:javax.ws.rs-api add e881e6f Ban jakarta.activation:jakarta.activation-api in favor of com.sun.activation:jakarta.activation add 561b425 Ban org.jboss.logging:jboss-logmanager-jdk and org.jboss.logging:jboss-logmanager add 701fa13 Ban javax.enterprise:cdi-api add 2fea1ee Ban jakarta.json-api in favor of org.glassfish:jakarta.json add e08002a Ban various logging backends add 80642ad paho: Add test coverage for file persistence #3680 add 8ebe489 Improve MicroProfile Fault Tolerance extension test coverage add 34b1aa7 Updated CHANGELOG.md new 4bba5fa Upgrade Camel to 3.17.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ccb3d54) \ N -- N -- N refs/heads/camel-main (4bba5fa) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: CHANGELOG.md |22 + catalog/pom.xml|13 + docs/antora.yml| 6 +- .../examples/components/google-secret-manager.yml |13 + docs/modules/ROOT/nav.adoc | 1 + ...-servicebus.adoc => google-secret-manager.adoc} |12 +- .../ROOT/pages/reference/extensions/http.adoc |11 - extensions-jvm/bonita/runtime/pom.xml |10 - extensions-jvm/cometd/runtime/pom.xml | 6 - .../google-secret-manager/deployment/pom.xml |14 +- .../deployment/GoogleSecretManagerProcessor.java} | 8 +- .../google-secret-manager/pom.xml | 8 +- .../google-secret-manager/runtime/pom.xml |24 +- .../main/resources/META-INF/quarkus-extension.yaml | 6 +- extensions-jvm/hdfs/runtime/pom.xml|10 - extensions-jvm/pom.xml | 1 + extensions-jvm/pulsar/runtime/pom.xml | 6 - extensions-jvm/spark/bom/pom.xml |28 + extensions-jvm/wordpress/runtime/pom.xml |10 - extensions-support/aws2/runtime/pom.xml| 6 - .../deployment/pom.xml |16 +- extensi
[GitHub] [camel-k] astefanutti commented on pull request #3152: Example to show usage of prometheus trait
astefanutti commented on pull request #3152: URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1082730262 @SubhasmitaSw you can find some typical examples here: * https://github.com/apache/camel-k/blame/main/docs/modules/traits/pages/affinity.adoc#L57 * https://github.com/apache/camel-k/blame/main/docs/modules/traits/pages/route.adoc#L108 The sections marked as auto-generated can be updated by running `make generate-doc`, which probably does not currently work on Windows, but that should not prevent you from editing the files. For the Prometheus trait, the metrics endpoint is configured by the trait, so the idea is more to illustrate the purpose of the trait options, like for the `pod-monitor` option, mentioning that it can be used for the Integration Pod(s) to expose a metrics endpoint, even if the Prometheus operator API is not installed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17863: camel-main - Is loading routes from directory twice due to early modeline detection
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 7017aab CAMEL-17863: camel-main - Is loading routes from directory
twice due to early modeline detection
7017aab is described below
commit 7017aab1e9d4dd1b2b2dfa9678948fc2a6dd936e
Author: Claus Ibsen
AuthorDate: Wed Mar 30 09:39:30 2022 +0200
CAMEL-17863: camel-main - Is loading routes from directory twice due to
early modeline detection
---
.../apache/camel/main/DefaultRoutesCollector.java | 58 +-
.../org/apache/camel/main/RoutesCollector.java | 12 +
.../org/apache/camel/main/RoutesConfigurer.java| 40 ++-
3 files changed, 61 insertions(+), 49 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
index 4035e30..e1d1c4a 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultRoutesCollector.java
@@ -135,33 +135,11 @@ public class DefaultRoutesCollector implements
RoutesCollector {
String includePattern) {
final ExtendedCamelContext ecc =
camelContext.adapt(ExtendedCamelContext.class);
-final PackageScanResourceResolver resolver =
ecc.getPackageScanResourceResolver();
final List answer = new ArrayList<>();
final String[] includes = includePattern != null ?
includePattern.split(",") : null;
-final String[] excludes = excludePattern != null ?
excludePattern.split(",") : null;
-
-if (includes == null || ObjectHelper.equal("false", includePattern)) {
-log.debug("Include pattern is empty/false, no routes will be
discovered from resources");
-return answer;
-}
StopWatch watch = new StopWatch();
-Collection accepted = new ArrayList<>();
-for (String include : includes) {
-log.debug("Loading additional RoutesBuilder from: {}", include);
-try {
-for (Resource resource : resolver.findResources(include)) {
-// filter unwanted resources
-if (!"false".equals(excludePattern) &&
AntPathMatcher.INSTANCE.anyMatch(excludes, resource.getLocation())) {
-continue;
-}
-accepted.add(resource);
-}
-} catch (Exception e) {
-throw RuntimeCamelException.wrapRuntimeException(e);
-}
-}
-
+Collection accepted =
findRouteResourcesFromDirectory(camelContext, excludePattern, includePattern);
try {
Collection builders =
ecc.getRoutesLoader().findRoutesBuilders(accepted);
if (!builders.isEmpty()) {
@@ -183,4 +161,38 @@ public class DefaultRoutesCollector implements
RoutesCollector {
return answer;
}
+
+@Override
+public Collection findRouteResourcesFromDirectory(
+CamelContext camelContext,
+String excludePattern,
+String includePattern) {
+final ExtendedCamelContext ecc =
camelContext.adapt(ExtendedCamelContext.class);
+final PackageScanResourceResolver resolver =
ecc.getPackageScanResourceResolver();
+final String[] includes = includePattern != null ?
includePattern.split(",") : null;
+final String[] excludes = excludePattern != null ?
excludePattern.split(",") : null;
+
+if (includes == null || ObjectHelper.equal("false", includePattern)) {
+log.debug("Include pattern is empty/false, no routes will be
discovered from resources");
+return new ArrayList<>();
+}
+
+Collection accepted = new ArrayList<>();
+for (String include : includes) {
+log.debug("Finding additional routes from: {}", include);
+try {
+for (Resource resource : resolver.findResources(include)) {
+// filter unwanted resources
+if (!"false".equals(excludePattern) &&
AntPathMatcher.INSTANCE.anyMatch(excludes, resource.getLocation())) {
+continue;
+}
+accepted.add(resource);
+}
+} catch (Exception e) {
+throw RuntimeCamelException.wrapRuntimeException(e);
+}
+}
+
+return accepted;
+}
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/RoutesCollector.java
b/core/camel-main/src/main/java/org/apache/camel/main/RoutesCollector.java
index 3d20e97..e7954d6 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RoutesCollector.java
+++ b/core/camel-main/src/main/java/org/
[GitHub] [camel-website] davsclaus commented on pull request #814: Remove old releases from doc
davsclaus commented on pull request #814: URL: https://github.com/apache/camel-website/pull/814#issuecomment-1082737559 ``` ➤ YN: [build:antora ] [build:antora-perf] [07:06:25.827] ERROR (asciidoctor): target of xref not found: languages:yaml.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/troubleshooting/debugging.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-k.git (refname: release-1.6.x, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:30.233] ERROR (asciidoctor): target of xref not found: 3.15.x@components:ROOT:index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kamelets.git (refname: 0.7.x, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:30.660] ERROR (asciidoctor): target of xref not found: 3.15.x@components::index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kamelets.git (refname: main, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:30.662] ERROR (asciidoctor): target of xref not found: 3.15.x@components:ROOT:index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kamelets.git (refname: main, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:47.502] ERROR (asciidoctor): target of xref not found: 0.6.x@camel-kamelets:ROOT:index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kafka-connector.git (refname: camel-kafka-connector-0.11.x, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:47.504] ERROR (asciidoctor): target of xref not found: 0.6.x@camel-kamelets:ROOT:index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kafka-connector.git (refname: camel-kafka-connector-0.11.x, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:48.418] ERROR (asciidoctor): target of xref not found: 0.6.x@camel-kamelets::index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kafka-connector.git (refname: camel-kafka-connector-1.0.x, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:48.420] ERROR (asciidoctor): target of xref not found: 0.6.x@camel-kamelets:ROOT:index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kafka-connector.git (refname: camel-kafka-connector-1.0.x, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:48.422] ERROR (asciidoctor): target of xref not found: 0.6.x@camel-kamelets:ROOT:index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kafka-connector.git (refname: camel-kafka-connector-1.0.x, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:49.153] ERROR (asciidoctor): target of xref not found: 0.6.x@camel-kamelets::index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kafka-connector.git (refname: main, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:49.156] ERROR (asciidoctor): target of xref not found: 0.6.x@camel-kamelets:ROOT:index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kafka-connector.git (refname: main, start path: docs) ➤ YN: [build:antora ] [build:antora-perf] [07:06:49.157] ERROR (asciidoctor): target of xref not found: 0.6.x@camel-kamelets:ROOT:index.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/index.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-kafka-connector.git (refname: main, start path: docs) ➤ YN: [build:antora ] ERROR: "build:an
[camel] branch main updated: Camel 3.17 upgrade guide.
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 899141b Camel 3.17 upgrade guide. 899141b is described below commit 899141b78c41a7f76e0343cfb54882ee79feb652 Author: Claus Ibsen AuthorDate: Wed Mar 30 09:47:36 2022 +0200 Camel 3.17 upgrade guide. --- .../modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc | 11 +++ .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc| 1 + 2 files changed, 12 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc new file mode 100644 index 000..21fd603 --- /dev/null +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc @@ -0,0 +1,11 @@ += Apache Camel 3.x Upgrade Guide + +This document is for helping you upgrade your Apache Camel application +from Camel 3.x to 3.y. For example if you are upgrading Camel 3.0 to 3.2, then you should follow the guides +from both 3.0 to 3.1 and 3.1 to 3.2. + +== Upgrading Camel 3.16 to 3.17 + +=== camel-main + +Added method `findRouteResourcesFromDirectory` to `org.apache.camel.main.RoutesCollector`. diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc index 945f0a2..a81f714 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc @@ -25,3 +25,4 @@ You can find upgrade guide for each release in the following pages: - xref:camel-3x-upgrade-guide-3_14.adoc[Upgrade guide 3.13 -> 3.14] - xref:camel-3x-upgrade-guide-3_15.adoc[Upgrade guide 3.14 -> 3.15] - xref:camel-3x-upgrade-guide-3_16.adoc[Upgrade guide 3.15 -> 3.16] +- xref:camel-3x-upgrade-guide-3_17.adoc[Upgrade guide 3.16 -> 3.17]
[GitHub] [camel] orpiske opened a new pull request #7295: CAMEL-17802: added migration documentation
orpiske opened a new pull request #7295: URL: https://github.com/apache/camel/pull/7295 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch cleanup-old-releases updated (5efaa45 -> bd1f9c1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch cleanup-old-releases in repository https://gitbox.apache.org/repos/asf/camel-website.git. from 5efaa45 Remove old releases from doc add bd1f9c1 Remove old releases from doc No new revisions were added by this update. Summary of changes: antora-playbook-snippets/antora-playbook.yml | 7 +++ 1 file changed, 7 insertions(+)
[GitHub] [camel-kamelets] davsclaus commented on issue #791: Camel 3.16 - Update kamelets to model changes
davsclaus commented on issue #791: URL: https://github.com/apache/camel-kamelets/issues/791#issuecomment-1082762101 So looked at this and our kamelets is not affected by the model changes. So we can upgrade to camel 3.16.0 on main branch -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] Delawen commented on pull request #862: feature(salesforce-sink): Add, update, and delete salesforce sink
Delawen commented on pull request #862: URL: https://github.com/apache/camel-kamelets/pull/862#issuecomment-1082770310 The failed test is not related to this PR... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] davsclaus commented on pull request #814: Remove old releases from doc
davsclaus commented on pull request #814: URL: https://github.com/apache/camel-website/pull/814#issuecomment-1082770691 ``` ➤ YN: [build:antora ] [build:antora-perf] [08:13:19.213] ERROR (asciidoctor): target of xref not found: languages:yaml.adoc ➤ YN: [build:antora ] [build:antora-perf] file: docs/modules/ROOT/pages/troubleshooting/debugging.adoc ➤ YN: [build:antora ] [build:antora-perf] source: https://github.com/apache/camel-k.git (refname: release-1.6.x, start path: docs) ➤ YN: [build:antora ] ERROR: "build:antora-perf" exited with 1. ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-1.6.x updated: Fix broken xref
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch release-1.6.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.6.x by this push: new 134a9f6 Fix broken xref 134a9f6 is described below commit 134a9f69dccf6106573b1e778eb1c42843209e3f Author: Claus Ibsen AuthorDate: Wed Mar 30 10:20:19 2022 +0200 Fix broken xref --- docs/modules/ROOT/pages/troubleshooting/debugging.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc index 1ff6903..0b06d75 100644 --- a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc +++ b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc @@ -59,6 +59,6 @@ When the debugging session is done, hitting kbd:[Ctrl+c] on the terminal where t As we've seen in the previous section, all `Integration` created in Camel K are finally bundled as a Java application, hence, the possibility to debug via JVM debugger. Any `Kamelet` you will be using directly in your `Route` definition or in a `KameletBinding` is automatically converted in a `yaml` route and injected in the Camel Context to be executed. That means that you cannot directly debug a `Kamelet` as you would do with a Java or any other JVM language `Route`. -However, you can troubleshoot individually each `Kamelet` definition by focusing on the specification xref:kamelets/kamelets-user.adoc#_flow[`Flow`]. As an example, you can create a simple xref:languages:yaml.adoc[`yaml`] test `Route` substituting the `kamelet:source` or `kamelet:sink` with any mock endpoint that can help you debugging the single `Kamelet` flow. Even using a `timer` and a `log` component may be enough for a basic check. +However, you can troubleshoot individually each `Kamelet` definition by focusing on the specification xref:kamelets/kamelets-user.adoc#_flow[`Flow`]. As an example, you can create a simple `yaml` test `Route` substituting the `kamelet:source` or `kamelet:sink` with any mock endpoint that can help you debugging the single `Kamelet` flow. Even using a `timer` and a `log` component may be enough for a basic check. NOTE: the same idea applies for a `KameletBinding` which translates to an `Integration` type under the hood. If you need to debug a `KameletBinding` just apply the same troubleshooting technique you would apply on an `Integration`.
[camel-k] branch main updated: Fix broken xref
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-k.git The following commit(s) were added to refs/heads/main by this push: new cd18311 Fix broken xref cd18311 is described below commit cd1831146a92844fd876cc55df73fe2c9488fafa Author: Claus Ibsen AuthorDate: Wed Mar 30 10:20:19 2022 +0200 Fix broken xref --- docs/modules/ROOT/pages/troubleshooting/debugging.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc index 1ff6903..0b06d75 100644 --- a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc +++ b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc @@ -59,6 +59,6 @@ When the debugging session is done, hitting kbd:[Ctrl+c] on the terminal where t As we've seen in the previous section, all `Integration` created in Camel K are finally bundled as a Java application, hence, the possibility to debug via JVM debugger. Any `Kamelet` you will be using directly in your `Route` definition or in a `KameletBinding` is automatically converted in a `yaml` route and injected in the Camel Context to be executed. That means that you cannot directly debug a `Kamelet` as you would do with a Java or any other JVM language `Route`. -However, you can troubleshoot individually each `Kamelet` definition by focusing on the specification xref:kamelets/kamelets-user.adoc#_flow[`Flow`]. As an example, you can create a simple xref:languages:yaml.adoc[`yaml`] test `Route` substituting the `kamelet:source` or `kamelet:sink` with any mock endpoint that can help you debugging the single `Kamelet` flow. Even using a `timer` and a `log` component may be enough for a basic check. +However, you can troubleshoot individually each `Kamelet` definition by focusing on the specification xref:kamelets/kamelets-user.adoc#_flow[`Flow`]. As an example, you can create a simple `yaml` test `Route` substituting the `kamelet:source` or `kamelet:sink` with any mock endpoint that can help you debugging the single `Kamelet` flow. Even using a `timer` and a `log` component may be enough for a basic check. NOTE: the same idea applies for a `KameletBinding` which translates to an `Integration` type under the hood. If you need to debug a `KameletBinding` just apply the same troubleshooting technique you would apply on an `Integration`.
[camel] branch regen_bot updated (16fee69 -> 63009a9)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 16fee69 Sync deps
add f9a9f74 CAMEL-17802: remove the autoCommitOnStop because the consumer
already auto-commits on the call to close
add e121490 CAMEL-17802: make sure to unsubscribe before unlocking
add 63009a9 CAMEL-17802: rework the commit management
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/components/kafka.json | 2 -
.../component/kafka/KafkaComponentConfigurer.java | 6 --
.../component/kafka/KafkaEndpointConfigurer.java | 6 --
.../component/kafka/KafkaEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/kafka/kafka.json| 2 -
.../camel/component/kafka/KafkaComponent.java | 2 +-
.../camel/component/kafka/KafkaConfiguration.java | 15 -
.../camel/component/kafka/KafkaFetchRecords.java | 4 +-
.../kafka/consumer/AbstractCommitManager.java | 4 ++
.../kafka/consumer/AsyncCommitManager.java | 4 ++
.../component/kafka/consumer/CommitManagers.java | 39 +++-
.../consumer/DefaultKafkaManualAsyncCommit.java| 2 +-
.../consumer/DefaultKafkaManualSyncCommit.java | 4 +-
.../kafka/consumer/NoopCommitManager.java | 6 +-
.../integration/BaseManualCommitTestSupport.java} | 70 ++---
.../KafkaConsumerManualAsyncCommitIT.java | 66
...T.java => KafkaConsumerManualNoopCommitIT.java} | 72 ++
.../KafkaConsumerManualSyncCommitIT.java | 66
.../dsl/KafkaComponentBuilderFactory.java | 20 --
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 19 --
20 files changed, 200 insertions(+), 212 deletions(-)
copy
components/{camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/test/java/org/apache/camel/component/vertx/kafka/VertxKafkaConsumerManualCommitTest.java
=>
camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/BaseManualCommitTestSupport.java}
(56%)
create mode 100644
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerManualAsyncCommitIT.java
rename
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/{KafkaConsumerManualCommitIT.java
=> KafkaConsumerManualNoopCommitIT.java} (58%)
create mode 100644
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerManualSyncCommitIT.java
[GitHub] [camel] SijmenHuizenga opened a new pull request #7296: camel-email - Add more header samples in docs
SijmenHuizenga opened a new pull request #7296: URL: https://github.com/apache/camel/pull/7296 Adding samples on how to set `cc`, `bcc` and `reply-to` headers for sending emails. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Kafka Oauth test bump Keycloak container version to 16.1.1 & leverage Strimzi dev services container Fixes #3531
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 4875c67 Kafka Oauth test bump Keycloak container version to 16.1.1 &
leverage Strimzi dev services container Fixes #3531
4875c67 is described below
commit 4875c67832235f0ce2c2ad9b014788b413b71b3f
Author: Zineb Bendhiba
AuthorDate: Mon Mar 14 15:12:04 2022 +0100
Kafka Oauth test bump Keycloak container version to 16.1.1 & leverage
Strimzi dev services container
Fixes #3531
---
integration-tests/kafka-oauth/pom.xml | 2 +-
.../kafka/oauth/it/KafkaKeycloakTestResource.java | 22 ++--
.../kafka/oauth/it/container/KafkaContainer.java | 112 -
.../oauth/it/container/KeycloakContainer.java | 25 +
.../src/test/resources/certificates/README.md | 48 -
.../test/resources/certificates/ca-truststore.p12 | Bin 1639 -> 0 bytes
.../src/test/resources/certificates/gen-ca.sh | 31 --
.../resources/certificates/gen-keycloak-certs.sh | 31 --
.../certificates/keycloak.server.keystore.p12 | Bin 5565 -> 0 bytes
.../resources/keycloak/scripts/keycloak-ssl.cli| 20
10 files changed, 19 insertions(+), 272 deletions(-)
diff --git a/integration-tests/kafka-oauth/pom.xml
b/integration-tests/kafka-oauth/pom.xml
index 888e2c1..2bfee7f 100644
--- a/integration-tests/kafka-oauth/pom.xml
+++ b/integration-tests/kafka-oauth/pom.xml
@@ -49,7 +49,7 @@
io.quarkus
-quarkus-resteasy-jackson
+quarkus-resteasy
io.strimzi
diff --git
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
index 549ddb7..5124891 100644
---
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
+++
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
@@ -20,9 +20,12 @@ import java.util.HashMap;
import java.util.Map;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-import org.apache.camel.quarkus.kafka.oauth.it.container.KafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
import org.apache.camel.quarkus.kafka.oauth.it.container.KeycloakContainer;
import org.jboss.logging.Logger;
+import org.testcontainers.utility.MountableFile;
+
+import static io.strimzi.test.container.StrimziKafkaContainer.KAFKA_PORT;
/**
* Inspired from
https://github.com/quarkusio/quarkus/tree/main/integration-tests/kafka-oauth-keycloak/
@@ -30,12 +33,11 @@ import org.jboss.logging.Logger;
public class KafkaKeycloakTestResource implements
QuarkusTestResourceLifecycleManager {
private static final Logger log =
Logger.getLogger(KafkaKeycloakTestResource.class);
-private KafkaContainer kafka;
+private StrimziKafkaContainer kafka;
private KeycloakContainer keycloak;
@Override
public Map start() {
-
Map properties = new HashMap<>();
//Start keycloak container
@@ -45,10 +47,16 @@ public class KafkaKeycloakTestResource implements
QuarkusTestResourceLifecycleMa
keycloak.createHostsFile();
//Start kafka container
-kafka = new KafkaContainer();
-kafka.start();
-log.info(kafka.getLogs());
-properties.put("kafka.bootstrap.servers", kafka.getBootstrapServers());
+this.kafka = new
StrimziKafkaContainer("quay.io/strimzi/kafka:latest-kafka-3.0.0")
+.withBrokerId(1)
+
.withKafkaConfigurationMap(Map.of("listener.security.protocol.map",
"JWT:SASL_PLAINTEXT,BROKER1:PLAINTEXT"))
+.withNetworkAliases("kafka")
+
.withServerProperties(MountableFile.forClasspathResource("kafkaServer.properties"))
+.withBootstrapServers(
+c -> String.format("JWT://%s:%s",
c.getContainerIpAddress(), c.getMappedPort(KAFKA_PORT)));
+this.kafka.start();
+log.info(this.kafka.getLogs());
+properties.put("kafka.bootstrap.servers",
this.kafka.getBootstrapServers());
properties.put("camel.component.kafka.brokers",
kafka.getBootstrapServers());
return properties;
diff --git
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
deleted file mode 100644
index e95e062..000
---
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
+
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3619: Kafka Oauth test bump Keycloak container version to 16.1.1 & leverage…
jamesnetherton merged pull request #3619: URL: https://github.com/apache/camel-quarkus/pull/3619 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton closed issue #3531: [Quarkus 2.8.0] Leverage Strimzi dev services container in kafka-oauth integration tests
jamesnetherton closed issue #3531: URL: https://github.com/apache/camel-quarkus/issues/3531 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (63009a9 -> 7017aab)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 63009a9 CAMEL-17802: rework the commit management add 7017aab CAMEL-17863: camel-main - Is loading routes from directory twice due to early modeline detection No new revisions were added by this update. Summary of changes: .../apache/camel/main/DefaultRoutesCollector.java | 58 +- .../org/apache/camel/main/RoutesCollector.java | 12 + .../org/apache/camel/main/RoutesConfigurer.java| 40 ++- 3 files changed, 61 insertions(+), 49 deletions(-)
[GitHub] [camel-k] squakez commented on issue #3127: Log a warn message once the component used has not a quarkus extension
squakez commented on issue #3127: URL: https://github.com/apache/camel-k/issues/3127#issuecomment-1082780752 I think some possible way to fix it is to scan the log provided from the builder. However, I'm just noticing a more general scenario could be covered by #3149. @phantomjinx can you please confirm that with the work you're doing that you are covering also the error mentioned in this issue? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (7017aab -> 899141b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 7017aab CAMEL-17863: camel-main - Is loading routes from directory twice due to early modeline detection add 899141b Camel 3.17 upgrade guide. No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc | 11 +++ .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc| 1 + 2 files changed, 12 insertions(+) create mode 100644 docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc
[GitHub] [camel-k] squakez commented on a change in pull request #3153: fix: redirect ouput and errors to appropriate writer
squakez commented on a change in pull request #3153:
URL: https://github.com/apache/camel-k/pull/3153#discussion_r838288844
##
File path: pkg/cmd/delete.go
##
@@ -139,14 +139,14 @@ func getIntegration(ctx context.Context, c client.Client,
name string, namespace
return &answer, nil
}
-func deleteIntegration(ctx context.Context, c client.Client, integration
*v1.Integration) error {
+func deleteIntegration(cmd *cobra.Command, ctx context.Context, c
client.Client, integration *v1.Integration) error {
Review comment:
Lint error, please fix this as suggested by the linter.
##
File path: pkg/cmd/delete.go
##
@@ -139,14 +139,14 @@ func getIntegration(ctx context.Context, c client.Client,
name string, namespace
return &answer, nil
}
-func deleteIntegration(ctx context.Context, c client.Client, integration
*v1.Integration) error {
+func deleteIntegration(cmd *cobra.Command, ctx context.Context, c
client.Client, integration *v1.Integration) error {
deleted, binding, err := deleteKameletBindingIfExists(ctx, c,
integration)
if err != nil {
return err
}
if deleted {
// Deleting KameletBinding will automatically clean up the
integration
- fmt.Println("KameletBinding " + binding + " deleted")
+ fmt.Fprintln(cmd.OutOrStdout(),"KameletBinding " + binding + "
deleted")
Review comment:
Missing space before the "KameletBinding" parameter.
##
File path: pkg/cmd/rebuild.go
##
@@ -69,7 +69,7 @@ func (o *rebuildCmdOptions) rebuild(_ *cobra.Command, args
[]string) error {
return err
}
- fmt.Printf("%d integrations have been rebuilt\n", len(integrations))
+ fmt.Fprintf(cmd.OutOrStdout(),"%d integrations have been rebuilt\n",
len(integrations))
Review comment:
Another missing space. Likely you want to run `gofmt` to fix all
formatting errors.
##
File path: pkg/cmd/uninstall.go
##
@@ -209,71 +209,71 @@ func (o *uninstallCmdOptions)
uninstallClusterWideResources(ctx context.Context,
if !o.SkipClusterRoleBindings || o.UninstallAll {
if err := o.uninstallClusterRoleBindings(ctx, c); err != nil {
if k8serrors.IsForbidden(err) {
- return createActionNotAuthorizedError()
+ return createActionNotAuthorizedError(cmd)
}
return err
}
- fmt.Printf("Camel K Cluster Role Bindings removed from
cluster\n")
+ fmt.Fprintf(cmd.OutOrStdout(), "Camel K Cluster Role Bindings
removed from cluster\n")
}
if !o.SkipClusterRoles || o.UninstallAll {
if err := o.uninstallClusterRoles(ctx, c); err != nil {
if k8serrors.IsForbidden(err) {
- return createActionNotAuthorizedError()
+ return createActionNotAuthorizedError(cmd)
}
return err
}
- fmt.Printf("Camel K Cluster Roles removed from cluster\n")
+ fmt.Fprintf(cmd.OutOrStdout(), "Camel K Cluster Roles removed
from cluster\n")
}
return nil
}
-func (o *uninstallCmdOptions) uninstallNamespaceRoles(ctx context.Context, c
client.Client) error {
+func (o *uninstallCmdOptions) uninstallNamespaceRoles(cmd *cobra.Command, ctx
context.Context, c client.Client) error {
Review comment:
Lint error, please fix accordingly.
##
File path: pkg/cmd/util_dependencies.go
##
@@ -230,37 +231,37 @@ func createCamelCatalog(ctx context.Context)
(*camel.RuntimeCatalog, error) {
return catalog, nil
}
-func outputDependencies(dependencies []string, format string) error {
+func outputDependencies(dependencies []string, format string, cmd
*cobra.Command) error {
if format != "" {
- err := printDependencies(format, dependencies)
+ err := printDependencies(format, dependencies, cmd)
if err != nil {
return err
}
} else {
// Print output in text form
- fmt.Println("dependencies:")
+ fmt.Fprintln(cmd.OutOrStdout(), "dependencies:")
for _, dep := range dependencies {
- fmt.Printf("%v\n", dep)
+ fmt.Fprintf(cmd.OutOrStdout(), "%v\n", dep)
}
}
return nil
}
-func printDependencies(format string, dependencies []string) error {
+func printDependencies(format string, dependencies []string, cmd
*cobra.Command) error {
switch format {
case "yaml":
data, err := util.DependenciesToYAML(dependencies)
if err != nil {
return err
[camel-website] branch main updated: Remove old releases from doc (#814)
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-website.git The following commit(s) were added to refs/heads/main by this push: new ea33721 Remove old releases from doc (#814) ea33721 is described below commit ea33721044d913cc6ea4120778b145c4d9d38861 Author: Claus Ibsen AuthorDate: Wed Mar 30 11:36:56 2022 +0200 Remove old releases from doc (#814) Remove old releases from doc --- antora-playbook-snippets/antora-playbook.yml | 13 + 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/antora-playbook-snippets/antora-playbook.yml b/antora-playbook-snippets/antora-playbook.yml index 33a6111..422af15 100644 --- a/antora-playbook-snippets/antora-playbook.yml +++ b/antora-playbook-snippets/antora-playbook.yml @@ -18,7 +18,6 @@ content: - camel-3.16.x - camel-3.15.x - camel-3.14.x -- camel-3.13.x - camel-3.12.x - camel-3.11.x start_paths: @@ -40,34 +39,26 @@ content: branches: - main - release-1.8.x -- release-1.7.x - release-1.6.x -- release-1.4.x start_path: docs - url: https://github.com/apache/camel-k-runtime.git branches: - main - release-1.11.x -- release-1.10.x -- release-1.9.x start_path: docs - url: https://github.com/apache/camel-kamelets.git branches: - main -- 0.7.x - 0.6.x -- 0.5.x +- 0.7.x start_path: docs - url: https://github.com/apache/camel-quarkus.git branches: - main - 2.7.x -- 2.6.x -- 2.5.x -- 2.4.x start_path: docs - url: https://github.com/apache/camel-quarkus-examples.git @@ -89,7 +80,6 @@ content: - camel-spring-boot-3.16.x - camel-spring-boot-3.15.x - camel-spring-boot-3.14.x -- camel-spring-boot-3.13.x - camel-spring-boot-3.12.x - camel-spring-boot-3.11.x start_paths: @@ -104,7 +94,6 @@ content: - camel-karaf-3.16.x - camel-karaf-3.15.x - camel-karaf-3.14.x -- camel-karaf-3.13.x - camel-karaf-3.12.x - camel-karaf-3.11.x start_path: docs
[GitHub] [camel-website] davsclaus merged pull request #814: Remove old releases from doc
davsclaus merged pull request #814: URL: https://github.com/apache/camel-website/pull/814 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] davsclaus commented on pull request #814: Remove old releases from doc
davsclaus commented on pull request #814: URL: https://github.com/apache/camel-website/pull/814#issuecomment-1082848698 This only removed the 3.13.x release. Because CKC uses kamelets 0.6.x that uses 3.15 and kamele main uses 3.15 and are not upgraded to 3.16 yet -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (899141b -> bcbf2a3)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 899141b Camel 3.17 upgrade guide. new 982c441 CAMEL-17806: camel-yaml-dsl - Make parser more forgiving and not report weird exception if yaml is not camel route. new bcbf2a3 CAMEL-17815: Show correct location of configured properties when parsed from yaml-dsl The 2 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: .../AbstractLocationPropertiesSource.java | 12 +++- .../properties/ClasspathPropertiesSource.java | 4 +-- .../component/properties/FilePropertiesSource.java | 2 +- .../dsl/yaml/common/YamlDeserializerSupport.java | 8 + .../IntegrationConfigurationPropertiesSource.java | 31 ++- .../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 36 +- 6 files changed, 61 insertions(+), 32 deletions(-)
[camel] 01/02: CAMEL-17806: camel-yaml-dsl - Make parser more forgiving and not report weird exception if yaml is not camel route.
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
commit 982c441ee0321f508c656e58eb91984c5a65c258
Author: Claus Ibsen
AuthorDate: Wed Mar 30 11:00:48 2022 +0200
CAMEL-17806: camel-yaml-dsl - Make parser more forgiving and not report
weird exception if yaml is not camel route.
---
.../org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java | 8
.../java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java | 5 +++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java
index 7148197..9a2376c 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java
@@ -258,6 +258,14 @@ public class YamlDeserializerSupport {
return (SequenceNode) node;
}
+public static boolean isSequenceNode(Node node) {
+if (node == null) {
+return false;
+}
+
+return node.getNodeType() == NodeType.SEQUENCE;
+}
+
public static Node getNamedNode(MappingNode node, String name) throws
YamlDeserializationException {
if (node == null) {
return null;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
index 3d6d141..659cc81 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
@@ -79,6 +79,7 @@ import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asMapping
import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asSequenceNode;
import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asStringList;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText;
+import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.isSequenceNode;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt;
import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.setDeserializationContext;
@@ -123,7 +124,7 @@ public class YamlRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
Iterator it = ObjectHelper.createIterator(target);
while (it.hasNext()) {
target = it.next();
-if (target instanceof Node) {
+if (target instanceof Node && isSequenceNode((Node)
target)) {
SequenceNode seq = asSequenceNode((Node) target);
for (Node node : seq.getValue()) {
int idx = -1;
@@ -215,7 +216,7 @@ public class YamlRoutesBuilderLoader extends
YamlRoutesBuilderLoaderSupport {
Iterator it = ObjectHelper.createIterator(target);
while (it.hasNext()) {
target = it.next();
-if (target instanceof Node) {
+if (target instanceof Node && isSequenceNode((Node)
target)) {
SequenceNode seq = asSequenceNode((Node) target);
for (Node node : seq.getValue()) {
int idx = -1;
[camel] 02/02: CAMEL-17815: Show correct location of configured properties when parsed from yaml-dsl
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
commit bcbf2a33ec96c832d4488275587551fa6d8ea700
Author: Claus Ibsen
AuthorDate: Wed Mar 30 11:39:46 2022 +0200
CAMEL-17815: Show correct location of configured properties when parsed
from yaml-dsl
---
.../AbstractLocationPropertiesSource.java | 12 -
.../properties/ClasspathPropertiesSource.java | 4 +--
.../component/properties/FilePropertiesSource.java | 2 +-
.../IntegrationConfigurationPropertiesSource.java | 31 --
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 31 +-
5 files changed, 50 insertions(+), 30 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
index 62d8918..b4bd408 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
@@ -41,7 +41,7 @@ public abstract class AbstractLocationPropertiesSource
extends ServiceSupport
this.location = location;
}
-abstract Properties loadPropertiesFromLocation(PropertiesComponent
propertiesComponent, PropertiesLocation location);
+public abstract Properties loadPropertiesFromLocation(PropertiesComponent
propertiesComponent, PropertiesLocation location);
@Override
public PropertiesLocation getLocation() {
@@ -88,6 +88,16 @@ public abstract class AbstractLocationPropertiesSource
extends ServiceSupport
return properties.getProperty(name);
}
+/**
+ * Sets a property
+ *
+ * @param key the key
+ * @param value the value
+ */
+public void setProperty(String key, String value) {
+properties.setProperty(key, value);
+}
+
@Override
protected void doInit() throws Exception {
super.doInit();
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
index 7aba136..2646289 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
@@ -41,7 +41,7 @@ public class ClasspathPropertiesSource extends
AbstractLocationPropertiesSource
}
@Override
-protected Properties loadPropertiesFromLocation(PropertiesComponent
propertiesComponent, PropertiesLocation location) {
+public Properties loadPropertiesFromLocation(PropertiesComponent
propertiesComponent, PropertiesLocation location) {
Properties answer = new OrderedProperties();
String path = location.getPath();
@@ -71,6 +71,6 @@ public class ClasspathPropertiesSource extends
AbstractLocationPropertiesSource
@Override
public int getOrder() {
-return 200;
+return 300;
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
index 7d63576..88cc980 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
@@ -42,7 +42,7 @@ public class FilePropertiesSource extends
AbstractLocationPropertiesSource imple
}
@Override
-protected Properties loadPropertiesFromLocation(PropertiesComponent
propertiesComponent, PropertiesLocation location) {
+public Properties loadPropertiesFromLocation(PropertiesComponent
propertiesComponent, PropertiesLocation location) {
Properties answer = new OrderedProperties();
String path = location.getPath();
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java
index 14d270f..61b6c2c 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java
@@ -21,21 +21,26 @@ import java.util.Properties;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
+import org.apache.camel.Ordered;
+import org.apache.camel.component.properties.AbstractLocationPro
[GitHub] [camel-website] github-actions[bot] commented on pull request #814: Remove old releases from doc
github-actions[bot] commented on pull request #814: URL: https://github.com/apache/camel-website/pull/814#issuecomment-1082881529 🚀 Preview is available at -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] 01/01: Upgrade Camel to version 3.16.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-3.16.0 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit c59516a9322dc9dd2ff5451d7d577cda4d10291b Author: Andrea Cosentino AuthorDate: Wed Mar 30 11:59:46 2022 +0200 Upgrade Camel to version 3.16.0 --- docs/antora.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 7f3dfd9..71386ca 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -34,5 +34,5 @@ asciidoc: camel-k-docs-version: next #camel-kafka-connector-version: none #camel-kafka-connector-docs-version: none -camel-version: 3.15.0 -camel-docs-version: 3.15.x +camel-version: 3.16.0 +camel-docs-version: 3.16.x diff --git a/pom.xml b/pom.xml index a8399fc..9a85b42 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 2.1.1 0.13 -3.15.0 +3.16.0 1.7.36 2.17.2 2.13.2
[camel-kamelets] branch camel-3.16.0 created (now c59516a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-3.16.0 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. at c59516a Upgrade Camel to version 3.16.0 This branch includes the following new commits: new c59516a Upgrade Camel to version 3.16.0 The 1 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.
[GitHub] [camel-kamelets] oscerd opened a new pull request #873: Upgrade Camel to version 3.16.0
oscerd opened a new pull request #873: URL: https://github.com/apache/camel-kamelets/pull/873 Fixes #791 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch main updated: Upgrade Camel to version 3.16.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 1aaf3d8 Upgrade Camel to version 3.16.0 1aaf3d8 is described below commit 1aaf3d8b123f05429914115873bb29147abfa28a Author: Andrea Cosentino AuthorDate: Wed Mar 30 11:59:46 2022 +0200 Upgrade Camel to version 3.16.0 --- docs/antora.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 7f3dfd9..71386ca 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -34,5 +34,5 @@ asciidoc: camel-k-docs-version: next #camel-kafka-connector-version: none #camel-kafka-connector-docs-version: none -camel-version: 3.15.0 -camel-docs-version: 3.15.x +camel-version: 3.16.0 +camel-docs-version: 3.16.x diff --git a/pom.xml b/pom.xml index a8399fc..9a85b42 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 2.1.1 0.13 -3.15.0 +3.16.0 1.7.36 2.17.2 2.13.2
[GitHub] [camel-kamelets] oscerd merged pull request #873: Upgrade Camel to version 3.16.0
oscerd merged pull request #873: URL: https://github.com/apache/camel-kamelets/pull/873 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd closed issue #791: Camel 3.16 - Update kamelets to model changes
oscerd closed issue #791: URL: https://github.com/apache/camel-kamelets/issues/791 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch regen_bot updated (ee793bf -> 1aaf3d8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. from ee793bf aws-sqs-fifo-sink: missing protocol option in the contentBasedDeduplication choice add 1aaf3d8 Upgrade Camel to version 3.16.0 No new revisions were added by this update. Summary of changes: docs/antora.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[GitHub] [camel] davsclaus merged pull request #7296: camel-email - Add more header samples in docs
davsclaus merged pull request #7296: URL: https://github.com/apache/camel/pull/7296 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #7295: CAMEL-17802: added migration documentation
davsclaus merged pull request #7295: URL: https://github.com/apache/camel/pull/7295 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (bcbf2a3 -> 0146c60)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from bcbf2a3 CAMEL-17815: Show correct location of configured properties when parsed from yaml-dsl add 0146c60 camel-email - Add more header samples in docs (#7296) No new revisions were added by this update. Summary of changes: components/camel-mail/src/main/docs/mail-component.adoc | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)
[camel] branch main updated: CAMEL-17802: added migration documentation (#7295)
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 a12e9e4 CAMEL-17802: added migration documentation (#7295) a12e9e4 is described below commit a12e9e4017f5a78ca42eedaad7c89789ad109d83 Author: Otavio Rodolfo Piske AuthorDate: Wed Mar 30 12:41:04 2022 +0200 CAMEL-17802: added migration documentation (#7295) --- .../modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc| 14 ++ 1 file changed, 14 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc index 21fd603..da36ee0 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc @@ -9,3 +9,17 @@ from both 3.0 to 3.1 and 3.1 to 3.2. === camel-main Added method `findRouteResourcesFromDirectory` to `org.apache.camel.main.RoutesCollector`. + +=== camel-kafka + +The option `autoCommitOnStop` was removed from the Camel Kafka component. When using `autoCommitEnable` (which is enabled by default) the Kafka consumer will automatically commit on close. + +When the `autoCommitEnable` is turned off, the component issues a call to the respective commit manager during shutdown. + +Asynchronous, Synchronous or NO-OP commit policies from the former `autoCommitOnStop` are now determined by automatically by the value of the `kafkaManualCommitFactory` option: + +* NO-OP is the default behavior if no `kafkaManualCommitFactory` is provided +* Async can be set using `kafkaManualCommitFactory=#class:org.apache.camel.component.kafka.consumer.DefaultKafkaManualAsyncCommitFactory` +* Sync can be set using `kafkaManualCommitFactory=#class:org.apache.camel.component.kafka.consumer.DefaultKafkaManualCommitFactory` + +
[camel] branch regen_bot updated (899141b -> bcbf2a3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 899141b Camel 3.17 upgrade guide. add 982c441 CAMEL-17806: camel-yaml-dsl - Make parser more forgiving and not report weird exception if yaml is not camel route. add bcbf2a3 CAMEL-17815: Show correct location of configured properties when parsed from yaml-dsl No new revisions were added by this update. Summary of changes: .../AbstractLocationPropertiesSource.java | 12 +++- .../properties/ClasspathPropertiesSource.java | 4 +-- .../component/properties/FilePropertiesSource.java | 2 +- .../dsl/yaml/common/YamlDeserializerSupport.java | 8 + .../IntegrationConfigurationPropertiesSource.java | 31 ++- .../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 36 +- 6 files changed, 61 insertions(+), 32 deletions(-)
[GitHub] [camel-k] phantomjinx commented on issue #3127: Log a warn message once the component used has not a quarkus extension
phantomjinx commented on issue #3127: URL: https://github.com/apache/camel-k/issues/3127#issuecomment-1082990473 @squakez No. I don't believe it is. I think this refers to adding more logging messages whereas #3149 seeks to grab the quarkus logging if the command immediately [fails](https://github.com/apache/camel-k/blob/main/pkg/util/command.go#L41). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] Delawen commented on pull request #862: feature(salesforce-sink): Add, update, and delete salesforce sink
Delawen commented on pull request #862: URL: https://github.com/apache/camel-kamelets/pull/862#issuecomment-1082992664 Should I maybe rebase? Or is it flaky tests and will be the same? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd commented on pull request #862: feature(salesforce-sink): Add, update, and delete salesforce sink
oscerd commented on pull request #862: URL: https://github.com/apache/camel-kamelets/pull/862#issuecomment-1082995823 It's not failing on other PRs. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd commented on pull request #862: feature(salesforce-sink): Add, update, and delete salesforce sink
oscerd commented on pull request #862: URL: https://github.com/apache/camel-kamelets/pull/862#issuecomment-1082996045 Let's try to rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez commented on issue #3127: Log a warn message once the component used has not a quarkus extension
squakez commented on issue #3127: URL: https://github.com/apache/camel-k/issues/3127#issuecomment-1083005684 Thanks @phantomjinx. I was trying to think a simple approach to parse the log, capture the kind of error and bubble up into the Builder error conditions. However, for the sake of simplicity, I think we can start inspecting the content of the [maven log line here](https://github.com/apache/camel-k/blob/main/pkg/util/maven/maven_log.go#L67), and if it complains of a camel dependency missing a version (such as in the issue description) we can add an additional line of log explaining that likely, the component has not a Camel Quarkus extension valid. @parul5sahoo I hope that can give you some hint on how to proceed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (bcbf2a3 -> a12e9e4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from bcbf2a3 CAMEL-17815: Show correct location of configured properties when parsed from yaml-dsl add 0146c60 camel-email - Add more header samples in docs (#7296) add a12e9e4 CAMEL-17802: added migration documentation (#7295) No new revisions were added by this update. Summary of changes: components/camel-mail/src/main/docs/mail-component.adoc| 7 +-- .../modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc| 14 ++ 2 files changed, 19 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (a12e9e4 -> 0146c60)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit a12e9e4 CAMEL-17802: added migration documentation (#7295) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (0146c60) \ O -- O -- O (a12e9e4) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-3x-upgrade-guide-3_17.adoc| 14 -- 1 file changed, 14 deletions(-)
[GitHub] [camel-kamelets] MelissaFlinn commented on issue #866: override example template for these action kamelets
MelissaFlinn commented on issue #866: URL: https://github.com/apache/camel-kamelets/issues/866#issuecomment-1083051506 What is wrong: the auto-generated examples for those Kamelets do not work. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] MelissaFlinn commented on issue #866: override example template for these action kamelets
MelissaFlinn commented on issue #866: URL: https://github.com/apache/camel-kamelets/issues/866#issuecomment-1083052685 The examples need additional steps - such as adding a serialize/deserialize step. The way that the template generates examples now, we cannot override the generated ones to provide examples that are correct/useful. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] jamesnetherton commented on issue #3127: Log a warn message once the component used has not a quarkus extension
jamesnetherton commented on issue #3127: URL: https://github.com/apache/camel-k/issues/3127#issuecomment-1083056942 Can't we verify the validity of any requested camel artifacts by attempting to look them up in the catalog, instead of parsing logs? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton closed issue #3655: Azure Storage blob - test failure
jamesnetherton closed issue #3655: URL: https://github.com/apache/camel-quarkus/issues/3655 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3683: Fix potential Azure Blob test failures when testing against the real service
jamesnetherton merged pull request #3683: URL: https://github.com/apache/camel-quarkus/pull/3683 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Fix potential Azure Blob test failures when testing against the real service
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 152f917 Fix potential Azure Blob test failures when testing against
the real service
152f917 is described below
commit 152f91743b6c5a9e50bb2181885915ffb598b79d
Author: James Netherton
AuthorDate: Wed Mar 30 09:34:52 2022 +0100
Fix potential Azure Blob test failures when testing against the real service
Fixes #3655
---
.../storage/blob/it/AzureStorageBlobResource.java | 6 --
.../azure/storage/blob/it/AzureStorageBlobTest.java | 21 +++--
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
b/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
index 790cbb1..5bd0f54 100644
---
a/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
+++
b/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
@@ -348,8 +348,10 @@ public class AzureStorageBlobResource {
List containers =
producerTemplate.requestBody("direct:listBlobContainers", null, List.class);
containers.stream()
-.map(container -> Json.createObjectBuilder()
-.add("name", container.getName())
+.map(BlobContainerItem::getName)
+.filter(containerName ->
containerName.startsWith("camel-quarkus"))
+.map(containerName -> Json.createObjectBuilder()
+.add("name", containerName)
.build())
.forEach(arrayBuilder::add);
diff --git
a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
index 7a3e8c1..1eb12e8 100644
---
a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
+++
b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java
@@ -43,6 +43,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;
+import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.StringEndsWith.endsWith;
@@ -121,7 +122,7 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
-.statusCode(204);
+.statusCode(anyOf(is(204), is(404)));
}
}
@@ -166,7 +167,7 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
-.statusCode(204);
+.statusCode(anyOf(is(204), is(404)));
}
}
@@ -224,7 +225,7 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
-.statusCode(204);
+.statusCode(anyOf(is(204), is(404)));
}
}
@@ -258,7 +259,7 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
-.statusCode(204);
+.statusCode(anyOf(is(204), is(404)));
}
}
@@ -352,13 +353,13 @@ class AzureStorageBlobTest {
// Delete
RestAssured.delete("/azure-storage-blob/blob/delete")
.then()
-.statusCode(204);
+.statusCode(anyOf(is(204), is(404)));
}
}
@Test
public void blobContainer() {
-String alternativeContainerName = "cq-test-" + UUID.randomUUID();
+String alternativeContainerName = "camel-quarkus-" + UUID.randomUUID();
try {
// Create
@@ -381,13 +382,13 @@ class AzureStorageBlobTest {
.queryParam("containerName", alternativeContainerName)
.delete("/azure-storage-blob/blob/container")
[GitHub] [camel-kamelets] christophd commented on pull request #862: feature(salesforce-sink): Add, update, and delete salesforce sink
christophd commented on pull request #862: URL: https://github.com/apache/camel-kamelets/pull/862#issuecomment-1083065425 after the rebase the test is green, YAY! this Kafka test has been flaky before (~50% failing) but I think I have fixed some issues with it. as @oscerd has mentioned the test is stable on other PRs. So lets's keep an eye on that one as it may still be flaky (maybe ~10%). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] JiriOndrusek opened a new pull request #3685: Improve mail test coverage #3674
JiriOndrusek opened a new pull request #3685: URL: https://github.com/apache/camel-quarkus/pull/3685 fixes https://github.com/apache/camel-quarkus/issues/3674 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #7297: CAMEL-17051: pre-work
orpiske opened a new pull request #7297: URL: https://github.com/apache/camel/pull/7297 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] KuthumiPepple commented on a change in pull request #3153: fix: redirect ouput and errors to appropriate writer
KuthumiPepple commented on a change in pull request #3153:
URL: https://github.com/apache/camel-k/pull/3153#discussion_r838498210
##
File path: e2e/support/test_support.go
##
@@ -1719,9 +1719,9 @@ func UserCleanup() {
command.Stderr = os.Stderr
command.Stdout = os.Stdout
if err := command.Run(); err != nil {
- fmt.Printf("An error occurred during user cleanup
command execution: %v\n", err)
+ fmt.Fprintf(command.Stderr, "An error occurred during
user cleanup command execution: %v\n", err)
Review comment:
Looking at this again, `Fprintln` doesn't accept a format string. Using
`Fprintln` would mean doing away with the formatting. Isn't that inportant?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on a change in pull request #3153: fix: redirect ouput and errors to appropriate writer
astefanutti commented on a change in pull request #3153:
URL: https://github.com/apache/camel-k/pull/3153#discussion_r838507832
##
File path: e2e/support/test_support.go
##
@@ -1719,9 +1719,9 @@ func UserCleanup() {
command.Stderr = os.Stderr
command.Stdout = os.Stdout
if err := command.Run(); err != nil {
- fmt.Printf("An error occurred during user cleanup
command execution: %v\n", err)
+ fmt.Fprintf(command.Stderr, "An error occurred during
user cleanup command execution: %v\n", err)
Review comment:
`Fprintln` operands are appended with white spaces, e.g.:
```golang
fmt.Fprintf(command.Stderr, "An error occurred during user cleanup command
execution: %v\n", err)
```
Can be turned into:
```golang
fmt.Fprintln(command.Stderr, "An error occurred during user cleanup command
execution:", err.Error())
```
I think for all the statements where formatting is actually used for
appending strings, then `Fprintln` is more appropriate.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel] branch main updated (a12e9e4 -> 1755d35)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from a12e9e4 CAMEL-17802: added migration documentation (#7295) new 251ea75 CAMEL-17687 - Create a Camel Azure Key Vault component - First commit new 98d5fc9 CAMEL-17687 - Create a Camel Azure Key Vault component - First iteration docs new f9fefe9 CAMEL-17687 - Create a Camel Azure Key Vault component new bdb7f66 CAMEL-17687 - Create a Camel Azure Key Vault component new 2305254 CAMEL-17687 - Create a Camel Azure Key Vault component new 3776be5 CAMEL-17687 - Create a Camel Azure Key Vault component new 1dfe2ff CAMEL-17687 - Create a Camel Azure Key Vault component new 77be1a5 CAMEL-17687 - Create a Camel Azure Key Vault component - Kit new c528072 CAMEL-17687 - Create a Camel Azure Key Vault component - Kit new 926874f CAMEL-17687 - Create a Camel Azure Key Vault component - Kit new db22270 CAMEL-17687 - Create a Camel Azure Key Vault component - Get Secret Operation new 4b46974 CAMEL-17687 - Create a Camel Azure Key Vault component - Delete Secret Operation new 1755d35 CAMEL-17687 - Create a Camel Azure Key Vault component The 13 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: bom/camel-bom/pom.xml | 5 + catalog/camel-allcomponents/pom.xml| 4 + .../org/apache/camel/catalog/components.properties | 1 + .../camel/catalog/components/azure-key-vault.json | 44 ++ .../camel-azure/camel-azure-key-vault/pom.xml | 90 .../key/vault/KeyVaultComponentConfigurer.java | 61 +++ .../key/vault/KeyVaultEndpointConfigurer.java | 88 .../key/vault/KeyVaultEndpointUriFactory.java | 80 .../services/org/apache/camel/component.properties | 7 + .../org/apache/camel/component/azure-key-vault | 2 + .../camel/configurer/azure-key-vault-component | 2 + .../camel/configurer/azure-key-vault-endpoint | 2 + .../camel/urifactory/azure-key-vault-endpoint | 2 + .../component/azure/key/vault/azure-key-vault.json | 44 ++ .../src/main/docs/azure-key-vault-component.adoc | 53 +++ .../azure/key/vault/KeyVaultComponent.java | 65 +++ .../azure/key/vault/KeyVaultConfiguration.java | 108 + .../azure/key/vault/KeyVaultConstants.java | 35 ++ .../azure/key/vault/KeyVaultEndpoint.java | 103 + .../azure/key/vault/KeyVaultOperation.java | 23 + .../azure/key/vault/KeyVaultProducer.java | 121 + .../operations/KeyVaultOperationsTest.java | 110 + .../src/test/resources/log4j2.properties | 27 ++ components/camel-azure/pom.xml | 1 + .../org/apache/camel/main/components.properties| 1 + .../ROOT/examples/json/azure-key-vault.json| 1 + docs/components/modules/ROOT/nav.adoc | 1 + .../ROOT/pages/azure-key-vault-component.adoc | 1 + .../component/ComponentsBuilderFactory.java| 13 + .../dsl/AzureKeyVaultComponentBuilderFactory.java | 144 ++ .../src/generated/resources/metadata.json | 22 + .../builder/endpoint/EndpointBuilderFactory.java | 1 + .../camel/builder/endpoint/EndpointBuilders.java | 1 + .../builder/endpoint/StaticEndpointBuilders.java | 43 ++ .../dsl/KeyVaultEndpointBuilderFactory.java| 491 + .../EndpointConsumerDeserializersResolver.java | 1 + .../EndpointProducerDeserializersResolver.java | 1 + parent/pom.xml | 5 + .../apache/camel/maven/packaging/MojoHelper.java | 3 +- 39 files changed, 1806 insertions(+), 1 deletion(-) create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json create mode 100644 components/camel-azure/camel-azure-key-vault/pom.xml create mode 100644 components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultComponentConfigurer.java create mode 100644 components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpointConfigurer.java create mode 100644 components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpointUriFactory.java create mode 100644 components/camel-azure/camel-azure-key-vault/src/generated/resources/META-INF/services/org/apache/camel/component.properties create mode 100644 components/camel-azure/camel-azure-key-vault/src/generated/resources/META-INF/services/org/apache/camel/component/azure-key-vault create mode 1
[camel] 05/13: CAMEL-17687 - Create a Camel Azure Key Vault component
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 2305254cead271c61546faccbe16713e10868c6a Author: Andrea Cosentino AuthorDate: Wed Mar 30 11:13:51 2022 +0200 CAMEL-17687 - Create a Camel Azure Key Vault component --- .../org/apache/camel/component/azure/key/vault/azure-key-vault.json | 2 +- .../camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json b/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json index fd2bcfa..f331f2f 100644 --- a/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json +++ b/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json @@ -3,7 +3,7 @@ "kind": "component", "name": "azure-key-vault", "title": "Azure Key Vault", -"description": "Send and receive messages to\/from Azure Event Bus.", +"description": "Manage secrets and keys in Azure Key Vault Service", "deprecated": false, "firstVersion": "3.17.0", "label": "cloud,cloud", diff --git a/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc b/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc index 0e22f5a..051d232 100644 --- a/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc +++ b/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc @@ -2,7 +2,7 @@ :doctitle: Azure Key Vault :shortname: azure-key-vault :artifactid: camel-azure-key-vault -:description: Send and receive messages to/from Azure Event Bus. +:description: Manage secrets and keys in Azure Key Vault Service :since: 3.17 :supportlevel: Preview :component-header: Both producer and consumer are supported
[camel] 06/13: CAMEL-17687 - Create a Camel Azure Key Vault component
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3776be58566749949710308a3638128a41309083
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 11:40:43 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component
---
.../operations/KeyVaultOperationsTest.java | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git
a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
index 10844e8..9c1832a 100644
---
a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
+++
b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
@@ -16,12 +16,27 @@
*/
package org.apache.camel.component.azure.key.vault.integration.operations;
-import org.apache.camel.*;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+@EnabledIfSystemProperty(named = "vaultName", matches = ".*",
+disabledReason = "Make sure to supply azure key vault Vault Name, e.g:
mvn verify -DvaultName=string")
+@EnabledIfSystemProperty(named = "clientId", matches = ".*",
+disabledReason = "Make sure to supply azure key vault Client Id, e.g:
mvn verify -DclientId=string")
+@EnabledIfSystemProperty(named = "clientSecret", matches = ".*",
+disabledReason = "Make sure to supply azure key vault Client Secret,
e.g: mvn verify -DclientSecret=string")
+@EnabledIfSystemProperty(named = "tenantId", matches = ".*",
+disabledReason = "Make sure to supply azure key vault Tenant Id, e.g:
mvn verify -DtenantId=string")
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class KeyVaultOperationsTest extends CamelTestSupport {
@EndpointInject("direct:start")
@@ -50,9 +65,7 @@ public class KeyVaultOperationsTest extends CamelTestSupport {
@Override
public void configure() {
from("direct:start").startupOrder(1)
-
.toF("azure-key-vault://%s?clientId=%s&clientSecret=%s&tenantId=%s", "test1345",
-"test", "test",
-"test")
+
.to("azure-key-vault://{{vaultName}}?clientId=RAW({{clientId}})&clientSecret=RAW({{clientSecret}})&tenantId=RAW({{tenantId}})")
.to("mock:result");
}
[camel] 02/13: CAMEL-17687 - Create a Camel Azure Key Vault component - First iteration docs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 98d5fc946e9709b27f93a7e337fc6e5a090e4e5f
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 11:08:46 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component - First iteration
docs
---
.../src/main/docs/azure-key-vault-component.adoc | 53
.../src/main/docs/azure-servicebus-component.adoc | 146 -
2 files changed, 53 insertions(+), 146 deletions(-)
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc
b/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc
new file mode 100644
index 000..468a99e
--- /dev/null
+++
b/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc
@@ -0,0 +1,53 @@
+= Azure Key Vault Component
+:doctitle: Azure Key Vault
+:shortname: azure-key-vault
+:artifactid: camel-azure-key-vault
+:description: Manage secrets/keys on Azure Key Vault.
+:since: 3.17
+:supportlevel: Stable
+:component-header: Both producer and consumer are supported
+//Manually maintained attributes
+:group: Azure
+:camel-spring-boot-name: azure-key-vault
+
+*Since Camel {since}*
+
+*{component-header}*
+
+The azure-key-vault component that integrates
https://azure.microsoft.com/en-us/services/key-vault/[Azure ServiceBus].
+
+Prerequisites
+
+You must have a valid Windows Azure Key Vault account. More information is
available at
+https://docs.microsoft.com/azure/[Azure Documentation Portal].
+
+[source,xml]
+
+
+org.apache.camel
+camel-azure-key-vault
+x.x.x
+
+
+
+
+
+// component-configure options: START
+
+// component-configure options: END
+
+// component options: START
+include::partial$component-configure-options.adoc[]
+include::partial$component-endpoint-options.adoc[]
+// component options: END
+
+// endpoint options: START
+
+// endpoint options: END
+
+
+== Usage
+
+// component headers: START
+include::partial$component-endpoint-headers.adoc[]
+// component headers: END
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-servicebus-component.adoc
b/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-servicebus-component.adoc
deleted file mode 100644
index c5e83d5..000
---
a/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-servicebus-component.adoc
+++ /dev/null
@@ -1,146 +0,0 @@
-= Azure ServiceBus Component
-:doctitle: Azure ServiceBus
-:shortname: azure-servicebus
-:artifactid: camel-azure-servicebus
-:description: Send and receive messages to/from Azure Event Bus.
-:since: 3.12
-:supportlevel: Stable
-:component-header: Both producer and consumer are supported
-//Manually maintained attributes
-:group: Azure
-:camel-spring-boot-name: azure-servicebus
-
-*Since Camel {since}*
-
-*{component-header}*
-
-The azure-servicebus component that integrates
https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview[Azure
ServiceBus]. Azure ServiceBus is a fully managed enterprise
-integration message broker. Service Bus can decouple applications and
services. Service Bus offers a reliable and secure platform for asynchronous
transfer of data and state. Data is transferred between different applications
and
- services using messages.
-
-Prerequisites
-
-You must have a valid Windows Azure Storage account. More information is
available at
-https://docs.microsoft.com/azure/[Azure Documentation Portal].
-
-[source,xml]
-
-
-org.apache.camel
-camel-azure-servicebus
-x.x.x
-
-
-
-
-
-// component-configure options: START
-
-// component-configure options: END
-
-// component options: START
-include::partial$component-configure-options.adoc[]
-include::partial$component-endpoint-options.adoc[]
-// component options: END
-
-// endpoint options: START
-
-// endpoint options: END
-
-
-== Async Consumer and Producer
-
-This component implements the async Consumer and producer.
-
-This allows camel route to consume and produce events asynchronously without
blocking any threads.
-
-== Usage
-
-// component headers: START
-include::partial$component-endpoint-headers.adoc[]
-// component headers: END
-
-=== Message Body
-In the producer, this component accepts message body of `String` type or
`List` to send batch messages.
-
-In the consumer, the returned message body will be of type `String.
-
-
-=== Azure ServiceBus Producer operations
-[width="100%",cols="10%,90%",options="header",]
-|===
-|Operation |Description
-|`sendMessages` | Sends a set of messages to a Service Bus queue or topic
using a batche
[camel] 11/13: CAMEL-17687 - Create a Camel Azure Key Vault component - Get Secret Operation
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db222709795167e54f9ff5033ff9907b3d2aadbc
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 13:19:35 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component - Get Secret
Operation
---
.../azure/key/vault/KeyVaultProducer.java | 14 +
.../operations/KeyVaultOperationsTest.java | 35 +-
2 files changed, 41 insertions(+), 8 deletions(-)
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
index 00c8bd8..dc1fe4f 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
+++
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
@@ -51,6 +51,9 @@ public class KeyVaultProducer extends DefaultProducer {
case createSecret:
createSecret(exchange);
break;
+case getSecret:
+getSecret(exchange);
+break;
default:
throw new IllegalArgumentException("Unsupported operation");
}
@@ -67,6 +70,17 @@ public class KeyVaultProducer extends DefaultProducer {
message.setBody(p);
}
+private void getSecret(Exchange exchange) throws InvalidPayloadException {
+final String secretName =
exchange.getMessage().getHeader(KeyVaultConstants.SECRET_NAME, String.class);
+if (ObjectHelper.isEmpty(secretName)) {
+throw new IllegalArgumentException("Secret Name must be specified
for createSecret Operation");
+}
+KeyVaultSecret p = getEndpoint().getSecretClient()
+.getSecret(secretName);
+Message message = getMessageForResponse(exchange);
+message.setBody(p.getValue());
+}
+
@Override
public KeyVaultEndpoint getEndpoint() {
return (KeyVaultEndpoint) super.getEndpoint();
diff --git
a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
index 73de7a5..e67b0e5 100644
---
a/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
+++
b/components/camel-azure/camel-azure-key-vault/src/test/java/org/apache/camel/component/azure/key/vault/integration/operations/KeyVaultOperationsTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.azure.key.vault.KeyVaultConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
@@ -39,19 +40,34 @@ import
org.junit.jupiter.api.condition.EnabledIfSystemProperty;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class KeyVaultOperationsTest extends CamelTestSupport {
-@EndpointInject("direct:start")
+@EndpointInject("direct:createSecret")
private ProducerTemplate template;
-@EndpointInject("mock:result")
-private MockEndpoint result;
+@EndpointInject("direct:getSecret")
+private ProducerTemplate getTemplate;
+
+@EndpointInject("mock:createSecret")
+private MockEndpoint createResult;
+
+@EndpointInject("mock:getSecret")
+private MockEndpoint getResult;
@Test
public void sendInOnly() throws Exception {
-result.expectedMessageCount(1);
+createResult.expectedMessageCount(1);
+getResult.expectedMessageCount(1);
+getResult.expectedBodiesReceived("TestValue");
+
+template.send("direct:createSecret", ExchangePattern.InOnly, new
Processor() {
+public void process(Exchange exchange) {
+exchange.getMessage().setHeader(KeyVaultConstants.SECRET_NAME,
"Test");
+exchange.getIn().setBody("TestValue");
+}
+});
-Exchange exchange = template.send("direct:start",
ExchangePattern.InOnly, new Processor() {
+template.send("direct:getSecret", ExchangePattern.InOnly, new
Processor() {
public void process(Exchange exchange) {
-exchange.getIn().setBody("Test");
+exchange.getMessage().setHeader(KeyVaultConstants.SECRET_NAME,
"Test");
}
[camel] 08/13: CAMEL-17687 - Create a Camel Azure Key Vault component - Kit
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 77be1a555293a036823c76177d34b9f464ce589c Author: Andrea Cosentino AuthorDate: Wed Mar 30 11:52:59 2022 +0200 CAMEL-17687 - Create a Camel Azure Key Vault component - Kit --- components/camel-azure/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-azure/pom.xml b/components/camel-azure/pom.xml index 58081c9..6a0a118 100644 --- a/components/camel-azure/pom.xml +++ b/components/camel-azure/pom.xml @@ -39,6 +39,7 @@ camel-azure-storage-queue camel-azure-cosmosdb camel-azure-servicebus +camel-azure-key-vault
[camel] 03/13: CAMEL-17687 - Create a Camel Azure Key Vault component
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f9fefe971635ce2fe65bc7ff33cea5d1e8d79a81
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 11:10:17 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component
---
.../component/azure/key/vault/KeyVaultEndpointUriFactory.java | 10 +-
.../src/main/docs/azure-key-vault-component.adoc | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpointUriFactory.java
b/components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpointUriFactory.java
index 88b4a1e..657c2e8 100644
---
a/components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpointUriFactory.java
+++
b/components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpointUriFactory.java
@@ -22,20 +22,20 @@ public class KeyVaultEndpointUriFactory extends
org.apache.camel.support.compone
private static final Set MULTI_VALUE_PREFIXES;
static {
Set props = new HashSet<>(9);
-props.add("lazyStartProducer");
props.add("bridgeErrorHandler");
props.add("clientId");
-props.add("vaultName");
-props.add("exchangePattern");
-props.add("tenantId");
props.add("clientSecret");
props.add("exceptionHandler");
+props.add("exchangePattern");
+props.add("lazyStartProducer");
props.add("operation");
+props.add("tenantId");
+props.add("vaultName");
PROPERTY_NAMES = Collections.unmodifiableSet(props);
Set secretProps = new HashSet<>(3);
secretProps.add("clientId");
-secretProps.add("tenantId");
secretProps.add("clientSecret");
+secretProps.add("tenantId");
SECRET_PROPERTY_NAMES = Collections.unmodifiableSet(secretProps);
MULTI_VALUE_PREFIXES = Collections.emptySet();
}
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc
b/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc
index 468a99e..0e22f5a 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc
+++
b/components/camel-azure/camel-azure-key-vault/src/main/docs/azure-key-vault-component.adoc
@@ -2,9 +2,9 @@
:doctitle: Azure Key Vault
:shortname: azure-key-vault
:artifactid: camel-azure-key-vault
-:description: Manage secrets/keys on Azure Key Vault.
+:description: Send and receive messages to/from Azure Event Bus.
:since: 3.17
-:supportlevel: Stable
+:supportlevel: Preview
:component-header: Both producer and consumer are supported
//Manually maintained attributes
:group: Azure
[camel] 01/13: CAMEL-17687 - Create a Camel Azure Key Vault component - First commit
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 251ea75760857449c6caa5e42ccbabb47c89c042
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 11:05:14 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component - First commit
---
catalog/camel-allcomponents/pom.xml| 4 +
.../camel-azure/camel-azure-key-vault/pom.xml | 90 +
.../key/vault/KeyVaultComponentConfigurer.java | 61 +
.../key/vault/KeyVaultEndpointConfigurer.java | 88 +
.../key/vault/KeyVaultEndpointUriFactory.java | 80 +++
.../services/org/apache/camel/component.properties | 7 +
.../org/apache/camel/component/azure-key-vault | 2 +
.../camel/configurer/azure-key-vault-component | 2 +
.../camel/configurer/azure-key-vault-endpoint | 2 +
.../camel/urifactory/azure-key-vault-endpoint | 2 +
.../component/azure/key/vault/azure-key-vault.json | 43 ++
.../src/main/docs/azure-servicebus-component.adoc | 146 +
.../azure/key/vault/KeyVaultComponent.java | 65 +
.../azure/key/vault/KeyVaultConfiguration.java | 108 +++
.../azure/key/vault/KeyVaultConstants.java | 31 +
.../azure/key/vault/KeyVaultEndpoint.java | 65 +
.../azure/key/vault/KeyVaultOperation.java | 22
.../azure/key/vault/KeyVaultProducer.java | 105 +++
.../operations/KeyVaultOperationsTest.java | 61 +
.../src/test/resources/log4j2.properties | 27
parent/pom.xml | 5 +
21 files changed, 1016 insertions(+)
diff --git a/catalog/camel-allcomponents/pom.xml
b/catalog/camel-allcomponents/pom.xml
index 1dbda43..19de873 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -207,6 +207,10 @@
org.apache.camel
+ camel-azure-key-vault
+
+
+ org.apache.camel
camel-azure-servicebus
diff --git a/components/camel-azure/camel-azure-key-vault/pom.xml
b/components/camel-azure/camel-azure-key-vault/pom.xml
new file mode 100644
index 000..57ec7be
--- /dev/null
+++ b/components/camel-azure/camel-azure-key-vault/pom.xml
@@ -0,0 +1,90 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+
+org.apache.camel
+camel-azure-parent
+3.17.0-SNAPSHOT
+
+
+camel-azure-key-vault
+jar
+
+Camel :: Azure :: Key Vault
+Camel Azure Key Vault Component
+
+
+
+
+
+
+org.apache.camel
+camel-support
+
+
+
+
+com.azure
+azure-security-keyvault-secrets
+4.3.8
+
+
+com.azure
+azure-identity
+${azure-identity-version}
+
+
+
+
+commons-io
+commons-io
+
+
+
+
+org.apache.camel
+camel-test-junit5
+test
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+test
+
+
+org.mockito
+mockito-junit-jupiter
+test
+
+
+org.awaitility
+awaitility
+test
+
+
+org.apache.commons
+commons-lang3
+${commons-lang3-version}
+test
+
+
+
diff --git
a/components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultComponentConfigurer.java
b/components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultComponentConfigurer.java
new file mode 100644
index 000..0e2b7e7
--- /dev/null
+++
b/components/camel-azure/camel-azure-key-vault/src/generated/java/org/apache/camel/component/azure/key/vault/KeyVaultComponentConfigurer.java
@@ -0,0 +1,61 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.key.vault;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.util.CaseInsensitiveMap;
+import org.apache.camel.support.component.PropertyConfigurerSupport;
+
+/**
+ * Generated by camel bui
[camel] 09/13: CAMEL-17687 - Create a Camel Azure Key Vault component - Kit
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c5280724591e4816dca111ab2ca973626137712e
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 11:54:51 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component - Kit
---
bom/camel-bom/pom.xml| 5 +
.../src/main/java/org/apache/camel/maven/packaging/MojoHelper.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 9439620..8890fe3 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -283,6 +283,11 @@
org.apache.camel
+camel-azure-key-vault
+${project.version}
+
+
+org.apache.camel
camel-azure-servicebus
${project.version}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
index 888191b..27de3bc 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
@@ -49,7 +49,7 @@ public final class MojoHelper {
case "camel-azure":
return Arrays.asList(dir.resolve("camel-azure-eventhubs"),
dir.resolve("camel-azure-storage-blob"),
dir.resolve("camel-azure-storage-datalake"),
dir.resolve("camel-azure-cosmosdb"),
-dir.resolve("camel-azure-storage-queue"),
dir.resolve("camel-azure-servicebus"));
+dir.resolve("camel-azure-storage-queue"),
dir.resolve("camel-azure-servicebus"), dir.resolve("camel-azure-key-vault"));
case "camel-google":
return Arrays.asList(dir.resolve("camel-google-bigquery"),
dir.resolve("camel-google-calendar"),
dir.resolve("camel-google-drive"),
dir.resolve("camel-google-mail"), dir.resolve("camel-google-pubsub"),
[camel] 10/13: CAMEL-17687 - Create a Camel Azure Key Vault component - Kit
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 926874fca1e99c62b1c1f3500a881ebccfeeb1eb
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 13:03:21 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component - Kit
---
bom/camel-bom/pom.xml | 4 +-
.../org/apache/camel/catalog/components.properties | 1 +
.../camel/catalog/components}/azure-key-vault.json | 3 +-
.../component/azure/key/vault/azure-key-vault.json | 3 +-
.../azure/key/vault/KeyVaultConstants.java | 2 +-
.../azure/key/vault/KeyVaultProducer.java | 9 +-
.../org/apache/camel/main/components.properties| 1 +
.../ROOT/examples/json/azure-key-vault.json| 1 +
docs/components/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/azure-key-vault-component.adoc | 1 +
.../component/ComponentsBuilderFactory.java| 13 +
.../dsl/AzureKeyVaultComponentBuilderFactory.java | 144 ++
.../src/generated/resources/metadata.json | 22 +
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/EndpointBuilders.java | 1 +
.../builder/endpoint/StaticEndpointBuilders.java | 43 ++
.../dsl/KeyVaultEndpointBuilderFactory.java| 491 +
.../EndpointConsumerDeserializersResolver.java | 1 +
.../EndpointProducerDeserializersResolver.java | 1 +
.../apache/camel/maven/packaging/MojoHelper.java | 3 +-
20 files changed, 734 insertions(+), 12 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 8890fe3..3707311 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -278,12 +278,12 @@
org.apache.camel
-camel-azure-parent
+camel-azure-key-vault
${project.version}
org.apache.camel
-camel-azure-key-vault
+camel-azure-parent
${project.version}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index 23e8e15..de8c49c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -41,6 +41,7 @@ aws2-sts
aws2-translate
azure-cosmosdb
azure-eventhubs
+azure-key-vault
azure-servicebus
azure-storage-blob
azure-storage-datalake
diff --git
a/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
similarity index 96%
copy from
components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json
copy to
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
index f331f2f..6560c92 100644
---
a/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
@@ -27,7 +27,8 @@
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
},
"headers": {
-"CamelAzureKeyVaultProducerOperation": { "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"org.apache.camel.component.azure.key.vault.KeyVaultOperationDefinition",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Overrides the desired operation to be used in the
producer." }
+"CamelAzureKeyVaultProducerOperation": { "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"org.apache.camel.component.azure.key.vault.KeyVaultOperationDefinition",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Overrides the desired operation to be used in the
producer." },
+"CamelAzureKeyVaultSecretName": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"String", "deprecated":
[camel] 13/13: CAMEL-17687 - Create a Camel Azure Key Vault component
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1755d35b365e4bb6837268b6ba9939092290b471
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 14:45:53 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component
---
.../resources/org/apache/camel/catalog/components/azure-key-vault.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
index 6560c92..4b78c18 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
@@ -36,7 +36,7 @@
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
"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.azure.key.vault.KeyVaultOperation",
"enum": [ "createSecret", "getSecret" ], "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Operation to be
performed" },
+"operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.azure.key.vault.KeyVaultOperation",
"enum": [ "createSecret", "getSecret", "deleteSecret" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Operation [...]
"clientId": { "kind": "parameter", "displayName": "Client Id", "group":
"security", "label": "security", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Client Id to be used" },
"clientSecret": { "kind": "parameter", "displayName": "Client Secret",
"group": "security", "label": "security", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Client Secret to be
used" },
"tenantId": { "kind": "parameter", "displayName": "Tenant Id", "group":
"security", "label": "security", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Tenant Id to be used" }
[camel] 12/13: CAMEL-17687 - Create a Camel Azure Key Vault component - Delete Secret Operation
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4b4697446e9b3bd89b78708117651b7477c12d93
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 13:29:25 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component - Delete Secret
Operation
---
.../component/azure/key/vault/azure-key-vault.json | 2 +-
.../azure/key/vault/KeyVaultOperation.java | 3 ++-
.../component/azure/key/vault/KeyVaultProducer.java | 17 +
.../operations/KeyVaultOperationsTest.java | 21 +++--
4 files changed, 39 insertions(+), 4 deletions(-)
diff --git
a/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json
b/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json
index 6560c92..4b78c18 100644
---
a/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json
+++
b/components/camel-azure/camel-azure-key-vault/src/generated/resources/org/apache/camel/component/azure/key/vault/azure-key-vault.json
@@ -36,7 +36,7 @@
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
"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.azure.key.vault.KeyVaultOperation",
"enum": [ "createSecret", "getSecret" ], "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Operation to be
performed" },
+"operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.azure.key.vault.KeyVaultOperation",
"enum": [ "createSecret", "getSecret", "deleteSecret" ], "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Operation [...]
"clientId": { "kind": "parameter", "displayName": "Client Id", "group":
"security", "label": "security", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Client Id to be used" },
"clientSecret": { "kind": "parameter", "displayName": "Client Secret",
"group": "security", "label": "security", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfiguration",
"configurationField": "configuration", "description": "Client Secret to be
used" },
"tenantId": { "kind": "parameter", "displayName": "Tenant Id", "group":
"security", "label": "security", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.azure.key.vault.KeyVaultConfigurati
[camel] 04/13: CAMEL-17687 - Create a Camel Azure Key Vault component
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bdb7f660b5cd955ee9808d1e6e619fc356e02484
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 11:12:44 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component
---
.../org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
index ce20663..1af5e11 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
+++
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
/**
- * Send and receive messages to/from Azure Event Bus.
+ * Manage secrets and keys in Azure Key Vault Service
*/
@UriEndpoint(firstVersion = "3.17.0", scheme = "azure-key-vault", title =
"Azure Key Vault",
syntax = "azure-key-vault:vaultName", category = {
[camel] 07/13: CAMEL-17687 - Create a Camel Azure Key Vault component
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1dfe2ff432fd0cb6d94c49daf975ea0f066d516e
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 11:51:02 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component
---
.../azure/key/vault/KeyVaultConstants.java | 4 +++
.../azure/key/vault/KeyVaultEndpoint.java | 38 ++
.../azure/key/vault/KeyVaultProducer.java | 28 +---
.../operations/KeyVaultOperationsTest.java | 8 ++---
4 files changed, 54 insertions(+), 24 deletions(-)
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultConstants.java
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultConstants.java
index fad06dd..d5696eb 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultConstants.java
+++
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultConstants.java
@@ -25,6 +25,10 @@ public final class KeyVaultConstants {
@Metadata(label = "producer", description = "Overrides the desired
operation to be used in the producer.",
javaType =
"org.apache.camel.component.azure.key.vault.KeyVaultOperationDefinition")
public static final String OPERATION = HEADER_PREFIX + "ProducerOperation";
+// headers set by the producer only
+@Metadata(label = "producer", description = "The secret name to be used in
Key Vault",
+javaType = "String")
+public static final String SECRET_NAME = HEADER_PREFIX + "SecretName";
private KeyVaultConstants() {
}
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
index 1af5e11..a3219b0 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
+++
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.azure.key.vault;
+import com.azure.identity.ClientSecretCredential;
+import com.azure.identity.ClientSecretCredentialBuilder;
+import com.azure.security.keyvault.secrets.SecretClient;
+import com.azure.security.keyvault.secrets.SecretClientBuilder;
import org.apache.camel.Category;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -34,6 +38,8 @@ import org.apache.camel.support.DefaultEndpoint;
headersClass = KeyVaultConstants.class)
public class KeyVaultEndpoint extends DefaultEndpoint {
+private SecretClient secretClient;
+
@UriParam
private KeyVaultConfiguration configuration;
@@ -43,6 +49,27 @@ public class KeyVaultEndpoint extends DefaultEndpoint {
}
@Override
+public void doInit() throws Exception {
+super.doInit();
+
+// Build key vault URI
+String keyVaultUri = "https://"; + getConfiguration().getVaultName() +
".vault.azure.net";
+
+// Credential
+ClientSecretCredential credential = new ClientSecretCredentialBuilder()
+.tenantId(getConfiguration().getTenantId())
+.clientId(getConfiguration().getClientId())
+.clientSecret(getConfiguration().getClientSecret())
+.build();
+
+// Build Client
+secretClient = new SecretClientBuilder()
+.vaultUrl(keyVaultUri)
+.credential(credential)
+.buildClient();
+}
+
+@Override
public Producer createProducer() throws Exception {
return new KeyVaultProducer(this);
}
@@ -62,4 +89,15 @@ public class KeyVaultEndpoint extends DefaultEndpoint {
public void setConfiguration(KeyVaultConfiguration configuration) {
this.configuration = configuration;
}
+
+/**
+ * The secret Client
+ */
+public SecretClient getSecretClient() {
+return secretClient;
+}
+
+public void setSecretClient(SecretClient secretClient) {
+this.secretClient = secretClient;
+}
}
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
index f760d8b..b9c1e52 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultProducer.java
+++
b/components/camel-a
[GitHub] [camel] orpiske opened a new pull request #7298: CAMEL-17879: removes the deprecated component camel-atomix
orpiske opened a new pull request #7298: URL: https://github.com/apache/camel/pull/7298 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7298: CAMEL-17879: removes the deprecated component camel-atomix
github-actions[bot] commented on pull request #7298: URL: https://github.com/apache/camel/pull/7298#issuecomment-1083112316 This PR changes components and will be tested automatically -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) ci: fixed missing GITHUB_TOKEN on the comment script
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 11d9d4c (chores) ci: fixed missing GITHUB_TOKEN on the comment script
11d9d4c is described below
commit 11d9d4c16cb7ee136374f78349fa140b95e46a8a
Author: Otavio Rodolfo Piske
AuthorDate: Wed Mar 30 15:00:11 2022 +0200
(chores) ci: fixed missing GITHUB_TOKEN on the comment script
---
.github/workflows/component-pr.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/component-pr.yaml
b/.github/workflows/component-pr.yaml
index 4935070..ecddf73 100644
--- a/.github/workflows/component-pr.yaml
+++ b/.github/workflows/component-pr.yaml
@@ -33,7 +33,7 @@ jobs:
RESULT: ${{ steps.quick-test.outputs.result }}
COUNT: ${{ steps.quick-test.outputs.count }}
with:
- github-token: ${{inputs.github-token}}
+ github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const { RESULT, COUNT } = process.env
[GitHub] [camel-k] KuthumiPepple commented on a change in pull request #3153: fix: redirect ouput and errors to appropriate writer
KuthumiPepple commented on a change in pull request #3153:
URL: https://github.com/apache/camel-k/pull/3153#discussion_r838520420
##
File path: e2e/support/test_support.go
##
@@ -1719,9 +1719,9 @@ func UserCleanup() {
command.Stderr = os.Stderr
command.Stdout = os.Stdout
if err := command.Run(); err != nil {
- fmt.Printf("An error occurred during user cleanup
command execution: %v\n", err)
+ fmt.Fprintf(command.Stderr, "An error occurred during
user cleanup command execution: %v\n", err)
Review comment:
Ok thank you. I'll use that
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel-website-pub] branch asf-site updated (2d718a7 -> bf349f1)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git. discard 2d718a7 Website updated to ea33721044d913cc6ea4120778b145c4d9d38861 discard 6895ea3 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new a1ba0f3 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new bf349f1 Website updated to ea33721044d913cc6ea4120778b145c4d9d38861 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2d718a7) \ N -- N -- N refs/heads/asf-site (bf349f1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 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: camel-kamelets/0.6.x/index.html |2 +- camel-kamelets/0.7.x/index.html |2 +- camel-kamelets/next/index.html |2 +- components/next/mail-component.html |7 +- manual/camel-3x-upgrade-guide-3_17.html |2 +- site-manifest.json |2 +- sitemap-camel-k.xml | 654 +-- sitemap-camel-kafka-connector.xml | 1706 +++ sitemap-camel-kamelets.xml | 994 ++-- sitemap-camel-karaf.xml | 78 +- sitemap-camel-quarkus.xml | 1392 +++--- sitemap-camel-spring-boot.xml | 56 +- sitemap-components.xml | 7962 +++ sitemap-manual.xml | 392 +- 14 files changed, 6627 insertions(+), 6624 deletions(-)
[GitHub] [camel-k] squakez commented on issue #3127: Log a warn message once the component used has not a quarkus extension
squakez commented on issue #3127: URL: https://github.com/apache/camel-k/issues/3127#issuecomment-1083120353 > Can't we verify the validity of any requested camel artifacts by attempting to look them up in the catalog, instead of parsing logs? Yeah, it's a very good idea. Probably we can extend the functions in https://github.com/apache/camel-k/blob/main/pkg/util/camel/camel_dependencies.go to lookup into the catalog, otherwise returning an error. If we go through this path, I am not sure if it's still suitable as a "good first issue" for contributors as it requires a bit of knowledge of the project. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7298: CAMEL-17879: removes the deprecated component camel-atomix
github-actions[bot] commented on pull request #7298: URL: https://github.com/apache/camel/pull/7298#issuecomment-1083127638 This PR changes components and will be tested automatically -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] SubhasmitaSw commented on pull request #3152: Example to show usage of prometheus trait
SubhasmitaSw commented on pull request #3152:
URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1083128202
I hope this looks fine now
```
import org.apache.camel.builder.RouteBuilder;
public class ServiceMonitor extends RouteBuilder {
@Override
public void configure() throws Exception {
from("timer:tick")
.setHeader("example")
.constant("Hello Camel K!")
.to("log:info");
}
}
```
and to test it if its running i tried to run using
`kamel run -t Hello.java prometheus.enabled=true`
However, I'm receiving an issue that I don't seem to understand right now.
`Error: cannot read sources: cannot read sources: missing file or
unsupported scheme in prometheus.enabled=true`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] SubhasmitaSw edited a comment on pull request #3152: Example to show usage of prometheus trait
SubhasmitaSw edited a comment on pull request #3152:
URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1083128202
I hope this looks fine now
```
import org.apache.camel.builder.RouteBuilder;
public class ServiceMonitor extends RouteBuilder {
@Override
public void configure() throws Exception {
from("timer:tick")
.setHeader("example")
.constant("Hello Camel K!")
.to("log:info");
}
}
```
and to test it if its working i tried to run using
`kamel run -t Hello.java prometheus.enabled=true`
However, I'm receiving an issue that I don't seem to understand right now.
`Error: cannot read sources: cannot read sources: missing file or
unsupported scheme in prometheus.enabled=true`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on pull request #3152: Example to show usage of prometheus trait
astefanutti commented on pull request #3152: URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1083129380 That should be `kamel run -t prometheus.enabled=true Hello.java` :) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) ci: avoid commenting the PR every time it is synced
This is an automated email from the ASF dual-hosted git repository. orpiske 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 41f898c (chores) ci: avoid commenting the PR every time it is synced 41f898c is described below commit 41f898c83309dbb13006ec483975c4d50cf8233f Author: Otavio Rodolfo Piske AuthorDate: Wed Mar 30 15:19:23 2022 +0200 (chores) ci: avoid commenting the PR every time it is synced --- .github/workflows/component-pr.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/component-pr.yaml b/.github/workflows/component-pr.yaml index ecddf73..14a08fb 100644 --- a/.github/workflows/component-pr.yaml +++ b/.github/workflows/component-pr.yaml @@ -19,6 +19,9 @@ name: component check on: pull_request_target: +types: + - opened + - reopened paths: - 'components/*'
[GitHub] [camel-k] SubhasmitaSw commented on pull request #3152: Example to show usage of prometheus trait
SubhasmitaSw commented on pull request #3152: URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1083136060 @astefanutti Thanks, it worked. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] SubhasmitaSw commented on pull request #3152: Example to show usage of prometheus trait
SubhasmitaSw commented on pull request #3152: URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1083138274 I have one more query, the license comment is auto-generated? or just have to copy-paste it? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on pull request #3152: Example to show usage of prometheus trait
astefanutti commented on pull request #3152: URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1083143898 > I have one more query, the license comment is auto-generated? or just have to copy-paste it? I think you have to add it manually in the extra example file. That being said, in the Prometheus trait example, there is nothing specific to the integration, so I wonder if that's really necessary to create an extra integration example for that. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti edited a comment on pull request #3152: Example to show usage of prometheus trait
astefanutti edited a comment on pull request #3152: URL: https://github.com/apache/camel-k/pull/3152#issuecomment-1083143898 > I have one more query, the license comment is auto-generated? or just have to copy-paste it? I think you have to add it manually in the extra example file. That being said, in the Prometheus trait example, there is nothing specific to the integration (as opposed to the JVM trait example that requires specific integrations), so I wonder if that's really necessary to create an extra integration example for that. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/04: CAMEL-17687 - Create a Camel Azure Key Vault component - Adding client instance to configuration
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 032c8d1d6b694c26d0b333276b51bc824aa2224f
Author: Andrea Cosentino
AuthorDate: Wed Mar 30 15:01:44 2022 +0200
CAMEL-17687 - Create a Camel Azure Key Vault component - Adding client
instance to configuration
---
.../component/azure/key/vault/KeyVaultComponent.java | 5 +
.../azure/key/vault/KeyVaultConfiguration.java | 18 +++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultComponent.java
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultComponent.java
index 3236024..9d1c77a 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultComponent.java
+++
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultComponent.java
@@ -60,6 +60,11 @@ public class KeyVaultComponent extends DefaultComponent {
final KeyVaultEndpoint endpoint = new KeyVaultEndpoint(uri, this,
configuration);
setProperties(endpoint, parameters);
+if (configuration.getSecretClient() == null
+&& (configuration.getClientId() == null ||
configuration.getClientSecret() == null || configuration.getTenantId() ==
null)) {
+throw new IllegalArgumentException("Azure Secret Client or client
Id, client secret and tenant Id must be specified");
+}
+
return endpoint;
}
}
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultConfiguration.java
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultConfiguration.java
index 625032f..a92ef9e 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultConfiguration.java
+++
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultConfiguration.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.azure.key.vault;
+import com.azure.security.keyvault.secrets.SecretClient;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
@@ -27,19 +28,30 @@ public class KeyVaultConfiguration implements Cloneable {
@UriPath
private String vaultName;
+@UriParam
+@Metadata(autowired = true)
+private SecretClient secretClient;
@UriParam(label = "security", secret = true)
-@Metadata(required = true)
private String clientId;
@UriParam(label = "security", secret = true)
-@Metadata(required = true)
private String clientSecret;
@UriParam(label = "security", secret = true)
-@Metadata(required = true)
private String tenantId;
@UriParam(label = "producer")
private KeyVaultOperation operation = KeyVaultOperation.createSecret;
/**
+ * Instance of Secret client
+ */
+public SecretClient getSecretClient() {
+return secretClient;
+}
+
+public void setSecretClient(SecretClient secretClient) {
+this.secretClient = secretClient;
+}
+
+/**
* Vault Name to be used
*/
public String getVaultName() {
[camel] branch main updated (41f898c -> 80e4991)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 41f898c (chores) ci: avoid commenting the PR every time it is synced new 032c8d1 CAMEL-17687 - Create a Camel Azure Key Vault component - Adding client instance to configuration new 534f44f CAMEL-17687 - Create a Camel Azure Key Vault component - Adding client instance to configuration new a900570 CAMEL-17687 - Create a Camel Azure Key Vault component - Adding client instance to configuration new 80e4991 CAMEL-17687 - Create a Camel Azure Key Vault component - Adding client instance to configuration 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: .../camel/catalog/components/azure-key-vault.json | 7 +- .../key/vault/KeyVaultEndpointConfigurer.java | 11 +++ .../key/vault/KeyVaultEndpointUriFactory.java | 3 +- .../component/azure/key/vault/azure-key-vault.json | 7 +- .../azure/key/vault/KeyVaultComponent.java | 13 ++- .../azure/key/vault/KeyVaultConfiguration.java | 18 +++- .../azure/key/vault/KeyVaultEndpoint.java | 9 +- .../dsl/KeyVaultEndpointBuilderFactory.java| 102 +++-- 8 files changed, 147 insertions(+), 23 deletions(-)
