Skip to content

Commit 04835f6

Browse files
cercer
committed
Improved schema naming, simplified scripts for creating schema
1 parent 8401adf commit 04835f6

File tree

12 files changed

+25
-64
lines changed

12 files changed

+25
-64
lines changed

‎docker-compose.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,31 @@ services:
3434
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
3535
EVENTUATE_CDC_PIPELINE_PIPELINE1_TYPE: eventuate-tram
3636
EVENTUATE_CDC_PIPELINE_PIPELINE1_READER: reader1
37-
EVENTUATE_CDC_PIPELINE_PIPELINE1_EVENTUATEDATABASESCHEMA: ftgoconsumerservice
37+
EVENTUATE_CDC_PIPELINE_PIPELINE1_EVENTUATEDATABASESCHEMA: ftgo_consumer_service
3838

3939
EVENTUATE_CDC_PIPELINE_PIPELINE2_TYPE: eventuate-tram
4040
EVENTUATE_CDC_PIPELINE_PIPELINE2_READER: reader1
41-
EVENTUATE_CDC_PIPELINE_PIPELINE2_EVENTUATEDATABASESCHEMA: ftgoorderservice
41+
EVENTUATE_CDC_PIPELINE_PIPELINE2_EVENTUATEDATABASESCHEMA: ftgo_order_service
4242

4343
EVENTUATE_CDC_PIPELINE_PIPELINE3_TYPE: eventuate-tram
4444
EVENTUATE_CDC_PIPELINE_PIPELINE3_READER: reader1
45-
EVENTUATE_CDC_PIPELINE_PIPELINE3_EVENTUATEDATABASESCHEMA: ftgokitchenservice
45+
EVENTUATE_CDC_PIPELINE_PIPELINE3_EVENTUATEDATABASESCHEMA: ftgo_kitchen_service
4646

4747
EVENTUATE_CDC_PIPELINE_PIPELINE4_TYPE: eventuate-tram
4848
EVENTUATE_CDC_PIPELINE_PIPELINE4_READER: reader1
49-
EVENTUATE_CDC_PIPELINE_PIPELINE4_EVENTUATEDATABASESCHEMA: ftgorestaurantservice
49+
EVENTUATE_CDC_PIPELINE_PIPELINE4_EVENTUATEDATABASESCHEMA: ftgo_restaurant_service
5050

5151
EVENTUATE_CDC_PIPELINE_PIPELINE5_TYPE: eventuate-tram
5252
EVENTUATE_CDC_PIPELINE_PIPELINE5_READER: reader1
53-
EVENTUATE_CDC_PIPELINE_PIPELINE5_EVENTUATEDATABASESCHEMA: ftgoaccountingservice
53+
EVENTUATE_CDC_PIPELINE_PIPELINE5_EVENTUATEDATABASESCHEMA: ftgo_accounting_service
5454

5555
EVENTUATE_CDC_PIPELINE_PIPELINE6_TYPE: eventuate-tram
5656
EVENTUATE_CDC_PIPELINE_PIPELINE6_READER: reader1
5757
EVENTUATE_CDC_PIPELINE_PIPELINE6_EVENTUATEDATABASESCHEMA: ftgoorderhistoryservice
5858

5959
EVENTUATE_CDC_PIPELINE_PIPELINE7_TYPE: eventuate-local
6060
EVENTUATE_CDC_PIPELINE_PIPELINE7_READER: reader1
61-
EVENTUATE_CDC_PIPELINE_PIPELINE7_EVENTUATEDATABASESCHEMA: ftgoaccountingservice
61+
EVENTUATE_CDC_PIPELINE_PIPELINE7_EVENTUATEDATABASESCHEMA: ftgo_accounting_service
6262

