Merge remote-tracking branch 'origin/releases/v13' into feat/v13/new-wes

bento-platform · Jul 18, 2023 · 869fd7a · 869fd7a
2 parents cf6adee + fd81df0
commit 869fd7a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -569,7 +569,7 @@ The following is a list of all host port allocations for Bento services in devel
 | DRS              | 7007 | 5682          |
 | Event relay      | 8750 | Unimplemented |
 | Katsu            | 8000 | 5432          |
-| Notification     | 8500 | Unimplemented |
+| Notification     | 8500 | 5681          |
 | Public           | 8090 | Unimplemented |
 | Redis            | 6379 | `N/A`         |
 | Service Registry | 5010 | Unimplemented |

diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
@@ -227,6 +227,9 @@ services:
       # Runtime
       - FLASK_DEBUG=True
       - BENTO_DEBUG=True
+    ports:
+      - "${BENTOV2_NOTIFICATION_EXTERNAL_PORT}:${BENTOV2_NOTIFICATION_INTERNAL_PORT}"
+      - "${BENTO_NOTIFICATION_DEBUGGER_EXTERNAL_PORT}:${BENTO_NOTIFICATION_DEBUGGER_INTERNAL_PORT}"
     extends:
       file: docker-compose.yaml
       service: notification

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -281,6 +281,8 @@ services:
       - REDIS_HOST=${BENTOV2_REDIS_CONTAINER_NAME}
       - REDIS_PORT=${BENTOV2_REDIS_INTERNAL_PORT}
       - INTERNAL_PORT=${BENTOV2_NOTIFICATION_INTERNAL_PORT}
+      - BENTO_AUTHZ_SERVICE_URL
+      - CORS_ORIGINS=${BENTOV2_PUBLIC_URL};${BENTOV2_PORTAL_PUBLIC_URL}
     networks:
       - notification-net
       - redis-net  # For event pub/sub

diff --git a/etc/bento.env b/etc/bento.env
@@ -133,13 +133,15 @@ BENTOV2_SERVICE_REGISTRY_CPUS=1
 
 # Notification
 BENTOV2_NOTIFICATION_IMAGE=ghcr.io/bento-platform/bento_notification_service
-BENTOV2_NOTIFICATION_VERSION=2.4.1
+BENTOV2_NOTIFICATION_VERSION=3.0.0
 BENTOV2_NOTIFICATION_VERSION_DEV=${BENTOV2_NOTIFICATION_VERSION}-dev
 BENTOV2_NOTIFICATION_CONTAINER_NAME=${BENTOV2_PREFIX}-notification
 BENTO_NOTIFICATION_NETWORK=${BENTOV2_PREFIX}-notification-net
 BENTOV2_NOTIFICATION_INTERNAL_PORT=${BENTO_STD_SERVICE_INTERNAL_PORT}
 BENTOV2_NOTIFICATION_EXTERNAL_PORT=8500
 BENTOV2_NOTIFICATION_VOL_DIR=${BENTOV2_ROOT_DATA_DIR}/notification/data
+BENTO_NOTIFICATION_DEBUGGER_EXTERNAL_PORT=5681
+BENTO_NOTIFICATION_DEBUGGER_INTERNAL_PORT=5681
 
 BENTOV2_NOTIFICATION_MEM_LIM=2G
 BENTOV2_NOTIFICATION_CPUS=2
@@ -267,7 +269,7 @@ CHORD_METADATA_SUB_PATH=/api/metadata
 
 # Redis
 BENTOV2_REDIS_BASE_IMAGE=redis
-BENTOV2_REDIS_BASE_IMAGE_VERSION=7.0.11-alpine
+BENTOV2_REDIS_BASE_IMAGE_VERSION=7.0.12-alpine
 BENTOV2_REDIS_CONTAINER_NAME=${BENTOV2_PREFIX}-redis
 BENTO_REDIS_NETWORK=${BENTOV2_PREFIX}-redis-net
 BENTOV2_REDIS_INTERNAL_PORT=6379

diff --git a/etc/bento_services.json b/etc/bento_services.json
@@ -25,7 +25,7 @@
   },
   "notification": {
     "service_kind": "notification",
-    "url_template": "{BENTO_PORTAL_PUBLIC_URL}/api/{service_kind}",
+    "url_template": "{BENTO_PUBLIC_URL}/api/{service_kind}",
     "repository": "[email protected]:bento-platform/bento_notification_service",
     "data_service": false
   },

diff --git a/lib/gateway/services/notification.conf.tpl → ...way/public_services/notification.conf.tpl b/lib/gateway/services/notification.conf.tpl → ...way/public_services/notification.conf.tpl
@@ -1,9 +1,8 @@
-location /api/notification { return 302 https://${BENTOV2_PORTAL_DOMAIN}/api/notification/; }
+location /api/notification { return 302 https://${BENTOV2_DOMAIN}/api/notification/; }
 location /api/notification/ {
     # Reverse proxy settings
     include /gateway/conf/proxy.conf;
     include /gateway/conf/proxy_extra.conf;
-    include /gateway/conf/proxy_private.conf;
 
     # Forward request to notification service
     rewrite ^ $request_uri;