diff --git a/api/Dockerfile b/api/Dockerfile index d4e3ed19..deaea8aa 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -10,10 +10,17 @@ COPY src ./src RUN gradle clean bootJar --no-daemon FROM eclipse-temurin:21-jdk-alpine -WORKDIR /app - -COPY --from=build /app/build/libs/*.jar app.jar EXPOSE 8080 -ENTRYPOINT ["java", "-jar", "app.jar"] +WORKDIR /app + +RUN apk add --no-cache bash netcat-openbsd + +COPY --from=build /app/build/libs/*.jar app.jar + +COPY ./api-init/wait-for-it.sh ./wait-for-it.sh +RUN chmod +x wait-for-it.sh + +ENTRYPOINT ["bash", "./wait-for-it.sh", "mongodb:27017", "--timeout=60", "--strict", "--", "java", "-jar", "app.jar"] + diff --git a/api/api-init/wait-for-it.sh b/api/api-init/wait-for-it.sh new file mode 100644 index 00000000..d990e0d3 --- /dev/null +++ b/api/api-init/wait-for-it.sh @@ -0,0 +1,182 @@ +#!/usr/bin/env bash +# Use this script to test if a given TCP host/port are available + +WAITFORIT_cmdname=${0##*/} + +echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } + +usage() +{ + cat << USAGE >&2 +Usage: + $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] + -h HOST | --host=HOST Host or IP under test + -p PORT | --port=PORT TCP port under test + Alternatively, you specify the host and port as host:port + -s | --strict Only execute subcommand if the test succeeds + -q | --quiet Don't output any status messages + -t TIMEOUT | --timeout=TIMEOUT + Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit 1 +} + +wait_for() +{ + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + else + echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" + fi + WAITFORIT_start_ts=$(date +%s) + while : + do + if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then + nc -z $WAITFORIT_HOST $WAITFORIT_PORT + WAITFORIT_result=$? + else + (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 + WAITFORIT_result=$? + fi + if [[ $WAITFORIT_result -eq 0 ]]; then + WAITFORIT_end_ts=$(date +%s) + echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" + break + fi + sleep 1 + done + return $WAITFORIT_result +} + +wait_for_wrapper() +{ + # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 + if [[ $WAITFORIT_QUIET -eq 1 ]]; then + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + else + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + fi + WAITFORIT_PID=$! + trap "kill -INT -$WAITFORIT_PID" INT + wait $WAITFORIT_PID + WAITFORIT_RESULT=$? + if [[ $WAITFORIT_RESULT -ne 0 ]]; then + echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + fi + return $WAITFORIT_RESULT +} + +# process arguments +while [[ $# -gt 0 ]] +do + case "$1" in + *:* ) + WAITFORIT_hostport=(${1//:/ }) + WAITFORIT_HOST=${WAITFORIT_hostport[0]} + WAITFORIT_PORT=${WAITFORIT_hostport[1]} + shift 1 + ;; + --child) + WAITFORIT_CHILD=1 + shift 1 + ;; + -q | --quiet) + WAITFORIT_QUIET=1 + shift 1 + ;; + -s | --strict) + WAITFORIT_STRICT=1 + shift 1 + ;; + -h) + WAITFORIT_HOST="$2" + if [[ $WAITFORIT_HOST == "" ]]; then break; fi + shift 2 + ;; + --host=*) + WAITFORIT_HOST="${1#*=}" + shift 1 + ;; + -p) + WAITFORIT_PORT="$2" + if [[ $WAITFORIT_PORT == "" ]]; then break; fi + shift 2 + ;; + --port=*) + WAITFORIT_PORT="${1#*=}" + shift 1 + ;; + -t) + WAITFORIT_TIMEOUT="$2" + if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi + shift 2 + ;; + --timeout=*) + WAITFORIT_TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + WAITFORIT_CLI=("$@") + break + ;; + --help) + usage + ;; + *) + echoerr "Unknown argument: $1" + usage + ;; + esac +done + +if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then + echoerr "Error: you need to provide a host and port to test." + usage +fi + +WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} +WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} +WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} +WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} + +# Check to see if timeout is from busybox? +WAITFORIT_TIMEOUT_PATH=$(type -p timeout) +WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) + +WAITFORIT_BUSYTIMEFLAG="" +if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then + WAITFORIT_ISBUSY=1 + # Check if busybox timeout uses -t flag + # (recent Alpine versions don't support -t anymore) + if timeout &>/dev/stdout | grep -q -e '-t '; then + WAITFORIT_BUSYTIMEFLAG="-t" + fi +else + WAITFORIT_ISBUSY=0 +fi + +if [[ $WAITFORIT_CHILD -gt 0 ]]; then + wait_for + WAITFORIT_RESULT=$? + exit $WAITFORIT_RESULT +else + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + wait_for_wrapper + WAITFORIT_RESULT=$? + else + wait_for + WAITFORIT_RESULT=$? + fi +fi + +if [[ $WAITFORIT_CLI != "" ]]; then + if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then + echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" + exit $WAITFORIT_RESULT + fi + exec "${WAITFORIT_CLI[@]}" +else + exit $WAITFORIT_RESULT +fi diff --git a/api/src/main/java/be/naaturel/boardmateapi/configurations/MongoConfig.java b/api/src/main/java/be/naaturel/boardmateapi/configurations/MongoConfig.java index 3b75d257..d9c4b523 100644 --- a/api/src/main/java/be/naaturel/boardmateapi/configurations/MongoConfig.java +++ b/api/src/main/java/be/naaturel/boardmateapi/configurations/MongoConfig.java @@ -2,9 +2,11 @@ package be.naaturel.boardmateapi.configurations; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; +import com.mongodb.client.MongoDatabase; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.mongodb.core.MongoTemplate; @Configuration public class MongoConfig { @@ -17,7 +19,10 @@ public class MongoConfig { } @Bean - public MongoClient mongoClient() { - return MongoClients.create(this.conf.connectionString); + public MongoTemplate mongoTemplate() { + System.out.println(">>> Connection string : " + conf.connectionString); + System.out.println(">>> Used database : " + conf.database); + MongoClient client = MongoClients.create(this.conf.connectionString); + return new MongoTemplate(client, conf.database); } } \ No newline at end of file diff --git a/api/src/main/java/be/naaturel/boardmateapi/configurations/Startup.java b/api/src/main/java/be/naaturel/boardmateapi/configurations/Startup.java deleted file mode 100644 index 44b82a3d..00000000 --- a/api/src/main/java/be/naaturel/boardmateapi/configurations/Startup.java +++ /dev/null @@ -1,23 +0,0 @@ -package be.naaturel.boardmateapi.configurations; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class Startup { - - AppConfigurations conf; - - @Autowired - public Startup(AppConfigurations appConf) { - this.conf = appConf; - } - - @Bean - public String log(){ - System.out.println(">>> Connection string : " + conf.connectionString); - System.out.println(">>> Database : " + conf.database); - return "logged"; - } -} diff --git a/api/src/main/java/be/naaturel/boardmateapi/controllers/PartyController.java b/api/src/main/java/be/naaturel/boardmateapi/controllers/GameController.java similarity index 82% rename from api/src/main/java/be/naaturel/boardmateapi/controllers/PartyController.java rename to api/src/main/java/be/naaturel/boardmateapi/controllers/GameController.java index 9ba60140..d9a43fff 100644 --- a/api/src/main/java/be/naaturel/boardmateapi/controllers/PartyController.java +++ b/api/src/main/java/be/naaturel/boardmateapi/controllers/GameController.java @@ -9,12 +9,12 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @RestController -public class PartyController { +public class GameController { private final GameService service; @Autowired - public PartyController(GameService service){ + public GameController(GameService service){ this.service = service; } @@ -38,7 +38,10 @@ public class PartyController { .status(HttpStatus.OK) .body(g); } catch (Exception e){ - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); + e.printStackTrace(); + return ResponseEntity + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .build(); } } @@ -51,7 +54,10 @@ public class PartyController { status(HttpStatus.INTERNAL_SERVER_ERROR) .build(); } catch (Exception e){ - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); + e.printStackTrace(); + return ResponseEntity + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(e.getStackTrace()); } } diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties index d0b2db1d..4839eefa 100644 --- a/api/src/main/resources/application.properties +++ b/api/src/main/resources/application.properties @@ -20,5 +20,5 @@ springdoc.swagger-ui.path=/api-docs springdoc.api-docs.path=/v1/api-docs #=============DATABASE============= -spring.data.mongodb.uri=mongodb://board-mate-user:apx820kcng@mongodb:27017/board-mate-db -spring.data.mongodb.database=board-mate-db \ No newline at end of file +spring.data.mongodb.uri=mongodb://board-mate-user:apx820kcng@mongodb:27017/board-mate-db?authSource=board-mate-db +spring.data.mongodb.database=board-mate-db