From 1d543461e95d47962da479ab7597ee2b5452ce28 Mon Sep 17 00:00:00 2001
From: emmatveev <emmtvv@gmail.com>
Date: Sat, 23 Nov 2024 22:36:58 +0300
Subject: [PATCH 1/3] fix

---
 .deploy/deploy-dev.yaml          | 12 ++++++------
 .gitea/workflows/deploy-dev.yaml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml
index bcec74f..fae8a61 100644
--- a/.deploy/deploy-dev.yaml
+++ b/.deploy/deploy-dev.yaml
@@ -10,7 +10,7 @@ services:
       TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
       STAGE: "development"
     networks:
-      - queues
+      - queues-development
     deploy:
       mode: replicated
       restart_policy:
@@ -28,7 +28,7 @@ services:
       STAGE: "development"
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
     networks:
-      - queues
+      - queues-development
     deploy:
       mode: replicated
       restart_policy:
@@ -44,7 +44,7 @@ services:
       TELEGRAM_TOKEN: $TELEGRAM_TOKEN_DEV
       STAGE: "development"
     networks:
-      - queues
+      - queues-development
     deploy:
       mode: replicated
       restart_policy:
@@ -63,7 +63,7 @@ services:
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
       STAGE: "development"
     networks:
-      - common-infra-nginx
+      - common-infra-nginx-development
     deploy:
       mode: replicated
       restart_policy:
@@ -73,7 +73,7 @@ services:
         order: start-first
 
 networks:
-  common-infra-nginx:
+  common-infra-nginx-development:
     external: true
-  queues:
+  queues-development:
     external: true
diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml
index 6f5dd31..2c6b44e 100644
--- a/.gitea/workflows/deploy-dev.yaml
+++ b/.gitea/workflows/deploy-dev.yaml
@@ -28,7 +28,7 @@ jobs:
         run: docker push mathwave/sprint-repo:pizda-bot
   deploy-dev:
     name: Deploy dev
-    runs-on: [dev]
+    runs-on: [prod]
     needs: push
     steps:
       - name: login
@@ -42,4 +42,4 @@ jobs:
           TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }}
           MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
           PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
-        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot-development
-- 
2.45.2


From 3d379bc6d7a2f25e312aded11340aca6c6abc79e Mon Sep 17 00:00:00 2001
From: emmatveev <emmtvv@gmail.com>
Date: Sun, 24 Nov 2024 18:05:52 +0300
Subject: [PATCH 2/3] configurator

---
 .deploy/deploy-dev.yaml  | 2 +-
 .deploy/deploy-prod.yaml | 1 +
 sprint_platform.py       | 8 ++------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml
index fae8a61..c61e5ea 100644
--- a/.deploy/deploy-dev.yaml
+++ b/.deploy/deploy-dev.yaml
@@ -26,9 +26,9 @@ services:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
       STAGE: "development"
-      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
     networks:
       - queues-development
+      - configurator
     deploy:
       mode: replicated
       restart_policy:
diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml
index 4206805..7474fae 100644
--- a/.deploy/deploy-prod.yaml
+++ b/.deploy/deploy-prod.yaml
@@ -29,6 +29,7 @@ services:
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
     networks:
       - queues
+      - configurator
     deploy:
       mode: replicated
       restart_policy:
diff --git a/sprint_platform.py b/sprint_platform.py
index e723f18..af3b1c7 100644
--- a/sprint_platform.py
+++ b/sprint_platform.py
@@ -14,11 +14,8 @@ class PlatformClient:
         self.stage = stage
         self.configs = configs
         self.experiments = experiments
-        self.endpoint = 'https://platform.sprinthub.ru/'
-        self.configs_url = urllib.parse.urljoin(self.endpoint, 'configs/get')
-        self.experiments_url = urllib.parse.urljoin(self.endpoint, 'experiments/get')
-        self.staff_url = urllib.parse.urljoin(self.endpoint, 'is_staff')
-        self.fetch_url = urllib.parse.urljoin(self.endpoint, 'fetch')
+        self.endpoint = 'http://configurator/'
+        self.fetch_url = urllib.parse.urljoin(self.endpoint, '/api/v1/fetch')
         self.config_storage = {}
         self.experiment_storage = {}
         self.staff_storage = {}
@@ -43,7 +40,6 @@ class PlatformClient:
             try:
                 response = get(
                     url,
-                    headers={'X-Security-Token': self.platform_security_token},
                     params=params
                 )
                 if response.status_code == 200:
-- 
2.45.2


From 8a4a6ac217828e1dc6b38081b83e3741df4bec22 Mon Sep 17 00:00:00 2001
From: emmatveev <emmtvv@gmail.com>
Date: Sun, 24 Nov 2024 18:10:34 +0300
Subject: [PATCH 3/3] fix

---
 .deploy/deploy-dev.yaml  | 2 ++
 .deploy/deploy-prod.yaml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml
index c61e5ea..1b47e52 100644
--- a/.deploy/deploy-dev.yaml
+++ b/.deploy/deploy-dev.yaml
@@ -77,3 +77,5 @@ networks:
     external: true
   queues-development:
     external: true
+  configurator:
+    external: true
diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml
index 7474fae..f11e53a 100644
--- a/.deploy/deploy-prod.yaml
+++ b/.deploy/deploy-prod.yaml
@@ -78,3 +78,5 @@ networks:
     external: true
   queues:
     external: true
+  configurator:
+    external: true
-- 
2.45.2