clearup and add validations for prod

.gitea/workflows/deploy.yml

@@ -1,37 +0,0 @@
-name: Deploy
-run-name: ${{ gitea.actor }} build image and push to container registry
-
-on: 
-  push:
-    branches:
-      - 'main'
-      - 'staging'
-
-jobs:
-      
-  CreateImage:
-    runs-on: [squizstaging]
-    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p
-    with:
-      runner: squizstaging
-    secrets:
-      REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-      REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
-  ValidateConfig:
-    runs-on: [squizstaging]
-    needs: CreateImage
-    container: 
-      image: gitea.pena/penadevops/container-images/node-compose:main
-      volumes:
-        - /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock
-    steps:
-      - name: Check out repository code
-        uses: https://gitea.pena/PenaDevops/actions.git/checkout@v1
-      - name: Run validator
-        run: GITHUB_RUN_NUMBER=${{ gitea.run_id }} compose -f deployments/${{ gitea.ref_name }}/validate_config.yml up
-  DeployService:
-    runs-on: [squizstaging]
-    needs: ValidateConfig
-    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.7
-    with:
-      runner: squizstaging

.gitea/workflows/deployStaging.yml

@@ -15,9 +15,18 @@ jobs:
     secrets:
       REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
       REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+  ValidateConfig:
+    runs-on: [squizstaging]
+    uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/validate_config.yml@v1.2.0
+    needs: CreateImage
+    with:
+      runner: hubstaging
+    secrets:
+      REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
+      REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
   DeployService:
     runs-on: [hubstaging]
-    needs: CreateImage
+    needs: ValidateConfig
     uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7
     with:
       runner: hubstaging

.gitignore

@@ -18,4 +18,5 @@ squiz
 gen
 worker/worker
 storer/storer
-answerer/answerer
+answerer/answerer
+main

Taskfile.dist.yml

@@ -3,8 +3,8 @@ version: "3"
 tasks:
   update-linter:
     cmds:
-      - go get -u penahub.gitlab.yandexcloud.net/devops/linters/golang.git
+      - go get -u gitea.pena/PenaSide/linters-golang/pkg/dummy
   lint:
     cmds:
       - task: update-linter
-      - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m penahub.gitlab.yandexcloud.net/devops/linters/golang.git)/.golangci.yml
+      - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m gitea.pena/PenaSide/linters-golang/pkg/dummy)/.golangci.yml

cmd/main.go

@@ -8,6 +8,7 @@ import (
 	"log"
 	"os/signal"
 	"syscall"
+	_ "gitea.pena/PenaSide/linters-golang/pkg/dummy"
 )
 
 func main() {

deployments/Containerfile

@@ -1,2 +0,0 @@
-FROM  gitea.pena/penadevops/container-images/golang:main
-COPY . .

deployments/main/docker-compose.yaml

@@ -2,14 +2,6 @@ services:
   storerv1.0.0:
     image: gitea.pena/squiz/storer/main:$GITHUB_RUN_NUMBER
     tty: true
-    environment:
+    env_file: config.env
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PUBLIC_ACCESS_SECRET_KEY: "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----"
-      PORT: 1489
-      MINIO_EP: s3.timeweb.cloud
-      MINIO_AK: 5CV77KVDUU9H0II9R24M
-      MINIO_SK: 0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu
-      PG_CRED: 'host=10.8.0.12 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
     ports: 
       - 10.8.0.12:1589:1489

deployments/main/staging/docker-compose.yaml

@@ -1,17 +0,0 @@
-services:
-  storer:
-    hostname: squiz-storer
-    container_name: squiz-storer
-    image: $CI_REGISTRY_IMAGE/storer:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PORT: 1489
-      MINIO_EP: 'storage.yandexcloud.net'
-      MINIO_AK: 'YCAJEOcqqTHpiwL4qFwLfHPNA'
-      MINIO_SK: 'YCNIAIat0XqdDzycWsYKX3OU7mPor6S0WmMoG4Ry'
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-    ports: 
-      - 1489:1489

go.mod

@@ -4,6 +4,7 @@ go 1.23.2
 
 require (
 	gitea.pena/PenaSide/common v0.0.0-20250103085335-91ea31fee517
+	gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735
 	gitea.pena/SQuiz/common v0.0.0-20250221135056-f98c45e04909
 	github.com/caarlos0/env/v8 v8.0.0
 	github.com/gofiber/fiber/v2 v2.52.4

go.sum

@@ -1,5 +1,7 @@
 gitea.pena/PenaSide/common v0.0.0-20250103085335-91ea31fee517 h1:EgBe8VcdPwmxbSzYLndncP+NmR73uYuXxkTeDlEttEE=
 gitea.pena/PenaSide/common v0.0.0-20250103085335-91ea31fee517/go.mod h1:91EuBCgcqgJ6mG36n2pds8sPwwfaJytLWOzY3h2YFKU=
+gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735 h1:jDVeUhGBTXBibmW5dmtJg2m2+z5z2Rf6J4G0LpjVoJ0=
+gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU=
 gitea.pena/SQuiz/common v0.0.0-20250221135056-f98c45e04909 h1:iCiqaJ6a7rGESAEUgtVA9IqhVn0oKiwRk7bryTWPV5w=
 gitea.pena/SQuiz/common v0.0.0-20250221135056-f98c45e04909/go.mod h1:rQRjqLlLyM71FZcvbM95Nv3ciq44F9DFtUHPZmDK3T8=
 github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0=