update deployments

deployments/main/docker-compose.yaml

@@ -1,20 +1,4 @@
 services:
-  core:
-    hostname: squiz-core
-    container_name: squiz-core
-    image: $CI_REGISTRY_IMAGE/main-core:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      HUB_ADMIN_URL: 'http://10.8.0.8:59303'
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PORT: 1488
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PG_CRED: 'host=10.8.0.9 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      AUTH_URL: 'http://10.8.0.8:59300/user'
-    ports: 
-      - 10.8.0.9:1488:1488
-
   storer:
     hostname: squiz-storer
     container_name: squiz-storer
@@ -31,47 +15,3 @@ services:
       PG_CRED: 'host=10.8.0.9 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
     ports: 
       - 10.8.0.9:1489:1489
-  worker:
-    hostname: squiz-worker
-    container_name: squiz-worker
-    image: $CI_REGISTRY_IMAGE/main-worker:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PG_CRED: 'host=10.8.0.9 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      KAFKA_BROKER: '10.8.0.8:9092'
-      KAFKA_TOPIC: 'tariffs'
-      QUIZ_ID: quizCnt
-      AMOUNT: 10
-      UNLIM_ID: quizUnlimTime
-      REDIS_HOST: '10.8.0.9:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-      SMTP_API_URL: 'https://api.smtp.bz/v1/smtp/send'
-      SMTP_HOST: 'connect.smtp.bz'
-      SMTP_PORT: '587'
-      SMTP_UNAME: 'team@pena.digital'
-      SMTP_PASS: 'AyMfwqA9LkQH'
-      SMTP_API_KEY: '8tv2xcsfCMBX3TCQxzgeeEwAEYyQrPUp0ggw'
-      SMTP_SENDER: 'recovery@noreply.pena.digital'    
-      CUSTOMER_SERVICE_ADDRESS: 'http://10.8.0.8:8065/'
-  answerer:
-    hostname: squiz-answerer
-    container_name: squiz-answerer
-    image: $CI_REGISTRY_IMAGE/main-answerer:$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: 1490
-      MINIO_EP: 'storage.yandexcloud.net'
-      MINIO_AK: 'YCAJEOcqqTHpiwL4qFwLfHPNA'
-      MINIO_SK: 'YCNIAIat0XqdDzycWsYKX3OU7mPor6S0WmMoG4Ry'
-      PG_CRED: 'host=10.8.0.9 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      REDIS_HOST: '10.8.0.9:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-    ports: 
-      - 10.8.0.9:1490:1490

deployments/main/staging/docker-compose.yaml

@@ -1,20 +1,4 @@
 services:
-  core:
-    hostname: squiz-core
-    container_name: squiz-core
-    image: $CI_REGISTRY_IMAGE/core:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      HUB_ADMIN_URL: 'http://10.6.0.11:59303'
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PORT: 1488
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      AUTH_URL: 'http://10.6.0.11:59300/user'
-    ports: 
-      - 1488:1488
-
   storer:
     hostname: squiz-storer
     container_name: squiz-storer
@@ -31,47 +15,3 @@ services:
       PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
     ports: 
       - 1489:1489
-  worker:
-    hostname: squiz-worker
-    container_name: squiz-worker
-    image: $CI_REGISTRY_IMAGE/worker:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      KAFKA_BROKER: '10.6.0.11:9092'
-      KAFKA_TOPIC: 'tariffs'
-      QUIZ_ID: quizCnt
-      AMOUNT: 10
-      UNLIM_ID: quizUnlimTime
-      REDIS_HOST: '10.6.0.23:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-      SMTP_HOST: 'connect.mailclient.bz'
-      SMTP_PORT: '587'
-      SMTP_SENDER: 'noreply@mailing.pena.digital'
-      SMTP_IDENTITY: ''
-      SMTP_USERNAME: 'kotilion.95@gmail.com'
-      SMTP_PASSWORD: 'vWwbCSg4bf0p'
-      SMTP_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev'
-      CUSTOMER_SERVICE_ADDRESS: 'http://10.6.0.11:8065/'
-  answerer:
-    hostname: squiz-answerer
-    container_name: squiz-answerer
-    image: $CI_REGISTRY_IMAGE/answerer:$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: 1490
-      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'
-      REDIS_HOST: '10.6.0.23:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-    ports: 
-      - 1490:1490

deployments/staging/docker-compose.yaml

