Skip to content

Commit

Permalink
Version 1.0.02
Browse files Browse the repository at this point in the history
  • Loading branch information
rlegorreta committed May 23, 2023
1 parent 88a08bc commit 572feb5
Show file tree
Hide file tree
Showing 13 changed files with 135 additions and 66 deletions.
45 changes: 20 additions & 25 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions auth-service-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spring:
url: jdbc:postgresql://authDB:5452/authdb
username: "{cipher}AQA2GH4NpK1oG5cAR2xOzdpZtJ3jTaYJygcPv+ZOqqJaoi8ymBRHiI+EfEWcS4LBirBENx/XChKYypZCDnOKt7a9KQ8GGsrFiN7rTP6ZTZlfKCQFGPA4axavSUcLoZW0RoclrrpEsg0qAVEyCpfUKGKMzov5JGBuJCKy9ahW5kM29Bz40gZHsVbWMVwBUBtCOy8PTIiwVXV8oxm7xkyh0BOiIlNXXtqYyZLrkRaD057Btufpsgxi7Rywyrw4KN9qIaYR004JRYcWrQj9Ef9upP0LgL7vdWZV1S6BNJnVM42gFQf8v3yKa1zPMiJ5yNqADClRHqRwtxx/rUjjStg8jSMILSWklGwwptCdxvpx6tvUneKMfQTnuEZveqBHlC2JhIk="
password: "{cipher}AQAVK1RrA8s6iiKBYWaygWGc1GwyI95aRts2aoO6Y1swxEbApjEvG02TNJadbRX3R/mkKzV+zmc19G0wZM70RQMTtvSV9aC6pQtuM6QiI2inBA5VOs5N+Kkr4DYUkhfb8WnZdtsr/SMFY3/S3HiFAnoNROgCdVSjyoGQa+VTY+ffGYNDWpw29xR4munA57hp6LtgTp6rINKXXNXKHWbd8GY3UKdyEKifc9Tm9jnzaCfrzEmhX1fK0/uNkTgssRtUj3lxz8ZSlkjDS+EHcq9qGWIYdzKewRwJT/YLPNytEL/YGeu0tu9DN2gioyBmCEzy+t7D2OK1nfLUGGmeNQic9H5KnmXmyVmNWnVkK44nJPsJG70N295ewg9ZOTsVnsTqQGk="
hikari:
connection-timeout: 2000 # The maximum time (ms) to spend waiting to get a connection from the pool
maximum-pool-size: 5 # The maximum number of connections HikariCP will keep in the poo
neo4j:
uri: bolt://neo4jDB:7687
authentication:
Expand Down
3 changes: 3 additions & 0 deletions auth-service-localNoDocker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spring:
url: jdbc:postgresql://localhost:5452/authdb
username: "{cipher}AQA2GH4NpK1oG5cAR2xOzdpZtJ3jTaYJygcPv+ZOqqJaoi8ymBRHiI+EfEWcS4LBirBENx/XChKYypZCDnOKt7a9KQ8GGsrFiN7rTP6ZTZlfKCQFGPA4axavSUcLoZW0RoclrrpEsg0qAVEyCpfUKGKMzov5JGBuJCKy9ahW5kM29Bz40gZHsVbWMVwBUBtCOy8PTIiwVXV8oxm7xkyh0BOiIlNXXtqYyZLrkRaD057Btufpsgxi7Rywyrw4KN9qIaYR004JRYcWrQj9Ef9upP0LgL7vdWZV1S6BNJnVM42gFQf8v3yKa1zPMiJ5yNqADClRHqRwtxx/rUjjStg8jSMILSWklGwwptCdxvpx6tvUneKMfQTnuEZveqBHlC2JhIk="
password: "{cipher}AQAVK1RrA8s6iiKBYWaygWGc1GwyI95aRts2aoO6Y1swxEbApjEvG02TNJadbRX3R/mkKzV+zmc19G0wZM70RQMTtvSV9aC6pQtuM6QiI2inBA5VOs5N+Kkr4DYUkhfb8WnZdtsr/SMFY3/S3HiFAnoNROgCdVSjyoGQa+VTY+ffGYNDWpw29xR4munA57hp6LtgTp6rINKXXNXKHWbd8GY3UKdyEKifc9Tm9jnzaCfrzEmhX1fK0/uNkTgssRtUj3lxz8ZSlkjDS+EHcq9qGWIYdzKewRwJT/YLPNytEL/YGeu0tu9DN2gioyBmCEzy+t7D2OK1nfLUGGmeNQic9H5KnmXmyVmNWnVkK44nJPsJG70N295ewg9ZOTsVnsTqQGk="
hikari:
connection-timeout: 2000 # The maximum time (ms) to spend waiting to get a connection from the pool
maximum-pool-size: 5 # The maximum number of connections HikariCP will keep in the poo
neo4j:
uri: bolt://localhost:7687
authentication:
Expand Down
16 changes: 16 additions & 0 deletions gateway-service-kubernetes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Last update May 2023 (rlh)
server:
port: 8072

