Merge pull request 'master' (#9) from master into prod

Reviewed-on: #9

.deploy/deploy-dev.yaml

@@ -18,6 +18,24 @@ services:
         parallelism: 1
         order: start-first
 
+  queues:
+    image: mathwave/sprint-repo:queues
+    networks:
+      - queues
+    environment:
+      MONGO_HOST: "mongo.develop.sprinthub.ru"
+      MONGO_PASSWORD: $MONGO_PASSWORD_DEV
+      NEW: "true"
+    deploy:
+      mode: replicated
+      restart_policy:
+        condition: any
+      update_config:
+        parallelism: 1
+        order: start-first
+
 networks:
   common-infra-nginx:
     external: true
+  queues:
+    external: true

.deploy/deploy-prod.yaml

@@ -18,6 +18,25 @@ services:
         parallelism: 1
         order: start-first
 
+  queues:
+    image: mathwave/sprint-repo:queues
+    networks:
+      - common-infra-nginx
+      - queues
+    environment:
+      MONGO_HOST: "mongo.sprinthub.ru"
+      MONGO_PASSWORD: $MONGO_PASSWORD_PROD
+      NEW: "true"
+    deploy:
+      mode: replicated
+      restart_policy:
+        condition: any
+      update_config:
+        parallelism: 1
+        order: start-first
+
 networks:
   common-infra-nginx:
     external: true
+  queues:
+    external: true

main.py

@@ -8,23 +8,9 @@ from app.routers import finish
 
 from app.storage import mongo
 
-from fastapi import responses
-
-
-QUEUES_TOKEN = os.getenv('QUEUES_TOKEN')
 
 app = fastapi.FastAPI()
 
-
-@app.middleware('http')
-async def check_token(request: fastapi.Request, call_next):
-    if QUEUES_TOKEN:
-        token = request.headers.get('X-Queues-Token')
-        if not token or token != QUEUES_TOKEN:
-            return responses.JSONResponse(status_code=403, content={'message': 'token is not provided or incorrect'})
-    return await call_next(request)
-
-
 app.include_router(take.router)
 app.include_router(put.router)
 app.include_router(finish.router)
@@ -33,4 +19,6 @@ mongo.create_indexes()
 
 
 if __name__ == '__main__':
+    if os.getenv('NEW') == 'true':
+        uvicorn.run(app, host="0.0.0.0", port=1239)
     uvicorn.run(app, host="0.0.0.0", port=1238)