feature: create new game-server-watcher (#118)

dhenkel92 · May 6, 2024 · a25269c · a25269c
1 parent 6a05123
commit a25269c
Show file tree

Hide file tree

Showing 32 changed files with 540 additions and 114 deletions.
diff --git a/.github/workflows/game-server-watcher.yml b/.github/workflows/game-server-watcher.yml
@@ -0,0 +1,40 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - ".github/workflows/game-server-watcher.yml"
+      - "game-server-watcher/**/*"
+
+name: Cloud Game Server Watcher
+
+jobs:
+  build:
+    name: Build Game Server Watcher
+    runs-on: ubuntu-latest
+    env:
+      IMAGE: cloudgame/game-server-watcher
+    steps:
+      - uses: actions/checkout@master
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+      - name: Go vet
+        run: |
+          cd game-server-watcher
+          go vet ./...
+      - name: Build Docker Container
+        run: |
+          cd game-server-watcher
+          docker build -t $IMAGE:$GITHUB_RUN_ID -f Dockerfile --build-arg DD_GIT_REPOSITORY_URL=$(git config --get remote.origin.url) --build-arg DD_GIT_COMMIT_SHA=${{ github.sha }} .
+      - name: Push Container
+        run: |
+          docker tag $IMAGE:$GITHUB_RUN_ID $IMAGE:latest
+          docker push $IMAGE:$GITHUB_RUN_ID
+          docker push $IMAGE:latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -53,17 +53,17 @@ repos:
   #########################################
   - repo: local
     hooks:
-      - id: cargo:fmt
-        name: Cargo fmt
+      - id: go:fmt
+        name: Go fmt
         language: script
         pass_filenames: false
         files: ^game-server-watcher/
-        entry: ./bin/execute-cargo.sh
-        args: ["game-server-watcher", "fmt", "--all", "--", "--check"]
-      - id: cargo:clippy
-        name: Cargo clippy
+        entry: ./bin/execute-go.sh
+        args: ["game-server-watcher", "fmt", "./..."]
+      - id: go:vet
+        name: Go Vet
         language: script
         pass_filenames: false
         files: ^game-server-watcher/
-        entry: ./bin/execute-cargo.sh
-        args: ["game-server-watcher", "clippy", "--features", "strict"]
+        entry: ./bin/execute-go.sh
+        args: ["game-server-watcher", "vet", "./..."]
diff --git a/async-server-provisioner/config/default.yml b/async-server-provisioner/config/default.yml
@@ -20,7 +20,7 @@ datadog:
   api_key: placeholder
 
 cloudGame:
-  ansibleBranch: use-latest-backup
+  ansibleBranch: main
   apiUrl: http://host.docker.internal:1337
   apiToken: placeholder
   backupS3Bucket: cloud-game-dev
diff --git a/backend/.strapi-updater.json b/backend/.strapi-updater.json
@@ -1,5 +1,5 @@
 {
 	"latest": "4.24.1",
-	"lastUpdateCheck": 1714910701412,
+	"lastUpdateCheck": 1715013457662,
 	"lastNotification": 1714740179673
 }
diff --git a/backend/src/index.js b/backend/src/index.js
@@ -11,6 +11,32 @@ module.exports = {
    * This gives you an opportunity to extend code.
    */
   register(/*{ strapi }*/) {
+    const extension = ({ nexus }) => ({
+      typeDefs: `
+        type GameServerPort {
+          port: Int!
+          protocol: String!
+          is_open: Boolean!
+        }
+        extend type GameDeployment {
+          game_server_ports: [GameServerPort!]
+        }
+      `,
+      resolvers: {
+        GameDeployment: {
+          game_server_ports: {
+            resolve: async (parent, args, context) => {
+              console.log(parent.id);
+              const data = await fetch("http://localhost:8080/ports");
+              return data.json();
+            },
+          },
+        },
+      },
+      // plugins: [nexus.plugin({})],
+    });
+
+    strapi.plugin("graphql").service("extension").use(extension);
     // const extensionService = strapi.plugin('graphql').service('extension');
     // extensionService.use({
     // resolversConfig: {

diff --git a/bin/execute-go.sh b/bin/execute-go.sh
@@ -0,0 +1,13 @@
+#! /bin/bash
+
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+project=$1
+
+if [ "$#" -lt 2 ]; then
+  exit 1
+fi
+
+cd $DIR/../$1
+go ${*:2}
diff --git a/game-server-watcher/.dockerignore → game-server-watcher-old/.dockerignore b/game-server-watcher/.dockerignore → game-server-watcher-old/.dockerignore
diff --git a/game-server-watcher-old/.gitignore b/game-server-watcher-old/.gitignore
@@ -0,0 +1,90 @@
+### Rust template
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Rust template
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
diff --git a/game-server-watcher/.idea/.gitignore → game-server-watcher-old/.idea/.gitignore b/game-server-watcher/.idea/.gitignore → game-server-watcher-old/.idea/.gitignore
diff --git a/...ver-watcher/.idea/game-server-watcher.iml → ...watcher-old/.idea/game-server-watcher.iml b/...ver-watcher/.idea/game-server-watcher.iml → ...watcher-old/.idea/game-server-watcher.iml
diff --git a/game-server-watcher/.idea/modules.xml → game-server-watcher-old/.idea/modules.xml b/game-server-watcher/.idea/modules.xml → game-server-watcher-old/.idea/modules.xml
diff --git a/game-server-watcher/.idea/vcs.xml → game-server-watcher-old/.idea/vcs.xml b/game-server-watcher/.idea/vcs.xml → game-server-watcher-old/.idea/vcs.xml
diff --git a/game-server-watcher/Cargo.lock → game-server-watcher-old/Cargo.lock b/game-server-watcher/Cargo.lock → game-server-watcher-old/Cargo.lock
diff --git a/game-server-watcher/Cargo.toml → game-server-watcher-old/Cargo.toml b/game-server-watcher/Cargo.toml → game-server-watcher-old/Cargo.toml
diff --git a/game-server-watcher-old/Dockerfile b/game-server-watcher-old/Dockerfile
@@ -0,0 +1,19 @@
+ARG BUILD_BASE=1.56.1-alpine3.14
+ARG BASE=3.14
+
+FROM rust:${BUILD_BASE} as build
+
+WORKDIR /root
+
+RUN apk add --no-cache musl-dev
+
+COPY . .
+
+ENV CARGO_HTTP_MULTIPLEXING=false
+RUN cargo build --release --features "strict"
+
+FROM alpine:${BASE}
+
+COPY --from=build /root/target/release/game-server-watcher /usr/bin/game-server-watcher
+
+ENTRYPOINT ["/usr/bin/game-server-watcher"]
diff --git a/game-server-watcher/example-config.yaml → game-server-watcher-old/example-config.yaml b/game-server-watcher/example-config.yaml → game-server-watcher-old/example-config.yaml
diff --git a/game-server-watcher/src/main.rs → game-server-watcher-old/src/main.rs b/game-server-watcher/src/main.rs → game-server-watcher-old/src/main.rs
diff --git a/...rver-watcher/src/net/is_port_reachable.rs → ...-watcher-old/src/net/is_port_reachable.rs b/...rver-watcher/src/net/is_port_reachable.rs → ...-watcher-old/src/net/is_port_reachable.rs
diff --git a/game-server-watcher/src/net/mod.rs → game-server-watcher-old/src/net/mod.rs b/game-server-watcher/src/net/mod.rs → game-server-watcher-old/src/net/mod.rs
diff --git a/game-server-watcher/src/routes/mod.rs → game-server-watcher-old/src/routes/mod.rs b/game-server-watcher/src/routes/mod.rs → game-server-watcher-old/src/routes/mod.rs
diff --git a/game-server-watcher/src/routes/types.rs → game-server-watcher-old/src/routes/types.rs b/game-server-watcher/src/routes/types.rs → game-server-watcher-old/src/routes/types.rs
diff --git a/...ver-watcher/src/routes/watcher_details.rs → ...watcher-old/src/routes/watcher_details.rs b/...ver-watcher/src/routes/watcher_details.rs → ...watcher-old/src/routes/watcher_details.rs
diff --git a/game-server-watcher/src/routes/watchers.rs → ...server-watcher-old/src/routes/watchers.rs b/game-server-watcher/src/routes/watchers.rs → ...server-watcher-old/src/routes/watchers.rs
diff --git a/game-server-watcher/src/watcher_config.rs → ...-server-watcher-old/src/watcher_config.rs b/game-server-watcher/src/watcher_config.rs → ...-server-watcher-old/src/watcher_config.rs
diff --git a/game-server-watcher/.gitignore b/game-server-watcher/.gitignore
@@ -1,90 +1,2 @@
-### Rust template
-# Generated by Cargo
-# will have compiled files and executables
-debug/
-target/
 
-# These are backup files generated by rustfmt
-**/*.rs.bk
-
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Rust template
-# Generated by Cargo
-# will have compiled files and executables
-debug/
-target/
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
+dist/
diff --git a/game-server-watcher/Dockerfile b/game-server-watcher/Dockerfile
@@ -1,19 +1,14 @@
-ARG BUILD_BASE=1.56.1-alpine3.14
-ARG BASE=3.14
+FROM golang:1.22-alpine3.19 as build
 
-FROM rust:${BUILD_BASE} as build
-
-WORKDIR /root
-
-RUN apk add --no-cache musl-dev
+ENV workdir=/usr/app
+WORKDIR /usr/app
 
 COPY . .
 
-ENV CARGO_HTTP_MULTIPLEXING=false
-RUN cargo build --release --features "strict"
+RUN CGO_ENABLED=0 go build -o ./game-server-watcher ./cmd/game-server-watcher/*
 
-FROM alpine:${BASE}
+FROM alpine:3.19
 
-COPY --from=build /root/target/release/game-server-watcher /usr/bin/game-server-watcher
+COPY --from=build /usr/app/game-server-watcher /usr/bin/game-server-watcher
 
-ENTRYPOINT ["/usr/bin/game-server-watcher"]
+ENTRYPOINT ["game-server-watcher"]