Merge branch 'master' into HelmChartsAndIstioconfig

testing/register-test-core/src/main/java/org/opengroup/osdu/register/subscriber/CreateSubscriberDescriptor.java

@@ -23,6 +23,7 @@ import org.opengroup.osdu.register.util.TestPayloadReader;
 
 public class CreateSubscriberDescriptor extends RestDescriptor {
     private final TestPayloadReader reader = new TestPayloadReader();
+    private static String topicName = System.getProperty("TEST_TOPIC_NAME", System.getenv("TEST_TOPIC_NAME"));
 
     @Override
     public String getPath() {
@@ -48,12 +49,17 @@ public class CreateSubscriberDescriptor extends RestDescriptor {
             url = pushPath;
         }
         String secret = Config.Instance().SUBSCRIBER_SECRET;
+
+        if(Strings.isNullOrEmpty(topicName)) {
+            topicName = "records-changed";
+        }
+
         return "{\n" +
                 "\t\"id\": \"" + getArg() + "\",\n" +
                 "\t\"name\": \"My listener\",\n" +
                 "\t\"description\": \"My test listener.\",\n" +
                 "\t\"pushEndpoint\":\"" + url + "\",\n" +
-                "\t\"topic\":\"records-changed\",\n" +
+                "\t\"topic\":\"" + topicName + "\",\n" +
                 "\t\"secret\": {\n" +
                 "\t\t\"secretType\" : \"HMAC\",\n" +
                 "\t\"value\":\"" + secret + "\"\n" +

testing/register-test-core/src/main/java/org/opengroup/osdu/register/util/TestUtils.java

@@ -31,6 +31,7 @@ import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 import static org.junit.Assert.assertEquals;
 
@@ -81,12 +82,14 @@ public abstract class TestUtils {
     public static Map<String, String> getOsduTenantHeaders() {
         Map<String, String> headers = new HashMap<>();
         headers.put("data-partition-id", getOsduTenant());
+        headers.put("correlation-id", UUID.randomUUID().toString());
         return headers;
     }
 
     public static Map<String, String> getCustomerTenantHeaders() {
         Map<String, String> headers = new HashMap<>();
         headers.put("data-partition-id", getCustomerTenant());
+        headers.put("correlation-id", UUID.randomUUID().toString());
         return headers;
     }