Commit 3728a53c authored by Komal Makkar's avatar Komal Makkar
Browse files

undoing stray changes

parent f945ff01
Pipeline #15506 failed with stage
in 2 minutes
......@@ -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));
......
......@@ -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();
......
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment