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 1550d2d Demo beans (#190)
1550d2d is described below
commit 1550d2dbfdd3f99c490b8e99e0d4c5cfe0d0f51c
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Sun Feb 13 13:09:01 2022 -0500
Demo beans (#190)
* VSCode deps style
* Fix for vscode
---
karavan-demo/http-to-kafka.yaml | 35 -------
karavan-demo/integrations/docker-compose.yml | 146 +++++++++++++--------------
karavan-demo/integrations/sql-to-kafka.yaml | 19 ----
karavan-vscode/src/extension.ts | 7 +-
karavan-vscode/webview/App.tsx | 5 +-
karavan-vscode/webview/index.css | 15 +--
6 files changed, 85 insertions(+), 142 deletions(-)
diff --git a/karavan-demo/http-to-kafka.yaml b/karavan-demo/http-to-kafka.yaml
deleted file mode 100644
index 298967a..0000000
--- a/karavan-demo/http-to-kafka.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- route:
- from:
- uri: platform-http:/demo
- steps:
- - unmarshal:
- json:
- library: jackson
- - choice:
- when:
- - expression:
- simple:
- expression: ${body[amount]} > 1000
- steps:
- - marshal:
- json:
- library: jackson
- - kamelet:
- name: kafka-not-secured-sink
- parameters:
- topic: topic-demo
- bootstrapServers: localhost:9092
- otherwise:
- steps:
- - log:
- message: Amount is too small
- loggingLevel: INFO
- logName: demo
- - setBody:
- expression:
- constant:
- expression: '{"result":"OK"}'
- - circuitBreaker: {}
- parameters:
- httpMethodRestrict: POST
- produces: application/json
diff --git a/karavan-demo/integrations/docker-compose.yml
b/karavan-demo/integrations/docker-compose.yml
index 4693a45..6b5a604 100644
--- a/karavan-demo/integrations/docker-compose.yml
+++ b/karavan-demo/integrations/docker-compose.yml
@@ -2,57 +2,57 @@
version: '3.8'
services:
- # mongo:
- # image: mongo
- # restart: always
- # ports:
- # - 27017:27017
- # environment:
- # MONGO_INITDB_ROOT_USERNAME: root
- # MONGO_INITDB_ROOT_PASSWORD: example
- # networks:
- # - karavan-demo
+ mongo:
+ image: mongo
+ restart: always
+ ports:
+ - 27017:27017
+ environment:
+ MONGO_INITDB_ROOT_USERNAME: root
+ MONGO_INITDB_ROOT_PASSWORD: example
+ networks:
+ - karavan-demo
- # zookeeper:
- # container_name: zookeeper
- # image: confluentinc/cp-zookeeper:latest
- # ports:
- # - "2181:2181"
- # environment:
- # ZOOKEEPER_CLIENT_PORT: 2181
- # ZOOKEEPER_TICK_TIME: 2000
- # networks:
- # - karavan-demo
+ zookeeper:
+ container_name: zookeeper
+ image: confluentinc/cp-zookeeper:latest
+ ports:
+ - "2181:2181"
+ environment:
+ ZOOKEEPER_CLIENT_PORT: 2181
+ ZOOKEEPER_TICK_TIME: 2000
+ networks:
+ - karavan-demo
- # kafka:
- # container_name: kafka
- # image: confluentinc/cp-kafka:latest
- # depends_on:
- # - zookeeper
- # ports:
- # - "9092:9092"
- # environment:
- # KAFKA_BROKER_ID: 1
- # KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
- # KAFKA_ADVERTISED_LISTENERS:
PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
- # KAFKA_LISTENER_SECURITY_PROTOCOL_MAP:
PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
- # KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
- # KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
- # KAFKA_CREATE_TOPICS: "events:1:1"
- # networks:
- # - karavan-demo
+ kafka:
+ container_name: kafka
+ image: confluentinc/cp-kafka:latest
+ depends_on:
+ - zookeeper
+ ports:
+ - "9092:9092"
+ environment:
+ KAFKA_BROKER_ID: 1
+ KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ KAFKA_ADVERTISED_LISTENERS:
PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
+ KAFKA_LISTENER_SECURITY_PROTOCOL_MAP:
PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+ KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+ KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+ KAFKA_CREATE_TOPICS: "events:1:1"
+ networks:
+ - karavan-demo
- # activemq:
- # image: registry.redhat.io/amq7/amq-broker:latest
- # container_name: activemq
- # environment:
- # - AMQ_USER=admin
- # - AMQ_PASSWORD=admin
- # ports:
- # - "61616:61616"
- # - "8161:8161"
- # networks:
- # - karavan-demo
+ activemq:
+ image: registry.redhat.io/amq7/amq-broker:latest
+ container_name: activemq
+ environment:
+ - AMQ_USER=admin
+ - AMQ_PASSWORD=admin
+ ports:
+ - "61616:61616"
+ - "8161:8161"
+ networks:
+ - karavan-demo
postgres:
image: postgres
@@ -82,32 +82,32 @@ services:
networks:
- karavan-demo
- # mysql:
- # image: mysql
- # container_name: mysql
- # restart: always
- # environment:
- # MYSQL_DATABASE: 'demo'
- # MYSQL_USER: 'demo'
- # MYSQL_PASSWORD: 'demo'
- # MYSQL_ROOT_PASSWORD: 'demo'
- # volumes:
- # - ./mysql_db.sql:/docker-entrypoint-initdb.d/mysql_db.sql
- # ports:
- # - '3306:3306'
- # expose:
- # - '3306'
- # networks:
- # - karavan-demo
+ mysql:
+ image: mysql
+ container_name: mysql
+ restart: always
+ environment:
+ MYSQL_DATABASE: 'demo'
+ MYSQL_USER: 'demo'
+ MYSQL_PASSWORD: 'demo'
+ MYSQL_ROOT_PASSWORD: 'demo'
+ volumes:
+ - ./mysql_db.sql:/docker-entrypoint-initdb.d/mysql_db.sql
+ ports:
+ - '3306:3306'
+ expose:
+ - '3306'
+ networks:
+ - karavan-demo
- # adminer:
- # image: adminer
- # container_name: adminer
- # restart: always
- # ports:
- # - 6060:8080
- # networks:
- # - karavan-demo
+ adminer:
+ image: adminer
+ container_name: adminer
+ restart: always
+ ports:
+ - 6060:8080
+ networks:
+ - karavan-demo
networks:
karavan-demo:
diff --git a/karavan-demo/integrations/sql-to-kafka.yaml
b/karavan-demo/integrations/sql-to-kafka.yaml
deleted file mode 100644
index 527429b..0000000
--- a/karavan-demo/integrations/sql-to-kafka.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-- route:
- from:
- uri: "sql:SELECT * FROM table1"
- parameters:
- dataSource: "datasource"
- steps:
- - marshal:
- json:
- library: Jackson
- - log: "${body}"
-- beans:
- - name: datasource
- type: "org.apache.commons.dbcp2.BasicDataSource"
- properties:
- username: postgres
- password: postgres
- url: jdbc:postgresql:localhost:5432:demo
- driverClassName: org.postgresql.Driver
-
diff --git a/karavan-vscode/src/extension.ts b/karavan-vscode/src/extension.ts
index f9cc360..cfc757e 100644
--- a/karavan-vscode/src/extension.ts
+++ b/karavan-vscode/src/extension.ts
@@ -59,7 +59,6 @@ export function activate(context: vscode.ExtensionContext) {
(...args: any[]) => {
if (args && args.length > 0) {
const yaml =
fs.readFileSync(path.resolve(args[0].path)).toString('utf8');
- console.log(yaml)
const filename = path.basename(args[0].path);
const relativePath = getRalativePath(args[0].path);
const integration = parceYaml(filename, yaml);
@@ -127,8 +126,7 @@ function openKaravanWebView(context:
vscode.ExtensionContext, webviewContent: st
panel.webview.postMessage({ command: 'components', components:
readComponents(context) });
// Send integration
- panel.webview.postMessage({ command: 'open', filename: filename, yaml:
yaml });
-
+ panel.webview.postMessage({ command: 'open', filename: filename,
relativePath: relativePath, yaml: yaml });
// Handle messages from the webview
panel.webview.onDidReceiveMessage(
@@ -136,8 +134,9 @@ function openKaravanWebView(context:
vscode.ExtensionContext, webviewContent: st
switch (message.command) {
case 'save':
if (vscode.workspace.workspaceFolders) {
+ console.log(message);
const uriFolder: vscode.Uri =
vscode.workspace.workspaceFolders[0].uri;
- const uriFile: vscode.Uri =
vscode.Uri.file(path.join(uriFolder.path, message.filename));
+ const uriFile: vscode.Uri =
vscode.Uri.file(path.join(uriFolder.path, message.relativePath));
fs.writeFile(uriFile.path, message.yaml, err => {
if (err) vscode.window.showErrorMessage("Error: "
+ err?.message);
});
diff --git a/karavan-vscode/webview/App.tsx b/karavan-vscode/webview/App.tsx
index c833189..1c23036 100644
--- a/karavan-vscode/webview/App.tsx
+++ b/karavan-vscode/webview/App.tsx
@@ -29,6 +29,7 @@ interface Props {
interface State {
filename: string
+ relativePath: string
yaml: string
key: string
}
@@ -37,6 +38,7 @@ class App extends React.Component<Props, State> {
public state: State = {
filename: '',
+ relativePath: '',
yaml: '',
key: ''
};
@@ -55,7 +57,7 @@ class App extends React.Component<Props, State> {
case 'open':
console.log(event);
if (this.state.filename === '' && this.state.key === ''){
- this.setState({filename: message.filename, yaml: message.yaml,
key: Math.random().toString()});
+ this.setState({filename: message.filename, yaml: message.yaml,
relativePath: message.relativePath, key: Math.random().toString()});
}
break;
}
@@ -66,6 +68,7 @@ class App extends React.Component<Props, State> {
vscode.postMessage({
command: 'save',
filename: filename,
+ relativePath: this.state.relativePath,
yaml: yaml
})
}
diff --git a/karavan-vscode/webview/index.css b/karavan-vscode/webview/index.css
index 1e786ab..15515cb 100644
--- a/karavan-vscode/webview/index.css
+++ b/karavan-vscode/webview/index.css
@@ -247,9 +247,6 @@ body,
--pf-c-page__main-section--BackgroundColor:
var(--pf-c-page__main-section--m-dark-100--BackgroundColor);
}
-.vscode-dark .karavan .beans-page .add-bean-button {
- /* color: rgb(239, 166, 79); */
-}
.vscode-dark .beans-page .beans-page-columns .bean-card-unselected {
border-color: rgb(239, 166, 79);
@@ -258,21 +255,19 @@ body,
.vscode-dark .beans-page .beans-page-columns .bean-card-selected {
color: rgb(171, 172, 224);
border-color: rgb(171, 172, 224);
-}
-
-.vscode-dark .beans-page .beans-page-columns .bean-card-selected {
background-color: rgb(37, 37, 38, 0.7);
- color: rgb(171, 172, 224);
}
-.vscode-dark .beans-page .beans-page-columns .bean-card-selected .icon {
- fill: rgb(171, 172, 224);
+.vscode-dark .beans-page .beans-page-columns .bean-card-unselected
.header-icon {
+ background: rgb(247, 205, 159);
+ border-color: rgb(239, 166, 79);
}
+
.vscode-dark .beans-page .beans-page-columns .bean-card:hover {
box-shadow: 0 0.01rem 0.001rem 0rem rgb(247 205 159 / 13%), 0 0.1rem 0.5rem
0.1rem rgb(247 205 159 / 12%);
}
.vscode-dark .beans-page .beans-page-columns .bean-card-unselected .icon {
- fill: white;
+ /* fill: white; */
}
\ No newline at end of file
