Merge branch 'dev' into 240-onto-incl

.env.unix.example

@@ -6,7 +6,6 @@ BROKER_PASSWORD=fda
 BROKER_CONSUMERS=2
 WEBSITE=http://example.com
 TOKEN_MAX=5
-LOGO=/path/to/logo.png
 MAIL_FROM="Database Repository <noreply@example.com>"
 MAIL_REPLY_TO="Admin <somebody@example.com>"
 MAIL_VERIFY=false
@@ -19,3 +18,4 @@ JWT_SECRET=secret
 JWT_EXPIRATION=86400000
 EUREKA_SERVER=http://discovery-service:9090/eureka/
 SHARED_FILESYSTEM=/tmp
+LOG_LEVEL=trace # error, warning, info, debug, trace

.env.win.example

@@ -6,7 +6,6 @@ BROKER_PASSWORD=fda
 BROKER_CONSUMERS=2
 WEBSITE=http://example.com
 TOKEN_MAX=5
-LOGO=/path/to/logo.png
 MAIL_FROM="Database Repository <noreply@example.com>"
 MAIL_REPLY_TO="Admin <somebody@example.com>"
 MAIL_VERIFY=false
@@ -19,3 +18,4 @@ JWT_SECRET=secret
 JWT_EXPIRATION=86400000
 EUREKA_SERVER=http://discovery-service:9090/eureka/
 SHARED_FILESYSTEM=C:\tmp
+LOG_LEVEL=trace # error, warning, info, debug, trace

.gitlab-ci.yml

@@ -19,6 +19,7 @@ image: "docker/compose:latest"
 stages:
   - build-backend
   - build-frontend
+  - test-backend
   - build-docker
   - release
 
@@ -90,6 +91,69 @@ build-backend-metadata:
   script:
     - "make build-backend-metadata"
 
+test-backend-authentication:
+  stage: test-backend
+  needs:
+    - build-backend-authentication
+  script:
+    - "make test-authentication-service"
+
+test-backend-identifier:
+  stage: test-backend
+  needs:
+    - build-backend-authentication
+  script:
+    - "make test-identifier-service"
+
+test-backend-container:
+  stage: test-backend
+  needs:
+    - build-backend-container
+  script:
+    - "make test-container-service"
+
+test-backend-database:
+  stage: test-backend
+  needs:
+    - build-backend-database
+  script:
+    - "make test-database-service"
+
+test-backend-discovery:
+  stage: test-backend
+  needs:
+    - build-backend-discovery
+  script:
+    - "make test-discovery-service"
+
+test-backend-query:
+  stage: test-backend
+  needs:
+    - build-backend-query
+  script:
+    - "make test-query-service"
+
+test-backend-table:
+  stage: test-backend
+  needs:
+    - build-backend-table
+  script:
+    - "make test-table-service"
+
+test-backend-metadata:
+  stage: test-backend
+  needs:
+    - build-backend-metadata
+  script:
+    - "make test-metadata-service"
+
+test-backend-gateway:
+  stage: test-backend
+  needs:
+    - build-backend-gateway
+  script:
+    - "make test-gateway-service"
+
 build-docker:
   stage: build-docker
   needs:

Makefile

@@ -193,7 +193,7 @@ pull-metadata:
 
 test-backend: test-authentication-service test-container-service test-database-service test-discovery-service test-gateway-service test-query-service test-table-service test-identifier-service test-metadata-service
 
-test-backend-auth:
+test-authentication-service:
 	mvn -f ./fda-authentication-service/pom.xml clean test verify
 
 test-identifier-service:

fda-authentication-service/Dockerfile

@@ -39,6 +39,7 @@ ENV SMTP_HOST=""
 ENV SMTP_PORT=""
 ENV SMTP_USERNAME=""
 ENV SMTP_PASSWORD=""
+ENV LOG_LEVEL=debug
 
 VOLUME /tmp
 
@@ -47,8 +48,8 @@ RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./authentication-service.jar
 
 EXPOSE 9097
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./authentication-service.jar"]

fda-authentication-service/rest-service/src/main/resources/application-docker.yml

@@ -37,7 +37,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: authentication-service

fda-authentication-service/rest-service/src/main/resources/application.yml

@@ -40,7 +40,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: authentication-service

fda-container-service/Dockerfile

@@ -28,14 +28,15 @@ ENV BROKER_USERNAME=fda
 ENV BROKER_PASSWORD=fda
 ENV SHARED_FILESYSTEM=/tmp
 ENV USER_NETWORK=userdb
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./container-service.jar
 
 EXPOSE 9091
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./container-service.jar"]

fda-container-service/rest-service/src/main/resources/application-docker.yml

@@ -27,7 +27,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: container-service

fda-container-service/rest-service/src/main/resources/application.yml

@@ -27,7 +27,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: container-service

fda-database-service/Dockerfile

@@ -30,14 +30,15 @@ ENV SEARCH_ENDPOINT=search-service
 ENV SEARCH_USERNAME=elastic
 ENV SEARCH_PASSWORD=elastic
 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./database-service.jar
 
 EXPOSE 9092
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./database-service.jar"]

fda-database-service/rest-service/src/main/resources/application-docker.yml

@@ -30,7 +30,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: database-service

fda-database-service/rest-service/src/main/resources/application.yml

@@ -30,7 +30,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: database-service

fda-discovery-service/Dockerfile

@@ -18,14 +18,15 @@ FROM openjdk:11-jre-slim as runtime
 ENV METADATA_DB=fda
 ENV METADATA_USERNAME=postgres
 ENV METADATA_PASSWORD=postgres
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./discovery/target/discovery-*.jar ./discovery.jar
+COPY --from=build ./discovery/target/discovery-*.jar ./discovery-service.jar
 
 EXPOSE 9090
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./discovery.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./discovery-service.jar"]

fda-discovery-service/discovery/src/main/resources/application-docker.yml

@@ -22,7 +22,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   eureka.client.register-with-eureka: false

fda-discovery-service/discovery/src/main/resources/application.yml

@@ -22,7 +22,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   eureka.client.register-with-eureka: false

fda-gateway-service/Dockerfile

@@ -19,14 +19,15 @@ ENV METADATA_DB=fda
 ENV METADATA_USERNAME=postgres
 ENV METADATA_PASSWORD=postgres
 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./gateway/target/gateway-*.jar ./gateway.jar
+COPY --from=build ./gateway/target/gateway-*.jar ./gateway-service.jar
 
 EXPOSE 9095
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./gateway.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./gateway-service.jar"]
\ No newline at end of file

fda-gateway-service/gateway/src/main/resources/application-docker.yml

@@ -23,7 +23,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: discovery-service

fda-gateway-service/gateway/src/main/resources/application.yml

@@ -23,7 +23,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: discovery-service

fda-identifier-service/Dockerfile

@@ -27,14 +27,15 @@ ENV METADATA_USERNAME=postgres
 ENV METADATA_PASSWORD=postgres
 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
 ENV WEBSITE=http://localhost:3000
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./identifier-service.jar
 
 EXPOSE 9096
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./identifier-service.jar"]