6363
EVENTUATE_CDC_READER_READER1_TYPE: mysql-binlog
6464
EVENTUATE_CDC_READER_READER1_DATASOURCEURL: jdbc:mysql://mysql:3306/eventuate
@@ -82,13 +82,13 @@ services:
8282
- kafka
8383
- cdc-service
8484
environment:
85-
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgoconsumerservice
85+
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgo_consumer_service
8686
SPRING_DATASOURCE_USERNAME: mysqluser
8787
SPRING_DATASOURCE_PASSWORD: mysqlpw
8888
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
8989
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
9090
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
91-
EVENTUATE_DATABASE_SCHEMA: ftgoconsumerservice
91+
EVENTUATE_DATABASE_SCHEMA: ftgo_consumer_service
9292
JAVA_OPTS: -Xmx192m
9393
ftgo-order-service:
9494
build: ./ftgo-order-service
@@ -100,7 +100,7 @@ services:
100100
- cdc-service
101101
- zipkin
102102
environment:
103-
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgoorderservice
103+
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgo_order_service
104104
SPRING_DATASOURCE_USERNAME: mysqluser
105105
SPRING_DATASOURCE_PASSWORD: mysqlpw
106106
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
@@ -110,7 +110,7 @@ services:
110110
SPRING_SLEUTH_ENABLED: "true"
111111
SPRING_SLEUTH_SAMPLER_PROBABILITY: 1
112112
SPRING_ZIPKIN_BASE_URL: http://zipkin:9411/
113-
EVENTUATE_DATABASE_SCHEMA: ftgoorderservice
113+
EVENTUATE_DATABASE_SCHEMA: ftgo_order_service
114114
ftgo-kitchen-service:
115115
build: ./ftgo-kitchen-service
116116
ports:
@@ -121,14 +121,14 @@ services:
121121
- zookeeper
122122
- cdc-service
123123
environment:
124-
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgokitchenservice
124+
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgo_kitchen_service
125125
SPRING_DATASOURCE_USERNAME: mysqluser
126126
SPRING_DATASOURCE_PASSWORD: mysqlpw
127127
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
128128
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
129129
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
130130
JAVA_OPTS: -Xmx192m
131-
EVENTUATE_DATABASE_SCHEMA: ftgokitchenservice
131+
EVENTUATE_DATABASE_SCHEMA: ftgo_kitchen_service
132132
ftgo-restaurant-service:
133133
build: ./ftgo-restaurant-service
134134
ports:
@@ -139,14 +139,14 @@ services:
139139
- zookeeper
140140
- cdc-service
141141
environment:
142-
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgorestaurantservice
142+
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgo_restaurant_service
143143
SPRING_DATASOURCE_USERNAME: mysqluser
144144
SPRING_DATASOURCE_PASSWORD: mysqlpw
145145
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
146146
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
147147
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
148148
JAVA_OPTS: -Xmx192m
149-
EVENTUATE_DATABASE_SCHEMA: ftgorestaurantservice
149+
EVENTUATE_DATABASE_SCHEMA: ftgo_restaurant_service
150150
ftgo-accounting-service:
151151
build: ./ftgo-accounting-service
152152
ports:
@@ -157,14 +157,14 @@ services:
157157
- zookeeper
158158
- cdc-service
159159
environment:
160-
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgoaccountingservice
160+
SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgo_accounting_service
161161
SPRING_DATASOURCE_USERNAME: mysqluser
162162
SPRING_DATASOURCE_PASSWORD: mysqlpw
163163
SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
164164
EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:9092
165165
EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
166166
JAVA_OPTS: -Xmx192m
167-
EVENTUATE_DATABASE_SCHEMA: ftgoaccountingservice
167+
EVENTUATE_DATABASE_SCHEMA: ftgo_accounting_service
168168
ftgo-order-history-service:
169169
build: ./ftgo-order-history-service
170170
ports:

‎ftgo-accounting-service/src/main/resources/application.properties‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,10 @@ logging.level.org.hibernate.SQL=DEBUG
88
logging.level.io.eventuate=DEBUG
99
logging.level.net.chrisrichardson.ftgo=DEBUG
1010
logging.level.io.eventuate.tram=TRACE
11-
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgoaccountingservice
11+
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_accounting_service
1212
spring.datasource.username=mysqluser
1313
spring.datasource.password=mysqlpw
1414
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
1515

1616
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
17-
eventuatelocal.cdc.db.user.name=root
18-
eventuatelocal.cdc.db.password=rootpassword
1917
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
20-
21-
aws.access.key_id=id_key
22-
aws.secret.access.key=access_key
23-
aws.dynamodb.endpoint.url=http://${DOCKER_HOST_IP:localhost}:8000
24-
aws.region=us-west-2

