[camel] branch camel-3.18.x updated: camel-jbang - Export should not fail fast due to stub component is shadowing the actual component which then cannot be auto configured.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new a89f0ab6fd7 camel-jbang - Export should not fail fast due to stub
component is shadowing the actual component which then cannot be auto
configured.
a89f0ab6fd7 is described below
commit a89f0ab6fd78a8ebe39f1f78e1badaaa1d494af3
Author: Claus Ibsen
AuthorDate: Wed Jul 27 07:49:50 2022 +0200
camel-jbang - Export should not fail fast due to stub component is
shadowing the actual component which then cannot be auto configured.
---
.../src/main/java/org/apache/camel/main/KameletMain.java| 6 ++
.../camel/main/download/DependencyDownloaderComponentResolver.java | 6 ++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index 17f8d4552cd..98f1eb87296 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -286,6 +286,8 @@ public class KameletMain extends MainCommandLineSupport {
if (stub) {
// turn off auto-wiring when running in stub mode
mainConfigurationProperties.setAutowiredEnabled(false);
+// and turn off fail fast as we stub components
+mainConfigurationProperties.setAutoConfigurationFailFast(false);
}
String info = startupInfo();
@@ -413,10 +415,6 @@ public class KameletMain extends MainCommandLineSupport {
addInitialProperty("camel.component.kamelet.location", location);
addInitialProperty("camel.component.rest.consumerComponentName",
"platform-http");
addInitialProperty("camel.component.rest.producerComponentName",
"vertx-http");
-if (stub) {
-// enable shadow mode on stub component
-addInitialProperty("camel.component.stub.shadow", "true");
-}
}
protected String startupInfo() {
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
index dce226fb808..6e405da6ae7 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
@@ -23,6 +23,7 @@ import org.apache.camel.Component;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.component.platform.http.PlatformHttpComponent;
+import org.apache.camel.component.stub.StubComponent;
import org.apache.camel.impl.engine.DefaultComponentResolver;
import org.apache.camel.main.http.VertxHttpServer;
import org.apache.camel.main.util.SuggestSimilarHelper;
@@ -62,6 +63,11 @@ public final class DependencyDownloaderComponentResolver
extends DefaultComponen
} else {
answer = super.resolveComponent("stub", context);
}
+if (stub && answer instanceof StubComponent) {
+StubComponent sc = (StubComponent) answer;
+// enable shadow mode on stub component
+sc.setShadow(true);
+}
if (answer instanceof PlatformHttpComponent) {
// setup a default http server on port 8080 if not already done
VertxHttpServer.setPlatformHttpComponent((PlatformHttpComponent)
answer);
[camel] branch main updated: camel-jbang - Export should not fail fast due to stub component is shadowing the actual component which then cannot be auto configured.
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 6000cee2b1c camel-jbang - Export should not fail fast due to stub
component is shadowing the actual component which then cannot be auto
configured.
6000cee2b1c is described below
commit 6000cee2b1ced0b122c1b06b79fdf33b214a1c23
Author: Claus Ibsen
AuthorDate: Wed Jul 27 07:49:50 2022 +0200
camel-jbang - Export should not fail fast due to stub component is
shadowing the actual component which then cannot be auto configured.
---
.../src/main/java/org/apache/camel/main/KameletMain.java| 6 ++
.../camel/main/download/DependencyDownloaderComponentResolver.java | 6 ++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index 17f8d4552cd..98f1eb87296 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -286,6 +286,8 @@ public class KameletMain extends MainCommandLineSupport {
if (stub) {
// turn off auto-wiring when running in stub mode
mainConfigurationProperties.setAutowiredEnabled(false);
+// and turn off fail fast as we stub components
+mainConfigurationProperties.setAutoConfigurationFailFast(false);
}
String info = startupInfo();
@@ -413,10 +415,6 @@ public class KameletMain extends MainCommandLineSupport {
addInitialProperty("camel.component.kamelet.location", location);
addInitialProperty("camel.component.rest.consumerComponentName",
"platform-http");
addInitialProperty("camel.component.rest.producerComponentName",
"vertx-http");
-if (stub) {
-// enable shadow mode on stub component
-addInitialProperty("camel.component.stub.shadow", "true");
-}
}
protected String startupInfo() {
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
index dce226fb808..6e405da6ae7 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderComponentResolver.java
@@ -23,6 +23,7 @@ import org.apache.camel.Component;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.component.platform.http.PlatformHttpComponent;
+import org.apache.camel.component.stub.StubComponent;
import org.apache.camel.impl.engine.DefaultComponentResolver;
import org.apache.camel.main.http.VertxHttpServer;
import org.apache.camel.main.util.SuggestSimilarHelper;
@@ -62,6 +63,11 @@ public final class DependencyDownloaderComponentResolver
extends DefaultComponen
} else {
answer = super.resolveComponent("stub", context);
}
+if (stub && answer instanceof StubComponent) {
+StubComponent sc = (StubComponent) answer;
+// enable shadow mode on stub component
+sc.setShadow(true);
+}
if (answer instanceof PlatformHttpComponent) {
// setup a default http server on port 8080 if not already done
VertxHttpServer.setPlatformHttpComponent((PlatformHttpComponent)
answer);
[GitHub] [camel-k] tadayosi commented on pull request #3490: fix(e2e): stabilise knative/yaks tests
tadayosi commented on PR #3490: URL: https://github.com/apache/camel-k/pull/3490#issuecomment-1196281897 validation error is what I carelessly inserted into main and not related to this. It's addressed at #3491. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi opened a new pull request, #3491: fix(lint): nolintlint
tadayosi opened a new pull request, #3491: URL: https://github.com/apache/camel-k/pull/3491 **Release Note** ```release-note NONE ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.18.x updated: CAMEL-18262 - Fixing the Template issue (#7995)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 1cc1c53782d CAMEL-18262 - Fixing the Template issue (#7995)
1cc1c53782d is described below
commit 1cc1c53782d8195b339a93b8da9ef59670986841
Author: Claus Ibsen
AuthorDate: Wed Jul 27 07:17:15 2022 +0200
CAMEL-18262 - Fixing the Template issue (#7995)
---
.../java/org/apache/camel/component/kamelet/KameletComponent.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
index aae39ca3c24..054b383ffcc 100644
---
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
+++
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
@@ -29,6 +29,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
@@ -401,7 +402,10 @@ public class KameletComponent extends DefaultComponent {
String id = context.addRouteFromTemplate(routeId, templateId,
endpoint.getKameletProperties());
RouteDefinition def = context.getRouteDefinition(id);
-if (!def.isPrepared()) {
+// start the route if not already started
+ServiceStatus status =
context.getRouteController().getRouteStatus(id);
+boolean started = status != null && status.isStarted();
+if (!started) {
context.startRouteDefinitions(Collections.singletonList(def));
}
[camel] branch main updated: CAMEL-18262 - Fixing the Template issue (#7995)
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 9a2dbcc67b8 CAMEL-18262 - Fixing the Template issue (#7995)
9a2dbcc67b8 is described below
commit 9a2dbcc67b8525fb8678c8d906f582c56c1daa13
Author: Claus Ibsen
AuthorDate: Wed Jul 27 07:17:15 2022 +0200
CAMEL-18262 - Fixing the Template issue (#7995)
---
.../java/org/apache/camel/component/kamelet/KameletComponent.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
index aae39ca3c24..054b383ffcc 100644
---
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
+++
b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
@@ -29,6 +29,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
@@ -401,7 +402,10 @@ public class KameletComponent extends DefaultComponent {
String id = context.addRouteFromTemplate(routeId, templateId,
endpoint.getKameletProperties());
RouteDefinition def = context.getRouteDefinition(id);
-if (!def.isPrepared()) {
+// start the route if not already started
+ServiceStatus status =
context.getRouteController().getRouteStatus(id);
+boolean started = status != null && status.isStarted();
+if (!started) {
context.startRouteDefinitions(Collections.singletonList(def));
}
[camel] branch regen_bot updated (1e0f06c293b -> c2ab133fd73)
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 discard 1e0f06c293b Regen for commit 05bc0406ddbfa5041665189dc4f9ee97ec606542 add c2ab133fd73 Regen for commit 286ace2b493c785363a6c2f9e29280bf28303a2a (#8049) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1e0f06c293b) \ N -- N -- N refs/heads/regen_bot (c2ab133fd73) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[GitHub] [camel] github-actions[bot] closed pull request #8050: Generated sources regen
github-actions[bot] closed pull request #8050: Generated sources regen URL: https://github.com/apache/camel/pull/8050 -- 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 (0035b210162 -> 1e0f06c293b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 0035b210162 Regen for commit 286ace2b493c785363a6c2f9e29280bf28303a2a add 05bc0406ddb Fix error message (#8047) add 1e0f06c293b Regen for commit 05bc0406ddbfa5041665189dc4f9ee97ec606542 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0035b210162) \ N -- N -- N refs/heads/regen_bot (1e0f06c293b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8050: Generated sources regen
github-actions[bot] opened a new pull request, #8050: URL: https://github.com/apache/camel/pull/8050 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: [create-pull-request] automated change
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 50c8cb51193 [create-pull-request] automated change
50c8cb51193 is described below
commit 50c8cb51193233f41589d85e88ef788aac27d16c
Author: oscerd
AuthorDate: Wed Jul 27 01:28:58 2022 +
[create-pull-request] automated change
---
.../catalog/components/kubernetes-config-maps.json | 30 --
.../springboot/catalog/components/salesforce.json | 3 ++-
.../src/main/docs/kubernetes.json | 7 +
...KubernetesConfigMapsComponentConfiguration.java | 17
4 files changed, 48 insertions(+), 9 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
index b33dee9df05..c57c2a6d12e 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
@@ -18,11 +18,12 @@
"async": false,
"api": false,
"consumerOnly": false,
-"producerOnly": true,
+"producerOnly": false,
"lenientProperties": false
},
"componentProperties": {
-"kubernetesClient": { "kind": "property", "displayName": "Kubernetes
Client", "group": "producer", "label": "", "required": false, "type": "object",
"javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated":
false, "autowired": true, "secret": false, "description": "To use an existing
kubernetes client." },
+"kubernetesClient": { "kind": "property", "displayName": "Kubernetes
Client", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "io.fabric8.kubernetes.client.KubernetesClient", "deprecated":
false, "autowired": true, "secret": false, "description": "To use an existing
kubernetes client." },
+"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
"lazyStartProducer": { "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 during star [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
},
@@ -36,13 +37,26 @@
"CamelKubernetesEventTimestamp": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"long", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Timestamp of the action watched by the
consumer", "constantName":
"org.apache.camel.component.kubernetes.KubernetesConstants#KUBERNETES_EVENT_TIMESTAMP"
}
},
"properties": {
-"masterUrl": { "kind": "path", "displayName": "Master Url", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.kubernetes.KubernetesConfiguration",
"configurationField": "configuration", "description": "Kubernetes Master url" },
-"apiVersion": { "kind": "parameter", "displayName": "Api Version",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
[GitHub] [camel-spring-boot] oscerd merged pull request #598: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
oscerd merged PR #598: URL: https://github.com/apache/camel-spring-boot/pull/598 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karaf] oscerd merged pull request #174: [Github Actions] Periodic Sync Camel Karaf Main Branch
oscerd merged PR #174: URL: https://github.com/apache/camel-karaf/pull/174 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch main updated: [create-pull-request] automated change
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 2e1c5106 [create-pull-request] automated change
2e1c5106 is described below
commit 2e1c5106234bdb6972ffdd229897973627e30f6e
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jul 27 01:15:04 2022 +
[create-pull-request] automated change
---
.../org/apache/camel/catalog/karaf/components/salesforce.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/salesforce.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/salesforce.json
index e3b96ec8..56ef73e6 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/salesforce.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/salesforce.json
@@ -134,7 +134,8 @@
"CamelSalesforceCreatedDate": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"java.time.ZonedDateTime", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The created date.",
"constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CREATED_DATE"
},
"CamelSalesforceTopicName": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The topic name.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_TOPIC_NAME"
},
"CamelSalesforceChannel": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The channel.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CHANNEL"
},
-"CamelSalesforceClientId": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The client id.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CLIENT_ID"
}
+"CamelSalesforceClientId": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The client id.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CLIENT_ID"
},
+"CamelSalesforceQueryResultTotalSize": { "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"int", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Total number of records matching a query.",
"constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_QUERY_RESULT_TOTAL_SIZE"
}
},
"properties": {
"operationName": { "kind": "path", "displayName": "Operation Name",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.internal.OperationName",
"enum": [ "getVersions", "getResources", "getGlobalObjects", "getBasicInfo",
"getDescription", "getSObject", "createSObject", "updateSObject",
"deleteSObject", "getSObjectWithId", "upsertSObject", "deleteSObjectWithId",
"getBlobField", "query", "queryMore", "queryA [...]
[camel] branch main updated: Regen for commit 286ace2b493c785363a6c2f9e29280bf28303a2a (#8049)
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 c2ab133fd73 Regen for commit 286ace2b493c785363a6c2f9e29280bf28303a2a
(#8049)
c2ab133fd73 is described below
commit c2ab133fd7378b3386b38e01c3b0511e68c31293
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jul 27 06:16:30 2022 +0200
Regen for commit 286ace2b493c785363a6c2f9e29280bf28303a2a (#8049)
Signed-off-by: GitHub
Co-authored-by: oscerd
---
.../endpoint/dsl/SalesforceEndpointBuilderFactory.java | 14 ++
1 file changed, 14 insertions(+)
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
index 752d9164dc2..537c4bc7082 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
@@ -4274,6 +4274,20 @@ public interface SalesforceEndpointBuilderFactory {
public String salesforceClientId() {
return "SalesforceClientId";
}
+
+/**
+ * Total number of records matching a query.
+ *
+ * The option is a: {@code int} type.
+ *
+ * Group: producer
+ *
+ * @return the name of the header {@code
+ * SalesforceQueryResultTotalSize}.
+ */
+public String salesforceQueryResultTotalSize() {
+return "SalesforceQueryResultTotalSize";
+}
}
static SalesforceEndpointBuilder endpointBuilder(
String componentName,
[GitHub] [camel] davsclaus merged pull request #8049: Generated sources regen
davsclaus merged PR #8049: URL: https://github.com/apache/camel/pull/8049 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Fix error message (#8047)
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 05bc0406ddb Fix error message (#8047)
05bc0406ddb is described below
commit 05bc0406ddbfa5041665189dc4f9ee97ec606542
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Wed Jul 27 06:16:16 2022 +0200
Fix error message (#8047)
---
.../org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
index 5a79d26cd01..89c1619d6a7 100644
---
a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
+++
b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
@@ -83,7 +83,7 @@ public class ServiceInterfaceStrategy implements
ElementNameStrategy {
} else {
throw new IllegalArgumentException(
"Result type of method " + method.getName()
- + " is not annotated with
WebParam. This is not yet supported");
+ + " is not annotated with
WebResult. This is not yet supported");
}
}
}
[GitHub] [camel] davsclaus merged pull request #8047: Fix error message
davsclaus merged PR #8047: URL: https://github.com/apache/camel/pull/8047 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi opened a new pull request, #3490: fix(e2e): stabilise knative/yaks tests
tadayosi opened a new pull request, #3490: URL: https://github.com/apache/camel-k/pull/3490 **Release Note** ```release-note NONE ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 02/02: chore: regen resources
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a786e46cc0d18806b917a1f9d5e9c63daffe46bf
Author: Tadayoshi Sato
AuthorDate: Wed Jul 27 13:07:52 2022 +0900
chore: regen resources
---
pkg/resources/resources.go | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 4334054e2..44e677f71 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -145,16 +145,16 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_integrations.yaml":
۰CompressedFileInfo{
name: "camel.apache.org_integrations.yaml",
modTime: time.Time{},
- uncompressedSize: 470949,
+ uncompressedSize: 470929,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\x1b\x37\xf6\x28\xf8\xbf\x3f\x05\x4a\x49\x5d\x49\x13\x91\xb2\x33\x73\x53\xbf\xf1\x4e\xdd\x94\x46\x92\x13\x6d\x6c\x99\x65\x29\xc9\x4d\x39\x9e\x04\xec\x06\x49\x5c\x35\x81\x1e\x00\x4d\x89\xbf\xf5\x7e\xf7\x2d\x1c\x00\xfd\xe0\xab\x0f\x5a\xa2\xe3\xcc\x36\xa6\x6a\x62\x52\xec\xd3\x78\x1c\x9c\xf7\xe3\x0b\x32\x78\xba\xf1\xec\x0b\xf2\x9a\x27\x4c\x68\x96\x12\x23\x89\x99\x31\x72\x96\xd3\x64\xc6\xc8\x8d\x9c\x98\x7b\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\x1b\x37\xf6\x28\xf8\xbf\x3f\x05\x4a\x49\x5d\x49\x13\x91\xb2\x33\x73\x53\xbf\xf1\x4e\xdd\x94\x46\x92\x13\x6d\x6c\x99\x65\x29\xc9\x4d\x39\x9e\x04\xec\x06\x49\x5c\x35\x81\x1e\x00\x4d\x89\xbf\xf5\x7e\xf7\x2d\x1c\x00\xfd\xe0\xab\x0f\x5a\xa2\xe3\xcc\x36\xa6\x6a\x62\x52\xec\xd3\x78\x1c\x9c\xf7\xe3\x0b\x32\x78\xba\xf1\xec\x0b\xf2\x9a\x27\x4c\x68\x96\x12\x23\x89\x99\x31\x72\x96\xd3\x64\xc6\xc8\x8d\x9c\x98\x7b\x
[...]
},
"/crd/bases/camel.apache.org_kameletbindings.yaml":
۰CompressedFileInfo{
name:
"camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 543899,
+ uncompressedSize: 543879,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\xfd\x73\x1b\x37\xb2\x2f\x8c\xff\xee\xbf\x02\x25\xa7\xae\xa4\x13\x92\xb2\xb3\xbb\xa9\xb3\xfe\x6e\xdd\x94\x56\x96\x13\x7d\x63\xcb\x2c\x4b\x71\x6e\xca\xc9\x49\xc0\x19\x90\xc4\xd5\x10\x98\x05\x30\x94\xb8\x8f\x9f\xff\xfd\x29\x34\x80\x79\xe1\x9b\xd0\x43\x51\x51\x36\x83\x53\x75\x36\x92\x35\x3d\x18\x00\xdd\xe8\xee\x4f\xbf\x3c\x27\xfd\x87\x1b\xcf\x9e\x93\xb7\x3c\x61\x42\xb3\x94\x18\x49\xcc\x94\x91\xd3\x9c\x26\x53\x46\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\xfd\x73\x1b\x37\xb2\x2f\x8c\xff\xee\xbf\x02\x25\xa7\xae\xa4\x13\x92\xb2\xb3\xbb\xa9\xb3\xfe\x6e\xdd\x94\x56\x96\x13\x7d\x63\xcb\x2c\x4b\x71\x6e\xca\xc9\x49\xc0\x19\x90\xc4\xd5\x10\x98\x05\x30\x94\xb8\x8f\x9f\xff\xfd\x29\x34\x80\x79\xe1\x9b\xd0\x43\x51\x51\x36\x83\x53\x75\x36\x92\x35\x3d\x18\x00\xdd\xe8\xee\x4f\xbf\x3c\x27\xfd\x87\x1b\xcf\x9e\x93\xb7\x3c\x61\x42\xb3\x94\x18\x49\xcc\x94\x91\xd3\x9c\x26\x53\x46\x
[...]
},
"/crd/bases/camel.apache.org_kamelets.yaml":
۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
[camel-k] branch main updated (869f7604d -> a786e46cc)
This is an automated email from the ASF dual-hosted git repository. tsato pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 869f7604d Updated CHANGELOG.md new a618af2b4 fix(lint): nolintlint new a786e46cc chore: regen resources 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: pkg/cmd/run_help.go | 3 +-- pkg/resources/resources.go | 8 pkg/util/resource/config.go | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-)
[camel-k] 01/02: fix(lint): nolintlint
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a618af2b4161baab11656780e3b39752310884d9
Author: Tadayoshi Sato
AuthorDate: Wed Jul 27 13:07:20 2022 +0900
fix(lint): nolintlint
---
pkg/cmd/run_help.go | 3 +--
pkg/util/resource/config.go | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkg/cmd/run_help.go b/pkg/cmd/run_help.go
index c2d54a011..e35d54a55 100644
--- a/pkg/cmd/run_help.go
+++ b/pkg/cmd/run_help.go
@@ -19,7 +19,7 @@ package cmd
import (
"context"
- "crypto/sha1" //nolint
+ "crypto/sha1"
"fmt"
"path"
"strings"
@@ -33,7 +33,6 @@ import (
corev1 "k8s.io/api/core/v1"
)
-//nolint
func hashFrom(contents ...[]byte) string {
// SHA1 because we need to limit the length to less than 64 chars
hash := sha1.New()
diff --git a/pkg/util/resource/config.go b/pkg/util/resource/config.go
index 6bfa5be2b..197e3fef5 100644
--- a/pkg/util/resource/config.go
+++ b/pkg/util/resource/config.go
@@ -19,7 +19,7 @@ package resource
import (
"context"
- "crypto/sha1" //nolint
+ "crypto/sha1"
"fmt"
"path/filepath"
"regexp"
@@ -235,7 +235,6 @@ func ConvertFileToConfigmap(ctx context.Context, c
client.Client, config *Config
return cm, nil
}
-//nolint
func hashFrom(contents ...[]byte) string {
// SHA1 because we need to limit the length to less than 64 chars
hash := sha1.New()
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 869f7604d Updated CHANGELOG.md 869f7604d is described below commit 869f7604d9486bf7172bf5470048a2db0ce3f6e7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jul 27 03:44:38 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 4 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81422f2de..c2d61dced 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,16 @@ **Closed issues:** - Kamel install error on Kind [\#3483](https://github.com/apache/camel-k/issues/3483) +- Integration cannot be run from github with different branch [\#3475](https://github.com/apache/camel-k/issues/3475) +- `make images` is not building the binary [\#3474](https://github.com/apache/camel-k/issues/3474) +- `install-it` workflow is failing silently [\#3465](https://github.com/apache/camel-k/issues/3465) - `camel-k-operator` pod in `CrashLoopBackOff` [\#3456](https://github.com/apache/camel-k/issues/3456) - Option `--maven-repository` on kamel run command has no effect [\#3447](https://github.com/apache/camel-k/issues/3447) - `make generate-doc` outputs non-deterministic `resources/traits.yaml` [\#3431](https://github.com/apache/camel-k/issues/3431) - Any ideas on disabling property expansion in kamel run? [\#3422](https://github.com/apache/camel-k/issues/3422) - Camel K integration Prometheus Trait label autocreation with Integration Platform not working [\#3415](https://github.com/apache/camel-k/issues/3415) - Example readme page 404 links [\#3413](https://github.com/apache/camel-k/issues/3413) +- Failing integration does not report error condition [\#3412](https://github.com/apache/camel-k/issues/3412) - kamel run --output yaml does not include resources [\#3396](https://github.com/apache/camel-k/issues/3396) - Migrate from batch/v1beta1 to batch/v1 [\#3393](https://github.com/apache/camel-k/issues/3393) - RBAC missing permissions for channels and inmemorychannels in messaging.knative.dev [\#3390](https://github.com/apache/camel-k/issues/3390)
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new b566da0a Updated CHANGELOG.md b566da0a is described below commit b566da0a2863665b5ef994231c5aaf21efa5961f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jul 27 03:39:57 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15963bf9..013fe0dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ **Merged pull requests:** - chore: fix 404 [\#851](https://github.com/apache/camel-k-runtime/pull/851) ([squakez](https://github.com/squakez)) +- build\(deps\): bump maven-common-artifact-filters from 3.3.0 to 3.3.1 [\#850](https://github.com/apache/camel-k-runtime/pull/850) ([dependabot[bot]](https://github.com/apps/dependabot)) +- build\(deps\): bump maven-remote-resources-plugin from 1.7.0 to 3.0.0 [\#849](https://github.com/apache/camel-k-runtime/pull/849) ([dependabot[bot]](https://github.com/apps/dependabot)) +- build\(deps\): bump maven-deploy-plugin from 3.0.0-M2 to 3.0.0 [\#848](https://github.com/apache/camel-k-runtime/pull/848) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore: bom cleaning [\#847](https://github.com/apache/camel-k-runtime/pull/847) ([squakez](https://github.com/squakez)) - build\(deps\): bump exec-maven-plugin from 3.0.0 to 3.1.0 [\#846](https://github.com/apache/camel-k-runtime/pull/846) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump apache from 26 to 27 [\#845](https://github.com/apache/camel-k-runtime/pull/845) ([dependabot[bot]](https://github.com/apps/dependabot))
[GitHub] [camel-k] tadayosi commented on a diff in pull request #3480: fix: camel-k ignores changes to traits configured using annotations
tadayosi commented on code in PR #3480:
URL: https://github.com/apache/camel-k/pull/3480#discussion_r930583574
##
pkg/controller/integration/kits.go:
##
@@ -82,6 +82,18 @@ func lookupKitsForIntegration(ctx context.Context, c
ctrl.Reader, integration *v
return kits, nil
}
+// sameOrMatch returns whether the v1.IntegrationKit ios the one used by the
v1.Integration or if it meets the
+// requirements of the v1.Integration.
+func sameOrMatch(kit *v1.IntegrationKit, integration *v1.Integration) (bool,
error) {
Review Comment:
I think this func is a necessary one to have, but also wonder if
`integrationMatches()` should be aware of the traits in annotations as well.
Currently `integrationMatches()` only compares `it.spec.traits` with
`kit.spec.traits` but shouldn't it really compare them using the combination of
annotations and spec.traits?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on a diff in pull request #3480: fix: camel-k ignores changes to traits configured using annotations
tadayosi commented on code in PR #3480:
URL: https://github.com/apache/camel-k/pull/3480#discussion_r930581435
##
pkg/trait/util.go:
##
@@ -320,3 +321,26 @@ func getBuilderTask(tasks []v1.Task) *v1.BuilderTask {
}
return nil
}
+
+// Equals return if traits set using annotations have changed.
+func Equals(oldObject metav1.Object, newObject metav1.Object) bool {
Review Comment:
I first saw the function name and misunderstood it as comparing both
annotations and spec.traits. It's only when I stared at the arg types that I
understood the correct intent.
Apart from the function name, is it not needed to actually compare the
traits under specs as well for where the func is invoked? Is it not necessary
because changes to traits under spec are handled in a different mechanics?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on a diff in pull request #3480: fix: camel-k ignores changes to traits configured using annotations
tadayosi commented on code in PR #3480:
URL: https://github.com/apache/camel-k/pull/3480#discussion_r930567487
##
pkg/controller/integration/kits.go:
##
@@ -82,6 +82,18 @@ func lookupKitsForIntegration(ctx context.Context, c
ctrl.Reader, integration *v
return kits, nil
}
+// sameOrMatch returns whether the v1.IntegrationKit ios the one used by the
v1.Integration or if it meets the
Review Comment:
typo: `ios` -> `is`
##
pkg/controller/integration/kits.go:
##
@@ -82,6 +82,18 @@ func lookupKitsForIntegration(ctx context.Context, c
ctrl.Reader, integration *v
return kits, nil
}
+// sameOrMatch returns whether the v1.IntegrationKit ios the one used by the
v1.Integration or if it meets the
+// requirements of the v1.Integration.
+func sameOrMatch(kit *v1.IntegrationKit, integration *v1.Integration) (bool,
error) {
Review Comment:
I think this func is a necessary one to have, but also wonder if
`integrationMatches()` should be aware of the traits in annotations as well.
Currently `integrationMatches()` only compares `it.spec.traits` with
`kit.spec.traits` but shouldn't it really compare the combination of
annotations and spec.traits?
##
pkg/trait/util.go:
##
@@ -320,3 +321,26 @@ func getBuilderTask(tasks []v1.Task) *v1.BuilderTask {
}
return nil
}
+
+// Equals return if traits set using annotations have changed.
+func Equals(oldObject metav1.Object, newObject metav1.Object) bool {
+ if len(oldObject.GetAnnotations()) != len(newObject.GetAnnotations()) {
+ return false
+ }
+
+ oldTraits := make(map[string]string)
+ newTraits := make(map[string]string)
+
+ for k, v := range oldObject.GetAnnotations() {
+ if strings.HasPrefix(k, "trait.camel.apache.org/") {
Review Comment:
we can use `camelv1.TraitAnnotationPrefix` here.
##
pkg/trait/util.go:
##
@@ -320,3 +321,26 @@ func getBuilderTask(tasks []v1.Task) *v1.BuilderTask {
}
return nil
}
+
+// Equals return if traits set using annotations have changed.
+func Equals(oldObject metav1.Object, newObject metav1.Object) bool {
+ if len(oldObject.GetAnnotations()) != len(newObject.GetAnnotations()) {
+ return false
+ }
+
+ oldTraits := make(map[string]string)
+ newTraits := make(map[string]string)
+
+ for k, v := range oldObject.GetAnnotations() {
+ if strings.HasPrefix(k, "trait.camel.apache.org/") {
+ oldTraits[k] = v
+ }
+ }
+ for k, v := range newObject.GetAnnotations() {
+ if strings.HasPrefix(k, "trait.camel.apache.org/") {
Review Comment:
we can use `camelv1.TraitAnnotationPrefix` here.
##
pkg/trait/util.go:
##
@@ -320,3 +321,26 @@ func getBuilderTask(tasks []v1.Task) *v1.BuilderTask {
}
return nil
}
+
+// Equals return if traits set using annotations have changed.
+func Equals(oldObject metav1.Object, newObject metav1.Object) bool {
Review Comment:
I first saw the function name and misunderstood it as comparing both
annotations and spec.traits. It's only when I stared at the arg types that I
understood the correct intent.
Apart from the function name, is it not needed to actually compare the
traits under specs as well for where the func is invoked? Are changes to
traits under spec handled in a different mechanics?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1196223414 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 2743339623-721-7062018f-e2e7-483e-9d6c-ca3ef06f9e5f * Camel Quarkus Commit: 3a1f37bf153e6bb1fbf7cbfd3daf29ce2056f95f * Camel Main Commit: 25ccbbfa1c300abbb5abded696b3422af2e5d641 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/2743339623 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on a diff in pull request #3487: fix(core): cascade Integration error when kit in...
tadayosi commented on code in PR #3487:
URL: https://github.com/apache/camel-k/pull/3487#discussion_r930568768
##
e2e/global/common/integration_fail_test.go:
##
@@ -62,3 +61,28 @@ func TestBadRouteIntegration(t *testing.T) {
Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
})
}
+
+func TestMissingDependencyIntegration(t *testing.T) {
Review Comment:
I don't see a reason to separate the namespaces for the test. Can't we merge
them into a single test func?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on issue #3234: Flaky E2E tests identified in 1.9.x
tadayosi commented on issue #3234: URL: https://github.com/apache/camel-k/issues/3234#issuecomment-1196186407 With recent efforts including #3478 E2E has become more stable now. We can check again if those listed above are still flaky or improved already. -- 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: migrate ibm-mq example
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 3aa976343 migrate ibm-mq example
3aa976343 is described below
commit 3aa9763439b17d92307f4fd1534f3537ae3a0cb8
Author: Kuthumi Pepple
AuthorDate: Tue Jul 19 20:06:56 2022 +0100
migrate ibm-mq example
---
examples/ibm-mq/MQRoute.java | 66 --
examples/ibm-mq/README.md | 42
examples/ibm-mq/ibm-mq-server-deploy/README.md | 26 ---
.../ibm-mq/ibm-mq-server-deploy/ibm-mq-server.yaml | 79 --
examples/ibm-mq/jms-ibm-mq-sink-binding.yaml | 18 -
examples/ibm-mq/jms-ibm-mq-source-binding.yaml | 15
6 files changed, 246 deletions(-)
diff --git a/examples/ibm-mq/MQRoute.java b/examples/ibm-mq/MQRoute.java
deleted file mode 100644
index 8ed1b3816..0
--- a/examples/ibm-mq/MQRoute.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// camel-k: language=java
-/*
- * 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.
- */
-
-import com.ibm.mq.jms.MQQueueConnectionFactory;
-import com.ibm.msg.client.wmq.WMQConstants;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jms.JmsComponent;
-import org.apache.camel.impl.DefaultCamelContext;
-
-public class MQRoute extends RouteBuilder {
-
-static String mqHost = "10.108.69.161";
-static int mqPort = 1414;
-static String mqQueueManager = "QM1";
-static String mqChannel = "DEV.APP.SVRCONN";
-static String mqQueue = "DEV.QUEUE.1";
-static String user = "app";
-static String password = "ibmmqpasswd";
-
-@Override
-public void configure() {
-MQQueueConnectionFactory mqFactory =
createWMQConnectionFactory(mqHost);
-getContext().getRegistry().bind("mqConnectionFactory", mqFactory);
-
-from("timer:tick")
-.setBody()
- .simple("Hello Camel K! #${exchangeProperty.CamelTimerCounter}")
-.to("jms:queue:" + mqQueue +
"?connectionFactory=#mqConnectionFactory");
-
-from("jms:queue:" + mqQueue +
"?connectionFactory=#mqConnectionFactory")
-.to("log:info");
-}
-
-private MQQueueConnectionFactory createWMQConnectionFactory(String mqHost)
{
-MQQueueConnectionFactory mqQueueConnectionFactory = new
MQQueueConnectionFactory();
-try {
-mqQueueConnectionFactory.setHostName(mqHost);
-mqQueueConnectionFactory.setChannel(mqChannel);
-mqQueueConnectionFactory.setPort(mqPort);
-mqQueueConnectionFactory.setQueueManager(mqQueueManager);
-
mqQueueConnectionFactory.setTransportType(WMQConstants.WMQ_CM_CLIENT);
-mqQueueConnectionFactory.setStringProperty(WMQConstants.USERID,
user);
-mqQueueConnectionFactory.setStringProperty(WMQConstants.PASSWORD,
password);
-} catch (Exception e) {
-e.printStackTrace();
-}
-return mqQueueConnectionFactory;
-}
-}
diff --git a/examples/ibm-mq/README.md b/examples/ibm-mq/README.md
deleted file mode 100644
index 08bd4a525..0
--- a/examples/ibm-mq/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Examples showing how to use Camel K to connect to an IBM MQ Server
-
-* Deploy the IBM MQ Server, as describe in the ibm-mq-server-deploy/README.md
-
-* Change the IBM MQ Server address in the MQRoute.java class file
-
-```
-ibmip=`kubectl get svc/ibm-mq-server -ojsonpath="{.spec.clusterIP}"`; sed -i
"/mqHost/s/\".*\"/\"$ibmip\"/g" MQRoute.java
-```
-
-For licensing reasons, the IBM MQ Java libraries are not defined in the routes
themselves, but you can declare the dependency while running the integration.
Alternatively you can use Kamel modeline to add the dependency in the route
file as a header.
-
-* Run the MQRoute.java. It is a producer and consumer of messages.
-
-```
-kamel run --dev MQRoute.java -d mvn:com.ibm.mq:com.ibm.mq.allclient:9.2.5.0
-```
-
-It will print the following output in
[GitHub] [camel-k] tadayosi merged pull request #3461: migrate ibm-mq example
tadayosi merged PR #3461: URL: https://github.com/apache/camel-k/pull/3461 -- 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-examples] 02/02: add more infomation to ibm-mq/README.md
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git
commit e4a67a6dc72d20d2447b981c0e42c7bcc2099e0b
Author: Kuthumi Pepple
AuthorDate: Tue Jul 19 15:33:33 2022 +0100
add more infomation to ibm-mq/README.md
---
generic-examples/ibm-mq/README.md | 26 +-
.../ibm-mq/ibm-mq-server-deploy/README.md | 2 +-
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/generic-examples/ibm-mq/README.md
b/generic-examples/ibm-mq/README.md
index 08bd4a5..e8c2ac7 100644
--- a/generic-examples/ibm-mq/README.md
+++ b/generic-examples/ibm-mq/README.md
@@ -1,6 +1,22 @@
# Examples showing how to use Camel K to connect to an IBM MQ Server
-* Deploy the IBM MQ Server, as describe in the ibm-mq-server-deploy/README.md
+The examples show the ways we can connect to an IBM MQ Server using Camel K
+
+You can find more information about Apache Camel and Apache Camel K on the
[official Camel website](https://camel.apache.org).
+
+## Before you begin
+
+Read the general instructions in the [root README.md file](/README.md) for
setting up your environment and the Kubernetes cluster before looking at this
example.
+
+Make sure you've read the [installation
instructions](https://camel.apache.org/camel-k/latest/installation/installation.html)
for your specific
+cluster before starting the example.
+
+## Additional Requirements for running the examples
+**An IBM MQ Server**: Queue manager for providing queuing services to clients.
For installation instructions, see [How to deploy an IBM MQ Server to a
Kubernetes cluster](./ibm-mq-server-deploy/) for demo purposes.
+
+## Running the examples
+
+* Deploy the IBM MQ Server, as described in the
[ibm-mq-server-deploy/README.md](./ibm-mq-server-deploy/README.md)
* Change the IBM MQ Server address in the MQRoute.java class file
@@ -8,7 +24,7 @@
ibmip=`kubectl get svc/ibm-mq-server -ojsonpath="{.spec.clusterIP}"`; sed -i
"/mqHost/s/\".*\"/\"$ibmip\"/g" MQRoute.java
```
-For licensing reasons, the IBM MQ Java libraries are not defined in the routes
themselves, but you can declare the dependency while running the integration.
Alternatively you can use Kamel modeline to add the dependency in the route
file as a header.
+For licensing reasons, the IBM MQ Java libraries are not defined in the routes
themselves, but you can declare the dependency while running the integration.
Alternatively, you can use Kamel modeline to add the dependency in the route
file as a header.
* Run the MQRoute.java. It is a producer and consumer of messages.
@@ -25,10 +41,10 @@ JmsConsumer[DEV.QUEUE.1]) Exchange[ExchangePattern: InOnly,
BodyType: String, Bo
* If you want to have a more streamlined declarative approach to run the
integration using Kamelets, you can use the routes in YAML format.
-The following kamel commands, has three distincts configurations:
-1. Declare de dependency of IBM MQ Java library as previously mentioned.
+The kamel commands below set the following configurations:
+1. As previously mentioned, declare as a dependency, the IBM MQ Java library.
2. Use the IBM MQ Server password set in a kubernetes `Secret` object.
-3. Set the IBM MQ Server IP address as a property to run the integration, so
the IBM MQ Cient can connect to the server.
+3. Set the IBM MQ Server IP address as a property to run the integration, so
the IBM MQ Client can connect to the server.
Run the integration to generate messages and send them to the IBM MQ Queue
(there is no output in the console)
diff --git a/generic-examples/ibm-mq/ibm-mq-server-deploy/README.md
b/generic-examples/ibm-mq/ibm-mq-server-deploy/README.md
index 4a0449e..f509743 100644
--- a/generic-examples/ibm-mq/ibm-mq-server-deploy/README.md
+++ b/generic-examples/ibm-mq/ibm-mq-server-deploy/README.md
@@ -1,4 +1,4 @@
-# How to deploy a IBM MQ Server to Kubernetes cluster
+# How to deploy an IBM MQ Server to a Kubernetes cluster
This is a very simple example to show how to install an IBM MQ Server.
**Note**, this is not ready for any production purpose.
[camel-k-examples] branch main updated (c9f92e8 -> e4a67a6)
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git
from c9f92e8 provide context to http examples
new 782a751 add ibm-mq example
new e4a67a6 add more infomation to ibm-mq/README.md
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:
generic-examples/ibm-mq/MQRoute.java | 66 ++
generic-examples/ibm-mq/README.md | 58 +++
.../ibm-mq/ibm-mq-server-deploy/README.md | 26 +
.../ibm-mq-server-deploy/ibm-mq-server.yaml} | 66 --
.../ibm-mq/jms-ibm-mq-sink-binding.yaml| 18 ++
.../ibm-mq/jms-ibm-mq-source-binding.yaml | 15 +
6 files changed, 232 insertions(+), 17 deletions(-)
create mode 100644 generic-examples/ibm-mq/MQRoute.java
create mode 100644 generic-examples/ibm-mq/README.md
create mode 100644 generic-examples/ibm-mq/ibm-mq-server-deploy/README.md
copy generic-examples/{databases/postgres-deploy/postgres-deployment.yaml =>
ibm-mq/ibm-mq-server-deploy/ibm-mq-server.yaml} (54%)
create mode 100644 generic-examples/ibm-mq/jms-ibm-mq-sink-binding.yaml
create mode 100644 generic-examples/ibm-mq/jms-ibm-mq-source-binding.yaml
[camel-k-examples] 01/02: add ibm-mq example
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-examples.git
commit 782a75133b7ec49320653e2b269e62738391abf7
Author: Kuthumi Pepple
AuthorDate: Sat Jul 16 22:41:08 2022 +0100
add ibm-mq example
---
generic-examples/ibm-mq/MQRoute.java | 66 ++
generic-examples/ibm-mq/README.md | 42
.../ibm-mq/ibm-mq-server-deploy/README.md | 26 +++
.../ibm-mq/ibm-mq-server-deploy/ibm-mq-server.yaml | 79 ++
.../ibm-mq/jms-ibm-mq-sink-binding.yaml| 18 +
.../ibm-mq/jms-ibm-mq-source-binding.yaml | 15
6 files changed, 246 insertions(+)
diff --git a/generic-examples/ibm-mq/MQRoute.java
b/generic-examples/ibm-mq/MQRoute.java
new file mode 100644
index 000..8ed1b38
--- /dev/null
+++ b/generic-examples/ibm-mq/MQRoute.java
@@ -0,0 +1,66 @@
+// camel-k: language=java
+/*
+ * 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.
+ */
+
+import com.ibm.mq.jms.MQQueueConnectionFactory;
+import com.ibm.msg.client.wmq.WMQConstants;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jms.JmsComponent;
+import org.apache.camel.impl.DefaultCamelContext;
+
+public class MQRoute extends RouteBuilder {
+
+static String mqHost = "10.108.69.161";
+static int mqPort = 1414;
+static String mqQueueManager = "QM1";
+static String mqChannel = "DEV.APP.SVRCONN";
+static String mqQueue = "DEV.QUEUE.1";
+static String user = "app";
+static String password = "ibmmqpasswd";
+
+@Override
+public void configure() {
+MQQueueConnectionFactory mqFactory =
createWMQConnectionFactory(mqHost);
+getContext().getRegistry().bind("mqConnectionFactory", mqFactory);
+
+from("timer:tick")
+.setBody()
+ .simple("Hello Camel K! #${exchangeProperty.CamelTimerCounter}")
+.to("jms:queue:" + mqQueue +
"?connectionFactory=#mqConnectionFactory");
+
+from("jms:queue:" + mqQueue +
"?connectionFactory=#mqConnectionFactory")
+.to("log:info");
+}
+
+private MQQueueConnectionFactory createWMQConnectionFactory(String mqHost)
{
+MQQueueConnectionFactory mqQueueConnectionFactory = new
MQQueueConnectionFactory();
+try {
+mqQueueConnectionFactory.setHostName(mqHost);
+mqQueueConnectionFactory.setChannel(mqChannel);
+mqQueueConnectionFactory.setPort(mqPort);
+mqQueueConnectionFactory.setQueueManager(mqQueueManager);
+
mqQueueConnectionFactory.setTransportType(WMQConstants.WMQ_CM_CLIENT);
+mqQueueConnectionFactory.setStringProperty(WMQConstants.USERID,
user);
+mqQueueConnectionFactory.setStringProperty(WMQConstants.PASSWORD,
password);
+} catch (Exception e) {
+e.printStackTrace();
+}
+return mqQueueConnectionFactory;
+}
+}
diff --git a/generic-examples/ibm-mq/README.md
b/generic-examples/ibm-mq/README.md
new file mode 100644
index 000..08bd4a5
--- /dev/null
+++ b/generic-examples/ibm-mq/README.md
@@ -0,0 +1,42 @@
+# Examples showing how to use Camel K to connect to an IBM MQ Server
+
+* Deploy the IBM MQ Server, as describe in the ibm-mq-server-deploy/README.md
+
+* Change the IBM MQ Server address in the MQRoute.java class file
+
+```
+ibmip=`kubectl get svc/ibm-mq-server -ojsonpath="{.spec.clusterIP}"`; sed -i
"/mqHost/s/\".*\"/\"$ibmip\"/g" MQRoute.java
+```
+
+For licensing reasons, the IBM MQ Java libraries are not defined in the routes
themselves, but you can declare the dependency while running the integration.
Alternatively you can use Kamel modeline to add the dependency in the route
file as a header.
+
+* Run the MQRoute.java. It is a producer and consumer of messages.
+
+```
+kamel run --dev MQRoute.java -d mvn:com.ibm.mq:com.ibm.mq.allclient:9.2.5.0
+```
+
+It will print the following output in the console
+
+```
+JmsConsumer[DEV.QUEUE.1]) Exchange[ExchangePattern: InOnly, BodyType: String,
[GitHub] [camel-k-examples] tadayosi merged pull request #63: Add IBM MQ example
tadayosi merged PR #63: URL: https://github.com/apache/camel-k-examples/pull/63 -- 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: Provides Makefile with ability to generate a test bundle index image
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new bb0e8f0e1 Provides Makefile with ability to generate a test bundle
index image
bb0e8f0e1 is described below
commit bb0e8f0e120c4da0fd654e18082d2d31b80e8ef1
Author: phantomjinx
AuthorDate: Mon Jul 18 15:04:19 2022 +0100
Provides Makefile with ability to generate a test bundle index image
* Allows building and testing of an OLM catalog containing the newly built
bundle and operator images as well as the existing released version
chain
* Updates the CSV name to the production name, ie. *-operator, after the
operator-sdk has generated and validated the bundle. Cannot do before as
the operator-sdk expect the CSV name to be the same as PACKAGE
* Improves operator-sdk rule by providing a detect-os rule rather than
using an if clause to download the corret platform binary
* Modifies the e2e test scripts to correct use the new variables in the
Makefile
---
.../kamel-build-bundle/build-bundle-image.sh | 18 +--
.../kamel-build-bundle/build-index-image.sh| 5 +-
.gitignore | 6 +-
script/Makefile| 71
script/build_bundle_index.sh | 129 +
5 files changed, 197 insertions(+), 32 deletions(-)
diff --git a/.github/actions/kamel-build-bundle/build-bundle-image.sh
b/.github/actions/kamel-build-bundle/build-bundle-image.sh
index 217c0cdf9..0bd0edb68 100755
--- a/.github/actions/kamel-build-bundle/build-bundle-image.sh
+++ b/.github/actions/kamel-build-bundle/build-bundle-image.sh
@@ -102,26 +102,28 @@ popd
#
# Build with the PUSH host to ensure the correct image:tag
# for docker to push the image.
+# Note: the CUSTOM_IMAGE must still reference the pull host
+# to allow the operator image to be found
#
-export
LOCAL_IMAGE_BUNDLE=${REGISTRY_PUSH_HOST}/${IMAGE_NAMESPACE}/camel-k-bundle:${IMAGE_VERSION}
+BUNDLE_IMAGE_BASE_NAME=$(basename $(make get-bundle-image))
+export
PUSH_BUNDLE_LOCAL_IMAGE=${REGISTRY_PUSH_HOST}/${IMAGE_NAMESPACE}/${BUNDLE_IMAGE_BASE_NAME}
export CUSTOM_IMAGE=${IMAGE_NAME}
+export CUSTOM_VERSION=${IMAGE_VERSION}
export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po
'\d+\.\d+')"
echo "PREV_XY_CHANNEL=${PREV_XY_CHANNEL}" >> $GITHUB_ENV
export NEW_XY_CHANNEL=stable-dev-$(make get-version | grep -Po "\d+\.\d+")
echo "NEW_XY_CHANNEL=${NEW_XY_CHANNEL}" >> $GITHUB_ENV
-make bundle-build \
- BUNDLE_IMAGE_NAME=${LOCAL_IMAGE_BUNDLE} \
+make bundle-push \
+ BUNDLE_IMAGE_NAME="${PUSH_BUNDLE_LOCAL_IMAGE}" \
DEFAULT_CHANNEL="${NEW_XY_CHANNEL}" \
CHANNELS="${NEW_XY_CHANNEL}"
-docker push ${LOCAL_IMAGE_BUNDLE}
-
#
# Use the PULL host to ensure the correct image:tag
# is passed into the tests for the deployment to pull from
#
-BUILD_BUNDLE_LOCAL_IMAGE="${REGISTRY_PULL_HOST}/${IMAGE_NAMESPACE}/camel-k-bundle:${IMAGE_VERSION}"
-echo "Setting build-bundle-local-image to ${BUILD_BUNDLE_LOCAL_IMAGE}"
-echo "::set-output name=build-bundle-local-image::${BUILD_BUNDLE_LOCAL_IMAGE}"
+PULL_BUNDLE_LOCAL_IMAGE="${REGISTRY_PULL_HOST}/${IMAGE_NAMESPACE}/${BUNDLE_IMAGE_BASE_NAME}:${IMAGE_VERSION}"
+echo "Setting build-bundle-local-image to ${PULL_BUNDLE_LOCAL_IMAGE}"
+echo "::set-output name=build-bundle-local-image::${PULL_BUNDLE_LOCAL_IMAGE}"
diff --git a/.github/actions/kamel-build-bundle/build-index-image.sh
b/.github/actions/kamel-build-bundle/build-index-image.sh
index 0078928fc..c8e61963e 100755
--- a/.github/actions/kamel-build-bundle/build-index-image.sh
+++ b/.github/actions/kamel-build-bundle/build-index-image.sh
@@ -172,8 +172,11 @@ if [ "${PULL_REGISTRY}" != "${PUSH_REGISTRY}" ]; then
# Tag the bundle image
#
echo "Tagging bundle image ..."
+ IMAGE_BASE_NAME=$(basename ${IMAGE_NAME})
+ export CUSTOM_IMAGE=${PUSH_REGISTRY}/${IMAGE_NAMESPACE}/${IMAGE_BASE_NAME}
+ export CUSTOM_VERSION=${IMAGE_VERSION}
docker tag \
-${PUSH_REGISTRY}/${IMAGE_NAMESPACE}/camel-k-bundle:${IMAGE_VERSION} \
+$(make get-bundle-image):${CUSTOM_VERSION} \
${BUNDLE_IMAGE}
# Push the bundle image to the registry
diff --git a/.gitignore b/.gitignore
index 3c195619b..75e386502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,9 @@
# Bundle directory
/bundle
-# Catalog directory
-/catalog
-catalog.Dockerfile
+# Bundle Index directory
+/index
+index.Dockerfile
# IDEs
.idea
diff --git a/script/Makefile b/script/Makefile
index c0a5c6886..878e90025 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -15,7 +15,6 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 1.10.0-SNAPSHOT
-OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION))
LAST_RELEASED_IMAGE_NAME := camel-k-operator
[GitHub] [camel-k] tadayosi merged pull request #3468: Provides Makefile with ability to generate a test bundle index image
tadayosi merged PR #3468: URL: https://github.com/apache/camel-k/pull/3468 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on issue #3442: Unable to run an integration on Minikube
tadayosi commented on issue #3442: URL: https://github.com/apache/camel-k/issues/3442#issuecomment-1196171964 Hi, Sorry, my bad. When you installed operator with `kamel install --global` you shouldn't need to run the following. My previous instruction was wrong. ``` kamel install --skip-operator-setup -n $NS ``` What happens if you do the same steps above but without `kamel install --skip-operator-setup`? Does it go back to the original issue? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch automatic-periodic-sync updated (10c47192fbc -> 6187140a829)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git omit 10c47192fbc [create-pull-request] automated change add feeb3677d3c [create-pull-request] automated change add 6187140a829 [create-pull-request] automated change This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (10c47192fbc) \ N -- N -- N refs/heads/automatic-periodic-sync (6187140a829) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../catalog/components/kubernetes-config-maps.json | 30 -- .../springboot/catalog/components/salesforce.json | 3 ++- .../src/main/docs/kubernetes.json | 7 + ...KubernetesConfigMapsComponentConfiguration.java | 17 4 files changed, 48 insertions(+), 9 deletions(-)
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #598: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
github-actions[bot] opened a new pull request, #598: URL: https://github.com/apache/camel-spring-boot/pull/598 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.58.0 updated (6466595cc -> fa66fa82e)
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-operator/prometheus-operator/pkg/apis/monitoring-0.58.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git discard 6466595cc chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring add a983b01dd fix(doc): standardise Camel dependency notation in docs and examples add 132dcebd1 Updated CHANGELOG.md add d108d0305 fix(core): cascade Integration error when kit in... add 4e90cc577 fix(ci): build before making images add aa9c2787c fix(ci): common & install e2e workflows fail silently add ed98e5e64 fix(e2e): fix failing e2e tests add 2a538884e fix(cli): fix kamel promote resources validation add 569fa13ed fix(trait): fix kameletbinding traits merge on integration add 95367ef68 fix(e2e): fix TestOperatorIDFiltering add aa1bfbcb8 chore(e2e): skip failing native build tests for OCP3 add 5c003373c chore(cli): refactor run command add 8434df6e5 fix(cli): run Integration from GitHub branch add fa66fa82e chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6466595cc) \ N -- N -- N refs/heads/dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.58.0 (fa66fa82e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGELOG.md | 2 + .../ROOT/pages/configuration/dependencies.adoc | 8 +- .../pages/configuration/runtime-resources.adoc | 2 +- .../ROOT/pages/contributing/developers.adoc| 2 +- e2e/global/builder/build_test.go | 5 + e2e/global/common/build/incremental_build_test.go | 2 +- e2e/global/common/config/config_test.go| 10 +- e2e/global/common/files/timer-kamelet-usage.groovy | 19 --- e2e/global/common/integration_fail_test.go | 26 ++- e2e/global/common/languages/groovy_test.go | 2 +- e2e/global/common/languages/init_test_support.go | 4 +- e2e/global/common/languages/java_test.go | 2 +- e2e/global/common/languages/js_test.go | 2 +- e2e/global/common/languages/kotlin_test.go | 2 +- e2e/global/common/languages/xml_test.go| 2 +- e2e/global/common/languages/yaml_test.go | 2 +- e2e/global/common/operator_metrics_test.go | 2 +- e2e/global/common/traits/jvm_test.go | 2 +- e2e/global/common/traits/openapi_test.go | 2 +- e2e/namespace/install/cli/describe_test.go | 2 +- e2e/namespace/install/cli/dev_mode_test.go | 2 +- .../install/cli/duplicate_parameters_test.go | 9 +- .../install/cli}/files/Java.java | 0 .../install/cli}/files/promote-route.groovy| 0 .../cli}/files/resource-file-location-route.groovy | 0 e2e/namespace/install/cli/global_kamelet_test.go | 5 +- e2e/namespace/install/cli/global_test.go | 1 + e2e/namespace/install/cli/install_test.go | 5 +- .../install/cli}/promote_test.go | 21 ++- e2e/namespace/install/cli/run_test.go | 53 -- e2e/namespace/install/maven_http_proxy_test.go | 5 +- .../install/operator_id_filtering_test.go | 18 +- e2e/namespace/native/native_test.go| 6 + e2e/support/test_support.go| 6 +- examples/pulsar/pulsar.groovy | 2 +- examples/saga/README.md| 8 +- examples/traits/tracing/InventoryService.java | 4 +- examples/traits/tracing/OrderService.java | 4 +- examples/traits/tracing/README.md | 4 +- .../user-config/resource-file-binary-route.groovy | 2 +- go.mod | 2 +- go.sum | 3 +- pkg/apis/camel/go.mod | 4 +- pkg/apis/camel/go.sum | 8 +- pkg/apis/camel/v1/common_types_support.go | 40 + pkg/apis/camel/v1/common_types_support_test.go | 131 +++ pkg/client/camel/go.mod| 5 +-
[camel-k] branch dependabot/go_modules/github.com/stretchr/testify-1.8.0 updated (522762eb5 -> 34decccc7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/stretchr/testify-1.8.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git discard 522762eb5 chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.8.0 add 88ebd002c [TEST] Add kamel debug test add ce2e4ec4a chore: small updates on Makefile add 91b9d5d49 Updated CHANGELOG.md add f1b7f1df6 fix(doc): fix camel-website build add ece4b5bd5 chore(lint): upgrade golangci-lint to 1.46.2 add a01da91dc chore(lint): fix nonamedreturns add 5d351d0f2 chore(lint): fix containedctx add af1bb836d chore(lint): suppress maintidx with TODO for later refactoring add 817435064 chore(lint): fix forcetypeassert add 4890d5235 chore(lint): fix ifshort add ef8dcf874 chore(lint): fix errorlint add 2bf7be9e4 chore(lint): fix prealloc add 4bcda6c07 chore(lint): fix unparam add eafde47d4 Updated CHANGELOG.md add 1d523e5f5 chore(e2e): reorg and clean up e2e/global/builder add 0cd7f11fc chore(e2e): refactor e2e/global/common add 72c72302b chore(e2e): reuse namespace for e2e/global/knative add 4ba7a2765 chore(e2e): move Java file to files/ for e2e/global/service-binding add bbf486c72 chore(e2e): reuse namespace for e2e/namespace/install add aa681a7a4 chore(e2e): move test files to files/ for e2e/namespace/native add 69cdfc25e chore(e2e): more namespace reuse for e2e/global/common add d08e12116 fix(e2e): fix knative test add 19eea8d2d chore(e2e): rename kamel run test function add 249c122ac Updated CHANGELOG.md add c28d7d3eb Updated CHANGELOG.md add a0286f4b1 migrate and improve http example add 9b8588b58 fix(olm): fix profile name: Openshift -> OpenShift add 16caeaf2d fix(trait): more robust, case-insensitive trait profile comparison add e356f4836 Updated CHANGELOG.md add 579c69c12 chore(lint): upgrade golangci-lint to 1.47.1 add cecaf715e Updated CHANGELOG.md add ddb86ab73 fix(doc): fix doc-gen to insert space between lines add f3ba7b180 Updated CHANGELOG.md add b9ebaef13 chore(api): refer to correct trait add 3cedfa0dd fix(trait): nil pointer dereference applying trait during kit building add b004a5a25 Updated CHANGELOG.md add 525af63cb chore(knative): upgrade Knative to 1.3 (0.30) #3381 add a983b01dd fix(doc): standardise Camel dependency notation in docs and examples add 132dcebd1 Updated CHANGELOG.md add d108d0305 fix(core): cascade Integration error when kit in... add 4e90cc577 fix(ci): build before making images add aa9c2787c fix(ci): common & install e2e workflows fail silently add ed98e5e64 fix(e2e): fix failing e2e tests add 2a538884e fix(cli): fix kamel promote resources validation add 569fa13ed fix(trait): fix kameletbinding traits merge on integration add 95367ef68 fix(e2e): fix TestOperatorIDFiltering add aa1bfbcb8 chore(e2e): skip failing native build tests for OCP3 add 5c003373c chore(cli): refactor run command add 8434df6e5 fix(cli): run Integration from GitHub branch add 34de7 chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.8.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (522762eb5) \ N -- N -- N refs/heads/dependabot/go_modules/github.com/stretchr/testify-1.8.0 (34de7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../kamel-install-knative/install-knative.sh | 10 +- .github/workflows/validate.yml | 2 +- .golangci.yml | 2 + CHANGELOG.md | 25 ++ addons/keda/keda.go| 3 +- addons/master/master.go| 12 +- addons/threescale/3scale.go| 6 +- addons/threescale/3scale_test.go | 12 +- addons/tracing/tracing.go | 2 +- addons/tracing/tracing_test.go | 5 +- cmd/util/doc-gen/generators/traitmetadatagen.go| 2 +- cmd/util/json-schema-gen/main.go | 14 +- cmd/util/platform-check/main.go| 2 +- .../camel.apache.org_integrationplatforms.yaml | 8 +-
[camel-k] branch dependabot/go_modules/github.com/operator-framework/api-0.15.0 updated (d840cb6a2 -> 3b5f3b4cf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/operator-framework/api-0.15.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git discard d840cb6a2 chore(deps): bump github.com/operator-framework/api add a983b01dd fix(doc): standardise Camel dependency notation in docs and examples add 132dcebd1 Updated CHANGELOG.md add d108d0305 fix(core): cascade Integration error when kit in... add 4e90cc577 fix(ci): build before making images add aa9c2787c fix(ci): common & install e2e workflows fail silently add ed98e5e64 fix(e2e): fix failing e2e tests add 2a538884e fix(cli): fix kamel promote resources validation add 569fa13ed fix(trait): fix kameletbinding traits merge on integration add 95367ef68 fix(e2e): fix TestOperatorIDFiltering add aa1bfbcb8 chore(e2e): skip failing native build tests for OCP3 add 5c003373c chore(cli): refactor run command add 8434df6e5 fix(cli): run Integration from GitHub branch add 3b5f3b4cf chore(deps): bump github.com/operator-framework/api This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d840cb6a2) \ N -- N -- N refs/heads/dependabot/go_modules/github.com/operator-framework/api-0.15.0 (3b5f3b4cf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGELOG.md | 2 + .../ROOT/pages/configuration/dependencies.adoc | 8 +- .../pages/configuration/runtime-resources.adoc | 2 +- .../ROOT/pages/contributing/developers.adoc| 2 +- e2e/global/builder/build_test.go | 5 + e2e/global/common/build/incremental_build_test.go | 2 +- e2e/global/common/config/config_test.go| 10 +- e2e/global/common/files/timer-kamelet-usage.groovy | 19 --- e2e/global/common/integration_fail_test.go | 26 ++- e2e/global/common/languages/groovy_test.go | 2 +- e2e/global/common/languages/init_test_support.go | 4 +- e2e/global/common/languages/java_test.go | 2 +- e2e/global/common/languages/js_test.go | 2 +- e2e/global/common/languages/kotlin_test.go | 2 +- e2e/global/common/languages/xml_test.go| 2 +- e2e/global/common/languages/yaml_test.go | 2 +- e2e/global/common/operator_metrics_test.go | 2 +- e2e/global/common/traits/jvm_test.go | 2 +- e2e/global/common/traits/openapi_test.go | 2 +- e2e/namespace/install/cli/describe_test.go | 2 +- e2e/namespace/install/cli/dev_mode_test.go | 2 +- .../install/cli/duplicate_parameters_test.go | 9 +- .../install/cli}/files/Java.java | 0 .../install/cli}/files/promote-route.groovy| 0 .../cli}/files/resource-file-location-route.groovy | 0 e2e/namespace/install/cli/global_kamelet_test.go | 5 +- e2e/namespace/install/cli/global_test.go | 1 + e2e/namespace/install/cli/install_test.go | 5 +- .../install/cli}/promote_test.go | 21 ++- e2e/namespace/install/cli/run_test.go | 53 -- e2e/namespace/install/maven_http_proxy_test.go | 5 +- .../install/operator_id_filtering_test.go | 18 +- e2e/namespace/native/native_test.go| 6 + e2e/support/test_support.go| 6 +- examples/pulsar/pulsar.groovy | 2 +- examples/saga/README.md| 8 +- examples/traits/tracing/InventoryService.java | 4 +- examples/traits/tracing/OrderService.java | 4 +- examples/traits/tracing/README.md | 4 +- .../user-config/resource-file-binary-route.groovy | 2 +- go.mod | 4 +- go.sum | 6 +- pkg/apis/camel/go.mod | 4 +- pkg/apis/camel/go.sum | 8 +- pkg/apis/camel/v1/common_types_support.go | 40 + pkg/apis/camel/v1/common_types_support_test.go | 131 +++ pkg/client/camel/go.mod| 5 +- pkg/client/camel/go.sum| 8 +- pkg/cmd/modeline.go| 4 +- pkg/cmd/promote.go
[camel-k] 01/02: chore(cli): refactor run command
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5c003373cb24b1a5a81aaad96a4ba6c35b070049
Author: Tadayoshi Sato
AuthorDate: Tue Jul 26 20:22:28 2022 +0900
chore(cli): refactor run command
---
pkg/cmd/run.go | 5 +-
pkg/cmd/util_sources.go | 174 +++-
2 files changed, 85 insertions(+), 94 deletions(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 79aab3856..e84a628e6 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -920,9 +920,8 @@ func getMountPath(targetPath string, dirName string, path
string) (string, error
return filepath.Join(targetPath, localRelativePath), nil
}
-// nolint:errcheck
func (o *runCmdOptions) uploadPomFromJar(gav maven.Dependency, path string,
platform *v1.IntegrationPlatform, ns string, options spectrum.Options, cmd
*cobra.Command) maven.Dependency {
- util.WithTempDir("camel-k", func(tmpDir string) error {
+ _ = util.WithTempDir("camel-k", func(tmpDir string) error {
pomPath := filepath.Join(tmpDir, "pom.xml")
jar, err := zip.OpenReader(path)
if err != nil {
@@ -954,7 +953,7 @@ func (o *runCmdOptions) uploadPomFromJar(gav
maven.Dependency, path string, plat
} else {
gav.Type = "pom"
// Swallow error as this is not a mandatory step
- o.uploadAsMavenArtifact(gav, pomPath, platform,
ns, options, cmd)
+ _ = o.uploadAsMavenArtifact(gav, pomPath,
platform, ns, options, cmd)
}
}
return nil
diff --git a/pkg/cmd/util_sources.go b/pkg/cmd/util_sources.go
index 991bf9eab..1c6563886 100644
--- a/pkg/cmd/util_sources.go
+++ b/pkg/cmd/util_sources.go
@@ -35,7 +35,7 @@ import (
"github.com/pkg/errors"
)
-// Source ---.
+// Source represents the source file of an Integration.
type Source struct {
Origin string
Location string
@@ -60,7 +60,7 @@ func (s *Source) setContent(content []byte) error {
return nil
}
-// ResolveSources ---.
+// ResolveSources resolves sources from a variety of locations including local
and remote.
func ResolveSources(ctx context.Context, locations []string, compress bool,
cmd *cobra.Command) ([]Source, error) {
sources := make([]Source, 0, len(locations))
@@ -71,7 +71,7 @@ func ResolveSources(ctx context.Context, locations []string,
compress bool, cmd
}
if ok {
- answer, err := ResolveLocalSource(location, compress)
+ answer, err := resolveLocalSource(location, compress)
if err != nil {
return sources, err
}
@@ -85,101 +85,26 @@ func ResolveSources(ctx context.Context, locations
[]string, compress bool, cmd
switch {
case u.Scheme == gistScheme ||
strings.HasPrefix(location, "https://gist.github.com/;):
- var tc *http.Client
-
- if token, ok := os.LookupEnv("GITHUB_TOKEN");
ok {
- ts :=
oauth2.StaticTokenSource({AccessToken: token})
- tc = oauth2.NewClient(ctx, ts)
-
- fmt.Fprintln(cmd.OutOrStdout(),
"GITHUB_TOKEN env var detected, using it for GitHub APIs authentication")
- }
-
- gc := github.NewClient(tc)
- gistID := ""
-
- if strings.HasPrefix(location,
"https://gist.github.com/;) {
- names :=
util.FindNamedMatches(`^https://gist.github.com/(([a-zA-Z0-9]*)/)?(?P[a-zA-Z0-9]*)$`,
location)
- if value, ok := names["gistid"]; ok {
- gistID = value
- }
- } else {
- gistID = u.Opaque
- }
-
- if gistID == "" {
- return sources, fmt.Errorf("unable to
determining gist id from %s", location)
- }
-
- gists, _, err := gc.Gists.Get(ctx, gistID)
+ answer, err := resolveGistSource(ctx, location,
compress, cmd, u)
if err != nil {
return sources, err
}
-
- for _, v := range gists.Files {
-
[camel-k] 02/02: fix(cli): run Integration from GitHub branch
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8434df6e541ae5bff9b1dbb0609d0280b8945fba
Author: Tadayoshi Sato
AuthorDate: Tue Jul 26 22:01:22 2022 +0900
fix(cli): run Integration from GitHub branch
Fix #3475
---
e2e/namespace/install/cli/run_test.go | 53 +--
pkg/cmd/modeline.go | 4 +--
pkg/cmd/util_sources.go | 7 -
pkg/util/util.go | 9 ++
pkg/util/util_test.go | 10 +++
5 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/e2e/namespace/install/cli/run_test.go
b/e2e/namespace/install/cli/run_test.go
index 14922aef0..4bca39e8a 100644
--- a/e2e/namespace/install/cli/run_test.go
+++ b/e2e/namespace/install/cli/run_test.go
@@ -43,26 +43,43 @@ func TestKamelCLIRun(t *testing.T) {
t.Run("Examples from GitHub", func(t *testing.T) {
t.Run("Java", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
"github:apache/camel-k/e2e/namespace/install/files/Java.java").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns,
+
"github:apache/camel-k/e2e/namespace/install/files/Java.java").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns,
"java", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationConditionStatus(ns,
"java", v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "java"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
})
t.Run("Java (RAW)", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
"https://raw.githubusercontent.com/apache/camel-k/main/e2e/namespace/install/files/Java.java;).Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns,
+
"https://raw.githubusercontent.com/apache/camel-k/main/e2e/namespace/install/files/Java.java;).Execute()).
+ To(Succeed())
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns,
"java", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationConditionStatus(ns,
"java", v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, "java"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ })
+
+ t.Run("Java (branch)", func(t *testing.T) {
+ Expect(KamelRunWithID(operatorID, ns,
+
"github:apache/camel-k/e2e/namespace/install/files/Java.java?branch=main").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns,
"java", v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "java"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
})
t.Run("Gist (ID)", func(t *testing.T) {
name := "github-gist-id"
- Expect(KamelRunWithID(operatorID, ns, "--name",
name, "gist:e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
+ Expect(KamelRunWithID(operatorID, ns, "--name",
name,
+
"gist:e2c3f9a5fd0d9e79b21b04809786f17a").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
[camel-k] branch main updated (aa1bfbcb8 -> 8434df6e5)
This is an automated email from the ASF dual-hosted git repository. tsato pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from aa1bfbcb8 chore(e2e): skip failing native build tests for OCP3 new 5c003373c chore(cli): refactor run command new 8434df6e5 fix(cli): run Integration from GitHub branch 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: e2e/namespace/install/cli/run_test.go | 53 +++--- pkg/cmd/modeline.go | 4 +- pkg/cmd/run.go| 5 +- pkg/cmd/util_sources.go | 181 +- pkg/util/util.go | 9 ++ pkg/util/util_test.go | 10 ++ 6 files changed, 150 insertions(+), 112 deletions(-)
[GitHub] [camel-k] tadayosi merged pull request #3489: fix(cli): run Integration from GitHub branch
tadayosi merged PR #3489: URL: https://github.com/apache/camel-k/pull/3489 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi closed issue #3475: Integration cannot be run from github with different branch
tadayosi closed issue #3475: Integration cannot be run from github with different branch URL: https://github.com/apache/camel-k/issues/3475 -- 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] 03/06: fix(cli): fix kamel promote resources validation
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2a538884e9873aa2d3b93c7f64bbb219f9f21dcf
Author: Tadayoshi Sato
AuthorDate: Mon Jul 25 15:56:03 2022 +0900
fix(cli): fix kamel promote resources validation
---
pkg/cmd/promote.go | 83 +-
1 file changed, 51 insertions(+), 32 deletions(-)
diff --git a/pkg/cmd/promote.go b/pkg/cmd/promote.go
index 4eb216c89..bf81e3e81 100644
--- a/pkg/cmd/promote.go
+++ b/pkg/cmd/promote.go
@@ -20,6 +20,7 @@ package cmd
import (
"context"
"fmt"
+ "reflect"
"regexp"
"strings"
@@ -194,43 +195,61 @@ func (o *promoteCmdOptions) validateDestResources(c
client.Client, it *v1.Integr
for t, v := range mount {
switch t {
case "configs":
- if list, ok := v.([]string); ok {
- for _, cn := range list {
- if conf, parseErr :=
resource.ParseConfig(cn); parseErr == nil {
- if conf.StorageType() ==
resource.StorageTypeConfigmap {
- configmaps =
append(configmaps, conf.Name())
- } else if conf.StorageType() ==
resource.StorageTypeSecret {
- secrets =
append(secrets, conf.Name())
- }
- } else {
- return parseErr
+ list, ok := v.([]interface{})
+ if !ok {
+ return fmt.Errorf("invalid %s type: %s, value:
%s", t, reflect.TypeOf(v), v)
+ }
+ for _, cn := range list {
+ s, ok := cn.(string)
+ if !ok {
+ return fmt.Errorf("invalid %s type: %s,
value: %s", t, reflect.TypeOf(cn), cn)
+ }
+ if conf, parseErr := resource.ParseConfig(s);
parseErr == nil {
+ if conf.StorageType() ==
resource.StorageTypeConfigmap {
+ configmaps = append(configmaps,
conf.Name())
+ } else if conf.StorageType() ==
resource.StorageTypeSecret {
+ secrets = append(secrets,
conf.Name())
}
+ } else {
+ return parseErr
}
}
case "resources":
- if list, ok := v.([]string); ok {
- for _, cn := range list {
- if conf, parseErr :=
resource.ParseResource(cn); parseErr == nil {
- if conf.StorageType() ==
resource.StorageTypeConfigmap {
- configmaps =
append(configmaps, conf.Name())
- } else if conf.StorageType() ==
resource.StorageTypeSecret {
- secrets =
append(secrets, conf.Name())
- }
- } else {
- return parseErr
+ list, ok := v.([]interface{})
+ if !ok {
+ return fmt.Errorf("invalid %s type: %s, value:
%s", t, reflect.TypeOf(v), v)
+ }
+ for _, cn := range list {
+ s, ok := cn.(string)
+ if !ok {
+ return fmt.Errorf("invalid %s type: %s,
value: %s", t, reflect.TypeOf(cn), cn)
+ }
+ if conf, parseErr := resource.ParseResource(s);
parseErr == nil {
+ if conf.StorageType() ==
resource.StorageTypeConfigmap {
+ configmaps = append(configmaps,
conf.Name())
+ } else if conf.StorageType() ==
resource.StorageTypeSecret {
+ secrets = append(secrets,
conf.Name())
}
+ } else {
+ return parseErr
}
}
case
[camel-k] 02/06: fix(e2e): fix failing e2e tests
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ed98e5e6430ade52e89152ffde29a01cc88e5bb5
Author: Tadayoshi Sato
AuthorDate: Mon Jul 25 14:03:00 2022 +0900
fix(e2e): fix failing e2e tests
---
e2e/global/common/config/config_test.go | 8
e2e/global/common/languages/groovy_test.go | 2 +-
e2e/global/common/languages/init_test_support.go| 4 ++--
e2e/global/common/languages/java_test.go| 2 +-
e2e/global/common/languages/js_test.go | 2 +-
e2e/global/common/languages/kotlin_test.go | 2 +-
e2e/global/common/languages/xml_test.go | 2 +-
e2e/global/common/languages/yaml_test.go| 2 +-
e2e/global/common/operator_metrics_test.go | 2 +-
e2e/global/common/traits/jvm_test.go| 2 +-
e2e/global/common/traits/openapi_test.go| 2 +-
e2e/namespace/install/cli/describe_test.go | 2 +-
e2e/namespace/install/cli/dev_mode_test.go | 2 +-
.../install/cli/duplicate_parameters_test.go| 9 +++--
.../install/cli/files/Java.java}| 19 +++
.../install/cli}/files/promote-route.groovy | 0
.../cli/files/resource-file-location-route.groovy} | 5 +++--
e2e/namespace/install/cli/global_kamelet_test.go| 5 ++---
e2e/namespace/install/cli/global_test.go| 1 +
e2e/namespace/install/cli/install_test.go | 5 +++--
.../install/cli}/promote_test.go| 21 -
e2e/namespace/install/maven_http_proxy_test.go | 5 ++---
e2e/namespace/install/operator_id_filtering_test.go | 4
e2e/support/test_support.go | 6 +++---
24 files changed, 65 insertions(+), 49 deletions(-)
diff --git a/e2e/global/common/config/config_test.go
b/e2e/global/common/config/config_test.go
index 7dc60fe48..cda0c2990 100644
--- a/e2e/global/common/config/config_test.go
+++ b/e2e/global/common/config/config_test.go
@@ -73,13 +73,13 @@ func TestRunConfigExamples(t *testing.T) {
// Store a configmap on the cluster
var cmData = make(map[string]string)
cmData["my-configmap-key"] = "my-configmap-content"
- NewPlainTextConfigmap(ns, "my-cm", cmData)
+ CreatePlainTextConfigmap(ns, "my-cm", cmData)
// Store a configmap with multiple values
var cmDataMulti = make(map[string]string)
cmDataMulti["my-configmap-key"] = "should-not-see-it"
cmDataMulti["my-configmap-key-2"] = "my-configmap-content-2"
- NewPlainTextConfigmap(ns, "my-cm-multi", cmDataMulti)
+ CreatePlainTextConfigmap(ns, "my-cm-multi", cmDataMulti)
t.Run("Config configmap", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
"./files/config-configmap-route.groovy", "--config",
"configmap:my-cm").Execute()).To(Succeed())
@@ -123,7 +123,7 @@ func TestRunConfigExamples(t *testing.T) {
// Store a configmap as property file
var cmDataProps = make(map[string]string)
cmDataProps["my.properties"] = "my.key.1=hello\nmy.key.2=world"
- NewPlainTextConfigmap(ns, "my-cm-properties", cmDataProps)
+ CreatePlainTextConfigmap(ns, "my-cm-properties", cmDataProps)
t.Run("Config configmap as property file", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
"./files/config-configmap-properties-route.groovy", "--config",
"configmap:my-cm-properties").Execute()).To(Succeed())
@@ -138,7 +138,7 @@ func TestRunConfigExamples(t *testing.T) {
// Store a secret on the cluster
var secData = make(map[string]string)
secData["my-secret-key"] = "very top secret"
- NewPlainTextSecret(ns, "my-sec", secData)
+ CreatePlainTextSecret(ns, "my-sec", secData)
t.Run("Config secret", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
"./files/config-secret-route.groovy", "--config",
"secret:my-sec").Execute()).To(Succeed())
diff --git a/e2e/global/common/languages/groovy_test.go
b/e2e/global/common/languages/groovy_test.go
index 17f8c896a..5c35e67e3 100644
--- a/e2e/global/common/languages/groovy_test.go
+++ b/e2e/global/common/languages/groovy_test.go
@@ -47,7 +47,7 @@ func TestRunSimpleGroovyExamples(t *testing.T) {
})
t.Run("init run groovy", func(t *testing.T) {
- RunInitGeneratedExample(camelv1.LanguageGroovy, ns, t)
+ RunInitGeneratedExample(t, operatorID, ns,
camelv1.LanguageGroovy)
})
})
}
diff --git
[camel-k] branch main updated (4e90cc577 -> aa1bfbcb8)
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 4e90cc577 fix(ci): build before making images
new aa9c2787c fix(ci): common & install e2e workflows fail silently
new ed98e5e64 fix(e2e): fix failing e2e tests
new 2a538884e fix(cli): fix kamel promote resources validation
new 569fa13ed fix(trait): fix kameletbinding traits merge on integration
new 95367ef68 fix(e2e): fix TestOperatorIDFiltering
new aa1bfbcb8 chore(e2e): skip failing native build tests for OCP3
The 6 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:
e2e/global/builder/build_test.go | 5 +
e2e/global/common/config/config_test.go| 8 +-
e2e/global/common/files/timer-kamelet-usage.groovy | 19 ---
e2e/global/common/languages/groovy_test.go | 2 +-
e2e/global/common/languages/init_test_support.go | 4 +-
e2e/global/common/languages/java_test.go | 2 +-
e2e/global/common/languages/js_test.go | 2 +-
e2e/global/common/languages/kotlin_test.go | 2 +-
e2e/global/common/languages/xml_test.go| 2 +-
e2e/global/common/languages/yaml_test.go | 2 +-
e2e/global/common/operator_metrics_test.go | 2 +-
e2e/global/common/traits/jvm_test.go | 2 +-
e2e/global/common/traits/openapi_test.go | 2 +-
e2e/namespace/install/cli/describe_test.go | 2 +-
e2e/namespace/install/cli/dev_mode_test.go | 2 +-
.../install/cli/duplicate_parameters_test.go | 9 +-
.../install/cli}/files/Java.java | 0
.../install/cli}/files/promote-route.groovy| 0
.../cli}/files/resource-file-location-route.groovy | 0
e2e/namespace/install/cli/global_kamelet_test.go | 5 +-
e2e/namespace/install/cli/global_test.go | 1 +
e2e/namespace/install/cli/install_test.go | 5 +-
.../install/cli}/promote_test.go | 21 ++--
e2e/namespace/install/maven_http_proxy_test.go | 5 +-
.../install/operator_id_filtering_test.go | 18 +--
e2e/namespace/native/native_test.go| 6 +
e2e/support/test_support.go| 6 +-
go.mod | 4 +-
go.sum | 6 +-
pkg/apis/camel/go.mod | 4 +-
pkg/apis/camel/go.sum | 8 +-
pkg/apis/camel/v1/common_types_support.go | 40 +++
pkg/apis/camel/v1/common_types_support_test.go | 131 +
pkg/client/camel/go.mod| 5 +-
pkg/client/camel/go.sum| 8 +-
pkg/cmd/promote.go | 83 -
pkg/controller/kameletbinding/integration.go | 4 +-
pkg/kamelet/repository/go.mod | 5 +-
pkg/kamelet/repository/go.sum | 8 +-
script/Makefile| 22 ++--
40 files changed, 339 insertions(+), 123 deletions(-)
delete mode 100644 e2e/global/common/files/timer-kamelet-usage.groovy
copy e2e/{global/common/build => namespace/install/cli}/files/Java.java (100%)
rename e2e/{global/common => namespace/install/cli}/files/promote-route.groovy
(100%)
copy e2e/{global/common/config =>
namespace/install/cli}/files/resource-file-location-route.groovy (100%)
rename e2e/{global/common => namespace/install/cli}/promote_test.go (88%)
create mode 100644 pkg/apis/camel/v1/common_types_support_test.go
[camel-k] 04/06: fix(trait): fix kameletbinding traits merge on integration
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 569fa13ed9972421daa66c6f3d374e4c56f9e789 Author: Tadayoshi Sato AuthorDate: Tue Jul 26 00:17:36 2022 +0900 fix(trait): fix kameletbinding traits merge on integration --- go.mod | 4 +- go.sum | 6 +- pkg/apis/camel/go.mod | 4 +- pkg/apis/camel/go.sum | 8 +- pkg/apis/camel/v1/common_types_support.go | 40 pkg/apis/camel/v1/common_types_support_test.go | 131 + pkg/client/camel/go.mod| 5 +- pkg/client/camel/go.sum| 8 +- pkg/controller/kameletbinding/integration.go | 4 +- pkg/kamelet/repository/go.mod | 5 +- pkg/kamelet/repository/go.sum | 8 +- 11 files changed, 208 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index dfa5c..9af171225 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 k8s.io/klog/v2 v2.40.1 k8s.io/kubectl v0.22.5 - k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 + k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e knative.dev/eventing v0.30.3 knative.dev/pkg v0.0.0-20220301181942-2fdd5f232e77 knative.dev/serving v0.30.0 @@ -111,7 +111,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/imdario/mergo v0.3.12 // indirect + github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kelseyhightower/envconfig v1.4.0 // indirect diff --git a/go.sum b/go.sum index 3a4c4fa9f..ea70353e5 100644 --- a/go.sum +++ b/go.sum @@ -799,8 +799,9 @@ github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a/go.mod h1:9GkyshztGufsdPQWjH+ifgnIr3xNUL5syI70g2dzU1o= @@ -2137,8 +2138,9 @@ k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO/+0oOQPRFrClpo= k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e h1:W1yba+Bpkwb5BatGKZALQ1yylhwnuD6CkYmrTibyLDM= +k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/caching v0.0.0-20220302153644-5a6403ef2de5/go.mod h1:52//2yvw0iO3Nu2duAMI5BzfQKHWiXZuvRvzaypoGkU= knative.dev/eventing v0.30.3 h1:phw3Uw/iSQGo3BJokCbfb0+zpbwwbYdg2w+UKE46lk0= knative.dev/eventing v0.30.3/go.mod h1:JCqC8evTls1WiBTmYhPEGME6OQD8HFnLQjFPImwOEOg= diff --git a/pkg/apis/camel/go.mod b/pkg/apis/camel/go.mod index d825b8b33..8b6e3d2a3 100644 --- a/pkg/apis/camel/go.mod +++ b/pkg/apis/camel/go.mod @@ -3,9 +3,11 @@ module github.com/apache/camel-k/pkg/apis/camel go 1.17 require ( + github.com/imdario/mergo v0.3.13 github.com/stretchr/testify v1.7.0 k8s.io/api v0.22.5 k8s.io/apimachinery v0.22.5 + k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e ) require ( @@ -22,7 +24,7 @@ require ( golang.org/x/text v0.3.6 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.0 // indirect
[camel-k] 05/06: fix(e2e): fix TestOperatorIDFiltering
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 95367ef684572ffa342e2c69399df855f94ef6a0
Author: Tadayoshi Sato
AuthorDate: Tue Jul 26 16:52:59 2022 +0900
fix(e2e): fix TestOperatorIDFiltering
---
.../install/operator_id_filtering_test.go | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/e2e/namespace/install/operator_id_filtering_test.go
b/e2e/namespace/install/operator_id_filtering_test.go
index 45239b29f..b142634d2 100644
--- a/e2e/namespace/install/operator_id_filtering_test.go
+++ b/e2e/namespace/install/operator_id_filtering_test.go
@@ -50,10 +50,6 @@ func TestOperatorIDFiltering(t *testing.T) {
}
WithNewTestNamespace(t, func(ns string) {
-
- // Create only IntegrationPlatform so that `kamel run` with
default operator ID succeeds
- Expect(KamelInstall(ns,
"--skip-operator-setup").Execute()).To(Succeed())
-
WithNewTestNamespace(t, func(nsop1 string) {
WithNewTestNamespace(t, func(nsop2 string) {
operator1 := "operator-1"
@@ -67,15 +63,15 @@ func TestOperatorIDFiltering(t *testing.T) {
t.Run("Operators ignore non-scoped
integrations", func(t *testing.T) {
RegisterTestingT(t)
- Expect(KamelRun(ns, "files/yaml.yaml",
"--name", "untouched").Execute()).To(Succeed())
+ Expect(KamelRun(ns, "files/yaml.yaml",
"--name", "untouched", "--force").Execute()).To(Succeed())
Consistently(IntegrationPhase(ns,
"untouched"), 10*time.Second).Should(BeEmpty())
})
t.Run("Operators run scoped integrations",
func(t *testing.T) {
RegisterTestingT(t)
- Expect(KamelRun(ns, "files/yaml.yaml",
"--name", "moving").Execute()).To(Succeed())
- Expect(AssignIntegrationToOperator(ns,
"moving", "operator-1")).To(Succeed())
+ Expect(KamelRun(ns, "files/yaml.yaml",
"--name", "moving", "--force").Execute()).To(Succeed())
+ Expect(AssignIntegrationToOperator(ns,
"moving", operator1)).To(Succeed())
Eventually(IntegrationPhase(ns,
"moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
Eventually(IntegrationPodPhase(ns,
"moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationLogs(ns,
"moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
@@ -84,7 +80,7 @@ func TestOperatorIDFiltering(t *testing.T) {
t.Run("Operators can handoff scoped
integrations", func(t *testing.T) {
RegisterTestingT(t)
- Expect(AssignIntegrationToOperator(ns,
"moving", "operator-2")).To(Succeed())
+ Expect(AssignIntegrationToOperator(ns,
"moving", operator2)).To(Succeed())
Eventually(IntegrationPhase(ns,
"moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
Expect(Kamel("rebuild", "-n", ns,
"moving").Execute()).To(Succeed())
Eventually(IntegrationPhase(ns,
"moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
@@ -111,9 +107,10 @@ func TestOperatorIDFiltering(t *testing.T) {
// Save resources by deleting "moving"
integration
Expect(Kamel("delete", "moving", "-n",
ns).Execute()).To(Succeed())
- Expect(KamelRun(ns, "files/yaml.yaml",
"--name", "pre-built", "-t", fmt.Sprintf("container.image=%s",
image)).Execute()).To(Succeed())
+ Expect(KamelRun(ns, "files/yaml.yaml",
"--name", "pre-built", "--force",
+ "-t",
fmt.Sprintf("container.image=%s", image)).Execute()).To(Succeed())
Consistently(IntegrationPhase(ns,
"pre-built"), 10*time.Second).Should(BeEmpty())
- Expect(AssignIntegrationToOperator(ns,
"pre-built", "operator-2")).To(Succeed())
+ Expect(AssignIntegrationToOperator(ns,
"pre-built", operator2)).To(Succeed())
Eventually(IntegrationPhase(ns,
"pre-built"),
[camel-k] 06/06: chore(e2e): skip failing native build tests for OCP3
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aa1bfbcb839fe467fe709bfcc43de8f46a6b9682
Author: Tadayoshi Sato
AuthorDate: Tue Jul 26 19:13:10 2022 +0900
chore(e2e): skip failing native build tests for OCP3
---
e2e/global/builder/build_test.go| 5 +
e2e/namespace/native/native_test.go | 6 ++
2 files changed, 11 insertions(+)
diff --git a/e2e/global/builder/build_test.go b/e2e/global/builder/build_test.go
index 4e4abfb76..7a379ae2e 100644
--- a/e2e/global/builder/build_test.go
+++ b/e2e/global/builder/build_test.go
@@ -57,6 +57,11 @@ func TestKitKnativeFullBuild(t *testing.T) {
}
func TestKitTimerToLogFullNativeBuild(t *testing.T) {
+ if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" {
+ t.Skip("INFO: Skipping test as known to never pass on OCP3")
+ return
+ }
+
doKitFullBuild(t, "timer-to-log", "4Gi", "15m0s", TestTimeoutVeryLong,
kitOptions{
dependencies: []string{
"camel:timer", "camel:log",
diff --git a/e2e/namespace/native/native_test.go
b/e2e/namespace/native/native_test.go
index c84e49704..f2b10692c 100644
--- a/e2e/namespace/native/native_test.go
+++ b/e2e/namespace/native/native_test.go
@@ -23,6 +23,7 @@ limitations under the License.
package native
import (
+ "os"
"testing"
. "github.com/onsi/gomega"
@@ -39,6 +40,11 @@ var (
)
func TestNativeIntegrations(t *testing.T) {
+ if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" {
+ t.Skip("INFO: Skipping test as known to never pass on OCP3")
+ return
+ }
+
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-quarkus-native"
Expect(KamelInstallWithID(operatorID, ns,
[camel-k] 01/06: fix(ci): common & install e2e workflows fail silently
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aa9c2787c2a92ba17b49de8fddb48b341aa0f493
Author: Tadayoshi Sato
AuthorDate: Fri Jul 22 19:15:06 2022 +0900
fix(ci): common & install e2e workflows fail silently
Fix #3465
---
script/Makefile | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/script/Makefile b/script/Makefile
index c5cd2327b..c0a5c6886 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -233,12 +233,13 @@ test: do-build
# This should execute all tests and not exit if one of the suites fail
#
test-integration: do-build
- STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \
- go test -timeout 60m -v ./e2e/global/common -tags=integration
$(TEST_INTEGRATION_COMMON_RUN); \
- go test -timeout 60m -v ./e2e/global/common/build -tags=integration
$(TEST_INTEGRATION_COMMON_BUILD_RUN); \
- go test -timeout 60m -v ./e2e/global/common/config -tags=integration
$(TEST_INTEGRATION_COMMON_CONFIG_RUN); \
- go test -timeout 60m -v ./e2e/global/common/languages -tags=integration
$(TEST_INTEGRATION_COMMON_LANG_RUN); \
- go test -timeout 60m -v ./e2e/global/common/traits -tags=integration
$(TEST_INTEGRATION_COMMON_TRAITS_RUN)
+ FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \
+ go test -timeout 60m -v ./e2e/global/common -tags=integration
$(TEST_INTEGRATION_COMMON_RUN) || FAILED=1; \
+ go test -timeout 60m -v ./e2e/global/common/build -tags=integration
$(TEST_INTEGRATION_COMMON_BUILD_RUN) || FAILED=1; \
+ go test -timeout 60m -v ./e2e/global/common/config -tags=integration
$(TEST_INTEGRATION_COMMON_CONFIG_RUN) || FAILED=1; \
+ go test -timeout 60m -v ./e2e/global/common/languages -tags=integration
$(TEST_INTEGRATION_COMMON_LANG_RUN) || FAILED=1; \
+ go test -timeout 60m -v ./e2e/global/common/traits -tags=integration
$(TEST_INTEGRATION_COMMON_TRAITS_RUN) || FAILED=1; \
+ exit $${FAILED}
test-knative: do-build
STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \
@@ -267,10 +268,11 @@ test-registry-maven-wagon: do-build
###
test-install: do-build
- STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \
- go test -timeout 60m -v ./e2e/namespace/install/ -tags=integration
$(TEST_INSTALL_RUN) \
- go test -timeout 60m -v ./e2e/namespace/install/cli -tags=integration
$(TEST_INSTALL_CLI_RUN); \
- go test -timeout 60m -v ./e2e/namespace/install/kustomize
-tags=integration $(TEST_INSTALL_KUSTOMIZE_RUN)
+ FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \
+ go test -timeout 60m -v ./e2e/namespace/install/ -tags=integration
$(TEST_INSTALL_RUN) || FAILED=1; \
+ go test -timeout 60m -v ./e2e/namespace/install/cli -tags=integration
$(TEST_INSTALL_CLI_RUN) || FAILED=1; \
+ go test -timeout 60m -v ./e2e/namespace/install/kustomize
-tags=integration $(TEST_INSTALL_KUSTOMIZE_RUN) || FAILED=1; \
+ exit $${FAILED}
test-quarkus-native: do-build
STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \
[GitHub] [camel-k] tadayosi merged pull request #3478: fix(ci): common & install e2e workflows fail silently
tadayosi merged PR #3478: URL: https://github.com/apache/camel-k/pull/3478 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi closed issue #3465: `install-it` workflow is failing silently
tadayosi closed issue #3465: `install-it` workflow is failing silently URL: https://github.com/apache/camel-k/issues/3465 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karaf] github-actions[bot] opened a new pull request, #174: [Github Actions] Periodic Sync Camel Karaf Main Branch
github-actions[bot] opened a new pull request, #174: URL: https://github.com/apache/camel-karaf/pull/174 Periodic Sync of Camel Karaf Main Branch with main Camel Main. see https://github.com/apache/camel-karaf/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch automatic-periodic-sync updated (df68ff24 -> dabf3b21)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git omit df68ff24 [create-pull-request] automated change add f1aeb529 [create-pull-request] automated change add dabf3b21 [create-pull-request] automated change This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (df68ff24) \ N -- N -- N refs/heads/automatic-periodic-sync (dabf3b21) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/karaf/components/salesforce.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[GitHub] [camel-k] github-actions[bot] commented on issue #3133: Camel K operator scaling documentation
github-actions[bot] commented on issue #3133: URL: https://github.com/apache/camel-k/issues/3133#issuecomment-1196133585 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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 (78340c95e13 -> 0035b210162)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 78340c95e13 Regen for commit 30d15e84d2ee7cdfe3cc9dc67f46943c85b853e4 add 286ace2b493 Regen for commit 30d15e84d2ee7cdfe3cc9dc67f46943c85b853e4 add 0035b210162 Regen for commit 286ace2b493c785363a6c2f9e29280bf28303a2a This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (78340c95e13) \ N -- N -- N refs/heads/regen_bot (0035b210162) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../endpoint/dsl/SalesforceEndpointBuilderFactory.java | 14 ++ 1 file changed, 14 insertions(+)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8049: Generated sources regen
github-actions[bot] opened a new pull request, #8049: URL: https://github.com/apache/camel/pull/8049 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit 30d15e84d2ee7cdfe3cc9dc67f46943c85b853e4
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 286ace2b493 Regen for commit 30d15e84d2ee7cdfe3cc9dc67f46943c85b853e4
286ace2b493 is described below
commit 286ace2b493c785363a6c2f9e29280bf28303a2a
Author: jeremyross
AuthorDate: Tue Jul 26 20:53:17 2022 +
Regen for commit 30d15e84d2ee7cdfe3cc9dc67f46943c85b853e4
Signed-off-by: GitHub
---
.../resources/org/apache/camel/catalog/components/salesforce.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
index e3b96ec8a08..56ef73e696e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
@@ -134,7 +134,8 @@
"CamelSalesforceCreatedDate": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"java.time.ZonedDateTime", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The created date.",
"constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CREATED_DATE"
},
"CamelSalesforceTopicName": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The topic name.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_TOPIC_NAME"
},
"CamelSalesforceChannel": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The channel.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CHANNEL"
},
-"CamelSalesforceClientId": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The client id.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CLIENT_ID"
}
+"CamelSalesforceClientId": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The client id.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CLIENT_ID"
},
+"CamelSalesforceQueryResultTotalSize": { "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"int", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Total number of records matching a query.",
"constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_QUERY_RESULT_TOTAL_SIZE"
}
},
"properties": {
"operationName": { "kind": "path", "displayName": "Operation Name",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.internal.OperationName",
"enum": [ "getVersions", "getResources", "getGlobalObjects", "getBasicInfo",
"getDescription", "getSObject", "createSObject", "updateSObject",
"deleteSObject", "getSObjectWithId", "upsertSObject", "deleteSObjectWithId",
"getBlobField", "query", "queryMore", "queryA [...]
[GitHub] [camel] oscerd merged pull request #8048: Generated sources regen
oscerd merged PR #8048: URL: https://github.com/apache/camel/pull/8048 -- 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 (f2a700aa7e2 -> 78340c95e13)
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 f2a700aa7e2 CAMEL-18299: use the FactoryFinder to lookup the adapter add 30d15e84d2e camel-salesforce: Document header. add 78340c95e13 Regen for commit 30d15e84d2ee7cdfe3cc9dc67f46943c85b853e4 No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/components/salesforce.json | 3 ++- .../resources/org/apache/camel/component/salesforce/salesforce.json | 3 ++- .../src/main/docs/salesforce-component.adoc | 4 ++-- .../org/apache/camel/component/salesforce/SalesforceConstants.java| 3 +++ .../component/salesforce/internal/processor/JsonRestProcessor.java| 4 ++-- .../it/resources/CamelSalesforceIntegrationTests.connectedApp | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8048: Generated sources regen
github-actions[bot] opened a new pull request, #8048: URL: https://github.com/apache/camel/pull/8048 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/reference/repos#update-a-repository"}
[camel-website-pub] branch asf-site updated (910a74081f -> e1a53145da)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard 910a74081f Website updated to ea4d39e66137bd347caba5f03d357c968e9b83db discard 1930c9ab0c Website updated to 325e929157412b27394080f4d4dba3d821476ddf new fc7132c93c Website updated to 325e929157412b27394080f4d4dba3d821476ddf new e1a53145da Website updated to c16b24aa7df996393ec777b9ee5a2490ce872cfb This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (910a74081f) \ N -- N -- N refs/heads/asf-site (e1a53145da) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .htaccess |74 +- .well-known/security.txt | 2 +- .../index.html | 2 +- .../secrets-properties-functions-part-2/index.html |30 + .../index.html | 2 +- blog/index.html| 2 +- blog/index.xml |12 + blog/page/10/index.html| 2 +- blog/page/11/index.html| 2 +- blog/page/12/index.html| 2 +- blog/page/13/index.html| 2 +- blog/page/14/index.html| 2 +- blog/page/15/index.html| 2 +- blog/page/16/index.html| 2 +- blog/page/17/index.html| 2 +- blog/page/18/index.html| 2 +- blog/page/19/index.html| 2 +- blog/page/2/index.html | 2 +- blog/page/20/index.html| 2 +- blog/page/21/index.html| 2 +- blog/page/22/index.html| 2 +- blog/page/23/index.html| 2 +- blog/page/24/index.html| 2 +- blog/page/25/index.html| 2 +- blog/page/26/index.html| 2 +- blog/page/27/index.html| 2 +- blog/page/28/index.html| 2 +- blog/page/29/index.html| 2 +- blog/page/3/index.html | 2 +- blog/page/30/index.html| 2 +- blog/page/31/index.html| 2 +- blog/page/32/index.html| 2 +- blog/page/33/index.html| 2 +- blog/page/34/index.html| 2 +- blog/page/35/index.html| 2 +- blog/page/36/index.html| 2 +- blog/page/37/index.html| 2 +- blog/page/38/index.html| 2 +- blog/page/39/index.html| 2 +- blog/page/4/index.html | 2 +- blog/page/40/index.html| 2 +- blog/page/41/index.html| 2 +- blog/page/42/index.html| 2 +- blog/page/43/index.html| 2 +- blog/page/44/index.html| 2 +- blog/page/45/index.html| 2 +- blog/page/46/index.html| 2 +- blog/page/47/index.html| 2 +- blog/page/48/index.html| 2 +- blog/page/49/index.html| 2 +- blog/page/5/index.html | 2 +- blog/page/50/index.html| 2 +- blog/page/51/index.html| 2 +- blog/page/52/index.html| 2 +- blog/page/53/index.html| 2 +- blog/page/54/index.html| 2 +-
[camel] branch main updated: camel-salesforce: Document header.
This is an automated email from the ASF dual-hosted git repository.
jeremyross 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 30d15e84d2e camel-salesforce: Document header.
30d15e84d2e is described below
commit 30d15e84d2ee7cdfe3cc9dc67f46943c85b853e4
Author: Jeremy Ross
AuthorDate: Tue Jul 26 15:08:58 2022 -0500
camel-salesforce: Document header.
Header: CamelSalesforceQueryResultTotalSize
---
.../resources/org/apache/camel/component/salesforce/salesforce.json | 3 ++-
.../src/main/docs/salesforce-component.adoc | 4 ++--
.../org/apache/camel/component/salesforce/SalesforceConstants.java| 3 +++
.../component/salesforce/internal/processor/JsonRestProcessor.java| 4 ++--
.../it/resources/CamelSalesforceIntegrationTests.connectedApp | 2 +-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
index e3b96ec8a08..56ef73e696e 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
+++
b/components/camel-salesforce/camel-salesforce-component/src/generated/resources/org/apache/camel/component/salesforce/salesforce.json
@@ -134,7 +134,8 @@
"CamelSalesforceCreatedDate": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"java.time.ZonedDateTime", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The created date.",
"constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CREATED_DATE"
},
"CamelSalesforceTopicName": { "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The topic name.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_TOPIC_NAME"
},
"CamelSalesforceChannel": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The channel.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CHANNEL"
},
-"CamelSalesforceClientId": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The client id.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CLIENT_ID"
}
+"CamelSalesforceClientId": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The client id.", "constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_CLIENT_ID"
},
+"CamelSalesforceQueryResultTotalSize": { "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"int", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Total number of records matching a query.",
"constantName":
"org.apache.camel.component.salesforce.SalesforceConstants#HEADER_SALESFORCE_QUERY_RESULT_TOTAL_SIZE"
}
},
"properties": {
"operationName": { "kind": "path", "displayName": "Operation Name",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.internal.OperationName",
"enum": [ "getVersions", "getResources", "getGlobalObjects", "getBasicInfo",
"getDescription", "getSObject", "createSObject", "updateSObject",
"deleteSObject", "getSObjectWithId", "upsertSObject", "deleteSObjectWithId",
"getBlobField", "query", "queryMore", "queryA [...]
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index 7add05acdc6..c527bbe02d3 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -522,7 +522,7 @@ Deletes a record in salesforce by
[GitHub] [camel-karavan] 00xE8 opened a new issue, #429: Allow message components to be selectable from the UI
00xE8 opened a new issue, #429: URL: https://github.com/apache/camel-karavan/issues/429 For citizen integrators, a great feature available in Azure LogicApps, is the ability to construct message schemas visually, as shown here [https://docs.microsoft.com/en-us/azure/logic-apps/media/logic-apps-perform-data-operations/send-email-parse-json-action.png](url) I would be happy to work on this, is there a starting guide? -- 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-website] branch regen_bot updated (ea4d39e6 -> c16b24aa)
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-website.git from ea4d39e6 feat: ApacheCons 2022 blog post add c16b24aa Added a post about vault support part-2 with updates and versioning No new revisions were added by this update. Summary of changes: .../secrets-properties-functions-part-2/index.md | 132 + 1 file changed, 132 insertions(+) create mode 100644 content/blog/2022/07/secrets-properties-functions-part-2/index.md
[camel-website] branch main updated: Added a post about vault support part-2 with updates and versioning
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-website.git The following commit(s) were added to refs/heads/main by this push: new c16b24aa Added a post about vault support part-2 with updates and versioning c16b24aa is described below commit c16b24aa7df996393ec777b9ee5a2490ce872cfb Author: Andrea Cosentino AuthorDate: Tue Jul 26 18:53:17 2022 +0200 Added a post about vault support part-2 with updates and versioning --- .../secrets-properties-functions-part-2/index.md | 132 + 1 file changed, 132 insertions(+) diff --git a/content/blog/2022/07/secrets-properties-functions-part-2/index.md b/content/blog/2022/07/secrets-properties-functions-part-2/index.md new file mode 100644 index ..70118a07 --- /dev/null +++ b/content/blog/2022/07/secrets-properties-functions-part-2/index.md @@ -0,0 +1,132 @@ +--- +title: "Load properties from Vault/Secrets cloud services: an update" +date: 2022-07-26 +draft: false +authors: ["oscerd"] +categories: ["Camel"] +preview: "An update about loading properties from a Cloud vault service" +--- + +In Camel 3.16.0 we introduced the ability to load properties from vault and use them in the Camel context. + +This post aims to show the updates and improvements we've done in the last two releases. + +### Supported Services + +In 3.16.0 we're supporting two of the main services available in the cloud space: + +- AWS Secret Manager +- Google Cloud Secret Manager + +In 3.19.0, to be released, we're going to have four services available: + +- AWS Secret Manager +- Google Cloud Secret Manager +- Azure Key Vault +- Hashicorp Vault + +### Setting up the Properties Function + +Each of the Secret management cloud services require different parameters to complete authentication and authorization. + +For both the Properties Functions currently available we provide two different approaches: +- Environment variables +- Main Configuration properties + +You already have the information for AWS and GCP in the old blog post. + +Let's explore Azure Key Vault and Hashicorp Vault. + + AWS Secrets Manager + +The Azure Key Vault Properties Function configurations through enviroment variables are the following: + +``` +export $CAMEL_VAULT_AZURE_TENANT_ID=tenantId +export $CAMEL_VAULT_AZURE_CLIENT_ID=clientId +export $CAMEL_VAULT_AZURE_CLIENT_SECRET=clientSecret +export $CAMEL_VAULT_AZURE_VAULT_NAME=vaultName +``` + +While as Main Configuration properties it is possible to define the credentials through the following: + +``` +camel.vault.azure.tenantId = accessKey +camel.vault.azure.clientId = clientId +camel.vault.azure.clientSecret = clientSecret +camel.vault.azure.vaultName = vaultName +``` + +To recover a secret from azure you might run something like: + +```xml + + + + + + +``` + + + Hashicorp Vault + +The Hashicorp Vault Properties Function configurations through enviroment variables are the following: + +``` +export $CAMEL_VAULT_HASHICORP_TOKEN=token +export $CAMEL_VAULT_HASHICORP_ENGINE=secretKey +export $CAMEL_VAULT_HASHICORP_HOST=host +export $CAMEL_VAULT_HASHICORP_PORT=port +export $CAMEL_VAULT_HASHICORP_SCHEME=http/https +``` + +While as Main Configuration properties it is possible to define the credentials through the following: + +``` +camel.vault.hashicorp.token = token +camel.vault.hashicorp.engine = engine +camel.vault.hashicorp.host = host +camel.vault.hashicorp.port = port +camel.vault.hashicorp.scheme = scheme +``` + +To recover a secret from Hashicorp Vault you might run something like: + +```xml + + + + + + +``` + + +### Multi fields Secrets and Default value + +As for AWS Secrets Manager and Google Secrets Manager, the multi fields secrets and default value are both supported by Azure Key Vault and Hashicorp Vault Properties functions. + +### Versioning + +In the next Camel version we are going to release the support for recovering a secret with a particular version. This will be supported by all the vault we currently support in Camel. + +In particular you'll be able to recover a specific version of a secrets with the following syntax. + +```xml + + + + + + +``` + +In this example we're going to recover the field username from the secret database, with version "2". In case the version is not available, we're going to have a default value of 'admin'. + +### Future + +We plan to work on the ability to reload the whole context once a secret has been rotated or updated. This is something still in the design phase, but we really would like to see it implemented soon. + +Stay tuned for more news! +
[GitHub] [camel-website] oscerd merged pull request #877: Added a post about vault support part-2 with updates and versioning
oscerd merged PR #877: URL: https://github.com/apache/camel-website/pull/877 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8047: Fix error message
github-actions[bot] commented on PR #8047: URL: https://github.com/apache/camel/pull/8047#issuecomment-1195868301 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **1 component(s) tested** -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8047: Fix error message
github-actions[bot] commented on PR #8047: URL: https://github.com/apache/camel/pull/8047#issuecomment-1195825738 :warning: This PR changes Camel components and will be tested automatically. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] Croway opened a new pull request, #8047: Fix error message
Croway opened a new pull request, #8047: URL: https://github.com/apache/camel/pull/8047 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] github-actions[bot] commented on pull request #877: Added a post about vault support part-2 with updates and versioning
github-actions[bot] commented on PR #877: URL: https://github.com/apache/camel-website/pull/877#issuecomment-1195822686 Preview is available at https://pr-877--camel.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch vault-part-2 created (now 91cbc81b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch vault-part-2 in repository https://gitbox.apache.org/repos/asf/camel-website.git at 91cbc81b Added a post about vault support part-2 with updates and versioning This branch includes the following new commits: new 91cbc81b Added a post about vault support part-2 with updates and versioning The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-website] 01/01: Added a post about vault support part-2 with updates and versioning
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch vault-part-2 in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 91cbc81b2c754b05961765c558fe7b41d8c58d86 Author: Andrea Cosentino AuthorDate: Tue Jul 26 18:53:17 2022 +0200 Added a post about vault support part-2 with updates and versioning --- .../secrets-properties-functions-part-2/index.md | 132 + 1 file changed, 132 insertions(+) diff --git a/content/blog/2022/07/secrets-properties-functions-part-2/index.md b/content/blog/2022/07/secrets-properties-functions-part-2/index.md new file mode 100644 index ..70118a07 --- /dev/null +++ b/content/blog/2022/07/secrets-properties-functions-part-2/index.md @@ -0,0 +1,132 @@ +--- +title: "Load properties from Vault/Secrets cloud services: an update" +date: 2022-07-26 +draft: false +authors: ["oscerd"] +categories: ["Camel"] +preview: "An update about loading properties from a Cloud vault service" +--- + +In Camel 3.16.0 we introduced the ability to load properties from vault and use them in the Camel context. + +This post aims to show the updates and improvements we've done in the last two releases. + +### Supported Services + +In 3.16.0 we're supporting two of the main services available in the cloud space: + +- AWS Secret Manager +- Google Cloud Secret Manager + +In 3.19.0, to be released, we're going to have four services available: + +- AWS Secret Manager +- Google Cloud Secret Manager +- Azure Key Vault +- Hashicorp Vault + +### Setting up the Properties Function + +Each of the Secret management cloud services require different parameters to complete authentication and authorization. + +For both the Properties Functions currently available we provide two different approaches: +- Environment variables +- Main Configuration properties + +You already have the information for AWS and GCP in the old blog post. + +Let's explore Azure Key Vault and Hashicorp Vault. + + AWS Secrets Manager + +The Azure Key Vault Properties Function configurations through enviroment variables are the following: + +``` +export $CAMEL_VAULT_AZURE_TENANT_ID=tenantId +export $CAMEL_VAULT_AZURE_CLIENT_ID=clientId +export $CAMEL_VAULT_AZURE_CLIENT_SECRET=clientSecret +export $CAMEL_VAULT_AZURE_VAULT_NAME=vaultName +``` + +While as Main Configuration properties it is possible to define the credentials through the following: + +``` +camel.vault.azure.tenantId = accessKey +camel.vault.azure.clientId = clientId +camel.vault.azure.clientSecret = clientSecret +camel.vault.azure.vaultName = vaultName +``` + +To recover a secret from azure you might run something like: + +```xml + + + + + + +``` + + + Hashicorp Vault + +The Hashicorp Vault Properties Function configurations through enviroment variables are the following: + +``` +export $CAMEL_VAULT_HASHICORP_TOKEN=token +export $CAMEL_VAULT_HASHICORP_ENGINE=secretKey +export $CAMEL_VAULT_HASHICORP_HOST=host +export $CAMEL_VAULT_HASHICORP_PORT=port +export $CAMEL_VAULT_HASHICORP_SCHEME=http/https +``` + +While as Main Configuration properties it is possible to define the credentials through the following: + +``` +camel.vault.hashicorp.token = token +camel.vault.hashicorp.engine = engine +camel.vault.hashicorp.host = host +camel.vault.hashicorp.port = port +camel.vault.hashicorp.scheme = scheme +``` + +To recover a secret from Hashicorp Vault you might run something like: + +```xml + + + + + + +``` + + +### Multi fields Secrets and Default value + +As for AWS Secrets Manager and Google Secrets Manager, the multi fields secrets and default value are both supported by Azure Key Vault and Hashicorp Vault Properties functions. + +### Versioning + +In the next Camel version we are going to release the support for recovering a secret with a particular version. This will be supported by all the vault we currently support in Camel. + +In particular you'll be able to recover a specific version of a secrets with the following syntax. + +```xml + + + + + + +``` + +In this example we're going to recover the field username from the secret database, with version "2". In case the version is not available, we're going to have a default value of 'admin'. + +### Future + +We plan to work on the ability to reload the whole context once a secret has been rotated or updated. This is something still in the design phase, but we really would like to see it implemented soon. + +Stay tuned for more news! +
[camel-karavan] branch main updated: Sync versioning with Camel (#428)
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 736b016 Sync versioning with Camel (#428)
736b016 is described below
commit 736b0168cf06a366d533a6d5a41c5460762e0ade
Author: Marat Gubaidullin
AuthorDate: Tue Jul 26 11:44:30 2022 -0400
Sync versioning with Camel (#428)
---
.github/workflows/builder.yml | 2 +-
karavan-builder/openshift/karavan-app.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index a382111..8fbea82 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -8,7 +8,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}-builder
- TAG: 0.0.16
+ TAG: 3.18.0
jobs:
build:
diff --git a/karavan-builder/openshift/karavan-app.yaml
b/karavan-builder/openshift/karavan-app.yaml
index bd9353b..4afa0c7 100644
--- a/karavan-builder/openshift/karavan-app.yaml
+++ b/karavan-builder/openshift/karavan-app.yaml
@@ -40,7 +40,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: ghcr.io/apache/camel-karavan:0.0.16
+ image: ghcr.io/apache/camel-karavan:3.18.0
imagePullPolicy: Always
name: karavan
resources:
[GitHub] [camel-karavan] mgubaidullin merged pull request #428: Sync versioning with Camel
mgubaidullin merged PR #428: URL: https://github.com/apache/camel-karavan/pull/428 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin closed issue #426: Missing Set Property (EIP) in vs code extension
mgubaidullin closed issue #426: Missing Set Property (EIP) in vs code extension URL: https://github.com/apache/camel-karavan/issues/426 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin commented on issue #426: Missing Set Property (EIP) in vs code extension
mgubaidullin commented on issue #426: URL: https://github.com/apache/camel-karavan/issues/426#issuecomment-1195649911 Already added. It will be available in the next release https://github.com/apache/camel-karavan/blob/2131158bd635fd1c6e20782a6132e6abaa7835ef/karavan-designer/src/designer/utils/CamelUi.tsx#L55 -- 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: Sync versioning with Camel (#427)
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 4864877 Sync versioning with Camel (#427)
4864877 is described below
commit 4864877e0c7fb0dd30b89d68d462069248450ffc
Author: Marat Gubaidullin
AuthorDate: Tue Jul 26 11:41:11 2022 -0400
Sync versioning with Camel (#427)
---
.github/workflows/app.yml | 2 +-
change_version.sh | 8 ++--
karavan-app/pom.xml | 2 +-
karavan-app/src/main/webapp/package.json| 2 +-
karavan-builder/openshift/karavan-quarkus-task.yaml | 2 +-
karavan-core/package.json | 2 +-
karavan-designer/package.json | 2 +-
karavan-generator/pom.xml | 2 +-
karavan-vscode/package.json | 2 +-
9 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 096923f..a4e7e4f 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -52,7 +52,7 @@ jobs:
mvn package -f karavan-app -DskipTest \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
- -Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}:0.0.16 \
+ -Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}:3.18.0 \
-Dquarkus.container-image.username=${{ github.actor }} \
-Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
if: ${{ github.ref == 'refs/heads/main' }}
diff --git a/change_version.sh b/change_version.sh
index e707b81..9019fd3 100755
--- a/change_version.sh
+++ b/change_version.sh
@@ -6,11 +6,15 @@ mvn versions:set -DnewVersion=$1 -f karavan-generator
echo "Set Application pom.xml version: $1";
mvn versions:set -DnewVersion=$1 -f karavan-app
+echo "Set Core package.json extension version: $1";
+yarn version --new-version $1 --no-commit --no-git-tag-version --cwd
karavan-core
+
+echo "Set Designer package.json version: $1";
+yarn version --new-version $1 --no-commit --no-git-tag-version --cwd
karavan-designer
+
echo "Set Application package.json extension version: $1";
yarn version --new-version $1 --no-commit --no-git-tag-version --cwd
karavan-app/src/main/webapp/
echo "Set VSCode extension package.json version: $1";
yarn version --new-version $1 --no-commit --no-git-tag-version --cwd
karavan-vscode
-echo "Set Designer package.json version: $1";
-yarn version --new-version $1 --no-commit --no-git-tag-version --cwd
karavan-designer
\ No newline at end of file
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 0454bb6..18c66f2 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -18,7 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
4.0.0
org.apache.camel.karavan
-0.0.16
+3.18.0
karavan
3.10.1
diff --git a/karavan-app/src/main/webapp/package.json
b/karavan-app/src/main/webapp/package.json
index ce2b428..e066815 100644
--- a/karavan-app/src/main/webapp/package.json
+++ b/karavan-app/src/main/webapp/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan",
- "version": "0.0.16",
+ "version": "3.18.0",
"private": true,
"scripts": {
"copy-designer": "cp -r ../../../../karavan-designer/src/designer src &&
cp -r ../../../../karavan-designer/src/kamelets src && cp -r
../../../../karavan-designer/src/components src && cp -r
../../../../karavan-designer/src/eip src && cp -r
../../../../karavan-designer/src/builder src",
diff --git a/karavan-builder/openshift/karavan-quarkus-task.yaml
b/karavan-builder/openshift/karavan-quarkus-task.yaml
index f58101f..db544d2 100644
--- a/karavan-builder/openshift/karavan-quarkus-task.yaml
+++ b/karavan-builder/openshift/karavan-quarkus-task.yaml
@@ -44,7 +44,7 @@ spec:
-Dquarkus.kubernetes.deploy=true \
-Dquarkus.container-image.group=${NAMESPACE} \
-Dquarkus.container-image.tag=${DATE}
- image: 'ghcr.io/apache/camel-karavan-builder:0.0.16'
+ image: 'ghcr.io/apache/camel-karavan-builder:3.18.0'
env:
- name: GIT_REPOSITORY
valueFrom:
diff --git a/karavan-core/package.json b/karavan-core/package.json
index 34f069f..9015208 100644
--- a/karavan-core/package.json
+++ b/karavan-core/package.json
@@ -1,7 +1,7 @@
{
"name": "karavan-core",
"publisher": "camel-karavan",
- "version": "0.0.16",
+ "version": "3.18.0",
"description": "Apache Camel Karavan Core",
"scripts": {
"build": "tsc",
diff --git a/karavan-designer/package.json b/karavan-designer/package.json
index 55bb3f5..2845374 100644
--- a/karavan-designer/package.json
+++ b/karavan-designer/package.json
@@ -1,6 +1,6 @@
{
[GitHub] [camel-karavan] mgubaidullin merged pull request #427: Sync versioning with Camel
mgubaidullin merged PR #427: URL: https://github.com/apache/camel-karavan/pull/427 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8046: CAMEL-18152: implement auto-configuration for the adapters
github-actions[bot] commented on PR #8046: URL: https://github.com/apache/camel/pull/8046#issuecomment-1195644807 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **7 component(s) tested** -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on pull request #8046: CAMEL-18152: implement auto-configuration for the adapters
orpiske commented on PR #8046:
URL: https://github.com/apache/camel/pull/8046#issuecomment-1195643175
> Its a bit wrong when there are 2 generated files for the same thing. You
need for @JdkService to have a sub path I think, eg @JdkService("resume/file")
>
> Or you can create a special annotation that extends @JdkService that setup
this correct, we have done this for some others, then you can use
@ResumeAdapter("file") etc as annotation.
Oh, thanks for catching it.
One of the files in the camel-file shouldn't be there as it is a leftover
from a previous attempt. 臘♂️
What I am trying to achieve here is that it needs to be able to
differentiate between different configs based on the consumer so that it loads
the adapter that is appropriate for that component. However, there are some
components (like the DB-based ones) that have a shared adapter because they do
+/- the same thing.
Tomorrow I'll clean it up.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #8046: CAMEL-18152: implement auto-configuration for the adapters
davsclaus commented on PR #8046:
URL: https://github.com/apache/camel/pull/8046#issuecomment-1195636617
Its a bit wrong when there are 2 generated files for the same thing. You
need for @JdkService to have a sub path I think, eg @JdkService("resume/file")
Or you can create a special annotation that extends @JdkService that setup
this correct, we have done this for some others, then you can use
@ResumeAdapter("file") etc as annotation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-karavan] Jasmin-Sk opened a new issue, #426: Missing Set Property (EIP) in vs code extension
Jasmin-Sk opened a new issue, #426: URL: https://github.com/apache/camel-karavan/issues/426 In karavan vs code extension when I am trying to add setProperty (which is EIP) in route it is not showing up in the list. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (b75619bf785 -> f2a700aa7e2)
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 b75619bf785 Upgrade to groovy 3.0.12
add b52b772d227 CAMEL-18229: renamed the adapter properties file to match
the existing naming pattern
add f2a700aa7e2 CAMEL-18299: use the FactoryFinder to lookup the adapter
No new revisions were added by this update.
Summary of changes:
.../camel/resume/{adapter.properties => Adapter} | 2 +-
.../resources/org/apache/camel/resume/Adapter} | 2 +-
.../org/apache/camel/resume/adapter.properties | 18 -
.../camel/resume/{adapter.properties => Adapter} | 2 +-
.../camel/resume/{adapter.properties => Adapter} | 2 +-
.../camel/resume/{adapter.properties => Adapter} | 2 +-
.../resources/org/apache/camel/resume/Adapter} | 2 +-
.../org/apache/camel/resume/adapter.properties | 18 -
.../properties/{adapter.properties => Adapter} | 0
.../apache/camel/support/resume/AdapterHelper.java | 84 +-
10 files changed, 25 insertions(+), 107 deletions(-)
copy
components/camel-atom/src/main/resources/org/apache/camel/resume/{adapter.properties
=> Adapter} (93%)
copy
components/{camel-atom/src/main/resources/org/apache/camel/resume/adapter.properties
=>
camel-aws/camel-aws2-kinesis/src/main/resources/org/apache/camel/resume/Adapter}
(92%)
delete mode 100644
components/camel-aws/camel-aws2-kinesis/src/main/resources/org/apache/camel/resume/adapter.properties
rename
components/camel-cassandraql/src/main/resources/org/apache/camel/resume/{adapter.properties
=> Adapter} (93%)
rename
components/camel-couchbase/src/main/resources/org/apache/camel/resume/{adapter.properties
=> Adapter} (93%)
rename
components/camel-couchdb/src/main/resources/org/apache/camel/resume/{adapter.properties
=> Adapter} (93%)
rename
components/{camel-atom/src/main/resources/org/apache/camel/resume/adapter.properties
=> camel-file/src/main/resources/org/apache/camel/resume/Adapter} (92%)
delete mode 100644
components/camel-file/src/main/resources/org/apache/camel/resume/adapter.properties
rename
core/camel-core/src/test/resources/org/apache/camel/component/properties/{adapter.properties
=> Adapter} (100%)
[GitHub] [camel-quarkus] jamesnetherton commented on issue #3942: [Camel 3.19.0] Dependency covergence check failure in HDFS extension
jamesnetherton commented on issue #3942: URL: https://github.com/apache/camel-quarkus/issues/3942#issuecomment-1195554660 @aldettinger I think you handled the Hadoop upgrade on the Camel side. Are you able to take a look into 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
[GitHub] [camel-quarkus] jamesnetherton opened a new issue, #3942: [Camel 3.19.0] Dependency covergence check failure in HDFS extension
jamesnetherton opened a new issue, #3942: URL: https://github.com/apache/camel-quarkus/issues/3942 ``` 2022-07-26T10:51:56.8904401Z [INFO] < org.apache.camel.quarkus:camel-quarkus-hdfs >- 2022-07-26T10:51:56.8905301Z [INFO] Building Camel Quarkus :: HDFS :: Runtime 2.12.0-SNAPSHOT [856/1330] 2022-07-26T10:51:56.8905931Z [INFO] [ jar ]- 2022-07-26T10:51:58.4329876Z [INFO] 2022-07-26T10:51:58.4333965Z [INFO] --- maven-clean-plugin:3.1.0:clean (default-clean) @ camel-quarkus-hdfs --- 2022-07-26T10:51:58.4343349Z [INFO] 2022-07-26T10:51:58.4346399Z [INFO] --- maven-enforcer-plugin:3.0.0-M3:enforce (camel-quarkus-enforcer-rules) @ camel-quarkus-hdfs --- 2022-07-26T10:52:00.0700978Z [WARNING] 2022-07-26T10:52:00.0701393Z Dependency convergence error for ch.qos.reload4j:reload4j:1.2.18.3 paths to dependency are: 2022-07-26T10:52:00.0702256Z +-org.apache.camel.quarkus:camel-quarkus-hdfs:2.12.0-SNAPSHOT 2022-07-26T10:52:00.0702765Z +-org.apache.camel:camel-hdfs:3.19.0-20220725.103340-14 2022-07-26T10:52:00.0703241Z +-org.apache.hadoop:hadoop-common:3.3.3 2022-07-26T10:52:00.0703666Z +-ch.qos.reload4j:reload4j:1.2.18.3 2022-07-26T10:52:00.0703968Z and 2022-07-26T10:52:00.0704338Z +-org.apache.camel.quarkus:camel-quarkus-hdfs:2.12.0-SNAPSHOT 2022-07-26T10:52:00.0704819Z +-org.apache.camel:camel-hdfs:3.19.0-20220725.103340-14 2022-07-26T10:52:00.0705259Z +-org.apache.hadoop:hadoop-common:3.3.3 2022-07-26T10:52:00.0705670Z +-org.slf4j:slf4j-reload4j:1.7.36 2022-07-26T10:52:00.0706070Z +-ch.qos.reload4j:reload4j:1.2.19 2022-07-26T10:52:00.0706350Z and 2022-07-26T10:52:00.0706714Z +-org.apache.camel.quarkus:camel-quarkus-hdfs:2.12.0-SNAPSHOT 2022-07-26T10:52:00.0707204Z +-org.apache.camel:camel-hdfs:3.19.0-20220725.103340-14 2022-07-26T10:52:00.0707637Z +-org.apache.hadoop:hadoop-common:3.3.3 2022-07-26T10:52:00.0708054Z +-org.apache.hadoop:hadoop-auth:3.3.3 2022-07-26T10:52:00.0708470Z +-ch.qos.reload4j:reload4j:1.2.18.3 2022-07-26T10:52:00.0708767Z and 2022-07-26T10:52:00.0709396Z +-org.apache.camel.quarkus:camel-quarkus-hdfs:2.12.0-SNAPSHOT 2022-07-26T10:52:00.0709889Z +-org.apache.camel:camel-hdfs:3.19.0-20220725.103340-14 2022-07-26T10:52:00.0710322Z +-org.apache.hadoop:hadoop-hdfs:3.3.3 2022-07-26T10:52:00.0710735Z +-ch.qos.reload4j:reload4j:1.2.18.3 ``` -- 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-k] branch main updated: fix(ci): build before making images
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 4e90cc577 fix(ci): build before making images 4e90cc577 is described below commit 4e90cc5775837bd5ca1d2418cce22d5872b2f5ea Author: Pasquale Congiusti AuthorDate: Tue Jul 26 12:25:34 2022 +0200 fix(ci): build before making images Closes #3474 --- script/Makefile | 50 ++ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/script/Makefile b/script/Makefile index 22d0717cf..c5cd2327b 100644 --- a/script/Makefile +++ b/script/Makefile @@ -205,6 +205,7 @@ TEST_PREBUILD = endif test: do-build + @echo "### Running unit test..." go test ./... cd pkg/apis/camel && go test ./... cd pkg/client/camel && go test ./... @@ -280,8 +281,9 @@ test-upgrade: do-build go test -timeout 60m -v ./e2e/namespace/upgrade -tags=integration $(TEST_UPGRADE_RUN) build-kamel: -# Ensure the binary is statically linked when building on Linux due to ABI changes in newer glibc 2.32, otherwise -# it would not run on older versions. See https://github.com/apache/camel-k/pull/2141#issuecomment-800990117 + @echo "### Building kamel CLI..." + @# Ensure the binary is statically linked when building on Linux due to ABI changes in newer glibc 2.32, otherwise + @# it would not run on older versions. See https://github.com/apache/camel-k/pull/2141#issuecomment-800990117 ifeq ($(shell uname -s 2>/dev/null || echo Unknown),Linux) CGO_ENABLED=0 go build $(GOFLAGS) -o kamel ./cmd/kamel/*.go else @@ -293,6 +295,7 @@ build-resources: go generate ./pkg/... bundle-kamelets: + @echo "Preparing Kamelets bundle resource..." ifneq (,$(findstring release,$(MAKECMDGOALS))) ifneq (,$(findstring $(KAMELET_CATALOG_REPO_BRANCH), main)) @echo "You cannot set KAMELET_CATALOG_REPO_BRANCH=$(KAMELET_CATALOG_REPO_BRANCH) when doing a release" @@ -326,6 +329,7 @@ clean: rm -rf bundle dep: + @echo "Cleaning dependencies..." go mod tidy cd pkg/apis/camel && go mod tidy cd pkg/client/camel && go mod tidy @@ -348,27 +352,21 @@ check-platform: # The below are dependencies needed for maven structured logs. We must bundle into the final container image. maven-overlay: + @echo "### Preparing maven dependencies bundle..." mkdir -p build/_maven_overlay ./script/maven_overlay.sh build/_maven_overlay -images: bundle-kamelets test maven-overlay - mkdir -p build/_maven_output +kamel-overlay: + @echo "### Copying kamel CLI to output build directory..." mkdir -p build/_output/bin -ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux) - GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go -else cp kamel build/_output/bin -endif + +images: build kamel-overlay maven-overlay bundle-kamelets + @echo "### Building Camel K operator container image..." docker build -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile . -images-arch: bundle-kamelets test maven-overlay - mkdir -p build/_maven_output - mkdir -p build/_output/bin -ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux) - GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go -else - cp kamel build/_output/bin -endif +images-arch: build kamel-overlay maven-overlay bundle-kamelets + @echo "### Building Camel K operator container image for multi architectures..." docker buildx rm --all-inactive --force docker buildx create --append --name builder ifeq ($(shell uname -m), x86_x64) @@ -378,24 +376,12 @@ ifeq ($(shell uname -m), aarch64) docker buildx build --platform=linux/arm64 -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile.arch . endif -images-dev: bundle-kamelets test package-artifacts maven-overlay - mkdir -p build/_maven_output - mkdir -p build/_output/bin -ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux) - GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go -else - cp kamel build/_output/bin -endif +images-dev: build kamel-overlay maven-overlay bundle-kamelets package-artifacts + @echo "### Building Camel K operator container development image..." docker build -t $(CUSTOM_IMAGE):$(CUSTOM_VERSION) -f build/Dockerfile . -images-arch-dev: bundle-kamelets test package-artifacts maven-overlay - mkdir -p build/_maven_output - mkdir -p build/_output/bin -ifneq ($(shell uname -s 2>/dev/null || echo Unknown),Linux) - GOOS=linux go build $(GOFLAGS) -o build/_output/bin/kamel ./cmd/kamel/*.go -else - cp kamel build/_output/bin -endif
[GitHub] [camel-k] squakez merged pull request #3488: fix(ci): build before making images
squakez merged PR #3488: URL: https://github.com/apache/camel-k/pull/3488 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez closed issue #3474: `make images` is not building the binary
squakez closed issue #3474: `make images` is not building the binary URL: https://github.com/apache/camel-k/issues/3474 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8046: CAMEL-18152: implement auto-configuration for the adapters
github-actions[bot] commented on PR #8046: URL: https://github.com/apache/camel/pull/8046#issuecomment-1195537801 :warning: This PR changes Camel components and will be tested automatically. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez commented on issue #3458: Declaring multiple traits in KameletBinding fails badly
squakez commented on issue #3458: URL: https://github.com/apache/camel-k/issues/3458#issuecomment-1195537689 It seems the problem is happening when there is both a `camel.properties` trait enabled and a Kamelet property configured. Probably we're trying to mount twice the same `user.properties` instead of merging them into one unique (or 2 property file with different 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
[GitHub] [camel] orpiske opened a new pull request, #8046: CAMEL-18152: implement auto-configuration for the adapters
orpiske opened a new pull request, #8046: URL: https://github.com/apache/camel/pull/8046 -- 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: CAMEL-18229: renamed the adapter properties file to match the existing naming pattern
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b52b772d22757e18a8632b87e6e260f966671763
Author: Otavio Rodolfo Piske
AuthorDate: Mon Jul 25 16:52:26 2022 +0200
CAMEL-18229: renamed the adapter properties file to match the existing
naming pattern
---
.../camel/resume/{adapter.properties => Adapter} | 2 +-
.../main/resources/org/apache/camel/resume/Adapter}| 2 +-
.../org/apache/camel/resume/adapter.properties | 18 --
.../camel/resume/{adapter.properties => Adapter} | 2 +-
.../camel/resume/{adapter.properties => Adapter} | 2 +-
.../camel/resume/{adapter.properties => Adapter} | 2 +-
.../main/resources/org/apache/camel/resume/Adapter}| 2 +-
.../org/apache/camel/resume/adapter.properties | 18 --
.../properties/{adapter.properties => Adapter} | 0
.../org/apache/camel/support/resume/AdapterHelper.java | 4 ++--
10 files changed, 8 insertions(+), 44 deletions(-)
diff --git
a/components/camel-atom/src/main/resources/org/apache/camel/resume/adapter.properties
b/components/camel-atom/src/main/resources/org/apache/camel/resume/Adapter
similarity index 93%
copy from
components/camel-atom/src/main/resources/org/apache/camel/resume/adapter.properties
copy to components/camel-atom/src/main/resources/org/apache/camel/resume/Adapter
index 3504fd3a39f..c32e5e5ab78 100644
---
a/components/camel-atom/src/main/resources/org/apache/camel/resume/adapter.properties
+++ b/components/camel-atom/src/main/resources/org/apache/camel/resume/Adapter
@@ -15,4 +15,4 @@
## limitations under the License.
## ---
-adapterClass=org.apache.camel.component.atom.UpdatedDateFilter
+class=org.apache.camel.component.atom.UpdatedDateFilter
diff --git
a/components/camel-atom/src/main/resources/org/apache/camel/resume/adapter.properties
b/components/camel-aws/camel-aws2-kinesis/src/main/resources/org/apache/camel/resume/Adapter
similarity index 92%
copy from
components/camel-atom/src/main/resources/org/apache/camel/resume/adapter.properties
copy to
components/camel-aws/camel-aws2-kinesis/src/main/resources/org/apache/camel/resume/Adapter
index 3504fd3a39f..f39c417887c 100644
---
a/components/camel-atom/src/main/resources/org/apache/camel/resume/adapter.properties
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/resources/org/apache/camel/resume/Adapter
@@ -15,4 +15,4 @@
## limitations under the License.
## ---
-adapterClass=org.apache.camel.component.atom.UpdatedDateFilter
+class=org.apache.camel.component.aws2.kinesis.consumer.KinesisDefaultResumeAdapter
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/resources/org/apache/camel/resume/adapter.properties
b/components/camel-aws/camel-aws2-kinesis/src/main/resources/org/apache/camel/resume/adapter.properties
deleted file mode 100644
index faded762861..000
---
a/components/camel-aws/camel-aws2-kinesis/src/main/resources/org/apache/camel/resume/adapter.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-## ---
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---
-
-adapterClass=org.apache.camel.component.aws2.kinesis.consumer.KinesisDefaultResumeAdapter
diff --git
a/components/camel-cassandraql/src/main/resources/org/apache/camel/resume/adapter.properties
b/components/camel-cassandraql/src/main/resources/org/apache/camel/resume/Adapter
similarity index 93%
rename from
components/camel-cassandraql/src/main/resources/org/apache/camel/resume/adapter.properties
rename to
components/camel-cassandraql/src/main/resources/org/apache/camel/resume/Adapter
index 336c53d8298..ca5a3ee17dc 100644
---
a/components/camel-cassandraql/src/main/resources/org/apache/camel/resume/adapter.properties
+++
b/components/camel-cassandraql/src/main/resources/org/apache/camel/resume/Adapter
@@ -16,4 +16,4 @@
##
