fix port conflict and KeycloakIntegrationTest.kt
This commit is contained in:
parent
a3a3a5f87c
commit
dac0c691c8
1
.env
1
.env
|
|
@ -125,7 +125,6 @@ KC_HOSTNAME=auth.meldestelle.local
|
||||||
# 6. SERVICE DISCOVERY (Consul)
|
# 6. SERVICE DISCOVERY (Consul)
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
CONSUL_HOST=consul
|
CONSUL_HOST=consul
|
||||||
CONSUL_PORT=8500
|
|
||||||
SERVICE_DISCOVERY_ENABLED=true
|
SERVICE_DISCOVERY_ENABLED=true
|
||||||
SERVICE_DISCOVERY_REGISTER_SERVICES=true
|
SERVICE_DISCOVERY_REGISTER_SERVICES=true
|
||||||
SERVICE_DISCOVERY_HEALTH_CHECK_PATH=/health
|
SERVICE_DISCOVERY_HEALTH_CHECK_PATH=/health
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,6 @@ spring:
|
||||||
consul:
|
consul:
|
||||||
discovery:
|
discovery:
|
||||||
enabled: false
|
enabled: false
|
||||||
config:
|
|
||||||
enabled: false
|
|
||||||
|
|
||||||
security:
|
security:
|
||||||
oauth2:
|
oauth2:
|
||||||
|
|
@ -29,8 +27,6 @@ management:
|
||||||
health:
|
health:
|
||||||
show-details: always
|
show-details: always
|
||||||
show-components: always
|
show-components: always
|
||||||
security:
|
|
||||||
enabled: false
|
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
level:
|
level:
|
||||||
|
|
@ -38,15 +34,5 @@ logging:
|
||||||
org.springframework.security: DEBUG
|
org.springframework.security: DEBUG
|
||||||
org.springframework.cloud.consul: INFO
|
org.springframework.cloud.consul: INFO
|
||||||
|
|
||||||
# Keycloak configuration
|
# Custom properties can be added here when proper @ConfigurationProperties classes are created
|
||||||
keycloak:
|
# For now, these properties are moved to environment variables or removed to avoid warnings
|
||||||
auth-server-url: ${KEYCLOAK_AUTH_SERVER_URL:http://localhost:8180}
|
|
||||||
realm: meldestelle
|
|
||||||
resource: auth-server
|
|
||||||
credentials:
|
|
||||||
secret: your-client-secret-here
|
|
||||||
|
|
||||||
# JWT configuration (development only - use proper secrets in production)
|
|
||||||
jwt:
|
|
||||||
secret: dev-secret-key-change-in-production
|
|
||||||
expiration: 86400000 # 24 hours in milliseconds
|
|
||||||
|
|
|
||||||
|
|
@ -154,9 +154,6 @@ spring:
|
||||||
- Path=/api/ping/**
|
- Path=/api/ping/**
|
||||||
filters:
|
filters:
|
||||||
- StripPrefix=1
|
- StripPrefix=1
|
||||||
filter:
|
|
||||||
weight:
|
|
||||||
enabled: false
|
|
||||||
|
|
||||||
# Circuit Breaker Konfiguration
|
# Circuit Breaker Konfiguration
|
||||||
resilience4j:
|
resilience4j:
|
||||||
|
|
|
||||||
|
|
@ -54,8 +54,5 @@ resilience4j:
|
||||||
minimum-number-of-calls: 4
|
minimum-number-of-calls: 4
|
||||||
wait-duration-in-open-state: 5s
|
wait-duration-in-open-state: 5s
|
||||||
|
|
||||||
# Optional: Metrics configuration
|
# Metrics configuration removed to avoid property resolution warnings
|
||||||
metrics:
|
# Use micrometer and actuator endpoints for metrics instead
|
||||||
enabled: true
|
|
||||||
legacy:
|
|
||||||
enabled: true
|
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,11 @@ fi
|
||||||
echo
|
echo
|
||||||
echo "🧪 Test 2: All Services Have Unique Ports"
|
echo "🧪 Test 2: All Services Have Unique Ports"
|
||||||
echo "------------------------------------------"
|
echo "------------------------------------------"
|
||||||
ALL_PORTS=($GATEWAY_TEST_PORT $PING_TEST_PORT ${CONSUL_PORT:-8500} ${REDIS_PORT:-6379})
|
ALL_PORTS=("$GATEWAY_TEST_PORT" "$PING_TEST_PORT" "${CONSUL_PORT:-8500}" "${REDIS_PORT:-6379}")
|
||||||
UNIQUE_PORTS=($(printf "%s\n" "${ALL_PORTS[@]}" | sort -u))
|
UNIQUE_PORTS=()
|
||||||
|
while IFS= read -r line; do
|
||||||
|
UNIQUE_PORTS+=("$line")
|
||||||
|
done < <(printf "%s\n" "${ALL_PORTS[@]}" | sort -u)
|
||||||
|
|
||||||
if [ ${#ALL_PORTS[@]} -eq ${#UNIQUE_PORTS[@]} ]; then
|
if [ ${#ALL_PORTS[@]} -eq ${#UNIQUE_PORTS[@]} ]; then
|
||||||
echo "✅ PASS: All services have unique ports"
|
echo "✅ PASS: All services have unique ports"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user