make it work (#114)

.dockerignore

@@ -0,0 +1 @@
+*/**/.terraform*

async-server-provisioner/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.17.0-stretch as build
+FROM node:21.7-bullseye-slim as build
 
 ENV NODE_ENV=development
 WORKDIR /usr/src/app
@@ -11,17 +11,17 @@ RUN npm ci
 COPY async-server-provisioner/ .
 RUN npm run build
 
-FROM node:14.17.0-stretch
+FROM node:21.7-bullseye-slim
 
 ENV NODE_ENV=production
 WORKDIR /usr/src/app
 
 RUN apt-get update \
-    && apt-get install -y wget unzip \
-    && wget https://releases.hashicorp.com/terraform/1.1.9/terraform_1.1.9_linux_amd64.zip -O /root/terraform.zip \
-    && unzip -d /root/ /root/terraform.zip \
-    && mv /root/terraform /usr/bin/terraform \
-    && wget https://github.com/gruntwork-io/terragrunt/releases/download/v0.36.7/terragrunt_linux_amd64 -O /usr/bin/terragrunt \
+    && apt-get install -y wget curl unzip \
+    && curl --proto '=https' --tlsv1.2 -fsSL https://get.opentofu.org/install-opentofu.sh -o install-opentofu.sh \
+    && chmod +x install-opentofu.sh \
+    && ./install-opentofu.sh --install-method deb \
+    && wget https://github.com/gruntwork-io/terragrunt/releases/download/v0.58.0/terragrunt_linux_amd64 -O /usr/bin/terragrunt \
     && chmod +x /usr/bin/terragrunt
 
 COPY --from=build /usr/src/app/package.json .

async-server-provisioner/config/default.yml

@@ -19,6 +19,6 @@ datadog:
   api_key: placeholder
 
 cloudGame:
-  ansibleBranch: create-restore-backups
+  ansibleBranch: main
   apiUrl: http://host.docker.internal:1337
   apiToken: placeholder

async-server-provisioner/src/ServiceLocator.ts

@@ -126,7 +126,7 @@ export default class ServiceLocator {
     }
     const adapter = await this.getMySqlAdapter();
     const dirtyAdapter = await this.getDirtyMySqlAdapter();
-    const repo = new GameDeploymentRepository(adapter, dirtyAdapter);
+    const repo = new GameDeploymentRepository(adapter, dirtyAdapter, this.getLogger());
 
     this.setCache('GameDeploymentRepository', repo);
     return repo;

async-server-provisioner/src/adapters/GraphQlAdapter.ts

@@ -1,9 +1,11 @@
 import * as config from 'config';
+import pino from 'pino';
 
 const apiUrl = config.get<string>('cloudGame.apiUrl');
 
-export async function gqlQuery(query: string, data: any): Promise<any> {
-  const res = await fetch(`${apiUrl}/graphql`, {
+export async function gqlQuery(logger: pino.Logger, query: string, data: any): Promise<Response> {
+  logger.child({ url: `${apiUrl}/graphql`, query, data }).info('Fetch API data');
+  return fetch(`${apiUrl}/graphql`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -15,5 +17,4 @@ export async function gqlQuery(query: string, data: any): Promise<any> {
       variables: data,
     }),
   });
-  return res.json();
 }

async-server-provisioner/src/repositories/GameDeploymentRepository.ts

@@ -3,6 +3,7 @@ import { GameDeployment, gameDeploymentFactory } from '../entities/GameDeploymen
 import { v4 } from 'uuid';
 import { TerraformGSOutput } from '../services/TerraformService';
 import { gqlQuery } from '../adapters/GraphQlAdapter';
+import pino from 'pino';
 
 const query = `
 query($id: ID) {
@@ -54,7 +55,8 @@ query($id: ID) {
 export default class GameDeploymentRepository {
   constructor(
     private mysqlAdapter: MySqlAdapter,
-    private dirtyMysqlAdapter: MySqlAdapter
+    private dirtyMysqlAdapter: MySqlAdapter,
+    private logger: pino.Logger
   ) {}
 
   public async getDeployment(): Promise<GameDeployment | null> {
@@ -83,7 +85,12 @@ export default class GameDeploymentRepository {
       return null;
     }
 
-    const data = await gqlQuery(query, { id: rows[0].gd_id });
+    const res = await gqlQuery(this.logger, query, { id: rows[0].gd_id });
+    const data = await res.json();
+    if (data.errors && data.errors.length != 0) {
+      this.logger.child({ errors: data.errors }).error('Failed to fetch game deployment data');
+      return null;
+    }
     const gameDeployment = gameDeploymentFactory(uuid, data);
     // eslint-disable-next-line no-console
     console.log(JSON.stringify(gameDeployment, null, 2));

backend/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+build

backend/.strapi-updater.json

@@ -1,5 +1,5 @@
 {
-	"latest": "4.24.0",
-	"lastUpdateCheck": 1714554785847,
-	"lastNotification": 1655564816994
-}
+	"latest": "4.24.1",
+	"lastUpdateCheck": 1714740073758,
+	"lastNotification": 1714740179673
+}

backend/Dockerfile-prod-be

@@ -1,4 +1,4 @@
-FROM node:16.14-bullseye as build
+FROM node:21.7-bullseye-slim as build
 
 ENV NODE_ENV=production
 WORKDIR /usr/src/app
@@ -10,7 +10,7 @@ RUN npm ci
 
 COPY backend .
 
-FROM node:16.14-bullseye
+FROM node:21.7-bullseye-slim
 
 WORKDIR /usr/src/app
 

backend/Dockerfile-prod-fe

@@ -1,8 +1,11 @@
-FROM node:16.14-bullseye as build
+FROM node:21.7-bullseye-slim as build
 
-ARG ADMIN_URL=http://localhost:1337/admin
+ARG ADMIN_URL=/
 ENV ADMIN_URL=$ADMIN_URL
 
+ARG SERVE_ADMIN_PANEL=false
+ENV SERVE_ADMIN_PANEL=$SERVE_ADMIN_PANEL
+
 ARG SERVER_URL=http://localhost:1337
 ENV SERVER_URL=$SERVER_URL
 
@@ -11,6 +14,7 @@ WORKDIR /usr/src/app
 
 COPY package.json .
 COPY package-lock.json .
+COPY prod-patches patches
 
 RUN npm ci
 

backend/config/admin.js

@@ -1,5 +1,6 @@
 module.exports = ({ env }) => ({
-  url: env("ADMIN_URL", "http://localhost:1337/admin"),
+  url: env("ADMIN_URL", "/admin/"),
+  serveAdminPanel: env("SERVE_ADMIN_PANEL", true),
   auth: {
     secret: env("ADMIN_JWT_SECRET"),
   },