spring:
data:
redis: # Redis is used by storing in memory all thre reauests per user and therefore
# limit to a maximum request per user per second(e.g., 10 reauest per second)
connect-timeout: 2s
host: redis
port: 6379
timeout: 1s

# Testing what environment we are using
gateway:
greeting: "Welcome to gateway microservice from the config server, 'kubernetes configuration'."
27 changes: 26 additions & 1 deletion gateway-service-local.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,39 @@
# Last update February 2023 (rlh)
# Last update May 2023 (rlh)
server:
port: 8072

eureka:
instance:
preferIpAddress: true
instanceId: ${spring.application.name}:${random.int}
hostname: gateway
client:
registerWithEureka: true
fetchRegistry: true # this must be true otherwise sends a 500 service unavailable
healthcheck:
enabled: false # this must be false otherwise sends a 500 service unavailable
serviceUrl:
defaultZone: http://eureka:8070/eureka/

spring:
cloud:
loadbalancer:
ribbon:
enabled: false
gateway:
# This is for automatic mapping of routes using eureka
discovery:
locator:
enabled: true
lowerCaseServiceId: true
data:
redis: # Redis is used by storing in memory all thre reauests per user and therefore
# limit to a maximum request per user per second(e.g., 10 reauest per second)
connect-timeout: 2s
host: redis
port: 6379
timeout: 1s

# Testing what environment we are using
gateway:
greeting: "Welcome to gateway microservice from the config server, 'local configuration'."
27 changes: 26 additions & 1 deletion gateway-service-localNoDocker.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,39 @@
# Last update February 2023 (rlh)
# Last update May 2023 (rlh)
server:
port: 8072

eureka:
instance:
preferIpAddress: true
instanceId: ${spring.application.name}:${random.int}
hostname: gateway
client:
registerWithEureka: true
fetchRegistry: true # this must be true otherwise sends a 500 service unavailable
healthcheck:
enabled: false # this must be false otherwise sends a 500 service unavailable
serviceUrl:
defaultZone: http://localhost:8070/eureka/

spring:
cloud:
loadbalancer:
ribbon:
enabled: false
gateway:
# This is for automatic mapping of routes using eureka
discovery:
locator:
enabled: true
lowerCaseServiceId: true
data:
redis: # Redis is used by storing in memory all thre reauests per user and therefore
# limit to a maximum request per user per second(e.g., 10 reauest per second)
connect-timeout: 2s # Time limit for a connection to establish
host: localhost
port: 6379
timeout: 1s # Time limit for a response to be received

# Testing what environment we are using
gateway:
greeting: "Welcome to gateway microservice from the config server, 'localNoDocker configuration'."
29 changes: 11 additions & 18 deletions gateway-service.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
# Last update May 2023 (rlh)

eureka:
instance:
preferIpAddress: true
instanceId: ${spring.application.name}:${random.int}
hostname: gateway-service
client:
enabled: false # Not used, just for Docker desktop with service discovery and load balanced
registerWithEureka: true
fetchRegistry: true # this must be true otherwise sends a 500 service unavailable

