Merge branch 'master' of...

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/notification into cache_ent

devops/gc/deploy/templates/deployment.yaml

@@ -66,3 +66,8 @@ spec:
               memory: {{ .Values.data.limitsMemory  | quote}}
             {{- end }}
       serviceAccountName: {{ .Values.data.serviceAccountName  | quote}}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1
+      maxSurge: 0

testing/notification-test-baremetal/src/test/java/org/opengroup/osdu/notification/api/TestPushEndpointGsa.java

@@ -19,6 +19,7 @@ package org.opengroup.osdu.notification.api;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.opengroup.osdu.config.util.DecodedContentExtractorUtil.NAIVE_JSON_CONTENT_ACCEPTANCE_TESTER;
 import static org.opengroup.osdu.notification.util.Constants.GROUP_ID;
 
 import com.google.common.base.Strings;
@@ -30,6 +31,7 @@ import java.util.Objects;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.opengroup.osdu.config.util.DecodedContentExtractor;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.common.model.notification.GsaSecret;
 import org.opengroup.osdu.core.common.model.notification.GsaSecretValue;
@@ -136,8 +138,11 @@ public class TestPushEndpointGsa {
     Secret gsaSecret = new GsaSecret();
     GsaSecretValue gsaSecretValue = new GsaSecretValue();
     gsaSecretValue.setAudience(integrationAudience);
-    String opsTester = System.getProperty(DE_OPS_TESTER, System.getenv(DE_OPS_TESTER));
-    gsaSecretValue.setKey(new String(Base64.getDecoder().decode(opsTester)));
+
+    String opsTester = new DecodedContentExtractor(System.getProperty(DE_OPS_TESTER, System.getenv(DE_OPS_TESTER)),
+        NAIVE_JSON_CONTENT_ACCEPTANCE_TESTER).getContent();
+
+    gsaSecretValue.setKey(opsTester);
     gsaSecret.setSecretType("GSA");
     ((GsaSecret) gsaSecret).setValue(gsaSecretValue);
     subscription.setSecret(gsaSecret);

testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/api/TestPushEndpointGsa.java

@@ -22,6 +22,7 @@ import com.sun.jersey.api.client.ClientResponse;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.opengroup.osdu.config.util.DecodedContentExtractor;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.common.model.notification.*;
 import org.opengroup.osdu.core.common.notification.ISubscriptionService;
@@ -37,6 +38,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.junit.Assert.*;
+import static org.opengroup.osdu.config.util.DecodedContentExtractorUtil.NAIVE_JSON_CONTENT_ACCEPTANCE_TESTER;
 import static org.opengroup.osdu.notification.util.Constants.GROUP_ID;
 
 public class TestPushEndpointGsa {
@@ -125,8 +127,11 @@ public class TestPushEndpointGsa {
     Secret gsaSecret = new GsaSecret();
     GsaSecretValue gsaSecretValue = new GsaSecretValue();
     gsaSecretValue.setAudience(integrationAudience);
-    String opsTester = System.getProperty(DE_OPS_TESTER, System.getenv(DE_OPS_TESTER));
-    gsaSecretValue.setKey(new String(Base64.getDecoder().decode(opsTester)));
+
+    String opsTester = new DecodedContentExtractor(System.getProperty(DE_OPS_TESTER, System.getenv(DE_OPS_TESTER)),
+        NAIVE_JSON_CONTENT_ACCEPTANCE_TESTER).getContent();
+
+    gsaSecretValue.setKey(opsTester);
     gsaSecret.setSecretType("GSA");
     ((GsaSecret) gsaSecret).setValue(gsaSecretValue);
     subscription.setSecret(gsaSecret);