@@ -1,20 +1,4 @@
 services:
-  core:
-    hostname: squiz-core
-    container_name: squiz-core
-    image: $CI_REGISTRY_IMAGE/staging-core:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      HUB_ADMIN_URL: 'http://10.6.0.11:59303'
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PORT: 1488
-      PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      AUTH_URL: 'http://10.6.0.11:59300/user'
-    ports: 
-      - 1488:1488
-
   storer:
     hostname: squiz-storer
     container_name: squiz-storer
@@ -31,47 +15,3 @@ services:
       PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
     ports: 
       - 1489:1489
-  worker:
-    hostname: squiz-worker
-    container_name: squiz-worker
-    image: $CI_REGISTRY_IMAGE/staging-worker:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    tty: true
-    environment:
-      IS_PROD_LOG: 'false'
-      IS_PROD: 'false'
-      PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
-      KAFKA_BROKER: '10.6.0.11:9092'
-      KAFKA_TOPIC: 'tariffs'
-      QUIZ_ID: quizCnt
-      AMOUNT: 10
-      UNLIM_ID: quizUnlimTime
-      REDIS_HOST: '10.6.0.23:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-      SMTP_HOST: 'connect.mailclient.bz'
-      SMTP_PORT: '587'
-      SMTP_SENDER: 'noreply@mailing.pena.digital'
-      SMTP_IDENTITY: ''
-      SMTP_USERNAME: 'kotilion.95@gmail.com'
-      SMTP_PASSWORD: 'vWwbCSg4bf0p'
-      SMTP_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev'
-      CUSTOMER_SERVICE_ADDRESS: 'http://10.6.0.11:8065/'
-  answerer:
-    hostname: squiz-answerer
-    container_name: squiz-answerer
-    image: $CI_REGISTRY_IMAGE/staging-answerer:$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: 1490
-      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'
-      REDIS_HOST: '10.6.0.23:6379'
-      REDIS_PASSWORD: 'Redalert2'
-      REDIS_DB: 2
-    ports: 
-      - 1490:1490

deployments/testmigrate/docker-compose.yaml

@@ -1,23 +0,0 @@
-version: '3'
-services:
-  test-postgres:
-    image: postgres
-    environment:
-      POSTGRES_PASSWORD: Redalert2
-      POSTGRES_USER: squiz
-      POSTGRES_DB: squiz
-    ports:
-      - 35432:5432
-    networks:
-      - penatest
-    healthcheck:
-      test: pg_isready -U squiz
-      interval: 2s
-      timeout: 2s
-      retries: 10
-
-networks:
-  penatest:
-
-# просто чтоб тестануть мигрировала ли бд
-# в app/app.go pgdal, err := dal.New(ctx, "host=localhost port=35432 user=squiz password=Redalert2 dbname=squiz sslmode=disable")

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/skeris/appInit v1.0.2
 	github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf
 	go.uber.org/zap v1.26.0
-	penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240313164312-4560248259a0
+	penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240314111040-7ed859ef7876
 )
 
 require (

go.sum

@@ -31,8 +31,9 @@ github.com/golang-migrate/migrate/v4 v4.17.0/go.mod h1:+Cp2mtLP4/aXDTKb9wmXYitdr
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -154,8 +155,6 @@ golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
@@ -172,7 +171,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d h1:gbaDt35HMDqOK84WYmDIlXMI7rstUcRqNttaT6Kx1do=
 penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM=
-penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240313164312-4560248259a0 h1:YbffFOWneoINvEqCWClf5Zatu/a0VNo9RM0nYveCzhk=
+penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240314111040-7ed859ef7876 h1:875+tdI7KuftCn9hZer2p9vq88FX0gbAaHOeCy1n6T4=
-penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240313164312-4560248259a0/go.mod h1:JgbH8cdAJBr3jx3BuY5nnuTyMdZ1XkRxo8a3w4Y3C0Y=
+penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240314111040-7ed859ef7876/go.mod h1:okduDAq0NVVDcM+TMyrd4mVXzBMeTzYI2B2/yi1sL1Y=
 penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240219174804-d78fd38511af h1:jQ7HaXSutDX5iepU7VRImxhikK7lV/lBKkiloOZ4Emo=
 penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240219174804-d78fd38511af/go.mod h1:5S5YwjSXWmnEKjBjG6MtyGtFmljjukDRS8CwHk/CF/I=