[camel-examples] branch main updated: Camel Google Secret Manager context reloading: Fix imports
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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 5bf6188d Camel Google Secret Manager context reloading: Fix imports
5bf6188d is described below
commit 5bf6188d36e8a52014d2aeabdcd444d33b12ea14
Author: Andrea Cosentino
AuthorDate: Wed Sep 14 07:54:25 2022 +0200
Camel Google Secret Manager context reloading: Fix imports
---
.../org/apache/camel/example/MyApplication.java| 48 ++
1 file changed, 13 insertions(+), 35 deletions(-)
diff --git
a/examples/vault/google-secret-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/vault/google-secret-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
index 34a5c482..95c29298 100644
---
a/examples/vault/google-secret-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
+++
b/examples/vault/google-secret-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
@@ -16,53 +16,31 @@
*/
package org.apache.camel.example;
+import java.time.Instant;
+
import org.apache.camel.main.Main;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.FixedCredentialsProvider;
-import com.google.api.gax.core.NoCredentialsProvider;
-import com.google.api.gax.grpc.GrpcTransportChannel;
-import com.google.api.gax.rpc.FixedTransportChannelProvider;
-import com.google.api.gax.rpc.TransportChannelProvider;
-import com.google.auth.oauth2.GoogleCredentials;
-import com.google.cloud.pubsub.v1.MessageReceiver;
-import com.google.cloud.pubsub.v1.Subscriber;
-import com.google.cloud.pubsub.v1.AckReplyConsumer;
-import com.google.pubsub.v1.ProjectSubscriptionName;
-import com.google.pubsub.v1.PubsubMessage;
-
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-
-import org.apache.camel.spi.ContextReloadStrategy;
-import org.apache.camel.util.StringHelper;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
/**
* Main class that boot the Camel application
*/
public final class MyApplication {
-private static final Logger LOG =
LoggerFactory.getLogger(MyApplication.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(MyApplication.class);
-public static Instant lastTime = null;
+ public static Instant lastTime = null;
-private MyApplication() {
-}
+ private MyApplication() {
+ }
-public static void main(String[] args) throws Exception {
-// use Camels Main class
-Main main = new Main(MyApplication.class);
+ public static void main(String[] args) throws Exception {
+ // use Camels Main class
+ Main main = new Main(MyApplication.class);
-// now keep the application running until the JVM is terminated (ctrl
+ c or sigterm)
-main.run(args);
-}
+ // now keep the application running until the JVM is terminated
(ctrl + c or
+ // sigterm)
+ main.run(args);
+ }
}
[camel] branch main updated (7e142a7ce71 -> 7902d58a29f)
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 7e142a7ce71 camel-jbang - Add route coverage to camel get route new 8252070f990 Upgrade AWS SDK v2 to version 2.17.273 new 7902d58a29f Sync deps and 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: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 02/02: Sync deps and regen
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 7902d58a29f3ba6462506524400c641d68dc6811 Author: Andrea Cosentino AuthorDate: Wed Sep 14 07:48:29 2022 +0200 Sync deps and regen Signed-off-by: Andrea Cosentino --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index ecf24b0315c..320e20c9d6c 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -65,7 +65,7 @@ 1.11.1 1.11.1 4.2.0 -2.17.272 +2.17.273 2.6.1 1.2.14 1.2.5
[camel] 01/02: Upgrade AWS SDK v2 to version 2.17.273
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 8252070f99004a3dc319f325c6f1c7c908272459 Author: Andrea Cosentino AuthorDate: Wed Sep 14 06:28:11 2022 +0200 Upgrade AWS SDK v2 to version 2.17.273 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 210b4d50e45..3d844038559 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -82,7 +82,7 @@ 1.11.1 1.11.1 4.2.0 -2.17.272 +2.17.273 2.6.1 1.2.14 1.2.5
[camel-examples] 04/04: Camel Google Secret Manager context reloading: Docs regen
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-examples.git commit ae979684378aa96f37a971aa944666b7a9175252 Author: Andrea Cosentino AuthorDate: Wed Sep 14 07:44:20 2022 +0200 Camel Google Secret Manager context reloading: Docs regen Signed-off-by: Andrea Cosentino --- examples/README.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/README.adoc b/examples/README.adoc index 4223ce7f..e4000337 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -11,7 +11,7 @@ View the individual example READMEs for details. == Examples // examples: START -Number of Examples: 89 (0 deprecated) +Number of Examples: 90 (0 deprecated) [width="100%",cols="4,2,4",options="header"] |=== @@ -43,6 +43,8 @@ Number of Examples: 89 (0 deprecated) | link:ftp/README.adoc[FTP] (ftp) | Beginner | An example for showing Camel FTP integration +| link:google-secret-manager-reloading/README.adoc[Google Secret Manager Reloading] (google-secret-manager-reloading) | Beginner | An example for showing Google Secret Manager Camel component with reloading + | link:java8/README.adoc[Java8] (java8) | Beginner | An example for showing Camel DSL for Java 8 | link:kafka-azure/README.adoc[Kafka Azure] (kafka-azure) | Beginner | An example for showing standalone Camel with Kafka and Azure Storage Blob
[camel-examples] 02/04: Camel Google Secret Manager context reloading: Added README
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-examples.git
commit 8354dc7b0aba773ebf4725158afac9658072328f
Author: Andrea Cosentino
AuthorDate: Wed Sep 14 07:35:49 2022 +0200
Camel Google Secret Manager context reloading: Added README
Signed-off-by: Andrea Cosentino
---
.../google-secret-manager-reloading/README.adoc| 187 +
1 file changed, 187 insertions(+)
diff --git a/examples/vault/google-secret-manager-reloading/README.adoc
b/examples/vault/google-secret-manager-reloading/README.adoc
index f0b287e5..782517d2 100644
--- a/examples/vault/google-secret-manager-reloading/README.adoc
+++ b/examples/vault/google-secret-manager-reloading/README.adoc
@@ -4,6 +4,193 @@ This example shows how to use Google Secret Manager to
retrieve a secret, update
Also notice how you can configure Camel in the `application.properties` file.
+=== Setup
+
+First of all you'll need to install the gcloud cli from
https://cloud.google.com/sdk/docs/install
+
+Once the Cli has been installed we can proceed to login and to setup the
project with the following commands:
+
+[source,sh]
+
+gcloud auth login
+
+
+and
+
+[source,sh]
+
+gcloud projects create gcp-sec-refresh --name="GCP Secret Manager Refresh"
+
+
+The project will need a service identity for using secret manager service and
we'll be able to have that through the command:
+
+[source,sh]
+
+gcloud beta services identity create --service "secretmanager.googleapis.com"
--project "gcp-sec-refresh"
+
+
+The latter command will provide a service account name that we need to export
+
+[source,sh]
+
+export SM_SERVICE_ACCOUNT="service-"
+
+
+Since we want to have notifications about event related to a specific secret
through a Google Pubsub topic we'll need to create a topic for this purpose
with the following command:
+
+[source,sh]
+
+gcloud pubsub topics create
"projects/gcp-sec-refresh/topics/pubsub-gcp-sec-refresh"
+
+
+The service account will need Secret Manager authorization to publish messages
on the topic just created, so we'll need to add an iam policy binding with the
following command:
+
+[source,sh]
+
+gcloud pubsub topics add-iam-policy-binding pubsub-gcp-sec-refresh --member
"serviceAccount:${SM_SERVICE_ACCOUNT}" --role "roles/pubsub.publisher"
--project gcp-sec-refresh
+
+
+We now need to create a subscription to the pubsub-gcp-sec-refresh just
created and we're going to call it sub-gcp-sec-refresh with the following
command:
+
+[source,sh]
+
+gcloud pubsub subscriptions create
"projects/gcp-sec-refresh/subscriptions/sub-gcp-sec-refresh" --topic
"projects/gcp-sec-refresh/topics/pubsub-gcp-sec-refresh"
+
+
+Now we need to create a service account for running our application:
+
+[source,sh]
+
+gcloud iam service-accounts create gcp-sec-refresh-sa --description="GCP Sec
Refresh SA" --project gcp-sec-refresh
+
+
+Let's give the SA an owner role:
+
+[source,sh]
+
+gcloud projects add-iam-policy-binding gcp-sec-refresh
--member="serviceAccount:gcp-sec-refresh...@gcp-sec-refresh.iam.gserviceaccount.com"
--role="roles/owner"
+
+
+Now we should create a Service account key file for the just create SA:
+
+[source,sh]
+
+gcloud iam service-accounts keys create gcp-sec-refresh.json
--iam-account=gcp-sec-refresh...@gcp-sec-refresh.iam.gserviceaccount.com
+
+
+Modify the application.properties file to point to serviceAccountKey property
to the just create gcp-sec-refresh.json file.
+
+Let's enable the Secret Manager API for our project
+
+[source,sh]
+
+gcloud services enable secretmanager.googleapis.com --project gcp-sec-refresh
+
+
+If needed enable also the Billing API.
+
+Now it's time to create our hello secret, with topic notification:
+
+[source,sh]
+
+gcloud secrets create hello
--topics=projects/gcp-sec-refresh/topics/pubsub-gcp-sec-refresh
--project=gcp-sec-refresh
+
+
+Let's add a value to the secret:
+
+[source,sh]
+
+echo -n "Camel rocks! " | gcloud secrets versions add hello --data-file=-
--project=gcp-sec-refresh
+
+
+=== Build
+
+First compile the example by executing:
+
+[source,sh]
+
+$ mvn compile
+
+
+=== How to run
+
+Then you can run this example using
+
+[source,sh]
+
+$ mvn camel:run
+
+
+At this point you should see:
+
+[source,sh]
+
+06:49:49.293 [org.apache.camel.example.MyApplication.main()] INFO
org.apache.camel.main.MainSupport - Apache Camel (Main) 3.19.0-SNAPSHOT is
starting
+06:49:49.377 [org.apache.camel.example.MyApplication.main()] INFO
o.apache.camel.main.BaseMainSupport - Classpath scanning enabled from base
package: org.apache.camel.example
+06:49:49.477 [org.apache.camel.example.MyApplication.main()] INFO
o.apache.camel.main.BaseMainSupport - Auto-configuration summary
+06:49:49.478
[camel-examples] 01/04: Camel Google Secret Manager context reloading example
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-examples.git
commit 20c31fe277975c7e706dad064e6a18655a4c3205
Author: Andrea Cosentino
AuthorDate: Wed Sep 14 07:10:02 2022 +0200
Camel Google Secret Manager context reloading example
Signed-off-by: Andrea Cosentino
---
.../google-secret-manager-reloading/README.adoc| 15 +++
.../vault/google-secret-manager-reloading/pom.xml | 113 +
.../org/apache/camel/example/MyApplication.java| 68 +
.../org/apache/camel/example/MyRouteBuilder.java | 28 +
.../src/main/resources/application.properties | 32 ++
.../src/main/resources/logback.xml | 30 ++
6 files changed, 286 insertions(+)
diff --git a/examples/vault/google-secret-manager-reloading/README.adoc
b/examples/vault/google-secret-manager-reloading/README.adoc
new file mode 100644
index ..f0b287e5
--- /dev/null
+++ b/examples/vault/google-secret-manager-reloading/README.adoc
@@ -0,0 +1,15 @@
+== Camel Example Google Secret Manager Reloading
+
+This example shows how to use Google Secret Manager to retrieve a secret,
update the secret and trigger a reload of the camel context.
+
+Also notice how you can configure Camel in the `application.properties` file.
+
+=== Help and contributions
+
+If you hit any problem using Camel or have some feedback, then please
+https://camel.apache.org/community/support/[let us know].
+
+We also love contributors, so
+https://camel.apache.org/community/contributing/[get involved] :-)
+
+The Camel riders!
diff --git a/examples/vault/google-secret-manager-reloading/pom.xml
b/examples/vault/google-secret-manager-reloading/pom.xml
new file mode 100644
index ..a6a93195
--- /dev/null
+++ b/examples/vault/google-secret-manager-reloading/pom.xml
@@ -0,0 +1,113 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+
+org.apache.camel.example
+camel-examples-vault-parent
+3.19.0-SNAPSHOT
+
+
+camel-example-google-secret-manager-reloading
+jar
+Camel :: Example :: Google Secret Manager Reloading
+An example for showing Google Secret Manager Camel component
with reloading
+
+
+Beginner
+
+
+
+
+
+
+org.apache.camel
+camel-bom
+${camel.version}
+pom
+import
+
+
+
+
+
+
+
+org.apache.camel
+camel-core
+
+
+org.apache.camel
+camel-main
+
+
+org.apache.camel
+camel-google-secret-manager
+
+
+org.apache.camel
+camel-http
+
+
+org.apache.camel
+camel-timer
+
+
+org.apache.camel
+camel-jsonpath
+
+
+
+
+org.apache.logging.log4j
+log4j-api
+${log4j2-version}
+runtime
+
+
+ch.qos.logback
+logback-core
+${logback-version}
+
+
+ch.qos.logback
+logback-classic
+${logback-version}
+
+
+
+
+
+
+
+org.apache.camel
+camel-maven-plugin
+${camel.version}
+
+false
+
org.apache.camel.example.MyApplication
+
+
+
+
+
+
diff --git
a/examples/vault/google-secret-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/vault/google-secret-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
new file mode 100644
index ..34a5c482
--- /dev/null
+++
b/examples/vault/google-secret-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the
[camel-examples] 03/04: Camel Google Secret Manager context reloading: Added example to modules
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-examples.git commit a0d497eec9257062caf9673cba1e64640f13abd1 Author: Andrea Cosentino AuthorDate: Wed Sep 14 07:37:46 2022 +0200 Camel Google Secret Manager context reloading: Added example to modules Signed-off-by: Andrea Cosentino --- examples/vault/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/vault/pom.xml b/examples/vault/pom.xml index f755ef57..32be4687 100644 --- a/examples/vault/pom.xml +++ b/examples/vault/pom.xml @@ -39,5 +39,6 @@ aws-secrets-manager aws-secrets-manager-reloading +google-secret-manager-reloading
[camel-examples] branch main updated (d45d3f02 -> ae979684)
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-examples.git
from d45d3f02 CAMEL-18296: Align camel and camel-examples versions to avoid
inconsistencies (#108)
new 20c31fe2 Camel Google Secret Manager context reloading example
new 8354dc7b Camel Google Secret Manager context reloading: Added README
new a0d497ee Camel Google Secret Manager context reloading: Added example
to modules
new ae979684 Camel Google Secret Manager context reloading: Docs regen
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/README.adoc | 4 +-
.../google-secret-manager-reloading/README.adoc| 202 +
.../pom.xml| 8 +-
.../org/apache/camel/example/MyApplication.java| 23 ++-
.../org/apache/camel/example/MyRouteBuilder.java | 5 +-
.../src/main/resources/application.properties | 13 +-
.../src/main/resources/logback.xml | 0
examples/vault/pom.xml | 1 +
8 files changed, 237 insertions(+), 19 deletions(-)
create mode 100644 examples/vault/google-secret-manager-reloading/README.adoc
copy examples/vault/{aws-secrets-manager =>
google-secret-manager-reloading}/pom.xml (92%)
copy examples/vault/{aws-secrets-manager-reloading =>
google-secret-manager-reloading}/src/main/java/org/apache/camel/example/MyApplication.java
(69%)
copy examples/{main-tiny =>
vault/google-secret-manager-reloading}/src/main/java/org/apache/camel/example/MyRouteBuilder.java
(89%)
copy examples/vault/{aws-secrets-manager-reloading =>
google-secret-manager-reloading}/src/main/resources/application.properties (80%)
copy examples/{aws/main-endpointdsl-aws2-s3-kafka =>
vault/google-secret-manager-reloading}/src/main/resources/logback.xml (100%)
[camel] branch regen_bot updated (81c2513b275 -> c2eb20f98ef)
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 81c2513b275 Fix CS add b5a824df8df CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363) add 358f190a974 CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363) add 33039c19137 CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363) add c2eb20f98ef Regen No new revisions were added by this update. Summary of changes: .../camel/catalog/components/google-pubsub.json| 1 + .../pubsub/GooglePubsubEndpointConfigurer.java | 6 .../pubsub/GooglePubsubEndpointUriFactory.java | 3 +- .../component/google/pubsub/google-pubsub.json | 1 + .../google/pubsub/GooglePubsubComponent.java | 2 ++ .../google/pubsub/GooglePubsubEndpoint.java| 13 + .../dsl/GooglePubsubEndpointBuilderFactory.java| 34 ++ 7 files changed, 59 insertions(+), 1 deletion(-)
[camel] branch main updated: camel-jbang - Add route coverage to camel get route
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 7e142a7ce71 camel-jbang - Add route coverage to camel get route
7e142a7ce71 is described below
commit 7e142a7ce718f5e4ee4687466060e407fda84ace
Author: Claus Ibsen
AuthorDate: Wed Sep 14 07:20:52 2022 +0200
camel-jbang - Add route coverage to camel get route
---
.../org/apache/camel/dev-console/route-coverage| 2 -
.../impl/console/RouteCoverageDevConsole.java | 169 -
.../apache/camel/impl/console/RouteDevConsole.java | 46 ++
.../core/commands/process/CamelRouteStatus.java| 14 ++
.../jbang/core/commands/process/CamelRouteTop.java | 3 +
5 files changed, 63 insertions(+), 171 deletions(-)
diff --git
a/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/route-coverage
b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/route-coverage
deleted file mode 100644
index f1efbfc9882..000
---
a/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/route-coverage
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.impl.console.RouteCoverageDevConsole
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteCoverageDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteCoverageDevConsole.java
deleted file mode 100644
index a0ca28c43f2..000
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteCoverageDevConsole.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.impl.console;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Route;
-import org.apache.camel.api.management.ManagedCamelContext;
-import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
-import org.apache.camel.api.management.mbean.ManagedRouteMBean;
-import org.apache.camel.spi.annotations.DevConsole;
-import org.apache.camel.support.PatternHelper;
-import org.apache.camel.util.StringHelper;
-import org.apache.camel.util.json.JsonObject;
-
-@DevConsole("route-coverage")
-public class RouteCoverageDevConsole extends AbstractDevConsole {
-
-/**
- * Filters the routes matching by route id, route uri, and source location
- */
-public static final String FILTER = "filter";
-
-/**
- * Limits the number of entries displayed
- */
-public static final String LIMIT = "limit";
-
-public RouteCoverageDevConsole() {
-super("camel", "route-coverage", "Route Coverage", "Route coverage
information");
-}
-
-@Override
-protected String doCallText(Map options) {
-final StringBuilder sb = new StringBuilder();
-Function task = mrb -> {
-if (sb.length() > 0) {
-sb.append("\n");
-}
-sb.append(String.format("Id: %s", mrb.getRouteId()));
-sb.append(String.format("\nFrom: %s", mrb.getEndpointUri()));
-if (mrb.getSourceLocation() != null) {
-sb.append(String.format("\nSource: %s",
mrb.getSourceLocation()));
-}
-sb.append(String.format("\nTotal: %s",
mrb.getExchangesTotal()));
-String coverage = calculateRouteCoverage(mrb);
-if (coverage != null) {
-sb.append(String.format("\nCoverage: %s", coverage));
-}
-sb.append("\n");
-return null;
-};
-doCall(options, task);
-return sb.toString();
-}
-
-@Override
-protected JsonObject doCallJson(Map options) {
-final JsonObject root = new JsonObject();
-final List list = new ArrayList<>();
-
-Function task = mrb -> {
-JsonObject jo = new
[GitHub] [camel-k] tadayosi opened a new pull request, #3640: feat(controller/cli): improve handling of invalid components & dependencies against Camel catalog
tadayosi opened a new pull request, #3640: URL: https://github.com/apache/camel-k/pull/3640 Fix #3127 **Release Note** ```release-note feat(controller/cli): improve handling of invalid components & dependencies against Camel catalog ``` -- 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: 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.git
The following commit(s) were added to refs/heads/main by this push:
new c2eb20f98ef Regen
c2eb20f98ef is described below
commit c2eb20f98efc7ed75fed562a6a276cb291882f52
Author: Claus Ibsen
AuthorDate: Wed Sep 14 06:33:56 2022 +0200
Regen
---
.../dsl/GooglePubsubEndpointBuilderFactory.java| 34 ++
1 file changed, 34 insertions(+)
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index 277be28377b..af5a072b68b 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -178,6 +178,40 @@ public interface GooglePubsubEndpointBuilderFactory {
doSetProperty("concurrentConsumers", concurrentConsumers);
return this;
}
+/**
+ * Set the maximum period a message ack deadline will be extended.
Value
+ * in seconds.
+ *
+ * The option is a: codeint/code type.
+ *
+ * Default: 3600
+ * Group: consumer
+ *
+ * @param maxAckExtensionPeriod the value to set
+ * @return the dsl builder
+ */
+default GooglePubsubEndpointConsumerBuilder maxAckExtensionPeriod(
+int maxAckExtensionPeriod) {
+doSetProperty("maxAckExtensionPeriod", maxAckExtensionPeriod);
+return this;
+}
+/**
+ * Set the maximum period a message ack deadline will be extended.
Value
+ * in seconds.
+ *
+ * The option will be converted to a codeint/code type.
+ *
+ * Default: 3600
+ * Group: consumer
+ *
+ * @param maxAckExtensionPeriod the value to set
+ * @return the dsl builder
+ */
+default GooglePubsubEndpointConsumerBuilder maxAckExtensionPeriod(
+String maxAckExtensionPeriod) {
+doSetProperty("maxAckExtensionPeriod", maxAckExtensionPeriod);
+return this;
+}
/**
* The max number of messages to receive from the server in a single
API
* call.
[camel-kafka-connector] branch automatic-periodic-sync updated (d1cb0ad97 -> 0084eb987)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git omit d1cb0ad97 [create-pull-request] automated change add 9b00db349 Updated CHANGELOG.md add 0084eb987 [create-pull-request] automated change This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d1cb0ad97) \ N -- N -- N refs/heads/automatic-periodic-sync (0084eb987) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGELOG.md | 33 +- .../CamelAwscloudwatchsinkSinkConnector.java | 3 +- .../CamelAwscloudwatchsinkSinkConnectorConfig.java | 3 +- .../CamelAwscloudwatchsinkSinkTask.java| 3 +- .../awsddbsink/CamelAwsddbsinkSinkConnector.java | 3 +- .../CamelAwsddbsinkSinkConnectorConfig.java| 3 +- .../awsddbsink/CamelAwsddbsinkSinkTask.java| 3 +- .../CamelAwsddbstreamssourceSourceConnector.java | 3 +- ...elAwsddbstreamssourceSourceConnectorConfig.java | 3 +- .../CamelAwsddbstreamssourceSourceTask.java| 3 +- .../awsec2sink/CamelAwsec2sinkSinkConnector.java | 3 +- .../CamelAwsec2sinkSinkConnectorConfig.java| 3 +- .../awsec2sink/CamelAwsec2sinkSinkTask.java| 3 +- .../CamelAwseventbridgesinkSinkConnector.java | 3 +- ...CamelAwseventbridgesinkSinkConnectorConfig.java | 3 +- .../CamelAwseventbridgesinkSinkTask.java | 3 +- .../CamelAwskinesisfirehosesinkSinkConnector.java | 3 +- ...lAwskinesisfirehosesinkSinkConnectorConfig.java | 3 +- .../CamelAwskinesisfirehosesinkSinkTask.java | 3 +- .../CamelAwskinesissinkSinkConnector.java | 3 +- .../CamelAwskinesissinkSinkConnectorConfig.java| 3 +- .../CamelAwskinesissinkSinkTask.java | 3 +- .../CamelAwskinesissourceSourceConnector.java | 3 +- ...CamelAwskinesissourceSourceConnectorConfig.java | 3 +- .../CamelAwskinesissourceSourceTask.java | 3 +- .../CamelAwslambdasinkSinkConnector.java | 3 +- .../CamelAwslambdasinkSinkConnectorConfig.java | 3 +- .../awslambdasink/CamelAwslambdasinkSinkTask.java | 3 +- .../CamelAwsredshiftsinkSinkConnector.java | 3 +- .../CamelAwsredshiftsinkSinkConnectorConfig.java | 3 +- .../CamelAwsredshiftsinkSinkTask.java | 3 +- .../CamelAwsredshiftsourceSourceConnector.java | 3 +- ...amelAwsredshiftsourceSourceConnectorConfig.java | 3 +- .../CamelAwsredshiftsourceSourceTask.java | 3 +- .../awss3sink/CamelAwss3sinkSinkConnector.java | 3 +- .../CamelAwss3sinkSinkConnectorConfig.java | 3 +- .../awss3sink/CamelAwss3sinkSinkTask.java | 3 +- .../CamelAwss3sourceSourceConnector.java | 3 +- .../CamelAwss3sourceSourceConnectorConfig.java | 3 +- .../awss3source/CamelAwss3sourceSourceTask.java| 3 +- ...CamelAwss3streaminguploadsinkSinkConnector.java | 3 +- ...wss3streaminguploadsinkSinkConnectorConfig.java | 3 +- .../CamelAwss3streaminguploadsinkSinkTask.java | 3 +- .../CamelAwssecretsmanagersinkSinkConnector.java | 3 +- ...elAwssecretsmanagersinkSinkConnectorConfig.java | 3 +- .../CamelAwssecretsmanagersinkSinkTask.java| 3 +- .../awssessink/CamelAwssessinkSinkConnector.java | 3 +- .../CamelAwssessinkSinkConnectorConfig.java| 3 +- .../awssessink/CamelAwssessinkSinkTask.java| 3 +- .../CamelAwssnsfifosinkSinkConnector.java | 3 +- .../CamelAwssnsfifosinkSinkConnectorConfig.java| 3 +- .../CamelAwssnsfifosinkSinkTask.java | 3 +- .../awssnssink/CamelAwssnssinkSinkConnector.java | 3 +- .../CamelAwssnssinkSinkConnectorConfig.java| 3 +- .../awssnssink/CamelAwssnssinkSinkTask.java| 3 +- .../CamelAwssqsbatchsinkSinkConnector.java | 3 +- .../CamelAwssqsbatchsinkSinkConnectorConfig.java | 3 +- .../CamelAwssqsbatchsinkSinkTask.java | 3 +- .../CamelAwssqsfifosinkSinkConnector.java | 3 +- .../CamelAwssqsfifosinkSinkConnectorConfig.java| 3 +- .../CamelAwssqsfifosinkSinkTask.java | 3 +- .../awssqssink/CamelAwssqssinkSinkConnector.java | 3 +- .../CamelAwssqssinkSinkConnectorConfig.java| 3 +- .../awssqssink/CamelAwssqssinkSinkTask.java|
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1246210392 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 3049264512-770-bfb04a54-f44c-4a81-b7b5-60d0c6b81b96 * Camel Quarkus Commit: 5ad00b92d12a761311523a3c0cea64e7a23cd850 * Camel Main Commit: c970b7dadea55ec48ad9f94ba2a36b169f8abad0 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/3049264512 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karaf] oscerd merged pull request #188: [Github Actions] Periodic Sync Camel Karaf Main Branch
oscerd merged PR #188: URL: https://github.com/apache/camel-karaf/pull/188 -- 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-karaf] branch main updated: [create-pull-request] automated change
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-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 49ac85f5 [create-pull-request] automated change
49ac85f5 is described below
commit 49ac85f59237f21e2c67ae3aa133feaa4d0cec72
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Sep 14 01:17:42 2022 +
[create-pull-request] automated change
---
.../org/apache/camel/catalog/karaf/components/google-pubsub.json| 1 +
.../main/resources/org/apache/camel/catalog/karaf/components/xj.json| 2 ++
.../resources/org/apache/camel/catalog/karaf/components/xslt-saxon.json | 2 ++
3 files changed, 5 insertions(+)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-pubsub.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-pubsub.json
index 8bf33e85..feba746b 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-pubsub.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-pubsub.json
@@ -48,6 +48,7 @@
"serviceAccountKey": { "kind": "parameter", "displayName": "Service
Account Key", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The Service account key that can be
used as credentials for the PubSub publisher\/subscriber. It can be loaded by
default from classpath, but you can prefix with classpath:, file:, or http: to
load the resource from different [...]
"ackMode": { "kind": "parameter", "displayName": "Ack Mode", "group":
"consumer", "label": "consumer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.google.pubsub.GooglePubsubConstants.AckMode",
"enum": [ "AUTO", "NONE" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "AUTO", "description": "AUTO = exchange gets
ack'ed\/nack'ed on completion. NONE = downstream process has to ack\/nack
explicitly" },
"concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1", "description": "The
number of parallel streams consuming from the subscription" },
+"maxAckExtensionPeriod": { "kind": "parameter", "displayName": "Max Ack
Extension Period", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 3600, "description": "Set the maximum period a
message ack deadline will be extended. Value in seconds" },
"maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages
Per Poll", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "1", "description": "The max number of
messages to receive from the server in a single API call" },
"synchronousPull": { "kind": "parameter", "displayName": "Synchronous
Pull", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Synchronously pull
batches of messages" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/xj.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/xj.json
index 71aba84f..6746b135 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/xj.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/xj.json
@@ -28,6 +28,7 @@
"saxonConfiguration": { "kind": "property", "displayName": "Saxon
Configuration", "group": "advanced", "label": "advanced", "required": false,
"type":
[camel-spring-boot] branch main updated: [create-pull-request] automated change
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
The following commit(s) were added to refs/heads/main by this push:
new dab8a15e3e9 [create-pull-request] automated change
dab8a15e3e9 is described below
commit dab8a15e3e9b6b57748d7d6a5b793d06459aac2d
Author: oscerd
AuthorDate: Wed Sep 14 01:21:23 2022 +
[create-pull-request] automated change
---
.../springboot/catalog/components/google-pubsub.json | 1 +
.../apache/camel/springboot/catalog/components/xj.json| 2 ++
.../camel/springboot/catalog/components/xslt-saxon.json | 2 ++
components-starter/camel-xj-starter/src/main/docs/xj.json | 7 +++
.../component/xj/springboot/XJComponentConfiguration.java | 15 +++
.../src/main/docs/xslt-saxon.json | 7 +++
.../saxon/springboot/XsltSaxonComponentConfiguration.java | 15 +++
7 files changed, 49 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
index 281232c2805..03f50c9c53f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
@@ -48,6 +48,7 @@
"serviceAccountKey": { "kind": "parameter", "displayName": "Service
Account Key", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The Service account key that can be
used as credentials for the PubSub publisher\/subscriber. It can be loaded by
default from classpath, but you can prefix with classpath:, file:, or http: to
load the resource from different [...]
"ackMode": { "kind": "parameter", "displayName": "Ack Mode", "group":
"consumer", "label": "consumer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.google.pubsub.GooglePubsubConstants.AckMode",
"enum": [ "AUTO", "NONE" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "AUTO", "description": "AUTO = exchange gets
ack'ed\/nack'ed on completion. NONE = downstream process has to ack\/nack
explicitly" },
"concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1", "description": "The
number of parallel streams consuming from the subscription" },
+"maxAckExtensionPeriod": { "kind": "parameter", "displayName": "Max Ack
Extension Period", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 3600, "description": "Set the maximum period a
message ack deadline will be extended. Value in seconds" },
"maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages
Per Poll", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "1", "description": "The max number of
messages to receive from the server in a single API call" },
"synchronousPull": { "kind": "parameter", "displayName": "Synchronous
Pull", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Synchronously pull
batches of messages" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
index 1e66d2b61d6..24a46ce8744 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
+++
[GitHub] [camel-spring-boot] oscerd merged pull request #627: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
oscerd merged PR #627: URL: https://github.com/apache/camel-spring-boot/pull/627 -- 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: Updated CHANGELOG.md
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 bf9cfc8aa Updated CHANGELOG.md bf9cfc8aa is described below commit bf9cfc8aa2403b2a0ea607dd194c6872731ffac1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Sep 14 03:59:03 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 225e0f6e2..a4f8714af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,14 @@ **Closed issues:** - `make bundle` failure [\#3602](https://github.com/apache/camel-k/issues/3602) +- Raise error when dependency could not be resolved via CamelCatalog [\#3449](https://github.com/apache/camel-k/issues/3449) - Parametrize kaniko executor image to point to private registry [\#3350](https://github.com/apache/camel-k/issues/3350) - kamel uninstall --all does not remove Kamelets [\#3342](https://github.com/apache/camel-k/issues/3342) - Configure parallel container image layers push based on CPU quota [\#3340](https://github.com/apache/camel-k/issues/3340) - Configure Maven builds based on CPU quota [\#3339](https://github.com/apache/camel-k/issues/3339) - Flaky E2E tests identified in 1.9.x [\#3234](https://github.com/apache/camel-k/issues/3234) - kamel log tail option [\#3004](https://github.com/apache/camel-k/issues/3004) +- Builder/Camel trait configmap/secret beside properties [\#3002](https://github.com/apache/camel-k/issues/3002) - Provide a command to add a repo for custom Kamelet catalog [\#2850](https://github.com/apache/camel-k/issues/2850) - Ability to set labels on knative service \(for things like "cluster-local"\) [\#1712](https://github.com/apache/camel-k/issues/1712) - kamel CLI - Allow to specify a namespace to use instead of default [\#1184](https://github.com/apache/camel-k/issues/1184)
[GitHub] [camel-quarkus] zhfeng commented on a diff in pull request #4088: JCache native mode
zhfeng commented on code in PR #4088: URL: https://github.com/apache/camel-quarkus/pull/4088#discussion_r970278736 ## integration-tests/jcache/src/main/resources/application.properties: ## @@ -0,0 +1,17 @@ +## --- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --- +quarkus.native.resources.includes=reference.conf Review Comment: Thanks for explanation. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zhfeng commented on a diff in pull request #4088: JCache native mode
zhfeng commented on code in PR #4088:
URL: https://github.com/apache/camel-quarkus/pull/4088#discussion_r970277955
##
extensions/jcache/deployment/src/main/java/org/apache/camel/quarkus/component/jcache/deployment/JcacheProcessor.java:
##
@@ -34,13 +38,20 @@ FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
-/**
- * Remove this once this extension starts supporting the native mode.
- */
-@BuildStep(onlyIf = NativeBuild.class)
-@Record(value = ExecutionTime.RUNTIME_INIT)
-void warnJvmInNative(JvmOnlyRecorder recorder) {
-JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
-recorder.warnJvmInNative(FEATURE); // warn at runtime
+@BuildStep
+void nativeResources(BuildProducer services,
+BuildProducer nativeResources) {
Review Comment:
OK, I get it. So it looks like only need
`BuildProducer services` here. Is it right? @ppalaga
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] javaduke commented on a diff in pull request #4088: JCache native mode
javaduke commented on code in PR #4088: URL: https://github.com/apache/camel-quarkus/pull/4088#discussion_r970266843 ## integration-tests/jcache/src/main/resources/application.properties: ## @@ -0,0 +1,17 @@ +## --- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --- +quarkus.native.resources.includes=reference.conf Review Comment: This is located in caffeine jcache jar, it is a default configuration file. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] javaduke commented on a diff in pull request #4088: JCache native mode
javaduke commented on code in PR #4088:
URL: https://github.com/apache/camel-quarkus/pull/4088#discussion_r970266507
##
extensions/jcache/deployment/src/main/java/org/apache/camel/quarkus/component/jcache/deployment/JcacheProcessor.java:
##
@@ -34,13 +38,20 @@ FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
-/**
- * Remove this once this extension starts supporting the native mode.
- */
-@BuildStep(onlyIf = NativeBuild.class)
-@Record(value = ExecutionTime.RUNTIME_INIT)
-void warnJvmInNative(JvmOnlyRecorder recorder) {
-JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
-recorder.warnJvmInNative(FEATURE); // warn at runtime
+@BuildStep
+void nativeResources(BuildProducer services,
+BuildProducer nativeResources) {
Review Comment:
@ppalaga suggested this, see here:
https://github.com/apache/camel-quarkus/issues/1846#issuecomment-1245107767 -
the purpose is to discover caching providers.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] zhfeng commented on a diff in pull request #4088: JCache native mode
zhfeng commented on code in PR #4088:
URL: https://github.com/apache/camel-quarkus/pull/4088#discussion_r970265256
##
extensions/jcache/deployment/src/main/java/org/apache/camel/quarkus/component/jcache/deployment/JcacheProcessor.java:
##
@@ -34,13 +38,20 @@ FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
-/**
- * Remove this once this extension starts supporting the native mode.
- */
-@BuildStep(onlyIf = NativeBuild.class)
-@Record(value = ExecutionTime.RUNTIME_INIT)
-void warnJvmInNative(JvmOnlyRecorder recorder) {
-JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
-recorder.warnJvmInNative(FEATURE); // warn at runtime
+@BuildStep
+void nativeResources(BuildProducer services,
+BuildProducer nativeResources) {
Review Comment:
It seems that `nativeResources` does not be used in the method. Did you want
to regiter some resouces in native image?
##
integration-tests/jcache/src/main/resources/application.properties:
##
@@ -0,0 +1,17 @@
+## ---
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---
+quarkus.native.resources.includes=reference.conf
Review Comment:
I can not find `reference.conf` in the test resource. Why we need this file?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] zhfeng commented on a diff in pull request #4049: Springless JPA extension
zhfeng commented on code in PR #4049:
URL: https://github.com/apache/camel-quarkus/pull/4049#discussion_r970255785
##
integration-tests/jpa/src/main/java/org/apache/camel/quarkus/component/jpa/it/JpaRoute.java:
##
@@ -73,7 +77,12 @@ public void configure() throws Exception {
from("direct:idempotent")
.idempotentConsumer(
header("messageId"),
-jpaMessageIdRepository(entityManagerFactory,
"idempotentProcessor"))
+new JpaMessageIdRepository(entityManagerFactory, new
TransactionStrategy() {
+@Override
+public void executeInTransaction(Runnable
runnable) {
+
QuarkusTransaction.run(runOptions().semantic(RunOptions.Semantic.JOIN_EXISTING),
runnable);
+}
+}, "idempotentProcessor"))
Review Comment:
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
[GitHub] [camel-quarkus] zhfeng commented on a diff in pull request #4049: Springless JPA extension
zhfeng commented on code in PR #4049:
URL: https://github.com/apache/camel-quarkus/pull/4049#discussion_r970255679
##
extensions/jpa/runtime/src/main/java/org/apache/camel/quarkus/component/jpa/DefaultTransactionStrategySubstitution.java:
##
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.quarkus.component.jpa;
+
+import javax.persistence.EntityManagerFactory;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+import org.apache.camel.component.jpa.DefaultTransactionStrategy;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+@TargetClass(DefaultTransactionStrategy.class)
+final public class DefaultTransactionStrategySubstitution {
Review Comment:
It is deleted 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
[GitHub] [camel-quarkus] zhfeng commented on a diff in pull request #4049: Springless JPA extension
zhfeng commented on code in PR #4049: URL: https://github.com/apache/camel-quarkus/pull/4049#discussion_r970254479 ## extensions/jpa/runtime/pom.xml: ## @@ -44,14 +49,14 @@ org.apache.camel.quarkus camel-quarkus-core - -org.apache.camel.quarkus -camel-quarkus-support-spring - org.apache.camel camel-jpa + +org.springframework +spring-tx Review Comment: Finnaly we remove it! and add fake `PlatformTransactionManager` and `TransactionTemplate` to make it work with graalvm native bulding. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi merged pull request #3632: Update documentation for kamelet type that can also be action
tadayosi merged PR #3632: URL: https://github.com/apache/camel-k/pull/3632 -- 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: Update documentation for kamelet type that can also be action
This is an automated email from the ASF dual-hosted git repository. tsato 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 90b3fc814 Update documentation for kamelet type that can also be action 90b3fc814 is described below commit 90b3fc814cb4a9e6ab03642fcbc1aa6d352c728f Author: Aurélien Pupier AuthorDate: Mon Sep 12 16:02:54 2022 +0200 Update documentation for kamelet type that can also be action the type can now also be action, not only source and sink. For instance, see https://github.com/apache/camel-kamelets/blob/b98e61105b8c782422028b0c2ea857a90c97a550/kamelets/avro-deserialize-action.kamelet.yaml#L29 --- docs/modules/ROOT/pages/kamelets/kamelets-user.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc index 34643b3f6..9fad54806 100644 --- a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc +++ b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc @@ -466,8 +466,8 @@ The following annotations and labels are also defined on the resource: |name |Description |Type |Example |label: `camel.apache.org/kamelet.type` -|Indicates if the Kamelet can be used as source or sink -|enum: `source`, `sink` +|Indicates if the Kamelet can be used as source, action or sink. +|enum: `source`, `action`, `sink` |E.g. `source` |===
[GitHub] [camel-k] tadayosi opened a new issue, #3639: Set up a workflow to validate website generation for Camel K docs
tadayosi opened a new issue, #3639: URL: https://github.com/apache/camel-k/issues/3639 Sometimes we miss website build issues like this #3635. We should have a workflow to validate the website generation on a pull req that changes `docs/`. -- 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
[GitHub] [camel-k] tadayosi commented on pull request #3635: Fix link in documentation
tadayosi commented on PR #3635: URL: https://github.com/apache/camel-k/pull/3635#issuecomment-1246140779 And as Claus says, I think we can remove the link for the time being to make the website generated. -- 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] 01/07: fix(metadata): add error handling on metadata extraction
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f3d5764432b7983fc35487b5d0ff5324929a60e0
Author: Tadayoshi Sato
AuthorDate: Tue Aug 23 14:34:26 2022 +0900
fix(metadata): add error handling on metadata extraction
---
addons/keda/keda.go| 6 +-
addons/master/master.go| 5 +-
pkg/cmd/local/local.go | 6 +-
pkg/metadata/metadata.go | 31 ++---
pkg/metadata/metadata_capabilities_test.go | 5 +-
pkg/metadata/metadata_dependencies_test.go | 105 +
pkg/metadata/metadata_http_test.go | 50 --
pkg/metadata/metadata_uri_test.go | 40 ++-
pkg/trait/cron.go | 6 +-
pkg/trait/dependencies.go | 13 +++-
pkg/trait/knative.go | 36 ++
pkg/trait/knative_service.go | 10 ++-
pkg/trait/service.go | 5 +-
pkg/trait/util.go | 10 ++-
pkg/util/kamelets/util.go | 7 +-
15 files changed, 217 insertions(+), 118 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 26ded971b..1b5aa0ab4 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -318,7 +318,7 @@ func (t *kedaTrait) populateTriggersFromKamelets(e
*trait.Environment) error {
return err
}
kameletURIs := make(map[string][]string)
- metadata.Each(e.CamelCatalog, sources, func(_ int, meta
metadata.IntegrationMetadata) bool {
+ if err := metadata.Each(e.CamelCatalog, sources, func(_ int, meta
metadata.IntegrationMetadata) bool {
for _, kameletURI := range meta.FromURIs {
if kameletStr := source.ExtractKamelet(kameletURI);
kameletStr != "" && camelv1alpha1.ValidKameletName(kameletStr) {
kamelet := kameletStr
@@ -332,7 +332,9 @@ func (t *kedaTrait) populateTriggersFromKamelets(e
*trait.Environment) error {
}
}
return true
- })
+ }); err != nil {
+ return err
+ }
if len(kameletURIs) == 0 {
return nil
diff --git a/addons/master/master.go b/addons/master/master.go
index 5c79ffde2..80d7a36ba 100644
--- a/addons/master/master.go
+++ b/addons/master/master.go
@@ -100,7 +100,10 @@ func (t *masterTrait) Configure(e *trait.Environment)
(bool, error) {
return false, err
}
- meta := metadata.ExtractAll(e.CamelCatalog, sources)
+ meta, err := metadata.ExtractAll(e.CamelCatalog, sources)
+ if err != nil {
+ return false, err
+ }
if t.Enabled == nil {
for _, endpoint := range meta.FromURIs {
diff --git a/pkg/cmd/local/local.go b/pkg/cmd/local/local.go
index 8f150ad6c..9ba54dd66 100644
--- a/pkg/cmd/local/local.go
+++ b/pkg/cmd/local/local.go
@@ -100,7 +100,11 @@ func getTopLevelDependencies(ctx context.Context, catalog
*camel.RuntimeCatalog,
}
// Extract list of top-level dependencies
- dependencies.Merge(trait.AddSourceDependencies(sourceSpec,
catalog))
+ srcDeps, err := trait.ExtractSourceDependencies(sourceSpec,
catalog)
+ if err != nil {
+ return nil, err
+ }
+ dependencies.Merge(srcDeps)
}
return dependencies.List(), nil
diff --git a/pkg/metadata/metadata.go b/pkg/metadata/metadata.go
index 02ab8f838..d73c7b221 100644
--- a/pkg/metadata/metadata.go
+++ b/pkg/metadata/metadata.go
@@ -26,18 +26,23 @@ import (
)
// ExtractAll returns metadata information from all listed source codes.
-func ExtractAll(catalog *camel.RuntimeCatalog, sources []v1.SourceSpec)
IntegrationMetadata {
+func ExtractAll(catalog *camel.RuntimeCatalog, sources []v1.SourceSpec)
(IntegrationMetadata, error) {
// neutral metadata
meta := src.NewMetadata()
meta.PassiveEndpoints = true
meta.ExposesHTTPServices = false
for _, source := range sources {
- meta = merge(meta, Extract(catalog, source).Metadata)
+ m, err := Extract(catalog, source)
+ if err != nil {
+ return IntegrationMetadata{}, err
+ }
+ meta = merge(meta, m.Metadata)
}
+
return IntegrationMetadata{
Metadata: meta,
- }
+ }, nil
}
func merge(m1 src.Metadata, m2 src.Metadata) src.Metadata {
@@ -60,7 +65,7 @@ func merge(m1 src.Metadata, m2 src.Metadata) src.Metadata {
}
// Extract returns metadata information from the source code.
-func Extract(catalog
[camel-k] 06/07: fix(controller): monitor should reconcile integrations in initialisation failed condition
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 06d6300b46ccb1e4f708037040f84a9500474d33
Author: Tadayoshi Sato
AuthorDate: Tue Sep 13 17:47:34 2022 +0900
fix(controller): monitor should reconcile integrations in initialisation
failed condition
---
pkg/controller/integration/monitor.go | 87 +--
1 file changed, 52 insertions(+), 35 deletions(-)
diff --git a/pkg/controller/integration/monitor.go
b/pkg/controller/integration/monitor.go
index 9909be03e..03aa86c67 100644
--- a/pkg/controller/integration/monitor.go
+++ b/pkg/controller/integration/monitor.go
@@ -57,58 +57,36 @@ func (action *monitorAction) Name() string {
}
func (action *monitorAction) CanHandle(integration *v1.Integration) bool {
- // When in InitializationFailed condition a kit is not available for
the integration
- // so the monitor action is not able to handle it.
- if isInInitializationFailed(integration.Status) {
- return false
- }
-
return integration.Status.Phase == v1.IntegrationPhaseDeploying ||
integration.Status.Phase == v1.IntegrationPhaseRunning ||
integration.Status.Phase == v1.IntegrationPhaseError
}
-func isInInitializationFailed(status v1.IntegrationStatus) bool {
- if status.Phase == v1.IntegrationPhaseError {
- cond := status.GetCondition(v1.IntegrationConditionReady)
- if cond.Status == corev1.ConditionFalse && cond.Reason ==
v1.IntegrationConditionInitializationFailedReason {
- return true
- }
+func (action *monitorAction) Handle(ctx context.Context, integration
*v1.Integration) (*v1.Integration, error) {
+ // When in InitializationFailed condition a kit is not available for
the integration
+ // so handle it differently from the rest
+ if isInInitializationFailed(integration.Status) {
+ // Only check if the Integration requires a rebuild
+ return action.checkDigestAndRebuild(integration, nil)
}
- return false
-}
-
-func (action *monitorAction) Handle(ctx context.Context, integration
*v1.Integration) (*v1.Integration, error) {
// At that staged the Integration must have a Kit
if integration.Status.IntegrationKit == nil {
return nil, fmt.Errorf("no kit set on integration %s",
integration.Name)
}
- kit, err := kubernetes.GetIntegrationKit(ctx, action.client,
integration.Status.IntegrationKit.Name,
integration.Status.IntegrationKit.Namespace)
+ kit, err := kubernetes.GetIntegrationKit(ctx, action.client,
+ integration.Status.IntegrationKit.Name,
integration.Status.IntegrationKit.Namespace)
if err != nil {
- return nil, fmt.Errorf("unable to find integration kit %s/%s:
%w", integration.Status.IntegrationKit.Namespace,
integration.Status.IntegrationKit.Name, err)
+ return nil, fmt.Errorf("unable to find integration kit %s/%s:
%w",
+ integration.Status.IntegrationKit.Namespace,
integration.Status.IntegrationKit.Name, err)
}
// Check if the Integration requires a rebuild
- hash, err := digest.ComputeForIntegration(integration)
- if err != nil {
+ if changed, err := action.checkDigestAndRebuild(integration, kit); err
!= nil {
return nil, err
- }
-
- if hash != integration.Status.Digest {
- action.L.Info("Monitor: Integration needs a rebuild")
-
- if v1.GetOperatorIDAnnotation(integration) != "" &&
- (v1.GetOperatorIDAnnotation(integration) !=
v1.GetOperatorIDAnnotation(kit)) {
- // Operator to reconcile the integration has changed.
Reset integration kit so new operator can handle the kit reference
- integration.SetIntegrationKit(nil)
- }
-
- integration.Initialize()
- integration.Status.Digest = hash
-
- return integration, nil
+ } else if changed != nil {
+ return changed, nil
}
// Check if an IntegrationKit with higher priority is ready
@@ -184,6 +162,45 @@ func (action *monitorAction) Handle(ctx context.Context,
integration *v1.Integra
return integration, nil
}
+func isInInitializationFailed(status v1.IntegrationStatus) bool {
+ if status.Phase != v1.IntegrationPhaseError {
+ return false
+ }
+ if cond := status.GetCondition(v1.IntegrationConditionReady); cond !=
nil {
+ if cond.Status == corev1.ConditionFalse &&
+ cond.Reason ==
v1.IntegrationConditionInitializationFailedReason {
+ return true
+ }
+ }
+
+ return false
+}
+
+func
[camel-k] 04/07: feat(controller): set integration phase to Error when traits application failed
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ffc6b7d176d506d9b5e94f5f7cba2244bd498826
Author: Tadayoshi Sato
AuthorDate: Tue Sep 13 14:30:05 2022 +0900
feat(controller): set integration phase to Error when traits application
failed
---
e2e/global/common/files/BadRoute.java | 11 ++---
e2e/global/common/files/Java.java | 14 +++
.../files/{BadRoute.java => Unresolvable.java} | 17
e2e/global/common/integration_fail_test.go | 26 +++-
pkg/apis/camel/v1/integration_types.go | 2 +
pkg/apis/camel/v1/integration_types_support.go | 23 ++
pkg/controller/integration/initialize.go | 6 ++-
.../integration/integration_controller.go | 30 -
pkg/controller/integration/monitor.go | 49 +++---
pkg/controller/integration/monitor_cronjob.go | 19 ++---
pkg/controller/integration/monitor_deployment.go | 14 +--
pkg/controller/integration/monitor_knative.go | 8 ++--
12 files changed, 148 insertions(+), 71 deletions(-)
diff --git a/e2e/global/common/files/BadRoute.java
b/e2e/global/common/files/BadRoute.java
index 9967879cb..dc2e42343 100644
--- a/e2e/global/common/files/BadRoute.java
+++ b/e2e/global/common/files/BadRoute.java
@@ -20,9 +20,10 @@ import java.lang.Override;
import org.apache.camel.builder.RouteBuilder;
public class BadRoute extends RouteBuilder {
- @Override
- public void configure() throws Exception {
-
from("mongodb:sample?database=sampledb=mycollection=findfoo").throwException(new
RuntimeException("Heyyy")).log("bar");
- }
+@Override
+public void configure() throws Exception {
+
from("mongodb:sample?database=sampledb=mycollection=findfoo")
+.throwException(new RuntimeException("Heyyy"))
+.log("bar");
+}
}
-
diff --git a/e2e/global/common/files/Java.java
b/e2e/global/common/files/Java.java
index 66fef5fe8..30b1f459e 100644
--- a/e2e/global/common/files/Java.java
+++ b/e2e/global/common/files/Java.java
@@ -18,11 +18,11 @@
import org.apache.camel.builder.RouteBuilder;
public class Java extends RouteBuilder {
- @Override
- public void configure() throws Exception {
- from("timer:tick")
- .setHeader("m").constant("string!")
- .setBody().simple("Magic${header.m}")
- .log("${body}");
- }
+@Override
+public void configure() throws Exception {
+from("timer:tick")
+.setHeader("m").constant("string!")
+.setBody().simple("Magic${header.m}")
+.log("${body}");
+}
}
diff --git a/e2e/global/common/files/BadRoute.java
b/e2e/global/common/files/Unresolvable.java
similarity index 73%
copy from e2e/global/common/files/BadRoute.java
copy to e2e/global/common/files/Unresolvable.java
index 9967879cb..768f32ad4 100644
--- a/e2e/global/common/files/BadRoute.java
+++ b/e2e/global/common/files/Unresolvable.java
@@ -15,14 +15,15 @@
* limitations under the License.
*/
-import java.lang.Exception;
-import java.lang.Override;
import org.apache.camel.builder.RouteBuilder;
-public class BadRoute extends RouteBuilder {
- @Override
- public void configure() throws Exception {
-
from("mongodb:sample?database=sampledb=mycollection=findfoo").throwException(new
RuntimeException("Heyyy")).log("bar");
- }
+public class Unresolvable extends RouteBuilder {
+@Override
+public void configure() throws Exception {
+from("timer:tick")
+.setHeader("m").constant("string!")
+.setBody().simple("Magic${header.m}")
+.log("${body}")
+.to("non-existent:hello");
+}
}
-
diff --git a/e2e/global/common/integration_fail_test.go
b/e2e/global/common/integration_fail_test.go
index c95b691b1..0f498ac84 100644
--- a/e2e/global/common/integration_fail_test.go
+++ b/e2e/global/common/integration_fail_test.go
@@ -24,6 +24,7 @@ package common
import (
"testing"
+ "time"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gstruct"
@@ -44,7 +45,8 @@ func TestBadRouteIntegration(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
"files/BadRoute.java", "--name", name).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationPhase(ns, name),
TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionFalse))
[camel-k] 02/07: feat(metadata): raise error when capability/dependency not resolved in CamelCatalog
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1bb2a6c824a4fa63c195657f677d2db6df8cbeea
Author: Tadayoshi Sato
AuthorDate: Mon Sep 12 13:22:33 2022 +0900
feat(metadata): raise error when capability/dependency not resolved in
CamelCatalog
---
addons/keda/keda_test.go | 49 -
addons/resume/resume.go| 5 +-
pkg/apis/camel/v1/camelcatalog_types_support.go| 12 +++
pkg/metadata/metadata_dependencies_test.go | 109 +++-
pkg/metadata/metadata_http_test.go | 44
pkg/metadata/metadata_uri_test.go | 85
pkg/trait/kamelets.go | 4 +-
pkg/trait/kamelets_test.go | 41
pkg/trait/knative_service_test.go | 21 ++--
pkg/trait/mount_test.go| 9 +-
pkg/util/source/inspector.go | 112 +++--
pkg/util/source/inspector_groovy.go| 20 +---
pkg/util/source/inspector_java_script.go | 20 +---
pkg/util/source/inspector_java_source.go | 20 +---
pkg/util/source/inspector_kotlin.go| 20 +---
pkg/util/source/inspector_xml.go | 14 ++-
pkg/util/source/inspector_yaml.go | 16 +--
.../source/{inspector_kamelet.go => kamelet.go}| 0
pkg/util/source/types.go | 16 ++-
19 files changed, 321 insertions(+), 296 deletions(-)
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index 4783653ca..75924a83d 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -35,17 +35,13 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
-)
-
-var (
- testingTrue = true
- testingFalse = false
+ "k8s.io/utils/pointer"
)
func TestManualConfig(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled =
- keda.Auto =
+ keda.Enabled = pointer.Bool(true)
+ keda.Auto = pointer.Bool(false)
meta := map[string]string{
"prop": "val",
"camelCase": "VAL",
@@ -72,8 +68,8 @@ func TestManualConfig(t *testing.T) {
func TestConfigFromSecret(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled =
- keda.Auto =
+ keda.Enabled = pointer.Bool(true)
+ keda.Auto = pointer.Bool(false)
meta := map[string]string{
"prop": "val",
"camelCase": "VAL",
@@ -119,7 +115,7 @@ func TestConfigFromSecret(t *testing.T) {
func TestKameletAutoDetection(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled =
+ keda.Enabled = pointer.Bool(true)
env := createBasicTestEnvironment(
{
ObjectMeta: metav1.ObjectMeta{
@@ -209,7 +205,7 @@ func TestKameletAutoDetection(t *testing.T) {
func TestKameletBindingAutoDetection(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled =
+ keda.Enabled = pointer.Bool(true)
logEndpoint := "log:info"
klb := camelv1alpha1.KameletBinding{
ObjectMeta: metav1.ObjectMeta{
@@ -322,15 +318,15 @@ func TestKameletBindingAutoDetection(t *testing.T) {
func TestHackReplicas(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled =
- keda.Auto =
+ keda.Enabled = pointer.Bool(true)
+ keda.Auto = pointer.Bool(false)
keda.Triggers = append(keda.Triggers, kedaTrigger{
Type: "custom",
Metadata: map[string]string{
"a": "b",
},
})
- keda.HackControllerReplicas =
+ keda.HackControllerReplicas = pointer.Bool(true)
env := createBasicTestEnvironment(
{
ObjectMeta: metav1.ObjectMeta{
@@ -356,15 +352,15 @@ func TestHackReplicas(t *testing.T) {
func TestHackKLBReplicas(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
- keda.Enabled =
- keda.Auto =
+ keda.Enabled = pointer.Bool(true)
+ keda.Auto = pointer.Bool(false)
keda.Triggers = append(keda.Triggers, kedaTrigger{
Type: "custom",
Metadata: map[string]string{
"a": "b",
},
})
- keda.HackControllerReplicas =
+ keda.HackControllerReplicas = pointer.Bool(true)
env := createBasicTestEnvironment(
{
ObjectMeta: metav1.ObjectMeta{
@@ -483,19 +479,14 @@ func createBasicTestEnvironment(resources
...runtime.Object) *trait.Environment
[camel-k] 03/07: fix(trait): traits for Initialization phase should not trigger at platform setup action
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 28550fcac6c57a954ccc3c558d2c4590d5af168e
Author: Tadayoshi Sato
AuthorDate: Tue Sep 13 13:45:20 2022 +0900
fix(trait): traits for Initialization phase should not trigger at platform
setup action
---
pkg/apis/camel/v1/integration_types.go | 4 +-
pkg/controller/integration/platform_setup.go | 7 +++
pkg/trait/platform.go| 94 +++-
pkg/trait/platform_test.go | 2 +-
4 files changed, 62 insertions(+), 45 deletions(-)
diff --git a/pkg/apis/camel/v1/integration_types.go
b/pkg/apis/camel/v1/integration_types.go
index 3ba0c2768..c6f1e750e 100644
--- a/pkg/apis/camel/v1/integration_types.go
+++ b/pkg/apis/camel/v1/integration_types.go
@@ -148,10 +148,10 @@ const (
// IntegrationPhaseNone --
IntegrationPhaseNone IntegrationPhase = ""
- // IntegrationPhaseInitialization --
- IntegrationPhaseInitialization IntegrationPhase = "Initialization"
// IntegrationPhaseWaitingForPlatform --
IntegrationPhaseWaitingForPlatform IntegrationPhase = "Waiting For
Platform"
+ // IntegrationPhaseInitialization --
+ IntegrationPhaseInitialization IntegrationPhase = "Initialization"
// IntegrationPhaseBuildingKit --
IntegrationPhaseBuildingKit IntegrationPhase = "Building Kit"
// IntegrationPhaseDeploying --
diff --git a/pkg/controller/integration/platform_setup.go
b/pkg/controller/integration/platform_setup.go
index 148673ec2..6c1b85bb1 100644
--- a/pkg/controller/integration/platform_setup.go
+++ b/pkg/controller/integration/platform_setup.go
@@ -62,6 +62,13 @@ func (action *platformSetupAction) Handle(ctx
context.Context, integration *v1.I
integration.Status.Profile = determineBestProfile(ctx,
action.client, integration, pl)
}
+ // Change the integration phase to Initialization after traits have
been applied
+ // so that traits targeting Initialization phase don't get applied
unintentionally
+ // at the platform setup step.
+ if integration.Status.Phase != v1.IntegrationPhaseWaitingForPlatform {
+ integration.Status.Phase = v1.IntegrationPhaseInitialization
+ }
+
return integration, nil
}
diff --git a/pkg/trait/platform.go b/pkg/trait/platform.go
index d2e7b6783..b6ed793cd 100644
--- a/pkg/trait/platform.go
+++ b/pkg/trait/platform.go
@@ -80,20 +80,31 @@ func (t *platformTrait) Apply(e *Environment) error {
initial := e.Integration.DeepCopy()
pl, err := t.getOrCreatePlatform(e)
- if err != nil || pl.Status.Phase != v1.IntegrationPlatformPhaseReady {
+ // Do not change to Initialization phase within the trait
+ switch {
+ case err != nil:
e.Integration.Status.Phase =
v1.IntegrationPhaseWaitingForPlatform
- } else {
- e.Integration.Status.Phase = v1.IntegrationPhaseInitialization
- }
-
- if initial.Status.Phase != e.Integration.Status.Phase {
- if err != nil {
-
e.Integration.Status.SetErrorCondition(v1.IntegrationConditionPlatformAvailable,
v1.IntegrationConditionPlatformAvailableReason, err)
+ if initial.Status.Phase != e.Integration.Status.Phase {
+ e.Integration.Status.SetErrorCondition(
+ v1.IntegrationConditionPlatformAvailable,
+ v1.IntegrationConditionPlatformAvailableReason,
+ err)
+
+ if pl != nil {
+ e.Integration.SetIntegrationPlatform(pl)
+ }
}
-
- if pl != nil {
+ case pl == nil:
+ e.Integration.Status.Phase =
v1.IntegrationPhaseWaitingForPlatform
+ case pl.Status.Phase != v1.IntegrationPlatformPhaseReady:
+ e.Integration.Status.Phase =
v1.IntegrationPhaseWaitingForPlatform
+ if initial.Status.Phase != e.Integration.Status.Phase {
e.Integration.SetIntegrationPlatform(pl)
}
+ default:
+ // In success case, phase should be reset to none
+ e.Integration.Status.Phase = v1.IntegrationPhaseNone
+ e.Integration.SetIntegrationPlatform(pl)
}
return nil
@@ -101,43 +112,42 @@ func (t *platformTrait) Apply(e *Environment) error {
func (t *platformTrait) getOrCreatePlatform(e *Environment)
(*v1.IntegrationPlatform, error) {
pl, err := platform.GetOrFindForResource(e.Ctx, t.Client,
e.Integration, false)
- if err != nil && apierrors.IsNotFound(err) {
- if pointer.BoolDeref(t.CreateDefault, false) {
- platformName := e.Integration.Status.Platform
-
[camel-k] 07/07: fix(e2e): add E2E test for reconcilation of integrations in initialisation failed condition
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 151def156ef0bcb8f4b05e95a2eb7de75cf111fd
Author: Tadayoshi Sato
AuthorDate: Tue Sep 13 18:05:28 2022 +0900
fix(e2e): add E2E test for reconcilation of integrations in initialisation
failed condition
---
e2e/global/common/integration_fail_test.go | 7 +++
e2e/global/common/operator_metrics_test.go | 5 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/e2e/global/common/integration_fail_test.go
b/e2e/global/common/integration_fail_test.go
index 0f498ac84..cf999630c 100644
--- a/e2e/global/common/integration_fail_test.go
+++ b/e2e/global/common/integration_fail_test.go
@@ -96,6 +96,13 @@ func TestBadRouteIntegration(t *testing.T) {
// Kit shouldn't be created
Consistently(IntegrationKit(ns, name),
10*time.Second).Should(BeEmpty())
+ // Fixing the route should reconcile the Integration in
Initialization Failed condition to Running
+ Expect(KamelRunWithID(operatorID, ns,
"files/Java.java", "--name", name).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
// Clean up
Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
})
diff --git a/e2e/global/common/operator_metrics_test.go
b/e2e/global/common/operator_metrics_test.go
index c0c1e9ed5..db24f0f62 100644
--- a/e2e/global/common/operator_metrics_test.go
+++ b/e2e/global/common/operator_metrics_test.go
@@ -65,8 +65,9 @@ func TestMetrics(t *testing.T) {
"-t", "prometheus.pod-monitor=false",
).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "java"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
pod := OperatorPod(ns)()
Expect(pod).NotTo(BeNil())
[camel-k] 05/07: chore(controller): small refactoring of integration controller
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c0ac5a167be70ad6c670302fb292c3328930677c
Author: Tadayoshi Sato
AuthorDate: Tue Sep 13 14:42:27 2022 +0900
chore(controller): small refactoring of integration controller
---
pkg/controller/integration/integration_controller.go | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/pkg/controller/integration/integration_controller.go
b/pkg/controller/integration/integration_controller.go
index d898ff3ea..bc63ef92c 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -80,9 +80,8 @@ func newReconciler(mgr manager.Manager, c client.Client)
reconcile.Reconciler {
func integrationUpdateFunc(old *v1.Integration, it *v1.Integration) bool {
// Observe the time to first readiness metric
previous := old.Status.GetCondition(v1.IntegrationConditionReady)
- if next := it.Status.GetCondition(v1.IntegrationConditionReady);
(previous == nil || previous.Status != corev1.ConditionTrue &&
(previous.FirstTruthyTime == nil || previous.FirstTruthyTime.IsZero())) &&
- next != nil && next.Status == corev1.ConditionTrue &&
next.FirstTruthyTime != nil && !next.FirstTruthyTime.IsZero() &&
- it.Status.InitializationTimestamp != nil {
+ next := it.Status.GetCondition(v1.IntegrationConditionReady)
+ if isIntegrationUpdated(it, previous, next) {
duration :=
next.FirstTruthyTime.Time.Sub(it.Status.InitializationTimestamp.Time)
Log.WithValues("request-namespace", it.Namespace,
"request-name", it.Name, "ready-after", duration.Seconds()).
ForIntegration(it).Infof("First readiness after %s",
duration)
@@ -108,6 +107,16 @@ func integrationUpdateFunc(old *v1.Integration, it
*v1.Integration) bool {
old.Status.Phase != it.Status.Phase
}
+func isIntegrationUpdated(it *v1.Integration, previous, next
*v1.IntegrationCondition) bool {
+ if previous == nil || previous.Status != corev1.ConditionTrue &&
(previous.FirstTruthyTime == nil || previous.FirstTruthyTime.IsZero()) {
+ if next != nil && next.Status == corev1.ConditionTrue &&
next.FirstTruthyTime != nil && !next.FirstTruthyTime.IsZero() {
+ return it.Status.InitializationTimestamp != nil
+ }
+ }
+
+ return false
+}
+
func integrationKitEnqueueRequestsFromMapFunc(c client.Client, kit
*v1.IntegrationKit) []reconcile.Request {
var requests []reconcile.Request
if kit.Status.Phase != v1.IntegrationKitPhaseReady && kit.Status.Phase
!= v1.IntegrationKitPhaseError {
[camel-k] branch main updated (b1c320ab9 -> 151def156)
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from b1c320ab9 fix: release as an action
new f3d576443 fix(metadata): add error handling on metadata extraction
new 1bb2a6c82 feat(metadata): raise error when capability/dependency not
resolved in CamelCatalog
new 28550fcac fix(trait): traits for Initialization phase should not
trigger at platform setup action
new ffc6b7d17 feat(controller): set integration phase to Error when traits
application failed
new c0ac5a167 chore(controller): small refactoring of integration
controller
new 06d6300b4 fix(controller): monitor should reconcile integrations in
initialisation failed condition
new 151def156 fix(e2e): add E2E test for reconcilation of integrations in
initialisation failed condition
The 7 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:
addons/keda/keda.go| 6 +-
addons/keda/keda_test.go | 49
addons/master/master.go| 5 +-
addons/resume/resume.go| 5 +-
e2e/global/common/files/BadRoute.java | 11 +-
e2e/global/common/files/Java.java | 14 +--
.../files/Java.java => files/Unresolvable.java}| 5 +-
e2e/global/common/integration_fail_test.go | 33 +-
e2e/global/common/operator_metrics_test.go | 5 +-
pkg/apis/camel/v1/camelcatalog_types_support.go| 12 ++
pkg/apis/camel/v1/integration_types.go | 6 +-
pkg/apis/camel/v1/integration_types_support.go | 23
pkg/cmd/local/local.go | 6 +-
pkg/controller/integration/initialize.go | 6 +-
.../integration/integration_controller.go | 45 ---
pkg/controller/integration/monitor.go | 104 ++---
pkg/controller/integration/monitor_cronjob.go | 19 ++-
pkg/controller/integration/monitor_deployment.go | 14 ++-
pkg/controller/integration/monitor_knative.go | 8 +-
pkg/controller/integration/platform_setup.go | 7 ++
pkg/metadata/metadata.go | 31 +++--
pkg/metadata/metadata_capabilities_test.go | 5 +-
pkg/metadata/metadata_dependencies_test.go | 130 ++---
pkg/metadata/metadata_http_test.go | 54 +
pkg/metadata/metadata_uri_test.go | 93 ---
pkg/trait/cron.go | 6 +-
pkg/trait/dependencies.go | 13 ++-
pkg/trait/kamelets.go | 4 +-
pkg/trait/kamelets_test.go | 41 +++
pkg/trait/knative.go | 36 --
pkg/trait/knative_service.go | 10 +-
pkg/trait/knative_service_test.go | 21 ++--
pkg/trait/mount_test.go| 9 +-
pkg/trait/platform.go | 94 ---
pkg/trait/platform_test.go | 2 +-
pkg/trait/service.go | 5 +-
pkg/trait/util.go | 10 +-
pkg/util/kamelets/util.go | 7 +-
pkg/util/source/inspector.go | 112 +-
pkg/util/source/inspector_groovy.go| 20 +---
pkg/util/source/inspector_java_script.go | 20 +---
pkg/util/source/inspector_java_source.go | 20 +---
pkg/util/source/inspector_kotlin.go| 20 +---
pkg/util/source/inspector_xml.go | 14 ++-
pkg/util/source/inspector_yaml.go | 16 ++-
.../source/{inspector_kamelet.go => kamelet.go}| 0
pkg/util/source/types.go | 16 ++-
47 files changed, 722 insertions(+), 470 deletions(-)
copy e2e/global/common/{traits/files/Java.java => files/Unresolvable.java}
(90%)
rename pkg/util/source/{inspector_kamelet.go => kamelet.go} (100%)
[GitHub] [camel-k] tadayosi closed issue #3449: Raise error when dependency could not be resolved via CamelCatalog
tadayosi closed issue #3449: Raise error when dependency could not be resolved via CamelCatalog URL: https://github.com/apache/camel-k/issues/3449 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi merged pull request #3571: feat(metadata): raise error when capability/dependency not resolved in CamelCatalog
tadayosi merged PR #3571: URL: https://github.com/apache/camel-k/pull/3571 -- 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 automatic-periodic-sync updated (7eacc6a6588 -> e472759ef4a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 7eacc6a6588 [create-pull-request] automated change add 221fb7605d9 CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager add ead062cb95c CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager add 393d1800179 CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager add 49448c86202 CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager add 5dcc7d0652d CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager add 5a66bcc58a8 CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager add e472759ef4a [create-pull-request] automated change No new revisions were added by this update. Summary of changes: .../catalog/components/google-pubsub.json | 1 + .../camel/springboot/catalog/components/xj.json| 2 + .../springboot/catalog/components/xslt-saxon.json | 2 + .../camel-xj-starter/src/main/docs/xj.json | 7 +++ .../xj/springboot/XJComponentConfiguration.java| 15 +++ .../src/main/docs/xslt-saxon.json | 7 +++ .../XsltSaxonComponentConfiguration.java | 15 +++ .../src/main/docs/spring-boot.json | 26 +++ .../boot/vault/GcpVaultAutoConfiguration.java | 5 ++- .../vault/GcpVaultConfigurationProperties.java | 52 ++ .../boot/vault/GcpVaultConfigurationTest.java | 11 - 11 files changed, 141 insertions(+), 2 deletions(-)
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #627: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
github-actions[bot] opened a new pull request, #627: URL: https://github.com/apache/camel-spring-boot/pull/627 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-karaf] branch automatic-periodic-sync updated (d0109ced -> 1a774ce2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from d0109ced [create-pull-request] automated change (#187) add 1a774ce2 [create-pull-request] automated change No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/karaf/components/google-pubsub.json| 1 + .../main/resources/org/apache/camel/catalog/karaf/components/xj.json| 2 ++ .../resources/org/apache/camel/catalog/karaf/components/xslt-saxon.json | 2 ++ 3 files changed, 5 insertions(+)
[GitHub] [camel-karaf] github-actions[bot] opened a new pull request, #188: [Github Actions] Periodic Sync Camel Karaf Main Branch
github-actions[bot] opened a new pull request, #188: URL: https://github.com/apache/camel-karaf/pull/188 Periodic Sync of Camel Karaf Main Branch with main Camel Main. see https://github.com/apache/camel-karaf/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
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #3638: chore(deps): bump github.com/operator-framework/api from 0.13.0 to 0.17.1
dependabot[bot] opened a new pull request, #3638: URL: https://github.com/apache/camel-k/pull/3638 Bumps [github.com/operator-framework/api](https://github.com/operator-framework/api) from 0.13.0 to 0.17.1. Release notes Sourced from https://github.com/operator-framework/api/releases;>github.com/operator-framework/api's releases. v0.17.1 What's Changed Fix a panic when reading annotations if the bundle is not there by https://github.com/bcrochet;>@bcrochet in https://github-redirect.dependabot.com/operator-framework/api/pull/255;>operator-framework/api#255 introduce spec.runAsRoot field by https://github.com/grokspawn;>@grokspawn in https://github-redirect.dependabot.com/operator-framework/api/pull/258;>operator-framework/api#258 (catsrc) move runAsRoot to spec.GrpcConfig from top level spec by https://github.com/anik120;>@anik120 in https://github-redirect.dependabot.com/operator-framework/api/pull/259;>operator-framework/api#259 (catsrc) rename grpcPodConfig.runAsRoot to grpcPodConfig.SecurityContextConfig by https://github.com/anik120;>@anik120 in https://github-redirect.dependabot.com/operator-framework/api/pull/261;>operator-framework/api#261 New Contributors https://github.com/bcrochet;>@bcrochet made their first contribution in https://github-redirect.dependabot.com/operator-framework/api/pull/255;>operator-framework/api#255 https://github.com/grokspawn;>@grokspawn made their first contribution in https://github-redirect.dependabot.com/operator-framework/api/pull/258;>operator-framework/api#258 Full Changelog: https://github.com/operator-framework/api/compare/v0.16.0...v0.17.1;>https://github.com/operator-framework/api/compare/v0.16.0...v0.17.1 v0.17.0 What's Changed Fix a panic when reading annotations if the bundle is not there by https://github.com/bcrochet;>@bcrochet in https://github-redirect.dependabot.com/operator-framework/api/pull/255;>operator-framework/api#255 introduce spec.runAsRoot field by https://github.com/grokspawn;>@grokspawn in https://github-redirect.dependabot.com/operator-framework/api/pull/258;>operator-framework/api#258 (catsrc) move runAsRoot to spec.GrpcConfig from top level spec by https://github.com/anik120;>@anik120 in https://github-redirect.dependabot.com/operator-framework/api/pull/259;>operator-framework/api#259 (catsrc) rename grpcPodConfig.runAsRoot to grpcPodConfig.SecurityContextConfig by https://github.com/anik120;>@anik120 in https://github-redirect.dependabot.com/operator-framework/api/pull/261;>operator-framework/api#261 New Contributors https://github.com/bcrochet;>@bcrochet made their first contribution in https://github-redirect.dependabot.com/operator-framework/api/pull/255;>operator-framework/api#255 https://github.com/grokspawn;>@grokspawn made their first contribution in https://github-redirect.dependabot.com/operator-framework/api/pull/258;>operator-framework/api#258 Full Changelog: https://github.com/operator-framework/api/compare/v0.16.0...v0.17.0;>https://github.com/operator-framework/api/compare/v0.16.0...v0.17.0 v0.16.0 What's Changed Fix a source of flakyness in the removed apis test by https://github.com/perdasilva;>@perdasilva in https://github-redirect.dependabot.com/operator-framework/api/pull/245;>operator-framework/api#245 move check bundle name to the Good Practices validator by https://github.com/camilamacedo86;>@camilamacedo86 in https://github-redirect.dependabot.com/operator-framework/api/pull/238;>operator-framework/api#238 :sparkles: feat: new validator to check Multiple Architectures configuration by https://github.com/camilamacedo86;>@camilamacedo86 in https://github-redirect.dependabot.com/operator-framework/api/pull/233;>operator-framework/api#233 Bump go version from 1.17 to 1.18 by https://github.com/timflannagan;>@timflannagan in https://github-redirect.dependabot.com/operator-framework/api/pull/251;>operator-framework/api#251 Add Affinity stanza to Subscription spec.config by https://github.com/perdasilva;>@perdasilva in https://github-redirect.dependabot.com/operator-framework/api/pull/253;>operator-framework/api#253 Full Changelog: https://github.com/operator-framework/api/compare/v0.15.0...v0.16.0;>https://github.com/operator-framework/api/compare/v0.15.0...v0.16.0 v0.15.0 What's Changed fix channel naming validation by https://github.com/camilamacedo86;>@camilamacedo86 in https://github-redirect.dependabot.com/operator-framework/api/pull/231;>operator-framework/api#231 Add CRD description check validation by https://github.com/ryantking;>@ryantking in https://github-redirect.dependabot.com/operator-framework/api/pull/234;>operator-framework/api#234 Introduce UpgradeStrategy to OperatorGroups by https://github.com/awgreene;>@awgreene in
[camel-k] branch dependabot/go_modules/github.com/operator-framework/api-0.17.1 created (now 6f21b2ce9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/operator-framework/api-0.17.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 6f21b2ce9 chore(deps): bump github.com/operator-framework/api No new revisions were added by this update.
[camel-k] branch dependabot/go_modules/github.com/redhat-developer/service-binding-operator-1.2.0 created (now 18882cc80)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/redhat-developer/service-binding-operator-1.2.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 18882cc80 chore(deps): bump github.com/redhat-developer/service-binding-operator No new revisions were added by this update.
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #3637: chore(deps): bump github.com/redhat-developer/service-binding-operator from 1.1.1 to 1.2.0
dependabot[bot] opened a new pull request, #3637: URL: https://github.com/apache/camel-k/pull/3637 Bumps [github.com/redhat-developer/service-binding-operator](https://github.com/redhat-developer/service-binding-operator) from 1.1.1 to 1.2.0. Release notes Sourced from https://github.com/redhat-developer/service-binding-operator/releases;>github.com/redhat-developer/service-binding-operator's releases. v1.2.0 What's Changed Update chart with sbo 1.1.1 app version by https://github.com/Kartikey-star;>@Kartikey-star in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1177;>redhat-developer/service-binding-operator#1177 Ignore security warnings without known fixes by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1178;>redhat-developer/service-binding-operator#1178 Change quay.io/redhat-developer/servicebinding-operator:index image to file-based catalog by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1179;>redhat-developer/service-binding-operator#1179 Enable annotations mapping to be optional by https://github.com/baijum;>@baijum in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1161;>redhat-developer/service-binding-operator#1161 Update sample apps by https://github.com/yselkowitz;>@yselkowitz in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1181;>redhat-developer/service-binding-operator#1181 Update version of PerconaXtraDBCluster and collect kube resources for OpenShift CI jobs by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1186;>redhat-developer/service-binding-operator#1186 Add negative scenario for Provisioned Service referencing non-existing secret by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1188;>redhat-developer/service-binding-operator#1188 Do not skip acceptance tests if the main Dockerfile is changed. by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1168;>redhat-developer/service-binding-operator#1168 fix(ci): collect kube resources and split acceptance testing jobs by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1189;>redhat-developer/service-binding-operator#1189 Update minikube version to v1.26.0 and revert OLM version for install.sh to 0.18.1 by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1190;>redhat-developer/service-binding-operator#1190 Extend the acceptance testing framework to support installing operator with both manual and automatic subscriptions by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1193;>redhat-developer/service-binding-operator#1193 Add docs to set permissions due to Kubernetes bug by https://github.com/baijum;>@baijum in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1191;>redhat-developer/service-binding-operator#1191 Correct asciidoc syntax for link by https://github.com/baijum;>@baijum in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1196;>redhat-developer/service-binding-operator#1196 Tweak golangci-lint to avoid out-of-memory in Github Actions by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1198;>redhat-developer/service-binding-operator#1198 Support spec v1beta1 resources by https://github.com/sadlerap;>@sadlerap in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1176;>redhat-developer/service-binding-operator#1176 Update DCO to align with redhat-developer organization guidelines. by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1200;>redhat-developer/service-binding-operator#1200 Fix hidden dependency between scenarios in acceptance tests by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1199;>redhat-developer/service-binding-operator#1199 Tweak security vulnerabilities by https://github.com/pmacik;>@pmacik in https://github-redirect.dependabot.com/redhat-developer/service-binding-operator/pull/1184;>redhat-developer/service-binding-operator#1184 Upgrade cert-manager release to v1.9.1 by https://github.com/sadlerap;>@sadlerap in
[GitHub] [camel-quarkus] javaduke commented on issue #1846: JCache native support
javaduke commented on issue #1846: URL: https://github.com/apache/camel-quarkus/issues/1846#issuecomment-1246035234 @ppalaga I just submitted a PR, and later I'll work on `camel-quarkus-jcache-caffeine` and maybe other caches like Hazelcast and EHcache too. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] javaduke opened a new pull request, #4088: JCache native mode
javaduke opened a new pull request, #4088: URL: https://github.com/apache/camel-quarkus/pull/4088 Addresses issue #1846 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] javaduke closed pull request #4087: Jcache native
javaduke closed pull request #4087: Jcache native URL: https://github.com/apache/camel-quarkus/pull/4087 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] javaduke opened a new pull request, #4087: Jcache native
javaduke opened a new pull request, #4087: URL: https://github.com/apache/camel-quarkus/pull/4087 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on issue #1846: JCache native support
ppalaga commented on issue #1846: URL: https://github.com/apache/camel-quarkus/issues/1846#issuecomment-1245928494 > Hmm, I tried caffeine version sync and got an error `Execution default-cli of goal org.l2x6.cq:cq-maven-plugin:3.1.0:sync-versions failed: java.lang.IllegalStateException: No such dependency com.github.ben-manes.caffeine:jcache in io.quarkus:quarkus-bom:2.12.0.Final:pom` - which makes sense, because it is not there :) But `caffeine-version` property is inherited from camel. Sorry, the sync should be ``` ``` We do not want to use the prop from Camel because it could get out of sync from Quarkus. > I didn't want to add caffeine dependency to the extension itself because in theory it should work with any JSR107 implementation, not just caffeine. That's right. Caffeine deps should be present only in the test module. > `com.github.benmanes.caffeine.jcache.copy.JavaSerializationCopier` is still needed; I see. I'd say the most user friendly solution would be to create a new extension `camel-quarkus-jcache-caffeine` that would host this reflection registration plus it would depend on `quarkus-caffeine`. We should also add a hint to `extensions/jcache/runtime/src/main/doc/usage.adoc` that end user may want to depend on `camel-quarkus-jcache-caffeine` if the want to use caffeine as a jcache impl. > Removed explicit caching provider injection from the routes. Great to hear that it works like that! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Renamed karavan-builder folder to karavan-cloud
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 6d576cd Renamed karavan-builder folder to karavan-cloud
6d576cd is described below
commit 6d576cd609500c4183049e9dde4438cc3293d81c
Author: Marat Gubaidullin
AuthorDate: Tue Sep 13 15:24:47 2022 -0400
Renamed karavan-builder folder to karavan-cloud
---
.github/workflows/builder.yml | 2 +-
README.md | 6 +++---
{karavan-builder => karavan-cloud}/Dockerfile | 0
{karavan-builder => karavan-cloud}/README.md| 0
{karavan-builder => karavan-cloud}/karavan-realm.json | 0
{karavan-builder => karavan-cloud}/openshift/karavan-acl.yaml | 0
.../openshift/karavan-act-environments.yaml | 0
{karavan-builder => karavan-cloud}/openshift/karavan-app.yaml | 0
{karavan-builder => karavan-cloud}/openshift/karavan-namespace.yaml | 0
{karavan-builder => karavan-cloud}/openshift/karavan-pvc.yaml | 0
.../openshift/karavan-quarkus-pipeline.yaml | 0
.../openshift/karavan-quarkus-task.yaml | 0
{karavan-builder => karavan-cloud}/openshift/karavan-secret.yaml| 0
{karavan-builder => karavan-cloud}/openshift/kustomization.yaml | 0
{karavan-builder => karavan-cloud}/openshift/pipeline-operator.yaml | 0
15 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index aef4a4c..c51edb0 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -30,6 +30,6 @@ jobs:
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
- file: karavan-builder/Dockerfile
+ file: karavan-cloud/Dockerfile
push: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
diff --git a/README.md b/README.md
index a8df154..379daae 100644
--- a/README.md
+++ b/README.md
@@ -25,13 +25,13 @@ Integration project output is a runnable uber-jar or an OCI
image for local envi
## Installation
Two types of applications are available:
-1. [Cloud-native](karavan-builder/README.md) application deployed into
Kubernetes/OpenShift
+1. [Cloud-native](karavan-cloud/README.md) application deployed into
Kubernetes/OpenShift
2. [VS Code extension](karavan-vscode/README.md) available on the
[Marketplace](https://marketplace.visualstudio.com/items?itemName=camel-karavan.karavan).
Both applications share same visual designer and work with Camel YAMl DSL.
## Karavan cloud-native application
-Karavan cloud-native integration toolkit is an application to manage projects,
design and monitor integrations, Tekton pipeline to build and deploy
integrations. More about [cloud-native Karavan](karavan-builder/README.md)
+Karavan cloud-native integration toolkit is an application to manage projects,
design and monitor integrations, Tekton pipeline to build and deploy
integrations. More about [cloud-native Karavan](karavan-cloud/README.md)
@@ -46,7 +46,7 @@ More about [Karavan VS Code
Extension](karavan-vscode/README.md)
## Features
### Mode
-* [Cloud-native](karavan-builder/README.md)
+* [Cloud-native](karavan-cloud/README.md)
* [VS Code extension](karavan-vscode/README.md)
### Visual Designer for Integrations
* Enterprise Integration Patterns DSL
diff --git a/karavan-builder/Dockerfile b/karavan-cloud/Dockerfile
similarity index 100%
rename from karavan-builder/Dockerfile
rename to karavan-cloud/Dockerfile
diff --git a/karavan-builder/README.md b/karavan-cloud/README.md
similarity index 100%
rename from karavan-builder/README.md
rename to karavan-cloud/README.md
diff --git a/karavan-builder/karavan-realm.json
b/karavan-cloud/karavan-realm.json
similarity index 100%
rename from karavan-builder/karavan-realm.json
rename to karavan-cloud/karavan-realm.json
diff --git a/karavan-builder/openshift/karavan-acl.yaml
b/karavan-cloud/openshift/karavan-acl.yaml
similarity index 100%
rename from karavan-builder/openshift/karavan-acl.yaml
rename to karavan-cloud/openshift/karavan-acl.yaml
diff --git a/karavan-builder/openshift/karavan-act-environments.yaml
b/karavan-cloud/openshift/karavan-act-environments.yaml
similarity index 100%
rename from karavan-builder/openshift/karavan-act-environments.yaml
rename to karavan-cloud/openshift/karavan-act-environments.yaml
diff --git a/karavan-builder/openshift/karavan-app.yaml
b/karavan-cloud/openshift/karavan-app.yaml
similarity index 100%
rename from karavan-builder/openshift/karavan-app.yaml
rename to karavan-cloud/openshift/karavan-app.yaml
diff --git
[camel-karavan] branch main updated (2dc6464 -> 2d0204d)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 2dc6464 #473: Upgrade to Camel 3.18.2
new 789b104 Upgrade Kamelets to 0.9.0
new eb11422 Clear DSL filter after selection
new abbb4db Show Kamelet Preview badge
new 3235f8a SSO with Keycloak
new acfcf50 Fix #467
new 2cf0db6 Merge branch 'main' of github.com:apache/camel-karavan
new 87535ed Cleanup after oidc/basic auth implemetation
new 57760a2 OIDC/BASIC auth config in Deployment manifests
new 2d0204d Support build separate images for public/basic/oidc auth
The 9 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/workflows/app.yml | 30 +-
.github/workflows/builder.yml |2 +-
.github/workflows/native.yml |2 +-
.github/workflows/vscode.yml |2 +-
karavan-app/pom.xml| 10 +-
.../org/apache/camel/karavan/api/AuthResource.java | 27 +-
.../camel/karavan/api/ComponentResources.java |2 +-
.../camel/karavan/api/ConfigurationResource.java |2 +-
.../org/apache/camel/karavan/api/GitResource.java |2 +-
.../apache/camel/karavan/api/KameletResources.java |2 +-
.../camel/karavan/api/KubernetesResource.java |2 +-
.../camel/karavan/api/ProjectFileResource.java |2 +-
.../apache/camel/karavan/api/ProjectResource.java |2 +-
.../apache/camel/karavan/api/StatusResource.java |2 +-
.../apache/camel/karavan/api/UsersResource.java| 48 +
.../apache/camel/karavan/service/AuthService.java | 35 +-
.../src/main/resources/application.properties | 60 +-
karavan-app/src/main/webapp/package-lock.json | 29 +
karavan-app/src/main/webapp/package.json |1 +
karavan-app/src/main/webapp/public/index.html |2 +
karavan-app/src/main/webapp/src/Logo.tsx |4 +-
karavan-app/src/main/webapp/src/Main.tsx | 62 +-
karavan-app/src/main/webapp/src/MainLogin.tsx | 50 +-
karavan-app/src/main/webapp/src/api/KaravanApi.tsx | 332 +--
karavan-app/src/main/webapp/src/api/SsoApi.tsx | 21 +
karavan-app/src/main/webapp/src/index.css | 12 +
.../main/webapp/src/projects/CreateFileModal.tsx |2 +-
.../main/webapp/src/projects/ProjectDashboard.tsx |2 +-
.../src/main/webapp/src/projects/ProjectInfo.tsx |2 +-
.../src/{models => projects}/ProjectModels.ts |0
.../src/main/webapp/src/projects/ProjectPage.tsx |2 +-
.../src/main/webapp/src/projects/ProjectsPage.tsx |2 +-
.../main/webapp/src/projects/PropertiesEditor.tsx |2 +-
.../src/main/webapp/src/projects/UploadModal.tsx |2 +-
karavan-builder/karavan-realm.json | 2317
karavan-builder/openshift/karavan-app.yaml |7 +
karavan-builder/openshift/karavan-secret.yaml |1 -
karavan-core/src/core/model/KameletModels.ts |1 +
.../kamelets/avro-deserialize-action.kamelet.yaml |6 +-
.../kamelets/avro-serialize-action.kamelet.yaml|6 +-
.../kamelets/aws-cloudwatch-sink.kamelet.yaml | 30 +-
.../public/kamelets/aws-ddb-sink.kamelet.yaml | 39 +-
.../kamelets/aws-ddb-streams-source.kamelet.yaml | 50 +-
.../public/kamelets/aws-ec2-sink.kamelet.yaml | 21 +-
.../kamelets/aws-eventbridge-sink.kamelet.yaml | 149 ++
.../aws-kinesis-firehose-sink.kamelet.yaml | 19 +-
.../public/kamelets/aws-kinesis-sink.kamelet.yaml | 38 +-
.../kamelets/aws-kinesis-source.kamelet.yaml | 31 +-
.../public/kamelets/aws-lambda-sink.kamelet.yaml | 21 +-
.../public/kamelets/aws-redshift-sink.kamelet.yaml | 22 +-
.../kamelets/aws-redshift-source.kamelet.yaml | 28 +-
.../public/kamelets/aws-s3-sink.kamelet.yaml | 37 +-
.../public/kamelets/aws-s3-source.kamelet.yaml | 45 +-
.../aws-s3-streaming-upload-sink.kamelet.yaml | 21 +-
.../kamelets/aws-secrets-manager-sink.kamelet.yaml | 11 +-
.../public/kamelets/aws-ses-sink.kamelet.yaml | 31 +-
.../public/kamelets/aws-sns-fifo-sink.kamelet.yaml | 19 +-
.../public/kamelets/aws-sns-sink.kamelet.yaml | 31 +-
.../kamelets/aws-sqs-batch-sink.kamelet.yaml | 19 +-
.../public/kamelets/aws-sqs-fifo-sink.kamelet.yaml | 19 +-
.../public/kamelets/aws-sqs-sink.kamelet.yaml | 31 +-
.../public/kamelets/aws-sqs-source.kamelet.yaml| 31 +-
.../kamelets/aws-translate-action.kamelet.yaml | 11 +-
.../kamelets/azure-cosmosdb-source.kamelet.yaml|4 +-
.../kamelets/azure-eventhubs-sink.kamelet.yaml | 22 +-
[camel-karavan] 09/09: Support build separate images for public/basic/oidc auth
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
commit 2d0204d08d62e4cea3617322757127e582acf690
Author: Marat Gubaidullin
AuthorDate: Tue Sep 13 15:16:05 2022 -0400
Support build separate images for public/basic/oidc auth
---
.github/workflows/app.yml | 30 ++
.github/workflows/builder.yml | 2 +-
.github/workflows/native.yml | 2 +-
.github/workflows/vscode.yml | 2 +-
4 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 5f95a32..3d414b2 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -1,4 +1,4 @@
-name: Build and push Application
+name: cloud-native app
on:
push:
@@ -46,13 +46,35 @@ jobs:
working-directory: ./karavan-core
run: npm install
- # Build Karavan standalone
- - name: Build Karavan standalone
+ # Build Karavan cloud app with public access
+ - name: Build application public
run: |
- mvn package -f karavan-app -DskipTest \
+ mvn package -f karavan-app -Dquarkus.profile=public -DskipTest \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}:3.18.3 \
-Dquarkus.container-image.username=${{ github.actor }} \
-Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
if: ${{ github.ref == 'refs/heads/main' }}
+
+ # Build Karavan cloud app with basic authorization
+ - name: Build application basic auth
+run: |
+ mvn package -f karavan-app -Dquarkus.profile=basic -DskipTest \
+ -Dquarkus.container-image.build=true \
+ -Dquarkus.container-image.push=true \
+
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}-basic:3.18.3 \
+ -Dquarkus.container-image.username=${{ github.actor }} \
+ -Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
+if: ${{ github.ref == 'refs/heads/main' }}
+
+ # Build Karavan cloud app with oidc authorization
+ - name: Build application oidc
+run: |
+ mvn package -f karavan-app -Dquarkus.profile=oidc -DskipTest \
+ -Dquarkus.container-image.build=true \
+ -Dquarkus.container-image.push=true \
+
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}-oidc:3.18.3 \
+ -Dquarkus.container-image.username=${{ github.actor }} \
+ -Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
+if: ${{ github.ref == 'refs/heads/main' }}
\ No newline at end of file
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index f4516f6..aef4a4c 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -1,4 +1,4 @@
-name: Build and Push Builder Image
+name: builder image
on:
push:
diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
index 082769d..7fcbb6b 100644
--- a/.github/workflows/native.yml
+++ b/.github/workflows/native.yml
@@ -1,4 +1,4 @@
-name: Build native image
+name: native-image
on:
push:
diff --git a/.github/workflows/vscode.yml b/.github/workflows/vscode.yml
index 017c348..fd9d8e5 100644
--- a/.github/workflows/vscode.yml
+++ b/.github/workflows/vscode.yml
@@ -1,4 +1,4 @@
-name: Build VS CODE Extension
+name: vscode xtension
on:
push:
[camel-karavan] 08/09: OIDC/BASIC auth config in Deployment manifests
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 commit 57760a218ae90c082c709b5761d42ca1334f3761 Author: Marat Gubaidullin AuthorDate: Tue Sep 13 15:15:31 2022 -0400 OIDC/BASIC auth config in Deployment manifests --- karavan-builder/openshift/karavan-app.yaml| 4 ++-- karavan-builder/openshift/karavan-secret.yaml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/karavan-builder/openshift/karavan-app.yaml b/karavan-builder/openshift/karavan-app.yaml index 592e8c3..e696f5a 100644 --- a/karavan-builder/openshift/karavan-app.yaml +++ b/karavan-builder/openshift/karavan-app.yaml @@ -36,8 +36,6 @@ spec: serviceAccountName: karavan containers: - env: -- name: PROFILE - value: basic - name: KUBERNETES_NAMESPACE valueFrom: fieldRef: @@ -48,6 +46,8 @@ spec: key: master-password name: karavan image: ghcr.io/apache/camel-karavan:3.18.3 + # image: ghcr.io/apache/camel-karavan-basic:3.18.3 + # image: ghcr.io/apache/camel-karavan-oidc:3.18.3 imagePullPolicy: Always name: karavan resources: diff --git a/karavan-builder/openshift/karavan-secret.yaml b/karavan-builder/openshift/karavan-secret.yaml index 248e379..eeab943 100644 --- a/karavan-builder/openshift/karavan-secret.yaml +++ b/karavan-builder/openshift/karavan-secret.yaml @@ -4,7 +4,6 @@ metadata: name: karavan type: Opaque stringData: - master-username: admin master-password: karavan projects-git-repository: https://github.com/mgubaidullin/karavan-demo.git projects-git-password: demo
[camel-karavan] 07/09: Cleanup after oidc/basic auth implemetation
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
commit 87535ed29c5751f80af05625498e010bf8fc4bb6
Author: Marat Gubaidullin
AuthorDate: Tue Sep 13 15:14:52 2022 -0400
Cleanup after oidc/basic auth implemetation
---
.../org/apache/camel/karavan/api/AuthResource.java | 17
.../apache/camel/karavan/service/AuthService.java | 31 --
.../src/main/resources/application.properties | 2 +-
3 files changed, 1 insertion(+), 49 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
index 60300fe..d7ff213 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
@@ -19,14 +19,9 @@ package org.apache.camel.karavan.api;
import org.apache.camel.karavan.service.AuthService;
import javax.inject.Inject;
-import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -36,18 +31,6 @@ public class AuthResource {
@Inject
AuthService authService;
-@POST
-@Path("/auth")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public Response auth(@HeaderParam("Authorization") String basicAuth,
@Context HttpHeaders headers) throws Exception {
-if (authService.login(basicAuth)){
-return Response.ok().build();
-} else {
-return Response.status(Response.Status.UNAUTHORIZED).build();
-}
-}
-
@GET
@Path("/auth")
@Produces(MediaType.TEXT_PLAIN)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
index 400e4f4..56c378a 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
@@ -16,10 +16,7 @@
*/
package org.apache.camel.karavan.service;
-import io.fabric8.kubernetes.api.model.Secret;
-import io.smallrye.mutiny.tuples.Tuple2;
import io.vertx.core.Vertx;
-import org.apache.camel.karavan.model.GitConfig;
import org.eclipse.microprofile.config.ConfigProvider;
import org.jboss.logging.Logger;
@@ -27,41 +24,13 @@ import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import java.net.MalformedURLException;
import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
import java.util.Map;
@ApplicationScoped
public class AuthService {
-@Inject
-Vertx vertx;
-
-@Inject
-KubernetesService kubernetesService;
-
private static final Logger LOGGER =
Logger.getLogger(AuthService.class.getName());
-private Tuple2 getMasterConfig() {
-if (kubernetesService.inKubernetes()){
-Secret secret = kubernetesService.getKaravanSecret();
-String username = new
String(Base64.getDecoder().decode(secret.getData().get("master-username").getBytes(StandardCharsets.UTF_8)));
-String password = new
String(Base64.getDecoder().decode(secret.getData().get("master-password").getBytes(StandardCharsets.UTF_8)));
-return Tuple2.of(username, password);
-} else {
-String username =
ConfigProvider.getConfig().getValue("karavan.master-username", String.class);
-String password =
ConfigProvider.getConfig().getValue("karavan.master-password", String.class);
-return Tuple2.of(username, password);
-}
-}
-
-public boolean login(String basicAuth) {
-Tuple2 master = getMasterConfig();
-String secretToken = new
String(Base64.getEncoder().encode((master.getItem1() + ":" +
master.getItem2()).getBytes()));
-String auth = "Basic " + secretToken;
-return auth.equals(basicAuth);
-}
-
public String authType() {
return ConfigProvider.getConfig().getValue("karavan.auth",
String.class);
}
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index 4114c1d..284d4b3 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -100,7 +100,7 @@ quarkus.keycloak.devservices.enabled=false
%basic.quarkus.kubernetes.env.mapping.master-password.from-secret=karavan
%basic.quarkus.kubernetes.env.mapping.master-password.with-key=master-password
%basic.quarkus.security.users.embedded.plain-text=true
[camel-karavan] 06/09: Merge branch 'main' of github.com:apache/camel-karavan
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 commit 2cf0db6dd3f97eb97c716b55014860147b8b0791 Merge: acfcf50 2dc6464 Author: Marat Gubaidullin AuthorDate: Tue Sep 13 15:05:04 2022 -0400 Merge branch 'main' of github.com:apache/camel-karavan karavan-builder/Dockerfile | 2 +- karavan-builder/openshift/karavan-quarkus-task.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-karavan] 05/09: Fix #467
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
commit acfcf507b7de6819f3dfa3035f1316d881e99c61
Author: Marat Gubaidullin
AuthorDate: Tue Sep 13 15:04:56 2022 -0400
Fix #467
---
karavan-app/pom.xml|4 +
.../org/apache/camel/karavan/api/AuthResource.java |6 +-
.../apache/camel/karavan/service/AuthService.java |4 +-
.../src/main/resources/application.properties | 44 +-
karavan-app/src/main/webapp/src/Logo.tsx |4 +-
karavan-app/src/main/webapp/src/Main.tsx | 52 +-
karavan-app/src/main/webapp/src/MainLogin.tsx |5 +-
karavan-app/src/main/webapp/src/api/KaravanApi.tsx | 117 +-
karavan-app/src/main/webapp/src/api/SsoApi.tsx |1 +
karavan-app/src/main/webapp/src/index.css | 12 +
karavan-builder/karavan-realm.json | 1180 +---
karavan-builder/openshift/karavan-app.yaml |7 +
12 files changed, 711 insertions(+), 725 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index ba091c3..9de3545 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -91,6 +91,10 @@
io.quarkus
quarkus-oidc
+
+io.quarkus
+quarkus-elytron-security-properties-file
+
io.quarkus
quarkus-smallrye-health
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
index ce51a63..60300fe 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
@@ -49,10 +49,10 @@ public class AuthResource {
}
@GET
-@Path("/sso")
+@Path("/auth")
@Produces(MediaType.TEXT_PLAIN)
-public Response sso() throws Exception {
-return Response.ok(authService.isSSO()).build();
+public Response authType() throws Exception {
+return Response.ok(authService.authType()).build();
}
@GET
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
index fb01c99..400e4f4 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java
@@ -62,8 +62,8 @@ public class AuthService {
return auth.equals(basicAuth);
}
-public boolean isSSO() {
-return ConfigProvider.getConfig().getValue("quarkus.oidc.enabled",
Boolean.class);
+public String authType() {
+return ConfigProvider.getConfig().getValue("karavan.auth",
String.class);
}
public Map getSsoConfig() throws MalformedURLException {
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index 53eb9ee..4114c1d 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -59,17 +59,16 @@ quarkus.infinispan-client.auth-password=password
# Use BASIC as a Docker for Mac workaround
quarkus.infinispan-client.client-intelligence=BASIC
-# SSO
-quarkus.oidc.enabled=true
-quarkus.oidc.auth-server-url=http://localhost:8081/realms/karavan
-quarkus.oidc.client-id=karavan-backend
-quarkus.oidc.credentials.secret=AYiPVbEh2be8vWpV6QRIx3jwPPrGspNJ
-quarkus.oidc.application-type=service
-quarkus.oidc.tls.verification=none
-quarkus.oidc.roles.source=accesstoken
-quarkus.keycloak.devservices.enabled=false
+# Public
+%public.karavan.auth=public
+%public.quarkus.oidc.enabled=false
+%public.quarkus.http.auth.basic=false
+%public.quarkus.security.users.embedded.enabled=false
+%public.quarkus.http.auth.permission.authenticated.enabled=false
+%public.quarkus.http.auth.permission.public.enabled=false
+# Authentication
quarkus.http.auth.permission.authenticated.paths=/api/*
quarkus.http.auth.permission.authenticated.policy=authenticated
@@ -77,6 +76,33 @@
quarkus.http.auth.permission.public.paths=/public/*,/static/*,/*.map,/*.css,/*.j
quarkus.http.auth.permission.public.policy=permit
quarkus.http.auth.permission.public.methods=GET,HEAD,POST
+# SSO Authentication
+%oidc.quarkus.oidc.enabled=true
+%oidc.quarkus.http.auth.basic=false
+%oidc.quarkus.security.users.embedded.enabled=false
+%oidc.quarkus.oidc.auth-server-url=http://localhost:8081/realms/karavan
+%oidc.quarkus.oidc.client-id=karavan-backend
+%oidc.quarkus.oidc.credentials.secret=D1MPIzn8I5RmItgsWGlJJoqzJ7gPPjb1
+%oidc.quarkus.oidc.application-type=service
+%oidc.quarkus.oidc.tls.verification=none
+%oidc.quarkus.oidc.roles.source=accesstoken
+%oidc.quarkus.oidc.authentication.user-info-required=true
[camel-karavan] 02/09: Clear DSL filter after selection
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
commit eb114229d8d41c4936efe70bc8c239fdf1fd9422
Author: Marat Gubaidullin
AuthorDate: Tue Sep 6 13:03:13 2022 -0400
Clear DSL filter after selection
---
karavan-designer/src/designer/route/DslSelector.tsx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/karavan-designer/src/designer/route/DslSelector.tsx
b/karavan-designer/src/designer/route/DslSelector.tsx
index 46af447..eef4cb9 100644
--- a/karavan-designer/src/designer/route/DslSelector.tsx
+++ b/karavan-designer/src/designer/route/DslSelector.tsx
@@ -40,7 +40,7 @@ interface Props {
interface State {
tabIndex: string | number
-filter?: string
+filter: string;
}
export class DslSelector extends React.Component {
@@ -53,11 +53,10 @@ export class DslSelector extends React.Component {
public state: State = {
tabIndex: this.props.tabIndex ? this.props.tabIndex :
this.getDefaultTabIndex(),
+filter: ''
}
-
selectTab = (evt: React.MouseEvent, eventKey:
string | number) => {
-console.log(eventKey)
this.setState({tabIndex: eventKey})
}
@@ -68,7 +67,8 @@ export class DslSelector extends React.Component {
}
selectDsl = (evt: React.MouseEvent, dsl: any) => {
-evt.stopPropagation()
+evt.stopPropagation();
+this.setState({filter:""});
this.props.onDslSelect.call(this, dsl, this.props.parentId,
this.props.position);
}
@@ -122,6 +122,11 @@ export class DslSelector extends React.Component {
)
}
+close = () => {
+this.setState({filter:""});
+this.props.onClose?.call(this);
+}
+
render() {
const parentDsl = this.props.parentDsl;
const title = parentDsl === undefined ? "Select source/from" : "Select
step";
@@ -133,7 +138,7 @@ export class DslSelector extends React.Component {
width={'90%'}
className='dsl-modal'
isOpen={this.props.isOpen}
-onClose={this.props.onClose}
+onClose={() => this.close()}
header={
[camel-karavan] 04/09: SSO with Keycloak
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
commit 3235f8acd4ae8b6d7a492b081802ff7acef67021
Author: Marat Gubaidullin
AuthorDate: Thu Sep 8 22:54:47 2022 -0400
SSO with Keycloak
---
karavan-app/pom.xml|6 +-
.../org/apache/camel/karavan/api/AuthResource.java | 18 +-
.../camel/karavan/api/ComponentResources.java |2 +-
.../camel/karavan/api/ConfigurationResource.java |2 +-
.../org/apache/camel/karavan/api/GitResource.java |2 +-
.../apache/camel/karavan/api/KameletResources.java |2 +-
.../camel/karavan/api/KubernetesResource.java |2 +-
.../camel/karavan/api/ProjectFileResource.java |2 +-
.../apache/camel/karavan/api/ProjectResource.java |2 +-
.../apache/camel/karavan/api/StatusResource.java |2 +-
.../apache/camel/karavan/api/UsersResource.java| 48 +
.../apache/camel/karavan/service/AuthService.java | 12 +
.../src/main/resources/application.properties | 32 +-
karavan-app/src/main/webapp/package-lock.json | 29 +
karavan-app/src/main/webapp/package.json |1 +
karavan-app/src/main/webapp/public/index.html |2 +
karavan-app/src/main/webapp/src/Main.tsx | 44 +-
karavan-app/src/main/webapp/src/MainLogin.tsx | 45 -
karavan-app/src/main/webapp/src/api/KaravanApi.tsx | 295 ++-
karavan-app/src/main/webapp/src/api/SsoApi.tsx | 20 +
.../main/webapp/src/projects/CreateFileModal.tsx |2 +-
.../main/webapp/src/projects/ProjectDashboard.tsx |2 +-
.../src/main/webapp/src/projects/ProjectInfo.tsx |2 +-
.../src/{models => projects}/ProjectModels.ts |0
.../src/main/webapp/src/projects/ProjectPage.tsx |2 +-
.../src/main/webapp/src/projects/ProjectsPage.tsx |2 +-
.../main/webapp/src/projects/PropertiesEditor.tsx |2 +-
.../src/main/webapp/src/projects/UploadModal.tsx |2 +-
karavan-builder/karavan-realm.json | 2405
29 files changed, 2777 insertions(+), 210 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 0a10d09..ba091c3 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -31,7 +31,7 @@
io.quarkus.platform
2.11.2.Final
3.0.0-M5
-0.8.1
+0.9.0
3.18.1
@@ -87,6 +87,10 @@
io.quarkus
quarkus-openshift-client
+
+io.quarkus
+quarkus-oidc
+
io.quarkus
quarkus-smallrye-health
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
index 759bb72..ce51a63 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
@@ -20,6 +20,7 @@ import org.apache.camel.karavan.service.AuthService;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -29,13 +30,14 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-@Path("/auth")
+@Path("/public")
public class AuthResource {
@Inject
AuthService authService;
@POST
+@Path("/auth")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public Response auth(@HeaderParam("Authorization") String basicAuth,
@Context HttpHeaders headers) throws Exception {
@@ -45,4 +47,18 @@ public class AuthResource {
return Response.status(Response.Status.UNAUTHORIZED).build();
}
}
+
+@GET
+@Path("/sso")
+@Produces(MediaType.TEXT_PLAIN)
+public Response sso() throws Exception {
+return Response.ok(authService.isSSO()).build();
+}
+
+@GET
+@Path("/sso-config")
+@Produces(MediaType.APPLICATION_JSON)
+public Response ssoConfig() throws Exception {
+return Response.ok(authService.getSsoConfig()).build();
+}
}
\ No newline at end of file
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ComponentResources.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ComponentResources.java
index bc89c60..f1d1ea5 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ComponentResources.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ComponentResources.java
@@ -27,7 +27,7 @@ import java.io.InputStreamReader;
import java.util.List;
import java.util.stream.Collectors;
-@Path("/component")
+@Path("/api/component")
public class ComponentResources {
@GET
diff --git
[camel-karavan] 03/09: Show Kamelet Preview badge
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
commit abbb4dbf7995b147bed82e5b59a16f7f42bacca1
Author: Marat Gubaidullin
AuthorDate: Tue Sep 6 13:16:54 2022 -0400
Show Kamelet Preview badge
---
karavan-core/src/core/model/KameletModels.ts| 1 +
karavan-designer/src/App.tsx| 5 +++--
karavan-designer/src/designer/karavan.css | 8 +++-
karavan-designer/src/designer/route/DslSelector.tsx | 1 +
karavan-designer/src/designer/utils/CamelUi.tsx | 1 +
karavan-designer/src/designer/utils/DslMetaModel.ts | 1 +
6 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/karavan-core/src/core/model/KameletModels.ts
b/karavan-core/src/core/model/KameletModels.ts
index beef08c..81a7d5f 100644
--- a/karavan-core/src/core/model/KameletModels.ts
+++ b/karavan-core/src/core/model/KameletModels.ts
@@ -58,6 +58,7 @@ export class Labels {
export class Annotations {
'camel.apache.org/kamelet.icon': string | any = '';
'camel.apache.org/catalog.version': string | any = '';
+ 'camel.apache.org/kamelet.support.level': string | any = '';
public constructor(init?: Partial) {
Object.assign(this, init);
diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx
index 62ddc36..276c971 100644
--- a/karavan-designer/src/App.tsx
+++ b/karavan-designer/src/App.tsx
@@ -94,7 +94,8 @@ class App extends React.Component {
};
componentDidMount() {
-["http-secured-sink.kamelet.yaml",
+["aws-eventbridge-sink.kamelet.yaml",
+"http-secured-sink.kamelet.yaml",
"timer-source.kamelet.yaml",
"http-secured-source.kamelet.yaml",
"http-sink.kamelet.yaml",
@@ -138,7 +139,7 @@ class App extends React.Component {
save(filename: string, yaml: string, propertyOnly: boolean) {
// console.log(filename);
-console.log(yaml);
+// console.log(yaml);
// console.log(propertyOnly);
}
diff --git a/karavan-designer/src/designer/karavan.css
b/karavan-designer/src/designer/karavan.css
index 95cd011..071aa52 100644
--- a/karavan-designer/src/designer/karavan.css
+++ b/karavan-designer/src/designer/karavan.css
@@ -868,12 +868,18 @@
}
.dsl-modal .version {
-text-align: right;
opacity: 0.5;
white-space: nowrap;
margin-left: auto;
}
+.dsl-modal .support-level {
+position: absolute;
+right: 6px;
+top: 6px;
+white-space: nowrap;
+}
+
.dsl-modal .labels {
opacity: 0.5;
}
diff --git a/karavan-designer/src/designer/route/DslSelector.tsx
b/karavan-designer/src/designer/route/DslSelector.tsx
index eef4cb9..c3d8644 100644
--- a/karavan-designer/src/designer/route/DslSelector.tsx
+++ b/karavan-designer/src/designer/route/DslSelector.tsx
@@ -100,6 +100,7 @@ export class DslSelector extends React.Component {
{CamelUi.getIconForDsl(dsl)}
{dsl.title}
+{dsl.supportLevel && dsl.supportLevel === 'Preview' &&
{dsl.supportLevel}}
{dsl.description}
diff --git a/karavan-designer/src/designer/utils/CamelUi.tsx
b/karavan-designer/src/designer/utils/CamelUi.tsx
index 3be4d1f..bd707b9 100644
--- a/karavan-designer/src/designer/utils/CamelUi.tsx
+++ b/karavan-designer/src/designer/utils/CamelUi.tsx
@@ -170,6 +170,7 @@ export class CamelUi {
title: k.title(),
description: k.title(),
version: k.version(),
+supportLevel:
k.metadata.annotations["camel.apache.org/kamelet.support.level"],
})
);
}
diff --git a/karavan-designer/src/designer/utils/DslMetaModel.ts
b/karavan-designer/src/designer/utils/DslMetaModel.ts
index 006bf4e..53318bd 100644
--- a/karavan-designer/src/designer/utils/DslMetaModel.ts
+++ b/karavan-designer/src/designer/utils/DslMetaModel.ts
@@ -24,6 +24,7 @@ export class DslMetaModel {
labels: string = ''
navigation: string = ''
version: string = ''
+supportLevel: string = ''
properties: any;
public constructor(init?: Partial) {
[GitHub] [camel-karavan] mgubaidullin closed issue #467: [cloud-native] Karavan should be integrated with Keycloak for user management and SSO
mgubaidullin closed issue #467: [cloud-native] Karavan should be integrated with Keycloak for user management and SSO URL: https://github.com/apache/camel-karavan/issues/467 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot-examples] davsclaus commented on pull request #85: SAP JCOClient
davsclaus commented on PR #85: URL: https://github.com/apache/camel-spring-boot-examples/pull/85#issuecomment-1245834209 We cannot have example from ASF that are using closed source dependencies, or that you need to have a paid enterprise product to use the example. However you can put the example on your own github organization and we can add a link to your example from the Camel website -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (b0339a00640 -> 81c2513b275)
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 b0339a00640 Polished
add caad006641d CAMEL-18501 - Camel-Google-Secret-Manager: Create a task
looking for secrets update in PubSub
add dc043fe9e0f CAMEL-18501 - Camel-Google-Secret-Manager: Create a task
looking for secrets update in PubSub
add 6b6bd28e08c CAMEL-18501 - Camel-Google-Secret-Manager: Create a task
looking for secrets update in PubSub
add 6726c4e0a3e CAMEL-18501 - Camel-Google-Secret-Manager: Create a task
looking for secrets update in PubSub
add bdca0517dd6 camel-core - Route coverage dev console
add f64db2fb930 CAMEL-18456: simplify setting up the server
add ecfd3425d91 CAMEL-18456: converted camel-olingo2 to
camel-test-infra-jetty
add 7a6116d130f CAMEL-18501 - Camel-Google-Secret-Manager: Create a task
looking for secrets update in PubSub
add 81c2513b275 Fix CS
No new revisions were added by this update.
Summary of changes:
.../main/camel-main-configuration-metadata.json| 4 +
.../camel-google-secret-manager/pom.xml| 17 ++
.../apache/camel/periodic-task/gcp-secret-refresh | 2 +
.../GoogleSecretManagerPropertiesFunction.java | 15 ++
.../manager/vault/PubsubReloadTriggerTask.java | 231 +
.../camel-olingo2/camel-olingo2-component/pom.xml | 28 +--
.../olingo2/AbstractOlingo2AppAPITestSupport.java | 17 ++
.../olingo2/AbstractOlingo2TestSupport.java| 16 ++
.../camel/component/olingo2/Olingo2AppAPITest.java | 32 +--
.../olingo2/Olingo2ComponentConsumerTest.java | 28 +--
.../olingo2/Olingo2ComponentProducerTest.java | 26 +--
.../camel/component/olingo2/Olingo2RouteTest.java | 24 +--
...ingo2SampleServer.java => Olingo2TestUtil.java} | 47 +
.../apache/camel/vault/GcpVaultConfiguration.java | 51 +
.../org/apache/camel/dev-console/route-coverage| 2 +
.../impl/console/RouteCoverageDevConsole.java | 169 +++
.../GcpVaultConfigurationPropertiesConfigurer.java | 24 +++
.../vault/GcpVaultConfigurationConfigurer.java | 24 +++
.../camel-main-configuration-metadata.json | 4 +
core/camel-main/src/main/docs/main.adoc| 6 +-
.../org/apache/camel/main/BaseMainSupport.java | 19 ++
.../main/GcpVaultConfigurationProperties.java | 32 +++
.../apache/camel/main/http/VertxHttpServer.java| 2 +-
.../infra/jetty/services/JettyConfiguration.java | 9 +
.../jetty/services/JettyConfigurationBuilder.java | 10 +-
.../infra/jetty/services/JettyEmbeddedService.java | 12 +-
26 files changed, 722 insertions(+), 129 deletions(-)
create mode 100644
components/camel-google/camel-google-secret-manager/src/generated/resources/META-INF/services/org/apache/camel/periodic-task/gcp-secret-refresh
create mode 100644
components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/vault/PubsubReloadTriggerTask.java
rename
components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/{Olingo2SampleServer.java
=> Olingo2TestUtil.java} (54%)
create mode 100644
core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/route-coverage
create mode 100644
core/camel-console/src/main/java/org/apache/camel/impl/console/RouteCoverageDevConsole.java
[GitHub] [camel-k] davsclaus commented on pull request #3635: Fix link in documentation
davsclaus commented on PR #3635: URL: https://github.com/apache/camel-k/pull/3635#issuecomment-1245756117 Can we disable the link temporary so the website can be updated. How to link between sub projects is different than relative links within a single sub project. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363)
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 33039c19137 CAMEL-18503: Configure max ack extension period in PubSub
subscriber (#8363)
33039c19137 is described below
commit 33039c19137d7265ae61d6e53aa67ac1b3c4e8be
Author: Claus Ibsen
AuthorDate: Tue Sep 13 19:50:00 2022 +0200
CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363)
---
.../resources/org/apache/camel/catalog/components/google-pubsub.json | 1 +
1 file changed, 1 insertion(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
index 8bf33e85c3e..feba746b487 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
@@ -48,6 +48,7 @@
"serviceAccountKey": { "kind": "parameter", "displayName": "Service
Account Key", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The Service account key that can be
used as credentials for the PubSub publisher\/subscriber. It can be loaded by
default from classpath, but you can prefix with classpath:, file:, or http: to
load the resource from different [...]
"ackMode": { "kind": "parameter", "displayName": "Ack Mode", "group":
"consumer", "label": "consumer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.google.pubsub.GooglePubsubConstants.AckMode",
"enum": [ "AUTO", "NONE" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "AUTO", "description": "AUTO = exchange gets
ack'ed\/nack'ed on completion. NONE = downstream process has to ack\/nack
explicitly" },
"concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1", "description": "The
number of parallel streams consuming from the subscription" },
+"maxAckExtensionPeriod": { "kind": "parameter", "displayName": "Max Ack
Extension Period", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 3600, "description": "Set the maximum period a
message ack deadline will be extended. Value in seconds" },
"maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages
Per Poll", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "1", "description": "The max number of
messages to receive from the server in a single API call" },
"synchronousPull": { "kind": "parameter", "displayName": "Synchronous
Pull", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Synchronously pull
batches of messages" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Allows for bridging the consumer to the Camel routing Error
Handler, which mean any exceptions occurred while the consumer is trying to
pickup incoming messages, or the likes, will now [...]
[camel] branch main updated: CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363)
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 358f190a974 CAMEL-18503: Configure max ack extension period in PubSub
subscriber (#8363)
358f190a974 is described below
commit 358f190a974497af161183b06e8d952f994eb1b8
Author: Claus Ibsen
AuthorDate: Tue Sep 13 19:49:26 2022 +0200
CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363)
---
.../component/google/pubsub/GooglePubsubEndpointConfigurer.java | 6 ++
.../component/google/pubsub/GooglePubsubEndpointUriFactory.java | 3 ++-
.../org/apache/camel/component/google/pubsub/google-pubsub.json | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/components/camel-google/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointConfigurer.java
b/components/camel-google/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointConfigurer.java
index 0e8211c1cb0..634fd267887 100644
---
a/components/camel-google/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointConfigurer.java
+++
b/components/camel-google/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointConfigurer.java
@@ -36,6 +36,8 @@ public class GooglePubsubEndpointConfigurer extends
PropertyConfigurerSupport im
case "lazyStartProducer":
target.setLazyStartProducer(property(camelContext, boolean.class, value));
return true;
case "loggerid":
case "loggerId": target.setLoggerId(property(camelContext,
java.lang.String.class, value)); return true;
+case "maxackextensionperiod":
+case "maxAckExtensionPeriod":
target.setMaxAckExtensionPeriod(property(camelContext, int.class, value));
return true;
case "maxmessagesperpoll":
case "maxMessagesPerPoll":
target.setMaxMessagesPerPoll(property(camelContext, java.lang.Integer.class,
value)); return true;
case "messageorderingenabled":
@@ -74,6 +76,8 @@ public class GooglePubsubEndpointConfigurer extends
PropertyConfigurerSupport im
case "lazyStartProducer": return boolean.class;
case "loggerid":
case "loggerId": return java.lang.String.class;
+case "maxackextensionperiod":
+case "maxAckExtensionPeriod": return int.class;
case "maxmessagesperpoll":
case "maxMessagesPerPoll": return java.lang.Integer.class;
case "messageorderingenabled":
@@ -108,6 +112,8 @@ public class GooglePubsubEndpointConfigurer extends
PropertyConfigurerSupport im
case "lazyStartProducer": return target.isLazyStartProducer();
case "loggerid":
case "loggerId": return target.getLoggerId();
+case "maxackextensionperiod":
+case "maxAckExtensionPeriod": return target.getMaxAckExtensionPeriod();
case "maxmessagesperpoll":
case "maxMessagesPerPoll": return target.getMaxMessagesPerPoll();
case "messageorderingenabled":
diff --git
a/components/camel-google/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java
b/components/camel-google/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java
index 6105e91c6b9..e3efb4ff570 100644
---
a/components/camel-google/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java
+++
b/components/camel-google/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java
@@ -21,7 +21,7 @@ public class GooglePubsubEndpointUriFactory extends
org.apache.camel.support.com
private static final Set SECRET_PROPERTY_NAMES;
private static final Set MULTI_VALUE_PREFIXES;
static {
-Set props = new HashSet<>(16);
+Set props = new HashSet<>(17);
props.add("ackMode");
props.add("authenticate");
props.add("bridgeErrorHandler");
@@ -31,6 +31,7 @@ public class GooglePubsubEndpointUriFactory extends
org.apache.camel.support.com
props.add("exchangePattern");
props.add("lazyStartProducer");
props.add("loggerId");
+props.add("maxAckExtensionPeriod");
props.add("maxMessagesPerPoll");
props.add("messageOrderingEnabled");
props.add("projectId");
diff --git
a/components/camel-google/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
b/components/camel-google/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
index 8bf33e85c3e..feba746b487 100644
---
[camel] branch main updated: CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363)
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 b5a824df8df CAMEL-18503: Configure max ack extension period in PubSub
subscriber (#8363)
b5a824df8df is described below
commit b5a824df8df4bcc7f5b6625a251c9307f71a78a8
Author: vpaturet <46598384+vpatu...@users.noreply.github.com>
AuthorDate: Tue Sep 13 19:47:26 2022 +0200
CAMEL-18503: Configure max ack extension period in PubSub subscriber (#8363)
---
.../component/google/pubsub/GooglePubsubComponent.java | 2 ++
.../camel/component/google/pubsub/GooglePubsubEndpoint.java | 13 +
2 files changed, 15 insertions(+)
diff --git
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
index f2051b1ad6a..143881567ad 100644
---
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
+++
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
@@ -55,6 +55,7 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.threeten.bp.Duration;
/**
* Represents the component that manages {@link GooglePubsubEndpoint}.
@@ -187,6 +188,7 @@ public class GooglePubsubComponent extends DefaultComponent
{
builder.setChannelProvider(channelProvider);
}
builder.setCredentialsProvider(getCredentialsProvider(googlePubsubEndpoint));
+
builder.setMaxAckExtensionPeriod(Duration.ofSeconds(googlePubsubEndpoint.getMaxAckExtensionPeriod()));
return builder.build();
}
diff --git
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index bbf39aeef53..e4298e3edcf 100644
---
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -86,6 +86,11 @@ public class GooglePubsubEndpoint extends DefaultEndpoint {
description = "AUTO = exchange gets ack'ed/nack'ed on
completion. NONE = downstream process has to ack/nack explicitly")
private GooglePubsubConstants.AckMode ackMode =
GooglePubsubConstants.AckMode.AUTO;
+@UriParam(label = "consumer", name = "maxAckExtensionPeriod",
+ description = "Set the maximum period a message ack deadline
will be extended. Value in seconds",
+ defaultValue = "3600")
+private int maxAckExtensionPeriod = 3600;
+
@UriParam(defaultValue = "false",
description = "Should message ordering be enabled",
label = "producer,advanced")
@@ -225,6 +230,14 @@ public class GooglePubsubEndpoint extends DefaultEndpoint {
this.ackMode = ackMode;
}
+public int getMaxAckExtensionPeriod() {
+return maxAckExtensionPeriod;
+}
+
+public void setMaxAckExtensionPeriod(int maxAckExtensionPeriod) {
+this.maxAckExtensionPeriod = maxAckExtensionPeriod;
+}
+
public GooglePubsubSerializer getSerializer() {
return serializer;
}
[GitHub] [camel] davsclaus merged pull request #8363: [CAMEL-18503] Configure max ack extension period in PubSub subscriber
davsclaus merged PR #8363: URL: https://github.com/apache/camel/pull/8363 -- 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: Fix CS
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 81c2513b275 Fix CS
81c2513b275 is described below
commit 81c2513b2758f3b07196c6905534c0b920fd6eb8
Author: Claus Ibsen
AuthorDate: Tue Sep 13 19:36:52 2022 +0200
Fix CS
---
.../google/secret/manager/vault/PubsubReloadTriggerTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/vault/PubsubReloadTriggerTask.java
b/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/vault/PubsubReloadTriggerTask.java
index 866b57a361f..d7acff94812 100644
---
a/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/vault/PubsubReloadTriggerTask.java
+++
b/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/vault/PubsubReloadTriggerTask.java
@@ -199,8 +199,8 @@ public class PubsubReloadTriggerTask extends ServiceSupport
implements CamelCont
public class FilteringEventMessageReceiver implements MessageReceiver {
-private String SECRET_UPDATE = "SECRET_UPDATE";
-private String SECRET_VERSION_ADD = "SECRET_VERSION_ADD";
+private static final String SECRET_UPDATE = "SECRET_UPDATE";
+private static final String SECRET_VERSION_ADD = "SECRET_VERSION_ADD";
private boolean triggerReloading;
[GitHub] [camel-quarkus] javaduke commented on issue #1846: JCache native support
javaduke commented on issue #1846: URL: https://github.com/apache/camel-quarkus/issues/1846#issuecomment-1245700678 OK, I made some changes: - I added your `ServiceProviderBuildItem` so the CachingProvider is now discovered; - I removed most of the reflection configuration but `com.github.benmanes.caffeine.jcache.copy.JavaSerializationCopier` is still needed; - There are no `caffeine-jcache` dependencies in the bom nor in extension, because in theory it should work with any compatible cache implementation - but the test uses caffeine and that's what's recommended; - Removed explicit caching provider injection from the routes. Can you please take a look and if everything looks good, I will submit a PR. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] javaduke commented on issue #1846: JCache native support
javaduke commented on issue #1846: URL: https://github.com/apache/camel-quarkus/issues/1846#issuecomment-1245662625 Also, I didn't want to add caffeine dependency to the extension itself because in theory it should work with any JSR107 implementation, not just caffeine. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] javaduke commented on issue #1846: JCache native support
javaduke commented on issue #1846:
URL: https://github.com/apache/camel-quarkus/issues/1846#issuecomment-1245659381
Hmm, I tried caffeine version sync and got an error `Execution default-cli
of goal org.l2x6.cq:cq-maven-plugin:3.1.0:sync-versions failed:
java.lang.IllegalStateException: No such dependency
com.github.ben-manes.caffeine:jcache in
io.quarkus:quarkus-bom:2.12.0.Final:pom` - which makes sense, because it is not
there :) But `caffeine-version` property is inherited from camel. So in my
`camel-quarkus-bom` I have:
```
com.github.ben-manes.caffeine
jcache
${caffeine-version}
javax.inject
javax.inject
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] squakez commented on a diff in pull request #3631: feat(cli): Allow to set build publish strategy options from install cmd
squakez commented on code in PR #3631:
URL: https://github.com/apache/camel-k/pull/3631#discussion_r969820383
##
pkg/cmd/install.go:
##
@@ -734,6 +723,37 @@ func (o *installCmdOptions) validate(_ *cobra.Command, _
[]string) error {
return result
}
+// addBuildPublishStrategyOptions parses and adds all the build publish
strategy options to the given IntegrationPlatformBuildSpec.
+func (o *installCmdOptions) addBuildPublishStrategyOptions(build
*v1.IntegrationPlatformBuildSpec) error {
+ for _, option := range o.BuildPublishStrategyOptions {
+ kv := strings.Split(option, "=")
+ if len(kv) == 2 {
+ key := kv[0]
+ if
builder.IsSupportedPublishStrategyOption(build.PublishStrategy, key) {
+ build.AddOption(key, kv[1])
+ } else {
+ return fmt.Errorf("build publish strategy
option '%s' not supported. %s", option,
supportedOptionsAsString(build.PublishStrategy))
+ }
+ } else {
+ return fmt.Errorf("build publish strategy option '%s'
not in the expected format (name=value)", option)
+ }
+ }
+ return nil
+}
+
+// supportedOptionsAsString provides all the supported options for the given
strategy as string.
+func supportedOptionsAsString(strategy
v1.IntegrationPlatformBuildPublishStrategy) string {
Review Comment:
+1 on this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel] branch main updated: CAMEL-18501 - Camel-Google-Secret-Manager: Create a task looking for secrets update in PubSub
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 7a6116d130f CAMEL-18501 - Camel-Google-Secret-Manager: Create a task
looking for secrets update in PubSub
7a6116d130f is described below
commit 7a6116d130f69b2b296bb298469f13c37402384a
Author: Claus Ibsen
AuthorDate: Tue Sep 13 16:32:46 2022 +0200
CAMEL-18501 - Camel-Google-Secret-Manager: Create a task looking for
secrets update in PubSub
---
.../camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index d7ab13d1f7c..7a6fc43a4f6 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -419,7 +419,7 @@ public abstract class BaseMainSupport extends BaseService {
Optional task =
camelContext.adapt(ExtendedCamelContext.class)
.getPeriodTaskResolver().newInstance("gcp-secret-refresh",
Runnable.class);
if (task.isPresent()) {
-long period = vc.aws().getRefreshPeriod();
+long period = vc.gcp().getRefreshPeriod();
Runnable r = task.get();
if (LOG.isDebugEnabled()) {
LOG.debug("Scheduling: {} (period: {})", r,
TimeUtils.printDuration(period, false));
[GitHub] [camel-k] squakez merged pull request #3636: fix: release as an action
squakez merged PR #3636: URL: https://github.com/apache/camel-k/pull/3636 -- 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: release as an action
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 b1c320ab9 fix: release as an action
b1c320ab9 is described below
commit b1c320ab91913c5a5fd7ba02dd07fc202a465ff8
Author: Pasquale Congiusti
AuthorDate: Fri Sep 9 11:58:48 2022 +0200
fix: release as an action
---
.github/actions/release-nightly/action.yml | 9 ++---
.github/workflows/release.yml | 10 +-
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/.github/actions/release-nightly/action.yml
b/.github/actions/release-nightly/action.yml
index 265f1130f..765cdcb99 100644
--- a/.github/actions/release-nightly/action.yml
+++ b/.github/actions/release-nightly/action.yml
@@ -26,11 +26,6 @@ inputs:
javaVersion:
required: true
type: string
-secrets:
- registryUsername:
-required: true
- registryPassword:
-required: true
runs:
using: "composite"
@@ -88,8 +83,8 @@ runs:
- name: Login to Container Registry
uses: docker/login-action@v1
with:
-username: ${{ secrets.registryUsername }}
-password: ${{ secrets.registryPassword }}
+username: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
+password: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
- name: Codegen
run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8ff36a8b6..af239def0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,9 +32,6 @@ jobs:
ref: "main"
goVersion: "1.17.x"
javaVersion: "11"
- secrets:
-registryUsername: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
-registryPassword: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
v1_10_x:
if: github.repository == 'apache/camel-k'
@@ -46,9 +43,6 @@ jobs:
ref: "release-1.10.x"
goVersion: "1.17.x"
javaVersion: "11"
- secrets:
-registryUsername: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
-registryPassword: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
v1_9_x:
if: github.repository == 'apache/camel-k'
@@ -60,6 +54,4 @@ jobs:
ref: "release-1.9.x"
goVersion: "1.17.x"
javaVersion: "11"
- secrets:
-registryUsername: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
-registryPassword: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
+
[GitHub] [camel-karavan] mgubaidullin commented on issue #475: Connect to AWS and On-prem services from AKS deployed karavan
mgubaidullin commented on issue #475: URL: https://github.com/apache/camel-karavan/issues/475#issuecomment-1245501409 There is no any limitations in Karavan and Camel to connect from AKS to On-Prem or AWS using Kamelets or Components. Any particular system/services you connect and have issue with? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez opened a new pull request, #3636: fix: release as an action
squakez opened a new pull request, #3636: URL: https://github.com/apache/camel-k/pull/3636 **Release Note** ```release-note NONE ``` -- 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] 02/02: CAMEL-18456: converted camel-olingo2 to camel-test-infra-jetty
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ecfd3425d91e735e010c53f709faf811925be1c5
Author: Otavio Rodolfo Piske
AuthorDate: Tue Sep 13 13:22:47 2022 +0200
CAMEL-18456: converted camel-olingo2 to camel-test-infra-jetty
---
.../camel-olingo2/camel-olingo2-component/pom.xml | 28 +-
.../olingo2/AbstractOlingo2AppAPITestSupport.java | 17
.../olingo2/AbstractOlingo2TestSupport.java| 16
.../camel/component/olingo2/Olingo2AppAPITest.java | 32 ---
.../olingo2/Olingo2ComponentConsumerTest.java | 28 ++
.../olingo2/Olingo2ComponentProducerTest.java | 26 +
.../camel/component/olingo2/Olingo2RouteTest.java | 24 ++--
...ingo2SampleServer.java => Olingo2TestUtil.java} | 45 ++
.../infra/jetty/services/JettyConfiguration.java | 9 +
.../jetty/services/JettyConfigurationBuilder.java | 10 -
.../infra/jetty/services/JettyEmbeddedService.java | 12 +-
11 files changed, 122 insertions(+), 125 deletions(-)
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml
b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 8634e93401d..7930d4b9c74 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -107,28 +107,20 @@
test
+
-org.eclipse.jetty
-jetty-servlet
-${jetty-version}
-test
-
-
-org.eclipse.jetty
-jetty-server
-${jetty-version}
+org.apache.camel
+camel-test-infra-common
+${project.version}
+test-jar
test
-
-
-org.eclipse.jetty.orbit
-javax.servlet
-
-
+
-org.eclipse.jetty
-jetty-webapp
-${jetty-version}
+org.apache.camel
+camel-test-infra-jetty
+${project.version}
+test-jar
test
diff --git
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
index c7f65214772..fdd1a805e25 100644
---
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
+++
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2AppAPITestSupport.java
@@ -28,6 +28,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.component.olingo2.api.Olingo2ResponseHandler;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.jetty.services.JettyConfiguration;
+import org.apache.camel.test.infra.jetty.services.JettyConfigurationBuilder;
import org.apache.http.entity.ContentType;
import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
import org.apache.olingo.odata2.api.ep.feed.ODataDeltaFeed;
@@ -140,6 +142,21 @@ public class AbstractOlingo2AppAPITestSupport {
return b.toString();
}
+protected static JettyConfiguration createConfiguration() {
+return createConfiguration(PORT);
+}
+
+protected static JettyConfiguration createConfiguration(int port) {
+return JettyConfigurationBuilder
+.emptyTemplate()
+.withPort(port)
+.withContextPath(JettyConfiguration.ROOT_CONTEXT_PATH)
+.withWebAppContextConfiguration()
+.withWebApp(AbstractOlingo2TestSupport.getWebResource())
+.build()
+.build();
+}
+
protected static final class TestOlingo2ResponseHandler implements
Olingo2ResponseHandler {
private T response;
diff --git
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java
index a915dfd7865..42bc0d979f7 100644
---
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java
+++
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/AbstractOlingo2TestSupport.java
@@ -17,12 +17,15 @@
package org.apache.camel.component.olingo2;
import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.util.Map;
import
[camel] branch main updated (bdca0517dd6 -> ecfd3425d91)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from bdca0517dd6 camel-core - Route coverage dev console
new f64db2fb930 CAMEL-18456: simplify setting up the server
new ecfd3425d91 CAMEL-18456: converted camel-olingo2 to
camel-test-infra-jetty
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-olingo2/camel-olingo2-component/pom.xml | 28 +
.../olingo2/AbstractOlingo2AppAPITestSupport.java | 17
.../olingo2/AbstractOlingo2TestSupport.java| 16
.../camel/component/olingo2/Olingo2AppAPITest.java | 32 ---
.../olingo2/Olingo2ComponentConsumerTest.java | 28 +
.../olingo2/Olingo2ComponentProducerTest.java | 26 +---
.../camel/component/olingo2/Olingo2RouteTest.java | 24 +--
...ingo2SampleServer.java => Olingo2TestUtil.java} | 47 ++
.../infra/jetty/services/JettyConfiguration.java | 9 +
.../jetty/services/JettyConfigurationBuilder.java | 10 -
.../infra/jetty/services/JettyEmbeddedService.java | 12 +-
11 files changed, 122 insertions(+), 127 deletions(-)
rename
components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/{Olingo2SampleServer.java
=> Olingo2TestUtil.java} (54%)
[camel] 01/02: CAMEL-18456: simplify setting up the server
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f64db2fb930c7be410452787de165dda9d1b8814
Author: Otavio Rodolfo Piske
AuthorDate: Tue Sep 13 11:31:19 2022 +0200
CAMEL-18456: simplify setting up the server
---
.../java/org/apache/camel/component/olingo2/Olingo2SampleServer.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2SampleServer.java
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2SampleServer.java
index 89a71996981..3bb49b22973 100644
---
a/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2SampleServer.java
+++
b/components/camel-olingo2/camel-olingo2-component/src/test/java/org/apache/camel/component/olingo2/Olingo2SampleServer.java
@@ -55,9 +55,7 @@ public class Olingo2SampleServer {
webappcontext.setWar(contextPath);
-HandlerCollection handlers = new HandlerCollection();
-handlers.setHandlers(new Handler[] { webappcontext, new
DefaultHandler() });
-server.setHandler(handlers);
+server.setHandler(webappcontext);
}
public void start() throws Exception {
[GitHub] [camel] orpiske merged pull request #8362: CAMEL-18456: converted camel-olingo2 to camel-test-infra-jetty
orpiske merged PR #8362: URL: https://github.com/apache/camel/pull/8362 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8362: CAMEL-18456: converted camel-olingo2 to camel-test-infra-jetty
github-actions[bot] commented on PR #8362: URL: https://github.com/apache/camel/pull/8362#issuecomment-1245444991 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **1 component(s) tested** -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8364: CAMEL-18456: converted camel-platform-http tests to camel-test-infra-jetty
github-actions[bot] commented on PR #8364: URL: https://github.com/apache/camel/pull/8364#issuecomment-1245436755 :warning: This PR changes Camel components and will be tested automatically. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #8364: CAMEL-18456: converted camel-platform-http tests to camel-test-infra-jetty
orpiske opened a new pull request, #8364: URL: https://github.com/apache/camel/pull/8364 Depends on #8362 -- 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 (3d998b7816 -> 5ad00b92d1)
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 discard 3d998b7816 Upgrade Camel to 3.19.0 new 5ad00b92d1 Upgrade Camel to 3.19.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3d998b7816) \ N -- N -- N refs/heads/camel-main (5ad00b92d1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/quarkus/test/support/azure/AzureStorageTestResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] github-actions[bot] commented on pull request #8363: [CAMEL-18503] Configure max ack extension period in PubSub subscriber
github-actions[bot] commented on PR #8363: URL: https://github.com/apache/camel/pull/8363#issuecomment-1245393876 :x: Finished component verification: **1 component(s) test failed** out of 1 component(s) tested -- 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 3308/add-publish-strategy-option-to-install updated (f12a913c7 -> e15fdd8f5)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 3308/add-publish-strategy-option-to-install in repository https://gitbox.apache.org/repos/asf/camel-k.git omit f12a913c7 feat(cli): Allow to set build publish strategy options from install cmd add e15fdd8f5 feat(cli): Allow to set build publish strategy options from install cmd This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f12a913c7) \ N -- N -- N refs/heads/3308/add-publish-strategy-option-to-install (e15fdd8f5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pkg/cmd/install.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel-quarkus] aldettinger commented on issue #4086: Automatic configuration of kubernetes cluster service
aldettinger commented on issue #4086: URL: https://github.com/apache/camel-quarkus/issues/4086#issuecomment-1245382141 Sub-task of #3918 focused on automatic configuration of kubernetes cluster service. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot-examples] wangyan100 opened a new pull request, #85: SAP JCOClient
wangyan100 opened a new pull request, #85: URL: https://github.com/apache/camel-spring-boot-examples/pull/85 An example showing how to work with Camel,SAP JCOClient and Spring Boot -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] apupier commented on a diff in pull request #901: Blogpost:Adding configuration on how to debug Apache Camel with the Vimspector
apupier commented on code in PR #901:
URL: https://github.com/apache/camel-website/pull/901#discussion_r969576427
##
content/blog/2022/09/vimdap/index.md:
##
@@ -0,0 +1,189 @@
+---
+title: "Configure Camel Debug Adapter in Vim to enable Camel Textual Route
debugging"
Review Comment:
as a title, I'm wondering if we cannot make it shorter and emphasize the
important part fo rCamel users. Something like: "Camel Textual Route debugging
in Vim"
Your title is fine too, just tryign to give more ideas
##
content/blog/2022/09/vimdap/index.md:
##
@@ -0,0 +1,189 @@
+---
+title: "Configure Camel Debug Adapter in Vim to enable Camel Textual Route
debugging"
+date: 2022-09-13
+authors: [Navyashree0923]
+categories: ["Tooling"]
+preview: "Configure Camel Debug Adapter in Vim to enable Camel Textual Route
debugging"
+---
+
+A month before it became easier to provide language support inside Vim, Neovim
using coc.nvim -[See this blog post](/blog/2022/07/coc-nvim-camel-lsp/). It is
now time to use Camel Debug Adapter in
Vim[camel-tooling/camel-dap-client-vim](https://github.com/camel-tooling/camel-dap-client-vim).
+
+# VIM Debug Adapter client for Apache Camel
+
+I just got the debug integration for camel in vim running using
[vimspector](https://github.com/puremourning/vimspector).
+
+
+
+## Install
+Install the vimspector using vim-plug plugin manager.
+- Inside `.vimrc` file:
+- `Plug 'puremourning/vimspector'`
+- `:PlugInstall`
+
+# How to get Camel Debug Adapter server.jar file?
+- I found 2 releases of camel DAP server here -
https://github.com/camel-tooling/camel-debug-adapter/tags but it doesn't
contain any jar files. To get a jar file either you can compile the source or
download from the Maven Central repository.
+- To download from Maven Central repository
+```sh
+cd /home
+curl -LO
https://repo1.maven.org/maven2/com/github/camel-tooling/camel-dap-server/0.4.0/camel-dap-server-0.4.0.jar
+ ```
+# Inside .vimrc file:
+```viml
+ call plug#begin()
+ " The default plugin directory will be as follows:
+ " - Vim (Linux/macOS): '~/.vim/plugged'
+ " - Vim (Windows): '~/vimfiles/plugged'
+ " - Neovim (Linux/macOS/Windows): stdpath('data') . '/plugged'
+ " You can specify a custom plugin directory by passing it as the argument
+ " - e.g. `call plug#begin('~/.vim/plugged')`
+ " - Avoid using standard Vim directory names like 'plugin'
+ "
+ "
+ " Use release branch (recommend)
+ Plug 'neoclide/coc.nvim', {'branch': 'release'}
+ Plug 'puremourning/vimspector'
+ call plug#end()
+
+ " https://github.com/puremourning/vimspector/blob/master/README.md#human-mode
+ let g:vimspector_enable_mappings = 'HUMAN'
+
+ " Vimspector key mappings
+ nnoremap dd :call vimspector#Launch()
+ nnoremap dt :call vimspector#ToggleBreakpoint()
+ nnoremap dc :call vimspector#Continue()
+ nnoremap de :call vimspector#Reset()
+```
+
+# Configure camel-example Debug Gadget
+Place this content in `cust_camel-debug-adapter.json` in your vimspector
directory (path might be different for you)
+```sh
+cd ~/.vim/plugged/vimspector/gadgets/linux/.gadgets.d
+```
+Vimspector adapter configuration:
+```json
+{
+ "adapters": {
+"cust_camel-debug-adapter": {
+ "command": [
+"java",
+"-jar",
+"/home/camel-dap-server-0.4.0.jar"
+ ]
+}
+ }
+}
+```
+# Vimspector Config
+ Create a file called `.vimspector.json` in the project root and then place
the following content
+
+ Vimspector debugger configuration:
+ ```json
+{
+ "configurations": {
+"Camel Debug Adapter - Attach": {
+ "adapter": "cust_camel-debug-adapter",
+ "configuration": {
+"request": "attach",
+"sourcePaths": [ "${workspaceRoot}/src/main/java" ],
+"hostName": "localhost",
+"port": "${JVMDebugPort}",
+"stepFilters": {
+ "skipClasses": [ "$$JDK" ]
+}
+ }
+}
+ }
+}
+```
+# How to attach Camel application to vimspector for debugging
+
+* To test the Camel application debugging need a working example. Lot of good
examples are provided in this repo,
[camel-examples](https://github.com/apache/camel-examples).
+* To enable Camel Textual Route debugging, now we can use directly `mvn
camel:debug`.
+
+## Make the following changes and run your camel application in window-1
+```sh
+ cd ~/camel-examples/examples/main
+```
+- vim src/main/java/org/apache/camel/example/MyBean.java
+- Add the following content inside `MyBean.java` file:
+```java
+package org.apache.camel.example;
+
+public class MyBean {
+
+private String hi;
+
+public MyBean(String hi) {
+this.hi = hi;
+}
+
+public String hello() {
+return hi + " Begin ? ";
+
+}
+ public String bye() {
+return hi + " End ? ";
+}
+}
+```
+- vim src/main/java/org/apache/camel/example/MyRouteBuilder.java
+- Inside `MyRouteBuilder.java` file:
+```java
+package
[camel-spring-boot] 01/06: CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager
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 221fb7605d9a4e162cd3fc692552ee07ffbc2d39
Author: Andrea Cosentino
AuthorDate: Tue Sep 13 14:08:12 2022 +0200
CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in
camel-spring-boot - Google Secret Manager
---
.../boot/vault/GcpVaultAutoConfiguration.java | 5 ++-
.../vault/GcpVaultConfigurationProperties.java | 52 ++
.../boot/vault/GcpVaultConfigurationTest.java | 7 ++-
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
index 6b53399ac58..de03063a38e 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.camel.spring.boot.vault;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.vault.AwsVaultConfiguration;
import org.apache.camel.vault.GcpVaultConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -37,6 +36,10 @@ public class GcpVaultAutoConfiguration {
answer.setServiceAccountKey(config.getServiceAccountKey());
answer.setProjectId(config.getProjectId());
answer.setUseDefaultInstance(config.isUseDefaultInstance());
+answer.setRefreshEnabled(config.isRefreshEnabled());
+answer.setRefreshPeriod(config.getRefreshPeriod());
+answer.setSecrets(config.getSecrets());
+answer.setSubscriptionName(config.getSubscriptionName());
return answer;
}
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
index 566083464c9..c19251c1378 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
@@ -36,6 +36,26 @@ public class GcpVaultConfigurationProperties {
* Define if we want to use the GCP Client Default Instance or not
*/
private boolean useDefaultInstance;
+
+/**
+ * Define the Google Pubsub subscription Name to be used when checking for
updates
+ */
+private String subscriptionName;
+
+/**
+ * Define if we want to refresh the secrets on update
+ */
+private boolean refreshEnabled;
+
+/**
+ * Define the refresh period
+ */
+private long refreshPeriod = 3;
+
+/**
+ * Define the secrets to look at
+ */
+private String secrets;
public String getServiceAccountKey() {
return serviceAccountKey;
@@ -60,4 +80,36 @@ public class GcpVaultConfigurationProperties {
public void setUseDefaultInstance(boolean useDefaultInstance) {
this.useDefaultInstance = useDefaultInstance;
}
+
+ public String getSubscriptionName() {
+ return subscriptionName;
+ }
+
+ public void setSubscriptionName(String subscriptionName) {
+ this.subscriptionName = subscriptionName;
+ }
+
+ public boolean isRefreshEnabled() {
+ return refreshEnabled;
+ }
+
+ public void setRefreshEnabled(boolean refreshEnabled) {
+ this.refreshEnabled = refreshEnabled;
+ }
+
+ public long getRefreshPeriod() {
+ return refreshPeriod;
+ }
+
+ public void setRefreshPeriod(long refreshPeriod) {
+ this.refreshPeriod = refreshPeriod;
+ }
+
+ public String getSecrets() {
+ return secrets;
+ }
+
+ public void setSecrets(String secrets) {
+ this.secrets = secrets;
+ }
}
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
index c3f244d5da1..47ed0fdf841 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
@@ -33,7 +33,12 @@ import org.springframework.test.annotation.DirtiesContext;
GcpVaultConfigurationTest.class},
properties = {
[camel-spring-boot] 02/06: CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager
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 ead062cb95c1e6e8e8170acedf7051ee7b2a4214
Author: Andrea Cosentino
AuthorDate: Tue Sep 13 14:13:10 2022 +0200
CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in
camel-spring-boot - Google Secret Manager
Signed-off-by: Andrea Cosentino
---
.../src/main/docs/spring-boot.json | 26 ++
1 file changed, 26 insertions(+)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index c5c02c8b3f5..21fdcdcaf2a 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -1442,12 +1442,38 @@
"description": "The GCP Project ID",
"sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties"
},
+{
+ "name": "camel.vault.gcp.refresh-enabled",
+ "type": "java.lang.Boolean",
+ "description": "Define if we want to refresh the secrets on update",
+ "sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties",
+ "defaultValue": false
+},
+{
+ "name": "camel.vault.gcp.refresh-period",
+ "type": "java.lang.Long",
+ "description": "Define the refresh period",
+ "sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties",
+ "defaultValue": 3
+},
+{
+ "name": "camel.vault.gcp.secrets",
+ "type": "java.lang.String",
+ "description": "Define the secrets to look at",
+ "sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties"
+},
{
"name": "camel.vault.gcp.service-account-key",
"type": "java.lang.String",
"description": "The Service Account Key location",
"sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties"
},
+{
+ "name": "camel.vault.gcp.subscription-name",
+ "type": "java.lang.String",
+ "description": "Define the Google Pubsub subscription Name to be used
when checking for updates",
+ "sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties"
+},
{
"name": "camel.vault.gcp.use-default-instance",
"type": "java.lang.Boolean",
[camel-spring-boot] 03/06: CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager
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 393d1800179760e9455127b78998221c38813f3c
Author: Andrea Cosentino
AuthorDate: Tue Sep 13 14:37:05 2022 +0200
CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in
camel-spring-boot - Google Secret Manager
Signed-off-by: Andrea Cosentino
---
.../apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
index 47ed0fdf841..33b4ef2a4c1 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
@@ -35,7 +35,7 @@ import org.springframework.test.annotation.DirtiesContext;
"camel.vault.gcp.serviceAccountKey=file:key.json",
"camel.vault.gcp.projectId=gcp-project,",
"camel.vault.gcp.subscriptionName=sub-1",
-"camel.vault.gcp.refreshEnabled=true,",
+"camel.vault.gcp.refreshEnabled=true",
"camel.vault.gcp.refreshPeriod=30,",
"camel.vault.gcp.secrets=hello*,"
}
@@ -49,5 +49,9 @@ public class GcpVaultConfigurationTest {
public void testGcpVault() throws Exception {
Assertions.assertEquals("file:key.json",
camelContext.getVaultConfiguration().gcp().getServiceAccountKey());
Assertions.assertEquals("gcp-project",
camelContext.getVaultConfiguration().gcp().getProjectId());
+Assertions.assertEquals("sub-1",
camelContext.getVaultConfiguration().gcp().getSubscriptionName());
+Assertions.assertEquals(true,
camelContext.getVaultConfiguration().gcp().isRefreshEnabled());
+Assertions.assertEquals(30,
camelContext.getVaultConfiguration().gcp().getRefreshPeriod());
+Assertions.assertEquals("hello*",
camelContext.getVaultConfiguration().gcp().getSecrets());
}
}
[camel-spring-boot] 06/06: CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot - Google Secret Manager
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 5a66bcc58a8cf0db159bc4c2aad167c01456a1b0
Author: Andrea Cosentino
AuthorDate: Tue Sep 13 14:42:31 2022 +0200
CAMEL-18502 - Support Secrets Reload from Vault/Cloud Service in
camel-spring-boot - Google Secret Manager
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
index 212087a12ca..93b3dce1a66 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationTest.java
@@ -37,7 +37,7 @@ import org.springframework.test.annotation.DirtiesContext;
"camel.vault.gcp.subscriptionName=sub-1",
"camel.vault.gcp.refreshEnabled=true",
"camel.vault.gcp.refreshPeriod=30",
-"camel.vault.gcp.secrets=hello*,"
+"camel.vault.gcp.secrets=hello*"
}
)
public class GcpVaultConfigurationTest {
