Re: [PR] fix(#5097): Remove secondary IntegrationPlatform in favor of using IntegrationProfile [camel-k]
christophd merged PR #5138: URL: https://github.com/apache/camel-k/pull/5138 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] jt400 mock coverage + native fixes [camel-quarkus]
jamesnetherton commented on code in PR #5812:
URL: https://github.com/apache/camel-quarkus/pull/5812#discussion_r1505503095
##
integration-tests/jt400/pom.xml:
##
@@ -63,6 +71,9 @@
native
+
+
${flat-class-path}
Review Comment:
> The real behavior in native is, that the native succeeds in case of
flat-class-path = true or false. TBH I'm not entirely sure why this is
happening)
Because the application and tests are running in separate processes. There
are some differences in class loading in test mode Vs prod mode. See the end of
the introductory paragraph here:
https://quarkus.io/guides/class-loading-reference
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1505496052
##
pkg/cmd/operator/operator.go:
##
@@ -70,122 +51,48 @@ import (
var log = logutil.Log.WithName("cmd")
Review Comment:
may be better to use a better log name
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1505497518
##
pkg/cmd/platformcontroller/platformcontroller.go:
##
@@ -0,0 +1,89 @@
+/*
+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 platformcontroller
+
+import (
+ "context"
+ "flag"
+ "fmt"
+ "os"
+ "runtime"
+
+ "github.com/apache/camel-k/v2/pkg/client"
+ managerCmd "github.com/apache/camel-k/v2/pkg/cmd/manager"
+ "github.com/apache/camel-k/v2/pkg/controller"
+ "github.com/apache/camel-k/v2/pkg/install"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
+ "sigs.k8s.io/controller-runtime/pkg/cache"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+)
+
+var log = logutil.Log.WithName("cmd")
Review Comment:
may be better to use a better log name
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1505496052
##
pkg/cmd/operator/operator.go:
##
@@ -70,122 +51,48 @@ import (
var log = logutil.Log.WithName("cmd")
Review Comment:
may be better to have a better log name
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1505494747
##
pkg/cmd/manager/controller.go:
##
@@ -0,0 +1,310 @@
+/*
+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 manager
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/apache/camel-k/v2/pkg/apis"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
+ "go.uber.org/automaxprocs/maxprocs"
+ "go.uber.org/zap"
+ "go.uber.org/zap/zapcore"
+ coordination "k8s.io/api/coordination/v1"
+ corev1 "k8s.io/api/core/v1"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/client-go/rest"
+ "k8s.io/client-go/tools/leaderelection/resourcelock"
+ "k8s.io/client-go/tools/record"
+ "k8s.io/klog/v2"
+ "sigs.k8s.io/controller-runtime/pkg/cache"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/config"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
+ zapctrl "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/manager/signals"
+)
+
+type Manager interface {
Review Comment:
don't mind, was too quick
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] jt400 mock coverage + native fixes [camel-quarkus]
JiriOndrusek commented on code in PR #5812:
URL: https://github.com/apache/camel-quarkus/pull/5812#discussion_r1505492463
##
integration-tests/jt400/pom.xml:
##
@@ -63,6 +71,9 @@
native
+
+
${flat-class-path}
Review Comment:
your tip should work correctly. I tried similar before. I added Profile as a
verification.
The real behavior in native is, that the native succeeds in case of
flat-class-path = true or false. (TBH I'm not entirely sure why this is
happening)
The profile changes flat class pat in runtime and brings 2 options:
1. if native run starts with flat-class-path = false, and profile changes
value to true, the execution fails. Quarkus detects, that build time property
is changed in runtime
2. It should be possible to run the mock test in JVM wholy based on profile.
(just the fact)
Therefore I kept profile to make sure that native value is the same as JVM
value (even if it has no effect on the result of the test)
I can try to simplify a little bit by ignoring `flat-class-path` and using
only property `quarkus.test.flat-class-path`. I'd like too keep the profile
just as another level of verification (to avoid false positive)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] jt400 mock coverage + native fixes [camel-quarkus]
JiriOndrusek commented on code in PR #5812:
URL: https://github.com/apache/camel-quarkus/pull/5812#discussion_r1505493819
##
extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java:
##
@@ -40,4 +49,30 @@ List
runtimeInitializedClasses() {
items.add(new
RuntimeInitializedClassBuildItem("com.ibm.as400.access.CredentialVault"));
return items;
}
+
+@BuildStep
+void reflectiveClasses(BuildProducer
reflectiveClassesProducer,
+CombinedIndexBuildItem combinedIndex) {
+IndexView index = combinedIndex.getIndex();
+
+
reflectiveClassesProducer.produce(ReflectiveClassBuildItem.builder(NLSImplNative.class).build());
+
+index.getKnownClasses().stream()
+.filter(c ->
c.name().toString().matches("com.ibm.as400.access.*Remote"))
Review Comment:
that's right, I'll take care of 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
Re: [PR] jt400 mock coverage + native fixes [camel-quarkus]
JiriOndrusek commented on code in PR #5812:
URL: https://github.com/apache/camel-quarkus/pull/5812#discussion_r1505493038
##
integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400MockTest.java:
##
@@ -0,0 +1,148 @@
+/*
+ * 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.jt400.it;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import org.apache.camel.util.CollectionHelper;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+
+@QuarkusTest
+@DisabledIfSystemProperty(named = "skip-mock-tests", matches = "true")
+@TestProfile(FlatClasspathTestProfile.class)
+public class Jt400MockTest {
+
+@Test
+public void testReadKeyedDataQueue() {
+prepareMockReply(Jt400Resource.ReplyType.ok);
+prepareMockReply(Jt400Resource.ReplyType.DQRequestAttributesNormal,
CollectionHelper.mapOf("keyLength", 5));
+prepareMockReply(Jt400Resource.ReplyType.ok);
+prepareMockReply(Jt400Resource.ReplyType.DQReadNormal, 0x8003, "mocked
jt400", "Hello from mocked jt400!", "MYKEY");
+
+/* A simple autogenerated test */
Review Comment:
sure, no idea how I get it there (probably some copy/paste)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] jt400 mock coverage + native fixes [camel-quarkus]
JiriOndrusek commented on code in PR #5812:
URL: https://github.com/apache/camel-quarkus/pull/5812#discussion_r1505492463
##
integration-tests/jt400/pom.xml:
##
@@ -63,6 +71,9 @@
native
+
+
${flat-class-path}
Review Comment:
you tip would work correctly. I tried it before. I added Profile as a
verification.
The real behavior in native is, that the native succeeds in case of
flat-class-path = true or false. (TBH I'm not entirely sure why this is
happening)
The profile changes flat class pat in runtime and brings 2 options:
1. if native run starts with flat-class-path = false, and profile changes
value to true, the execution fails. Quarkus detects, that build time property
is changed in runtime
2. It should be possible to run the mock test in JVM wholy based on profile.
(just the fact)
Therefore I kept profile to make sure that native value is the same as JVM
value (even if it has no effect on the result of the test)
I can try to simplify a little bit by ignoring `flat-class-path` and using
only property `quarkus.test.flat-class-path`. I'd like too keep the profile
just as another level of verification (to avoid false positive)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1505456692
##
pkg/cmd/manager/controller.go:
##
@@ -0,0 +1,310 @@
+/*
+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 manager
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/apache/camel-k/v2/pkg/apis"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
+ "go.uber.org/automaxprocs/maxprocs"
+ "go.uber.org/zap"
+ "go.uber.org/zap/zapcore"
+ coordination "k8s.io/api/coordination/v1"
+ corev1 "k8s.io/api/core/v1"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/client-go/rest"
+ "k8s.io/client-go/tools/leaderelection/resourcelock"
+ "k8s.io/client-go/tools/record"
+ "k8s.io/klog/v2"
+ "sigs.k8s.io/controller-runtime/pkg/cache"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/config"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
+ zapctrl "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/manager/signals"
+)
+
+type Manager interface {
+ LoggerSetup() (logutil.Logger, error, string)
+ PrintVersion()
+ GetWatchNamespace() (string, error)
+ CreateBootstrapClient(cfg *rest.Config) (client.Client, error, string)
+ CreateEventBroadcaster(bootstrapClient client.Client, watchNamespace
string, ctx context.Context) (record.EventBroadcaster, error, string)
+ GetControllerNamespaceAndLeaderElection(watchNamespace string,
bootstrapClient client.Client, leaderElection bool, ctx context.Context)
(string, bool, error, string)
+ SetOperatorImage(bootstrapClient client.Client, ctx context.Context)
(error, string)
+ GetManagerOptions(bootstrapClient client.Client, watchNamespace string)
(cache.Options, error, string)
+ CreateManager(healthPort int32, monitoringPort int32, leaderElection
bool, leaderElectionID string, cfg *rest.Config, eventBroadcaster
record.EventBroadcaster, controllerNamespace string, options cache.Options, ctx
context.Context) (manager.Manager, client.Client, error, string)
+ ControllerPreStartResourcesInit(initCtx context.Context,
bootstrapClient client.Client, watchNamespace string, controllerNamespace
string, ctx context.Context, ctrlClient client.Client, mgr manager.Manager)
(error, string)
+}
+
+type ControllerCmd struct {
+ ControllerManager Manager
+}
+
+func (c ControllerCmd) Run(healthPort, monitoringPort int32, leaderElection
bool, leaderElectionID string) (error, string) {
+ log, err, errMessage := c.ControllerManager.LoggerSetup()
+ if err != nil {
+ log.Error(err, errMessage)
+ }
+
+ c.ControllerManager.PrintVersion()
+ // Will only appear if DEBUG level has been enabled using the env var
LOG_LEVEL
+ log.Debug("*** DEBUG level messages will be logged ***")
+
+ watchNamespace, err := c.ControllerManager.GetWatchNamespace()
+ if err != nil {
+ return err, "failed to get watch namespace"
+ }
+
+ cfg, err := config.GetConfig()
+ if err != nil {
+ return err, "cannot get client config"
+ }
+
+ bootstrapClient, err, errMessage :=
c.ControllerManager.CreateBootstrapClient(cfg)
+ if err != nil {
+ return err, errMessage
+ }
+
+ ctx := signals.SetupSignalHandler()
+
+ eventBroadcaster, err, errMessage :=
c.ControllerManager.CreateEventBroadcaster(bootstrapClient, watchNamespace, ctx)
+ if eventBroadcaster != nil {
+ defer eventBroadcaster.Shutdown()
+ }
+ if err != nil {
+ return err, errMessage
+ }
+
+ controllerNamespace, leaderElection, err, errMessage :=
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1505458111
##
pkg/cmd/manager/controller.go:
##
@@ -0,0 +1,310 @@
+/*
+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 manager
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/apache/camel-k/v2/pkg/apis"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
+ "go.uber.org/automaxprocs/maxprocs"
+ "go.uber.org/zap"
+ "go.uber.org/zap/zapcore"
+ coordination "k8s.io/api/coordination/v1"
+ corev1 "k8s.io/api/core/v1"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/client-go/rest"
+ "k8s.io/client-go/tools/leaderelection/resourcelock"
+ "k8s.io/client-go/tools/record"
+ "k8s.io/klog/v2"
+ "sigs.k8s.io/controller-runtime/pkg/cache"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/config"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
+ zapctrl "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/manager/signals"
+)
+
+type Manager interface {
+ LoggerSetup() (logutil.Logger, error, string)
+ PrintVersion()
+ GetWatchNamespace() (string, error)
+ CreateBootstrapClient(cfg *rest.Config) (client.Client, error, string)
+ CreateEventBroadcaster(bootstrapClient client.Client, watchNamespace
string, ctx context.Context) (record.EventBroadcaster, error, string)
+ GetControllerNamespaceAndLeaderElection(watchNamespace string,
bootstrapClient client.Client, leaderElection bool, ctx context.Context)
(string, bool, error, string)
+ SetOperatorImage(bootstrapClient client.Client, ctx context.Context)
(error, string)
+ GetManagerOptions(bootstrapClient client.Client, watchNamespace string)
(cache.Options, error, string)
+ CreateManager(healthPort int32, monitoringPort int32, leaderElection
bool, leaderElectionID string, cfg *rest.Config, eventBroadcaster
record.EventBroadcaster, controllerNamespace string, options cache.Options, ctx
context.Context) (manager.Manager, client.Client, error, string)
+ ControllerPreStartResourcesInit(initCtx context.Context,
bootstrapClient client.Client, watchNamespace string, controllerNamespace
string, ctx context.Context, ctrlClient client.Client, mgr manager.Manager)
(error, string)
+}
+
+type ControllerCmd struct {
+ ControllerManager Manager
+}
+
+func (c ControllerCmd) Run(healthPort, monitoringPort int32, leaderElection
bool, leaderElectionID string) (error, string) {
+ log, err, errMessage := c.ControllerManager.LoggerSetup()
+ if err != nil {
+ log.Error(err, errMessage)
+ }
+
+ c.ControllerManager.PrintVersion()
+ // Will only appear if DEBUG level has been enabled using the env var
LOG_LEVEL
+ log.Debug("*** DEBUG level messages will be logged ***")
+
+ watchNamespace, err := c.ControllerManager.GetWatchNamespace()
+ if err != nil {
+ return err, "failed to get watch namespace"
+ }
+
+ cfg, err := config.GetConfig()
+ if err != nil {
+ return err, "cannot get client config"
+ }
+
+ bootstrapClient, err, errMessage :=
c.ControllerManager.CreateBootstrapClient(cfg)
+ if err != nil {
+ return err, errMessage
+ }
+
+ ctx := signals.SetupSignalHandler()
+
+ eventBroadcaster, err, errMessage :=
c.ControllerManager.CreateEventBroadcaster(bootstrapClient, watchNamespace, ctx)
+ if eventBroadcaster != nil {
+ defer eventBroadcaster.Shutdown()
+ }
+ if err != nil {
+ return err, errMessage
+ }
+
+ controllerNamespace, leaderElection, err, errMessage :=
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1505456692
##
pkg/cmd/manager/controller.go:
##
@@ -0,0 +1,310 @@
+/*
+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 manager
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/apache/camel-k/v2/pkg/apis"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
+ "go.uber.org/automaxprocs/maxprocs"
+ "go.uber.org/zap"
+ "go.uber.org/zap/zapcore"
+ coordination "k8s.io/api/coordination/v1"
+ corev1 "k8s.io/api/core/v1"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/client-go/rest"
+ "k8s.io/client-go/tools/leaderelection/resourcelock"
+ "k8s.io/client-go/tools/record"
+ "k8s.io/klog/v2"
+ "sigs.k8s.io/controller-runtime/pkg/cache"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/config"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
+ zapctrl "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/manager/signals"
+)
+
+type Manager interface {
+ LoggerSetup() (logutil.Logger, error, string)
+ PrintVersion()
+ GetWatchNamespace() (string, error)
+ CreateBootstrapClient(cfg *rest.Config) (client.Client, error, string)
+ CreateEventBroadcaster(bootstrapClient client.Client, watchNamespace
string, ctx context.Context) (record.EventBroadcaster, error, string)
+ GetControllerNamespaceAndLeaderElection(watchNamespace string,
bootstrapClient client.Client, leaderElection bool, ctx context.Context)
(string, bool, error, string)
+ SetOperatorImage(bootstrapClient client.Client, ctx context.Context)
(error, string)
+ GetManagerOptions(bootstrapClient client.Client, watchNamespace string)
(cache.Options, error, string)
+ CreateManager(healthPort int32, monitoringPort int32, leaderElection
bool, leaderElectionID string, cfg *rest.Config, eventBroadcaster
record.EventBroadcaster, controllerNamespace string, options cache.Options, ctx
context.Context) (manager.Manager, client.Client, error, string)
+ ControllerPreStartResourcesInit(initCtx context.Context,
bootstrapClient client.Client, watchNamespace string, controllerNamespace
string, ctx context.Context, ctrlClient client.Client, mgr manager.Manager)
(error, string)
+}
+
+type ControllerCmd struct {
+ ControllerManager Manager
+}
+
+func (c ControllerCmd) Run(healthPort, monitoringPort int32, leaderElection
bool, leaderElectionID string) (error, string) {
+ log, err, errMessage := c.ControllerManager.LoggerSetup()
+ if err != nil {
+ log.Error(err, errMessage)
+ }
+
+ c.ControllerManager.PrintVersion()
+ // Will only appear if DEBUG level has been enabled using the env var
LOG_LEVEL
+ log.Debug("*** DEBUG level messages will be logged ***")
+
+ watchNamespace, err := c.ControllerManager.GetWatchNamespace()
+ if err != nil {
+ return err, "failed to get watch namespace"
+ }
+
+ cfg, err := config.GetConfig()
+ if err != nil {
+ return err, "cannot get client config"
+ }
+
+ bootstrapClient, err, errMessage :=
c.ControllerManager.CreateBootstrapClient(cfg)
+ if err != nil {
+ return err, errMessage
+ }
+
+ ctx := signals.SetupSignalHandler()
+
+ eventBroadcaster, err, errMessage :=
c.ControllerManager.CreateEventBroadcaster(bootstrapClient, watchNamespace, ctx)
+ if eventBroadcaster != nil {
+ defer eventBroadcaster.Shutdown()
+ }
+ if err != nil {
+ return err, errMessage
+ }
+
+ controllerNamespace, leaderElection, err, errMessage :=
Re: [I] Get environment variable value is empty in properties file [camel-k]
Miaoxiang-philips closed issue #5178: Get environment variable value is empty in properties file URL: https://github.com/apache/camel-k/issues/5178 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Get environment variable value is empty in properties file [camel-k]
Miaoxiang-philips commented on issue #5178:
URL: https://github.com/apache/camel-k/issues/5178#issuecomment-1968309724
Regarding this issue, the current status:
We do this by commenting in the java file:
```yaml
# camel-k: dependency=mvn:io.quarkus:quarkus-jdbc-postgresql
# camel-k: build-property=quarkus.datasource.xxx.db-kind=postgresql
# camel-k: config=secret:
# camel-k: config=file:datasource.properties
```
The datasource.properties file continues to retrieve the value in Secret
using ${PASSWORD}:
```
```
kamel run xxx.java --dev
```
quarkus.datasource.xxx.password=${PASSWORD}
```
In this way, my requirements can be realized. Is there any other better
scheme that can tell me? Thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [I] Error while building Karavan Web Application [camel-karavan]
Praval791 closed issue #1147: Error while building Karavan Web Application URL: https://github.com/apache/camel-karavan/issues/1147 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Error while building Karavan Web Application [camel-karavan]
Praval791 commented on issue #1147: URL: https://github.com/apache/camel-karavan/issues/1147#issuecomment-1968303625 @indubabu yes, I have to use CMD, and there was an error in the instructions in the dev README that I fixed yesterday. Now, the README is also updated. -- 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 (eb5f038bece -> de16d5b5d82)
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 eb5f038bece Regen
add 5dc0a9dc288 Camel AWS Bedrock: Added to Kit (#13332)
add de16d5b5d82 align output log (#13326)
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/components.properties | 1 +
.../camel/catalog/components}/aws-bedrock.json | 0
.../apache/camel/catalog/main/sensitive-keys.json | 1 +
.../platform/http/main/MainHttpServer.java | 37 +-
.../org/apache/camel/main/components.properties| 1 +
.../java/org/apache/camel/util/SensitiveUtils.java | 2 +
.../component/ComponentsBuilderFactory.java| 13 +
...java => AwsBedrockComponentBuilderFactory.java} | 276 ++---
.../src/generated/resources/metadata.json | 23 ++
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/EndpointBuilders.java | 1 +
.../builder/endpoint/StaticEndpointBuilders.java | 43 +++
...ory.java => BedrockEndpointBuilderFactory.java} | 425 ++---
.../camel-component-known-dependencies.properties | 1 +
.../{Aws2Ec2UriDsl.kt => AwsBedrockUriDsl.kt} | 56 +--
.../apache/camel/maven/packaging/MojoHelper.java | 2 +-
16 files changed, 494 insertions(+), 389 deletions(-)
copy
{components/camel-aws/camel-aws-bedrock/src/generated/resources/META-INF/org/apache/camel/component/aws2/bedrock
=>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components}/aws-bedrock.json
(100%)
copy
dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/{Aws2LambdaComponentBuilderFactory.java
=> AwsBedrockComponentBuilderFactory.java} (68%)
copy
dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{KMS2EndpointBuilderFactory.java
=> BedrockEndpointBuilderFactory.java} (67%)
copy
dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/{Aws2Ec2UriDsl.kt
=> AwsBedrockUriDsl.kt} (91%)
Re: [PR] Handle quote escape in bindy [camel]
davsclaus commented on PR #13270: URL: https://github.com/apache/camel/pull/13270#issuecomment-1968275664 If we need to backport this, then its good to have a JIRA ticket for this to track 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
Re: [PR] Automatically transform to xml if all files are yaml [camel]
davsclaus commented on PR #13331: URL: https://github.com/apache/camel/pull/13331#issuecomment-1968275249 You may want to update the description for the option to mention that, and add a TIP in the camel-jbang 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 For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: align output log (#13326)
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 de16d5b5d82 align output log (#13326)
de16d5b5d82 is described below
commit de16d5b5d8266ace46db873947a10102e338294a
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Wed Feb 28 06:39:58 2024 +0100
align output log (#13326)
* align output log
* align output log
---
.../platform/http/main/MainHttpServer.java | 37 ++
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git
a/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/MainHttpServer.java
b/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/MainHttpServer.java
index 6263068c794..a3311f307a7 100644
---
a/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/MainHttpServer.java
+++
b/components/camel-platform-http-main/src/main/java/org/apache/camel/component/platform/http/main/MainHttpServer.java
@@ -327,25 +327,30 @@ public class MainHttpServer extends ServiceSupport
implements CamelContextAware,
// log only if changed
if (last == null || last.size() != endpoints.size() ||
!last.containsAll(endpoints)) {
LOG.info("HTTP endpoints summary");
+int longestEndpoint = 0;
for (HttpEndpointModel u : endpoints) {
-String line = "http://0.0.0.0:; + (server != null ?
server.getPort() : getPort()) + u.getUri();
+String endpoint = getEndpoint(u);
+if (endpoint.length() > longestEndpoint) {
+longestEndpoint = endpoint.length();
+}
+}
+
+int spacing = 3;
+String formatTemplate = "%-" + (longestEndpoint + spacing)
+ "s %-8s %s";
+for (HttpEndpointModel u : endpoints) {
+String endpoint = getEndpoint(u);
+String formattedVerbs = "";
if (u.getVerbs() != null) {
-line += "(" + u.getVerbs() + ")";
+formattedVerbs = "(" + u.getVerbs() + ")";
}
+String formattedMediaTypes = "";
if (u.getConsumes() != null || u.getProduces() !=
null) {
-line += "(";
-if (u.getConsumes() != null) {
-line += "accept:" + u.getConsumes();
-if (u.getProduces() != null) {
-line += " ";
-}
-}
-if (u.getProduces() != null) {
-line += "produce:" + u.getProduces();
-}
-line += ")";
+formattedMediaTypes = String.format("(%s%s%s)",
+u.getConsumes() != null ? "accept:" +
u.getConsumes() : "",
+u.getProduces() != null && u.getConsumes()
!= null ? " " : "",
+u.getProduces() != null ? "produce:" +
u.getProduces() : "");
}
-LOG.info("{}", line);
+LOG.info("{}", String.format(formatTemplate,
endpoint, formattedVerbs, formattedMediaTypes));
}
}
@@ -353,6 +358,10 @@ public class MainHttpServer extends ServiceSupport
implements CamelContextAware,
last = new HashSet<>(endpoints);
}
+private String getEndpoint(HttpEndpointModel httpEndpointModel) {
+return "http://0.0.0.0:; + (server != null ? server.getPort()
: getPort()) + httpEndpointModel.getUri();
+}
+
@Override
public void onCamelContextStarted(CamelContext context, boolean
alreadyStarted) {
if (alreadyStarted) {
Re: [PR] align output log [camel]
davsclaus merged PR #13326: URL: https://github.com/apache/camel/pull/13326 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] User should be able to limit resources for integration containers in docker [camel-karavan]
mgubaidullin commented on issue #1052: URL: https://github.com/apache/camel-karavan/issues/1052#issuecomment-1968181399 In Kubernetes it is already supported by adding deployment.jkube.yaml file with resource fragment to the project -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] User should be able to limit resources for integration containers in docker [camel-karavan]
vidhyasagarj commented on issue #1052: URL: https://github.com/apache/camel-karavan/issues/1052#issuecomment-1968095494 Noted @mgubaidullin, Will make the change accordingly. Any plans for adding this feature for kubernetes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Error while building Karavan Web Application [camel-karavan]
indubabu commented on issue #1147: URL: https://github.com/apache/camel-karavan/issues/1147#issuecomment-1968076542 If you are using Powershell, you will have to add quotes around -D parameters [](https://stackoverflow.com/questions/21902668/maven-works-in-cmd-but-not-powershell) otherwise, you can try with the command prompt. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 4b5761dc7 chore: changelog automatic update 4b5761dc7 is described below commit 4b5761dc70f379646c73bdd89a6b623f48acd2b6 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Feb 28 01:11:37 2024 + chore: changelog automatic update --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29c772ff0..fa17f162a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,6 @@ - Data type Kamelet hardcoded [\#5014](https://github.com/apache/camel-k/issues/5014) - Quarkus buildMode should sort JVM before Native execution [\#5001](https://github.com/apache/camel-k/issues/5001) - Failing to build native integration [\#5000](https://github.com/apache/camel-k/issues/5000) -- unambigious reference to configmaps and secrets [\#4841](https://github.com/apache/camel-k/issues/4841) - Use generated trait [\#4811](https://github.com/apache/camel-k/issues/4811) - Pointer to an external schema/CRD [\#4788](https://github.com/apache/camel-k/issues/4788) - Pipe using simple language expressions causing failure [\#4777](https://github.com/apache/camel-k/issues/4777)
(camel-karavan) branch main updated: Fix
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 d93d493e Fix
d93d493e is described below
commit d93d493e362ac95d4213c51930b46058611b1a65
Author: Marat Gubaidullin
AuthorDate: Tue Feb 27 20:04:06 2024 -0500
Fix
---
.../java/org/apache/camel/karavan/service/KaravanCacheService.java| 4
1 file changed, 4 insertions(+)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
index 1c87bd59..3b00a54f 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
@@ -59,6 +59,10 @@ public class KaravanCacheService {
public static final String DEFAULT_ENVIRONMENT = "dev";
+public HazelcastInstance getHz() {
+return hz;
+}
+
void start() {
LOGGER.info("KaravanCacheService is starting");
Config config = new ClasspathYamlConfig("hazelcast.yaml");
(camel-k) branch dependabot/go_modules/knative.dev/eventing-0.40.2 created (now 703c4f682)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/knative.dev/eventing-0.40.2 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 703c4f682 chore(deps): bump knative.dev/eventing from 0.39.3 to 0.40.2 No new revisions were added by this update.
[PR] chore(deps): bump knative.dev/eventing from 0.39.3 to 0.40.2 [camel-k]
dependabot[bot] opened a new pull request, #5194: URL: https://github.com/apache/camel-k/pull/5194 Bumps [knative.dev/eventing](https://github.com/knative/eventing) from 0.39.3 to 0.40.2. Commits https://github.com/knative/eventing/commit/40637813ad8dd63481c73223b0bc930e114eb404;>4063781 [release-1.13] Move OIDC tests to test/rekt (https://redirect.github.com/knative/eventing/issues/7705;>#7705) https://github.com/knative/eventing/commit/c818a3aa817aa0a9b2dd17563ff0eda938a96c6d;>c818a3a [release-1.13] Create SinkBindings token-secret only if sink has an audience ... https://github.com/knative/eventing/commit/a78fb6a2fac2db9523dccbf2c1549b839e0018b1;>a78fb6a [release-1.13] feat: replace yaml merge tags (https://redirect.github.com/knative/eventing/issues/7664;>#7664) https://github.com/knative/eventing/commit/2e6742c63afe771e751d5d03b25b478b79bf6ef9;>2e6742c [release-1.13] Fix mtbroker-filter to proxy response headers (https://redirect.github.com/knative/eventing/issues/7633;>#7633) https://github.com/knative/eventing/commit/fd952282e353070526aa8f474856b981e64560bb;>fd95228 Enable storage of EventType v1b2 (https://redirect.github.com/knative/eventing/issues/7594;>#7594) https://github.com/knative/eventing/commit/6962251f674cb7d276fe0434e2b4b53a49cd1716;>6962251 Add a Prerequisite helper to check if the OIDC authentication feature flag is... https://github.com/knative/eventing/commit/341a8df35c29f8721838c6762f65c4df904a1758;>341a8df [main] Update community files (https://redirect.github.com/knative/eventing/issues/7611;>#7611) https://github.com/knative/eventing/commit/bb5313df8dd5295573cbc4a08206af741edeeef0;>bb5313d Remove OIDC service account, when OIDC feature is disabled again (https://redirect.github.com/knative/eventing/issues/7570;>#7570) https://github.com/knative/eventing/commit/44ff98b38212a812337725924a7fcd58be526a86;>44ff98b Eventing TLS: Add scheme label to metrics (https://redirect.github.com/knative/eventing/issues/7581;>#7581) https://github.com/knative/eventing/commit/8d6c6e4918025795d053064e99c62a184b39ce12;>8d6c6e4 Bump Go to v1.21 (https://redirect.github.com/knative/eventing/issues/7602;>#7602) Additional commits viewable in https://github.com/knative/eventing/compare/v0.39.3...v0.40.2;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- 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 dependabot/go_modules/github.com/prometheus/client_golang-1.19.0 created (now 751215127)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/prometheus/client_golang-1.19.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 751215127 chore(deps): bump github.com/prometheus/client_golang No new revisions were added by this update.
[PR] chore(deps): bump github.com/prometheus/client_golang from 1.18.0 to 1.19.0 [camel-k]
dependabot[bot] opened a new pull request, #5193: URL: https://github.com/apache/camel-k/pull/5193 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.18.0 to 1.19.0. Release notes Sourced from https://github.com/prometheus/client_golang/releases;>github.com/prometheus/client_golang's releases. v1.19.0 What's Changed The module prometheus/common v0.48.0 introduced a bug when used together with client_golang. If your project uses client_golang and you want to use prometheus/common v0.48.0 or higher, please update client_golang to v1.19.0. [CHANGE] Minimum required go version is now 1.20 (we also test client_golang against new 1.22 version). https://redirect.github.com/prometheus/client_golang/issues/1445;>#1445 https://redirect.github.com/prometheus/client_golang/issues/1449;>#1449 [FEATURE] collectors: Add version collector. https://redirect.github.com/prometheus/client_golang/issues/1422;>#1422 https://redirect.github.com/prometheus/client_golang/issues/1427;>#1427 New Contributors https://github.com/michurin;>@​michurin made their first contribution in https://redirect.github.com/prometheus/client_golang/pull/1423;>prometheus/client_golang#1423 https://github.com/kavu;>@​kavu made their first contribution in https://redirect.github.com/prometheus/client_golang/pull/1445;>prometheus/client_golang#1445 https://github.com/ywwg;>@​ywwg made their first contribution in https://redirect.github.com/prometheus/client_golang/pull/1448;>prometheus/client_golang#1448 Full Changelog: https://github.com/prometheus/client_golang/compare/v1.18.0...v1.19.0;>https://github.com/prometheus/client_golang/compare/v1.18.0...v1.19.0 Changelog Sourced from https://github.com/prometheus/client_golang/blob/v1.19.0/CHANGELOG.md;>github.com/prometheus/client_golang's changelog. 1.19.0 / 2023-02-27 The module prometheus/common v0.48.0 introduced a bug when used together with client_golang. If your project uses client_golang and you want to use prometheus/common v0.48.0 or higher, please update client_golang to v1.19.0. [CHANGE] Minimum required go version is now 1.20 (we also test client_golang against new 1.22 version). https://redirect.github.com/prometheus/client_golang/issues/1445;>#1445 https://redirect.github.com/prometheus/client_golang/issues/1449;>#1449 [FEATURE] collectors: Add version collector. https://redirect.github.com/prometheus/client_golang/issues/1422;>#1422 https://redirect.github.com/prometheus/client_golang/issues/1427;>#1427 Commits https://github.com/prometheus/client_golang/commit/77d4003c72f054ac435df1223deac17b1f8858ea;>77d4003 Add 1.19.0 changelog (https://redirect.github.com/prometheus/client_golang/issues/1451;>#1451) https://github.com/prometheus/client_golang/commit/14259fa70cfb69f1262f69fdfe58ed5e6318d441;>14259fa Merge pull request https://redirect.github.com/prometheus/client_golang/issues/1448;>#1448 from ywwg/owilliams/content-negotiation https://github.com/prometheus/client_golang/commit/6d039205b8decc22868f43b0bd0da01b376a36aa;>6d03920 deps: bump prometheus/common version https://github.com/prometheus/client_golang/commit/353395b3b67b2bee0a219950bf5570779d74a392;>353395b Remove support for go 1.19 (https://redirect.github.com/prometheus/client_golang/issues/1449;>#1449) https://github.com/prometheus/client_golang/commit/9dd5d2a64af1e9bd0cbff0516ded6e51d25209bf;>9dd5d2a Merge pull request https://redirect.github.com/prometheus/client_golang/issues/1445;>#1445 from kavu/add_go122_metrics_test https://github.com/prometheus/client_golang/commit/c906a5e91a4604bd55fb8e26a54b5ba64a81c678;>c906a5e Add support for Go 1.22 https://github.com/prometheus/client_golang/commit/7ac90362b02729a65109b33d172bafb65d7dab50;>7ac9036 Merge pull request https://redirect.github.com/prometheus/client_golang/issues/1440;>#1440 from prometheus/dependabot/github_actions/github-act... https://github.com/prometheus/client_golang/commit/8c7e30ff0dae76cb87061a37bbccc6c8789196fa;>8c7e30f Merge pull request https://redirect.github.com/prometheus/client_golang/issues/1441;>#1441 from prometheus/dependabot/go_modules/tutorial/whats... https://github.com/prometheus/client_golang/commit/08769f8257358282749a5180c9dc845f6e065640;>08769f8 Bump github.com/prometheus/common in /tutorial/whatsup https://github.com/prometheus/client_golang/commit/83d5940383d55377072d10a70316a7e24c5bb47c;>83d5940 Bump the github-actions group with 2 updates Additional commits viewable in https://github.com/prometheus/client_golang/compare/v1.18.0...v1.19.0;>compare view [![Dependabot compatibility
(camel-k) branch release-2.1.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.1.x by this push: new b7c3c9561 chore: changelog automatic update b7c3c9561 is described below commit b7c3c956115dc0a979efc326c46921c6e92a0022 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Feb 28 00:26:28 2024 + chore: changelog automatic update --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29c772ff0..fa17f162a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,6 @@ - Data type Kamelet hardcoded [\#5014](https://github.com/apache/camel-k/issues/5014) - Quarkus buildMode should sort JVM before Native execution [\#5001](https://github.com/apache/camel-k/issues/5001) - Failing to build native integration [\#5000](https://github.com/apache/camel-k/issues/5000) -- unambigious reference to configmaps and secrets [\#4841](https://github.com/apache/camel-k/issues/4841) - Use generated trait [\#4811](https://github.com/apache/camel-k/issues/4811) - Pointer to an external schema/CRD [\#4788](https://github.com/apache/camel-k/issues/4788) - Pipe using simple language expressions causing failure [\#4777](https://github.com/apache/camel-k/issues/4777)
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 441d62c72 chore: nightly automatic updates 441d62c72 is described below commit 441d62c72af482908e73a8631dfd89aa84011a78 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 27 23:46:48 2024 + chore: nightly automatic updates --- CHANGELOG.md | 5 +- README.adoc | 2 +- badge.out| 2 +- coverage | 2 +- coverage.out | 234 +++ 5 files changed, 130 insertions(+), 115 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d89334be..a742b7d59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,6 @@ - Data type Kamelet hardcoded [\#5014](https://github.com/apache/camel-k/issues/5014) - Quarkus buildMode should sort JVM before Native execution [\#5001](https://github.com/apache/camel-k/issues/5001) - Failing to build native integration [\#5000](https://github.com/apache/camel-k/issues/5000) -- unambigious reference to configmaps and secrets [\#4841](https://github.com/apache/camel-k/issues/4841) - Use generated trait [\#4811](https://github.com/apache/camel-k/issues/4811) - Pointer to an external schema/CRD [\#4788](https://github.com/apache/camel-k/issues/4788) - Pipe using simple language expressions causing failure [\#4777](https://github.com/apache/camel-k/issues/4777) @@ -46,6 +45,10 @@ **Merged pull requests:** +- update quarkus-native.adoc [\#5190](https://github.com/apache/camel-k/pull/5190) ([bvahdat](https://github.com/bvahdat)) +- chore\(knative\): configure via properties [\#5186](https://github.com/apache/camel-k/pull/5186) ([squakez](https://github.com/squakez)) +- chore\(cmd\): deprecate -d file feature [\#5185](https://github.com/apache/camel-k/pull/5185) ([squakez](https://github.com/squakez)) +- fix\(trait\): service binding [\#5184](https://github.com/apache/camel-k/pull/5184) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/prometheus/common from 0.47.0 to 0.48.0 [\#5177](https://github.com/apache/camel-k/pull/5177) ([dependabot[bot]](https://github.com/apps/dependabot)) - fix\(ctrl\): calculate digest on spec traits [\#5176](https://github.com/apache/camel-k/pull/5176) ([squakez](https://github.com/squakez)) - chore\(deps\): bump go.uber.org/zap from 1.26.0 to 1.27.0 [\#5171](https://github.com/apache/camel-k/pull/5171) ([dependabot[bot]](https://github.com/apps/dependabot)) diff --git a/README.adoc b/README.adoc index 2c022bdea..e335e9edf 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernet image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative;, link="https://github.com/apache/camel-k/actions/workflows/knative.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml;] -image:https://img.shields.io/badge/Coverage-35.8%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] +image:https://img.shields.io/badge/Coverage-36.2%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com;] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider. diff --git a/badge.out b/badge.out index 17294bada..293d863e4 100644 --- a/badge.out +++ b/badge.out @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/coverage b/coverage index 21aa28547..b82d77ecc 100644 --- a/coverage +++ b/coverage @@ -1 +1 @@ -35.8 +36.2 diff --git a/coverage.out b/coverage.out index 4ff6fd19e..e39cddfa5 100644 --- a/coverage.out +++ b/coverage.out @@ -239,6 +239,15 @@ github.com/apache/camel-k/v2/pkg/apis/camel/v1/kamelet_types_support.go:180: github.com/apache/camel-k/v2/pkg/apis/camel/v1/kamelet_types_support.go:184: ValidKameletProperties
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1504961262
##
pkg/cmd/manager/controller.go:
##
@@ -0,0 +1,310 @@
+/*
+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 manager
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/apache/camel-k/v2/pkg/apis"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
+ "go.uber.org/automaxprocs/maxprocs"
+ "go.uber.org/zap"
+ "go.uber.org/zap/zapcore"
+ coordination "k8s.io/api/coordination/v1"
+ corev1 "k8s.io/api/core/v1"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/client-go/rest"
+ "k8s.io/client-go/tools/leaderelection/resourcelock"
+ "k8s.io/client-go/tools/record"
+ "k8s.io/klog/v2"
+ "sigs.k8s.io/controller-runtime/pkg/cache"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/config"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
+ zapctrl "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/manager/signals"
+)
+
+type Manager interface {
+ LoggerSetup() (logutil.Logger, error, string)
+ PrintVersion()
+ GetWatchNamespace() (string, error)
+ CreateBootstrapClient(cfg *rest.Config) (client.Client, error, string)
+ CreateEventBroadcaster(bootstrapClient client.Client, watchNamespace
string, ctx context.Context) (record.EventBroadcaster, error, string)
+ GetControllerNamespaceAndLeaderElection(watchNamespace string,
bootstrapClient client.Client, leaderElection bool, ctx context.Context)
(string, bool, error, string)
+ SetOperatorImage(bootstrapClient client.Client, ctx context.Context)
(error, string)
+ GetManagerOptions(bootstrapClient client.Client, watchNamespace string)
(cache.Options, error, string)
+ CreateManager(healthPort int32, monitoringPort int32, leaderElection
bool, leaderElectionID string, cfg *rest.Config, eventBroadcaster
record.EventBroadcaster, controllerNamespace string, options cache.Options, ctx
context.Context) (manager.Manager, client.Client, error, string)
+ ControllerPreStartResourcesInit(initCtx context.Context,
bootstrapClient client.Client, watchNamespace string, controllerNamespace
string, ctx context.Context, ctrlClient client.Client, mgr manager.Manager)
(error, string)
+}
+
+type ControllerCmd struct {
+ ControllerManager Manager
+}
+
+func (c ControllerCmd) Run(healthPort, monitoringPort int32, leaderElection
bool, leaderElectionID string) (error, string) {
+ log, err, errMessage := c.ControllerManager.LoggerSetup()
+ if err != nil {
+ log.Error(err, errMessage)
+ }
+
+ c.ControllerManager.PrintVersion()
+ // Will only appear if DEBUG level has been enabled using the env var
LOG_LEVEL
+ log.Debug("*** DEBUG level messages will be logged ***")
+
+ watchNamespace, err := c.ControllerManager.GetWatchNamespace()
+ if err != nil {
+ return err, "failed to get watch namespace"
+ }
+
+ cfg, err := config.GetConfig()
+ if err != nil {
+ return err, "cannot get client config"
+ }
+
+ bootstrapClient, err, errMessage :=
c.ControllerManager.CreateBootstrapClient(cfg)
+ if err != nil {
+ return err, errMessage
+ }
+
+ ctx := signals.SetupSignalHandler()
+
+ eventBroadcaster, err, errMessage :=
c.ControllerManager.CreateEventBroadcaster(bootstrapClient, watchNamespace, ctx)
+ if eventBroadcaster != nil {
+ defer eventBroadcaster.Shutdown()
+ }
+ if err != nil {
+ return err, errMessage
+ }
+
+ controllerNamespace, leaderElection, err, errMessage :=
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1504950108
##
pkg/cmd/manager/controller.go:
##
@@ -0,0 +1,310 @@
+/*
+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 manager
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/apache/camel-k/v2/pkg/apis"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
+ "go.uber.org/automaxprocs/maxprocs"
+ "go.uber.org/zap"
+ "go.uber.org/zap/zapcore"
+ coordination "k8s.io/api/coordination/v1"
+ corev1 "k8s.io/api/core/v1"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/client-go/rest"
+ "k8s.io/client-go/tools/leaderelection/resourcelock"
+ "k8s.io/client-go/tools/record"
+ "k8s.io/klog/v2"
+ "sigs.k8s.io/controller-runtime/pkg/cache"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/config"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
+ zapctrl "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/manager/signals"
+)
+
+type Manager interface {
Review Comment:
this and the default implementation should probably be in a dedicated
package, otherwise the operator sub command has to import the manager sub
command
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119:
URL: https://github.com/apache/camel-k/pull/5119#discussion_r1504941598
##
pkg/cmd/manager/controller.go:
##
@@ -0,0 +1,310 @@
+/*
+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 manager
+
+import (
+ "context"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/apache/camel-k/v2/pkg/apis"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
+ "go.uber.org/automaxprocs/maxprocs"
+ "go.uber.org/zap"
+ "go.uber.org/zap/zapcore"
+ coordination "k8s.io/api/coordination/v1"
+ corev1 "k8s.io/api/core/v1"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/client-go/rest"
+ "k8s.io/client-go/tools/leaderelection/resourcelock"
+ "k8s.io/client-go/tools/record"
+ "k8s.io/klog/v2"
+ "sigs.k8s.io/controller-runtime/pkg/cache"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/config"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
+ zapctrl "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/manager/signals"
+)
+
+type Manager interface {
+ LoggerSetup() (logutil.Logger, error, string)
+ PrintVersion()
+ GetWatchNamespace() (string, error)
+ CreateBootstrapClient(cfg *rest.Config) (client.Client, error, string)
+ CreateEventBroadcaster(bootstrapClient client.Client, watchNamespace
string, ctx context.Context) (record.EventBroadcaster, error, string)
+ GetControllerNamespaceAndLeaderElection(watchNamespace string,
bootstrapClient client.Client, leaderElection bool, ctx context.Context)
(string, bool, error, string)
Review Comment:
by convention, `context.Context` is usually the first argument
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix #4948 part of #3397 [camel-k]
lburgazzoli commented on code in PR #5119: URL: https://github.com/apache/camel-k/pull/5119#discussion_r1504936589 ## build/test.log: ## Review Comment: this is likely a file we don't want to include -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Avoid hard coded use of localhost in Google cloud extension tests
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new fdd73156dc Avoid hard coded use of localhost in Google cloud extension
tests
fdd73156dc is described below
commit fdd73156dc7e653d4c38db010995204f512d6474
Author: James Netherton
AuthorDate: Tue Feb 27 14:12:07 2024 +
Avoid hard coded use of localhost in Google cloud extension tests
---
.../quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java | 2 +-
.../quarkus/component/google/storage/it/GoogleStorageResource.java | 7 +++
.../component/google/storage/it/GoogleStorageTestResource.java | 7 +--
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java
b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java
index 7f42af04b5..b7f0a3625d 100644
---
a/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java
+++
b/integration-tests/google-pubsub/src/test/java/org/apache/camel/quarkus/component/google/pubsub/it/GooglePubSubCustomizer.java
@@ -164,7 +164,7 @@ public class GooglePubSubCustomizer implements
GoogleTestEnvCustomizer {
private FixedTransportChannelProvider
createChannelProvider(GoogleCloudContext context) {
ManagedChannel channel = ManagedChannelBuilder
-.forTarget(String.format("%s:%s", "localhost",
container.getFirstMappedPort()))
+.forTarget(String.format("%s:%s", container.getHost(),
container.getFirstMappedPort()))
.usePlaintext()
.build();
diff --git
a/integration-tests/google-storage/src/main/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageResource.java
b/integration-tests/google-storage/src/main/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageResource.java
index 23fa010661..edfb7d938a 100644
---
a/integration-tests/google-storage/src/main/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageResource.java
+++
b/integration-tests/google-storage/src/main/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageResource.java
@@ -59,8 +59,7 @@ public class GoogleStorageResource {
public static final String DIRECT_POLLING = "direct:polling";
-public static final String PARAM_PORT =
"org.apache.camel.quarkus.component.googlr.storage.it.GoogleStorageClientProducer_port";
-
+public static final String GOOGLE_STORAGE_URL_CONFIG_KEY =
"google.storage.url";
public static final String QUERY_OBJECT_NAME = "objectName";
public static final String QUERY_BUCKET = "bucketName";
public static final String QUERY_OPERATION = "operation";
@@ -78,9 +77,9 @@ public class GoogleStorageResource {
Storage storageClient() throws IOException {
Storage storage;
if (GoogleStorageHelper.usingMockBackend()) {
-String port =
ConfigProvider.getConfig().getValue(GoogleStorageResource.PARAM_PORT,
String.class);
+String host =
ConfigProvider.getConfig().getValue(GOOGLE_STORAGE_URL_CONFIG_KEY,
String.class);
storage = StorageOptions.newBuilder()
-.setHost("http://localhost:; + port)
+.setHost(host)
.setProjectId("dummy-project-for-testing")
.build()
.getService();
diff --git
a/integration-tests/google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java
b/integration-tests/google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java
index dbc6e09e14..3a22955f1e 100644
---
a/integration-tests/google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java
+++
b/integration-tests/google-storage/src/test/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageTestResource.java
@@ -22,6 +22,7 @@ import java.util.Map;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import org.apache.camel.quarkus.test.AvailablePortFinder;
import org.eclipse.microprofile.config.ConfigProvider;
+import org.testcontainers.DockerClientFactory;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
@@ -39,13 +40,15 @@ public class GoogleStorageTestResource implements
QuarkusTestResourceLifecycleMa
Map properties = new HashMap<>();
if (GoogleStorageHelper.usingMockBackend()) {
+String url =
Re: [PR] Avoid hard coded use of localhost in Google cloud extension tests [camel-quarkus]
jamesnetherton merged PR #5808: URL: https://github.com/apache/camel-quarkus/pull/5808 -- 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) 02/04: Use correct quarkus-extension-maven-plugin in beanio extension
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 5385110ac82f579fe0a3d751d73e2c168575baf3 Author: James Netherton AuthorDate: Tue Feb 27 11:38:12 2024 + Use correct quarkus-extension-maven-plugin in beanio extension --- extensions-jvm/beanio/runtime/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions-jvm/beanio/runtime/pom.xml b/extensions-jvm/beanio/runtime/pom.xml index 3fa873545a..1b79437afc 100644 --- a/extensions-jvm/beanio/runtime/pom.xml +++ b/extensions-jvm/beanio/runtime/pom.xml @@ -49,7 +49,7 @@ io.quarkus -quarkus-bootstrap-maven-plugin +quarkus-extension-maven-plugin org.apache.maven.plugins
(camel-quarkus) 03/04: Update beanio jvmSince version to 3.8.0
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1202e01cb732fdedeb04bb0d32835b950a3d7b4c
Author: James Netherton
AuthorDate: Tue Feb 27 12:03:57 2024 +
Update beanio jvmSince version to 3.8.0
---
docs/modules/ROOT/examples/dataformats/beanio.yml| 2 +-
docs/modules/ROOT/pages/reference/extensions/beanio.adoc | 4 ++--
extensions-jvm/beanio/runtime/pom.xml| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/modules/ROOT/examples/dataformats/beanio.yml
b/docs/modules/ROOT/examples/dataformats/beanio.yml
index f80a772613..db2e6f7c43 100644
--- a/docs/modules/ROOT/examples/dataformats/beanio.yml
+++ b/docs/modules/ROOT/examples/dataformats/beanio.yml
@@ -5,7 +5,7 @@ cqArtifactIdBase: beanio
cqNativeSupported: false
cqStatus: Preview
cqDeprecated: false
-cqJvmSince: 1.1.0
+cqJvmSince: 3.8.0
cqNativeSince: n/a
cqCamelPartName: beanio
cqCamelPartTitle: BeanIO
diff --git a/docs/modules/ROOT/pages/reference/extensions/beanio.adoc
b/docs/modules/ROOT/pages/reference/extensions/beanio.adoc
index 0a0f4d405e..6b78085800 100644
--- a/docs/modules/ROOT/pages/reference/extensions/beanio.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/beanio.adoc
@@ -9,12 +9,12 @@
:cq-status-deprecation: Preview
:cq-description: Marshal and unmarshal Java beans to and from flat files (such
as CSV, delimited, or fixed length formats).
:cq-deprecated: false
-:cq-jvm-since: 1.1.0
+:cq-jvm-since: 3.8.0
:cq-native-since: n/a
ifeval::[{doc-show-badges} == true]
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.1.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##3.8.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
endif::[]
Marshal and unmarshal Java beans to and from flat files (such as CSV,
delimited, or fixed length formats).
diff --git a/extensions-jvm/beanio/runtime/pom.xml
b/extensions-jvm/beanio/runtime/pom.xml
index 1b79437afc..922323f2e9 100644
--- a/extensions-jvm/beanio/runtime/pom.xml
+++ b/extensions-jvm/beanio/runtime/pom.xml
@@ -31,7 +31,7 @@
Marshal and unmarshal Java beans to and from flat files (such
as CSV, delimited, or fixed length formats).
-1.1.0
+3.8.0
(camel-quarkus) branch 3.8.x updated (af8a44cbdf -> 92d0c2c84d)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from af8a44cbdf update quarkus metadata #5803 (#5804) new b5945d18b1 Move com.squareup.okhttp3:mockwebserver into camel-quarkus-bom new 5385110ac8 Use correct quarkus-extension-maven-plugin in beanio extension new 1202e01cb7 Update beanio jvmSince version to 3.8.0 new 92d0c2c84d Upgrade quarkus-amazon-services to 2.12.1 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: docs/modules/ROOT/examples/dataformats/beanio.yml |2 +- .../ROOT/pages/reference/extensions/beanio.adoc|4 +- extensions-jvm/beanio/runtime/pom.xml |4 +- pom.xml|6 +- poms/bom-test/pom.xml |5 - poms/bom/pom.xml |5 + poms/bom/src/main/generated/flattened-full-pom.xml | 2492 ++-- .../src/main/generated/flattened-reduced-pom.xml | 98 +- .../generated/flattened-reduced-verbose-pom.xml| 282 +-- 9 files changed, 1459 insertions(+), 1439 deletions(-)
(camel-quarkus) 01/04: Move com.squareup.okhttp3:mockwebserver into camel-quarkus-bom
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.8.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b5945d18b1d7b9c63871cd9e24457959388cd25e
Author: James Netherton
AuthorDate: Tue Feb 27 09:51:02 2024 +
Move com.squareup.okhttp3:mockwebserver into camel-quarkus-bom
---
poms/bom-test/pom.xml | 5 -
poms/bom/pom.xml | 5 +
poms/bom/src/main/generated/flattened-full-pom.xml | 5 +
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index 32c7c706cd..514cea7dba 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -70,11 +70,6 @@
import
-
-com.squareup.okhttp3
-mockwebserver
-${okhttp.version}
-
io.quarkiverse.micrometer.registry
quarkus-micrometer-registry-jmx
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index e3a72107d4..074a36ec16 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6322,6 +6322,11 @@
logging-interceptor
${okhttp.version}
+
+com.squareup.okhttp3
+mockwebserver
+${okhttp.version}
+
com.squareup.okio
okio
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 473f8ac670..ed2ee4937c 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6245,6 +6245,11 @@
logging-interceptor
4.12.0
+
+com.squareup.okhttp3
+mockwebserver
+4.12.0
+
com.squareup.okio
okio
Re: [PR] [3.8.x] Backports [camel-quarkus]
jamesnetherton merged PR #5810: URL: https://github.com/apache/camel-quarkus/pull/5810 -- 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
[I] Various guide links have been removed for non-deprecated extensions [camel-quarkus]
holly-cummins opened a new issue, #5814: URL: https://github.com/apache/camel-quarkus/issues/5814 ### Bug description I'm not sure what the best way to handle this is. It looks like some old versions have been removed from the https://camel.apache.org/camel-quarkus/ docs site, which means their pages have dead links. When what's written in the metadata file doesn't point to a live file, I currently do the following to try and help users find the documentation, and avoid dead links: - Rewrite Camel URLs. I try mapping `latest` to `2.16.x` and `2.13.x` (this is a hand-coded list of mappings, so I need to maintain it) - If an extension is marked deprecated, I silently drop the guides link I don't silently drop dead guides link as a general rule, because putting in an incorrect guides link is a common error for extension authors, and I want to catch those cases. The general assumption is that if you put it in the file, it's because you expect it to work. :) For Camel, the current model doesn't seem to be working, so there's a few things I can do. - Add an exception and silently drop dead links for Camel extensions only. This has the drawback that if a guides link on a new extension gets messed up (easily done), no one gets alerted - Silently drop dead links, if an extension is more than (say) a year old. I'd be treating "this hasn't been updated for ages" as an implicit deprecation process. This wouldn't help with, for example, the facebook extension below. It was last updated in October last year, but its documentation seems to have vanished. Atmos was updated in - Continue raising issues, so that the team can review and choose to add the deprecated status. This has the advantage that the deprecated status is useful for users. - Update the camel docs to include an 'archive' section, and I can look in there when mapping guides links - Something else? Here's the links - https://camel.apache.org/camel-quarkus/latest/reference/extensions/johnzon.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/jclouds.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/avro-rpc.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/xstream.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/jbpm.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/rabbitmq.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/milo.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/vm.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/atmos.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/solr.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/corda.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/atlasmap.html - https://camel.apache.org/camel-quarkus/latest/reference/extensions/facebook.html -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Fix
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 b374fedf Fix
b374fedf is described below
commit b374fedf191fca0efd9a2919951bfbc5784f3eef
Author: Marat Gubaidullin
AuthorDate: Tue Feb 27 14:05:22 2024 -0500
Fix
---
karavan-core/test/variables.spec.ts | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/karavan-core/test/variables.spec.ts
b/karavan-core/test/variables.spec.ts
index 0e28a961..a3004554 100644
--- a/karavan-core/test/variables.spec.ts
+++ b/karavan-core/test/variables.spec.ts
@@ -25,7 +25,10 @@ describe('Variables', () => {
it('Find Variables', () => {
const yaml1 =
fs.readFileSync('test/variable1.camel.yaml',{encoding:'utf8', flag:'r'});
const yaml2 =
fs.readFileSync('test/variable2.camel.yaml',{encoding:'utf8', flag:'r'});
-const variables = VariableUtil.findVariables([new IntegrationFile('1',
yaml1), new IntegrationFile('2', yaml2)]);
+const variables = VariableUtil.findVariables([
+new IntegrationFile('variable1.camel.yaml', yaml1)
+, new IntegrationFile('variable2.camel.yaml', yaml2)
+]);
expect(variables.length).to.equal(19);
});
});
\ No newline at end of file
Re: [PR] fix(#5097): Remove secondary IntegrationPlatform in favor of using IntegrationProfile [camel-k]
github-actions[bot] commented on PR #5138: URL: https://github.com/apache/camel-k/pull/5138#issuecomment-1967409618 :warning: Unit test coverage report - coverage decreased from 36.2% to 36% (**-0.2%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) 03/03: Fix
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 1a2e462d574e17a2df85ec489c05c0bd97a53999
Author: Marat Gubaidullin
AuthorDate: Tue Feb 27 14:01:43 2024 -0500
Fix
---
karavan-core/src/core/api/VariableUtil.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/karavan-core/src/core/api/VariableUtil.ts
b/karavan-core/src/core/api/VariableUtil.ts
index 88e9e93a..8887dd67 100644
--- a/karavan-core/src/core/api/VariableUtil.ts
+++ b/karavan-core/src/core/api/VariableUtil.ts
@@ -35,7 +35,8 @@ export class VariableUtil {
}
static findVariables = (files: IntegrationFile[]): string[] => {
-const integrations = files.map(file =>
CamelDefinitionYaml.yamlToIntegration(file.name, file.code));
+const integrations = files.filter(file =>
file.name?.endsWith(".camel.yaml"))
+.map(file => CamelDefinitionYaml.yamlToIntegration(file.name,
file.code));
return VariableUtil.findVariablesInIntegrations(integrations);
};
(camel-karavan) 01/03: security-authorize-web-endpoints-reference
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 774f0d6f00339cc51a046f888bc40ae33f57822f
Author: Marat Gubaidullin
AuthorDate: Tue Feb 27 12:58:22 2024 -0500
security-authorize-web-endpoints-reference
---
karavan-app/src/main/resources/application.properties| 2 +-
karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index 939778f5..a694040d 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -69,7 +69,7 @@ karavan.container-image.registry-password=
quarkus.http.auth.permission.authenticated.paths=/api/*
quarkus.http.auth.permission.authenticated.policy=authenticated
-quarkus.http.auth.permission.public.paths=/public/*,/static/*,/*.map,/*.css,/*.js,/*.png,/*.html,/*.woff2,/*.ico,/robots.txt
+quarkus.http.auth.permission.public.paths=/public/*,/static/*,/robots.txt,/favicon.ico
quarkus.http.auth.permission.public.policy=permit
quarkus.http.auth.permission.public.methods=GET,HEAD,POST
diff --git a/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
b/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
index cd2538fe..61af5453 100644
--- a/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
+++ b/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx
@@ -182,7 +182,7 @@ export function CreateFileModal(props: Props) {
function getFullFileName(name: string, type?: string) {
let extension = ProjectFileTypes.filter(value => value.name ===
type)[0]?.extension;
extension = extension === '*' ? '' : '.' + extension;
-const filename = (extension !== 'java')
+const filename = (extension !== '.java')
? fileNameCheck(name)
: CamelUi.javaNameFromTitle(name);
return filename + (isKamelet ? '-' + kameletType : '') + extension;
(camel-karavan) branch main updated (33c870c5 -> 1a2e462d)
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 33c870c5 Fix new 774f0d6f security-authorize-web-endpoints-reference new 5679b161 Fix new 1a2e462d Fix The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/camel/karavan/service/GitService.java | 6 +-- .../camel/karavan/service/KaravanCacheService.java | 6 +-- .../camel/karavan/service/KaravanService.java | 45 +++--- .../camel/karavan/service/ProjectService.java | 15 ++-- .../src/main/resources/application.properties | 2 +- .../src/main/webui/src/api/ProjectService.ts | 2 - .../webui/src/project/files/CreateFileModal.tsx| 2 +- karavan-core/src/core/api/VariableUtil.ts | 3 +- 8 files changed, 23 insertions(+), 58 deletions(-)
(camel-karavan) 02/03: Fix
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 5679b161f7b96049c8dab494310a194a9cac6437
Author: Marat Gubaidullin
AuthorDate: Tue Feb 27 13:12:25 2024 -0500
Fix
---
.../apache/camel/karavan/service/GitService.java | 6 +--
.../camel/karavan/service/KaravanCacheService.java | 6 +--
.../camel/karavan/service/KaravanService.java | 45 +++---
.../camel/karavan/service/ProjectService.java | 15 ++--
.../src/main/webui/src/api/ProjectService.ts | 2 -
5 files changed, 19 insertions(+), 55 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
index 14da6248..7a4ce07e 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
@@ -24,11 +24,7 @@ import io.smallrye.mutiny.tuples.Tuple2;
import io.vertx.core.Vertx;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import org.apache.camel.karavan.model.GitConfig;
-import org.apache.camel.karavan.model.GitRepo;
-import org.apache.camel.karavan.model.GitRepoFile;
-import org.apache.camel.karavan.model.Project;
-import org.apache.camel.karavan.model.ProjectFile;
+import org.apache.camel.karavan.model.*;
import org.eclipse.jgit.api.*;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRemoteException;
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
index ce2b178b..1c87bd59 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
@@ -24,7 +24,6 @@ import com.hazelcast.map.IMap;
import com.hazelcast.query.Predicate;
import com.hazelcast.query.Predicates;
import io.quarkus.runtime.ShutdownEvent;
-import io.quarkus.vertx.ConsumeEvent;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Singleton;
@@ -42,8 +41,6 @@ import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
-import static org.apache.camel.karavan.service.KaravanService.START_SERVICES;
-
@Default
@Singleton
public class KaravanCacheService {
@@ -62,8 +59,7 @@ public class KaravanCacheService {
public static final String DEFAULT_ENVIRONMENT = "dev";
-@ConsumeEvent(value = START_SERVICES)
-void start(String data) {
+void start() {
LOGGER.info("KaravanCacheService is starting");
Config config = new ClasspathYamlConfig("hazelcast.yaml");
hz = Hazelcast.getOrCreateHazelcastInstance(config);
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
index 353c1b53..3bef1afd 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
@@ -20,7 +20,6 @@ import io.quarkus.runtime.Quarkus;
import io.quarkus.runtime.ShutdownEvent;
import io.quarkus.runtime.Startup;
import io.quarkus.runtime.StartupEvent;
-import io.quarkus.vertx.ConsumeEvent;
import io.vertx.core.eventbus.EventBus;
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
@@ -53,9 +52,10 @@ public class KaravanService implements HealthCheck {
@Inject
ProjectService projectService;
-public static final String START_KUBERNETES_SERVICES =
"START_KUBERNETES_LISTENERS";
-public static final String START_INTERNAL_DOCKER_SERVICES =
"START_INTERNAL_DOCKER_SERVICES";
-public static final String START_SERVICES = "START_SERVICES";
+@Inject
+KaravanCacheService karavanCacheService;
+
+public static final String KARAVAN_STARTED = "KARAVAN_STARTED";
@Override
public HealthCheckResponse call() {
@@ -63,44 +63,27 @@ public class KaravanService implements HealthCheck {
}
void onStart(@Observes StartupEvent ev) throws Exception {
-if (!ConfigService.inKubernetes()) {
-eventBus.publish(START_INTERNAL_DOCKER_SERVICES, null);
-} else {
-eventBus.publish(START_KUBERNETES_SERVICES, null);
-}
-eventBus.publish(START_SERVICES, null);
-}
-
-@ConsumeEvent(value = START_INTERNAL_DOCKER_SERVICES, blocking = true)
-void startInternalDockerServices(String data) throws Exception {
-LOGGER.info("Starting Karavan in Docker");
-if (!dockerService.checkDocker()){
+
(camel) branch kit-bedrock deleted (was 591f6d9b9b4)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch kit-bedrock in repository https://gitbox.apache.org/repos/asf/camel.git was 591f6d9b9b4 Camel-AWS-Bedrock: Added to kit The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Camel AWS Bedrock: Added to Kit (#13332)
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
The following commit(s) were added to refs/heads/main by this push:
new 5dc0a9dc288 Camel AWS Bedrock: Added to Kit (#13332)
5dc0a9dc288 is described below
commit 5dc0a9dc2886dd30da79b82f3cb3dc4a5a72bf37
Author: Andrea Cosentino
AuthorDate: Tue Feb 27 19:55:22 2024 +0100
Camel AWS Bedrock: Added to Kit (#13332)
* Camel-AWS-Bedrock: Added to MojoHelper
Signed-off-by: Andrea Cosentino
* Camel-AWS-Bedrock: Added to kit
Signed-off-by: Andrea Cosentino
* Camel-AWS-Bedrock: Added to kit
Signed-off-by: Andrea Cosentino
-
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/catalog/components.properties | 1 +
.../camel/catalog/components/aws-bedrock.json | 77 +++
.../apache/camel/catalog/main/sensitive-keys.json | 1 +
.../org/apache/camel/main/components.properties| 1 +
.../java/org/apache/camel/util/SensitiveUtils.java | 2 +
.../component/ComponentsBuilderFactory.java| 13 +
.../dsl/AwsBedrockComponentBuilderFactory.java | 488 +++
.../src/generated/resources/metadata.json | 23 +
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/EndpointBuilders.java | 1 +
.../builder/endpoint/StaticEndpointBuilders.java | 43 ++
.../dsl/BedrockEndpointBuilderFactory.java | 679 +
.../camel-component-known-dependencies.properties | 1 +
.../camel/kotlin/components/AwsBedrockUriDsl.kt| 155 +
.../apache/camel/maven/packaging/MojoHelper.java | 2 +-
15 files changed, 1487 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index f5f6b8a8483..964b2197cc9 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -6,6 +6,7 @@ asterisk
atmosphere-websocket
atom
avro
+aws-bedrock
aws-cloudtrail
aws-config
aws-secrets-manager
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock.json
new file mode 100644
index 000..85c01b88d9a
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock.json
@@ -0,0 +1,77 @@
+{
+ "component": {
+"kind": "component",
+"name": "aws-bedrock",
+"title": "AWS Bedrock",
+"description": "Invoke Model of AWS Bedrock service.",
+"deprecated": false,
+"firstVersion": "4.5.0",
+"label": "ai,cloud",
+"javaType": "org.apache.camel.component.aws2.bedrock.BedrockComponent",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel",
+"artifactId": "camel-aws-bedrock",
+"version": "4.5.0-SNAPSHOT",
+"scheme": "aws-bedrock",
+"extendsScheme": "",
+"syntax": "aws-bedrock:label",
+"async": false,
+"api": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false,
+"remote": true
+ },
+ "componentProperties": {
+"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.bedrock.BedrockConfiguration", "deprecated":
false, "autowired": false, "secret": false, "description": "Component
configuration" },
+"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
+"modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.bedrock.BedrockConfiguration",
"configurationField": "configuration", "description": "Define the model Id we
are going to use" },
+"operation": { "index": 3, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
Re: [PR] Camel AWS Bedrock: Added to Kit [camel]
oscerd merged PR #13332: URL: https://github.com/apache/camel/pull/13332 -- 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 kit-bedrock updated (e0b9bb5212c -> 591f6d9b9b4)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch kit-bedrock in repository https://gitbox.apache.org/repos/asf/camel.git from e0b9bb5212c Camel-AWS-Bedrock: Added to kit add 591f6d9b9b4 Camel-AWS-Bedrock: Added to kit No new revisions were added by this update. Summary of changes: core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] fix(#5097): Remove secondary IntegrationPlatform in favor of using IntegrationProfile [camel-k]
christophd commented on PR #5138: URL: https://github.com/apache/camel-k/pull/5138#issuecomment-1967359750 > LGTM. Might be a good idea to regenerate the CRDs. @gansheer I did a `make generate` and `make bundle` - am I missing something else? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(ctrl): address changes during phase transition [camel-k]
lburgazzoli commented on code in PR #5180:
URL: https://github.com/apache/camel-k/pull/5180#discussion_r1504706590
##
pkg/util/digest/digest.go:
##
@@ -108,10 +108,16 @@ func ComputeForIntegration(integration *v1.Integration,
configmaps []*corev1.Con
// Calculation logic prior to 1.10.0 (the new Traits API schema) is
maintained
// in order to keep consistency in the digest calculated from the same
set of
// Trait configurations for backward compatibility.
- traitsMap, err := toMap(integration.Spec.Traits)
+ traits := integration.Spec.Traits.DeepCopy()
+ // Merge with executed traits
+ if err := traits.Merge(integration.Status.Traits); err != nil {
Review Comment:
So what I'm talking about is that, if a spec trait value changes, and the
same trait is set in the status, then the digest won't change as the status one
overrides the spec one so the test below, fails:
```go
func TestSpecStatusDrift(t *testing.T) {
it := v1.Integration{}
it.Spec.Traits.Camel = {}
it.Status.Traits.Camel = {}
it.Spec.Traits.Camel.Properties = []string{"hello=world1"}
d1, _ := ComputeForIntegration(, nil, nil)
it.Status.Traits.Camel.Properties = []string{"hello=world2"}
d2, _ := ComputeForIntegration(, nil, nil)
it.Spec.Traits.Camel.Properties = []string{"hello=world3"}
d3, _ := ComputeForIntegration(, nil, nil)
assert.NotEqual(t, d2, d1, "d2 must not be equal to d1")
assert.NotEqual(t, d3, d2, "d3 must not be equal to d2")
}
```
```
=== RUN TestSpecStatusDrift
digest_test.go:250:
Error Trace:
/home/luca/work/dev/camel-k/pkg/util/digest/digest_test.go:250
Error: Should not be:
"vZ9xT9oBngdDxEgHDEWFW2xqeq-rhHJK2zi-qNruAf-U"
Test: TestSpecStatusDrift
Messages: d3 must not be equal to d2
--- FAIL: TestSpecStatusDrift (0.00s)
```
So it may be possible that is fine for phase transitions, but the method
should be correct regardless where/when it is used also because this digest
ends up being projected as a container env var.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix(ctrl): address changes during phase transition [camel-k]
lburgazzoli commented on PR #5180: URL: https://github.com/apache/camel-k/pull/5180#issuecomment-1967312309 A side note, since the digest ends up begin[ projected as a container env var](https://github.com/apache/camel-k/blob/9c058daa180106fb5b770558f9b553b7bfb9d2ef/pkg/trait/container.go#L181), computing the digest from traits has a number of side effects, as example by enabling/disabling the creation of a route or service, would lead to the container to be restarted which is not expected. Reported as an issue here https://github.com/apache/camel-k/issues/5192 -- 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
[I] Revuew integration digest computation and projection to the integration container as env var [camel-k]
lburgazzoli opened a new issue, #5192: URL: https://github.com/apache/camel-k/issues/5192 ### What happened? Since an integration digest ends up begin [projected as a container env var](https://github.com/apache/camel-k/blob/9c058daa180106fb5b770558f9b553b7bfb9d2ef/pkg/trait/container.go#L181), [including the traits when computing the digest](https://github.com/apache/camel-k/blob/9c058daa180106fb5b770558f9b553b7bfb9d2ef/pkg/util/digest/digest.go#L111) has a number of side effects, as example by enabling/disabling the creation of a route or service, would lead to the container to be restarted which is not expected. ### Steps to reproduce _No response_ ### Relevant log output _No response_ ### Camel K version _No response_ -- 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
Re: [PR] Camel AWS Bedrock: Added to Kit [camel]
github-actions[bot] commented on PR #13332: URL: https://github.com/apache/camel/pull/13332#issuecomment-1967309029 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Camel AWS Bedrock: Added to Kit [camel]
oscerd commented on PR #13332: URL: https://github.com/apache/camel/pull/13332#issuecomment-1967308309 /component-test aws -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Camel AWS Bedrock: Added to Kit [camel]
github-actions[bot] commented on PR #13332: URL: https://github.com/apache/camel/pull/13332#issuecomment-1967304924 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Camel AWS Bedrock: Added to Kit [camel]
oscerd opened a new pull request, #13332: URL: https://github.com/apache/camel/pull/13332 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 02/02: Camel-AWS-Bedrock: Added to kit
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kit-bedrock
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e0b9bb5212cd2d8a0cd23d02ae709381bb625e9c
Author: Andrea Cosentino
AuthorDate: Tue Feb 27 18:57:30 2024 +0100
Camel-AWS-Bedrock: Added to kit
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/catalog/components.properties | 1 +
.../camel/catalog/components/aws-bedrock.json | 77 +++
.../apache/camel/catalog/main/sensitive-keys.json | 1 +
.../org/apache/camel/main/components.properties| 1 +
.../java/org/apache/camel/util/SensitiveUtils.java | 4 +-
.../component/ComponentsBuilderFactory.java| 13 +
.../dsl/AwsBedrockComponentBuilderFactory.java | 488 +++
.../src/generated/resources/metadata.json | 23 +
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/EndpointBuilders.java | 1 +
.../builder/endpoint/StaticEndpointBuilders.java | 43 ++
.../dsl/BedrockEndpointBuilderFactory.java | 679 +
.../camel-component-known-dependencies.properties | 1 +
.../camel/kotlin/components/AwsBedrockUriDsl.kt| 155 +
14 files changed, 1487 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index f5f6b8a8483..964b2197cc9 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -6,6 +6,7 @@ asterisk
atmosphere-websocket
atom
avro
+aws-bedrock
aws-cloudtrail
aws-config
aws-secrets-manager
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock.json
new file mode 100644
index 000..85c01b88d9a
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-bedrock.json
@@ -0,0 +1,77 @@
+{
+ "component": {
+"kind": "component",
+"name": "aws-bedrock",
+"title": "AWS Bedrock",
+"description": "Invoke Model of AWS Bedrock service.",
+"deprecated": false,
+"firstVersion": "4.5.0",
+"label": "ai,cloud",
+"javaType": "org.apache.camel.component.aws2.bedrock.BedrockComponent",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel",
+"artifactId": "camel-aws-bedrock",
+"version": "4.5.0-SNAPSHOT",
+"scheme": "aws-bedrock",
+"extendsScheme": "",
+"syntax": "aws-bedrock:label",
+"async": false,
+"api": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false,
+"remote": true
+ },
+ "componentProperties": {
+"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.bedrock.BedrockConfiguration", "deprecated":
false, "autowired": false, "secret": false, "description": "Component
configuration" },
+"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
+"modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.bedrock.BedrockConfiguration",
"configurationField": "configuration", "description": "Define the model Id we
are going to use" },
+"operation": { "index": 3, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType": "org.apache.camel.component.aws2.bedrock.BedrockOperations",
"enum": [ "invokeTextModel" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.BedrockConfiguration",
"configurationField": "configuration", "description": "The operation to [...]
+"overrideEndpoint": { "index": 4, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean",
(camel) branch kit-bedrock created (now e0b9bb5212c)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch kit-bedrock in repository https://gitbox.apache.org/repos/asf/camel.git at e0b9bb5212c Camel-AWS-Bedrock: Added to kit This branch includes the following new commits: new 07662ec8815 Camel-AWS-Bedrock: Added to MojoHelper new e0b9bb5212c Camel-AWS-Bedrock: Added to kit The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/02: Camel-AWS-Bedrock: Added to MojoHelper
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kit-bedrock
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 07662ec8815e1497f5a22043a0c35130472bbaa5
Author: Andrea Cosentino
AuthorDate: Tue Feb 27 18:45:16 2024 +0100
Camel-AWS-Bedrock: Added to MojoHelper
Signed-off-by: Andrea Cosentino
---
.../src/main/java/org/apache/camel/maven/packaging/MojoHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
index b62dfad09c9..a2f85b5f116 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java
@@ -89,7 +89,7 @@ public final class MojoHelper {
dir.resolve("camel-aws2-sts"),
dir.resolve("camel-aws2-timestream"),
dir.resolve("camel-aws2-translate"),
dir.resolve("camel-aws-xray"),
dir.resolve("camel-aws-secrets-manager"),
-dir.resolve("camel-aws-cloudtrail"),
dir.resolve("camel-aws-config"));
+dir.resolve("camel-aws-cloudtrail"),
dir.resolve("camel-aws-config"), dir.resolve("camel-aws-bedrock"));
case "camel-vertx":
return Arrays.asList(dir.resolve("camel-vertx"),
dir.resolve("camel-vertx-http"),
Re: [PR] fix(ctrl): address changes during phase transition [camel-k]
lburgazzoli commented on code in PR #5180:
URL: https://github.com/apache/camel-k/pull/5180#discussion_r1504706590
##
pkg/util/digest/digest.go:
##
@@ -108,10 +108,16 @@ func ComputeForIntegration(integration *v1.Integration,
configmaps []*corev1.Con
// Calculation logic prior to 1.10.0 (the new Traits API schema) is
maintained
// in order to keep consistency in the digest calculated from the same
set of
// Trait configurations for backward compatibility.
- traitsMap, err := toMap(integration.Spec.Traits)
+ traits := integration.Spec.Traits.DeepCopy()
+ // Merge with executed traits
+ if err := traits.Merge(integration.Status.Traits); err != nil {
Review Comment:
So what I'm talking about is that, if a spec trait value changes, and the
same trait is set in the status, then the digest won't change as the status one
overrides the spec one so the test below, fails:
```go
func TestSpecStatusDrift(t *testing.T) {
it := v1.Integration{}
it.Spec.Traits.Camel = {}
it.Status.Traits.Camel = {}
it.Spec.Traits.Camel.Properties = []string{"hello=world1"}
d1, _ := ComputeForIntegration(, nil, nil)
it.Status.Traits.Camel.Properties = []string{"hello=world2"}
d2, _ := ComputeForIntegration(, nil, nil)
it.Spec.Traits.Camel.Properties = []string{"hello=world3"}
d3, _ := ComputeForIntegration(, nil, nil)
assert.NotEqual(t, d2, d1, "d2 must not be equal to d1")
assert.NotEqual(t, d3, d2, "d3 must not be equal to d2")
}
```
```
=== RUN TestSpecStatusDrift
digest_test.go:250:
Error Trace:
/home/luca/work/dev/camel-k/pkg/util/digest/digest_test.go:250
Error: Should not be:
"vZ9xT9oBngdDxEgHDEWFW2xqeq-rhHJK2zi-qNruAf-U"
Test: TestSpecStatusDrift
Messages: d3 must not be equal to d2
--- FAIL: TestSpecStatusDrift (0.00s)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] fix(ctrl): address changes during phase transition [camel-k]
lburgazzoli commented on code in PR #5180:
URL: https://github.com/apache/camel-k/pull/5180#discussion_r1504706590
##
pkg/util/digest/digest.go:
##
@@ -108,10 +108,16 @@ func ComputeForIntegration(integration *v1.Integration,
configmaps []*corev1.Con
// Calculation logic prior to 1.10.0 (the new Traits API schema) is
maintained
// in order to keep consistency in the digest calculated from the same
set of
// Trait configurations for backward compatibility.
- traitsMap, err := toMap(integration.Spec.Traits)
+ traits := integration.Spec.Traits.DeepCopy()
+ // Merge with executed traits
+ if err := traits.Merge(integration.Status.Traits); err != nil {
Review Comment:
So what I'm talking about is that, if a spec trait value changes, and the
same trait is set in the status, then the digest won't change so the test
below, fails:
```go
func TestSpecStatusDrift(t *testing.T) {
it := v1.Integration{}
it.Spec.Traits.Camel = {}
it.Status.Traits.Camel = {}
it.Spec.Traits.Camel.Properties = []string{"hello=world1"}
d1, _ := ComputeForIntegration(, nil, nil)
it.Status.Traits.Camel.Properties = []string{"hello=world2"}
d2, _ := ComputeForIntegration(, nil, nil)
it.Spec.Traits.Camel.Properties = []string{"hello=world3"}
d3, _ := ComputeForIntegration(, nil, nil)
assert.NotEqual(t, d2, d1, "d2 must not be equal to d1")
assert.NotEqual(t, d3, d2, "d3 must not be equal to d2")
}
```
```
=== RUN TestSpecStatusDrift
digest_test.go:250:
Error Trace:
/home/luca/work/dev/camel-k/pkg/util/digest/digest_test.go:250
Error: Should not be:
"vZ9xT9oBngdDxEgHDEWFW2xqeq-rhHJK2zi-qNruAf-U"
Test: TestSpecStatusDrift
Messages: d3 must not be equal to d2
--- FAIL: TestSpecStatusDrift (0.00s)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-spring-boot) branch CAMEL-20467 deleted (was 145a5fe80a0)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20467 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 145a5fe80a0 CAMEL-20467 - Camel AWS Bedrock: Create Spring Boot starter The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-spring-boot) branch main updated: CAMEL-20467 - Camel AWS Bedrock: Create Spring Boot starter (#1095)
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 532341dca84 CAMEL-20467 - Camel AWS Bedrock: Create Spring Boot
starter (#1095)
532341dca84 is described below
commit 532341dca840373b822476b6aa40821f73d37e9b
Author: Andrea Cosentino
AuthorDate: Tue Feb 27 18:50:50 2024 +0100
CAMEL-20467 - Camel AWS Bedrock: Create Spring Boot starter (#1095)
Signed-off-by: Andrea Cosentino
---
.../camel/springboot/catalog/components.properties | 1 +
.../springboot/catalog/components/aws-bedrock.json | 77 +
.../catalog/components/platform-http.json | 29 +-
.../camel-aws-bedrock-starter/pom.xml | 56
.../src/main/docs/aws-bedrock.json | 178 +++
.../BedrockComponentAutoConfiguration.java | 77 +
.../springboot/BedrockComponentConfiguration.java | 350 +
.../springboot/BedrockComponentConverter.java | 65
.../src/main/resources/META-INF/LICENSE.txt| 203
.../src/main/resources/META-INF/NOTICE.txt | 11 +
...rk.boot.autoconfigure.AutoConfiguration.imports | 19 ++
components-starter/pom.xml | 1 +
.../itest/springboot/CamelAwsBedrockTest.java | 48 +++
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 10 +
15 files changed, 1119 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index d0502ea88bd..ecc7f827abd 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -8,6 +8,7 @@ atlasmap
atmosphere-websocket
atom
avro
+aws-bedrock
aws-cloudtrail
aws-config
aws-secrets-manager
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
new file mode 100644
index 000..f937e818654
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
@@ -0,0 +1,77 @@
+{
+ "component": {
+"kind": "component",
+"name": "aws-bedrock",
+"title": "AWS Bedrock",
+"description": "Invoke Model of AWS Bedrock service.",
+"deprecated": false,
+"firstVersion": "4.5.0",
+"label": "ai,cloud",
+"javaType": "org.apache.camel.component.aws2.bedrock.BedrockComponent",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-aws-bedrock-starter",
+"version": "4.5.0-SNAPSHOT",
+"scheme": "aws-bedrock",
+"extendsScheme": "",
+"syntax": "aws-bedrock:label",
+"async": false,
+"api": false,
+"consumerOnly": false,
+"producerOnly": true,
+"lenientProperties": false,
+"remote": true
+ },
+ "componentProperties": {
+"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.bedrock.BedrockConfiguration", "deprecated":
false, "autowired": false, "secret": false, "description": "Component
configuration" },
+"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
+"modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.bedrock.BedrockConfiguration",
"configurationField": "configuration", "description": "Define the model Id we
are going to use" },
+"operation": { "index": 3, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
Re: [PR] CAMEL-20467 - Camel AWS Bedrock: Create Spring Boot starter [camel-spring-boot]
oscerd merged PR #1095: URL: https://github.com/apache/camel-spring-boot/pull/1095 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) branch CAMEL-20467 created (now 145a5fe80a0)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20467 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 145a5fe80a0 CAMEL-20467 - Camel AWS Bedrock: Create Spring Boot starter No new revisions were added by this update.
[I] Missing images in metadata for facebook and hdfs Quarkus extensions [camel-quarkus]
holly-cummins opened a new issue, #5813: URL: https://github.com/apache/camel-quarkus/issues/5813 ### Bug description Missing image: https://camel.apache.org/_/img/logo-d-f21b25ba38.svg The problem image was found on these artifacts: [org.apache.camel.quarkus:camel-quarkus-facebook::jar:3.6.0, org.apache.camel.quarkus:camel-quarkus-hdfs::jar:3.6.0] (I know they're unlisted, but we still validate the metadata. We also, at the moment, validate the image links for deprecated extensions. We *don't* validate the guides links on deprecated extensions, since, by definition, their content may be a bit stale. Let me know if you want to extend the same logic to images for deprecated extensions - although that wouldn't actually affect these two cases.) -- 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
Re: [PR] chore(knative): configure via properties [camel-k]
lburgazzoli commented on PR #5186: URL: https://github.com/apache/camel-k/pull/5186#issuecomment-1967175001 it is more for knowledge sharing so everyone knows why we merged something with failing tests and we can check the issue to be solved when moving to the new architecture -- 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 (f7259281e72 -> eb5f038bece)
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 f7259281e72 Camel-AWS-Bedrock - Fixed artifact name (#13330) add 38e00673e41 Perform a full regen during PR build add eb5f038bece Regen No new revisions were added by this update. Summary of changes: .github/workflows/pr-build-main.yml| 2 +- .../modules/eips/examples/json/batchConfig.json| 1 + .../modules/eips/examples/json/contextScan.json| 1 - .../eips/examples/json/customLoadBalancer.json | 1 + .../docs/modules/eips/examples/json/doCatch.json | 1 - .../docs/modules/eips/examples/json/doFinally.json | 1 - .../docs/modules/eips/examples/json/doTry.json | 1 - .../modules/eips/examples/json/errorHandler.json | 1 - .../docs/modules/eips/examples/json/failover.json | 1 + .../modules/eips/examples/json/globalOption.json | 1 - .../modules/eips/examples/json/globalOptions.json | 1 - .../docs/modules/eips/examples/json/inputType.json | 1 - .../docs/modules/eips/examples/json/intercept.json | 1 - .../modules/eips/examples/json/interceptFrom.json | 1 - .../examples/json/interceptSendToEndpoint.json | 1 - .../docs/modules/eips/examples/json/marshal.json | 1 - .../modules/eips/examples/json/onCompletion.json | 1 - .../modules/eips/examples/json/onException.json| 1 - .../examples/json/optimisticLockRetryPolicy.json | 1 - .../modules/eips/examples/json/outputType.json | 1 - .../modules/eips/examples/json/packageScan.json| 1 - .../docs/modules/eips/examples/json/policy.json| 1 - .../docs/modules/eips/examples/json/property.json | 1 - .../eips/examples/json/propertyExpression.json | 1 - .../docs/modules/eips/examples/json/random.json| 1 + .../eips/examples/json/redeliveryPolicy.json | 1 - .../modules/eips/examples/json/restContextRef.json | 1 - .../modules/eips/examples/json/roundRobin.json | 1 + .../docs/modules/eips/examples/json/route.json | 1 - .../modules/eips/examples/json/routeBuilder.json | 1 - .../eips/examples/json/routeConfiguration.json | 1 - .../json/routeConfigurationContextRef.json | 1 - .../eips/examples/json/routeConfigurations.json| 1 - .../eips/examples/json/routeContextRef.json| 1 - .../modules/eips/examples/json/routeTemplate.json | 1 - .../examples/json/routeTemplateContextRef.json | 1 - .../modules/eips/examples/json/routeTemplates.json | 1 - .../docs/modules/eips/examples/json/routes.json| 1 - .../modules/eips/examples/json/serviceCall.json| 1 + .../eips/examples/json/setExchangePattern.json | 1 - .../docs/modules/eips/examples/json/sticky.json| 1 + .../modules/eips/examples/json/streamConfig.json | 1 + .../modules/eips/examples/json/templateBean.json | 1 - .../eips/examples/json/templateParameter.json | 1 - .../modules/eips/examples/json/templatedRoute.json | 1 - .../eips/examples/json/templatedRouteBean.json | 1 - .../examples/json/templatedRouteParameter.json | 1 - .../eips/examples/json/templatedRoutes.json| 1 - .../eips/examples/json/threadPoolProfile.json | 1 - .../modules/eips/examples/json/throwException.json | 1 - .../docs/modules/eips/examples/json/topic.json | 1 + .../modules/eips/examples/json/transacted.json | 1 - .../docs/modules/eips/examples/json/unmarshal.json | 1 - .../docs/modules/eips/examples/json/value.json | 1 - .../docs/modules/eips/examples/json/weighted.json | 1 + .../eips/examples/json/whenSkipSendToEndpoint.json | 1 - docs/.yarn/install-state.gz| Bin 502984 -> 503000 bytes .../json/application-cloudevents-json.json | 1 - .../ROOT/examples/json/application-json.json | 1 - .../examples/json/application-x-java-object.json | 1 - .../ROOT/examples/json/application-x-struct.json | 1 - .../modules/ROOT/examples/json/avro-binary.json| 1 - .../ROOT/examples/json/avro-x-java-object.json | 1 - .../modules/ROOT/examples/json/avro-x-struct.json | 1 - .../aws-cloudtrail-application-cloudevents.json| 1 - .../examples/json/aws2-ddb-application-json.json | 1 - .../aws2-ddbstream-application-cloudevents.json| 1 - .../json/aws2-kinesis-application-cloudevents.json | 1 - .../json/aws2-s3-application-cloudevents.json | 1 - .../json/aws2-sqs-application-cloudevents.json | 1 - .../azure-cosmosdb-application-cloudevents.json| 1 - .../azure-eventhubs-application-cloudevents.json | 1 - .../json/azure-files-application-cloudevents.json | 1 - .../azure-servicebus-application-cloudevents.json | 1 - ...azure-storage-blob-application-cloudevents.json | 1 - ...zure-storage-queue-application-cloudevents.json | 1 -
Re: [PR] chore(knative): configure via properties [camel-k]
squakez commented on PR #5186: URL: https://github.com/apache/camel-k/pull/5186#issuecomment-1967143408 > do we have an issue to track the flaky test ? Probably not. This is happening because some sync problem in github actions OS when running the --dev and watching files. We've planned to deprecate the `kamel run`, so, feel free to log an issue if you think it deserves attention. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(knative): configure via properties [camel-k]
lburgazzoli commented on PR #5186: URL: https://github.com/apache/camel-k/pull/5186#issuecomment-1967119380 do we have an issue to track the flaky test ? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 01/02: Perform a full regen during PR build
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 38e00673e41e5213804b9fd7e27f12b5ce86e34a
Author: Guillaume Nodet
AuthorDate: Tue Feb 27 07:19:39 2024 +0100
Perform a full regen during PR build
---
.github/workflows/pr-build-main.yml | 2 +-
docs/gulpfile.js| 8
docs/pom.xml| 2 +-
dsl/camel-endpointdsl/pom.xml | 14 -
etc/scripts/regen.sh| 40 -
5 files changed, 23 insertions(+), 43 deletions(-)
diff --git a/.github/workflows/pr-build-main.yml
b/.github/workflows/pr-build-main.yml
index 13752ab9ac3..3571d9a123b 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -55,7 +55,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
-run: ./mvnw -l build.log -Dquickly install
+run: ./etc/scripts/regen.sh > build.log 2>&1
- name: archive logs
uses: actions/upload-artifact@v4
if: always()
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index b1c95e2e1b2..7858f78442b 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -114,7 +114,7 @@ const sources = {
},
json: {
source: [
-
'../components/{*,*/*,*/*/*}/src/generated/resources/org/apache/camel/**/*.json',
+
'../components/{*,*/*,*/*/*}/src/generated/resources/META-INF/org/apache/camel/**/*.json',
],
destination: 'components/modules/ROOT/examples/json',
filter: (content) => JSON.parse(content).component, // check if there is
a "component" key at the root
@@ -194,7 +194,7 @@ const sources = {
},
json: {
source: [
-
'../core/camel-core-model/src/generated/resources/org/apache/camel/model/**/*.json',
+
'../core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/**/*.json',
],
destination:
'../core/camel-core-engine/src/main/docs/modules/eips/examples/json',
filter: (content) => {
@@ -271,7 +271,7 @@ const tasks = Array.from(sourcesMap).flatMap(([type,
definition]) => {
// by default that's only index.adoc, index.adoc is not symlinked
// so we don't want to remove it
const clean = (destination, keep) => {
-const deleteAry = [`${destination}/*`] // files in destination needs to be
deleted
+const deleteAry = [`${destination}/*`] // files in destination needs to be
deleted */
// append any exceptions, i.e. files to keep at the destination
deleteAry.push(...(keep || ['index.adoc']).map((file) =>
`!${destination}/${file}`))
return deleteAsync(deleteAry, {
@@ -346,7 +346,7 @@ const tasks = Array.from(sourcesMap).flatMap(([type,
definition]) => {
// creates symlinks from source to destination for every example
// file referenced from .adoc file in the source maintaining the
- // basedir from the file path, i.e. symlinking from a deep hiearchy
+ // basedir from the file path, i.e. symlinking from a deep hierarchy
const createExampleSymlinks = (source, destination) => {
const extractExamples = function (file, enc, done) {
const asciidoc = file.contents.toString()
diff --git a/docs/pom.xml b/docs/pom.xml
index 393b574c18d..5f15fbfbae5 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -93,7 +93,7 @@
-full
+regen
!quickly
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index a18e39da1b6..0374dfb1073 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -185,7 +185,7 @@
-full
+regen
!quickly
@@ -207,6 +207,18 @@
+
+
+
+
+full
+
+
+!quickly
+
+
+
+
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/etc/scripts/regen.sh b/etc/scripts/regen.sh
index 31da1e11452..1693627e08f 100755
--- a/etc/scripts/regen.sh
+++ b/etc/scripts/regen.sh
@@ -16,46 +16,14 @@
# limitations under the License.
#
-if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
-echo "Error: Bash 4 or higher is required to run this script, but found
${BASH_VERSINFO}"
-exit 1
-fi
-
-shopt -s globstar
-
-CAMEL_DIR=$(cd `dirname "$0"`/../..; pwd)
-cd $CAMEL_DIR
+# Move to top directory
+cd `dirname "$0"`/../..
# Force clean
git clean -fdx
rm -Rf **/src/generated/
# Regenerate everything
-./mvnw -Pfull,update-camel-releases -DskipTests package
+./mvnw
(camel) branch main updated (f7259281e72 -> eb5f038bece)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from f7259281e72 Camel-AWS-Bedrock - Fixed artifact name (#13330) new 38e00673e41 Perform a full regen during PR build new eb5f038bece 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: .github/workflows/pr-build-main.yml| 2 +- .../modules/eips/examples/json/batchConfig.json| 1 + .../modules/eips/examples/json/contextScan.json| 1 - .../eips/examples/json/customLoadBalancer.json | 1 + .../docs/modules/eips/examples/json/doCatch.json | 1 - .../docs/modules/eips/examples/json/doFinally.json | 1 - .../docs/modules/eips/examples/json/doTry.json | 1 - .../modules/eips/examples/json/errorHandler.json | 1 - .../docs/modules/eips/examples/json/failover.json | 1 + .../modules/eips/examples/json/globalOption.json | 1 - .../modules/eips/examples/json/globalOptions.json | 1 - .../docs/modules/eips/examples/json/inputType.json | 1 - .../docs/modules/eips/examples/json/intercept.json | 1 - .../modules/eips/examples/json/interceptFrom.json | 1 - .../examples/json/interceptSendToEndpoint.json | 1 - .../docs/modules/eips/examples/json/marshal.json | 1 - .../modules/eips/examples/json/onCompletion.json | 1 - .../modules/eips/examples/json/onException.json| 1 - .../examples/json/optimisticLockRetryPolicy.json | 1 - .../modules/eips/examples/json/outputType.json | 1 - .../modules/eips/examples/json/packageScan.json| 1 - .../docs/modules/eips/examples/json/policy.json| 1 - .../docs/modules/eips/examples/json/property.json | 1 - .../eips/examples/json/propertyExpression.json | 1 - .../docs/modules/eips/examples/json/random.json| 1 + .../eips/examples/json/redeliveryPolicy.json | 1 - .../modules/eips/examples/json/restContextRef.json | 1 - .../modules/eips/examples/json/roundRobin.json | 1 + .../docs/modules/eips/examples/json/route.json | 1 - .../modules/eips/examples/json/routeBuilder.json | 1 - .../eips/examples/json/routeConfiguration.json | 1 - .../json/routeConfigurationContextRef.json | 1 - .../eips/examples/json/routeConfigurations.json| 1 - .../eips/examples/json/routeContextRef.json| 1 - .../modules/eips/examples/json/routeTemplate.json | 1 - .../examples/json/routeTemplateContextRef.json | 1 - .../modules/eips/examples/json/routeTemplates.json | 1 - .../docs/modules/eips/examples/json/routes.json| 1 - .../modules/eips/examples/json/serviceCall.json| 1 + .../eips/examples/json/setExchangePattern.json | 1 - .../docs/modules/eips/examples/json/sticky.json| 1 + .../modules/eips/examples/json/streamConfig.json | 1 + .../modules/eips/examples/json/templateBean.json | 1 - .../eips/examples/json/templateParameter.json | 1 - .../modules/eips/examples/json/templatedRoute.json | 1 - .../eips/examples/json/templatedRouteBean.json | 1 - .../examples/json/templatedRouteParameter.json | 1 - .../eips/examples/json/templatedRoutes.json| 1 - .../eips/examples/json/threadPoolProfile.json | 1 - .../modules/eips/examples/json/throwException.json | 1 - .../docs/modules/eips/examples/json/topic.json | 1 + .../modules/eips/examples/json/transacted.json | 1 - .../docs/modules/eips/examples/json/unmarshal.json | 1 - .../docs/modules/eips/examples/json/value.json | 1 - .../docs/modules/eips/examples/json/weighted.json | 1 + .../eips/examples/json/whenSkipSendToEndpoint.json | 1 - docs/.yarn/install-state.gz| Bin 502984 -> 503000 bytes .../json/application-cloudevents-json.json | 1 - .../ROOT/examples/json/application-json.json | 1 - .../examples/json/application-x-java-object.json | 1 - .../ROOT/examples/json/application-x-struct.json | 1 - .../modules/ROOT/examples/json/avro-binary.json| 1 - .../ROOT/examples/json/avro-x-java-object.json | 1 - .../modules/ROOT/examples/json/avro-x-struct.json | 1 - .../aws-cloudtrail-application-cloudevents.json| 1 - .../examples/json/aws2-ddb-application-json.json | 1 - .../aws2-ddbstream-application-cloudevents.json| 1 - .../json/aws2-kinesis-application-cloudevents.json | 1 - .../json/aws2-s3-application-cloudevents.json | 1 - .../json/aws2-sqs-application-cloudevents.json | 1 - .../azure-cosmosdb-application-cloudevents.json| 1 - .../azure-eventhubs-application-cloudevents.json | 1 - .../json/azure-files-application-cloudevents.json | 1 -
(camel) 02/02: Regen
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit eb5f038bece844c9eeb9e24737d370e3dc36bed9 Author: Guillaume Nodet AuthorDate: Tue Feb 27 12:34:15 2024 +0100 Regen --- .../modules/eips/examples/json/batchConfig.json| 1 + .../modules/eips/examples/json/contextScan.json| 1 - .../eips/examples/json/customLoadBalancer.json | 1 + .../docs/modules/eips/examples/json/doCatch.json | 1 - .../docs/modules/eips/examples/json/doFinally.json | 1 - .../docs/modules/eips/examples/json/doTry.json | 1 - .../modules/eips/examples/json/errorHandler.json | 1 - .../docs/modules/eips/examples/json/failover.json | 1 + .../modules/eips/examples/json/globalOption.json | 1 - .../modules/eips/examples/json/globalOptions.json | 1 - .../docs/modules/eips/examples/json/inputType.json | 1 - .../docs/modules/eips/examples/json/intercept.json | 1 - .../modules/eips/examples/json/interceptFrom.json | 1 - .../examples/json/interceptSendToEndpoint.json | 1 - .../docs/modules/eips/examples/json/marshal.json | 1 - .../modules/eips/examples/json/onCompletion.json | 1 - .../modules/eips/examples/json/onException.json| 1 - .../examples/json/optimisticLockRetryPolicy.json | 1 - .../modules/eips/examples/json/outputType.json | 1 - .../modules/eips/examples/json/packageScan.json| 1 - .../docs/modules/eips/examples/json/policy.json| 1 - .../docs/modules/eips/examples/json/property.json | 1 - .../eips/examples/json/propertyExpression.json | 1 - .../docs/modules/eips/examples/json/random.json| 1 + .../eips/examples/json/redeliveryPolicy.json | 1 - .../modules/eips/examples/json/restContextRef.json | 1 - .../modules/eips/examples/json/roundRobin.json | 1 + .../docs/modules/eips/examples/json/route.json | 1 - .../modules/eips/examples/json/routeBuilder.json | 1 - .../eips/examples/json/routeConfiguration.json | 1 - .../json/routeConfigurationContextRef.json | 1 - .../eips/examples/json/routeConfigurations.json| 1 - .../eips/examples/json/routeContextRef.json| 1 - .../modules/eips/examples/json/routeTemplate.json | 1 - .../examples/json/routeTemplateContextRef.json | 1 - .../modules/eips/examples/json/routeTemplates.json | 1 - .../docs/modules/eips/examples/json/routes.json| 1 - .../modules/eips/examples/json/serviceCall.json| 1 + .../eips/examples/json/setExchangePattern.json | 1 - .../docs/modules/eips/examples/json/sticky.json| 1 + .../modules/eips/examples/json/streamConfig.json | 1 + .../modules/eips/examples/json/templateBean.json | 1 - .../eips/examples/json/templateParameter.json | 1 - .../modules/eips/examples/json/templatedRoute.json | 1 - .../eips/examples/json/templatedRouteBean.json | 1 - .../examples/json/templatedRouteParameter.json | 1 - .../eips/examples/json/templatedRoutes.json| 1 - .../eips/examples/json/threadPoolProfile.json | 1 - .../modules/eips/examples/json/throwException.json | 1 - .../docs/modules/eips/examples/json/topic.json | 1 + .../modules/eips/examples/json/transacted.json | 1 - .../docs/modules/eips/examples/json/unmarshal.json | 1 - .../docs/modules/eips/examples/json/value.json | 1 - .../docs/modules/eips/examples/json/weighted.json | 1 + .../eips/examples/json/whenSkipSendToEndpoint.json | 1 - docs/.yarn/install-state.gz| Bin 502984 -> 503000 bytes .../json/application-cloudevents-json.json | 1 - .../ROOT/examples/json/application-json.json | 1 - .../examples/json/application-x-java-object.json | 1 - .../ROOT/examples/json/application-x-struct.json | 1 - .../modules/ROOT/examples/json/avro-binary.json| 1 - .../ROOT/examples/json/avro-x-java-object.json | 1 - .../modules/ROOT/examples/json/avro-x-struct.json | 1 - .../aws-cloudtrail-application-cloudevents.json| 1 - .../examples/json/aws2-ddb-application-json.json | 1 - .../aws2-ddbstream-application-cloudevents.json| 1 - .../json/aws2-kinesis-application-cloudevents.json | 1 - .../json/aws2-s3-application-cloudevents.json | 1 - .../json/aws2-sqs-application-cloudevents.json | 1 - .../azure-cosmosdb-application-cloudevents.json| 1 - .../azure-eventhubs-application-cloudevents.json | 1 - .../json/azure-files-application-cloudevents.json | 1 - .../azure-servicebus-application-cloudevents.json | 1 - ...azure-storage-blob-application-cloudevents.json | 1 - ...zure-storage-queue-application-cloudevents.json | 1 - .../ROOT/examples/json/beanPostProcessor.json | 1 - .../modules/ROOT/examples/json/camelContext.json | 1 - .../ROOT/examples/json/consumerTemplate.json | 1
Re: [PR] Perform a full regen during PR build [camel]
gnodet merged PR #13316: URL: https://github.com/apache/camel/pull/13316 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: chore(knative): configure via properties
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 9c058daa1 chore(knative): configure via properties
9c058daa1 is described below
commit 9c058daa180106fb5b770558f9b553b7bfb9d2ef
Author: Pasquale Congiusti
AuthorDate: Tue Feb 27 14:49:44 2024 +0100
chore(knative): configure via properties
---
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 1 -
docs/modules/traits/pages/knative.adoc| 1 -
pkg/apis/camel/v1/knative/types.go| 1 +
pkg/apis/camel/v1/knative/types_support.go| 41 +
pkg/apis/camel/v1/knative/types_support_test.go | 61 ++
pkg/apis/camel/v1/trait/knative.go| 1 -
pkg/trait/knative.go | 215 +-
pkg/trait/knative_service_test.go | 2 -
pkg/trait/knative_test.go | 133 ++---
9 files changed, 257 insertions(+), 199 deletions(-)
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index e8e5bae6e..574e7c98c 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -7183,7 +7183,6 @@ Automatically deploy the integration as Knative service
when all conditions hold
The Knative trait automatically discovers addresses of Knative resources and
inject them into the
running integration.
-The full Knative configuration is injected in the CAMEL_KNATIVE_CONFIGURATION
in JSON format.
The Camel Knative component will then use the full configuration to configure
the routes.
The trait is enabled by default when the Knative profile is active.
diff --git a/docs/modules/traits/pages/knative.adoc
b/docs/modules/traits/pages/knative.adoc
index ef2af7007..b82ac44a0 100755
--- a/docs/modules/traits/pages/knative.adoc
+++ b/docs/modules/traits/pages/knative.adoc
@@ -4,7 +4,6 @@
The Knative trait automatically discovers addresses of Knative resources and
inject them into the
running integration.
-The full Knative configuration is injected in the CAMEL_KNATIVE_CONFIGURATION
in JSON format.
The Camel Knative component will then use the full configuration to configure
the routes.
The trait is enabled by default when the Knative profile is active.
diff --git a/pkg/apis/camel/v1/knative/types.go
b/pkg/apis/camel/v1/knative/types.go
index 01e781225..2fb6b9665 100644
--- a/pkg/apis/camel/v1/knative/types.go
+++ b/pkg/apis/camel/v1/knative/types.go
@@ -38,6 +38,7 @@ type CamelServiceDefinition struct {
URL string`json:"url,omitempty"`
Pathstring`json:"path,omitempty"`
Metadatamap[string]string `json:"metadata,omitempty"`
+ SinkBinding bool `json:"sinkBinding,omitempty"`
}
// CamelEndpointKind -- .
diff --git a/pkg/apis/camel/v1/knative/types_support.go
b/pkg/apis/camel/v1/knative/types_support.go
index 0c7dcc870..d4ebf4b39 100644
--- a/pkg/apis/camel/v1/knative/types_support.go
+++ b/pkg/apis/camel/v1/knative/types_support.go
@@ -19,6 +19,7 @@ package knative
import (
"encoding/json"
+ "fmt"
"net/url"
)
@@ -41,6 +42,46 @@ func BuildCamelServiceDefinition(name string, endpointKind
CamelEndpointKind, se
return definition, nil
}
+// SetSinkBinding marks one of the service as SinkBinding.
+func (env *CamelEnvironment) SetSinkBinding(name string, endpointKind
CamelEndpointKind, serviceType CamelServiceType, apiVersion, kind string) {
+ for i, svc := range env.Services {
+ svc := svc
+ if svc.Name == name &&
+ svc.Metadata[CamelMetaEndpointKind] ==
string(endpointKind) &&
+ svc.ServiceType == serviceType &&
+ (apiVersion == "" ||
svc.Metadata[CamelMetaKnativeAPIVersion] == apiVersion) &&
+ (kind == "" || svc.Metadata[CamelMetaKnativeKind] ==
kind) {
+ svc.SinkBinding = true
+ env.Services[i] = svc
+ }
+ }
+}
+
+// ToCamelProperties returns the application properties representation of the
services.
+func (env *CamelEnvironment) ToCamelProperties() map[string]string {
+ mappedServices := make(map[string]string)
+ for i, service := range env.Services {
+ resource :=
fmt.Sprintf("camel.component.knative.environment.resources[%d]", i)
+ mappedServices[fmt.Sprintf("%s.name", resource)] = service.Name
+ mappedServices[fmt.Sprintf("%s.type", resource)] =
string(service.ServiceType)
+ mappedServices[fmt.Sprintf("%s.objectKind", resource)] =
service.Metadata[CamelMetaKnativeKind]
+
Re: [PR] chore(knative): configure via properties [camel-k]
squakez commented on PR #5186: URL: https://github.com/apache/camel-k/pull/5186#issuecomment-1967098477 Known flaky check failure. Merging. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(knative): configure via properties [camel-k]
squakez merged PR #5186: URL: https://github.com/apache/camel-k/pull/5186 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade quarkus-amazon-services to 2.12.1 [camel-quarkus]
jamesnetherton merged PR #5811: URL: https://github.com/apache/camel-quarkus/pull/5811 -- 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: Fix
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 33c870c5 Fix
33c870c5 is described below
commit 33c870c5ed3aa5bf09a9bb26034298b90051ccc0
Author: Marat Gubaidullin
AuthorDate: Tue Feb 27 11:08:23 2024 -0500
Fix
---
karavan-app/src/main/webui/src/api/ProjectService.ts | 1 +
karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx | 4 ++--
karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletsTab.tsx | 3 ---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/karavan-app/src/main/webui/src/api/ProjectService.ts
b/karavan-app/src/main/webui/src/api/ProjectService.ts
index 6b76a1bb..670da152 100644
--- a/karavan-app/src/main/webui/src/api/ProjectService.ts
+++ b/karavan-app/src/main/webui/src/api/ProjectService.ts
@@ -42,6 +42,7 @@ export class ProjectService {
ProjectEventBus.sendLog('set', '');
useLogStore.setState({showLog: true, type: 'container',
podName: res.data})
} else {
+console.log(res);
EventBus.sendAlert('Error Starting DevMode container',
res.statusText, 'warning')
}
});
diff --git
a/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx
b/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx
index 8a043507..d0784c02 100644
--- a/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx
+++ b/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletCard.tsx
@@ -38,7 +38,7 @@ export function KameletCard(props: Props) {
useEffect(() => {
setBlockedKamelets(KameletApi.getBlockedKameletNames());
}, []);
-
+
const kamelet = props.kamelet;
const isCustom =
KameletApi.getCustomKameletNames().includes(kamelet.metadata.name);
@@ -65,7 +65,7 @@ export function KameletCard(props: Props) {
{isCustom && custom}
{showBlockCheckbox && selectKamelet(_,
checked)}/>}
+onChange={(_, checked) =>
selectKamelet(_, checked)}/>}
{CamelUi.getIconFromSource(kamelet.icon())}
diff --git
a/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletsTab.tsx
b/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletsTab.tsx
index d25e843d..353819e4 100644
--- a/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletsTab.tsx
+++ b/karavan-app/src/main/webui/src/knowledgebase/kamelets/KameletsTab.tsx
@@ -43,9 +43,6 @@ export function KameletsTab(props: Props) {
let kameletList = KameletApi.getKamelets().filter(kamelet =>
kamelet.spec.definition.title.toLowerCase().includes(filter.toLowerCase()));
if (customOnly) kameletList = kameletList.filter(k =>
KameletApi.getCustomKameletNames().includes(k.metadata.name));
-
-console.log("KameletApi.getCustomKameletNames()",
KameletApi.getCustomKameletNames())
-
return (
Re: [PR] jt400 mock coverage + native fixes [camel-quarkus]
jamesnetherton commented on code in PR #5812:
URL: https://github.com/apache/camel-quarkus/pull/5812#discussion_r1504516663
##
extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java:
##
@@ -40,4 +49,30 @@ List
runtimeInitializedClasses() {
items.add(new
RuntimeInitializedClassBuildItem("com.ibm.as400.access.CredentialVault"));
return items;
}
+
+@BuildStep
+void reflectiveClasses(BuildProducer
reflectiveClassesProducer,
+CombinedIndexBuildItem combinedIndex) {
+IndexView index = combinedIndex.getIndex();
+
+
reflectiveClassesProducer.produce(ReflectiveClassBuildItem.builder(NLSImplNative.class).build());
+
+index.getKnownClasses().stream()
+.filter(c ->
c.name().toString().matches("com.ibm.as400.access.*Remote"))
Review Comment:
Nitpick - might be better for performance to use a `Pattern` constant
instead of doing regex compilation in loops that are somewhat unbounded.
##
integration-tests/jt400/pom.xml:
##
@@ -63,6 +71,9 @@
native
+
+
${flat-class-path}
Review Comment:
Maybe a better way of doing this is to just set
`quarkus.test.flat-class-path = true` in `application.properties`. Then change
the `skip-mock-tests` profile to include property
`false`.
Then there's no need for the `flat-class-path` Maven property or
`FlatClasspathTestProfile.java`.
I may be wrong, but I think it could work.
##
integration-tests/jt400/src/test/java/org/apache/camel/quarkus/component/jt400/it/Jt400MockTest.java:
##
@@ -0,0 +1,148 @@
+/*
+ * 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.jt400.it;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import org.apache.camel.util.CollectionHelper;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+
+@QuarkusTest
+@DisabledIfSystemProperty(named = "skip-mock-tests", matches = "true")
+@TestProfile(FlatClasspathTestProfile.class)
+public class Jt400MockTest {
+
+@Test
+public void testReadKeyedDataQueue() {
+prepareMockReply(Jt400Resource.ReplyType.ok);
+prepareMockReply(Jt400Resource.ReplyType.DQRequestAttributesNormal,
CollectionHelper.mapOf("keyLength", 5));
+prepareMockReply(Jt400Resource.ReplyType.ok);
+prepareMockReply(Jt400Resource.ReplyType.DQReadNormal, 0x8003, "mocked
jt400", "Hello from mocked jt400!", "MYKEY");
+
+/* A simple autogenerated test */
Review Comment:
Please remove the `/* A simple autogenerated test */` comments (see more in
other test below).
--
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 camel-4.4.x updated: CAMEL-20462: small typos in properties description
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new 596b7f0f083 CAMEL-20462: small typos in properties description
596b7f0f083 is described below
commit 596b7f0f08378680307cb3be42533026e28f011e
Author: Ricardo M
AuthorDate: Mon Feb 26 18:20:00 2024 +0100
CAMEL-20462: small typos in properties description
This commit fixes a couple of typos:
* Beans: Sets a reference to an _exiting_ bean to use, which is looked up
from the registry
* OnException: Turn on exponential _backk_ off
In addition to that, a missing `enum` annotation was added to the
LogLevel of `retriesExhaustedLogLevel`
---
.../resources/org/apache/camel/catalog/models/bean.json| 2 +-
.../org/apache/camel/catalog/models/redeliveryPolicy.json | 6 +++---
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 4 ++--
.../src/generated/resources/org/apache/camel/model/bean.json | 2 +-
.../resources/org/apache/camel/model/redeliveryPolicy.json | 6 +++---
.../src/main/java/org/apache/camel/model/BeanDefinition.java | 2 +-
.../org/apache/camel/model/RedeliveryPolicyDefinition.java | 7 ---
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 8
.../src/generated/resources/schema/camelYamlDsl.json | 10 ++
9 files changed, 25 insertions(+), 22 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bean.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bean.json
index 3cf92f05078..2cac773dc45 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bean.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bean.json
@@ -15,7 +15,7 @@
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "index": 1, "kind": "element", "displayName":
"Description", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the description of this node" },
"disabled": { "index": 2, "kind": "attribute", "displayName": "Disabled",
"label": "advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to disable this EIP from the
route during build time. Once an EIP has been disabled then it cannot be
enabled later at runtime." },
-"ref": { "index": 3, "kind": "attribute", "displayName": "Ref",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
a reference to an exiting bean to use, which is looked up from the registry" },
+"ref": { "index": 3, "kind": "attribute", "displayName": "Ref",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
a reference to an existing bean to use, which is looked up from the registry" },
"method": { "index": 4, "kind": "attribute", "displayName": "Method",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the method name on the bean to use" },
"beanType": { "index": 5, "kind": "attribute", "displayName": "Bean Type",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the class name (fully qualified) of the bean to use" },
"scope": { "index": 6, "kind": "attribute", "displayName": "Scope",
"label": "advanced", "required": false, "type": "enum", "javaType":
"java.lang.String", "enum": [ "Singleton", "Request", "Prototype" ],
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"Singleton", "description": "Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case c [...]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicy.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicy.json
index a161fb8348e..93a45d627a1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/redeliveryPolicy.json
+++
Re: [PR] [backport] CAMEL-20462: small typos in properties description [camel]
orpiske merged PR #13325: URL: https://github.com/apache/camel/pull/13325 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Automatically transform to xml if all files are yaml [camel]
Croway opened a new pull request, #13331: URL: https://github.com/apache/camel/pull/13331 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] align output log [camel]
orpiske commented on PR #13326: URL: https://github.com/apache/camel/pull/13326#issuecomment-1966858308 > we use a table printer library in jbang That one looks pretty cool -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] User should be able to limit resources for integration containers in docker [camel-karavan]
mgubaidullin commented on issue #1052: URL: https://github.com/apache/camel-karavan/issues/1052#issuecomment-1966834915 @vidhyasagarj thanks. I made a mistake. It looks like the format was changed in the latest docker-compose https://docs.docker.com/compose/compose-file/compose-file-v3/#resources ``` deploy: resources: limits: cpus: '0.50' memory: 50M reservations: cpus: '0.25' memory: 20 ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] align output log [camel]
davsclaus commented on PR #13326: URL: https://github.com/apache/camel/pull/13326#issuecomment-1966807217 we use a table printer library in jbang -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Camel 4.4 - Adding back camel-beanio data format [camel-karavan]
mgubaidullin closed issue #1084: Camel 4.4 - Adding back camel-beanio data format URL: https://github.com/apache/camel-karavan/issues/1084 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Camel 4.4 - Adding back camel-beanio data format [camel-karavan]
mgubaidullin commented on issue #1084: URL: https://github.com/apache/camel-karavan/issues/1084#issuecomment-1966802957 There is no images for data formats. I think it would be too noisy to have them https://github.com/apache/camel-karavan/assets/1379213/4f70b0d2-ceca-4376-92a4-72c1cccbba87;> -- 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: Update DEV.md corrected XCOPY command source path (#1148)
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 3dd6438d Update DEV.md corrected XCOPY command source path (#1148)
3dd6438d is described below
commit 3dd6438dc58917a3d8dc4cc09521d89907087556
Author: Praval jindal <94207665+praval...@users.noreply.github.com>
AuthorDate: Tue Feb 27 20:48:24 2024 +0530
Update DEV.md corrected XCOPY command source path (#1148)
Corrected the source paths in the XCOPY commands to go one more level up in
the directory structure, ensuring the correct source directories are copied to
the destination.
---
docs/DEV.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/DEV.md b/docs/DEV.md
index c092ffa0..f022f107 100644
--- a/docs/DEV.md
+++ b/docs/DEV.md
@@ -55,9 +55,9 @@ Docker Engine 24+
1. Make the following change in package.json line 5-12 (needed only for
Windows)
```
"scripts": {
-"copy-designer": "xcopy ..\\..\\..\\..\\karavan-designer\\src\\designer
src\\designer /E/H/Y",
-"copy-knowledgebase": "xcopy
..\\..\\..\\..\\karavan-designer\\src\\knowledgebase src\\knowledgebase /E/H/Y",
-"copy-topology": "xcopy ..\\..\\..\\..\\karavan-designer\\src\\topology
src\\topology /E/H/Y",
+"copy-designer": "xcopy
..\\..\\..\\..\\..\\karavan-designer\\src\\designer src\\designer /E/H/Y",
+"copy-knowledgebase": "xcopy
..\\..\\..\\..\\..\\karavan-designer\\src\\knowledgebase src\\knowledgebase
/E/H/Y",
+"copy-topology": "xcopy
..\\..\\..\\..\\..\\karavan-designer\\src\\topology src\\topology /E/H/Y",
"copy-code": " npm run copy-designer && npm run copy-knowledgebase &&
npm run copy-topology",
"start": "set PORT=3003 && npm run copy-code && react-scripts start",
"build": "npm run copy-code && DISABLE_ESLINT_PLUGIN=true react-scripts
build"
Re: [PR] Update DEV.md corrected XCOPY command source path [camel-karavan]
mgubaidullin merged PR #1148: URL: https://github.com/apache/camel-karavan/pull/1148 -- 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: change to limit container resoures for docker (#1149)
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 3d36c52d change to limit container resoures for docker (#1149)
3d36c52d is described below
commit 3d36c52db74d2607d9d9bf9c886cc887f41272f3
Author: Vidhya Sagar <36588343+vidhyasag...@users.noreply.github.com>
AuthorDate: Tue Feb 27 23:17:13 2024 +0800
change to limit container resoures for docker (#1149)
Co-authored-by: Vidhya Sagar
---
.../camel/karavan/docker/DockerForKaravan.java | 14 ++--
.../apache/camel/karavan/docker/DockerService.java | 12 +--
.../camel/karavan/docker/DockerServiceUtils.java | 34 --
.../camel/karavan/model/DockerComposeService.java | 41 ++
.../main/resources/snippets/docker-compose.yaml| 3 ++
5 files changed, 96 insertions(+), 8 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
b/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
index 7c07cbc4..42c9d6f0 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForKaravan.java
@@ -22,7 +22,9 @@ import com.github.dockerjava.api.model.RestartPolicy;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.model.ContainerStatus;
+import org.apache.camel.karavan.model.DockerComposeService;
import org.apache.camel.karavan.model.Project;
+import org.apache.camel.karavan.service.ProjectService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
@@ -46,6 +48,9 @@ public class DockerForKaravan {
@Inject
DockerService dockerService;
+@Inject
+ProjectService projectService;
+
public void runProjectInDevMode(String projectId, String jBangOptions,
Map ports,
Map files) throws
Exception {
Map volumes = getMavenVolumes();
@@ -64,13 +69,16 @@ public class DockerForKaravan {
? List.of(ENV_VAR_JBANG_OPTIONS + "=" + jBangOptions)
: List.of();
+DockerComposeService composeService =
projectService.getProjectDockerComposeService(projectId);
+
return dockerService.createContainer(projectId, devmodeImage,
env, ports, healthCheck,
Map.of(LABEL_TYPE,
ContainerStatus.ContainerType.devmode.name(),
LABEL_PROJECT_ID, projectId,
LABEL_CAMEL_RUNTIME, CamelRuntime.CAMEL_MAIN.getValue()
),
-volumes, null, RestartPolicy.noRestart(), false);
+volumes, null, RestartPolicy.noRestart(), false,
+composeService.getCpus(), composeService.getCpu_percent(),
composeService.getMem_limit(), composeService.getMem_reservation());
}
@@ -96,7 +104,9 @@ public class DockerForKaravan {
LABEL_PROJECT_ID, project.getProjectId(),
LABEL_TAG, tag
),
-volumes, null,RestartPolicy.noRestart(), false,
"/karavan/builder/build.sh");
+volumes, null,RestartPolicy.noRestart(), false,
+null, null, null, null,
+"/karavan/builder/build.sh");
}
private Map getMavenVolumes(){
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
index f1a41476..bfd49f1a 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
@@ -36,6 +36,7 @@ import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.math.NumberUtils;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
@@ -205,8 +206,9 @@ public class DockerService extends DockerServiceUtils {
restartPolicy = RestartPolicy.alwaysRestart();
}
-return createContainer(compose.getContainer_name(),
compose.getImage(),
-env, compose.getPortsMap(), healthCheck, labels, volumes,
networkName, restartPolicy, pullAlways, command);
+return createContainer(compose.getContainer_name(),
compose.getImage(),
+env, compose.getPortsMap(), healthCheck, labels, volumes,
networkName, restartPolicy, pullAlways,
+compose.getCpus(),
Re: [PR] change to limit container resources for docker #1052 [camel-karavan]
mgubaidullin merged PR #1149: URL: https://github.com/apache/camel-karavan/pull/1149 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] jt400 mock coverage + native fixes [camel-quarkus]
JiriOndrusek opened a new pull request, #5812: URL: https://github.com/apache/camel-quarkus/pull/5812 fixes https://github.com/apache/camel-quarkus/issues/5809 The mocked tests require `quarkus.test.flat-class-path` to be `true`. (default behavior for the tests) New profile `skip-mock-tests` returns flat-class-path to `false` and disables all mocked tests. Profile is not active by default and can be activated by property `-Dskip-mock-tests=true` for the execution. Test coverage is quite small - there are tests to read/write for keyed data-queue and message-queue, and the test for the program call. Mocked backend is not based on the real server, therefore the response are probably far from the real responses This mocked tests could be refactored in the future to mimic real responses. Now it allows extension to be tested in the native mode (to some extent). -- 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
