You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2024/09/05 09:39:56 UTC
(camel) branch CAMEL-21173 updated (d6a48a2a1ad -> 15a56dc89d4)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch CAMEL-21173
in repository https://gitbox.apache.org/repos/asf/camel.git
discard d6a48a2a1ad CAMEL-21173 - Camel-Jbang Dev Console: Add Kubernetes Vault support - cli connector and ListVault command
omit 202a096a15c CAMEL-21173 - Camel-Jbang Dev Console: Add Kubernetes Vault support
add ff90953169d CAMEL-21162: camel-http - Http producer should capture response input stream using more standard approach in Camel to ensure stream caching works with spool to disk. (#15438)
add 21c66f8f40e CAMEL-21175 - Create package name for file created with Camel Jbang
add aba70fc5091 chore(deps): Bump aws-java-sdk2-version from 2.27.18 to 2.27.19 (#15440)
add 44b6a16ea1c chore(deps): Bump com.googlecode.libphonenumber:libphonenumber (#15441)
add efa8cf992d7 chore(deps): Bump io.camunda:zeebe-client-java from 8.5.6 to 8.5.7 (#15442)
add db94fbb90a3 CAMEL-21173 - Camel-Jbang Dev Console: Add Kubernetes Vault support (#15439)
add 58b43ad0521 chore(deps-dev): Bump com.graphql-java:graphql-java from 22.2 to 22.3 (#15443)
add b9c8f65492b CAMEL-20199: Remove synchronized block from components G to I (#15444)
new 15a56dc89d4 CAMEL-21173 - Camel-Jbang Dev Console: Add Kubernetes Vault support - cli connector and ListVault command
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 (d6a48a2a1ad)
\
N -- N -- N refs/heads/CAMEL-21173 (15a56dc89d4)
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:
.../component/as2/api/protocol/ResponseMDN.java | 36 ++++----
.../as2/internal/AS2PropertiesHelper.java | 17 +++-
.../component/aws2/kinesis/KinesisConnection.java | 36 +++++---
.../camel/component/aws2/sqs/Sqs2Consumer.java | 9 +-
.../bean/AbstractCamelInvocationHandler.java | 40 +++++----
.../box/internal/BoxPropertiesHelper.java | 17 +++-
.../braintree/BraintreeConfiguration.java | 90 ++++++++++----------
.../internal/BraintreePropertiesHelper.java | 17 +++-
.../java/org/apache/camel/coap/CoAPComponent.java | 57 +++++++------
.../java/org/apache/camel/coap/CoAPProducer.java | 11 ++-
.../camel/component/consul/ConsulEndpoint.java | 19 +++--
.../component/controlbus/ControlBusComponent.java | 13 ++-
.../dhis2/internal/Dhis2PropertiesHelper.java | 17 +++-
.../dropbox/util/DropboxPropertyManager.java | 34 ++++----
.../fhir/internal/FhirPropertiesHelper.java | 17 +++-
.../bigquery/GoogleBigQueryConnectionFactory.java | 25 ++++--
.../internal/GoogleCalendarPropertiesHelper.java | 17 +++-
.../internal/GoogleDrivePropertiesHelper.java | 17 +++-
.../mail/internal/GoogleMailPropertiesHelper.java | 17 +++-
.../internal/GoogleSheetsPropertiesHelper.java | 17 +++-
.../hazelcast/policy/HazelcastRoutePolicy.java | 28 +++++--
.../camel/http/common/DefaultHttpRegistry.java | 42 +++++++---
.../apache/camel/component/http/HttpEndpoint.java | 22 +++--
.../apache/camel/component/http/HttpProducer.java | 25 ++----
....java => HttpStreamCacheNoSpoolToDiskTest.java} | 43 ++++++----
...st.java => HttpStreamCacheSpoolToDiskTest.java} | 46 +++++-----
.../iec60870/AbstractConnectionMultiplexor.java | 83 ++++++++++--------
.../component/iec60870/AbstractIecComponent.java | 5 +-
.../iec60870/client/ClientConnection.java | 39 ++++++---
.../cluster/InfinispanEmbeddedClusterView.java | 85 +++++++++----------
.../cluster/InfinispanRemoteClusterView.java | 97 ++++++++++------------
.../apache/camel/component/irc/IrcComponent.java | 40 +++++----
.../apache/camel/dsl/jbang/core/commands/Init.java | 26 ++++++
.../src/main/resources/templates/java.tmpl | 2 +-
.../camel/dsl/jbang/core/commands/InitTest.java | 36 ++++++++
parent/pom.xml | 8 +-
.../utils/extensions/JmsServiceExtension.java | 27 +++---
37 files changed, 740 insertions(+), 437 deletions(-)
copy components/camel-http/src/test/java/org/apache/camel/component/http/{HttpDisableStreamCacheTest.java => HttpStreamCacheNoSpoolToDiskTest.java} (65%)
copy components/camel-http/src/test/java/org/apache/camel/component/http/{HttpDisableStreamCacheTest.java => HttpStreamCacheSpoolToDiskTest.java} (63%)
(camel) 01/01: CAMEL-21173 - Camel-Jbang Dev Console: Add Kubernetes Vault support - cli connector and ListVault command
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-21173
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 15a56dc89d46f3f37d0ce050d88ee6907b55f50c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 5 11:19:10 2024 +0200
CAMEL-21173 - Camel-Jbang Dev Console: Add Kubernetes Vault support - cli connector and ListVault command
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../apache/camel/cli/connector/LocalCliConnector.java | 9 +++++++++
.../dsl/jbang/core/commands/process/ListVault.java | 18 ++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index 1efcede4b85..203520a614d 100644
--- a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++ b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -1230,6 +1230,15 @@ public class LocalCliConnector extends ServiceSupport implements CliConnector, C
root.put("azure-secrets", json);
}
}
+ // kubernetes-secrets is optional
+ Optional<DevConsole> dcKubernetes
+ = PluginHelper.getDevConsoleResolver(camelContext).lookupDevConsole("kubernetes-secrets");
+ if (dcKubernetes.isPresent()) {
+ JsonObject json = (JsonObject) dcKubernetes.get().call(DevConsole.MediaType.JSON);
+ if (json != null) {
+ root.put("kubernetes-secrets", json);
+ }
+ }
return root;
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
index 359a138c767..e5d679d5149 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
@@ -135,6 +135,24 @@ public class ListVault extends ProcessWatchCommand {
rows.add(row);
}
}
+
+ JsonObject kubernetes = (JsonObject) vaults.get("kubernetes-secrets");
+ if (kubernetes != null) {
+ row.vault = "Kubernetes";
+ row.lastCheck = kubernetes.getLongOrDefault("startCheckTimestamp", 0);
+ row.lastReload = kubernetes.getLongOrDefault("lastReloadTimestamp", 0);
+ JsonArray arr = (JsonArray) kubernetes.get("secrets");
+ for (int i = 0; i < arr.size(); i++) {
+ if (i > 0) {
+ // create a copy for 2+ secrets
+ row = row.copy();
+ }
+ JsonObject jo = (JsonObject) arr.get(i);
+ row.secret = jo.getString("name");
+ row.timestamp = jo.getLongOrDefault("timestamp", 0);
+ rows.add(row);
+ }
+ }
}
}
});