Skip to content

Commit 44db9ea

Browse files
add tunnels for env deps and config props
1 parent 8fbddf4 commit 44db9ea

File tree

9 files changed

+82
-30
lines changed

9 files changed

+82
-30
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ target/
1818
.sonar/
1919
.sonarlint/
2020

21+
tunnels/
22+
2123
.DS_Store

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ docker/monitoring/volumes
4848

4949
http-client.env.json
5050

51-
/.idea/httpRequests/
51+
src/main/resources/config/env.properties

src/main/resources/application.properties

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
1+
spring.config.import=classpath:config/env.properties
12
spring.main.allow-bean-definition-overriding=false
23

34
server.port=8080
45
spring.application.name=SoftenoReactiveMongoApp
56

6-
spring.data.mongodb.host=localhost
7-
spring.data.mongodb.port=27017
8-
spring.data.mongodb.username=app
9-
spring.data.mongodb.password=password
10-
spring.data.mongodb.database=example1
7+
spring.data.mongodb.host=${MONGO_HOST}
8+
spring.data.mongodb.port=${MONGO_PORT}
9+
spring.data.mongodb.username=${MONGO_USER}
10+
spring.data.mongodb.password=${MONGO_PASSWORD}
11+
spring.data.mongodb.database=${MONGO_DB}
1112
spring.data.mongodb.auto-index-creation=true
1213

1314
spring.rsocket.server.mapping-path=/rsocket
1415
spring.rsocket.server.transport=websocket
1516
spring.rsocket.server.port=8081
1617

17-
spring.kafka.bootstrap-servers=localhost:9094
18+
spring.kafka.bootstrap-servers=${KAFKA_URL}
1819
spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
1920
spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
20-
spring.kafka.consumer.group-id=sample-group-jvm
21+
spring.kafka.consumer.group-id=${KAFKA_GROUP}
2122
spring.kafka.consumer.auto-offset-reset=earliest
2223
spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer
2324
spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
2425
spring.kafka.properties.spring.json.trusted.packages=*
2526
spring.kafka.consumer.properties.spring.json.use.type.headers=false
2627
spring.kafka.consumer.properties.spring.json.value.default.type=com.fasterxml.jackson.databind.JsonNode
2728

28-
com.softeno.kafka.tx=sample_topic_2
29-
com.softeno.kafka.rx=sample_topic_2
30-
com.softeno.kafka.keycloak=keycloak-events
29+
com.softeno.kafka.tx=${KAFKA_TOPIC_TX}
30+
com.softeno.kafka.rx=${KAFKA_TOPIC_RX}
31+
com.softeno.kafka.keycloak=${KAFKA_KEYCLOAK}
3132

32-
com.softeno.external.url=http://localhost:4500/sample
3333
#com.softeno.external.url=http://localhost:8080/sample
3434
#com.softeno.external.url=http://localhost:8080/sample-secured
35-
com.softeno.external.name=node-service
36-
com.softeno.external.graphql-url=http://localhost:8080/graphql
35+
com.softeno.external.url=${EXTERNAL_URL}
36+
com.softeno.external.name=${EXTERNAL_NAME}
37+
com.softeno.external.graphql-url=${EXTERNAL_GRAPH_QL}
3738

3839
resilience4j.circuitbreaker.instances.customer-service.failureRateThreshold=50
3940
resilience4j.circuitbreaker.instances.customer-service.minimumNumberOfCalls=10
@@ -42,16 +43,15 @@ resilience4j.circuitbreaker.instances.customer-service.slidingWindowSize=10
4243
resilience4j.circuitbreaker.instances.customer-service.waitDurationInOpenState=50s
4344
resilience4j.circuitbreaker.instances.customer-service.permittedNumberOfCallsInHalfOpenState=3
4445

