Merge branch 'deployment' into develop

Author: Uncensored-Developer

.github/workflows/main.yml

@@ -0,0 +1,46 @@
+name: CI Pipeline
+on: [ push ]
+
+jobs:
+  build:
+    name: Build & Test
+    runs-on: self-hosted
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.7
+
+      - name: Build
+        run: go build ./cmd/app/
+
+      - name: Test
+        run: go test -v ./...
+
+  lint:
+    name: Lint
+    runs-on: self-hosted
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.7
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.58
+          args: --timeout=10m
+          skip-cache: true
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true

.github/workflows/publish.yml

@@ -0,0 +1,37 @@
+name: Docker Image Publish
+on: [ push, workflow_dispatch ]
+
+jobs:
+  push_to_registry:
+    runs-on: self-hosted
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: uncensored/buzz
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build & Push Docker image
+        id: push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -1,2 +1,4 @@
 .idea/
-randoms/
+randoms/
+deployment/
+.vagrant/

Makefile

@@ -0,0 +1,13 @@
+docker-up:
+	docker compose up
+
+start-db:
+	docker compose up mysql_db
+
+migrate-up:
+	docker compose up mysql_db_go_migrate
+
+fmt:
+# run gofumpt two times because it's buggy and need 2 pass
+	@find . -type f -name '*.go' ! -path '*/.cookiecutter/*' ! -path './vendor/*' | xargs gofumpt -l -w
+	@find . -type f -name '*.go' ! -path '*/.cookiecutter/*' ! -path './vendor/*' | xargs gofumpt -l -w

Vagrantfile

@@ -0,0 +1,13 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "hashicorp/bionic64"
+
+  config.vm.synced_folder ".", "/home/vagrant/app"
+
+  config.vm.provision :shell, path: "vagrant_setup_dep.sh"
+
+  config.vm.provision :shell, inline: <<-SHELL
+    sudo su - vagrant -c "cd /home/vagrant/app && make docker-up"
+  SHELL
+
+  config.vm.network "forwarded_port", guest: 8007, host: 8004
+end

cmd/app/main.go

@@ -3,8 +3,9 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/Uncensored-Developer/buzz/internal/server"
 	"os"
+
+	"github.com/Uncensored-Developer/buzz/internal/server"
 )
 
 func main() {

cmd/migrate/main.go

@@ -1,11 +1,12 @@
 package main
 
 import (
+	"log"
+
 	"github.com/Uncensored-Developer/buzz/pkg/config"
 	"github.com/Uncensored-Developer/buzz/pkg/logger"
 	"github.com/Uncensored-Developer/buzz/pkg/migrate"
 	"go.uber.org/zap"
-	"log"
 )
 
 func main() {

docker-compose.yaml

@@ -54,8 +54,7 @@ services:
     networks:
       - buzz_network
 
-  api:
-    container_name: buzz
+  api_1:
     restart: always
     build:
       context: .
@@ -79,6 +78,42 @@ services:
     networks:
       - buzz_network
 
+  api_2:
+    restart: always
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8004:8004"
+    depends_on:
+      - mysql_db
+      - mysql_db_go_migrate
+      - redis
+    environment:
+      - BUZZ_HTTP_HOST=0.0.0.0
+      - BUZZ_HTTP_PORT=8003
+      - BUZZ_DEBUG=true
+      - BUZZ_DATABASE_URL=mysql://user:password@mysql_db:3306/buzz
+      - BUZZ_REDIS_URL=redis://redis:6379
+      - BUZZ_JWT_KEY=wTkjqFUqqDpUGinAJqHZ
+      - BUZZ_PASSWORD_HASHER_SALT=wTkjqFUqqDpUGinAJqHZ
+      - BUZZ_FAKE_USER_PASSWORD=password123
+      - BUZZ_SEED_USERS=true
+    networks:
+      - buzz_network
+
+  load_balancer:
+    image: nginx:alpine
+    depends_on:
+      - api_1
+      - api_2
+    ports:
+      - "8007:80"
+    volumes:
+      - ./nginx/load_balancer.conf:/etc/nginx/conf.d/default.conf:ro
+    networks:
+      - buzz_network
+
 volumes:
   mysql-data:
     driver: local

golangci.yml

@@ -0,0 +1,3 @@
+linters:
+  disable:
+    - errcheck

internal/datastore/uow.go

@@ -3,6 +3,7 @@ package datastore
 import (
 	"context"
 	"database/sql"
+
 	data2 "github.com/Uncensored-Developer/buzz/internal/matches/data"
 	"github.com/Uncensored-Developer/buzz/internal/users/data"
 	"github.com/uptrace/bun"