GONRG-1110 Optionally encrypted credentials from file or content for...

GONRG-1110 Optionally encrypted credentials from file or content for DE_OPS_TESTER, DE_ADMIN_TESTER, DE_EDITOR_TESTER, DE_NO_ACCESS_TESTER accounts

testing/register-test-gcp/pom.xml

@@ -27,12 +27,11 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.opengroup.osdu.register</groupId>
     <artifactId>register-test-gcp</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <description>Register service GCP integration tests </description>
+    <description>Register service GCP integration tests</description>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -108,6 +107,11 @@
             <artifactId>core-lib-gcp</artifactId>
             <version>0.1.21</version>
         </dependency>
+        <dependency>
+            <groupId>org.opengroup.osdu</groupId>
+            <artifactId>core-test-lib-gcp</artifactId>
+            <version>0.0.2</version>
+        </dependency>
         <dependency>
             <groupId>org.opengroup.osdu.register</groupId>
             <artifactId>register-test-core</artifactId>

testing/register-test-gcp/src/test/java/org/opengroup/osdu/register/util/GCPTestUtils.java

 package org.opengroup.osdu.register.util;
 
 import com.google.common.base.Strings;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.NullArgumentException;
 
+@Slf4j
 public class GCPTestUtils extends TestUtils {
 
     @Override
@@ -38,12 +40,13 @@ public class GCPTestUtils extends TestUtils {
     }
 
     private String getToken(String testerEnvVar) throws Exception {
-        String serviceAccountFile = System.getProperty(testerEnvVar, System.getenv(testerEnvVar));
+        log.info("Get {}} credentials", testerEnvVar);
+        String serviceAccountValue = System.getProperty(testerEnvVar, System.getenv(testerEnvVar));
         String audience = System.getProperty("INTEGRATION_TEST_AUDIENCE", System.getenv("INTEGRATION_TEST_AUDIENCE"));
         if (Strings.isNullOrEmpty(audience)) {
             audience = "245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com";
         }
-        return new GoogleServiceAccount(serviceAccountFile).getAuthToken(audience);
+        return new GoogleServiceAccount(serviceAccountValue).getAuthToken(audience);
 
     }
 }

testing/register-test-gcp/src/test/java/org/opengroup/osdu/register/util/GoogleServiceAccount.java

@@ -30,6 +30,7 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.opengroup.osdu.config.util.DecodedContentExtractor;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -39,15 +40,15 @@ import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.opengroup.osdu.config.util.DecodedContentExtractorUtil.NAIVE_JSON_CONTENT_ACCEPTANCE_TESTER;
+
 public class GoogleServiceAccount {
-    public GoogleServiceAccount(String serviceAccountEncoded) throws IOException {
-        this(Base64.getDecoder().decode(serviceAccountEncoded));
-    }
+    public GoogleServiceAccount(String serviceAccountValue) throws IOException {
 
-    public GoogleServiceAccount(byte[] serviceAccountJson) throws IOException {
-        try (InputStream inputStream = new ByteArrayInputStream(serviceAccountJson)) {
+        serviceAccountValue = new DecodedContentExtractor(serviceAccountValue, NAIVE_JSON_CONTENT_ACCEPTANCE_TESTER).getContent();
 
-            serviceAccount = ServiceAccountCredentials.fromStream(inputStream);
+        try (InputStream inputStream = new ByteArrayInputStream(serviceAccountValue.getBytes())) {
+            this.serviceAccount = ServiceAccountCredentials.fromStream(inputStream);
         }
     }