spring:
cloud:
loadbalancer:
ribbon:
enabled: false
gateway:
# This is for automatic mapping of routes using eureka
discovery:
locator:
enabled: true
lowerCaseServiceId: true
# This is if we want manually mapping routing using service discovery
# Erase al postfix for '-service' microservices
routes:
Expand Down Expand Up @@ -90,6 +72,17 @@ spring:
- Path=/param-service/**
filters:
- RewritePath=/param-service/(?<path>.*), /$\{path}
- id: test-service # The route ID
uri: ${TEST_SERVICE_URL:lb://test}
predicates:
- Path=/test-service/** # The predicate is a path to match
filters:
- RewritePath=/test-service/(?<path>.*), /$\{path} # Rewrite the path to take out the 'service'
- name:
CircuitBreaker: # Filter name for Circuit breaker
args:
name: tesCircuitBreaker # Name of the circuit breaker
fallbackUri: forward:/test-fallback # Forwards request to this URI when the circuit is open

# Testing what environment we are using
gateway:
Expand Down
6 changes: 5 additions & 1 deletion param-ingestor-service-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ eureka:
spring:
# Postgres DB to store all system parameters
datasource:
url: jdbc:postgresql://paramDB:5442/paramdb
url: jdbc:postgresql://paramDB:5452/paramdb
username: "{cipher}AQBLXYRWIKIIytWzw/VIQNfrMHay3gXdliVTNniJTFZ/IGsOVMr4ZLte/c7VM9eabjbdTOcLbKfwKiMQ/h3p2c5OPMEOk556ZRthgnnQSm8znXm+TRiZE6ig9pZnhuzFtSQKKT6Ilemr6FMttDO30zderR7/ST4Mp79+VqyqPtVkoKGPPJaEuc6DhvbzxIBZpNQgaHLvLoN6ubfnzbWTW5lujADegfiN4XHRc1mlOWNi8zv/TzCx1+Vc/KuuDvXnMV/VAQ7rLQRiXaxRmERLlMR16P0SvDhxVr6apYHhu/+LM3Dj7uQtZG91p8Yeb+3h1FRdZtgN/6K8aeBtYkuW/0f3a8DC4Ok6rVI1TV2//3JTElZsxHnqhv6UMQsaOUSwJvY="
password: "{cipher}AQBRD5jO2C7EUbzgiBo6rpcIrsC5hyg+oVhNpkn/Aoh/ld6Kk59vJ11fg3XqBOYtvRl4EiK89Kyn/n0559mtag+E/SFv6tcHPBEE47qMT2ewIJ/7qfEttEqm6Bp/cnLRi3ynZDt/xg4LYtaYmquxyL29zuH6yXqAdj1UTX3G3cCvYVXkXMhlQK+N94iH0E5jFSiniwB/PrnE/FF0wiel5iOfw+0SRGowWifHFKtHSHUGevWucTa/XHECN6csUCI9sbFolHfkNfixgnqVmcJralMqEjIBKXYPWCHlsuPr8QrrBMi6TLG+XTneU05bTEB1ceCE1Jk+HWdQxgmZlAbWpT4t6o+cqSAZ9Rpb6fpVjhIX/whD61XdUfxjfyhXMA/GzgM="
hikari:
connection-timeout: 2000 # The maximum time (ms) to spend waiting to get a connection from the pool
maximum-pool-size: 5 # The maximum number of connections HikariCP will keep in the poo

# Zipking variables
sleuth:
sampler:
Expand Down
5 changes: 4 additions & 1 deletion param-ingestor-service-localNoDocker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ eureka:

spring:
datasource:
url: jdbc:postgresql://localhost:5442/paramdb
url: jdbc:postgresql://localhost:5452/paramdb
username: "{cipher}AQBLXYRWIKIIytWzw/VIQNfrMHay3gXdliVTNniJTFZ/IGsOVMr4ZLte/c7VM9eabjbdTOcLbKfwKiMQ/h3p2c5OPMEOk556ZRthgnnQSm8znXm+TRiZE6ig9pZnhuzFtSQKKT6Ilemr6FMttDO30zderR7/ST4Mp79+VqyqPtVkoKGPPJaEuc6DhvbzxIBZpNQgaHLvLoN6ubfnzbWTW5lujADegfiN4XHRc1mlOWNi8zv/TzCx1+Vc/KuuDvXnMV/VAQ7rLQRiXaxRmERLlMR16P0SvDhxVr6apYHhu/+LM3Dj7uQtZG91p8Yeb+3h1FRdZtgN/6K8aeBtYkuW/0f3a8DC4Ok6rVI1TV2//3JTElZsxHnqhv6UMQsaOUSwJvY="
password: "{cipher}AQBRD5jO2C7EUbzgiBo6rpcIrsC5hyg+oVhNpkn/Aoh/ld6Kk59vJ11fg3XqBOYtvRl4EiK89Kyn/n0559mtag+E/SFv6tcHPBEE47qMT2ewIJ/7qfEttEqm6Bp/cnLRi3ynZDt/xg4LYtaYmquxyL29zuH6yXqAdj1UTX3G3cCvYVXkXMhlQK+N94iH0E5jFSiniwB/PrnE/FF0wiel5iOfw+0SRGowWifHFKtHSHUGevWucTa/XHECN6csUCI9sbFolHfkNfixgnqVmcJralMqEjIBKXYPWCHlsuPr8QrrBMi6TLG+XTneU05bTEB1ceCE1Jk+HWdQxgmZlAbWpT4t6o+cqSAZ9Rpb6fpVjhIX/whD61XdUfxjfyhXMA/GzgM="
hikari:
connection-timeout: 2000 # The maximum time (ms) to spend waiting to get a connection from the pool
maximum-pool-size: 5 # The maximum number of connections HikariCP will keep in the poo

# Zipking variables
sleuth:
Expand Down
5 changes: 4 additions & 1 deletion param-service-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ spring:

# Postgres DB to store all system parameters
datasource:
url: jdbc:postgresql://paramDB:5442/paramdb
url: jdbc:postgresql://paramDB:5452/paramdb
username: "{cipher}AQBLXYRWIKIIytWzw/VIQNfrMHay3gXdliVTNniJTFZ/IGsOVMr4ZLte/c7VM9eabjbdTOcLbKfwKiMQ/h3p2c5OPMEOk556ZRthgnnQSm8znXm+TRiZE6ig9pZnhuzFtSQKKT6Ilemr6FMttDO30zderR7/ST4Mp79+VqyqPtVkoKGPPJaEuc6DhvbzxIBZpNQgaHLvLoN6ubfnzbWTW5lujADegfiN4XHRc1mlOWNi8zv/TzCx1+Vc/KuuDvXnMV/VAQ7rLQRiXaxRmERLlMR16P0SvDhxVr6apYHhu/+LM3Dj7uQtZG91p8Yeb+3h1FRdZtgN/6K8aeBtYkuW/0f3a8DC4Ok6rVI1TV2//3JTElZsxHnqhv6UMQsaOUSwJvY="
password: "{cipher}AQBRD5jO2C7EUbzgiBo6rpcIrsC5hyg+oVhNpkn/Aoh/ld6Kk59vJ11fg3XqBOYtvRl4EiK89Kyn/n0559mtag+E/SFv6tcHPBEE47qMT2ewIJ/7qfEttEqm6Bp/cnLRi3ynZDt/xg4LYtaYmquxyL29zuH6yXqAdj1UTX3G3cCvYVXkXMhlQK+N94iH0E5jFSiniwB/PrnE/FF0wiel5iOfw+0SRGowWifHFKtHSHUGevWucTa/XHECN6csUCI9sbFolHfkNfixgnqVmcJralMqEjIBKXYPWCHlsuPr8QrrBMi6TLG+XTneU05bTEB1ceCE1Jk+HWdQxgmZlAbWpT4t6o+cqSAZ9Rpb6fpVjhIX/whD61XdUfxjfyhXMA/GzgM="
hikari:
connection-timeout: 2000 # The maximum time (ms) to spend waiting to get a connection from the pool
maximum-pool-size: 5 # The maximum number of connections HikariCP will keep in the poo

management:
tracing:
Expand Down
5 changes: 4 additions & 1 deletion param-service-localNoDocker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ spring:
brokers: http://localhost:9092

datasource:
url: jdbc:postgresql://localhost:5442/paramdb
url: jdbc:postgresql://localhost:5452/paramdb
username: "{cipher}AQBLXYRWIKIIytWzw/VIQNfrMHay3gXdliVTNniJTFZ/IGsOVMr4ZLte/c7VM9eabjbdTOcLbKfwKiMQ/h3p2c5OPMEOk556ZRthgnnQSm8znXm+TRiZE6ig9pZnhuzFtSQKKT6Ilemr6FMttDO30zderR7/ST4Mp79+VqyqPtVkoKGPPJaEuc6DhvbzxIBZpNQgaHLvLoN6ubfnzbWTW5lujADegfiN4XHRc1mlOWNi8zv/TzCx1+Vc/KuuDvXnMV/VAQ7rLQRiXaxRmERLlMR16P0SvDhxVr6apYHhu/+LM3Dj7uQtZG91p8Yeb+3h1FRdZtgN/6K8aeBtYkuW/0f3a8DC4Ok6rVI1TV2//3JTElZsxHnqhv6UMQsaOUSwJvY="
password: "{cipher}AQBRD5jO2C7EUbzgiBo6rpcIrsC5hyg+oVhNpkn/Aoh/ld6Kk59vJ11fg3XqBOYtvRl4EiK89Kyn/n0559mtag+E/SFv6tcHPBEE47qMT2ewIJ/7qfEttEqm6Bp/cnLRi3ynZDt/xg4LYtaYmquxyL29zuH6yXqAdj1UTX3G3cCvYVXkXMhlQK+N94iH0E5jFSiniwB/PrnE/FF0wiel5iOfw+0SRGowWifHFKtHSHUGevWucTa/XHECN6csUCI9sbFolHfkNfixgnqVmcJralMqEjIBKXYPWCHlsuPr8QrrBMi6TLG+XTneU05bTEB1ceCE1Jk+HWdQxgmZlAbWpT4t6o+cqSAZ9Rpb6fpVjhIX/whD61XdUfxjfyhXMA/GzgM="
hikari:
connection-timeout: 2000 # The maximum time (ms) to spend waiting to get a connection from the pool
maximum-pool-size: 5 # The maximum number of connections HikariCP will keep in the poo

management:
tracing:
Expand Down
Loading

0 comments on commit 572feb5

Please sign in to comment.