Commit a245908c authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update to prod/stage/test system

parent 395c3ccd
Pipeline #30209 passed with stages
in 4 minutes and 14 seconds
...@@ -19,14 +19,14 @@ sourceCompatibility = 1.8 ...@@ -19,14 +19,14 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
repositories { repositories {
jcenter() mavenCentral()
maven { maven {
url "https://dl.bintray.com/memoriav/memobase" url "https://gitlab.switch.ch/api/v4/projects/1324/packages/maven"
} }
} }
ext { ext {
kafkaV = '2.3.1' kafkaV = '2.7.0'
log4jV = '2.11.2' log4jV = '2.11.2'
} }
...@@ -40,7 +40,7 @@ dependencies { ...@@ -40,7 +40,7 @@ dependencies {
implementation group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaV implementation group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaV
implementation "org.apache.kafka:kafka-streams:${kafkaV}" implementation "org.apache.kafka:kafka-streams:${kafkaV}"
implementation 'org.memobase:memobase-service-utilities:2.0.15' implementation 'org.memobase:memobase-service-utilities:3.0.1'
// CSV Reader // CSV Reader
implementation("com.github.doyaaaaaken:kotlin-csv-jvm:0.7.3") implementation("com.github.doyaaaaaken:kotlin-csv-jvm:0.7.3")
// XSLX / XSL Reader // XSLX / XSL Reader
...@@ -50,7 +50,7 @@ dependencies { ...@@ -50,7 +50,7 @@ dependencies {
implementation 'org.odftoolkit:odftoolkit:1.0.0-BETA1' implementation 'org.odftoolkit:odftoolkit:1.0.0-BETA1'
// JSON Parser // JSON Parser
implementation 'com.beust:klaxon:5.2' implementation 'com.beust:klaxon:5.4'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.71" implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.71"
......
deploymentName: di-table-data-transform-deployment
applicationId: di-table-data-transform-prod-app
kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
inputTopicName: mb-di-data-transform-prod
outputTopicName: mb-di-mapper-prod
reportingTopicName: mb-di-reports-reporting-prod
\ No newline at end of file
deploymentName: di-table-data-transform-deployment
applicationId: di-table-data-transform-stage-app
kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
inputTopicName: mb-di-data-transform-stage
outputTopicName: mb-di-mapper-stage
reportingTopicName: mb-di-reports-reporting-stage
\ No newline at end of file
deploymentName: di-table-data-transform-deployment
applicationId: di-table-data-transform-test-app
kafkaConfigs: test-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
inputTopicName: mb-di-data-transform-prod
outputTopicName: mb-di-mapper-prod
reportingTopicName: mb-di-reports-reporting-prod
\ No newline at end of file
deploymentName: ip-table-data-transform-deployment
applicationId: table-data-transform-app
kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
inputTopicName: import-process-data-transform
outputTopicName: import-process-mapper
reportingTopicName: import-process-reporting
\ No newline at end of file
...@@ -2,12 +2,12 @@ registry: "cr.gitlab.switch.ch" ...@@ -2,12 +2,12 @@ registry: "cr.gitlab.switch.ch"
image: "memoriav/memobase-2020/services/import-process/table-data-transform" image: "memoriav/memobase-2020/services/import-process/table-data-transform"
tag: "latest" tag: "latest"
deploymentName: table-data-transform deploymentName: placeholder
applicationId: table-data-transform-app applicationId: placeholder
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: placeholder
sftpConfigs: internal-sftp-config sftpConfigs: placeholder
inputTopicName: import-process-data-transform inputTopicName: placeholder
outputTopicName: import-process-mapper outputTopicName: placeholder
reportingTopicName: import-process-reporting reportingTopicName: placeholder
\ No newline at end of file \ No newline at end of file
...@@ -42,7 +42,7 @@ class Service(file: String = "app.yml") { ...@@ -42,7 +42,7 @@ class Service(file: String = "app.yml") {
fun run() { fun run() {
stream.use { stream.use {
it.start() it.start()
while (stream.state().isRunning) { while (stream.state().isRunningOrRebalancing) {
log.info("Service is running.") log.info("Service is running.")
Thread.sleep(10_000L) Thread.sleep(10_000L)
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment