From 3728a53cf1061a3173f65f9e432f4fb062dc6a27 Mon Sep 17 00:00:00 2001
From: komakkar <komakkar@microsoft.com>
Date: Mon, 16 Nov 2020 00:07:36 +0530
Subject: [PATCH] undoing stray changes
---
.../org/opengroup/osdu/notification/api/PubsubEndpoint.java | 2 +-
.../osdu/notification/api/PubsubEndpointHMACTests.java | 1 -
.../java/org/opengroup/osdu/notification/util/Config.java | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
index a291671c2..edbce0c44 100644
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java
@@ -122,7 +122,7 @@ public class PubsubEndpoint {
requestHeader.put("Authorization", idToken);
}
- this.log.info("komakkar sending out notification to endpoint: " + pushUrl);
+ this.log.info("sending out notification to endpoint: " + endpoint);
requestHeader.put(DpsHeaders.CONTENT_TYPE, "application/json");
requestHeader.put(DpsHeaders.CORRELATION_ID, headerAttributes.get(DpsHeaders.CORRELATION_ID));
requestHeader.put(DpsHeaders.DATA_PARTITION_ID, headerAttributes.get(DpsHeaders.DATA_PARTITION_ID));
diff --git a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpointHMACTests.java b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpointHMACTests.java
index dd88efd1a..71e87539c 100644
--- a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpointHMACTests.java
+++ b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpointHMACTests.java
@@ -92,7 +92,6 @@ public abstract class PubsubEndpointHMACTests extends BaseTestTemplate {
subscription.setSecret(secret);
- System.out.println(subscription.toString());
try {
Subscription subscriptionCreated = subscriptionService.create(subscription);
notificationId = subscriptionCreated.getNotificationId();
diff --git a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/Config.java b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/Config.java
index b09565335..3a9c5544b 100644
--- a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/Config.java
+++ b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/Config.java
@@ -36,7 +36,7 @@ public class Config {
config.ClientTenant = getEnvironmentVariableOrDefaultValue("CLIENT_TENANT","nonexistenttenant");
config.IntegrationAudience = getEnvironmentVariableOrDefaultValue("INTEGRATION_TEST_AUDIENCE","245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com");
config.OsduTenant = getEnvironmentVariableOrDefaultValue("OSDU_TENANT","opendes");
- config.Topic = getEnvironmentVariableOrDefaultValue("TOPIC_ID","osdu-mvp-idcmvpd-i2or-grid-recordstopic");
+ config.Topic = getEnvironmentVariableOrDefaultValue("TOPIC_ID","records-changed");
config.hmacSecretValue = System.getProperty("HMAC_SECRET", System.getenv("HMAC_SECRET"));
if (env.equalsIgnoreCase("LOCAL")) {
@@ -54,7 +54,7 @@ public class Config {
config.HostUrl = System.getProperty("NOTIFICATION_BASE_URL", System.getenv("NOTIFICATION_BASE_URL"));
config.GSAPushUrl = registerUrl+"/test/gsa-challenge/";
//Adding this so CPs can point to custom HMAC push endpoints
- config.HMACPushUrl = getEnvironmentVariableOrDefaultValue("REGISTER_CUSTOM_PUSH_URL_HMAC",registerUrl+"/test/challenge/1");
+ config.HMACPushUrl = getEnvironmentVariableOrDefaultValue("REGISTER_CUSTOM_PUSH_URL_HMAC",registerUrl+"/test/challenge/");
//Adding a new variable NOTIFICATION_REGISTER_BASE_URL since REGISTER_BASE_URL is used by Register integration tests which needs a trailing \
String regUrl= getEnvironmentVariable("NOTIFICATION_REGISTER_BASE_URL");
if(regUrl==null)
--
GitLab