You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/08/28 23:19:06 UTC
[camel-karavan] branch main updated (2040731b -> 1aa88167)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 2040731b Feature 836 (#873)
new c3b83293 Fix #869
new 1aa88167 Fix #869
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:
karavan-core/src/core/api/ComponentApi.ts | 3 +++
karavan-core/test/{placeholder.spec.ts => tod.spec.ts} | 11 +++++------
karavan-core/test/tod.yaml | 9 +++++++++
3 files changed, 17 insertions(+), 6 deletions(-)
copy karavan-core/test/{placeholder.spec.ts => tod.spec.ts} (75%)
create mode 100644 karavan-core/test/tod.yaml
[camel-karavan] 01/02: Fix #869
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit c3b8329329ca79a0a6c0474af0fa676926414ec4
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Aug 28 19:18:48 2023 -0400
Fix #869
---
karavan-core/test/tod.spec.ts | 38 ++++++++++++++++++++++++++++++++++++++
karavan-core/test/tod.yaml | 31 +++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+)
diff --git a/karavan-core/test/tod.spec.ts b/karavan-core/test/tod.spec.ts
new file mode 100644
index 00000000..a1fb9a9a
--- /dev/null
+++ b/karavan-core/test/tod.spec.ts
@@ -0,0 +1,38 @@
+/*
+ * 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 {expect} from 'chai';
+import * as fs from 'fs';
+import 'mocha';
+import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
+
+
+describe('Plain YAML with route to integration', () => {
+
+ it('YAML <-> Object', () => {
+ const yaml = fs.readFileSync('test/routes1.yaml',{encoding:'utf8', flag:'r'});
+ const i = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml);
+ expect(i.metadata.name).to.equal('test1.yaml');
+ expect(i.kind).to.equal('Integration');
+ expect(i.spec.flows?.length).to.equal(1);
+ expect(i.type).to.equal('plain');
+ if (i.spec.flows) expect(i.spec.flows[0].from.uri).to.equal('timer');
+ if (i.spec.flows) expect(i.spec.flows[0].from.parameters.name).to.equal('info');
+ const yaml2 = CamelDefinitionYaml.integrationToYaml(i);
+ expect(yaml.replaceAll("\r\n", "\n")).to.equal(yaml2); // replace for Windows compatibility
+ });
+
+});
diff --git a/karavan-core/test/tod.yaml b/karavan-core/test/tod.yaml
new file mode 100644
index 00000000..784cb8f4
--- /dev/null
+++ b/karavan-core/test/tod.yaml
@@ -0,0 +1,31 @@
+- route:
+ id: route-ea82
+ from:
+ uri: timer
+ id: from-1
+ parameters:
+ name: info
+ steps:
+ - choice:
+ when:
+ - expression:
+ simple:
+ expression: ${headers} != null
+ id: simple-1
+ id: when-1
+ steps:
+ - log:
+ message: hello11
+ logName: log11
+ id: log-1
+ - expression:
+ simple:
+ expression: ${headers} == null
+ id: simple-2
+ id: when-2
+ steps:
+ - log:
+ message: hello22s
+ logName: log22
+ id: log-2
+ id: choice-1
[camel-karavan] 02/02: Fix #869
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 1aa88167402d86fe87083c1664746118011cd8a1
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Aug 28 19:18:54 2023 -0400
Fix #869
---
karavan-core/src/core/api/ComponentApi.ts | 3 +++
karavan-core/test/tod.spec.ts | 15 ++++----------
karavan-core/test/tod.yaml | 34 ++++++-------------------------
3 files changed, 13 insertions(+), 39 deletions(-)
diff --git a/karavan-core/src/core/api/ComponentApi.ts b/karavan-core/src/core/api/ComponentApi.ts
index 60c035fd..5e4f372a 100644
--- a/karavan-core/src/core/api/ComponentApi.ts
+++ b/karavan-core/src/core/api/ComponentApi.ts
@@ -112,6 +112,9 @@ export class ComponentApi {
};
static parseElementUri(def: any): any {
+ if (def.dslName === 'ToDynamicDefinition') {
+ return def;
+ }
const uriParts = ComponentApi.parseUri(def.uri);
if (uriParts.length > 1 && !def.uri.startsWith('kamelet:')) {
const uriValues = ComponentApi.getUriParts(def.uri);
diff --git a/karavan-core/test/tod.spec.ts b/karavan-core/test/tod.spec.ts
index a1fb9a9a..f2330935 100644
--- a/karavan-core/test/tod.spec.ts
+++ b/karavan-core/test/tod.spec.ts
@@ -20,19 +20,12 @@ import 'mocha';
import {CamelDefinitionYaml} from "../src/core/api/CamelDefinitionYaml";
-describe('Plain YAML with route to integration', () => {
+describe('ToDynamicDefinition', () => {
- it('YAML <-> Object', () => {
- const yaml = fs.readFileSync('test/routes1.yaml',{encoding:'utf8', flag:'r'});
+ it('ToDynamicDefinition URI', () => {
+ const yaml = fs.readFileSync('test/tod.yaml',{encoding:'utf8', flag:'r'});
const i = CamelDefinitionYaml.yamlToIntegration("test1.yaml", yaml);
- expect(i.metadata.name).to.equal('test1.yaml');
- expect(i.kind).to.equal('Integration');
- expect(i.spec.flows?.length).to.equal(1);
- expect(i.type).to.equal('plain');
- if (i.spec.flows) expect(i.spec.flows[0].from.uri).to.equal('timer');
- if (i.spec.flows) expect(i.spec.flows[0].from.parameters.name).to.equal('info');
- const yaml2 = CamelDefinitionYaml.integrationToYaml(i);
- expect(yaml.replaceAll("\r\n", "\n")).to.equal(yaml2); // replace for Windows compatibility
+ expect(i.spec.flows?.[0].from.steps[0].uri, 'kafka:${header.foo}')
});
});
diff --git a/karavan-core/test/tod.yaml b/karavan-core/test/tod.yaml
index 784cb8f4..5f6cbf8a 100644
--- a/karavan-core/test/tod.yaml
+++ b/karavan-core/test/tod.yaml
@@ -1,31 +1,9 @@
- route:
- id: route-ea82
+ id: route-f435
from:
- uri: timer
- id: from-1
- parameters:
- name: info
+ uri: kamelet:timer-source
+ id: from-e52c
steps:
- - choice:
- when:
- - expression:
- simple:
- expression: ${headers} != null
- id: simple-1
- id: when-1
- steps:
- - log:
- message: hello11
- logName: log11
- id: log-1
- - expression:
- simple:
- expression: ${headers} == null
- id: simple-2
- id: when-2
- steps:
- - log:
- message: hello22s
- logName: log22
- id: log-2
- id: choice-1
+ - toD:
+ uri: kafka:${header.foo}
+ id: toD-0d39
\ No newline at end of file