Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
oscerd closed pull request #1103: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1103 -- 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
Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
oscerd commented on PR #1103: URL: https://github.com/apache/camel-spring-boot/pull/1103#issuecomment-1986781583 Wrong -- 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
Re: [PR] CAMEL-16557: add a free form key value map on components, dataformats, languages, etc [camel]
lburgazzoli commented on PR #13423: URL: https://github.com/apache/camel/pull/13423#issuecomment-1986779728 > I dont think we need to have org.apache.camel as prefix for protocol, autoscaling etc. At this stage it was a port 1-1 of what exists in camel-k where the `org.apache.camel` was meant as a namespace for camel specific things, opening the door to add other, non camel specific annotation, like `dev.knative, io.strimzi, software.amazon`. Now I think we can remove the namespace since we are moving to the camel catalog, I'll do so on Monday. > Also is there anything that is autoscaling = false. It seems its just everything that is true This was just a marker were the absence means autoscaling=false -- 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-spring-boot) branch main updated: Regen
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 832c93b2821 Regen
832c93b2821 is described below
commit 832c93b28216c671b51d6cd4fb6fa4c5f0b6c34a
Author: Claus Ibsen
AuthorDate: Sat Mar 9 08:33:28 2024 +0100
Regen
---
.../apache/camel/springboot/catalog/components/aws-bedrock-agent.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
index 2816931d7ff..73667b1f4c0 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
@@ -28,7 +28,7 @@
"knowledgeBaseId": { "index": 2, "kind": "property", "displayName":
"Knowledge Base Id", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Knowledge
Base Id we are going to use" },
"lazyStartProducer": { "index": 3, "kind": "property", "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 [...]
"modelId": { "index": 4, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "anthropic.claude-instant-v1",
"anthropic.claude-v2", "anthropic.claude-v2:1" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descr [...]
-"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descript [...]
+"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob", "listIngestionJobs" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "conf [...]
"overrideEndpoint": { "index": 6, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used [...]
"pojoRequest": { "index": 7, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"profileCredentialsName": { "index": 8, "kind": "property", "displayName":
"Profile Credentials Name", "group": "producer", "label": "", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false",
"configurationClass":
Re: [PR] CAMEL-16557: add a free form key value map on components, dataformats, languages, etc [camel]
davsclaus commented on PR #13423: URL: https://github.com/apache/camel/pull/13423#issuecomment-1986775337 I dont think we need to have org.apache.camel as prefix for protocol, autoscaling etc. Also is there anything that is autoscaling = false. It seems its just everything that is 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
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1986698648 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8211424594-1416-6e73df43-b977-4f9a-91ce-bb59e409581e * Camel Quarkus Commit: c3867380d86ee016ee3e17be9665f7510cd59cac * Quarkus Main Commit: b2930ef0dcb3aa8b9259d650cf6c8abb974b1ec3 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8211424594 -- 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-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 7e80ff0f2 chore: changelog automatic update 7e80ff0f2 is described below commit 7e80ff0f28a036c3b7d3e54299fc7ce386e19202 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 9 01:08:30 2024 + chore: changelog automatic update --- CHANGELOG.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93affe488..d2ef583cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,18 @@ **Closed issues:** +- Update buil/Dokerfile to use go 1.21 [\#5231](https://github.com/apache/camel-k/issues/5231) +- Error java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint [\#5225](https://github.com/apache/camel-k/issues/5225) +- Misleading "Monitor: Integration needs a rebuild" message [\#5219](https://github.com/apache/camel-k/issues/5219) - Route parameters are ignored for `path` parameters [\#5203](https://github.com/apache/camel-k/issues/5203) - Builder property failure when using non xml tag characters [\#5195](https://github.com/apache/camel-k/issues/5195) - Error configuring property: camel.component.test\[1\]port\[80\]tcp.addr because cannot find component with name test\[1\]port\[80\]tcp. [\#5179](https://github.com/apache/camel-k/issues/5179) - Get environment variable value is empty in properties file [\#5178](https://github.com/apache/camel-k/issues/5178) - Debug Integrations failing [\#5161](https://github.com/apache/camel-k/issues/5161) +- Multiple crons at the same Integration do not run as expected [\#5158](https://github.com/apache/camel-k/issues/5158) +- Kamel delete KameletBinding only removes integration resource [\#5156](https://github.com/apache/camel-k/issues/5156) - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143) +- Running integrations fail when the used registry has a port other than default 80 [\#5141](https://github.com/apache/camel-k/issues/5141) - camel-jackson configure configure "autoDiscoverObjectMapper" property for non-spring boot application [\#5140](https://github.com/apache/camel-k/issues/5140) - Integrations remain in Initialization loop when referenced config map has owner references [\#5114](https://github.com/apache/camel-k/issues/5114) - Externally built Integrations are deployed without a command in Camel-K 2.2.0 [\#5112](https://github.com/apache/camel-k/issues/5112) @@ -19,6 +25,7 @@ - Add possibility to configure annotation for the builder pods [\#5106](https://github.com/apache/camel-k/issues/5106) - Include the operator node-selector in the helm chart [\#5103](https://github.com/apache/camel-k/issues/5103) - TestCreateCatalog fail when DEFAULT\_RUNTIME\_VERSION=3.6.0-SNAPSHOT [\#5099](https://github.com/apache/camel-k/issues/5099) +- Remove secondary IntegrationPlatform in favor of using IntegrationProfile settings [\#5097](https://github.com/apache/camel-k/issues/5097) - Quartz builds failing to start when using native builds [\#5088](https://github.com/apache/camel-k/issues/5088) - Ability to set different resources for jvm and native containers when both are used in the same Integration [\#5065](https://github.com/apache/camel-k/issues/5065) - Don't run dependabot on forked repos [\#5063](https://github.com/apache/camel-k/issues/5063)
Re: [PR] Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.0 to 3.2.1 [camel-quarkus]
zhfeng merged PR #5854: URL: https://github.com/apache/camel-quarkus/pull/5854 -- 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 dependabot/maven/io.quarkiverse.artemis-quarkus-artemis-bom-3.2.1 deleted (was fde757c07e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.artemis-quarkus-artemis-bom-3.2.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was fde757c07e Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.0 to 3.2.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch main updated: Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.0 to 3.2.1 (#5854)
This is an automated email from the ASF dual-hosted git repository. zhfeng 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 b2930ef0dc Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.0 to 3.2.1 (#5854) b2930ef0dc is described below commit b2930ef0dcb3aa8b9259d650cf6c8abb974b1ec3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sat Mar 9 09:01:22 2024 +0800 Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.0 to 3.2.1 (#5854) Bumps [io.quarkiverse.artemis:quarkus-artemis-bom](https://github.com/quarkiverse/quarkus-artemis) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/quarkiverse/quarkus-artemis/releases) - [Commits](https://github.com/quarkiverse/quarkus-artemis/compare/3.2.0...3.2.1) --- updated-dependencies: - dependency-name: io.quarkiverse.artemis:quarkus-artemis-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f0197b7c4..e25acfcea9 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 2.5.0.Final 2.12.1 -3.2.0 +3.2.1 3.8.0 1.0.0 3.8.0
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1986664669 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 8210534951-1312-79d72624-0ac8-460b-a585-2581676899e7 * Camel Quarkus Commit: e841abf651dc6ff77750823f8a259e9414845f1f * Camel Main Commit: ff9d9545e267d6481e5315d6dc9645c8162d65e5 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8210534951 -- 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
Re: [PR] CAMEL-20521: camel-amqp - AMQP publisher application is losing messages with local JMS transaction enabled [camel]
zhfeng commented on code in PR #13403:
URL: https://github.com/apache/camel/pull/13403#discussion_r1518442503
##
components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java:
##
@@ -51,4 +64,28 @@ public void setIncludeAmqpAnnotations(boolean
includeAmqpAnnotations) {
this.includeAmqpAnnotations = includeAmqpAnnotations;
}
+public static class CamelAmqpTemplate extends CamelJmsTemplate {
+
+public CamelAmqpTemplate(AMQPConfiguration config, ConnectionFactory
connectionFactory) {
+super(config, connectionFactory);
+}
+
+@Override
+protected void commitIfNecessary(Session session) throws JMSException {
+//# CAMEL-20521 - we can't use JmsUtils.commitIfNecessary because
it catches
+// jakarta.jms.IllegalStateException that can be thrown if the
session is closed
Review Comment:
I'm not sure why this can fix CAMEL-20521 when session is closed during the
commit? It will lead to the re-connecting?
--
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
Re: [I] Running integrations fail when the used registry has a port other than default 80 [camel-k]
bvahdat commented on issue #5141: URL: https://github.com/apache/camel-k/issues/5141#issuecomment-1986599401 Thanks @squakez for looking into this. So what this means is that currently using [minikube registry](https://minikube.sigs.k8s.io/docs/handbook/registry/) with it's default port `5000` one can not run any camel-k integration. Maybe this needs to mentioned [here](https://camel.apache.org/camel-k/2.2.x/installation/platform/minikube.html)? -- 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-2.1.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.1.x by this push: new 5510e3985 chore: changelog automatic update 5510e3985 is described below commit 5510e3985234a8c9dff85c56872d59c2f3a3771c Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 9 00:24:55 2024 + chore: changelog automatic update --- CHANGELOG.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93affe488..d2ef583cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,18 @@ **Closed issues:** +- Update buil/Dokerfile to use go 1.21 [\#5231](https://github.com/apache/camel-k/issues/5231) +- Error java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint [\#5225](https://github.com/apache/camel-k/issues/5225) +- Misleading "Monitor: Integration needs a rebuild" message [\#5219](https://github.com/apache/camel-k/issues/5219) - Route parameters are ignored for `path` parameters [\#5203](https://github.com/apache/camel-k/issues/5203) - Builder property failure when using non xml tag characters [\#5195](https://github.com/apache/camel-k/issues/5195) - Error configuring property: camel.component.test\[1\]port\[80\]tcp.addr because cannot find component with name test\[1\]port\[80\]tcp. [\#5179](https://github.com/apache/camel-k/issues/5179) - Get environment variable value is empty in properties file [\#5178](https://github.com/apache/camel-k/issues/5178) - Debug Integrations failing [\#5161](https://github.com/apache/camel-k/issues/5161) +- Multiple crons at the same Integration do not run as expected [\#5158](https://github.com/apache/camel-k/issues/5158) +- Kamel delete KameletBinding only removes integration resource [\#5156](https://github.com/apache/camel-k/issues/5156) - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143) +- Running integrations fail when the used registry has a port other than default 80 [\#5141](https://github.com/apache/camel-k/issues/5141) - camel-jackson configure configure "autoDiscoverObjectMapper" property for non-spring boot application [\#5140](https://github.com/apache/camel-k/issues/5140) - Integrations remain in Initialization loop when referenced config map has owner references [\#5114](https://github.com/apache/camel-k/issues/5114) - Externally built Integrations are deployed without a command in Camel-K 2.2.0 [\#5112](https://github.com/apache/camel-k/issues/5112) @@ -19,6 +25,7 @@ - Add possibility to configure annotation for the builder pods [\#5106](https://github.com/apache/camel-k/issues/5106) - Include the operator node-selector in the helm chart [\#5103](https://github.com/apache/camel-k/issues/5103) - TestCreateCatalog fail when DEFAULT\_RUNTIME\_VERSION=3.6.0-SNAPSHOT [\#5099](https://github.com/apache/camel-k/issues/5099) +- Remove secondary IntegrationPlatform in favor of using IntegrationProfile settings [\#5097](https://github.com/apache/camel-k/issues/5097) - Quartz builds failing to start when using native builds [\#5088](https://github.com/apache/camel-k/issues/5088) - Ability to set different resources for jvm and native containers when both are used in the same Integration [\#5065](https://github.com/apache/camel-k/issues/5065) - Don't run dependabot on forked repos [\#5063](https://github.com/apache/camel-k/issues/5063)
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1103: URL: https://github.com/apache/camel-spring-boot/pull/1103 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- 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 main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot 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 3fd3fdfa1 chore: nightly automatic updates 3fd3fdfa1 is described below commit 3fd3fdfa12044d35dba04ba8ac98c8e6a5b793f7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Mar 8 23:46:15 2024 + chore: nightly automatic updates --- CHANGELOG.md | 15 ++ README.adoc | 2 +- badge.out| 2 +- coverage | 2 +- coverage.out | 603 ++- 5 files changed, 320 insertions(+), 304 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da0ade7ce..5fd06d71f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,18 @@ **Closed issues:** +- Update buil/Dokerfile to use go 1.21 [\#5231](https://github.com/apache/camel-k/issues/5231) +- Error java.lang.ClassNotFoundException: io.quarkus.bootstrap.runner.QuarkusEntryPoint [\#5225](https://github.com/apache/camel-k/issues/5225) +- Misleading "Monitor: Integration needs a rebuild" message [\#5219](https://github.com/apache/camel-k/issues/5219) - Route parameters are ignored for `path` parameters [\#5203](https://github.com/apache/camel-k/issues/5203) - Builder property failure when using non xml tag characters [\#5195](https://github.com/apache/camel-k/issues/5195) - Error configuring property: camel.component.test\[1\]port\[80\]tcp.addr because cannot find component with name test\[1\]port\[80\]tcp. [\#5179](https://github.com/apache/camel-k/issues/5179) - Get environment variable value is empty in properties file [\#5178](https://github.com/apache/camel-k/issues/5178) - Debug Integrations failing [\#5161](https://github.com/apache/camel-k/issues/5161) +- Multiple crons at the same Integration do not run as expected [\#5158](https://github.com/apache/camel-k/issues/5158) +- Kamel delete KameletBinding only removes integration resource [\#5156](https://github.com/apache/camel-k/issues/5156) - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143) +- Running integrations fail when the used registry has a port other than default 80 [\#5141](https://github.com/apache/camel-k/issues/5141) - camel-jackson configure configure "autoDiscoverObjectMapper" property for non-spring boot application [\#5140](https://github.com/apache/camel-k/issues/5140) - Integrations remain in Initialization loop when referenced config map has owner references [\#5114](https://github.com/apache/camel-k/issues/5114) - Externally built Integrations are deployed without a command in Camel-K 2.2.0 [\#5112](https://github.com/apache/camel-k/issues/5112) @@ -19,6 +25,7 @@ - Add possibility to configure annotation for the builder pods [\#5106](https://github.com/apache/camel-k/issues/5106) - Include the operator node-selector in the helm chart [\#5103](https://github.com/apache/camel-k/issues/5103) - TestCreateCatalog fail when DEFAULT\_RUNTIME\_VERSION=3.6.0-SNAPSHOT [\#5099](https://github.com/apache/camel-k/issues/5099) +- Remove secondary IntegrationPlatform in favor of using IntegrationProfile settings [\#5097](https://github.com/apache/camel-k/issues/5097) - Quartz builds failing to start when using native builds [\#5088](https://github.com/apache/camel-k/issues/5088) - Ability to set different resources for jvm and native containers when both are used in the same Integration [\#5065](https://github.com/apache/camel-k/issues/5065) - Don't run dependabot on forked repos [\#5063](https://github.com/apache/camel-k/issues/5063) @@ -50,6 +57,13 @@ **Merged pull requests:** +- fix\(cmd\): delete KameletBinding until they exists [\#5237](https://github.com/apache/camel-k/pull/5237) ([squakez](https://github.com/squakez)) +- fix\(ctrl\): message digest change [\#5236](https://github.com/apache/camel-k/pull/5236) ([squakez](https://github.com/squakez)) +- fix\(build\): Upgrade container image to golang 1.21 [\#5235](https://github.com/apache/camel-k/pull/5235) ([gansheer](https://github.com/gansheer)) +- \[Regression\] fix\(quarkus\): don't override application.properties [\#5234](https://github.com/apache/camel-k/pull/5234) ([squakez](https://github.com/squakez)) +- fix\(trait\): revert persisted status [\#5233](https://github.com/apache/camel-k/pull/5233) ([squakez](https://github.com/squakez)) +- chore\(deps\): bump github.com/prometheus/common from 0.48.0 to 0.50.0 [\#5232](https://github.com/apache/camel-k/pull/5232) ([dependabot[bot]](https://github.com/apps/dependabot)) +- fix\(trait\): Add documentation and test on multiple sources [\#5229](https://github.com/apache/camel-k/pull/5229) ([gansheer](https://github.com/gansheer)) - chore\(deps\): bump github.com/cloudevents/sdk-go/v2
[PR] Update camel-3-migration-guide.adoc [camel]
nrkkalyan opened a new pull request, #13425: URL: https://github.com/apache/camel/pull/13425 Added additional information for supported java version # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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 dependabot/maven/io.quarkiverse.artemis-quarkus-artemis-bom-3.2.1 created (now fde757c07e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.artemis-quarkus-artemis-bom-3.2.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at fde757c07e Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.0 to 3.2.1 No new revisions were added by this update.
[PR] Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.0 to 3.2.1 [camel-quarkus]
dependabot[bot] opened a new pull request, #5854: URL: https://github.com/apache/camel-quarkus/pull/5854 Bumps [io.quarkiverse.artemis:quarkus-artemis-bom](https://github.com/quarkiverse/quarkus-artemis) from 3.2.0 to 3.2.1. Release notes Sourced from https://github.com/quarkiverse/quarkus-artemis/releases;>io.quarkiverse.artemis:quarkus-artemis-bom's releases. 3.2.1 Release Notes: New features: Allow configuring a client id at the adapter level (https://redirect.github.com/quarkiverse/quarkus-artemis/issues/428;>#428) Version updates: Changed quarkus version form 3.8.1 to 3.8.2 Changed quarkus-camel-bom version form 3.8.1 to 3.8.2 Please check the https://quarkiverse.github.io/quarkiverse-docs/quarkus-artemis/dev/index.html;>project documentation. Full Changelog: https://github.com/quarkiverse/quarkus-artemis/compare/3.2.0...3.2.1;>https://github.com/quarkiverse/quarkus-artemis/compare/3.2.0...3.2.1 Commits https://github.com/quarkiverse/quarkus-artemis/commit/6b791f1ea394dfef81e89dcd7f7ffb9d3db13442;>6b791f1 [maven-release-plugin] prepare release 3.2.1 https://github.com/quarkiverse/quarkus-artemis/commit/8ccdbf392d6952b19f99c4d0c306ca39a7a1fcd6;>8ccdbf3 Update the latest release version 3.2.1 in documentation https://github.com/quarkiverse/quarkus-artemis/commit/9449de0dd3f68b88424bc4d8a2ff134bf5521a6c;>9449de0 Release 3.2.1 (https://redirect.github.com/quarkiverse/quarkus-artemis/issues/433;>#433) https://github.com/quarkiverse/quarkus-artemis/commit/4278e61fc047219f9fa84536282f5a534dd3fa4b;>4278e61 Bump io.quarkus.platform:quarkus-camel-bom from 3.8.1 to 3.8.2 (https://redirect.github.com/quarkiverse/quarkus-artemis/issues/430;>#430) https://github.com/quarkiverse/quarkus-artemis/commit/4c68e455c7cc12d21954b4a849ee2bd8359b4efc;>4c68e45 Bump quarkus.version from 3.8.1 to 3.8.2 (https://redirect.github.com/quarkiverse/quarkus-artemis/issues/429;>#429) https://github.com/quarkiverse/quarkus-artemis/commit/57e6af66c6f0c7ddc4d79d464486d24fe55ce31e;>57e6af6 Closes https://redirect.github.com/quarkiverse/quarkus-artemis/issues/427;>#427 Allow configuring a client id at the adapter level (https://redirect.github.com/quarkiverse/quarkus-artemis/issues/428;>#428) https://github.com/quarkiverse/quarkus-artemis/commit/71e0ce4e501b950d01ef9c1bcc8d682665b2ad74;>71e0ce4 docs: update .all-contributorsrc [skip ci] https://github.com/quarkiverse/quarkus-artemis/commit/817d52937ca7f443b87b49865558a6c44d5bba6a;>817d529 docs: update README.md [skip ci] https://github.com/quarkiverse/quarkus-artemis/commit/b8abaa119bf900c058853e933c50a41a7b68b663;>b8abaa1 Closes https://redirect.github.com/quarkiverse/quarkus-artemis/issues/400;>#400 support additional activation specs in the config. (https://redirect.github.com/quarkiverse/quarkus-artemis/issues/401;>#401) https://github.com/quarkiverse/quarkus-artemis/commit/e24a369fb8d5f1b1dba7323385abf1e193893ce4;>e24a369 [maven-release-plugin] prepare for next development iteration See full diff in https://github.com/quarkiverse/quarkus-artemis/compare/3.2.0...3.2.1;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it
Re: [PR] Update what-platforms-are-supported.adoc [camel]
nrkkalyan commented on PR #13424: URL: https://github.com/apache/camel/pull/13424#issuecomment-1986439280 Added additional clarity with respect to supported java versions for each version -- 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
[PR] Update what-platforms-are-supported.adoc [camel]
nrkkalyan opened a new pull request, #13424: URL: https://github.com/apache/camel/pull/13424 Added some additional clarification on the java version support. # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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
Re: [PR] chore(e2e): Improve E2E tests [camel-k]
squakez commented on PR #5188: URL: https://github.com/apache/camel-k/pull/5188#issuecomment-1986392093 Forget my last comment, I see the `main` branch is up to date. Thanks. -- 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
Re: [PR] chore(e2e): Improve E2E tests [camel-k]
squakez commented on PR #5188: URL: https://github.com/apache/camel-k/pull/5188#issuecomment-1986390359 > @squakez many thanks. I managed to get a setup working on my arm64 machine with the native E2E tests. Run them all manually and all have been green! Will continue to merge now Good. Do you mind also updating the documentation [1] with all the latest changes? thanks. [1] https://camel.apache.org/camel-k/2.2.x/contributing/e2e.html -- 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
Re: [PR] fix(traits): use Comparable matches [camel-k]
squakez commented on PR #5230: URL: https://github.com/apache/camel-k/pull/5230#issuecomment-1986387256 ``` --- PASS: TestNativeHighMemoryIntegrations (1750.79s) --- PASS: TestNativeHighMemoryIntegrations/java_native_support (847.92s) --- PASS: TestNativeHighMemoryIntegrations/java_native_support/java_native_same_should_not_rebuild (2.22s) --- PASS: TestNativeHighMemoryIntegrations/java_native_support/java_native_should_rebuild (417.19s) --- PASS: TestNativeHighMemoryIntegrations/groovy_native_support (457.62s) --- PASS: TestNativeHighMemoryIntegrations/kotlin_native_support (434.65s) PASS ok github.com/apache/camel-k/v2/e2e/native 1750.826s --- PASS: TestNativeBinding (435.95s) --- PASS: TestNativeBinding/binding_with_native_build (421.78s) --- PASS: TestNativeIntegrations (846.09s) --- PASS: TestNativeIntegrations/unsupported_integration_source_language (0.80s) --- PASS: TestNativeIntegrations/xml_native_support (410.86s) --- PASS: TestNativeIntegrations/automatic_rollout_deployment_from_jvm_to_native_kit (424.50s) --- PASS: TestNativeIntegrations/automatic_rollout_deployment_from_jvm_to_native_kit/yaml_native_should_not_rebuild (2.76s) PASS ok github.com/apache/camel-k/v2/e2e/native 1282.082s `` -- 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
Re: [I] Remove secondary IntegrationPlatform in favor of using IntegrationProfile settings [camel-k]
christophd commented on issue #5097: URL: https://github.com/apache/camel-k/issues/5097#issuecomment-1986304849 Closed with #5138 -- 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
Re: [I] Remove secondary IntegrationPlatform in favor of using IntegrationProfile settings [camel-k]
christophd closed issue #5097: Remove secondary IntegrationPlatform in favor of using IntegrationProfile settings URL: https://github.com/apache/camel-k/issues/5097 -- 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) 07/10: chore(e2e): Use separate operator instances for trait e2e tests
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 92ea86144ab6f6d8024c1116896a4bf1797e285e
Author: Christoph Deppisch
AuthorDate: Tue Mar 5 11:44:28 2024 +0100
chore(e2e): Use separate operator instances for trait e2e tests
---
e2e/advanced/synthetic_test.go | 8 +-
e2e/common/cli/bind_test.go | 3 +-
e2e/common/cli/default.go| 4 +-
e2e/common/cli/describe_test.go | 5 +-
e2e/common/{misc => cli}/main_test.go| 7 +-
e2e/common/config/config_reload_test.go | 25 +++
e2e/common/config/config_test.go | 6 +
e2e/common/config/default.go | 29 ---
e2e/common/config/kamelet_config_test.go | 260 ---
e2e/common/config/pipe_config_test.go| 8 +
e2e/common/languages/default.go | 29 ---
e2e/common/languages/groovy_test.go | 14 +-
e2e/common/languages/java_test.go| 14 +-
e2e/common/languages/js_test.go | 14 +-
e2e/common/languages/kotlin_test.go | 14 +-
e2e/common/languages/main_test.go| 62 --
e2e/common/languages/polyglot_test.go| 14 +-
e2e/common/languages/xml_test.go | 14 +-
e2e/common/languages/yaml_test.go| 14 +-
e2e/common/{config => }/main_test.go | 29 +--
e2e/common/misc/cron_test.go | 6 +
e2e/common/misc/default.go | 29 ---
e2e/common/misc/integration_fail_test.go | 6 +
e2e/common/misc/integration_trait_update_test.go | 6 +
e2e/common/misc/kamelet_test.go | 7 +
e2e/common/misc/kamelet_update_test.go | 6 +
e2e/common/misc/maven_repository_test.go | 7 +
e2e/common/misc/pipe_test.go | 6 +
e2e/common/misc/pipe_with_image_test.go | 7 +
e2e/common/misc/registry_maven_wagon_test.go | 194 +
e2e/common/misc/rest_test.go | 7 +
e2e/common/misc/scale_binding_test.go| 6 +
e2e/common/misc/scale_integration_test.go| 6 +
e2e/common/misc/structured_logs_test.go | 8 +-
e2e/common/runtimes/default.go | 28 ---
e2e/common/runtimes/runtimes_test.go | 7 +
e2e/common/traits/affinity_test.go | 6 +
e2e/common/traits/builder_test.go| 13 +-
e2e/common/traits/camel_test.go | 6 +
e2e/common/traits/container_test.go | 6 +
e2e/common/traits/default.go | 29 ---
e2e/common/traits/deployment_test.go | 13 +-
e2e/common/traits/error_handler_test.go | 6 +
e2e/common/traits/errored_trait_test.go | 6 +
e2e/common/traits/health_test.go | 6 +
e2e/common/traits/istio_test.go | 3 +-
e2e/common/traits/jolokia_test.go| 6 +
e2e/common/traits/jvm_test.go| 6 +
e2e/common/traits/kamelet_test.go| 6 +
e2e/common/traits/main_test.go | 62 --
e2e/common/traits/master_test.go | 7 +
e2e/common/traits/openapi_test.go| 7 +
e2e/common/traits/pdb_test.go| 6 +
e2e/common/traits/pod_test.go| 6 +
e2e/common/traits/prometheus_test.go | 9 +-
e2e/common/traits/pull_secret_test.go| 6 +
e2e/common/traits/route_test.go | 10 +-
e2e/common/traits/service_binding_test.go| 6 +
e2e/common/traits/service_test.go| 7 +
e2e/common/traits/toleration_test.go | 6 +
script/Makefile | 1 +
61 files changed, 652 insertions(+), 502 deletions(-)
diff --git a/e2e/advanced/synthetic_test.go b/e2e/advanced/synthetic_test.go
index 972036019..5d8382984 100644
--- a/e2e/advanced/synthetic_test.go
+++ b/e2e/advanced/synthetic_test.go
@@ -80,14 +80,14 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
// Label the deployment --> Verify the Integration is created
(cannot still monitor)
ExpectExecSucceed(t, g, Kubectl("label", "deploy",
"my-camel-sb-svc", "camel.apache.org/integration=my-it", "-n", ns))
- g.Eventually(IntegrationPhase(t, ns, "my-it"),
TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning))
+ g.Eventually(IntegrationPhase(t, ns, "my-it"),
TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
g.Eventually(IntegrationConditionStatus(t, ns, "my-it",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
(camel-k) 04/10: chore(e2e): Use operator instance per package in common tests
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 19199b2ec8030ba225834095d470f20245d359c3
Author: Christoph Deppisch
AuthorDate: Mon Mar 4 11:05:45 2024 +0100
chore(e2e): Use operator instance per package in common tests
- Gain execution speed on GitHub CI jobs
- Custom Kamelets creation need to use proper operatorID
---
e2e/advanced/build_order_strategy_test.go| 2 +-
e2e/advanced/incremental_build_test.go | 5 +-
e2e/advanced/main_test.go| 5 ++
e2e/advanced/promote_test.go | 8 +--
e2e/common/cli/bind_test.go | 2 +-
e2e/common/config/default.go | 4 +-
e2e/common/config/kamelet_config_test.go | 100 +--
e2e/common/{setup => config}/main_test.go| 35 --
e2e/common/config/pipe_config_test.go| 4 +-
e2e/common/languages/default.go | 4 +-
e2e/common/{setup => languages}/main_test.go | 35 --
e2e/common/misc/default.go | 4 +-
e2e/common/misc/kamelet_update_test.go | 12 ++--
e2e/common/{setup => misc}/main_test.go | 36 +-
e2e/common/misc/pipe_test.go | 10 +--
e2e/common/misc/registry_maven_wagon_test.go | 52 +++---
e2e/common/misc/structured_logs_test.go | 3 +-
e2e/common/runtimes/default.go | 1 -
e2e/common/setup/testdata/Java.java | 28
e2e/common/setup/testdata/yaml.yaml | 28
e2e/common/traits/builder_test.go| 5 +-
e2e/common/traits/default.go | 4 +-
e2e/common/traits/deployment_test.go | 2 +
e2e/common/traits/health_test.go | 4 +-
e2e/common/traits/istio_test.go | 7 ++
e2e/common/traits/kamelet_test.go| 2 +-
e2e/common/{setup => traits}/main_test.go| 35 --
e2e/common/traits/service_binding_test.go| 2 +-
e2e/install/cli/global_kamelet_test.go | 4 +-
e2e/knative/kamelet_test.go | 2 +-
e2e/support/test_support.go | 23 +++---
e2e/support/test_util.go | 5 ++
pkg/apis/camel/v1/kamelet_types_support.go | 5 ++
script/Makefile | 10 +--
34 files changed, 216 insertions(+), 272 deletions(-)
diff --git a/e2e/advanced/build_order_strategy_test.go
b/e2e/advanced/build_order_strategy_test.go
index 83dcdce8c..ad30b02e8 100644
--- a/e2e/advanced/build_order_strategy_test.go
+++ b/e2e/advanced/build_order_strategy_test.go
@@ -46,7 +46,7 @@ func TestRunBuildOrderStrategyMatchingDependencies(t
*testing.T) {
"--build-order-strategy",
string(v1.BuildOrderStrategyDependencies)).Execute()).To(Succeed())
g.Eventually(PlatformPhase(t, ns),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- g.Expect(CreateTimerKamelet(t, ns,
"timer-source")()).To(Succeed())
+ g.Expect(CreateTimerKamelet(t, operatorID, ns,
"timer-source")()).To(Succeed())
integrationA := RandomizedSuffixName("java-a")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/advanced/incremental_build_test.go
b/e2e/advanced/incremental_build_test.go
index 09172c6ca..40db5479a 100644
--- a/e2e/advanced/incremental_build_test.go
+++ b/e2e/advanced/incremental_build_test.go
@@ -98,6 +98,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
operatorID := "camel-k-incremental-build-pod"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID,
ns).Execute()).To(Succeed())
+ g.Eventually(SelectedPlatformPhase(t, ns, operatorID),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
@@ -141,7 +142,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
integrationIncrementalKitName := IntegrationKit(t, ns,
nameIncremental)()
// the container comes in a format like
//
10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d
- // we should be save just to check the substring is
contained
+ // we should be saving just to check the substring is
contained
g.Eventually(Kit(t, ns,
integrationIncrementalKitName)().Status.BaseImage).Should(ContainSubstring(integrationKitName))
g.Eventually(Kit(t, ns,
(camel-k) 10/10: chore(e2e): Fix E2E tests
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 39097a550ccc6b49408b31f09d4b42ecb1e1a456
Author: Christoph Deppisch
AuthorDate: Wed Mar 6 23:23:33 2024 +0100
chore(e2e): Fix E2E tests
---
e2e/common/cli/bind_test.go | 2 +-
e2e/common/cli/describe_test.go | 4 ++--
e2e/common/cli/dev_mode_test.go | 2 +-
e2e/common/config/pipe_config_test.go| 2 +-
e2e/common/misc/cron_test.go | 6 +++---
e2e/common/misc/registry_maven_wagon_test.go | 2 +-
e2e/common/misc/scale_binding_test.go| 2 +-
e2e/install/upgrade/cli_upgrade_test.go | 2 +-
e2e/install/upgrade/helm_upgrade_test.go | 2 +-
e2e/knative/knative_test.go | 2 ++
e2e/support/test_support.go | 5 +
pkg/cmd/builder_test.go | 2 +-
12 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index a03c984c6..6e45011c6 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -46,7 +46,7 @@ func TestKamelCLIBind(t *testing.T) {
})
t.Run("unsuccessful binding, no property", func(t *testing.T) {
- g.Expect(KamelBindWithID(t, operatorID, ns,
"timer-source", "log:info").Execute()).NotTo(Succeed())
+ g.Expect(KamelBindWithID(t, operatorID, ns,
operatorNS+"/timer-source", "log:info").Execute()).NotTo(Succeed())
})
t.Run("bind uris", func(t *testing.T) {
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index 656b14d98..8e5f6a562 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -71,10 +71,10 @@ func TestKamelCliDescribe(t *testing.T) {
})
t.Run("Test kamel describe integration platform", func(t
*testing.T) {
- platform := GetOutputString(Kamel(t, "describe",
"platform", operatorID, "-n", ns))
+ platform := GetOutputString(Kamel(t, "describe",
"platform", operatorID, "-n", operatorNS))
g.Expect(platform).To(ContainSubstring(fmt.Sprintf("Name: %s",
operatorID)))
- r, _ := regexp.Compile("(?sm).*Namespace:\\s+" + ns +
".*")
+ r, _ := regexp.Compile("(?sm).*Namespace:\\s+" +
operatorNS + ".*")
g.Expect(platform).To(MatchRegexp(r.String()))
r, _ = regexp.Compile("(?sm).*Runtime Version:\\s+" +
defaults.DefaultRuntimeVersion + ".*")
diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go
index 6bfd136d7..c257a3723 100644
--- a/e2e/common/cli/dev_mode_test.go
+++ b/e2e/common/cli/dev_mode_test.go
@@ -143,7 +143,7 @@ func TestRunDevMode(t *testing.T) {
go kamelRun.Execute()
// Second run should start up within a few seconds
- timeout := 10 * time.Second
+ timeout := 20 * time.Second
g.Eventually(logScanner.IsFound(`integration "`+name+`"
in phase Running`), timeout).Should(BeTrue())
g.Eventually(logScanner.IsFound("Magicstring!"),
timeout).Should(BeTrue())
})
diff --git a/e2e/common/config/pipe_config_test.go
b/e2e/common/config/pipe_config_test.go
index b896e7f8a..b471b1012 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -37,7 +37,7 @@ func TestPipeConfig(t *testing.T) {
t.Parallel()
WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config"
+ operatorID := "camel-k-pipe-config"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index 76948bbb8..339af3da7 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -46,21 +46,21 @@ func TestRunCronExample(t *testing.T) {
t.Run("cron", func(t *testing.T) {
g.Expect(KamelRunWithID(t, operatorID, ns,
"files/cron.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationCronJob(t, ns, "cron"),
TestTimeoutMedium).ShouldNot(BeNil())
+ g.Eventually(IntegrationCronJob(t, ns, "cron"),
TestTimeoutLong).ShouldNot(BeNil())
g.Eventually(IntegrationConditionStatus(t, ns, "cron",
v1.IntegrationConditionReady),
TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
(camel-k) 09/10: chore(e2e): Use separate viper instance per command
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5fa6aaf2d89b25a9a4495f34e325e55d4b42588a
Author: Christoph Deppisch
AuthorDate: Wed Mar 6 15:24:30 2024 +0100
chore(e2e): Use separate viper instance per command
---
e2e/support/test_support.go | 5 -
pkg/cmd/bind.go | 2 +-
pkg/cmd/bind_test.go| 2 +-
pkg/cmd/builder.go | 2 +-
pkg/cmd/builder_test.go | 4 ++--
pkg/cmd/config.go | 2 +-
pkg/cmd/config_test.go | 2 +-
pkg/cmd/debug.go| 2 +-
pkg/cmd/delete.go | 2 +-
pkg/cmd/delete_test.go | 2 +-
pkg/cmd/describe_integration.go | 2 +-
pkg/cmd/describe_kamelet.go | 2 +-
pkg/cmd/describe_kit.go | 2 +-
pkg/cmd/describe_platform.go| 2 +-
pkg/cmd/dump.go | 2 +-
pkg/cmd/get.go | 2 +-
pkg/cmd/install.go | 38 +++-
pkg/cmd/install_test.go | 2 +-
pkg/cmd/kamelet_add_repo.go | 2 +-
pkg/cmd/kamelet_add_repo_test.go| 2 +-
pkg/cmd/kamelet_delete.go | 2 +-
pkg/cmd/kamelet_get.go | 2 +-
pkg/cmd/kamelet_remove_repo.go | 2 +-
pkg/cmd/kamelet_remove_repo_test.go | 2 +-
pkg/cmd/kit_create.go | 2 +-
pkg/cmd/kit_create_test.go | 2 +-
pkg/cmd/kit_delete.go | 2 +-
pkg/cmd/kit_get.go | 2 +-
pkg/cmd/log.go | 2 +-
pkg/cmd/log_test.go | 2 +-
pkg/cmd/operator.go | 7 +++
pkg/cmd/operator_test.go| 4 ++--
pkg/cmd/promote.go | 2 +-
pkg/cmd/promote_test.go | 2 +-
pkg/cmd/rebuild.go | 2 +-
pkg/cmd/rebuild_test.go | 2 +-
pkg/cmd/reset.go| 2 +-
pkg/cmd/root.go | 36 ++
pkg/cmd/root_test.go| 39 +++--
pkg/cmd/run.go | 8 ++--
pkg/cmd/run_test.go | 4 ++--
pkg/cmd/uninstall.go| 14 -
pkg/cmd/uninstall_test.go | 6 +++---
pkg/cmd/util.go | 23 +-
pkg/cmd/util_config.go | 2 +-
pkg/cmd/version.go | 2 +-
pkg/cmd/version_test.go | 2 +-
script/Makefile | 2 +-
48 files changed, 114 insertions(+), 146 deletions(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index e9fe94d63..c088c33d8 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -140,7 +140,6 @@ var TestContext context.Context
var testClient client.Client
var clientMutex = sync.Mutex{}
-var kamelCLIMutex = sync.Mutex{}
var kamelInstallMutex = sync.Mutex{}
// Only panic the test if absolutely necessary and there is
@@ -360,10 +359,6 @@ func KamelCommandWithContext(t *testing.T, ctx
context.Context, command string,
}
func KamelWithContext(t *testing.T, ctx context.Context, args ...string)
*cobra.Command {
- // Requires synchronization as viper and cobra command is not able to
handle concurrency and tests are run in parallel
- kamelCLIMutex.Lock()
- defer kamelCLIMutex.Unlock()
-
var c *cobra.Command
var err error
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index 57530a673..938a02389 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -47,7 +47,7 @@ func newCmdBind(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *bindCmdOptions
Use: "bind [source] [sink] ...",
Short: "Bind Kubernetes resources, such as
Kamelets, in an integration flow.",
Long: "Bind Kubernetes resources, such as
Kamelets, in an integration flow. Endpoints are expected in the format
\"[[apigroup/]version:]kind:[namespace/]name\" or plain Camel URIs.",
- PersistentPreRunE: decode(),
+ PersistentPreRunE: decode(, options.Flags),
PreRunE: options.preRunE,
RunE: options.runE,
Annotations: make(map[string]string),
diff --git a/pkg/cmd/bind_test.go b/pkg/cmd/bind_test.go
index 802677e33..86756896c 100644
--- a/pkg/cmd/bind_test.go
+++ b/pkg/cmd/bind_test.go
@@ -40,7 +40,7 @@ func initializeBindCmdOptions(t *testing.T) (*bindCmdOptions,
*cobra.Command, Ro
options, rootCmd := kamelTestPreAddCommandInitWithClient(fakeClient)
bindCmdOptions := addTestBindCmd(*options, rootCmd)
- kamelTestPostAddCommandInit(t, rootCmd)
+ kamelTestPostAddCommandInit(t, rootCmd, options)
return bindCmdOptions,
(camel-k) 08/10: chore(e2e): Synchronize kamel install command in e2e tests
This is an automated email from the ASF dual-hosted git repository. cdeppisch pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit e0803311e132d3393c77a926ac9042479c6aed2f Author: Christoph Deppisch AuthorDate: Tue Mar 5 19:29:37 2024 +0100 chore(e2e): Synchronize kamel install command in e2e tests --- e2e/advanced/build_order_strategy_test.go| 2 +- e2e/advanced/builder_test.go | 2 +- e2e/advanced/catalog_builder_test.go | 2 +- e2e/advanced/debug_test.go | 2 +- e2e/advanced/deployment_test.go | 2 +- e2e/advanced/dump_test.go| 2 +- e2e/advanced/environment_test.go | 2 +- e2e/advanced/incremental_build_test.go | 8 +- e2e/advanced/integration_profile_test.go | 6 +- e2e/advanced/kamelet_repo_test.go| 2 +- e2e/advanced/local_platform_test.go | 4 +- e2e/advanced/maven_http_proxy_test.go| 4 +- e2e/advanced/operator_id_filtering_test.go | 6 +- e2e/advanced/operator_metrics_test.go| 2 +- e2e/advanced/platform_traits_test.go | 2 +- e2e/advanced/promote_test.go | 4 +- e2e/advanced/reset_test.go | 2 +- e2e/advanced/synthetic_test.go | 4 +- e2e/builder/build_test.go| 2 +- e2e/builder/registry_test.go | 6 +- e2e/common/cli/main_test.go | 2 +- e2e/common/cli/run_test.go | 4 +- e2e/common/config/config_reload_test.go | 8 +- e2e/common/config/config_test.go | 2 +- e2e/common/config/kamelet_config_test.go | 194 +++ e2e/common/config/pipe_config_test.go| 2 +- e2e/common/languages/groovy_test.go | 2 +- e2e/common/languages/java_test.go| 2 +- e2e/common/languages/js_test.go | 2 +- e2e/common/languages/kotlin_test.go | 2 +- e2e/common/languages/polyglot_test.go| 2 +- e2e/common/languages/xml_test.go | 2 +- e2e/common/languages/yaml_test.go| 2 +- e2e/common/misc/cron_test.go | 2 +- e2e/common/misc/integration_fail_test.go | 2 +- e2e/common/misc/integration_trait_update_test.go | 2 +- e2e/common/misc/kamelet_test.go | 2 +- e2e/common/misc/kamelet_update_test.go | 2 +- e2e/common/misc/maven_repository_test.go | 2 +- e2e/common/misc/pipe_test.go | 2 +- e2e/common/misc/pipe_with_image_test.go | 2 +- e2e/common/misc/registry_maven_wagon_test.go | 2 +- e2e/common/misc/rest_test.go | 2 +- e2e/common/misc/scale_binding_test.go| 2 +- e2e/common/misc/scale_integration_test.go| 2 +- e2e/common/misc/structured_logs_test.go | 2 +- e2e/common/runtimes/runtimes_test.go | 2 +- e2e/common/traits/affinity_test.go | 2 +- e2e/common/traits/builder_test.go| 2 +- e2e/common/traits/camel_test.go | 2 +- e2e/common/traits/container_test.go | 2 +- e2e/common/traits/deployment_test.go | 4 +- e2e/common/traits/error_handler_test.go | 2 +- e2e/common/traits/errored_trait_test.go | 2 +- e2e/common/traits/health_test.go | 2 +- e2e/common/traits/istio_test.go | 2 +- e2e/common/traits/jolokia_test.go| 2 +- e2e/common/traits/jvm_test.go| 2 +- e2e/common/traits/kamelet_test.go| 2 +- e2e/common/traits/master_test.go | 2 +- e2e/common/traits/openapi_test.go| 2 +- e2e/common/traits/pdb_test.go| 2 +- e2e/common/traits/pod_test.go| 2 +- e2e/common/traits/prometheus_test.go | 2 +- e2e/common/traits/pull_secret_test.go| 2 +- e2e/common/traits/route_test.go | 2 +- e2e/common/traits/service_binding_test.go| 2 +- e2e/common/traits/service_test.go| 2 +- e2e/common/traits/toleration_test.go | 2 +- e2e/install/cli/global_kamelet_test.go | 6 +- e2e/install/cli/global_test.go | 8 +- e2e/install/cli/install_test.go | 16 +- e2e/install/cli/maven_ca_secret_test.go | 2 +- e2e/install/cli/uninstall_test.go| 16 +- e2e/install/upgrade/cli_upgrade_test.go | 2 +- e2e/knative/knative_platform_test.go | 2 +- e2e/knative/knative_test.go | 2 +- e2e/native/native_binding_test.go| 2 +-
(camel-k) 05/10: chore(e2e): Fix concurrent access to viper flags
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit fc225f18898eae766a7ebe131b71eaa58d1c18e6
Author: Christoph Deppisch
AuthorDate: Mon Mar 4 21:56:05 2024 +0100
chore(e2e): Fix concurrent access to viper flags
---
pkg/cmd/install.go | 5 +
pkg/cmd/root.go | 8
pkg/cmd/run.go | 5 +
pkg/cmd/uninstall.go | 5 +
pkg/cmd/util.go | 16
5 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 8567165b6..4e54b0046 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -676,6 +676,11 @@ func (o *installCmdOptions) postRun(cmd *cobra.Command, _
[]string) error {
func (o *installCmdOptions) decode(cmd *cobra.Command, _ []string) error {
path := pathToRoot(cmd)
+
+ // Requires synchronization as viper bind flag is not able to handle
concurrency
+ m.Lock()
+ defer m.Unlock()
+
if err := decodeKey(o, path); err != nil {
return err
}
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index a43e5a349..70c18209e 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -23,6 +23,7 @@ import (
"fmt"
"os"
"strings"
+ "sync"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@@ -39,6 +40,9 @@ const kamelCommandLongDescription = `Apache Camel K is a
lightweight integration
superpowers.
`
+// Mutex to synchronize flag operations as viper library is not able to handle
concurrency.
+var m = sync.Mutex{}
+
// RootCmdOptions --.
// nolint: containedctx
type RootCmdOptions struct {
@@ -93,6 +97,10 @@ func kamelPreAddCommandInit(options *RootCmdOptions)
*cobra.Command {
}
func kamelPostAddCommandInit(cmd *cobra.Command) error {
+ // Requires synchronization as viper bind flag is not able to handle
concurrency
+ m.Lock()
+ defer m.Unlock()
+
if err := bindPFlagsHierarchy(cmd); err != nil {
return err
}
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 12ce4da6b..4c33c4154 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -187,6 +187,11 @@ func (o *runCmdOptions) decode(cmd *cobra.Command, args
[]string) error {
// load from kamel.run (1)
pathToRoot := pathToRoot(cmd)
+
+ // Requires synchronization as viper bind flag is not able to handle
concurrency
+ m.Lock()
+ defer m.Unlock()
+
if err := decodeKey(o, pathToRoot); err != nil {
return err
}
diff --git a/pkg/cmd/uninstall.go b/pkg/cmd/uninstall.go
index 461435c0b..489da6c1f 100644
--- a/pkg/cmd/uninstall.go
+++ b/pkg/cmd/uninstall.go
@@ -107,6 +107,11 @@ var defaultListOptions = metav1.ListOptions{
func (o *uninstallCmdOptions) decode(cmd *cobra.Command, _ []string) error {
path := pathToRoot(cmd)
+
+ // Requires synchronization as viper bind flag is not able to handle
concurrency
+ m.Lock()
+ defer m.Unlock()
+
if err := decodeKey(o, path); err != nil {
return err
}
diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
index 4365addee..aec422477 100644
--- a/pkg/cmd/util.go
+++ b/pkg/cmd/util.go
@@ -25,7 +25,6 @@ import (
"log"
"reflect"
"strings"
- "sync"
"github.com/mitchellh/mapstructure"
@@ -45,9 +44,6 @@ const (
offlineCommandLabel = "camel.apache.org/cmd.offline"
)
-// Mutex to synchronize flag operations as viper library is not able to handle
concurrency.
-var m = sync.Mutex{}
-
// DeleteIntegration --.
func DeleteIntegration(ctx context.Context, c client.Client, name string,
namespace string) error {
integration := v1.Integration{
@@ -78,10 +74,6 @@ func bindPFlagsHierarchy(cmd *cobra.Command) error {
}
func bindPFlags(cmd *cobra.Command) error {
- // Requires synchronization as viper bind flag is not able to handle
concurrency
- m.Lock()
- defer m.Unlock()
-
prefix := pathToRoot(cmd)
pl := p.NewClient()
@@ -122,10 +114,6 @@ func pathToRoot(cmd *cobra.Command) string {
}
func decodeKey(target interface{}, key string) error {
- // Requires synchronization as viper all settings is not able to handle
concurrency
- m.Lock()
- defer m.Unlock()
-
nodes := strings.Split(key, ".")
settings := viper.AllSettings()
@@ -168,6 +156,10 @@ func decodeKey(target interface{}, key string) error {
func decode(target interface{}) func(*cobra.Command, []string) error {
return func(cmd *cobra.Command, args []string) error {
+ // Requires synchronization as viper bind flag is not able to
handle concurrency
+ m.Lock()
+ defer m.Unlock()
+
path := pathToRoot(cmd)
if err := decodeKey(target, path); err != nil {
(camel-k) branch main updated (b986989b8 -> 39097a550)
This is an automated email from the ASF dual-hosted git repository. cdeppisch pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from b986989b8 fix(trait): revert persisted status new 773622571 chore(e2e): Improve E2E tests new 4e2db21a8 chore(e2e): Run E2E tests in parallel new c39835610 chore(e2e): Use fresh Gomega instance for each test new 19199b2ec chore(e2e): Use operator instance per package in common tests new fc225f188 chore(e2e): Fix concurrent access to viper flags new fcd6f33e4 chore(e2e): Skip cluster setup when installing Camel K operators in test namespaces new 92ea86144 chore(e2e): Use separate operator instances for trait e2e tests new e0803311e chore(e2e): Synchronize kamel install command in e2e tests new 5fa6aaf2d chore(e2e): Use separate viper instance per command new 39097a550 chore(e2e): Fix E2E tests The 10 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: .github/actions/e2e-common/exec-tests.sh |2 + e2e/advanced/build_order_strategy_test.go | 184 ++-- e2e/advanced/builder_test.go | 47 +- e2e/advanced/catalog_builder_test.go | 94 +- e2e/advanced/debug_test.go | 61 +- e2e/advanced/deployment_test.go| 23 +- e2e/advanced/dump_test.go | 33 +- e2e/advanced/environment_test.go | 61 +- e2e/advanced/incremental_build_test.go | 220 +++-- e2e/advanced/integration_profile_test.go | 118 +-- e2e/advanced/kamelet_repo_test.go | 31 +- e2e/advanced/local_platform_test.go| 98 +- e2e/advanced/main_test.go | 75 ++ e2e/advanced/maven_http_proxy_test.go | 75 +- e2e/advanced/operator_id_filtering_test.go | 102 +- e2e/advanced/operator_metrics_test.go | 156 +-- e2e/advanced/platform_traits_test.go | 37 +- e2e/advanced/promote_test.go | 134 +-- e2e/advanced/reset_test.go | 63 +- e2e/advanced/synthetic_test.go | 90 +- e2e/advanced/tekton_test.go| 16 +- e2e/builder/build_test.go | 168 ++-- e2e/builder/registry_test.go | 34 +- e2e/common/cli/bind_test.go| 56 +- e2e/common/cli/config_test.go | 42 +- e2e/common/cli/default.go |9 +- e2e/common/cli/delete_test.go | 76 +- e2e/common/cli/describe_test.go| 66 +- e2e/common/cli/dev_mode_test.go| 193 ++-- e2e/common/cli/duplicate_parameters_test.go|4 +- e2e/common/cli/get_test.go | 78 +- e2e/common/cli/help_test.go| 28 +- e2e/common/cli/log_test.go | 40 +- .../startup_test.go => common/cli/main_test.go}| 47 +- e2e/common/cli/offline_commands_test.go| 23 +- e2e/common/cli/run_test.go | 337 --- e2e/common/cli/version_test.go |6 +- e2e/common/config/config_reload_test.go| 233 +++-- e2e/common/config/config_test.go | 588 ++- e2e/common/config/default.go | 26 - e2e/common/config/kamelet_config_test.go | 625 ++-- e2e/common/config/pipe_config_test.go | 397 e2e/common/languages/default.go| 26 - e2e/common/languages/groovy_test.go| 29 +- e2e/common/languages/java_test.go | 29 +- e2e/common/languages/js_test.go| 29 +- e2e/common/languages/kotlin_test.go| 29 +- e2e/common/languages/polyglot_test.go | 33 +- e2e/common/languages/xml_test.go | 29 +- e2e/common/languages/yaml_test.go | 29 +- e2e/common/main_test.go| 65 ++ e2e/common/misc/client_test.go | 45 +- e2e/common/misc/cron_test.go | 83 +- e2e/common/misc/default.go | 26 - e2e/common/misc/integration_fail_test.go | 301 +++--- e2e/common/misc/integration_trait_update_test.go | 39 +- e2e/common/misc/kamelet_test.go| 62 +- e2e/common/misc/kamelet_update_test.go | 33 +- e2e/common/misc/maven_repository_test.go | 44 +- e2e/common/misc/pipe_test.go | 155 +-- e2e/common/misc/pipe_with_image_test.go
(camel-k) 06/10: chore(e2e): Skip cluster setup when installing Camel K operators in test namespaces
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit fcd6f33e400fe708a8e73baa9335832ca20bfcc2
Author: Christoph Deppisch
AuthorDate: Tue Mar 5 09:28:48 2024 +0100
chore(e2e): Skip cluster setup when installing Camel K operators in test
namespaces
---
e2e/support/test_support.go | 4 ++--
script/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 3fac8750c..b5cabc7a1 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -277,10 +277,10 @@ func KamelInstallWithIDAndKameletCatalog(t *testing.T,
operatorID string, namesp
func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID
string, namespace string, skipKameletCatalog bool, args ...string)
*cobra.Command {
var installArgs []string
- installArgs = []string{"install", "-n", namespace, "--operator-id",
operatorID}
+ installArgs = []string{"install", "-n", namespace, "--operator-id",
operatorID, "--skip-cluster-setup"}
if skipKameletCatalog {
- installArgs = append(installArgs, "--operator-env-vars",
"KAMEL_INSTALL_DEFAULT_KAMELETS=false")
+ installArgs = append(installArgs,
"--skip-default-kamelets-setup")
}
logLevel := os.Getenv("CAMEL_K_TEST_LOG_LEVEL")
diff --git a/script/Makefile b/script/Makefile
index 68ed85910..79f5beccc 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -94,7 +94,7 @@ KAMELET_CATALOG_REPO_TAG := v4.0.1
DO_TEST_PREBUILD ?= true
TEST_PREBUILD = build
# Tests may run in parallel to each other. This count sets the amount of tests
run in parallel. (default value usually is GOMAXPROCS)
-TEST_COMMON_PARALLEL_COUNT ?= 2
+TEST_COMMON_PARALLEL_COUNT ?= 4
TEST_ADVANCED_PARALLEL_COUNT ?= 4
# OLM (Operator Lifecycle Manager and Operator Hub): uncomment to override
operator settings at build time
Re: [PR] chore(e2e): Improve E2E tests [camel-k]
christophd merged PR #5188: URL: https://github.com/apache/camel-k/pull/5188 -- 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
Re: [PR] chore(e2e): Improve E2E tests [camel-k]
christophd commented on PR #5188: URL: https://github.com/apache/camel-k/pull/5188#issuecomment-1986295005 @squakez many thanks. I managed to get a setup working on my arm64 machine with the native E2E tests. Run them all manually and all have been green! Will continue to merge now -- 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-karavan) branch main updated: Login improvement
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new a4dddbbb Login improvement a4dddbbb is described below commit a4dddbbb3107b458d009b7599d87105bb3a413bd Author: Marat Gubaidullin AuthorDate: Fri Mar 8 12:31:46 2024 -0500 Login improvement --- karavan-app/src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties index aa43273b..d1382f7f 100644 --- a/karavan-app/src/main/resources/application.properties +++ b/karavan-app/src/main/resources/application.properties @@ -36,10 +36,10 @@ karavan.docker.network=karavan # Keycloak configuration karavan.keycloak.url=http://localhost:8079 -karavan.keycloak.realm=talisman +karavan.keycloak.realm=karavan karavan.keycloak.frontend.clientId=frontend karavan.keycloak.backend.clientId=backend -karavan.keycloak.backend.secret=KJTyO4ukg8c3x0TZvG0ZPCerw7jEbze +karavan.keycloak.backend.secret=karavan # Git repository Configuration karavan.git.repository=http://gitea:3000/karavan/karavan.git
(camel-karavan) branch main updated: Login improvement
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 012fd901 Login improvement
012fd901 is described below
commit 012fd901d30a4489c6aeb7ca4618efeb8776ebef
Author: Marat Gubaidullin
AuthorDate: Fri Mar 8 12:29:33 2024 -0500
Login improvement
---
.../src/main/resources/application.properties | 4 +-
karavan-app/src/main/webui/src/api/KaravanApi.tsx | 8 ++--
karavan-app/src/main/webui/src/api/ProjectStore.ts | 2 +-
karavan-app/src/main/webui/src/api/SsoApi.tsx | 4 +-
karavan-app/src/main/webui/src/main/Main.tsx | 52 ++
.../src/main/webui/src/main/PageNavigation.tsx | 14 --
.../src/main/webui/src/main/useMainHook.tsx| 6 +--
7 files changed, 35 insertions(+), 55 deletions(-)
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index 7815c76c..aa43273b 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -36,10 +36,10 @@ karavan.docker.network=karavan
# Keycloak configuration
karavan.keycloak.url=http://localhost:8079
-karavan.keycloak.realm=karavan
+karavan.keycloak.realm=talisman
karavan.keycloak.frontend.clientId=frontend
karavan.keycloak.backend.clientId=backend
-karavan.keycloak.backend.secret=backend
+karavan.keycloak.backend.secret=KJTyO4ukg8c3x0TZvG0ZPCerw7jEbze
# Git repository Configuration
karavan.git.repository=http://gitea:3000/karavan/karavan.git
diff --git a/karavan-app/src/main/webui/src/api/KaravanApi.tsx
b/karavan-app/src/main/webui/src/api/KaravanApi.tsx
index 1738290f..3bdb20f8 100644
--- a/karavan-app/src/main/webui/src/api/KaravanApi.tsx
+++ b/karavan-app/src/main/webui/src/api/KaravanApi.tsx
@@ -38,7 +38,6 @@ export class KaravanApi {
static me?: any;
static authType?: string = undefined;
-static isAuthorized: boolean = false;
static basicToken: string = '';
static getInstance() {
@@ -61,7 +60,7 @@ export class KaravanApi {
}
static setAuthType(authType: string) {
-console.log("setAuthType", authType)
+console.log("SetAuthType", authType)
KaravanApi.authType = authType;
switch (authType){
case "public": {
@@ -129,7 +128,6 @@ export class KaravanApi {
{headers: {'content-type': 'application/x-www-form-urlencoded'}})
.then(res => {
if (res.status === 200) {
-KaravanApi.isAuthorized = true;
KaravanApi.basicToken = Buffer.from(username + ":" +
password).toString('base64');
KaravanApi.setBasicAuthentication();
KaravanApi.getMe(user => {
@@ -177,7 +175,9 @@ export class KaravanApi {
instance.get('/public/auth', {headers: {'Accept': 'text/plain'}})
.then(res => {
if (res.status === 200) {
-KaravanApi.setAuthType(res.data);
+const authType = res.data;
+KaravanApi.setAuthType(authType);
+useAppConfigStore.setState({isAuthorized: authType ===
'public'})
after(res.data);
}
}).catch(err => {
diff --git a/karavan-app/src/main/webui/src/api/ProjectStore.ts
b/karavan-app/src/main/webui/src/api/ProjectStore.ts
index 5bf4a103..00434f84 100644
--- a/karavan-app/src/main/webui/src/api/ProjectStore.ts
+++ b/karavan-app/src/main/webui/src/api/ProjectStore.ts
@@ -364,7 +364,7 @@ export const useLogStore =
createWithEqualityFn((set) => ({
},
}), shallow)
-console.log("Start log subscriber");
+console.log("Start Log Subscriber");
const sub = ProjectEventBus.onLog()?.subscribe((result: ["add" | "set",
string]) => {
if (result[0] === 'add') {
unstable_batchedUpdates(() => {
diff --git a/karavan-app/src/main/webui/src/api/SsoApi.tsx
b/karavan-app/src/main/webui/src/api/SsoApi.tsx
index 9ac7ed61..6bf480c5 100644
--- a/karavan-app/src/main/webui/src/api/SsoApi.tsx
+++ b/karavan-app/src/main/webui/src/api/SsoApi.tsx
@@ -17,6 +17,7 @@
import Keycloak from "keycloak-js";
import {KaravanApi} from "./KaravanApi";
+import {useAppConfigStore} from "./ProjectStore";
export class SsoApi {
@@ -27,7 +28,6 @@ export class SsoApi {
SsoApi.keycloak = new Keycloak({url: config.url, realm:
config.realm, clientId: config.clientId});
SsoApi.keycloak.init({onLoad: 'login-required', flow: 'hybrid',
checkLoginIframe: false}).then(value => {
console.log('SsoApi', 'User is now authenticated.');
-KaravanApi.isAuthorized = true;
after();
}).catch(reason => {
console.log('SsoApi', 'Error:', reason);
Re: [PR] CAMEL-16557: add a free form key value map on components, dataformats, languages, etc [camel]
lburgazzoli commented on PR #13423: URL: https://github.com/apache/camel/pull/13423#issuecomment-1986084665 @davsclaus here a quick POC about addin arbitrary annotations to the catalog entries -- 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
Re: [PR] CAMEL-16557: add a free form key value map on components, dataformats, languages, etc [camel]
github-actions[bot] commented on PR #13423: URL: https://github.com/apache/camel/pull/13423#issuecomment-1986083278 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- 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
[PR] CAMEL-16557: add a free form key value map on components, dataformats, languages, etc [camel]
lburgazzoli opened a new pull request, #13423: URL: https://github.com/apache/camel/pull/13423 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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
Re: [I] Kubernetes Install Failing [camel-karavan]
skumaravelan commented on issue #1165: URL: https://github.com/apache/camel-karavan/issues/1165#issuecomment-1986067237 Somehow , the below part is causing an issue. When I comment out this section, am able to proceed with deployment. What is the problem in here. # Patch for Service with nodePort patches: - path: ./nodePort.yaml target: kind: "Service" name: "karavan" ## Replace secret from.env if required secretGenerator: - name: karavan behavior: replace options: disableNameSuffixHash: true envs: - .env -- 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-karavan) branch main updated: Remove m2 cache
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 79ba2b6b Remove m2 cache
79ba2b6b is described below
commit 79ba2b6bf0efb051c1709b5b68a43e7b33d72108
Author: Marat Gubaidullin
AuthorDate: Fri Mar 8 11:20:26 2024 -0500
Remove m2 cache
---
.../apache/camel/karavan/docker/DockerForKaravan.java | 17 -
karavan-app/src/main/resources/application.properties | 1 -
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
b/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
index 42c9d6f0..34cb6459 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
@@ -28,6 +28,7 @@ import org.apache.camel.karavan.service.ProjectService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -42,9 +43,6 @@ public class DockerForKaravan {
@ConfigProperty(name = "karavan.devmode.image")
String devmodeImage;
-@ConfigProperty(name = "karavan.maven.cache")
-Optional mavenCache;
-
@Inject
DockerService dockerService;
@@ -53,8 +51,7 @@ public class DockerForKaravan {
public void runProjectInDevMode(String projectId, String jBangOptions,
Map ports,
Map files) throws
Exception {
-Map volumes = getMavenVolumes();
-Container c = createDevmodeContainer(projectId, jBangOptions, ports,
volumes);
+Container c = createDevmodeContainer(projectId, jBangOptions, ports,
new HashMap<>());
dockerService.runContainer(projectId);
dockerService.copyFiles(c.getId(), "/karavan/code", files, true);
}
@@ -84,9 +81,8 @@ public class DockerForKaravan {
public void runBuildProject(Project project, String script, List
env, Map sshFiles, String tag) throws Exception {
String containerName = project.getProjectId() + BUILDER_SUFFIX;
-Map volumes = getMavenVolumes();
dockerService.deleteContainer(containerName);
-Container c = createBuildContainer(containerName, project, env,
volumes, tag);
+Container c = createBuildContainer(containerName, project, env, new
HashMap<>(0), tag);
dockerService.copyExecFile(c.getId(), "/karavan/builder", "build.sh",
script);
sshFiles.forEach((name, text) -> {
dockerService.copyExecFile(c.getId(), "/karavan/.ssh", name, text);
@@ -108,9 +104,4 @@ public class DockerForKaravan {
null, null, null, null,
"/karavan/builder/build.sh");
}
-
-private Map getMavenVolumes(){
-return mavenCache.map(s -> Map.of(s,
"/karavan/.m2")).orElseGet(Map::of);
-}
-
-}
+}
\ No newline at end of file
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index 364beb04..7815c76c 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -31,7 +31,6 @@ karavan.devmode.create-pvc=false
karavan.devmode.service.account=karavan
karavan.builder.service.account=karavan
karavan.secret.name=karavan
-karavan.maven.cache=
karavan.docker.network=karavan
Re: [PR] fix(traits): use Comparable matches [camel-k]
github-actions[bot] commented on PR #5230: URL: https://github.com/apache/camel-k/pull/5230#issuecomment-1985981407 :heavy_check_mark: Unit test coverage report - coverage increased from 36.9% to 37.1% (**+0.2%**) -- 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
Re: [PR] fix(trait): revert persisted status [camel-k]
squakez merged PR #5233: URL: https://github.com/apache/camel-k/pull/5233 -- 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 main updated: fix(cmd): delete KameletBinding until they exists
This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 3866625ca fix(cmd): delete KameletBinding until they exists
3866625ca is described below
commit 3866625ca67193f874e2c5841bef635c19f228bd
Author: Pasquale Congiusti
AuthorDate: Fri Mar 8 13:17:18 2024 +0100
fix(cmd): delete KameletBinding until they exists
Closes #5156
---
pkg/cmd/delete.go | 40 +---
1 file changed, 37 insertions(+), 3 deletions(-)
diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go
index 5ce21e727..927d7a763 100644
--- a/pkg/cmd/delete.go
+++ b/pkg/cmd/delete.go
@@ -24,6 +24,7 @@ import (
"strconv"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/client"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
@@ -136,13 +137,22 @@ func getIntegration(ctx context.Context, c client.Client,
name string, namespace
}
func deleteIntegration(ctx context.Context, cmd *cobra.Command, c
client.Client, integration *v1.Integration) error {
- deleted, binding, err := deletePipeIfExists(ctx, c, integration)
+ deletedPipes, pipe, err := deletePipeIfExists(ctx, c, integration)
if err != nil {
return err
}
- if deleted {
+ if deletedPipes {
// Deleting Pipe will automatically clean up the integration
- fmt.Fprintln(cmd.OutOrStdout(), "Pipe "+binding+" deleted")
+ fmt.Fprintln(cmd.OutOrStdout(), "Pipe "+pipe+" deleted")
+ return nil
+ }
+ deletedKameletBindings, klb, err := deleteKameletBindingIfExists(ctx,
c, integration)
+ if err != nil {
+ return err
+ }
+ if deletedKameletBindings {
+ // Deleting KameletBinding will automatically clean up the
integration
+ fmt.Fprintln(cmd.OutOrStdout(), "KameletBinding "+klb+"
deleted")
return nil
}
return c.Delete(ctx, integration)
@@ -172,6 +182,30 @@ func deletePipeIfExists(ctx context.Context, c
client.Client, integration *v1.In
return err == nil, name, err
}
+func deleteKameletBindingIfExists(ctx context.Context, c client.Client,
integration *v1.Integration) (bool, string, error) {
+ kind, name := findCreator(integration)
+ if kind != v1alpha1.KameletBindingKind || name == "" {
+ return false, "", nil
+ }
+
+ binding := v1alpha1.KameletBinding{
+ TypeMeta: metav1.TypeMeta{
+ Kind: kind,
+ APIVersion: v1.SchemeGroupVersion.String(),
+ },
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: integration.Namespace,
+ Name: name,
+ },
+ }
+ err := c.Delete(ctx, )
+ if k8errors.IsNotFound(err) {
+ // Simply skip if binding doesn't exist (could be deleted
already)
+ return false, name, nil
+ }
+ return err == nil, name, err
+}
+
func findCreator(integration *v1.Integration) (string, string) {
kind := integration.GetLabels()[kubernetes.CamelCreatorLabelKind]
name := integration.GetLabels()[kubernetes.CamelCreatorLabelName]
Re: [I] Kamel delete KameletBinding only removes integration resource [camel-k]
squakez closed issue #5156: Kamel delete KameletBinding only removes integration resource URL: https://github.com/apache/camel-k/issues/5156 -- 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
Re: [PR] fix(cmd): delete KameletBinding until they exists [camel-k]
squakez merged PR #5237: URL: https://github.com/apache/camel-k/pull/5237 -- 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-spring-boot) branch camel-spring-boot-4.4.x updated (257b3e1a096 -> eaf543cf624)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-spring-boot-4.4.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 257b3e1a096 CAMEL-20448: camel-spring-boot - Upgrade to 3.2.3 new 861da5e698d Duration (#1102) new eaf543cf624 Regen 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: .../springboot/catalog/components/activemq.json| 2 +- .../camel/springboot/catalog/components/amqp.json | 2 +- .../springboot/catalog/components/arangodb.json| 2 +- .../camel/springboot/catalog/components/as2.json | 2 +- .../springboot/catalog/components/asterisk.json| 2 +- .../catalog/components/atmosphere-websocket.json | 2 +- .../camel/springboot/catalog/components/atom.json | 2 +- .../camel/springboot/catalog/components/avro.json | 2 +- .../catalog/components/aws-cloudtrail.json | 2 +- .../springboot/catalog/components/aws-config.json | 2 +- .../catalog/components/aws-secrets-manager.json| 2 +- .../springboot/catalog/components/aws2-athena.json | 2 +- .../springboot/catalog/components/aws2-cw.json | 2 +- .../springboot/catalog/components/aws2-ddb.json| 2 +- .../catalog/components/aws2-ddbstream.json | 2 +- .../springboot/catalog/components/aws2-ec2.json| 2 +- .../springboot/catalog/components/aws2-ecs.json| 2 +- .../springboot/catalog/components/aws2-eks.json| 2 +- .../catalog/components/aws2-eventbridge.json | 2 +- .../springboot/catalog/components/aws2-iam.json| 2 +- .../catalog/components/aws2-kinesis-firehose.json | 2 +- .../catalog/components/aws2-kinesis.json | 2 +- .../springboot/catalog/components/aws2-kms.json| 2 +- .../springboot/catalog/components/aws2-lambda.json | 2 +- .../springboot/catalog/components/aws2-mq.json | 2 +- .../springboot/catalog/components/aws2-msk.json| 2 +- .../catalog/components/aws2-redshift-data.json | 2 +- .../springboot/catalog/components/aws2-s3.json | 2 +- .../springboot/catalog/components/aws2-ses.json| 2 +- .../springboot/catalog/components/aws2-sns.json| 6 +- .../springboot/catalog/components/aws2-sqs.json| 2 +- .../catalog/components/aws2-step-functions.json| 2 +- .../springboot/catalog/components/aws2-sts.json| 2 +- .../catalog/components/aws2-timestream.json| 2 +- .../catalog/components/aws2-translate.json | 2 +- .../catalog/components/azure-cosmosdb.json | 2 +- .../catalog/components/azure-eventhubs.json| 2 +- .../springboot/catalog/components/azure-files.json | 2 +- .../catalog/components/azure-key-vault.json| 2 +- .../catalog/components/azure-servicebus.json | 48 +- .../catalog/components/azure-storage-blob.json | 2 +- .../catalog/components/azure-storage-datalake.json | 30 +- .../catalog/components/azure-storage-queue.json| 2 +- .../catalog/components/bean-validator.json | 2 +- .../camel/springboot/catalog/components/bean.json | 2 +- .../springboot/catalog/components/bonita.json | 2 +- .../camel/springboot/catalog/components/box.json | 2 +- .../springboot/catalog/components/braintree.json | 2 +- .../springboot/catalog/components/browse.json | 2 +- .../catalog/components/caffeine-cache.json | 2 +- .../catalog/components/caffeine-loadcache.json | 2 +- .../springboot/catalog/components/chatscript.json | 2 +- .../camel/springboot/catalog/components/chunk.json | 2 +- .../camel/springboot/catalog/components/class.json | 2 +- .../springboot/catalog/components/cm-sms.json | 2 +- .../springboot/catalog/components/coap+tcp.json| 2 +- .../camel/springboot/catalog/components/coap.json | 2 +- .../springboot/catalog/components/coaps+tcp.json | 2 +- .../camel/springboot/catalog/components/coaps.json | 2 +- .../springboot/catalog/components/cometd.json | 2 +- .../springboot/catalog/components/cometds.json | 2 +- .../springboot/catalog/components/consul.json | 2 +- .../springboot/catalog/components/controlbus.json | 2 +- .../springboot/catalog/components/couchbase.json | 2 +- .../springboot/catalog/components/couchdb.json | 2 +- .../camel/springboot/catalog/components/cql.json | 2 +- .../camel/springboot/catalog/components/cron.json | 2 +- .../springboot/catalog/components/crypto.json | 2 +- .../camel/springboot/catalog/components/cxf.json | 2 +- .../camel/springboot/catalog/components/cxfrs.json | 2 +- .../springboot/catalog/components/dataformat.json | 2 +- .../catalog/components/dataset-test.json | 2 +-
(camel-spring-boot) 01/02: Duration (#1102)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 861da5e698d94a74bdef71adf9b4b9c95fac
Author: Claus Ibsen
AuthorDate: Fri Mar 8 15:56:14 2024 +0100
Duration (#1102)
CAMEL-20542: spring boot auto-configuration should not type convert
java.time objects.
---
.../camel-aws2-cw-starter/src/main/docs/aws2-cw.json | 2 +-
.../aws2/cw/springboot/Cw2ComponentConfiguration.java | 2 +-
.../component/aws2/cw/springboot/Cw2ComponentConverter.java | 2 --
.../src/main/docs/azure-servicebus.json | 4 ++--
.../springboot/ServiceBusComponentConfiguration.java | 5 ++---
.../servicebus/springboot/ServiceBusComponentConverter.java | 4
.../src/main/docs/azure-storage-blob.json | 6 +++---
.../storage/blob/springboot/BlobComponentConfiguration.java | 7 ++-
.../azure/storage/blob/springboot/BlobComponentConverter.java | 4
.../src/main/docs/azure-storage-datalake.json | 2 +-
.../datalake/springboot/DataLakeComponentConfiguration.java | 2 +-
.../datalake/springboot/DataLakeComponentConverter.java | 2 --
.../src/main/docs/azure-storage-queue.json| 6 +++---
.../storage/queue/springboot/QueueComponentConfiguration.java | 7 ++-
.../storage/queue/springboot/QueueComponentConverter.java | 2 --
.../camel-consul-starter/src/main/docs/consul.json| 6 +++---
.../consul/springboot/ConsulComponentConfiguration.java | 7 +++
.../component/consul/springboot/ConsulComponentConverter.java | 2 --
.../camel-etcd3-starter/src/main/docs/etcd3.json | 8
.../etcd3/springboot/Etcd3ComponentConfiguration.java | 11 ---
.../component/etcd3/springboot/Etcd3ComponentConverter.java | 2 --
.../camel-minio-starter/src/main/docs/minio.json | 4 ++--
.../minio/springboot/MinioComponentConfiguration.java | 6 ++
.../component/minio/springboot/MinioComponentConverter.java | 2 --
.../springboot/maven/SpringBootAutoConfigurationMojo.java | 9 +
25 files changed, 45 insertions(+), 69 deletions(-)
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
b/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
index d4a5c7ca72d..5f5734afb16 100644
--- a/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
+++ b/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
@@ -128,7 +128,7 @@
{
"name": "camel.component.aws2-cw.timestamp",
"type": "java.time.Instant",
- "description": "The metric timestamp. The option is a java.time.Instant
type.",
+ "description": "The metric timestamp",
"sourceType":
"org.apache.camel.component.aws2.cw.springboot.Cw2ComponentConfiguration"
},
{
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
index 8214f82297a..fcce9937464 100644
---
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
@@ -71,7 +71,7 @@ public class Cw2ComponentConfiguration
*/
private String region;
/**
- * The metric timestamp. The option is a java.time.Instant type.
+ * The metric timestamp
*/
private Instant timestamp;
/**
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
index 78cc4bba863..b0b6bf26555 100644
---
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
+++
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
@@ -40,7 +40,6 @@ public class Cw2ComponentConverter implements
GenericConverter {
public Set getConvertibleTypes() {
Set answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.aws2.cw.Cw2Configuration.class));
-answer.add(new ConvertiblePair(String.class, java.time.Instant.class));
answer.add(new ConvertiblePair(String.class,
software.amazon.awssdk.services.cloudwatch.CloudWatchClient.class));
return answer;
}
@@ -59,7 +58,6 @@
(camel) branch camel-4.4.x updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.4.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-4.4.x by this push: new 9919181631d Regen 9919181631d is described below commit 9919181631d89643553f617a06ddd18091037a68 Author: Claus Ibsen AuthorDate: Fri Mar 8 16:01:34 2024 +0100 Regen --- .../camel-azure-cosmosdb/src/main/docs/azure-cosmosdb-component.adoc| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-azure/camel-azure-cosmosdb/src/main/docs/azure-cosmosdb-component.adoc b/components/camel-azure/camel-azure-cosmosdb/src/main/docs/azure-cosmosdb-component.adoc index b10c625ac38..dc42e9dcde7 100644 --- a/components/camel-azure/camel-azure-cosmosdb/src/main/docs/azure-cosmosdb-component.adoc +++ b/components/camel-azure/camel-azure-cosmosdb/src/main/docs/azure-cosmosdb-component.adoc @@ -2,7 +2,7 @@ :doctitle: Azure CosmosDB :shortname: azure-cosmosdb :artifactid: camel-azure-cosmosdb -:description: To read and write records to the CosmosDB database on the Azure cloud platform. +:description: To read and write records to the CosmosDB database on Azure cloud platform. :since: 3.10 :supportlevel: Stable :tabs-sync-option:
(camel) branch regen_bot updated (a3ff92203ee -> 38deed9faac)
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 a3ff92203ee CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side add 38deed9faac Add note in 4.4 upgrade guide about openapi v2 (swagger) is deprecated No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 3 +++ 1 file changed, 3 insertions(+)
(camel-spring-boot) branch duration deleted (was ffc407d9ce0)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch duration in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was ffc407d9ce0 CAMEL-20542: spring boot auto-configuration should not type convert java.time objects. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-spring-boot) branch main updated: Duration (#1102)
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new e7286fa0650 Duration (#1102)
e7286fa0650 is described below
commit e7286fa0650f024427b2bb20adddfc049fc67972
Author: Claus Ibsen
AuthorDate: Fri Mar 8 15:56:14 2024 +0100
Duration (#1102)
CAMEL-20542: spring boot auto-configuration should not type convert
java.time objects.
---
.../camel-aws2-cw-starter/src/main/docs/aws2-cw.json | 2 +-
.../aws2/cw/springboot/Cw2ComponentConfiguration.java | 2 +-
.../component/aws2/cw/springboot/Cw2ComponentConverter.java | 2 --
.../src/main/docs/azure-servicebus.json | 4 ++--
.../springboot/ServiceBusComponentConfiguration.java | 5 ++---
.../servicebus/springboot/ServiceBusComponentConverter.java | 4
.../src/main/docs/azure-storage-blob.json | 6 +++---
.../storage/blob/springboot/BlobComponentConfiguration.java | 7 ++-
.../azure/storage/blob/springboot/BlobComponentConverter.java | 4
.../src/main/docs/azure-storage-datalake.json | 2 +-
.../datalake/springboot/DataLakeComponentConfiguration.java | 2 +-
.../datalake/springboot/DataLakeComponentConverter.java | 2 --
.../src/main/docs/azure-storage-queue.json| 6 +++---
.../storage/queue/springboot/QueueComponentConfiguration.java | 7 ++-
.../storage/queue/springboot/QueueComponentConverter.java | 2 --
.../camel-consul-starter/src/main/docs/consul.json| 6 +++---
.../consul/springboot/ConsulComponentConfiguration.java | 7 +++
.../component/consul/springboot/ConsulComponentConverter.java | 2 --
.../camel-etcd3-starter/src/main/docs/etcd3.json | 8
.../etcd3/springboot/Etcd3ComponentConfiguration.java | 11 ---
.../component/etcd3/springboot/Etcd3ComponentConverter.java | 2 --
.../camel-minio-starter/src/main/docs/minio.json | 4 ++--
.../minio/springboot/MinioComponentConfiguration.java | 6 ++
.../component/minio/springboot/MinioComponentConverter.java | 2 --
.../camel-qdrant-starter/src/main/docs/qdrant.json| 2 +-
.../qdrant/springboot/QdrantComponentConfiguration.java | 3 +--
.../component/qdrant/springboot/QdrantComponentConverter.java | 2 --
.../springboot/maven/SpringBootAutoConfigurationMojo.java | 9 +
28 files changed, 47 insertions(+), 74 deletions(-)
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
b/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
index d4a5c7ca72d..5f5734afb16 100644
--- a/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
+++ b/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
@@ -128,7 +128,7 @@
{
"name": "camel.component.aws2-cw.timestamp",
"type": "java.time.Instant",
- "description": "The metric timestamp. The option is a java.time.Instant
type.",
+ "description": "The metric timestamp",
"sourceType":
"org.apache.camel.component.aws2.cw.springboot.Cw2ComponentConfiguration"
},
{
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
index 8214f82297a..fcce9937464 100644
---
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
@@ -71,7 +71,7 @@ public class Cw2ComponentConfiguration
*/
private String region;
/**
- * The metric timestamp. The option is a java.time.Instant type.
+ * The metric timestamp
*/
private Instant timestamp;
/**
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
index 78cc4bba863..b0b6bf26555 100644
---
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
+++
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
@@ -40,7 +40,6 @@ public class Cw2ComponentConverter implements
GenericConverter {
public Set getConvertibleTypes() {
Set answer = new LinkedHashSet<>();
answer.add(new
Re: [PR] Duration [camel-spring-boot]
davsclaus merged PR #1102: URL: https://github.com/apache/camel-spring-boot/pull/1102 -- 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: Add note in 4.4 upgrade guide about openapi v2 (swagger) is deprecated
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 38deed9faac Add note in 4.4 upgrade guide about openapi v2 (swagger) is deprecated 38deed9faac is described below commit 38deed9faacd537ae2838b6d540500da7692ba19 Author: Claus Ibsen AuthorDate: Fri Mar 8 15:51:12 2024 +0100 Add note in 4.4 upgrade guide about openapi v2 (swagger) is deprecated --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc index 43c1ed7587f..d3c7a5d88d9 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc @@ -239,6 +239,9 @@ use `org.apache.camel.component.jsonvalidator.DefaultJsonUriSchemaLoader` instea Removed `token` from the URI's path in favor of setting it through a `token` query parameter. While the `token` was in the URI path, it could potentially be leaked within the logs. +=== camel-openapi-java and camel-rest-openapi + +Deprecated support for the old Swagger 2.0 spec. Only OpenAPI v3 specs is supported from Camel 4.5 onwards. == Camel Spring Boot
Re: [PR] fix(trait): revert persisted status [camel-k]
squakez commented on PR #5233: URL: https://github.com/apache/camel-k/pull/5233#issuecomment-1985815518 ``` --- PASS: TestNativeHighMemoryIntegrations (1834.10s) --- PASS: TestNativeHighMemoryIntegrations/java_native_support (875.74s) --- PASS: TestNativeHighMemoryIntegrations/java_native_support/java_native_same_should_not_rebuild (2.21s) --- PASS: TestNativeHighMemoryIntegrations/java_native_support/java_native_should_rebuild (428.39s) --- PASS: TestNativeHighMemoryIntegrations/groovy_native_support (495.43s) --- PASS: TestNativeHighMemoryIntegrations/kotlin_native_support (451.77s) PASS ok github.com/apache/camel-k/v2/e2e/native 1834.133s --- PASS: TestNativeIntegrations (884.52s) --- PASS: TestNativeIntegrations/unsupported_integration_source_language (0.76s) --- PASS: TestNativeIntegrations/xml_native_support (412.21s) --- PASS: TestNativeIntegrations/automatic_rollout_deployment_from_jvm_to_native_kit (462.53s) --- PASS: TestNativeIntegrations/automatic_rollout_deployment_from_jvm_to_native_kit/yaml_native_should_not_rebuild (2.70s) PASS ok github.com/apache/camel-k/v2/e2e/native 1330.983s ``` -- 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
Re: [PR] chore(e2e): Improve E2E tests [camel-k]
christophd commented on PR #5188: URL: https://github.com/apache/camel-k/pull/5188#issuecomment-1985810056 @squakez rebase done -- 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
[PR] Duration [camel-spring-boot]
davsclaus opened a new pull request, #1102: URL: https://github.com/apache/camel-spring-boot/pull/1102 (no comment) -- 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-spring-boot) 02/02: CAMEL-20542: spring boot auto-configuration should not type convert java.time objects.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch duration
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ffc407d9ce0abe01f678db8e807fecffcb7a409d
Author: Claus Ibsen
AuthorDate: Fri Mar 8 15:34:51 2024 +0100
CAMEL-20542: spring boot auto-configuration should not type convert
java.time objects.
---
.../camel-aws2-cw-starter/src/main/docs/aws2-cw.json | 2 +-
.../aws2/cw/springboot/Cw2ComponentConfiguration.java | 2 +-
.../component/aws2/cw/springboot/Cw2ComponentConverter.java | 2 --
.../src/main/docs/azure-servicebus.json | 4 ++--
.../springboot/ServiceBusComponentConfiguration.java | 5 ++---
.../servicebus/springboot/ServiceBusComponentConverter.java | 4
.../src/main/docs/azure-storage-blob.json | 6 +++---
.../storage/blob/springboot/BlobComponentConfiguration.java | 7 ++-
.../azure/storage/blob/springboot/BlobComponentConverter.java | 4
.../src/main/docs/azure-storage-datalake.json | 2 +-
.../datalake/springboot/DataLakeComponentConfiguration.java | 2 +-
.../datalake/springboot/DataLakeComponentConverter.java | 2 --
.../src/main/docs/azure-storage-queue.json| 6 +++---
.../storage/queue/springboot/QueueComponentConfiguration.java | 7 ++-
.../storage/queue/springboot/QueueComponentConverter.java | 2 --
.../camel-consul-starter/src/main/docs/consul.json| 6 +++---
.../consul/springboot/ConsulComponentConfiguration.java | 7 +++
.../component/consul/springboot/ConsulComponentConverter.java | 2 --
.../camel-etcd3-starter/src/main/docs/etcd3.json | 8
.../etcd3/springboot/Etcd3ComponentConfiguration.java | 11 ---
.../component/etcd3/springboot/Etcd3ComponentConverter.java | 2 --
.../camel-minio-starter/src/main/docs/minio.json | 4 ++--
.../minio/springboot/MinioComponentConfiguration.java | 6 ++
.../component/minio/springboot/MinioComponentConverter.java | 2 --
.../camel-qdrant-starter/src/main/docs/qdrant.json| 2 +-
.../qdrant/springboot/QdrantComponentConfiguration.java | 3 +--
.../component/qdrant/springboot/QdrantComponentConverter.java | 2 --
27 files changed, 38 insertions(+), 74 deletions(-)
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
b/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
index d4a5c7ca72d..5f5734afb16 100644
--- a/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
+++ b/components-starter/camel-aws2-cw-starter/src/main/docs/aws2-cw.json
@@ -128,7 +128,7 @@
{
"name": "camel.component.aws2-cw.timestamp",
"type": "java.time.Instant",
- "description": "The metric timestamp. The option is a java.time.Instant
type.",
+ "description": "The metric timestamp",
"sourceType":
"org.apache.camel.component.aws2.cw.springboot.Cw2ComponentConfiguration"
},
{
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
index 8214f82297a..fcce9937464 100644
---
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConfiguration.java
@@ -71,7 +71,7 @@ public class Cw2ComponentConfiguration
*/
private String region;
/**
- * The metric timestamp. The option is a java.time.Instant type.
+ * The metric timestamp
*/
private Instant timestamp;
/**
diff --git
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
index 78cc4bba863..b0b6bf26555 100644
---
a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
+++
b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
@@ -40,7 +40,6 @@ public class Cw2ComponentConverter implements
GenericConverter {
public Set getConvertibleTypes() {
Set answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.aws2.cw.Cw2Configuration.class));
-answer.add(new ConvertiblePair(String.class, java.time.Instant.class));
answer.add(new ConvertiblePair(String.class,
(camel-spring-boot) branch duration created (now ffc407d9ce0)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch duration in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at ffc407d9ce0 CAMEL-20542: spring boot auto-configuration should not type convert java.time objects. This branch includes the following new commits: new 5413a3f3d33 CAMEL-20542: spring boot auto-configuration should not type convert java.time objects. new ffc407d9ce0 CAMEL-20542: spring boot auto-configuration should not type convert java.time objects. 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.
(camel-spring-boot) 01/02: CAMEL-20542: spring boot auto-configuration should not type convert java.time objects.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch duration
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 5413a3f3d33bbabff5ff53d02e202fe6974b0d2b
Author: Claus Ibsen
AuthorDate: Fri Mar 8 15:34:12 2024 +0100
CAMEL-20542: spring boot auto-configuration should not type convert
java.time objects.
---
.../camel/springboot/maven/SpringBootAutoConfigurationMojo.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index 48334bcc709..e0b686d4547 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -747,6 +747,10 @@ public class SpringBootAutoConfigurationMojo extends
AbstractSpringBootGenerator
if (option.getJavaType().startsWith("java.util.Map") ||
option.getJavaType().startsWith("java.util.List") ||
option.getJavaType().startsWith("java.util.Set")) {
return false;
}
+// we can configure java.time types from spring-boot so do not regard
them as complex
+if (option.getJavaType().startsWith("java.time")) {
+return false;
+}
// all the object types are complex
return "object".equals(option.getType()) ||
"duration".equals(option.getType());
}
@@ -756,6 +760,11 @@ public class SpringBootAutoConfigurationMojo extends
AbstractSpringBootGenerator
if (option.getJavaType().startsWith("java.util.Map") ||
option.getJavaType().startsWith("java.util.List") ||
option.getJavaType().startsWith("java.util.Set")) {
return false;
}
+// we can configure java.time types from spring-boot so do not regard
them as complex
+if (option.getJavaType().startsWith("java.time")) {
+return false;
+}
+
// enums are not complex
if (option.getEnums() != null && !option.getEnums().isEmpty()) {
return false;
(camel-quarkus) branch camel-main updated: Fixed latform http - inlining requires unique routes, partialy fixed openapi-java
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 8d4713857a Fixed latform http - inlining requires unique routes,
partialy fixed openapi-java
8d4713857a is described below
commit 8d4713857a8410f380301a1a053c58572b064d8b
Author: JiriOndrusek
AuthorDate: Fri Mar 8 15:34:15 2024 +0100
Fixed latform http - inlining requires unique routes, partialy fixed
openapi-java
---
integration-tests/openapi-java/pom.xml | 4
.../component/openapijava/it/OpenApiRoutes.java| 28 +++---
integration-tests/platform-http/pom.xml| 4
.../platform/http/it/PlatformHttpRouteBuilder.java | 6 ++---
4 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/integration-tests/openapi-java/pom.xml
b/integration-tests/openapi-java/pom.xml
index e646f823c4..494797bcea 100644
--- a/integration-tests/openapi-java/pom.xml
+++ b/integration-tests/openapi-java/pom.xml
@@ -55,6 +55,10 @@
org.apache.camel.quarkus
camel-quarkus-rest
+
+org.apache.camel.quarkus
+camel-quarkus-seda
+
io.quarkus
quarkus-resteasy
diff --git
a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
index 9b93b29959..e89d8554df 100644
---
a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
+++
b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
@@ -102,14 +102,14 @@ public class OpenApiRoutes extends RouteBuilder {
.code("error")
.message("Response Error")
.endResponseMessage()
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.get("/security/scopes")
.security("OAuth2", "scope1,scope2,scope3")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.get("/security/api/key")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.apiKey("X-API-Key", "The API key")
.withHeader("X-API-KEY")
@@ -117,13 +117,13 @@ public class OpenApiRoutes extends RouteBuilder {
.end()
.get("/security/basic/auth")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.basicAuth("basicAuth", "Basic Authentication")
.end()
.get("/security/oauth2")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.oauth2("oauth2", "OAuth2 Authentication")
.flow("implicit")
@@ -137,19 +137,19 @@ public class OpenApiRoutes extends RouteBuilder {
if (openApiVersion.startsWith("3")) {
rest()
.get("/security/bearer/token")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.bearerToken("bearerAuth", "Bearer Token Authentication")
.end()
.get("/security/mutual/tls")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.mutualTLS("mutualTLS")
.end()
.get("/security/openid")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.securityDefinitions()
.openIdConnect("openId",
"https://secure.apache.org/fake/openid-configuration;)
.end()
@@ -227,7 +227,7 @@ public class OpenApiRoutes extends RouteBuilder {
.arrayType("password")
.allowableValues("foo", "bar", "cheese")
.endParam()
-.to("direct:echoMethodPath");
+.to("seda:echoMethodPath");
rest("/form")
.post("/oneOf")
@@ -242,7 +242,7 @@ public class OpenApiRoutes extends RouteBuilder {
.code(200).message("Ok")
.endResponseMessage()
-.to("direct:res");
+.to("seda:res");
rest("/form")
.post("/allOf")
(camel) branch regen_bot updated (8b56b78392b -> a3ff92203ee)
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 8b56b78392b Central (#13420) add e48a29a44ea CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side add c18843a1c60 CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side add a3ff92203ee CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side No new revisions were added by this update. Summary of changes: .../catalog/components/aws-bedrock-agent.json | 4 +- .../aws2/bedrock/agent/aws-bedrock-agent.json | 4 +- .../aws2/bedrock/agent/BedrockAgentOperations.java | 4 +- .../aws2/bedrock/agent/BedrockAgentProducer.java | 63 -- .../agent/integration/BedrockAgentProducerIT.java | 17 +- 5 files changed, 82 insertions(+), 10 deletions(-)
[I] Only include CloudEvents transformer service pattern if camel-quarkus-cloudevents is on the classpath [camel-quarkus]
jamesnetherton opened a new issue, #5853: URL: https://github.com/apache/camel-quarkus/issues/5853 At the moment there is a service inclusion pattern set in the CQ core like `META-INF/services/org/apache/camel/transformer/*`. This means that all transformers provided by Camel components will get discovered. We should excluded any CloudEvents transformers by default unless `camel-quarkus-cloudevents` is on the classpath. Otherwise we have to keep on explicitly adding `camel-cloudevents` in a bunch of places, where it should be [optional](https://github.com/search?q=repo%3Aapache%2Fcamel+camel-cloudevents+language%3A%22Maven+POM%22+%22provided%22=code). -- 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.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch CAMEL-20543 deleted (was 1621229c95f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20543 in repository https://gitbox.apache.org/repos/asf/camel.git was 1621229c95f CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) 02/03: CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side
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 c18843a1c60f9abe5fb97062d24e0ed672184de0
Author: Andrea Cosentino
AuthorDate: Fri Mar 8 14:36:45 2024 +0100
CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the
producer side
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/catalog/components/aws-bedrock-agent.json| 4 ++--
.../apache/camel/component/aws2/bedrock/agent/aws-bedrock-agent.json | 4 ++--
.../camel/component/aws2/bedrock/agent/BedrockAgentProducer.java | 1 -
.../aws2/bedrock/agent/integration/BedrockAgentProducerIT.java| 2 --
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock-agent.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock-agent.json
index ead55d6577f..d3b7a7545d5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock-agent.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock-agent.json
@@ -28,7 +28,7 @@
"knowledgeBaseId": { "index": 2, "kind": "property", "displayName":
"Knowledge Base Id", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Knowledge
Base Id we are going to use" },
"lazyStartProducer": { "index": 3, "kind": "property", "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 [...]
"modelId": { "index": 4, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "anthropic.claude-instant-v1",
"anthropic.claude-v2", "anthropic.claude-v2:1" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descr [...]
-"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descript [...]
+"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob", "listIngestionJobs" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "conf [...]
"overrideEndpoint": { "index": 6, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used [...]
"pojoRequest": { "index": 7, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"profileCredentialsName": { "index": 8, "kind": "property", "displayName":
"Profile Credentials Name", "group": "producer", "label": "", "required":
false, "type": "string", "javaType":
(camel) 03/03: CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side
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 a3ff92203ee283b78c6a5598c6afc56896abadc5
Author: Andrea Cosentino
AuthorDate: Fri Mar 8 14:41:02 2024 +0100
CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the
producer side
Signed-off-by: Andrea Cosentino
---
.../aws2/bedrock/agent/integration/BedrockAgentProducerIT.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
index 8553a5150c4..2de238a7fb4 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
@@ -25,12 +25,14 @@ 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.EnabledIfSystemProperties;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
// Must be manually tested. Provide your own accessKey and secretKey using
-Daws.manual.access.key and -Daws.manual.secret.key
-/*@EnabledIfSystemProperties({
+@EnabledIfSystemProperties({
@EnabledIfSystemProperty(named = "aws.manual.access.key", matches =
".*", disabledReason = "Access key not provided"),
@EnabledIfSystemProperty(named = "aws.manual.secret.key", matches =
".*", disabledReason = "Secret key not provided")
-})*/
+})
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class BedrockAgentProducerIT extends CamelTestSupport {
@@ -70,10 +72,10 @@ class BedrockAgentProducerIT extends CamelTestSupport {
@Override
public void configure() {
from("direct:start_ingestion")
-
.to("aws-bedrock-agent:label?useDefaultCredentialsProvider=true=us-east-1=startIngestionJob")
+
.to("aws-bedrock-agent:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=startIngestionJob")
.to(result);
from("direct:list_ingestion_jobs")
-
.to("aws-bedrock-agent:label?useDefaultCredentialsProvider=true=us-east-1=listIngestionJobs")
+
.to("aws-bedrock-agent:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=listIngestionJobs")
.log("${body}")
.to(result);
}
(camel) 01/03: CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side
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 e48a29a44ea3e25a5081c2452da0e8773edc2510
Author: Andrea Cosentino
AuthorDate: Fri Mar 8 14:23:38 2024 +0100
CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the
producer side
Signed-off-by: Andrea Cosentino
---
.../aws2/bedrock/agent/BedrockAgentOperations.java | 4 +-
.../aws2/bedrock/agent/BedrockAgentProducer.java | 64 --
.../agent/integration/BedrockAgentProducerIT.java | 21 ++-
3 files changed, 81 insertions(+), 8 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentOperations.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentOperations.java
index 45b2b2cbff8..57710e6951e 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentOperations.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentOperations.java
@@ -18,5 +18,7 @@ package org.apache.camel.component.aws2.bedrock.agent;
public enum BedrockAgentOperations {
-startIngestionJob
+startIngestionJob,
+
+listIngestionJobs
}
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentProducer.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentProducer.java
index ba479bd3d0a..de54bc34ed8 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentProducer.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentProducer.java
@@ -27,9 +27,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.services.bedrockagent.BedrockAgentClient;
+import
software.amazon.awssdk.services.bedrockagent.model.ListIngestionJobsRequest;
+import
software.amazon.awssdk.services.bedrockagent.model.ListIngestionJobsResponse;
import
software.amazon.awssdk.services.bedrockagent.model.StartIngestionJobRequest;
import
software.amazon.awssdk.services.bedrockagent.model.StartIngestionJobResponse;
-import software.amazon.awssdk.services.bedrockagentruntime.model.*;
/**
* A Producer which sends messages to the Amazon Bedrock Agent Service http://aws.amazon.com/bedrock/;>AWS
@@ -50,6 +51,9 @@ public class BedrockAgentProducer extends DefaultProducer {
case startIngestionJob:
startIngestionJob(getEndpoint().getBedrockAgentClient(),
exchange);
break;
+case listIngestionJobs:
+listIngestionJobs(getEndpoint().getBedrockAgentClient(),
exchange);
+break;
default:
throw new IllegalArgumentException("Unsupported operation");
}
@@ -95,7 +99,7 @@ public class BedrockAgentProducer extends DefaultProducer {
throw ase;
}
Message message = getMessageForResponse(exchange);
-prepareResponse(result, message);
+prepareIngestionJobResponse(result, message);
}
} else {
String knowledgeBaseId;
@@ -123,14 +127,66 @@ public class BedrockAgentProducer extends DefaultProducer
{
builder.dataSourceId(dataSourceId);
StartIngestionJobResponse output =
bedrockAgentClient.startIngestionJob(builder.build());
Message message = getMessageForResponse(exchange);
-prepareResponse(output, message);
+prepareIngestionJobResponse(output, message);
+}
+}
+
+
+private void listIngestionJobs(BedrockAgentClient bedrockAgentClient,
Exchange exchange)
+throws InvalidPayloadException {
+if (getConfiguration().isPojoRequest()) {
+Object payload = exchange.getMessage().getMandatoryBody();
+if (payload instanceof ListIngestionJobsRequest) {
+ListIngestionJobsResponse result;
+try {
+result =
bedrockAgentClient.listIngestionJobs((ListIngestionJobsRequest) payload);
+} catch (AwsServiceException ase) {
+LOG.trace("Start Ingestion Job command returned the error
code {}", ase.awsErrorDetails().errorCode());
+throw ase;
+}
+Message message = getMessageForResponse(exchange);
+prepareListIngestionJobsResponse(result, message);
+}
+} else {
+String
(camel) branch main updated (8b56b78392b -> a3ff92203ee)
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 8b56b78392b Central (#13420) new e48a29a44ea CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side new c18843a1c60 CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side new a3ff92203ee CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side 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: .../catalog/components/aws-bedrock-agent.json | 4 +- .../aws2/bedrock/agent/aws-bedrock-agent.json | 4 +- .../aws2/bedrock/agent/BedrockAgentOperations.java | 4 +- .../aws2/bedrock/agent/BedrockAgentProducer.java | 63 -- .../agent/integration/BedrockAgentProducerIT.java | 17 +- 5 files changed, 82 insertions(+), 10 deletions(-)
Re: [PR] CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side - ListIngestionJobs Operation [camel]
oscerd merged PR #13422: URL: https://github.com/apache/camel/pull/13422 -- 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: fixed Rest - inlining requires unique routes
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 99c4d3ba13 fixed Rest - inlining requires unique routes
99c4d3ba13 is described below
commit 99c4d3ba137abe2d1443d442c46943340a7a601f
Author: JiriOndrusek
AuthorDate: Fri Mar 8 15:09:21 2024 +0100
fixed Rest - inlining requires unique routes
---
integration-tests/rest/pom.xml | 4
.../quarkus/component/rest/it/RestRoutes.java | 26 +++---
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/integration-tests/rest/pom.xml b/integration-tests/rest/pom.xml
index a9d407008a..de76b46bbe 100644
--- a/integration-tests/rest/pom.xml
+++ b/integration-tests/rest/pom.xml
@@ -59,6 +59,10 @@
org.apache.camel.quarkus
camel-quarkus-rest
+
+org.apache.camel.quarkus
+camel-quarkus-seda
+
io.quarkus
quarkus-resteasy-jsonb
diff --git
a/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
b/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
index ea6254c9a7..4bd328713c 100644
---
a/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
+++
b/integration-tests/rest/src/main/java/org/apache/camel/quarkus/component/rest/it/RestRoutes.java
@@ -42,29 +42,29 @@ public class RestRoutes extends RouteBuilder {
rest("/rest")
.delete()
.produces("text/plain")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.get()
.produces("text/plain")
-.to("direct:echoMethodPath")
+.to("seda:echoMethodPath")
.head()
-.to("direct:contentTypeText")
+.to("seda:contentTypeText")
.patch()
.consumes("text/plain")
.produces("text/plain")
-.to("direct:echoBodyPath")
+.to("seda:echoBodyPath")
.post()
.consumes("text/plain")
.produces("text/plain")
-.to("direct:echoBodyPath")
+.to("seda:echoBodyPath")
.put()
.consumes("text/plain")
.produces("text/plain")
-.to("direct:echoBodyPath")
+.to("seda:echoBodyPath")
.post("/validation")
.clientRequestValidation(true)
@@ -81,7 +81,7 @@ public class RestRoutes extends RouteBuilder {
.bindingMode(RestBindingMode.json)
.type(Person.class)
.produces(MediaType.TEXT_PLAIN)
-.to("direct:personString")
+.to("seda:personString")
.get("/binding/json/producer")
.to("direct:personJson")
@@ -90,7 +90,7 @@ public class RestRoutes extends RouteBuilder {
.bindingMode(RestBindingMode.xml)
.type(Person.class)
.produces(MediaType.TEXT_PLAIN)
-.to("direct:personString")
+.to("seda:personString")
.get("/binding/xml/producer")
.to("direct:personXml")
@@ -99,15 +99,15 @@ public class RestRoutes extends RouteBuilder {
.to("direct:hello")
.verb("head", "/custom/verb")
-.to("direct:contentTypeText")
+.to("seda:contentTypeText")
.post("/multipart/upload")
.to("direct:processAttachments");
-from("direct:echoMethodPath")
+from("seda:echoMethodPath")
.setBody().simple("${header.CamelHttpMethod}:
${header.CamelHttpPath}");
-from("direct:echoBodyPath")
+from("seda:echoBodyPath")
.setBody().simple("${body}: ${header.CamelHttpPath}");
from("direct:greetWithBody")
@@ -119,7 +119,7 @@ public class RestRoutes extends RouteBuilder {
from("direct:hello")
.log("Hello ${body}");
-from("direct:personString")
+from("seda:personString")
.setHeader(Exchange.CONTENT_TYPE, constant("text/plain"))
.setBody().simple("Name: ${body.firstName} ${body.lastName},
Age: ${body.age}");
@@ -129,7 +129,7 @@ public class RestRoutes extends RouteBuilder {
from("direct:personXml")
.setBody().constant(PERSON_XML);
-from("direct:contentTypeText")
+from("seda:contentTypeText")
.setHeader(Exchange.CONTENT_TYPE).constant("text/plain");
(camel-spring-boot) branch main updated: Regen
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new de8b0d9f749 Regen
de8b0d9f749 is described below
commit de8b0d9f7498a8893c0d32b91e8aa5f7a6945527
Author: Claus Ibsen
AuthorDate: Fri Mar 8 15:02:46 2024 +0100
Regen
---
.../apache/camel/springboot/catalog/components/aws-bedrock-agent.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
index 73667b1f4c0..2816931d7ff 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
@@ -28,7 +28,7 @@
"knowledgeBaseId": { "index": 2, "kind": "property", "displayName":
"Knowledge Base Id", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Knowledge
Base Id we are going to use" },
"lazyStartProducer": { "index": 3, "kind": "property", "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 [...]
"modelId": { "index": 4, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "anthropic.claude-instant-v1",
"anthropic.claude-v2", "anthropic.claude-v2:1" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descr [...]
-"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob", "listIngestionJobs" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "conf [...]
+"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descript [...]
"overrideEndpoint": { "index": 6, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used [...]
"pojoRequest": { "index": 7, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"profileCredentialsName": { "index": 8, "kind": "property", "displayName":
"Profile Credentials Name", "group": "producer", "label": "", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false",
"configurationClass":
Re: [PR] Install operator/base image according to the target architecture [camel-k]
squakez commented on code in PR #5200: URL: https://github.com/apache/camel-k/pull/5200#discussion_r1517751314 ## script/Makefile: ## @@ -424,57 +433,36 @@ maven-overlay: mkdir -p build/_maven_overlay ./script/maven_overlay.sh build/_maven_overlay -kamel-overlay: - mkdir -p build/_output/bin -ifeq ($(shell uname -s 2>/dev/null || echo Unknown),Linux) - @echo "### Copying Linux platform arch $(IMAGE_ARCH) CLI into output build directory..." -else - @echo "### (Re)Building a Linux platform arch $(IMAGE_ARCH) CLI " - @echo "### Likely you're on a non Linux host, so I need to build a Linux CLI to bundle in the container image" - GOOS=linux GOARCH=$(IMAGE_ARCH) go build $(GOFLAGS) -o build/_output/bin/kamel-$(IMAGE_ARCH) ./cmd/kamel/*.go -endif - cp build/_output/bin/kamel-$(IMAGE_ARCH) build/_output/bin/kamel - TARGET_STAGE := base ifeq ($(DEBUG_MODE),true) TARGET_STAGE := debug CUSTOM_IMAGE := $(CUSTOM_IMAGE)-debug endif -DOCKER_TAG := $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -ifneq ($(IMAGE_ARCH), amd64) - DOCKER_TAG := $(DOCKER_TAG)-$(IMAGE_ARCH) -endif - -images: build kamel-overlay maven-overlay bundle-kamelets +package_maven_artifacts: ifneq (,$(findstring SNAPSHOT,$(DEFAULT_RUNTIME_VERSION))) ./script/package_maven_artifacts.sh -s "$(STAGING_RUNTIME_REPO)" -d "$(CAMEL_K_RUNTIME_DIR)" $(DEFAULT_RUNTIME_VERSION) endif - @echo "### Building Camel K operator arch $(IMAGE_ARCH) container image..." - mkdir -p build/_maven_output - docker buildx build --target $(TARGET_STAGE) --platform=linux/$(IMAGE_ARCH) -t $(DOCKER_TAG) -f build/Dockerfile . -# Mainly used for internal CI purposes Review Comment: This is the reason all checks are failing. As you modified heavily the makefile, things are not working. We don't have a good control on the directives used in all the checks, reason why we better do not touch too much the Makefile. I advocate for a conservative approach, just creating the manifest in the `images-push` and `images-push-staging` methods. -- 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
Re: [PR] CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side - ListIngestionJobs Operation [camel]
github-actions[bot] commented on PR #13422: URL: https://github.com/apache/camel/pull/13422#issuecomment-1985743091 :robot: The Apache Camel test robot will run the tests for you :+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
Re: [PR] CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side - ListIngestionJobs Operation [camel]
oscerd commented on PR #13422: URL: https://github.com/apache/camel/pull/13422#issuecomment-1985742509 /component-test aws -- 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
Re: [PR] CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side [camel]
github-actions[bot] commented on PR #13422: URL: https://github.com/apache/camel/pull/13422#issuecomment-1985742213 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- 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
[PR] CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side [camel]
oscerd opened a new pull request, #13422: URL: https://github.com/apache/camel/pull/13422 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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
Re: [I] [camel-main] Kamelet tests fail at build time due to StackOverflowError [camel-quarkus]
JiriOndrusek commented on issue #5849: URL: https://github.com/apache/camel-quarkus/issues/5849#issuecomment-1985742314 Fixed in camel-main branch, issue can be closed as camel-main (for Camel 4.5 is merged into main) -- 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: fixed kamelet #5849
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 2816632026 fixed kamelet #5849
2816632026 is described below
commit 28166320260b01c0fba8a73774c7fe8e83a3d762
Author: JiriOndrusek
AuthorDate: Fri Mar 8 14:56:55 2024 +0100
fixed kamelet #5849
---
.../camel/quarkus/component/kamelet/deployment/KameletProcessor.java | 5 +
.../org/apache/camel/quarkus/component/kamelet/KameletRecorder.java | 5 +
2 files changed, 10 insertions(+)
diff --git
a/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
b/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
index 1b9ea1f1c1..1bd217b289 100644
---
a/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
+++
b/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
@@ -130,6 +130,11 @@ class KameletProcessor {
resource.setLocation(originalResource.getLocation());
resource.setExists(originalResource.exists());
definition.setResource(resource);
+//remove references to camelContext
https://github.com/apache/camel-quarkus/issues/5849
+definition.setCamelContext(null);
+if (definition.getRoute() != null &&
definition.getRoute().getOutputs() != null) {
+definition.getRoute().getOutputs().forEach(o ->
o.setCamelContext(null));
+}
});
return new CamelContextCustomizerBuildItem(
diff --git
a/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
b/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
index 98499932ed..b431298fc0 100644
---
a/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
+++
b/extensions/kamelet/runtime/src/main/java/org/apache/camel/quarkus/component/kamelet/KameletRecorder.java
@@ -58,6 +58,11 @@ public class KameletRecorder {
}
}
}
+//return references to camelContext
https://github.com/apache/camel-quarkus/issues/5849
+definition.setCamelContext(context);
+if (definition.getRoute() != null &&
definition.getRoute().getOutputs() != null) {
+definition.getRoute().getOutputs().forEach(o ->
o.setCamelContext(context));
+}
}
context.getCamelContextExtension().getContextPlugin(Model.class).addRouteTemplateDefinitions(definitions);
} catch (Exception e) {
(camel) 03/03: CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20543
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1621229c95fd4d56cfa1b603f12696d10a7e5593
Author: Andrea Cosentino
AuthorDate: Fri Mar 8 14:41:02 2024 +0100
CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the
producer side
Signed-off-by: Andrea Cosentino
---
.../aws2/bedrock/agent/integration/BedrockAgentProducerIT.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
index 8553a5150c4..2de238a7fb4 100644
---
a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
+++
b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/agent/integration/BedrockAgentProducerIT.java
@@ -25,12 +25,14 @@ 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.EnabledIfSystemProperties;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
// Must be manually tested. Provide your own accessKey and secretKey using
-Daws.manual.access.key and -Daws.manual.secret.key
-/*@EnabledIfSystemProperties({
+@EnabledIfSystemProperties({
@EnabledIfSystemProperty(named = "aws.manual.access.key", matches =
".*", disabledReason = "Access key not provided"),
@EnabledIfSystemProperty(named = "aws.manual.secret.key", matches =
".*", disabledReason = "Secret key not provided")
-})*/
+})
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class BedrockAgentProducerIT extends CamelTestSupport {
@@ -70,10 +72,10 @@ class BedrockAgentProducerIT extends CamelTestSupport {
@Override
public void configure() {
from("direct:start_ingestion")
-
.to("aws-bedrock-agent:label?useDefaultCredentialsProvider=true=us-east-1=startIngestionJob")
+
.to("aws-bedrock-agent:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=startIngestionJob")
.to(result);
from("direct:list_ingestion_jobs")
-
.to("aws-bedrock-agent:label?useDefaultCredentialsProvider=true=us-east-1=listIngestionJobs")
+
.to("aws-bedrock-agent:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=listIngestionJobs")
.log("${body}")
.to(result);
}
(camel) branch CAMEL-20543 created (now 1621229c95f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20543 in repository https://gitbox.apache.org/repos/asf/camel.git at 1621229c95f CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side This branch includes the following new commits: new 84e8e92762b CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side new 0b7d220b66c CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side new 1621229c95f CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side 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.
(camel) 01/03: CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20543
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 84e8e92762b48ace7e93b9e25f4fa0d9c1b3bcdf
Author: Andrea Cosentino
AuthorDate: Fri Mar 8 14:23:38 2024 +0100
CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the
producer side
Signed-off-by: Andrea Cosentino
---
.../aws2/bedrock/agent/BedrockAgentOperations.java | 4 +-
.../aws2/bedrock/agent/BedrockAgentProducer.java | 64 --
.../agent/integration/BedrockAgentProducerIT.java | 21 ++-
3 files changed, 81 insertions(+), 8 deletions(-)
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentOperations.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentOperations.java
index 45b2b2cbff8..57710e6951e 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentOperations.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentOperations.java
@@ -18,5 +18,7 @@ package org.apache.camel.component.aws2.bedrock.agent;
public enum BedrockAgentOperations {
-startIngestionJob
+startIngestionJob,
+
+listIngestionJobs
}
diff --git
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentProducer.java
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentProducer.java
index ba479bd3d0a..de54bc34ed8 100644
---
a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentProducer.java
+++
b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agent/BedrockAgentProducer.java
@@ -27,9 +27,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
import software.amazon.awssdk.services.bedrockagent.BedrockAgentClient;
+import
software.amazon.awssdk.services.bedrockagent.model.ListIngestionJobsRequest;
+import
software.amazon.awssdk.services.bedrockagent.model.ListIngestionJobsResponse;
import
software.amazon.awssdk.services.bedrockagent.model.StartIngestionJobRequest;
import
software.amazon.awssdk.services.bedrockagent.model.StartIngestionJobResponse;
-import software.amazon.awssdk.services.bedrockagentruntime.model.*;
/**
* A Producer which sends messages to the Amazon Bedrock Agent Service http://aws.amazon.com/bedrock/;>AWS
@@ -50,6 +51,9 @@ public class BedrockAgentProducer extends DefaultProducer {
case startIngestionJob:
startIngestionJob(getEndpoint().getBedrockAgentClient(),
exchange);
break;
+case listIngestionJobs:
+listIngestionJobs(getEndpoint().getBedrockAgentClient(),
exchange);
+break;
default:
throw new IllegalArgumentException("Unsupported operation");
}
@@ -95,7 +99,7 @@ public class BedrockAgentProducer extends DefaultProducer {
throw ase;
}
Message message = getMessageForResponse(exchange);
-prepareResponse(result, message);
+prepareIngestionJobResponse(result, message);
}
} else {
String knowledgeBaseId;
@@ -123,14 +127,66 @@ public class BedrockAgentProducer extends DefaultProducer
{
builder.dataSourceId(dataSourceId);
StartIngestionJobResponse output =
bedrockAgentClient.startIngestionJob(builder.build());
Message message = getMessageForResponse(exchange);
-prepareResponse(output, message);
+prepareIngestionJobResponse(output, message);
+}
+}
+
+
+private void listIngestionJobs(BedrockAgentClient bedrockAgentClient,
Exchange exchange)
+throws InvalidPayloadException {
+if (getConfiguration().isPojoRequest()) {
+Object payload = exchange.getMessage().getMandatoryBody();
+if (payload instanceof ListIngestionJobsRequest) {
+ListIngestionJobsResponse result;
+try {
+result =
bedrockAgentClient.listIngestionJobs((ListIngestionJobsRequest) payload);
+} catch (AwsServiceException ase) {
+LOG.trace("Start Ingestion Job command returned the error
code {}", ase.awsErrorDetails().errorCode());
+throw ase;
+}
+Message message = getMessageForResponse(exchange);
+prepareListIngestionJobsResponse(result, message);
+}
+} else {
+String
(camel) 02/03: CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the producer side
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20543
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0b7d220b66c3fefbff520958f0c07390a6f4f8f2
Author: Andrea Cosentino
AuthorDate: Fri Mar 8 14:36:45 2024 +0100
CAMEL-20543 - Camel-AWS-Bedrock-Agent: Support more operations on the
producer side
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/catalog/components/aws-bedrock-agent.json| 4 ++--
.../apache/camel/component/aws2/bedrock/agent/aws-bedrock-agent.json | 4 ++--
.../camel/component/aws2/bedrock/agent/BedrockAgentProducer.java | 1 -
.../aws2/bedrock/agent/integration/BedrockAgentProducerIT.java| 2 --
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock-agent.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock-agent.json
index ead55d6577f..d3b7a7545d5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock-agent.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock-agent.json
@@ -28,7 +28,7 @@
"knowledgeBaseId": { "index": 2, "kind": "property", "displayName":
"Knowledge Base Id", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Knowledge
Base Id we are going to use" },
"lazyStartProducer": { "index": 3, "kind": "property", "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 [...]
"modelId": { "index": 4, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "anthropic.claude-instant-v1",
"anthropic.claude-v2", "anthropic.claude-v2:1" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descr [...]
-"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "descript [...]
+"operation": { "index": 5, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentOperations", "enum":
[ "startIngestionJob", "listIngestionJobs" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "conf [...]
"overrideEndpoint": { "index": 6, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used [...]
"pojoRequest": { "index": 7, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"profileCredentialsName": { "index": 8, "kind": "property", "displayName":
"Profile Credentials Name", "group": "producer", "label": "", "required":
false, "type": "string", "javaType":
(camel-k) branch main updated (7932a06f1 -> 1d58799b9)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 7932a06f1 fix(quarkus): don't override application.properties add 1d58799b9 fix(ctrl): message digest change No new revisions were added by this update. Summary of changes: pkg/controller/integration/build_kit.go | 2 +- pkg/controller/integration/monitor.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)
Re: [I] Misleading "Monitor: Integration needs a rebuild" message [camel-k]
squakez closed issue #5219: Misleading "Monitor: Integration needs a rebuild" message URL: https://github.com/apache/camel-k/issues/5219 -- 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
Re: [PR] fix(ctrl): message digest change [camel-k]
squakez merged PR #5236: URL: https://github.com/apache/camel-k/pull/5236 -- 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
Re: [PR] chore(e2e): Improve E2E tests [camel-k]
squakez commented on PR #5188: URL: https://github.com/apache/camel-k/pull/5188#issuecomment-1985716413 @christophd please, rebase to main, and once ready let me know so I can run the test locally -- 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 main updated: fix(quarkus): don't override application.properties
This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 7932a06f1 fix(quarkus): don't override application.properties
7932a06f1 is described below
commit 7932a06f194bd91622d3dfc3a31045ccc98e18ca
Author: Pasquale Congiusti
AuthorDate: Fri Mar 8 11:12:15 2024 +0100
fix(quarkus): don't override application.properties
---
pkg/builder/quarkus.go | 19 --
pkg/builder/quarkus_test.go | 60 +
2 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/pkg/builder/quarkus.go b/pkg/builder/quarkus.go
index 3568a6b0c..3c074f540 100644
--- a/pkg/builder/quarkus.go
+++ b/pkg/builder/quarkus.go
@@ -221,9 +221,13 @@ func BuildQuarkusRunnerCommon(ctx context.Context, mc
maven.Context, project mav
}
func computeApplicationProperties(appPropertiesPath string,
applicationProperties map[string]string) error {
- f, err := os.OpenFile(appPropertiesPath, os.O_RDWR|os.O_CREATE, 0666)
+ f, err := os.OpenFile(appPropertiesPath,
os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
if err != nil {
- return fmt.Errorf("failure while creating
application.properties: %w", err)
+ return fmt.Errorf("failure while opening/creating
application.properties: %w", err)
+ }
+ fstat, err := f.Stat()
+ if err != nil {
+ return err
}
if applicationProperties == nil {
// Default build time properties
@@ -231,12 +235,23 @@ func computeApplicationProperties(appPropertiesPath
string, applicationPropertie
}
// disable quarkus banner
applicationProperties["quarkus.banner.enabled"] = "false"
+ // camel-quarkus does route discovery at startup, but we don't want
+ // this to happen as routes are loaded at runtime and looking for
+ // routes at build time may try to load camel-k-runtime routes builder
+ // proxies which in some case may fail.
+ applicationProperties["quarkus.camel.routes-discovery.enabled"] =
"false"
// required for to resolve data type transformers at runtime with
service discovery
// the different Camel runtimes use different resource paths for the
service lookup
applicationProperties["quarkus.camel.service.discovery.include-patterns"] =
"META-INF/services/org/apache/camel/datatype/converter/*,META-INF/services/org/apache/camel/datatype/transformer/*,META-INF/services/org/apache/camel/transformer/*"
// Workaround to prevent JS runtime errors, see
https://github.com/apache/camel-quarkus/issues/5678
applicationProperties["quarkus.class-loading.parent-first-artifacts"] =
"org.graalvm.regex:regex"
defer f.Close()
+ // Add a new line if the file is already containing some value
+ if fstat.Size() > 0 {
+ if _, err := f.WriteString("\n"); err != nil {
+ return err
+ }
+ }
// Fill with properties coming from user configuration
for k, v := range applicationProperties {
if _, err := f.WriteString(fmt.Sprintf("%s=%s\n", k, v)); err
!= nil {
diff --git a/pkg/builder/quarkus_test.go b/pkg/builder/quarkus_test.go
index 791cc24a4..4b994fd4c 100644
--- a/pkg/builder/quarkus_test.go
+++ b/pkg/builder/quarkus_test.go
@@ -162,6 +162,66 @@ func TestGenerateQuarkusProjectWithBuildTimeProperties(t
*testing.T) {
require.NoError(t, err)
}
+func TestGenerateQuarkusProjectWithNativeSources(t *testing.T) {
+ tmpDir, err := os.MkdirTemp("", "go-test-camel-k-quarkus-native")
+ require.NoError(t, err)
+ defaultCatalog, err := camel.DefaultCatalog()
+ require.NoError(t, err)
+
+ builderContext := builderContext{
+ C: context.TODO(),
+ Path: tmpDir,
+ Namespace: "test",
+ Build: v1.BuilderTask{
+ Runtime: defaultCatalog.Runtime,
+ Maven: v1.MavenBuildSpec{
+ MavenSpec: v1.MavenSpec{},
+ },
+ Sources: []v1.SourceSpec{v1.NewSourceSpec("Test.java",
"bogus, irrelevant for test", v1.LanguageJavaSource)},
+ },
+ }
+ if strings.Contains(defaults.DefaultRuntimeVersion, "SNAPSHOT") {
+ builderContext.Build.Maven.Repositories = []v1.Repository{
+ {
+ ID: "APACHE-SNAPSHOT",
+ Name: "Apache Snapshot",
+ URL:
"https://repository.apache.org/content/repositories/snapshots-group;,
+ Snapshots: v1.RepositoryPolicy{
+ Enabled:true,
+
Re: [PR] [Regression] fix(quarkus): don't override application.properties [camel-k]
squakez merged PR #5234: URL: https://github.com/apache/camel-k/pull/5234 -- 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-spring-boot) branch main updated (7e5f37d06c8 -> 48a84552427)
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-spring-boot.git
from 7e5f37d06c8 Regen
new 365fa15d0b6 Regen Bedrock Starter with AWS Bedrock Agent
new 48a84552427 Added test for Bedrock Agent
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/springboot/catalog/components.properties | 1 +
.../catalog/components/aws-bedrock-agent.json | 81 +
.../src/main/docs/aws-bedrock.json | 183 +
.../BedrockAgentComponentAutoConfiguration.java} | 22 +--
.../BedrockAgentComponentConfiguration.java} | 90 +-
.../BedrockAgentComponentConverter.java} | 12 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +
.../itest/springboot/CamelAwsBedrockTest.java | 1 +
8 files changed, 334 insertions(+), 58 deletions(-)
create mode 100644
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
copy
components-starter/{camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java
=>
camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agent/springboot/BedrockAgentComponentAutoConfiguration.java}
(81%)
copy
components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/{agentruntime/springboot/BedrockAgentRuntimeComponentConfiguration.java
=> agent/springboot/BedrockAgentComponentConfiguration.java} (80%)
copy
components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/{runtime/springboot/BedrockComponentConverter.java
=> agent/springboot/BedrockAgentComponentConverter.java} (77%)
(camel-spring-boot) 01/02: Regen Bedrock Starter with AWS Bedrock Agent
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-spring-boot.git
commit 365fa15d0b698a228a606ea3e21ba8476f209a9a
Author: Andrea Cosentino
AuthorDate: Fri Mar 8 14:30:22 2024 +0100
Regen Bedrock Starter with AWS Bedrock Agent
Signed-off-by: Andrea Cosentino
---
.../camel/springboot/catalog/components.properties | 1 +
.../catalog/components/aws-bedrock-agent.json | 81 +
.../src/main/docs/aws-bedrock.json | 183 ++
.../BedrockAgentComponentAutoConfiguration.java| 77 +
.../BedrockAgentComponentConfiguration.java| 374 +
.../springboot/BedrockAgentComponentConverter.java | 65
...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +
7 files changed, 783 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 55aac288128..957a567fb5e 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -9,6 +9,7 @@ atmosphere-websocket
atom
avro
aws-bedrock
+aws-bedrock-agent
aws-bedrock-agent-runtime
aws-cloudtrail
aws-config
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
new file mode 100644
index 000..73667b1f4c0
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock-agent.json
@@ -0,0 +1,81 @@
+{
+ "component": {
+"kind": "component",
+"name": "aws-bedrock-agent",
+"title": "AWS Bedrock Agent",
+"description": "Operate on AWS Bedrock through its Agent.",
+"deprecated": false,
+"firstVersion": "4.5.0",
+"label": "ai,cloud",
+"javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentComponent",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-aws-bedrock-starter",
+"version": "4.5.0-SNAPSHOT",
+"scheme": "aws-bedrock-agent",
+"extendsScheme": "",
+"syntax": "aws-bedrock-agent:label",
+"async": false,
+"api": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false,
+"remote": true
+ },
+ "componentProperties": {
+"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component configuration" },
+"dataSourceId": { "index": 1, "kind": "property", "displayName": "Data
Source Id", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Data source
Id we are going to use" },
+"knowledgeBaseId": { "index": 2, "kind": "property", "displayName":
"Knowledge Base Id", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.agent.BedrockAgentConfiguration",
"configurationField": "configuration", "description": "Define the Knowledge
Base Id we are going to use" },
+"lazyStartProducer": { "index": 3, "kind": "property", "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 [...]
+"modelId": { "index": 4, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "anthropic.claude-instant-v1",
"anthropic.claude-v2", "anthropic.claude-v2:1" ], "deprecated": false,
(camel-spring-boot) 02/02: Added test for Bedrock Agent
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-spring-boot.git
commit 48a84552427af7d6c14d6e1b2ceea5d4a2207f5a
Author: Andrea Cosentino
AuthorDate: Fri Mar 8 14:32:15 2024 +0100
Added test for Bedrock Agent
Signed-off-by: Andrea Cosentino
---
.../test/java/org/apache/camel/itest/springboot/CamelAwsBedrockTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAwsBedrockTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAwsBedrockTest.java
index 38459ee8f62..8c64ad1fbf3 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAwsBedrockTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAwsBedrockTest.java
@@ -41,6 +41,7 @@ public class CamelAwsBedrockTest extends
AbstractSpringBootTestSupport {
@Test
public void componentTests() throws Exception {
this.runComponentTest(createTestConfig(), "aws-bedrock");
+this.runComponentTest(createTestConfig(), "aws-bedrock-agent");
this.runComponentTest(createTestConfig(), "aws-bedrock-agent-runtime");
this.runModuleUnitTestsIfEnabled(config);
(camel-quarkus) branch camel-main updated: Fix failing CamelBeansUnremovableTest tests
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 3b0cebc6ba Fix failing CamelBeansUnremovableTest tests
3b0cebc6ba is described below
commit 3b0cebc6ba07655de136225c9b4707acca9d9b01
Author: James Netherton
AuthorDate: Fri Mar 8 13:33:11 2024 +
Fix failing CamelBeansUnremovableTest tests
---
.../camel/quarkus/core/runtime/CamelBeansUnremovableTest.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelBeansUnremovableTest.java
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelBeansUnremovableTest.java
index 80b6382891..ecd7d2896c 100644
---
a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelBeansUnremovableTest.java
+++
b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelBeansUnremovableTest.java
@@ -39,15 +39,15 @@ import org.junit.jupiter.api.extension.RegisterExtension;
public class CamelBeansUnremovableTest {
-static final String RESSOURCE_PATH =
"org/apache/camel/quarkus/core/runtime/"
+static final String RESOURCE_PATH =
"META-INF/org/apache/camel/quarkus/core/runtime/"
+ CamelBeansUnremovableTest.class.getSimpleName();
@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-.addAsResource("custom-component.json", RESSOURCE_PATH +
"/custom-component.json")
-.addAsResource("custom-dataformat.json", RESSOURCE_PATH +
"/custom-dataformat.json")
-.addAsResource("custom-language.json", RESSOURCE_PATH +
"/custom-language.json"));
+.addAsResource("custom-component.json", RESOURCE_PATH +
"/custom-component.json")
+.addAsResource("custom-dataformat.json", RESOURCE_PATH +
"/custom-dataformat.json")
+.addAsResource("custom-language.json", RESOURCE_PATH +
"/custom-language.json"));
@Inject
CamelContext context;
(camel) branch regen_bot updated (06bc4aaadb3 -> 8b56b78392b)
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 06bc4aaadb3 CAMEL-20536 - Camel-AWS-Bedrock: Add the component for Bedrock Agent add 8b56b78392b Central (#13420) No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-jbang.adoc| 6 ++ .../camel/dsl/jbang/core/commands/Export.java | 6 ++ .../dsl/jbang/core/commands/ExportBaseCommand.java | 8 +++ .../apache/camel/dsl/jbang/core/commands/Run.java | 14 .../java/org/apache/camel/main/KameletMain.java| 26 .../camel/main/download/DependencyDownloader.java | 20 ++ .../main/download/MavenDependencyDownloader.java | 31 - .../camel/tooling/maven/MavenDownloader.java | 24 +++ .../camel/tooling/maven/MavenDownloaderImpl.java | 75 -- 9 files changed, 189 insertions(+), 21 deletions(-)
(camel-quarkus) 01/02: Fixed groovy-dsl, kotlin-dsl, java-joor-dsl because of CAMEL-20466
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 282b1b71984938a1711e4b48718b148fb2b7534b
Author: JiriOndrusek
AuthorDate: Fri Mar 8 13:24:50 2024 +0100
Fixed groovy-dsl, kotlin-dsl, java-joor-dsl because of CAMEL-20466
---
.../groovy-dsl/src/main/resources/routes/routes-with-rest.groovy| 2 --
.../test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java| 2 +-
.../java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java | 1 -
.../java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java| 2 +-
.../kotlin-dsl/src/main/resources/routes/routes-with-rest.kts | 2 --
.../test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java| 2 +-
6 files changed, 3 insertions(+), 8 deletions(-)
diff --git
a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
index ab12f3f457..b09e06b0bd 100644
---
a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
+++
b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
@@ -21,14 +21,12 @@ rest {
path("/my/path") {
get("/get") {
-id("routes-with-rest-get")
produces("text/plain")
to("direct:get")
}
}
post {
-id("routes-with-rest-post")
path("/post")
consumes("text/plain")
produces("text/plain")
diff --git
a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
index 6f41d92bba..5d366194af 100644
---
a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
+++
b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
@@ -54,7 +54,7 @@ class GroovyDslTest {
.then()
.statusCode(200)
.body(CoreMatchers.is(
-
"my-groovy-route,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-eip-body,routes-with-eip-exchange,routes-with-eip-message,routes-with-eip-process,routes-with-eip-setBody,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post,routes-with-rest-get,routes-with-rest-post"));
+
"my-groovy-route,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-eip-body,routes-with-eip-exchange,routes-with-eip-message,routes-with-eip-process,routes-with-eip-setBody,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post"));
RestAssured.given()
.get("/groovy-dsl/main/successful/routes")
.then()
diff --git
a/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
b/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
index c5997b823b..28120a1b29 100644
---
a/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
+++
b/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
@@ -23,7 +23,6 @@ public class MyRoutesWithModel extends RouteBuilder {
public void configure() throws Exception {
rest("/say")
.get("/emp/{id}")
-.id("routes-with-rest-get")
.produces("application/json")
.outType(MyUser.class)
.to("direct:routes-with-rest");
diff --git
a/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
b/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
index 767196aeaf..335c29df34 100644
---
a/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
+++
b/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
@@ -76,7 +76,7 @@ class JavaJoorDslTest {
.then()
.statusCode(200)
.body(CoreMatchers.is(
-
"inner-classes-route,my-java-route,reflection-route,routes-with-bean,routes-with-inner-bean,routes-with-nested-class,routes-with-rest,routes-with-rest-get,routes-with-template"));
+
"inner-classes-route,my-java-route,reflection-route,routes-with-bean,routes-with-inner-bean,routes-with-nested-class,routes-with-rest,routes-with-template"));
RestAssured.given()
(camel-quarkus) 02/02: generated files
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 47d22cecedc2a0db0fec7c245304e5e5d3cf2e73 Author: JiriOndrusek AuthorDate: Fri Mar 8 14:06:49 2024 +0100 generated files --- poms/bom/src/main/generated/flattened-full-pom.xml | 336 ++--- .../src/main/generated/flattened-reduced-pom.xml | 28 +- .../generated/flattened-reduced-verbose-pom.xml| 84 +++--- 3 files changed, 224 insertions(+), 224 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 978b5ff87f..3a11c42ece 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -21793,284 +21793,284 @@ 2.2 -org.eclipse.jetty -jetty-alpn-client -12.0.6 +org.eclipse.jetty +jetty-alpn-client +12.0.7 -org.eclipse.jetty -jetty-alpn-conscrypt-client -12.0.6 +org.eclipse.jetty +jetty-alpn-conscrypt-client +12.0.7 -org.eclipse.jetty -jetty-alpn-conscrypt-server -12.0.6 +org.eclipse.jetty +jetty-alpn-conscrypt-server +12.0.7 -org.eclipse.jetty -jetty-alpn-java-client -12.0.6 +org.eclipse.jetty +jetty-alpn-java-client +12.0.7 -org.eclipse.jetty -jetty-alpn-java-server -12.0.6 +org.eclipse.jetty +jetty-alpn-java-server +12.0.7 -org.eclipse.jetty -jetty-alpn-server -12.0.6 +org.eclipse.jetty +jetty-alpn-server +12.0.7 -org.eclipse.jetty -jetty-client -12.0.6 +org.eclipse.jetty +jetty-client +12.0.7 -org.eclipse.jetty -jetty-deploy -12.0.6 +org.eclipse.jetty +jetty-deploy +12.0.7 -org.eclipse.jetty -jetty-http -12.0.6 +org.eclipse.jetty +jetty-http +12.0.7 -org.eclipse.jetty -jetty-http-spi -12.0.6 +org.eclipse.jetty +jetty-http-spi +12.0.7 -org.eclipse.jetty -jetty-http-tools -12.0.6 +org.eclipse.jetty +jetty-http-tools +12.0.7 -org.eclipse.jetty -jetty-io -12.0.6 +org.eclipse.jetty +jetty-io +12.0.7 -org.eclipse.jetty -jetty-jmx -12.0.6 +org.eclipse.jetty +jetty-jmx +12.0.7 -org.eclipse.jetty -jetty-jndi -12.0.6 +org.eclipse.jetty +jetty-jndi +12.0.7 -org.eclipse.jetty -jetty-keystore -12.0.6 +org.eclipse.jetty +jetty-keystore +12.0.7 -org.eclipse.jetty -jetty-openid -12.0.6 +org.eclipse.jetty +jetty-openid +12.0.7 -org.eclipse.jetty -jetty-osgi -12.0.6 +org.eclipse.jetty +jetty-osgi +12.0.7 -org.eclipse.jetty -jetty-plus -12.0.6 +org.eclipse.jetty +jetty-plus +12.0.7 -org.eclipse.jetty -jetty-proxy -12.0.6 +org.eclipse.jetty +jetty-proxy +12.0.7 -org.eclipse.jetty -jetty-rewrite -12.0.6 +org.eclipse.jetty +jetty-rewrite +12.0.7 -org.eclipse.jetty -jetty-security -12.0.6 +org.eclipse.jetty +jetty-security +12.0.7 -org.eclipse.jetty -jetty-server -12.0.6 +org.eclipse.jetty +jetty-server +12.0.7 -org.eclipse.jetty -jetty-session -12.0.6 +org.eclipse.jetty +jetty-session +12.0.7 -org.eclipse.jetty -jetty-slf4j-impl -12.0.6 +org.eclipse.jetty +jetty-slf4j-impl +12.0.7 -org.eclipse.jetty -jetty-start -12.0.6 +org.eclipse.jetty +jetty-start +12.0.7 -org.eclipse.jetty -jetty-unixdomain-server -12.0.6 +org.eclipse.jetty +jetty-unixdomain-server +12.0.7 -org.eclipse.jetty -jetty-util -12.0.6 +org.eclipse.jetty +jetty-util +12.0.7 -
(camel-quarkus) branch camel-main updated (67cc9e13cf -> 47d22ceced)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 67cc9e13cf fixed slack because of CAMEL-20464 new 282b1b7198 Fixed groovy-dsl, kotlin-dsl, java-joor-dsl because of CAMEL-20466 new 47d22ceced generated files 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: .../main/resources/routes/routes-with-rest.groovy | 2 - .../camel/quarkus/dsl/groovy/GroovyDslTest.java| 2 +- .../main/resources/routes/MyRoutesWithModel.java | 1 - .../quarkus/dsl/java/joor/JavaJoorDslTest.java | 2 +- .../src/main/resources/routes/routes-with-rest.kts | 2 - .../camel/quarkus/dsl/kotlin/KotlinDslTest.java| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 336 ++--- .../src/main/generated/flattened-reduced-pom.xml | 28 +- .../generated/flattened-reduced-verbose-pom.xml| 84 +++--- 9 files changed, 227 insertions(+), 232 deletions(-)
(camel) branch central deleted (was 2543b7596c3)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch central in repository https://gitbox.apache.org/repos/asf/camel.git was 2543b7596c3 CAMEL-20539: camel-jbang - Make it possible to turn off maven central so its easier to ensure all downloads can be done via maven proxy/mirror The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Central (#13420)
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 8b56b78392b Central (#13420)
8b56b78392b is described below
commit 8b56b78392b9425f124c006d8181c899606506e1
Author: Claus Ibsen
AuthorDate: Fri Mar 8 14:01:29 2024 +0100
Central (#13420)
CAMEL-20539: camel-jbang - Make it possible to turn off maven central so
its easier to ensure all downloads can be done via maven proxy/mirror
---
.../modules/ROOT/pages/camel-jbang.adoc| 6 ++
.../camel/dsl/jbang/core/commands/Export.java | 6 ++
.../dsl/jbang/core/commands/ExportBaseCommand.java | 8 +++
.../apache/camel/dsl/jbang/core/commands/Run.java | 14
.../java/org/apache/camel/main/KameletMain.java| 26
.../camel/main/download/DependencyDownloader.java | 20 ++
.../main/download/MavenDependencyDownloader.java | 31 -
.../camel/tooling/maven/MavenDownloader.java | 24 +++
.../camel/tooling/maven/MavenDownloaderImpl.java | 75 --
9 files changed, 189 insertions(+), 21 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 25d0283e7f7..d50e92f81a4 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -3394,6 +3394,12 @@ The follow options related to _exporting_, can be
configured in `application.pro
|`camel.jbang.mavenSettingsSecurity`
|Optional location of Maven settings-security.xml file to decrypt settings.xml
+|`camel.jbang.mavenCentralEnabled`
+|Whether downloading JARs from Maven Central repository is enabled
+
+|`camel.jbang.mavenApacheSnapshotEnabled`
+|Whether downloading JARs from ASF Maven Snapshot repository is enabled
+
|`camel.jbang.exportDir`
|Directory where the project will be exported
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index 419e9da8a93..387eaea659e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -66,6 +66,10 @@ public class Export extends ExportBaseCommand {
this.repos = prop.getProperty("camel.jbang.repos", this.repos);
this.mavenSettings =
prop.getProperty("camel.jbang.maven-settings", this.mavenSettings);
this.mavenSettingsSecurity =
prop.getProperty("camel.jbang.maven-settings-security",
this.mavenSettingsSecurity);
+this.mavenCentralEnabled = "true"
+
.equals(prop.getProperty("camel.jbang.maven-central-enabled",
mavenCentralEnabled ? "true" : "false"));
+this.mavenApacheSnapshotEnabled =
"true".equals(prop.getProperty("camel.jbang.maven-apache-snapshot-enabled",
+mavenApacheSnapshotEnabled ? "true" : "false"));
this.exclude = prop.getProperty("camel.jbang.exclude",
this.exclude);
}
@@ -100,6 +104,8 @@ public class Export extends ExportBaseCommand {
cmd.gav = this.gav;
cmd.mavenSettings = this.mavenSettings;
cmd.mavenSettingsSecurity = this.mavenSettingsSecurity;
+cmd.mavenCentralEnabled = this.mavenCentralEnabled;
+cmd.mavenApacheSnapshotEnabled = this.mavenApacheSnapshotEnabled;
cmd.exportDir = this.exportDir;
cmd.fresh = this.fresh;
cmd.download = this.download;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 502795aafeb..2f5ac5f1472 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -119,6 +119,14 @@ abstract class ExportBaseCommand extends CamelCommand {
description = "Optional location of Maven
settings-security.xml file to decrypt settings.xml")
String mavenSettingsSecurity;
+@CommandLine.Option(names = { "--maven-central-enabled" },
+description = "Whether downloading JARs from Maven
Central repository is enabled")
+boolean mavenCentralEnabled = true;
+
+@CommandLine.Option(names = { "--maven-apache-snapshot-enabled" },
+description = "Whether downloading JARs from ASF Maven
Snapshot repository is enabled")
+boolean
