From 9f960c28209a4a3fb01a5b777ed87c5afb64ba9b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 12 Aug 2024 11:55:15 +0200 Subject: [PATCH 1/6] refs #4685 First working version --- README.md | 2 +- package.json | 2 +- queues/comparative.yml | 22 ++++++++++++ queues/stock.yml | 76 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 queues/comparative.yml create mode 100644 queues/stock.yml diff --git a/README.md b/README.md index 2b69786..a5d6b32 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,4 @@ npm run consumer * [Zongji](https://github.com/nevill/zongji) * [MySQL2](https://github.com/sidorares/node-mysql2#readme) -* [RabbitMQ] (https://www.rabbitmq.com/) +* [RabbitMQ](https://www.rabbitmq.com/) diff --git a/package.json b/package.json index 42eda9c..96a514a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mycdc", - "version": "0.0.14", + "version": "0.0.15", "author": "Verdnatura Levante SL", "description": "Asynchronous DB calculations reading the binary log", "license": "GPL-3.0", diff --git a/queues/comparative.yml b/queues/comparative.yml new file mode 100644 index 0000000..2754907 --- /dev/null +++ b/queues/comparative.yml @@ -0,0 +1,22 @@ +mode: changes +query: CALL vn.itemComparative_refresh(?, ?, ?) +includeSchema: + vn: + ticket: + key: id + columns: + - id + - shipped + - warehouseFk + - isDeleted + - clientFk + events: + - updaterows + sale: + key: id + columns: + - id + - ticketFk + - itemFk + - quantity + - priceFixed diff --git a/queues/stock.yml b/queues/stock.yml new file mode 100644 index 0000000..4f42e64 --- /dev/null +++ b/queues/stock.yml @@ -0,0 +1,76 @@ +query: + travel: CALL stock.buyAvailable_refresh('travel', :id) + entry: CALL stock.buyAvailable_refresh('entry', :id) + buy: CALL stock.buyAvailable_refresh('buy', :id) + ticket: CALL stock.outbound_refresh('ticket', :id) + sale: CALL stock.outbound_refresh('sale', :id) + order: CALL stock.outbound_refresh('order', :id) + orderRow: CALL stock.outbound_refresh('orderRow', :id) +includeSchema: + vn: + travel: + key: id + columns: + - id + - landed + - shipped + - landingHour + - warehouseInFk + - warehouseOutFk + - isReceived + events: + - updaterows + entry: + key: id + columns: + - id + - travelFk + - isRaid + events: + - updaterows + buy: + key: id + columns: + - id + - entryFk + - itemFk + - quantity + - life + - isAlive + ticket: + key: id + columns: + - id + - warehouseFk + - shipped + events: + - updaterows + sale: + key: id + columns: + - id + - ticketFk + - itemFk + - quantity + - created + - isPicked + hedera: + order: + key: id + columns: + - id + - date_send + - address_id + - company_id + - customer_id + - confirmed + events: + - updaterows + orderRow: + key: id + columns: + - orderFk + - itemFk + - warehouseFk + - shipment + - amount From deeaeb058aec30710f97d825a188567661ce4c02 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 24 Feb 2025 18:51:10 +0100 Subject: [PATCH 2/6] refs #4685 Alpha version --- assets/zongji.sql | 2 -- queues/stock.yml | 24 +++++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/zongji.sql b/assets/zongji.sql index b9bc14a..4d7e86b 100644 --- a/assets/zongji.sql +++ b/assets/zongji.sql @@ -9,5 +9,3 @@ CREATE TABLE `util`.`binlogQueue`( CREATE USER 'mycdc-producer'@'%' IDENTIFIED BY 'P4$$w0rd'; GRANT REPLICATION SLAVE, REPLICATION CLIENT, SELECT ON *.* TO 'mycdc-producer'@'%'; GRANT INSERT, DELETE ON `util`.* TO 'mycdc-producer'@'%'; - -CREATE USER 'mycdc-producer'@'%' IDENTIFIED BY 'P4$$w0rd'; diff --git a/queues/stock.yml b/queues/stock.yml index 4f42e64..2324eca 100644 --- a/queues/stock.yml +++ b/queues/stock.yml @@ -1,11 +1,11 @@ query: - travel: CALL stock.buyAvailable_refresh('travel', :id) - entry: CALL stock.buyAvailable_refresh('entry', :id) - buy: CALL stock.buyAvailable_refresh('buy', :id) - ticket: CALL stock.outbound_refresh('ticket', :id) - sale: CALL stock.outbound_refresh('sale', :id) - order: CALL stock.outbound_refresh('order', :id) - orderRow: CALL stock.outbound_refresh('orderRow', :id) + travel: CALL stock.buyOut_refreshBuy('travel', :id) + entry: CALL stock.buyOut_refreshBuy('entry', :id) + buy: CALL stock.buyOut_refreshBuy('lot', :id) + ticket: CALL stock.buyOut_refreshSale('ticket', :id) + sale: CALL stock.buyOut_refreshSale('lot', :id) + order: CALL stock.buyOut_refreshOrder('order', :id) + orderRow: CALL stock.buyOut_refreshOrder('lot', :id) includeSchema: vn: travel: @@ -18,6 +18,7 @@ includeSchema: - warehouseInFk - warehouseOutFk - isReceived + - isRaid events: - updaterows entry: @@ -25,11 +26,10 @@ includeSchema: columns: - id - travelFk - - isRaid events: - updaterows buy: - key: id + key: lotFk columns: - id - entryFk @@ -43,10 +43,11 @@ includeSchema: - id - warehouseFk - shipped + - landed events: - updaterows sale: - key: id + key: lotFk columns: - id - ticketFk @@ -67,10 +68,11 @@ includeSchema: events: - updaterows orderRow: - key: id + key: lotFk columns: - orderFk - itemFk - warehouseFk - shipment - amount + - created From 2ed53e5ea06122ddb3402ca574591c399f849d71 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 25 Feb 2025 09:39:09 +0100 Subject: [PATCH 3/6] refs #4685 Column fixes --- queues/comparative.yml | 22 ---------------------- queues/stock.yml | 5 +++-- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 queues/comparative.yml diff --git a/queues/comparative.yml b/queues/comparative.yml deleted file mode 100644 index 2754907..0000000 --- a/queues/comparative.yml +++ /dev/null @@ -1,22 +0,0 @@ -mode: changes -query: CALL vn.itemComparative_refresh(?, ?, ?) -includeSchema: - vn: - ticket: - key: id - columns: - - id - - shipped - - warehouseFk - - isDeleted - - clientFk - events: - - updaterows - sale: - key: id - columns: - - id - - ticketFk - - itemFk - - quantity - - priceFixed diff --git a/queues/stock.yml b/queues/stock.yml index 2324eca..f9eb7bb 100644 --- a/queues/stock.yml +++ b/queues/stock.yml @@ -31,7 +31,7 @@ includeSchema: buy: key: lotFk columns: - - id + - lotFk - entryFk - itemFk - quantity @@ -49,7 +49,7 @@ includeSchema: sale: key: lotFk columns: - - id + - lotFk - ticketFk - itemFk - quantity @@ -70,6 +70,7 @@ includeSchema: orderRow: key: lotFk columns: + - lotFk - orderFk - itemFk - warehouseFk From 831305ad301b1e197a5866e37084aff816e5b7bf Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 25 Feb 2025 13:30:35 +0100 Subject: [PATCH 4/6] refs #4685 Version increased --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96a514a..71efda8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mycdc", - "version": "0.0.15", + "version": "0.0.25", "author": "Verdnatura Levante SL", "description": "Asynchronous DB calculations reading the binary log", "license": "GPL-3.0", From 6e8ea95e534d19e3c12ce08f63dfa8644485c3c2 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 25 Feb 2025 18:08:07 +0100 Subject: [PATCH 5/6] refs #4685 Added ticket.isAlive, orderRow.isReserved --- queues/stock.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/queues/stock.yml b/queues/stock.yml index f9eb7bb..fcf9f5c 100644 --- a/queues/stock.yml +++ b/queues/stock.yml @@ -44,6 +44,7 @@ includeSchema: - warehouseFk - shipped - landed + - isAlive events: - updaterows sale: @@ -77,3 +78,4 @@ includeSchema: - shipment - amount - created + - isReserved From 7a8a7fe4d157a7ac9b0ced6d648947e090e90a4a Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 26 Feb 2025 17:06:54 +0100 Subject: [PATCH 6/6] refs #4685 Jenkinsfile improved for branch deploy --- Jenkinsfile | 88 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2a53e04..ebfa971 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,33 +1,81 @@ #!/usr/bin/env groovy +def PROTECTED_BRANCH +def IS_LATEST + +node { + stage('Setup') { + PROTECTED_BRANCH = [ + 'dev', + 'test', + 'master', + 'main', + 'beta' + ].contains(env.BRANCH_NAME) + + IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME) + + // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables + echo "NODE_NAME: ${env.NODE_NAME}" + echo "WORKSPACE: ${env.WORKSPACE}" + } +} pipeline { agent any options { disableConcurrentBuilds() } stages { - stage('Build') { - when {branch 'master'} + stage('Version') { + when { + expression { PROTECTED_BRANCH } + } steps { script { def packageJson = readJSON file: 'package.json' - env.VERSION = packageJson.version + def version = "${packageJson.version}-build${env.BUILD_ID}" + writeFile(file: 'VERSION.txt', text: version) + echo "VERSION: ${version}" } - sh 'docker-compose build --build-arg BUILD_ID=$BUILD_ID --parallel' } } - stage('Push') { - when {branch 'master'} + stage('Build') { + when { + expression { PROTECTED_BRANCH } + } environment { - CREDENTIALS = credentials('docker-registry') + VERSION = readFile 'VERSION.txt' + } + parallel { + stage('Producer') { + steps { + dockerBuild 'mycdc-producer', '.', 'assets/Dockerfile.producer' + } + } + stage('Consumer') { + steps { + dockerBuild 'mycdc-consumer', '.', 'assets/Dockerfile.consumer' + } + } + } + } + stage('Deploy') { + when { + branch 'dev' + branch 'test' + } + environment { + VERSION = readFile 'VERSION.txt' } steps { - script { - def packageJson = readJSON file: 'package.json' - env.VERSION = packageJson.version + withKubeConfig([ + serverUrl: "$KUBERNETES_API", + credentialsId: 'kubernetes', + namespace: 'mycdc' + ]) { + sh 'kubectl set image deployment/producer-$BRANCH_NAME main=$REGISTRY/mycdc-producer:$VERSION' + sh 'kubectl set image deployment/consumer-$BRANCH_NAME main=$REGISTRY/mycdc-consumer:$VERSION' } - sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY' - sh 'docker-compose push' } } } @@ -38,3 +86,19 @@ pipeline { } } } + +def dockerBuild(imageName, context, dockerfile = null) { + if (dockerfile == null) + dockerfile = "${context}/Dockerfile" + def baseImage = "${imageName}:${env.VERSION}" + def image = docker.build(baseImage, "-f ${dockerfile} ${context}") + dockerPush(image) +} + +def dockerPush(image) { + docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') { + image.push() + image.push(env.BRANCH_NAME) + if (IS_LATEST) image.push('latest') + } +}