45-
### keycloak realm config: http://localhost:8090/realms/master/.well-known/openid-configuration
46-
spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:8090/realms/master
47-
spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:8090/realms/master/protocol/openid-connect/certs
48-
spring.security.oauth2.client.registration.keycloak.client-id=backend
49-
spring.security.oauth2.client.registration.keycloak.client-secret=Jtn7eBkt5hU4E6oNy7iQ2YJPQR8po5oY
50-
spring.security.oauth2.client.registration.keycloak.authorization-grant-type=client_credentials
51-
spring.security.oauth2.client.provider.keycloak.authorization-uri=http://localhost:8090/realms/master/protocol/openid-connect/auth
52-
spring.security.oauth2.client.provider.keycloak.token-uri=http://localhost:8090/realms/master/protocol/openid-connect/token
53-
spring.security.oauth2.client.provider.keycloak.user-info-uri=http://localhost:8090/realms/master/protocol/openid-connect/userinfo
54-
spring.security.oauth2.client.provider.keycloak.jwk-set-uri=http://localhost:8090/realms/master/protocol/openid-connect/certs
46+
spring.security.oauth2.resourceserver.jwt.issuer-uri=${OAUTH_ISSUER_URI}
47+
spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${OAUTH_JWK_SET_URI}
48+
spring.security.oauth2.client.registration.keycloak.client-id=${OAUTH_CLIENT_ID}
49+
spring.security.oauth2.client.registration.keycloak.client-secret=${OAUTH_CLIENT_SECRET}
50+
spring.security.oauth2.client.registration.keycloak.authorization-grant-type=${OAUTH_GRANT_TYPE}
51+
spring.security.oauth2.client.provider.keycloak.authorization-uri=${OAUTH_AUTHORIZATION_URI}
52+
spring.security.oauth2.client.provider.keycloak.token-uri=${OAUTH_TOKEN_URI}
53+
spring.security.oauth2.client.provider.keycloak.user-info-uri=${OAUTH_USER_INFO_URI}
54+
spring.security.oauth2.client.provider.keycloak.jwk-set-uri=${OAUTH_JWK_SET_URI}
5555

5656
management.endpoints.web.base-path=/actuator
5757
management.endpoints.web.exposure.include=*
@@ -63,11 +63,11 @@ springdoc.api-docs.enabled=true
6363
springdoc.api-docs.path=/v3/api-docs
6464
springdoc.swagger-ui.path=/swagger-ui.html
6565

66-
io.min.name=admin
67-
io.min.secret=changeme
68-
io.min.url=http://localhost:9000/
69-
io.min.bucket=test
70-
io.min.folder=testDir
66+
io.min.name=${IO_MIN_NAME}
67+
io.min.secret=${IO_MIN_PASSWORD}
68+
io.min.url=${IO_MIN_URL}
69+
io.min.bucket=${IO_MIN_BUCKET}
70+
io.min.folder=${IO_MIN_FOLDER}
7171

7272
### grphql
7373
spring.graphql.path=/graphql
@@ -79,7 +79,7 @@ spring.graphql.cors.allowed-methods=*
7979

8080
## observation & zipkin
8181
management.tracing.enabled=true
82-
management.zipkin.tracing.endpoint=http://localhost:9411/api/v2/spans
82+
management.zipkin.tracing.endpoint=${ZIPKIN_URL}
8383
management.tracing.sampling.probability=1.0
8484
management.tracing.propagation.consume=b3
8585
management.tracing.propagation.produce=b3
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
MONGO_HOST=
2+
MONGO_PORT=
3+
MONGO_USER=
4+
MONGO_PASSWORD=
5+
MONGO_DB=
6+
7+
KAFKA_URL=
8+
KAFKA_GROUP=
9+
KAFKA_TOPIC_TX=
10+
KAFKA_TOPIC_RX=
11+
KAFKA_KEYCLOAK=
12+
13+
OAUTH_CLIENT_ID=
14+
OAUTH_CLIENT_SECRET=
15+
OAUTH_ISSUER_URI=
16+
OAUTH_JWK_SET_URI=
17+
OAUTH_AUTHORIZATION_URI=
18+
OAUTH_TOKEN_URI=
19+
OAUTH_USER_INFO_URI=
20+
OAUTH_GRANT_TYPE=
21+
22+
EXTERNAL_URL=
23+
EXTERNAL_NAME=
24+
EXTERNAL_GRAPH_QL=
25+
26+
ZIPKIN_URL=
27+
28+
IO_MIN_NAME=
29+
IO_MIN_PASSWORD=
30+
IO_MIN_URL=
31+
IO_MIN_BUCKET=
32+
IO_MIN_FOLDER=

src/main/resources/logback-spring.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<root level="info">
1717
<appender-ref ref="Console"/>
1818
</root>
19+
<logger name="org.springframework.security" level="info" additivity="false">
20+
<appender-ref ref="Console"/>
21+
</logger>
1922
<logger name="com.softeno" level="trace" additivity="false">
2023
<appender-ref ref="Console"/>
2124
</logger>

tunnels/tunnel-kafka.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
ssh -L 9094:$1:9094 $2@$1
4+

tunnels/tunnel-keycloak.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
ssh -L 8090:$1:8090 $2@$1

tunnels/tunnel-mongo.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
ssh -L 27017:$1:27017 $2@$1
4+

tunnels/tunnel-zipkin.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
ssh -L 9411:$1:9411 $2@$1
4+

0 commit comments

Comments
 (0)