Rename 'error-reporting' server as 'game-support' server (#12132)

* Add NGINX to docker-compose * Remove placeholder build.gradle files (not yet clear if this is what we want) * Update error report server to use context path of '/game-support' * Move 'error-reporting' client to 'servers/error-report/client' * Rename 'servers/error-reporting' -> 'servers/game-support' * Build game installers whenever any http 'client' folder is updated
triplea-game · Nov 26, 2023 · c10971f · c10971f
1 parent ac5a642
commit c10971f
Show file tree

Hide file tree

Showing 46 changed files with 18 additions and 62 deletions.
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
@@ -9,5 +9,8 @@ services:
     volumes:
       - ./init.sql:/docker-entrypoint-initdb.d/01-init.sql
     ports:
-      - 5432:5432
-
+      - "5432:5432"
+  nginx:
+    image: nginx:stable-alpine-perl
+    ports:
+      - "80:80"
diff --git a/.github/workflows/upload-game-installers.yml b/.github/workflows/upload-game-installers.yml
@@ -4,10 +4,11 @@ on:
     branches:
       - master
     paths:
+      - 'build.gradle'
       - 'game-app/**'
       - 'http-clients/**'
       - 'lib/**'
-      - 'build.gradle'
+      - 'servers/*/client/**'
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 jobs:

diff --git a/servers/error-reporting/README.md → servers/game-support/README.md b/servers/error-reporting/README.md → servers/game-support/README.md
diff --git a/...ients/error-reporting-client/build.gradle → servers/game-support/client/build.gradle b/...ients/error-reporting-client/build.gradle → servers/game-support/client/build.gradle
diff --git a/.../report/CanUploadErrorReportResponse.java → .../report/CanUploadErrorReportResponse.java b/.../report/CanUploadErrorReportResponse.java → .../report/CanUploadErrorReportResponse.java
diff --git a/...client/error/report/CanUploadRequest.java → ...client/error/report/CanUploadRequest.java b/...client/error/report/CanUploadRequest.java → ...client/error/report/CanUploadRequest.java
diff --git a/...lient/error/report/ErrorReportClient.java → ...lient/error/report/ErrorReportClient.java b/...lient/error/report/ErrorReportClient.java → ...lient/error/report/ErrorReportClient.java
@@ -8,8 +8,8 @@
 
 /** Http client to upload error reports to the http lobby server. */
 public interface ErrorReportClient {
-  String ERROR_REPORT_PATH = "/error-report";
-  String CAN_UPLOAD_ERROR_REPORT_PATH = "/error-report-check";
+  String ERROR_REPORT_PATH = "/game-support/error-report";
+  String CAN_UPLOAD_ERROR_REPORT_PATH = "/game-support/error-report-check";
   int MAX_REPORTS_PER_DAY = 5;
 
   /** Creates an error report uploader clients, sends error reports and gets a response back. */

diff --git a/...ient/error/report/ErrorReportRequest.java → ...ient/error/report/ErrorReportRequest.java b/...ient/error/report/ErrorReportRequest.java → ...ient/error/report/ErrorReportRequest.java
diff --git a/...ent/error/report/ErrorReportResponse.java → ...ent/error/report/ErrorReportResponse.java b/...ent/error/report/ErrorReportResponse.java → ...ent/error/report/ErrorReportResponse.java
diff --git a/servers/error-reporting/build.gradle → servers/game-support/server/build.gradle b/servers/error-reporting/build.gradle → servers/game-support/server/build.gradle
@@ -49,9 +49,9 @@ configurations {
 dependencies {
     implementation "io.dropwizard:dropwizard-core:$dropwizardVersion"
     implementation "io.dropwizard:dropwizard-jdbi3:$dropwizardVersion"
-    implementation project(':http-clients:error-reporting-client')
     implementation project(':http-clients:github-client')
     implementation project(':lib:http-client-lib')
+    implementation project(':servers:game-support:client')
     implementation project(':servers:server-lib')
 
     runtimeOnly "org.postgresql:postgresql:$postgresqlVersion"

diff --git a/servers/error-reporting/configuration.yml → ...ers/game-support/server/configuration.yml b/servers/error-reporting/configuration.yml → ...ers/game-support/server/configuration.yml
diff --git a/...rror/reporting/ErrorReportController.java → ...rror/reporting/ErrorReportController.java b/...rror/reporting/ErrorReportController.java → ...rror/reporting/ErrorReportController.java
diff --git a/...eporting/ErrorReportingConfiguration.java → ...eporting/ErrorReportingConfiguration.java b/...eporting/ErrorReportingConfiguration.java → ...eporting/ErrorReportingConfiguration.java
diff --git a/...error/reporting/ErrorReportingServer.java → ...error/reporting/ErrorReportingServer.java b/...error/reporting/ErrorReportingServer.java → ...error/reporting/ErrorReportingServer.java
diff --git a/.../upload/CanUploadErrorReportStrategy.java → .../upload/CanUploadErrorReportStrategy.java b/.../upload/CanUploadErrorReportStrategy.java → .../upload/CanUploadErrorReportStrategy.java
diff --git a/...r/reporting/upload/CreateIssueParams.java → ...r/reporting/upload/CreateIssueParams.java b/...r/reporting/upload/CreateIssueParams.java → ...r/reporting/upload/CreateIssueParams.java
diff --git a/...r/reporting/upload/ErrorReportModule.java → ...r/reporting/upload/ErrorReportModule.java b/...r/reporting/upload/ErrorReportModule.java → ...r/reporting/upload/ErrorReportModule.java
diff --git a/...r/reporting/upload/ErrorReportingDao.java → ...r/reporting/upload/ErrorReportingDao.java b/...r/reporting/upload/ErrorReportingDao.java → ...r/reporting/upload/ErrorReportingDao.java
diff --git a/...ing/upload/InsertHistoryRecordParams.java → ...ing/upload/InsertHistoryRecordParams.java b/...ing/upload/InsertHistoryRecordParams.java → ...ing/upload/InsertHistoryRecordParams.java
diff --git a/...ing/CanUploadErrorReportStrategyTest.java → ...ing/CanUploadErrorReportStrategyTest.java b/...ing/CanUploadErrorReportStrategyTest.java → ...ing/CanUploadErrorReportStrategyTest.java
diff --git a/...ErrorReportControllerIntegrationTest.java → ...ErrorReportControllerIntegrationTest.java b/...ErrorReportControllerIntegrationTest.java → ...ErrorReportControllerIntegrationTest.java
diff --git a/...rror/reporting/ErrorReportModuleTest.java → ...rror/reporting/ErrorReportModuleTest.java b/...rror/reporting/ErrorReportModuleTest.java → ...rror/reporting/ErrorReportModuleTest.java
diff --git a/...rting/ErrorReportServerTestExtension.java → ...rting/ErrorReportServerTestExtension.java b/...rting/ErrorReportServerTestExtension.java → ...rting/ErrorReportServerTestExtension.java
diff --git a/...r/reporting/db/ErrorReportingDaoTest.java → ...r/reporting/db/ErrorReportingDaoTest.java b/...r/reporting/db/ErrorReportingDaoTest.java → ...r/reporting/db/ErrorReportingDaoTest.java
diff --git a/...orReportingModuleDatabaseTestSupport.java → ...orReportingModuleDatabaseTestSupport.java b/...orReportingModuleDatabaseTestSupport.java → ...orReportingModuleDatabaseTestSupport.java
diff --git a/..._reporting/empty_error_report_history.yml → ..._reporting/empty_error_report_history.yml b/..._reporting/empty_error_report_history.yml → ..._reporting/empty_error_report_history.yml
diff --git a/.../error_reporting/error_report_history.yml → .../error_reporting/error_report_history.yml b/.../error_reporting/error_report_history.yml → .../error_reporting/error_report_history.yml
diff --git a/...ting/error_report_history_post_insert.yml → ...ting/error_report_history_post_insert.yml b/...ting/error_report_history_post_insert.yml → ...ting/error_report_history_post_insert.yml
diff --git a/...rting/error_report_history_post_purge.yml → ...rting/error_report_history_post_purge.yml b/...rting/error_report_history_post_purge.yml → ...rting/error_report_history_post_purge.yml
diff --git a/...porting/src/test/resources/db-cleanup.sql → .../server/src/test/resources/db-cleanup.sql b/...porting/src/test/resources/db-cleanup.sql → .../server/src/test/resources/db-cleanup.sql
diff --git a/...r-reporting/src/test/resources/dbunit.yml → ...port/server/src/test/resources/dbunit.yml b/...r-reporting/src/test/resources/dbunit.yml → ...port/server/src/test/resources/dbunit.yml
diff --git a/...rting/src/test/resources/logback-test.xml → ...erver/src/test/resources/logback-test.xml b/...rting/src/test/resources/logback-test.xml → ...erver/src/test/resources/logback-test.xml
diff --git a/servers/lobby-games/README.md b/servers/lobby-games/README.md
diff --git a/servers/lobby-games/client/build.gradle b/servers/lobby-games/client/build.gradle
diff --git a/servers/lobby-games/server/build.gradle b/servers/lobby-games/server/build.gradle
diff --git a/servers/lobby-chat/README.md → servers/lobby/README.md b/servers/lobby-chat/README.md → servers/lobby/README.md
@@ -2,3 +2,8 @@
 
 This service keeps a list of chatters and sends chat messages between them.
 When logging into the lobby, a person is logging into this service.
+
+
+## Lobby-Games Server - Overview
+
+This service is responsible for keeping a list of ongoing lobby games and their status.
diff --git a/servers/error-reporting/client/build.gradle → servers/lobby/client/build.gradle b/servers/error-reporting/client/build.gradle → servers/lobby/client/build.gradle
diff --git a/servers/error-reporting/server/build.gradle → servers/lobby/server/build.gradle b/servers/error-reporting/server/build.gradle → servers/lobby/server/build.gradle
diff --git a/servers/maps-index/client/build.gradle b/servers/maps-index/client/build.gradle
diff --git a/servers/maps-index/server/build.gradle b/servers/maps-index/server/build.gradle
diff --git a/servers/maps-index/README.md → servers/maps/README.md b/servers/maps-index/README.md → servers/maps/README.md
@@ -1,4 +1,4 @@
-# Maps-Index Server - Overview
+# Maps Server - Overview
 
 The maps-index server indexes all of the maps and provides an API
 for game-clients to get a listing of maps and to interact with

diff --git a/servers/lobby-chat/client/build.gradle → servers/maps/client/build.gradle b/servers/lobby-chat/client/build.gradle → servers/maps/client/build.gradle
diff --git a/servers/lobby-chat/server/build.gradle → servers/maps/server/build.gradle b/servers/lobby-chat/server/build.gradle → servers/maps/server/build.gradle
diff --git a/servers/nginx/README.md b/servers/nginx/README.md
diff --git a/servers/nginx/docker-run.sh b/servers/nginx/docker-run.sh
diff --git a/settings.gradle b/settings.gradle
@@ -7,7 +7,6 @@ include 'game-app:game-headless'
 include 'game-app:game-relay-server'
 include 'game-app:map-data'
 include 'game-app:smoke-testing'
-include 'http-clients:error-reporting-client'
 include 'http-clients:github-client'
 include 'http-clients:lobby-client'
 include 'lib:feign-common'
@@ -19,7 +18,8 @@ include 'lib:test-common'
 include 'lib:websocket-client'
 include 'lib:websocket-server'
 include 'lib:xml-reader'
-include 'servers:error-reporting'
+include 'servers:game-support:client'
+include 'servers:game-support:server'
 include 'servers:server-lib'
 include 'servers:server-test-support'
 include 'spitfire-server:database'