From 00cc86111177971d92784f05355270784561a4a8 Mon Sep 17 00:00:00 2001
From: Rucha Deshpande <deshruch@amazon.com>
Date: Wed, 13 Oct 2021 15:30:50 -0500
Subject: [PATCH] add x-user-id to pubsubbodyextractor

---
 .../osdu/notification/service/SubscriptionHandler.java         | 3 +++
 .../provider/aws/impl/AwsPubsubRequestBodyExtractor.java       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/service/SubscriptionHandler.java b/notification-core/src/main/java/org/opengroup/osdu/notification/service/SubscriptionHandler.java
index 4df5aa6ea..40716ff81 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/service/SubscriptionHandler.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/service/SubscriptionHandler.java
@@ -73,6 +73,9 @@ public class SubscriptionHandler {
         while (itr.hasNext()) {
             System.out.println(itr.next());
         }
+        tempheaders.entrySet().forEach(entry -> {
+            System.out.println(entry.getKey() + " " + entry.getValue());
+        });
         System.out.println("**********TESTING ISTIO PRINTING ALL HEADERS done*************");
 
         ISubscriptionService service = subscriptionFactory.create(headers);
diff --git a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/AwsPubsubRequestBodyExtractor.java b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/AwsPubsubRequestBodyExtractor.java
index bc731b0ff..73867657f 100644
--- a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/AwsPubsubRequestBodyExtractor.java
+++ b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/AwsPubsubRequestBodyExtractor.java
@@ -112,6 +112,7 @@ public class AwsPubsubRequestBodyExtractor implements IPubsubRequestBodyExtracto
             throw new AppException(HttpStatus.BAD_REQUEST.value(), INVALID_PUBSUB_MESSAGE,
                     "No tenant information from pubsub message.");
         }
+        lowerCase.put("x-user-id",attributes.get("x-user-id"));
         content.setAttributes(lowerCase);
 
         String decoded = new String(Base64.getDecoder().decode(data));
-- 
GitLab