Merge branch 'rename-domain-env-variable' into 'master'

Renamed domain env variable (GONRG-6912)

See merge request !700

provider/storage-gc/docs/anthos/README.md

@@ -431,7 +431,7 @@ You will need to have the following environment variables defined.
 | name                                           | value                                     | description                                                      | sensitive?                                        | source |
 |------------------------------------------------|-------------------------------------------|------------------------------------------------------------------|---------------------------------------------------|--------|
 | `DEPLOY_ENV`                                   | `empty`                                   | Required but not used, should be set up with string "empty"      | no                                                | -      |
-| `DOMAIN`                                       | ex`opendes-gc.projects.com`               | OSDU R2 to run tests under                                       | no                                                | -      |
+| `GROUP_ID`                                     | ex`opendes-gc.projects.com`               | OSDU R2 to run tests under                                       | no                                                | -      |
 | `LEGAL_URL`                                    | ex`http://localhsot:8080/api/legal/v1/`   | Legal API endpoint                                               | no                                                | -      |
 | `STORAGE_URL`                                  | ex`http://localhost:8080/api/storage/v2/` | Endpoint of storage service                                      | no                                                | -      |
 | `TENANT_NAME`                                  | ex `opendes`                              | OSDU tenant used for testing                                     | no                                                | --     |
@@ -473,11 +473,11 @@ oqmDriver=rabbitmq
 ```
 #### Specify osdu services urls:
 ```properties
-DOMAIN=https://osdu.ref.gcp.gnrg-osdu.projects.epam.com
-AUTHORIZE_API=${DOMAIN}/api/entitlements/v2
-CRS_API=${DOMAIN}/api/crs/v2
-LEGALTAG_API=${DOMAIN}/api/legal/v1
-PARTITION_API=${DOMAIN}/api/partition/v1/
+HOST=https://osdu.ref.gcp.gnrg-osdu.projects.epam.com
+AUTHORIZE_API=${HOST}/api/entitlements/v2
+CRS_API=${HOST}/api/crs/v2
+LEGALTAG_API=${HOST}/api/legal/v1
+PARTITION_API=${HOST}/api/partition/v1/
 ```
 #### Auth variables:
 ```properties

provider/storage-gc/docs/gc/README.md

@@ -133,7 +133,7 @@ You will need to have the following environment variables defined.
 | name                      | value                                     | description                                                                                                    | sensitive? | source                                                       |
 |---------------------------|-------------------------------------------|----------------------------------------------------------------------------------------------------------------|------------|--------------------------------------------------------------|
 | `DEPLOY_ENV`              | `empty`                                   | Required but not used, should be set up with string "empty"                                                    | no         | -                                                            |
-| `DOMAIN`                  | ex`opendes-gc.projects.com`               | OSDU R2 to run tests under                                                                                     | no         | -                                                            |
+| `GROUP_ID`                | ex`opendes-gc.projects.com`               | OSDU R2 to run tests under                                                                                     | no         | -                                                            |
 | `INTEGRATION_TESTER`      | `********`                                | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already | yes        | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
 | `LEGAL_URL`               | ex`http://localhsot:8080/api/legal/v1/`   | Legal API endpoint                                                                                             | no         | -                                                            |
 | `NO_DATA_ACCESS_TESTER`   | `********`                                | Service account base64 encoded string without data access                                                      | yes        | <https://console.cloud.google.com/iam-admin/serviceaccounts> |

testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/util/AnthosTestUtils.java

@@ -15,11 +15,17 @@
 package org.opengroup.osdu.storage.util;
 
 import com.google.common.base.Strings;
+import java.util.Optional;
 
 public class AnthosTestUtils extends TestUtils {
 
     private static final OpenIDTokenProvider openIDTokenProvider = new OpenIDTokenProvider();
 
+    public AnthosTestUtils() {
+        domain = Optional.ofNullable(System.getProperty("GROUP_ID", System.getenv("GROUP_ID")))
+                .orElse("group");
+    }
+
     @Override
     public synchronized String getToken() throws Exception {
         if (Strings.isNullOrEmpty(token)) {

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

@@ -48,7 +48,7 @@ public abstract class TestUtils {
     protected static String noDataAccesstoken = null;
     private static Gson gson = new Gson();
 
-    protected static final String domain = System.getProperty("DOMAIN", System.getenv("DOMAIN"));
+    protected static String domain = System.getProperty("DOMAIN", System.getenv("DOMAIN"));
 
     public static final String getDomain() {
         return domain;

testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/util/GCPTestUtils.java

@@ -15,9 +15,15 @@
 package org.opengroup.osdu.storage.util;
 
 import com.google.common.base.Strings;
+import java.util.Optional;
 
 public class GCPTestUtils extends TestUtils{
 
+	public GCPTestUtils() {
+		domain = Optional.ofNullable(System.getProperty("GROUP_ID", System.getenv("GROUP_ID")))
+				.orElse("group");
+	}
+
 	@Override
 	public synchronized String getToken() throws Exception {
 		if (Strings.isNullOrEmpty(token)) {