From f6ea4db35ed557e736e8ac678df4edabaf0d9027 Mon Sep 17 00:00:00 2001
From: Piotr Biernat <keedosn@gmail.com>
Date: Sat, 24 Jun 2023 12:44:28 +0200
Subject: [PATCH] update

---
 deploy/egommerce-stack.dev.local.yml |  2 --
 deploy/egommerce-stack.dev.yml       | 13 +++++--------
 deploy/egommerce-stack.yml           |  8 ++++++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/deploy/egommerce-stack.dev.local.yml b/deploy/egommerce-stack.dev.local.yml
index e766ca9..8eb0ef1 100644
--- a/deploy/egommerce-stack.dev.local.yml
+++ b/deploy/egommerce-stack.dev.local.yml
@@ -2,8 +2,6 @@ version: "3.9"
 
 services:
   api-gateway:
-    # command: ["--providers.consulcatalog.refreshinterval=5s"]
-    # ^^^^^^ FIXME use config option: static/env/cli must be selected
     environment:
       - APP_DOMAIN=egommerce.local
     ports:
diff --git a/deploy/egommerce-stack.dev.yml b/deploy/egommerce-stack.dev.yml
index 789ef03..83247b6 100644
--- a/deploy/egommerce-stack.dev.yml
+++ b/deploy/egommerce-stack.dev.yml
@@ -1,10 +1,8 @@
 version: "3.9"
 
 services:
-  # INFRASTRUCTURE SERVICES
   api-gateway:
     image: git.pbiernat.dev/egommerce/api-gateway:dev
-    hostname: api-gateway
     environment:
       - APP_DOMAIN=api-gateway
     volumes:
@@ -12,14 +10,12 @@ services:
 
   api-registry:
     image: git.pbiernat.dev/egommerce/api-registry:dev
-    hostname: api-registry
     environment:
       - APP_DOMAIN=api-registry
       - CONSUL_HTTP_TOKEN=devop
 
   api-eventbus:
     image: git.pbiernat.dev/egommerce/api-eventbus:dev
-    hostname: api-eventbus
     environment:
       - APP_DOMAIN=api-eventbus
       # - RABBITMQ_NODENAME=api-eventbus
@@ -34,19 +30,16 @@ services:
 
   api-logger:
     image: git.pbiernat.dev/egommerce/api-logger:dev
-    hostname: api-logger
     environment:
       - APP_DOMAIN=api-logger
 
   #api-prometheus:
     # image: prom/prometheus:latest # FIXME: create private image(prod/dev)...
-  #  hostname: prometheus.keshop.bieda.it
   #  environment:
   #    - APP_DOMAIN=prometheus.keshop.bieda.it
 
   #api-grafana:
     # image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)...
-  #  hostname: grafana.keshop.bieda.it
   #  environment:
   #    - APP_DOMAIN=grafana.keshop.bieda.it
 
@@ -77,6 +70,7 @@ services:
     image: git.pbiernat.dev/egommerce/basket-svc:dev
     environment:
       - APP_DOMAIN=basket-svc
+      - AUTH_HANDLER_URL=http://identity-svc/api/v1/traefik
       - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
       - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
       - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
@@ -87,6 +81,7 @@ services:
     image: git.pbiernat.dev/egommerce/catalog-svc:dev
     environment:
       - APP_DOMAIN=catalog-svc
+      - AUTH_HANDLER_URL=http://identity-svc/api/v1/traefik
       - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
       - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
       - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
@@ -97,6 +92,7 @@ services:
     image: git.pbiernat.dev/egommerce/pricing-svc:dev
     environment:
       - APP_DOMAIN=pricing-svc
+      - AUTH_HANDLER_URL=http://identity-svc/api/v1/traefik
       - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
       - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
       - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
@@ -107,13 +103,14 @@ services:
     image: git.pbiernat.dev/egommerce/order-svc:dev
     environment:
       - APP_DOMAIN=order-svc
+      - AUTH_HANDLER_URL=http://identity-svc/api/v1/traefik
       - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
       - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
       - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
     volumes:
       - ./certs/api-gateway:/certs
 
-  # Workers (EventBus)
+  # Workers (Eventbus)
   basket-worker:
     image: git.pbiernat.dev/egommerce/basket-worker:dev
     environment:
diff --git a/deploy/egommerce-stack.yml b/deploy/egommerce-stack.yml
index 4842625..af38dcf 100644
--- a/deploy/egommerce-stack.yml
+++ b/deploy/egommerce-stack.yml
@@ -154,6 +154,7 @@ services:
       - APP_PATH_PREFIX=/basket
       - APP_DOMAIN
       - APP_KV_NAMESPACE
+      - AUTH_HANDLER_URL
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -177,6 +178,7 @@ services:
       - APP_PATH_PREFIX=/catalog
       - APP_DOMAIN
       - APP_KV_NAMESPACE
+      - AUTH_HANDLER_URL
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -198,6 +200,7 @@ services:
       - APP_PATH_PREFIX=/pricing
       - APP_DOMAIN
       - APP_KV_NAMESPACE
+      - AUTH_HANDLER_URL
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -219,6 +222,7 @@ services:
       - APP_PATH_PREFIX=/order
       - APP_DOMAIN
       - APP_KV_NAMESPACE
+      - AUTH_HANDLER_URL
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -233,7 +237,7 @@ services:
       - postgres-db-network
       - mongodb-db-network
 
-  # Workers (EventBus)
+  # Workers (Eventbus)
   basket-worker:
     image: git.pbiernat.dev/egommerce/basket-worker:latest
     environment:
@@ -244,7 +248,7 @@ services:
       - EVENTBUS_URL
     networks:
       - basket-worker-network
-      # - pricing-svc-network
+      - pricing-svc-network
       - api-gateway-network
       - api-registry-network
       - api-eventbus-network