‎ftgo-consumer-service/src/main/resources/application.properties‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ logging.level.org.hibernate.SQL=DEBUG
88
logging.level.io.eventuate=DEBUG
99
logging.level.net.chrisrichardson.ftgo=DEBUG
1010
logging.level.io.eventuate.tram=TRACE
11-
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgoconsumerservice
11+
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_consumer_service
1212
spring.datasource.username=mysqluser
1313
spring.datasource.password=mysqlpw
1414
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
1515

1616
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
17-
eventuatelocal.cdc.db.user.name=root
18-
eventuatelocal.cdc.db.password=rootpassword
1917
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181

‎ftgo-kitchen-service/src/main/resources/application.properties‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ logging.level.io.eventuate=DEBUG
99
logging.level.net.chrisrichardson.ftgo=DEBUG
1010
logging.level.io.eventuate.tram=TRACE
1111

12-
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgokitchenservice
12+
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_kitchen_service
1313
spring.datasource.username=mysqluser
1414
spring.datasource.password=mysqlpw
1515
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
1616

1717
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
18-
eventuatelocal.cdc.db.user.name=root
19-
eventuatelocal.cdc.db.password=rootpassword
2018
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181

‎ftgo-kitchen-service/src/test/resources/application.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
1212
spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
1313

1414
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
15-
eventuatelocal.cdc.db.user.name=root
16-
eventuatelocal.cdc.db.password=rootpassword
1715
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
1816

1917
aws.access.key_id=id_key

‎ftgo-order-history-service/src/main/resources/application.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ logging.level.io.eventuate.tram=TRACE
88
logging.level.root=INFO
99

1010
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
11-
eventuatelocal.cdc.db.user.name=root
12-
eventuatelocal.cdc.db.password=rootpassword
1311
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
1412

1513
aws.access.key_id=id_key

‎ftgo-order-history-service/src/test/resources/application.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
1212
spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
1313

1414
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
15-
eventuatelocal.cdc.db.user.name=root
16-
eventuatelocal.cdc.db.password=rootpassword
1715
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
1816

1917
aws.access.key_id=id_key

‎ftgo-order-service/src/main/resources/application.properties‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ logging.level.net.chrisrichardson.ftgo=DEBUG
1414
logging.level.io.eventuate.tram=TRACE
1515

1616
eventuate.database.schema=none
17-
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgoorderservice
17+
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_order_service
1818
spring.datasource.username=mysqluser
1919
spring.datasource.password=mysqlpw
2020
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
2121

2222
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
23-
eventuatelocal.cdc.db.user.name=root
24-
eventuatelocal.cdc.db.password=rootpassword
2523
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
2624

‎ftgo-restaurant-service-aws-lambda/src/main/resources/application.properties‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
88
spring.data.mongodb.uri=mongodb://${DOCKER_HOST_IP:localhost}/bankingexampledb
99

1010
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
11-
eventuatelocal.cdc.db.user.name=root
12-
eventuatelocal.cdc.db.password=rootpassword
1311
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181
1412

1513
aws.access.key_id=id_key

‎ftgo-restaurant-service/src/main/resources/application.properties‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ logging.level.io.eventuate=DEBUG
99
logging.level.net.chrisrichardson.ftgo=DEBUG
1010
logging.level.io.eventuate.tram=TRACE
1111

12-
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgorestaurantservice
12+
spring.datasource.url=jdbc:mysql://${DOCKER_HOST_IP:localhost}/ftgo_restaurant_service
1313
spring.datasource.username=mysqluser
1414
spring.datasource.password=mysqlpw
1515
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
1616

1717
eventuatelocal.kafka.bootstrap.servers=${DOCKER_HOST_IP:localhost}:9092
18-
eventuatelocal.cdc.db.user.name=root
19-
eventuatelocal.cdc.db.password=rootpassword
2018
eventuatelocal.zookeeper.connection.string=${DOCKER_HOST_IP:localhost}:2181

0 commit comments

Comments
 (0)