diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55a1d4093a83f38841f770348a025f622f4cd1b5..9d280ff22abe139564537ffe29f29cd7aca21a72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@ variables:
AZURE_BUILD_SUBDIR: provider/legal-azure
AZURE_TEST_SUBDIR: testing/legal-test-azure
+ IBM_BUILD_SUBDIR: provider/legal-ibm
+ IBM_INT_TEST_SUBDIR: testing/legal-test-ibm
include:
- project: "osdu/platform/ci-cd-pipelines"
@@ -29,7 +31,9 @@ include:
ref: "master"
file: 'cloud-providers/gcp.yml'
- project: 'osdu/platform/ci-cd-pipelines'
- file: 'cloud-providers/aws.yml'
+ file: 'cloud-providers/aws.yml'
+ - project: 'osdu/platform/ci-cd-pipelines'
+ file: 'cloud-providers/ibm.yml'
- project: "osdu/platform/ci-cd-pipelines"
file: "scanners/fossa.yml"
- project: "osdu/platform/ci-cd-pipelines"
diff --git a/maven/settings.xml b/maven/settings.xml
deleted file mode 100644
index 651f5fe7f0ab3e46bdb81d400d49c1f91c682d5b..0000000000000000000000000000000000000000
--- a/maven/settings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <servers>
- <server>
- <id>os-core</id>
- <username>slb-des-ext-collaboration</username>
- <password>${VSTS_FEED_TOKEN}</password>
- </server>
- </servers>
-</settings>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4e5924b96119792a8cf99528dc68da9ceae36451..368cb60de33ab2b17a04f7e486d11bcb50fa1a29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
<module>provider/legal-byoc</module>
<module>provider/legal-azure</module>
<module>provider/legal-aws</module>
+ <module>provider/legal-ibm</module>
</modules>
<repositories>
diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml
index f2c2f1c63e768972c0f89fac07086fc515fa1056..f0a35b15aab4cdc798ba0cec922ed9e4905fac0f 100644
--- a/provider/legal-ibm/pom.xml
+++ b/provider/legal-ibm/pom.xml
@@ -13,7 +13,7 @@
<artifactId>legal-ibm</artifactId>
<packaging>jar</packaging>
<properties>
- <osdu.ibmcore.version>0.0.13-SNAPSHOT</osdu.ibmcore.version>
+ <osdu.ibmcore.version>0.0.14-SNAPSHOT</osdu.ibmcore.version>
</properties>
@@ -70,7 +70,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.0.0</version>
<scope>test</scope>
</dependency>
@@ -123,4 +122,17 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>local</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <build.profile.id>local</build.profile.id>
+ <profileActive>local</profileActive>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderFactoryImpl.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderFactoryImpl.java
index 4780610af521b485388879eca17384e841db1ed0..491f4a624c595025fef55c634ced908e21a881a7 100644
--- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderFactoryImpl.java
+++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/countries/StorageReaderFactoryImpl.java
@@ -34,6 +34,12 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ResourceLoader;
import org.springframework.stereotype.Component;
+import com.cloudant.client.api.Database;
+import com.cloudant.client.api.query.JsonIndex;
+import com.cloudant.client.org.lightcouch.DocumentConflictException;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+
/**
* @author mbayser
*
@@ -90,6 +96,35 @@ public class StorageReaderFactoryImpl implements IStorageReaderFactory {
}
IBMCloudantClientFactory cloudantFactory = new IBMCloudantClientFactory(creds);
+
+ // Initialize data
+ try {
+ Database db = cloudantFactory.getDatabase(dbNamePrefix, dbName);
+
+ System.out.println("creating indexes...");
+ db.createIndex(JsonIndex.builder().name("tenant-region-json-index").asc("tenant", "region").definition());
+
+ try {
+ JsonObject json = new JsonObject();
+ json.addProperty("_id", "integratio_test");
+ json.addProperty("name", "Malaysia");
+ json.addProperty("alpha2", "MY");
+ json.addProperty("numeric", 458);
+ json.addProperty("residencyRisk", "Client consent required");
+ JsonArray array = new JsonArray();
+ array.add("Transferred Data");
+ json.add("typesNotApplyDataResidency", array);
+ json.addProperty("tenant", "opendes");
+ json.addProperty("region", "us");
+ db.save(json);
+ logger.info("MY Country created for integration tests.");
+ } catch (DocumentConflictException e) {
+ logger.info("MY Country already exists.");
+ }
+
+ } catch (MalformedURLException e1) {
+ logger.error("Error initializing country database data.", e1);
+ }
return getReader(cloudantFactory, tenant, projectRegion, dbNamePrefix, dbName);
}
diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/di/DevNullPublisher.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/di/DevNullPublisher.java
deleted file mode 100644
index ab4ca44b3f53f061216e22da3e55adeebacb3846..0000000000000000000000000000000000000000
--- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/di/DevNullPublisher.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// (C) Copyright IBM Corporation 2019
-// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.legal.ibm.di;
-
-
-import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.opengroup.osdu.core.common.model.legal.StatusChangedTags;
-import org.opengroup.osdu.legal.provider.interfaces.ILegalTagPublisher;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-
-/**
- * @author mbayser
- *
- */
-@ConditionalOnProperty(
- value="ibm.legal.publisher.devnull",
- havingValue = "true",
- matchIfMissing = false)
-@Service
-public class DevNullPublisher implements ILegalTagPublisher {
-
-
- /* (non-Javadoc)
- * @see org.opengroup.osdu.legal.provider.interfaces.LegalTagPublisher#publish(java.lang.String, org.opengroup.osdu.core.api.DpsHeaders, org.opengroup.osdu.legal.jobs.StatusChangedTags)
- */
- @Override
- public void publish(String projectId, DpsHeaders headers, StatusChangedTags tags) throws Exception {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/jobs/LegalTagPublisherImpl.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/jobs/LegalTagPublisherImpl.java
index a9e143e734759aa32f077fc0aeb943fcec4300f1..b870247b475d4cffb2fc9a256a51644a1762df65 100644
--- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/jobs/LegalTagPublisherImpl.java
+++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/jobs/LegalTagPublisherImpl.java
@@ -25,15 +25,12 @@ import org.opengroup.osdu.core.common.model.legal.StatusChangedTag;
import org.opengroup.osdu.core.common.model.legal.StatusChangedTags;
import org.opengroup.osdu.core.ibm.messagebus.IMessageFactory;
import org.opengroup.osdu.legal.provider.interfaces.ILegalTagPublisher;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
import com.google.gson.Gson;
-@ConditionalOnProperty(
- value="ibm.legal.publisher.devnull",
- havingValue = "false",
- matchIfMissing = true)
+import net.minidev.json.JSONObject;
+
@Component
public class LegalTagPublisherImpl implements ILegalTagPublisher {
@@ -51,13 +48,16 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher {
List<StatusChangedTag> batch = tags.getStatusChangedTags().subList(i,
Math.min(tags.getStatusChangedTags().size(), i + BATCH_SIZE));
- String json = gson.toJson(batch);
+ JSONObject statusChangedTags = new JSONObject();
+ statusChangedTags.appendField("statusChangedTags", batch);
+ String json = gson.toJson(statusChangedTags);
message.put("data", json);
message.put(DpsHeaders.ACCOUNT_ID, headers.getPartitionIdWithFallbackToAccountId());
message.put(DpsHeaders.DATA_PARTITION_ID, headers.getPartitionIdWithFallbackToAccountId());
headers.addCorrelationIdIfMissing();
message.put(DpsHeaders.CORRELATION_ID, headers.getCorrelationId());
mq.sendMessage(IMessageFactory.LEGAL_QUEUE_NAME, gson.toJson(message));
+ // TODO discover where this message is consumed!
}
diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java
index 55368b99e9e87a70e4a024feb91d947cda8190fb..b8761bd39e3dea292d31453f82a7509c19dd8116 100644
--- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java
+++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/tags/CloudantLegalTagRepository.java
@@ -21,6 +21,7 @@ import static com.cloudant.client.api.query.Expression.in;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
+import java.sql.Date;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -32,6 +33,7 @@ import javax.inject.Inject;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.opengroup.osdu.core.common.model.legal.LegalTag;
import org.opengroup.osdu.core.common.model.legal.ListLegalTagArgs;
+import org.opengroup.osdu.core.common.model.legal.Properties;
import org.opengroup.osdu.core.ibm.auth.ServiceCredentials;
import org.opengroup.osdu.core.ibm.cloudant.IBMCloudantClientFactory;
import org.opengroup.osdu.legal.provider.interfaces.ILegalTagRepository;
@@ -46,6 +48,7 @@ import com.cloudant.client.api.Database;
import com.cloudant.client.api.model.Response;
import com.cloudant.client.api.query.EmptyExpression;
import com.cloudant.client.api.query.ExecutionStats;
+import com.cloudant.client.api.query.JsonIndex;
import com.cloudant.client.api.query.QueryBuilder;
import com.cloudant.client.api.query.QueryResult;
import com.cloudant.client.api.query.Selector;
@@ -120,7 +123,55 @@ public class CloudantLegalTagRepository implements ILegalTagRepository {
.registerTypeAdapter(CloudantBackedLegalTag.class, CloudantBackedLegalTag.serializer)
.registerTypeAdapter(CloudantBackedLegalTag.class, CloudantBackedLegalTag.deserializer);
this.cloudant = cloudantFactory.getClient();
- this.db = cloudantFactory.getDatabase(cloudant, dbNamePrefix, dataBaseName);
+ this.db = cloudantFactory.getDatabase(cloudant, dbNamePrefix, dataBaseName);
+
+ db.createIndex(JsonIndex.builder().name("is-valid-json-index").asc("is_valid").definition());
+ db.createIndex(JsonIndex.builder().name("id-json-index").asc("_id").definition());
+
+ try {
+ LegalTag tag = new LegalTag();
+ tag.setName("opendes-dps-integration-test-1566474656479");
+ tag.setDescription("invalid date");
+ tag.setIsValid(true);
+ Properties tp = new Properties();
+ tp.setCountryOfOrigin(Arrays.asList("US"));
+ tp.setContractId("A1234");
+ tp.setOriginator("MyCompany");
+ tp.setDataType("Transferred Data");
+ tp.setSecurityClassification("Public");
+ tp.setPersonalData("No Personal Data");
+ tp.setExportClassification("EAR99");
+ tp.setExpirationDate(Date.valueOf("2005-12-11"));
+ tag.setProperties(tp);
+ tag.setDefaultId();
+ db.save(tag);
+ logger.info("Invalid tag created for integration tests.");
+ } catch (DocumentConflictException e) {
+ logger.info("Invalid Tag already exists.");
+ }
+
+ try {
+ LegalTag tag = new LegalTag();
+ tag.setName("opendes-public-usa-dataset-1");
+ tag.setDescription("test for opendes-storage");
+ tag.setIsValid(true);
+ Properties tp = new Properties();
+ tp.setCountryOfOrigin(Arrays.asList("US"));
+ tp.setContractId(Properties.UNKNOWN_CONTRACT_ID);
+ tp.setOriginator("MyCompany");
+ tp.setDataType("Public Domain Data");
+ tp.setSecurityClassification("Public");
+ tp.setPersonalData("No Personal Data");
+ tp.setExportClassification("EAR99");
+ tp.setExpirationDate(Properties.DEFAULT_EXPIRATIONDATE);
+ tag.setProperties(tp);
+ tag.setDefaultId();
+ db.save(tag);
+ logger.info("Default tag created for integration tests.");
+ } catch (DocumentConflictException e) {
+ logger.info("Default Tag already exists.");
+ }
+
}
@Override
diff --git a/provider/legal-ibm/src/main/resources/application.yml b/provider/legal-ibm/src/main/resources/application.yml
index 9e7072815c5f22049d364eef5a081117d4b4e6a3..1aaac9b776c53de2e4a9504f7009d65d22a87716 100644
--- a/provider/legal-ibm/src/main/resources/application.yml
+++ b/provider/legal-ibm/src/main/resources/application.yml
@@ -20,8 +20,6 @@ ibm:
env:
prefix: acceptance-test
legal:
- publisher:
- devnull: true
db:
name: legal-tags
credentials: file:/somepath
@@ -33,3 +31,9 @@ ibm:
url: ${ibm.legal.db.url}
user: ${ibm.legal.db.user}
password: ${ibm.legal.db.password}
+
+amqphub:
+ amqp10jms:
+ remote-url: REPLACE_ME
+ username: REPLACE_ME
+ password: REPLACE_ME
diff --git a/testing/legal-test-ibm/pom.xml b/testing/legal-test-ibm/pom.xml
index 38c69cabddfc64b3e8c89aa90880d722dc44b720..653cb5355e20dfbf84e3804772caaae99ff00a00 100644
--- a/testing/legal-test-ibm/pom.xml
+++ b/testing/legal-test-ibm/pom.xml
@@ -1,97 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2017-2019 Schlumberger
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<!-- Copyright 2017-2019 Schlumberger Licensed under the Apache License,
+ Version 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.opengroup.osdu.legal</groupId>
+ <artifactId>legal-test-ibm</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <packaging>jar</packaging>
- <groupId>org.opengroup.osdu.legal</groupId>
- <artifactId>legal-test-ibm</artifactId>
- <version>0.0.1</version>
- <packaging>jar</packaging>
+ <properties>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.main.basedir>${project.basedir}</project.main.basedir>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.opengroup.osdu.legal</groupId>
+ <artifactId>legal-test-core</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage-blob -->
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-core-lib-ibm</artifactId>
+ <version>0.0.14-SNAPSHOT</version>
+ </dependency>
- <properties>
- <maven.compiler.target>1.8</maven.compiler.target>
- <maven.compiler.source>1.8</maven.compiler.source>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.main.basedir>${project.basedir}</project.main.basedir>
- <!--
- <PROJECT_ID>${PROJECT_ID}</PROJECT_ID>
- <HOST_URL>${HOST_URL}</HOST_URL>
- <ENTITLEMENT_URL>${ENTITLEMENT_URL}</ENTITLEMENT_URL>
- <INTEGRATION_TESTER>${INTEGRATION_TESTER}</INTEGRATION_TESTER>
- <INTEGRATION_TEST_AUDIENCE>${INTEGRATION_TEST_AUDIENCE}</INTEGRATION_TEST_AUDIENCE>
- <MY_TENANT>${MY_TENANT}</MY_TENANT>
- <CLIENT_TENANT>${CLIENT_TENANT}</CLIENT_TENANT>
- <MY_TENANT_PROJECT>${MY_TENANT_PROJECT}</MY_TENANT_PROJECT>
- <CLIENT_TENANT_PROJECT>${CLIENT_TENANT_PROJECT}</CLIENT_TENANT_PROJECT>
- -->
- </properties>
+ <!-- Tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <dependencies>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.opengroup.osdu.legal</groupId>
- <artifactId>legal-test-core</artifactId>
- <version>0.0.2-SNAPSHOT</version>
- </dependency>
+ <repositories>
+ <repository>
+ <id>${gitlab-server}</id>
+ <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
+ </repository>
+ </repositories>
- <!-- Tests -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <!-- can remove this? -->
- <repositories>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</url>
- </repository>
- </repositories>
+ <distributionManagement>
+ <repository>
+ <id>${gitlab-server}</id>
+ <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
+ </repository>
+ <snapshotRepository>
+ <id>${gitlab-server}</id>
+ <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
+ </snapshotRepository>
+ </distributionManagement>
- <distributionManagement>
- <repository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>${gitlab-server}</id>
- <url>https://community.opengroup.org/api/v4/projects/74/packages/maven</url>
- </snapshotRepository>
- </distributionManagement>
- <build>
- <defaultGoal>test</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
- <configuration>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>none</exclude>
+ </excludes>
+ <includes>
+ <include>**/acceptanceTests</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/testing/legal-test-ibm/run_service.sh b/testing/legal-test-ibm/run_service.sh
deleted file mode 100644
index 704f52eec800e2eef7b596c797d5bd1bfa237b22..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/run_service.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-export TENANT_INFO_DATABASE=acceptance-test-tenant-info
-export LEGAL_TAG_DATABASE=acceptance-test-legal-tags
-export COUNTRIES_DATABASE=acceptance-test-countries
-
-# snagged from: https://stackoverflow.com/a/51264222/26510
-function toAbsPath {
- local target
- target="$1"
-
- if [ "$target" == "." ]; then
- echo "$(pwd)"
- elif [ "$target" == ".." ]; then
- echo "$(dirname "$(pwd)")"
- else
- echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
- fi
-}
-
-function getScriptDir(){
- local SOURCED
- local RESULT
- (return 0 2>/dev/null) && SOURCED=1 || SOURCED=0
-
- if [ "$SOURCED" == "1" ]
- then
- RESULT=$(dirname "$1")
- else
- RESULT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
- fi
- toAbsPath "$RESULT"
-}
-
-SCRIPT_DIR=$(getScriptDir "$0")
-
-CRED_FILE=$(basename ${IBM_CREDENTIALS_FILE})
-
-mkdir config
-cp ${IBM_CREDENTIALS_FILE} config/
-cat <<EOF > config/application.yml
-ibm:
- tenant:
- cloudant:
- dbName: tenant-info
- credentials: file:config/${CRED_FILE}
- legal:
- cloudant:
- dbName: legal-tags
- credentials: file:config/${CRED_FILE}
-EOF
-
-java -jar ${SCRIPT_DIR}/../../provider/legal-ibm/target/legal-ibm-0.0.4-SNAPSHOT-spring-boot.jar
diff --git a/testing/legal-test-ibm/run_tests.sh b/testing/legal-test-ibm/run_tests.sh
deleted file mode 100644
index af90a9e525a27bb2b14929c712ad512745ab693b..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/run_tests.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if [ -z "$LEGAL_TEST_TOKEN" ]
-then
- echo "env var LEGAL_TEST_TOKEN not set"
- exit 1
-fi
-
-DATABASE_PREFIX=acceptance-test
-export COUNTRIES_DATABASE=$DATABASE_PREFIX-countries
-export TENANT_INFO_DATABASE=$DATABASE_PREFIX-tenant-info
-export LEGAL_TAG_DATABASE=$DATABASE_PREFIX-legal-tags
-export DATA_PARTITION_ID=data-partition-id
-export HOST_URL=http://localhost:8080/api/legal/v1/
-#export HOST_URL=http://localhost:8080/api/legal/v1/
-export HOST_URL=https://os-legal-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/legal/v1/
-export MY_TENANT=TENANT1
-export MY_TENANT_PROJECT=PROJECT1
-
-mvn test
diff --git a/testing/legal-test-ibm/setup_acceptance.sh b/testing/legal-test-ibm/setup_acceptance.sh
deleted file mode 100644
index 18e3162e3997f04e4249d5d9237fbe0c4f6a6465..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/setup_acceptance.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-BASE_URL=$(jq -r ".url" < ${IBM_CREDENTIALS_FILE})
-USERNAME=$(jq -r ".username" < ${IBM_CREDENTIALS_FILE})
-PASSWORD=$(jq -r ".password" < ${IBM_CREDENTIALS_FILE})
-
-DATABASE_PREFIX=acceptance-test
-
-curl -XPUT -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-countries
-curl -XPUT -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-legal-tags
-curl -XPUT -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-tenant-info
-
-# snagged from: https://stackoverflow.com/a/51264222/26510
-function toAbsPath {
- local target
- target="$1"
-
- if [ "$target" == "." ]; then
- echo "$(pwd)"
- elif [ "$target" == ".." ]; then
- echo "$(dirname "$(pwd)")"
- else
- echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
- fi
-}
-
-function getScriptDir(){
- local SOURCED
- local RESULT
- (return 0 2>/dev/null) && SOURCED=1 || SOURCED=0
-
- if [ "$SOURCED" == "1" ]
- then
- RESULT=$(dirname "$1")
- else
- RESULT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
- fi
- toAbsPath "$RESULT"
-}
-
-SCRIPT_DIR=$(getScriptDir "$0")
-
-
-
-TEST_COUNTRIES=${SCRIPT_DIR}/../legal-test-core/src/main/resources/TenantConfigTestingPurpose.json
-cat $TEST_COUNTRIES | jq -rc '{ "docs": [.[] + {"tenant": "TENANT1", "region": "us"}]}' | curl -XPOST --data-binary @- -H"Content-type: application/json" -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-countries/_bulk_docs
-
-TEST_TENANT=${SCRIPT_DIR}/src/test/resources/Tenant.json
-curl -XPOST --data-binary @${TEST_TENANT} -H"Content-type: application/json" -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-tenant-info/_bulk_docs
-
-TEST_TAGS=${SCRIPT_DIR}/src/test/resources/InitialTags.json
-curl -XPOST --data-binary @${TEST_TAGS} -H"Content-type: application/json" -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-legal-tags/_bulk_docs
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestCreateLegalTagApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestCreateLegalTagApiAcceptance.java
new file mode 100644
index 0000000000000000000000000000000000000000..74ebd5753b2b6978b45823ea72683007f9712458
--- /dev/null
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestCreateLegalTagApiAcceptance.java
@@ -0,0 +1,50 @@
+// Copyright 2020 IBM Corp. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.legal.acceptanceTests;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.opengroup.osdu.legal.util.IBMLegalTagUtils;
+
+public class TestCreateLegalTagApiAcceptance extends CreateLegalTagApiAcceptanceTests {
+
+ @Before
+ @Override
+ public void setup() throws Exception {
+ this.legalTagUtils = new IBMLegalTagUtils();
+ super.setup();
+ }
+
+ @After
+ @Override
+ public void teardown() throws Exception {
+ super.teardown();
+ this.legalTagUtils = null;
+ }
+
+ @Test
+ @Override
+ public void should_return307_when_makingHttpRequest()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ @Test
+ @Override
+ public void should_return401_when_makingHttpRequestWithoutToken()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestDeleteLegalTagApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestDeleteLegalTagApiAcceptance.java
new file mode 100644
index 0000000000000000000000000000000000000000..ccbc421f500a284acc5fa0905073a797f70ce7cf
--- /dev/null
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestDeleteLegalTagApiAcceptance.java
@@ -0,0 +1,75 @@
+// Copyright 2020 IBM Corp. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.legal.acceptanceTests;
+
+import static junit.framework.TestCase.assertTrue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.opengroup.osdu.legal.util.IBMLegalTagUtils;
+import org.opengroup.osdu.legal.util.IBMServiceBusHelper;
+import org.opengroup.osdu.legal.util.LegalTagUtils;
+
+public class TestDeleteLegalTagApiAcceptance extends DeleteLegalTagApiAcceptanceTests {
+
+ @Before
+ @Override
+ public void setup() throws Exception {
+ this.legalTagUtils = new IBMLegalTagUtils();
+ super.setup();
+ }
+
+ @After
+ @Override
+ public void teardown() throws Exception {
+ super.teardown();
+ this.legalTagUtils = null;
+ }
+
+ @Test
+ @Override
+ public void should_return307_when_makingHttpRequest()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ @Test
+ @Override
+ public void should_return401_when_makingHttpRequestWithoutToken()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ /*@Test
+ public void should_receiveSubscriptionMessage_when_deletingAContractThatDoesExist() throws Exception {
+
+ //clear out topic queue before test
+ while (IBMServiceBusHelper.getMessage(1) != null) {}
+
+ name = LegalTagUtils.createRandomNameTenant();
+ legalTagUtils.getResult(legalTagUtils.create(name), 201, String.class );
+ validateAccess(204);
+
+ boolean passed = false;
+ int i = 0;
+ while (i < 10 && !passed) {
+ String message = IBMServiceBusHelper.getMessage(2);
+ System.out.println(">>>> " + message);
+ passed = IBMServiceBusHelper.checkLegalTagNameSent(message, name);
+ ++i;
+ Thread.sleep(1000);
+ }
+ assertTrue("Pubsub message not received with tag: " + name, passed);
+ }*/
+}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagApiAcceptance.java
new file mode 100644
index 0000000000000000000000000000000000000000..93bdecc9407b786da8c4ba7cd5969084e8862743
--- /dev/null
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagApiAcceptance.java
@@ -0,0 +1,50 @@
+// Copyright 2020 IBM Corp. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.legal.acceptanceTests;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.opengroup.osdu.legal.util.IBMLegalTagUtils;
+
+public class TestGetLegalTagApiAcceptance extends GetLegalTagApiAcceptanceTests {
+
+ @Before
+ @Override
+ public void setup() throws Exception {
+ this.legalTagUtils = new IBMLegalTagUtils();
+ super.setup();
+ }
+
+ @After
+ @Override
+ public void teardown() throws Exception {
+ super.teardown();
+ this.legalTagUtils = null;
+ }
+
+ @Test
+ @Override
+ public void should_return307_when_makingHttpRequest()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ @Test
+ @Override
+ public void should_return401_when_makingHttpRequestWithoutToken()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagPropertiesApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagPropertiesApiAcceptance.java
new file mode 100644
index 0000000000000000000000000000000000000000..917feff24b0b1470c276434f9c652c168385a0d8
--- /dev/null
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagPropertiesApiAcceptance.java
@@ -0,0 +1,50 @@
+// Copyright 2020 IBM Corp. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.legal.acceptanceTests;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.opengroup.osdu.legal.util.IBMLegalTagUtils;
+
+public class TestGetLegalTagPropertiesApiAcceptance extends GetLegalTagPropertiesApiAcceptanceTests {
+
+ @Before
+ @Override
+ public void setup() throws Exception {
+ this.legalTagUtils = new IBMLegalTagUtils();
+ super.setup();
+ }
+
+ @After
+ @Override
+ public void teardown() throws Exception {
+ super.teardown();
+ this.legalTagUtils = null;
+ }
+
+ @Test
+ @Override
+ public void should_return307_when_makingHttpRequest()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ @Test
+ @Override
+ public void should_return401_when_makingHttpRequestWithoutToken()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagsApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagsApiAcceptance.java
new file mode 100644
index 0000000000000000000000000000000000000000..6c4b65a79840a18ad0836445002641765d98083a
--- /dev/null
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestGetLegalTagsApiAcceptance.java
@@ -0,0 +1,50 @@
+// Copyright 2020 IBM Corp. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.legal.acceptanceTests;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.opengroup.osdu.legal.util.IBMLegalTagUtils;
+
+public class TestGetLegalTagsApiAcceptance extends GetLegalTagsApiAcceptanceTests {
+
+ @Before
+ @Override
+ public void setup() throws Exception {
+ this.legalTagUtils = new IBMLegalTagUtils();
+ super.setup();
+ }
+
+ @After
+ @Override
+ public void teardown() throws Exception {
+ super.teardown();
+ this.legalTagUtils = null;
+ }
+
+ @Test
+ @Override
+ public void should_return307_when_makingHttpRequest()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ @Test
+ @Override
+ public void should_return401_when_makingHttpRequestWithoutToken()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestListLegalTagsApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestListLegalTagsApiAcceptance.java
similarity index 59%
rename from testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestListLegalTagsApiAcceptance.java
rename to testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestListLegalTagsApiAcceptance.java
index 4e2f5724b1d97c31dccfc00219f74bd0c9434adc..2c7c2fb9fea2ade1dfdc55e8f7004bb9b4b14cbd 100644
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestListLegalTagsApiAcceptance.java
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestListLegalTagsApiAcceptance.java
@@ -1,5 +1,4 @@
-// (C) Copyright IBM Corporation 2019
-// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+// Copyright 2020 IBM Corp. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -13,31 +12,39 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.opengroup.osdu.legal.ibm.acceptanceTests;
+package org.opengroup.osdu.legal.acceptanceTests;
import org.junit.After;
import org.junit.Before;
-import org.opengroup.osdu.legal.acceptanceTests.ListLegalTagsApiAcceptanceTests;
-import org.opengroup.osdu.legal.ibm.acceptanceTests.util.IBMLegalTagUtils;
+import org.junit.Test;
+import org.opengroup.osdu.legal.util.IBMLegalTagUtils;
-/**
- * @author mbayser
- *
- */
public class TestListLegalTagsApiAcceptance extends ListLegalTagsApiAcceptanceTests {
@Before
@Override
- public void setup() throws Exception {
+ public void setup() throws Exception {
this.legalTagUtils = new IBMLegalTagUtils();
super.setup();
}
@After
@Override
- public void teardown() throws Exception {
+ public void teardown() throws Exception {
super.teardown();
this.legalTagUtils = null;
}
-}
\ No newline at end of file
+ @Test
+ @Override
+ public void should_return307_when_makingHttpRequest()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ @Test
+ @Override
+ public void should_return401_when_makingHttpRequestWithoutToken()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestUpdateLegalTagApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestUpdateLegalTagApiAcceptance.java
similarity index 66%
rename from testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestUpdateLegalTagApiAcceptance.java
rename to testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestUpdateLegalTagApiAcceptance.java
index a053ea8105c0864bf99ef8e71966192b0b91f1c3..34386f125b5933dece3e2877b670db6bf42daa70 100644
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestUpdateLegalTagApiAcceptance.java
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestUpdateLegalTagApiAcceptance.java
@@ -1,5 +1,4 @@
-// (C) Copyright IBM Corporation 2019
-// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+// Copyright 2020 IBM Corp. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -13,17 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.opengroup.osdu.legal.ibm.acceptanceTests;
+package org.opengroup.osdu.legal.acceptanceTests;
import org.junit.After;
import org.junit.Before;
-import org.opengroup.osdu.legal.acceptanceTests.UpdateLegalTagApiAcceptanceTests;
-import org.opengroup.osdu.legal.ibm.acceptanceTests.util.IBMLegalTagUtils;
+import org.junit.Test;
+import org.opengroup.osdu.legal.util.IBMLegalTagUtils;
-/**
- * @author mbayser
- *
- */
public class TestUpdateLegalTagApiAcceptance extends UpdateLegalTagApiAcceptanceTests {
@Before
@@ -36,8 +31,21 @@ public class TestUpdateLegalTagApiAcceptance extends UpdateLegalTagApiAcceptance
@After
@Override
public void teardown() throws Exception {
+
super.teardown();
this.legalTagUtils = null;
}
+ @Test
+ @Override
+ public void should_return307_when_makingHttpRequest()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ @Test
+ @Override
+ public void should_return401_when_makingHttpRequestWithoutToken()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestValidateLegalTagsApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java
similarity index 60%
rename from testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestValidateLegalTagsApiAcceptance.java
rename to testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java
index ca3e966736798fe6e6116a549fd7828092c61c79..25205abbca6d414a4a920ffa0ae700ebaf012155 100644
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestValidateLegalTagsApiAcceptance.java
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestValidateLegalTagsApiAcceptance.java
@@ -1,5 +1,4 @@
-// (C) Copyright IBM Corporation 2019
-// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+// Copyright 2020 IBM Corp. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -13,30 +12,39 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.opengroup.osdu.legal.ibm.acceptanceTests;
+package org.opengroup.osdu.legal.acceptanceTests;
import org.junit.After;
import org.junit.Before;
-import org.opengroup.osdu.legal.acceptanceTests.ValidateLegalTagsApiAcceptanceTests;
-import org.opengroup.osdu.legal.ibm.acceptanceTests.util.IBMLegalTagUtils;
+import org.junit.Test;
+import org.opengroup.osdu.legal.util.IBMLegalTagUtils;
-/**
- * @author mbayser
- *
- */
public class TestValidateLegalTagsApiAcceptance extends ValidateLegalTagsApiAcceptanceTests {
@Before
@Override
- public void setup() throws Exception {
+ public void setup() throws Exception {
this.legalTagUtils = new IBMLegalTagUtils();
super.setup();
}
@After
@Override
- public void teardown() throws Exception {
+ public void teardown() throws Exception {
super.teardown();
this.legalTagUtils = null;
}
+
+ @Test
+ @Override
+ public void should_return307_when_makingHttpRequest()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
+ @Test
+ @Override
+ public void should_return401_when_makingHttpRequestWithoutToken()throws Exception{
+ //services are enforced to run in https on OpenShift
+ }
+
}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestCreateLegalTagApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestCreateLegalTagApiAcceptance.java
deleted file mode 100644
index 4825dc665a2979b6508314449055965ef34695f1..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestCreateLegalTagApiAcceptance.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.opengroup.osdu.legal.ibm.acceptanceTests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.opengroup.osdu.legal.acceptanceTests.CreateLegalTagApiAcceptanceTests;
-import org.opengroup.osdu.legal.ibm.acceptanceTests.util.IBMLegalTagUtils;
-import org.opengroup.osdu.legal.util.TestUtils;
-
-import com.sun.jersey.api.client.ClientResponse;
-
-public class TestCreateLegalTagApiAcceptance extends CreateLegalTagApiAcceptanceTests {
-
- @Before
- @Override
- public void setup() throws Exception {
- this.legalTagUtils = new IBMLegalTagUtils();
- super.setup();
- }
-
- @After
- @Override
- public void teardown() throws Exception {
- super.teardown();
- this.legalTagUtils = null;
- }
-
- /*
- * This test has to be modified slightly for cloudant. Since the exact same document is
- * uploaded several times, in the case where cloudant returns 202, it doesn't make
- * sense to ask if 1 out of N writes is the winner.
- */
- @Override
- @Test
- public void should_onlyLetAMaximumOf1LegaltagBeCreated_when_tryingToCreateMultipleVersionsOfTheSameContractAtTheSameTime() throws Exception {
- ExecutorService executor = Executors.newFixedThreadPool(10);
- List<Callable<ClientResponse>> tasks = new ArrayList<>();
-
- for (int i = 0; i < 10; i++) {
- Callable<ClientResponse> task = () -> {
- try {
- return legalTagUtils.create(name);
- } catch (Exception ex) {
- return null;
- }
- };
- tasks.add(task);
- }
-
- List<Future<ClientResponse>> responses = executor.invokeAll(tasks);
- executor.shutdown();
- executor.awaitTermination(20, TimeUnit.SECONDS);
-
- int sucessResponseCount = 0;
- int non409ErrorResponseCount = 0;
- for (Future<ClientResponse> future : responses) {
- if (future.get().getStatus() == 201) {
- sucessResponseCount++;
- } else if (future.get().getStatus() != 409) {
- non409ErrorResponseCount++;
- }
- }
- assertTrue("Expected at least one 1 successful response. Actual " + sucessResponseCount, sucessResponseCount >= 1);
- assertEquals(0, non409ErrorResponseCount);
- }
-
-
-
- /*
- * Now this test is designed so that we can test if we can say who the winner is when documents
- * actually conflict
- */
- @Test
- public void should_onlyLetAMaximumOf1LegaltagBeCreated_when_tryingToCreateMultipleDifferentVersionsOfTheSameContractAtTheSameTime() throws Exception {
- ExecutorService executor = Executors.newFixedThreadPool(10);
- List<Callable<ClientResponse>> tasks = new ArrayList<>();
-
- for (int i = 0; i < 10; i++) {
- Callable<ClientResponse> task = () -> {
- try {
- return legalTagUtils.create(
- "US",
- name,
- "2099-12-25",
- "Transferred Data",
- TestUtils.getMyDataPartition(),
- "<my description>"+Thread.currentThread().getId());
-
- } catch (Exception ex) {
- return null;
- }
- };
- tasks.add(task);
- }
-
- List<Future<ClientResponse>> responses = executor.invokeAll(tasks);
- executor.shutdown();
- executor.awaitTermination(20, TimeUnit.SECONDS);
-
- int sucessResponseCount = 0;
- int non409ErrorResponseCount = 0;
- for (Future<ClientResponse> future : responses) {
- if (future.get().getStatus() == 201) {
- sucessResponseCount++;
- } else if (future.get().getStatus() != 409) {
- non409ErrorResponseCount++;
- }
- }
- assertTrue("Expected at most one 1 successful response. Actual " + sucessResponseCount, sucessResponseCount <= 1);
- assertEquals(0, non409ErrorResponseCount);
- }
-
-}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestDeleteLegalTagApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestDeleteLegalTagApiAcceptance.java
deleted file mode 100644
index 5259f2b4e9d20a1afc82cb726328b08fecd03a0e..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestDeleteLegalTagApiAcceptance.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// (C) Copyright IBM Corporation 2019
-// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.legal.ibm.acceptanceTests;
-
-
-import org.junit.After;
-import org.junit.Before;
-import org.opengroup.osdu.legal.acceptanceTests.DeleteLegalTagApiAcceptanceTests;
-import org.opengroup.osdu.legal.ibm.acceptanceTests.util.IBMLegalTagUtils;
-
-/**
- * @author mbayser
- *
- */
-
-public class TestDeleteLegalTagApiAcceptance extends DeleteLegalTagApiAcceptanceTests {
-
- @Before
- @Override
- public void setup() throws Exception {
- this.legalTagUtils = new IBMLegalTagUtils();
- super.setup();
- }
-
- @After
- @Override
- public void teardown() throws Exception {
- super.teardown();
- this.legalTagUtils = null;
- }
-
-}
-
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagApiAcceptance.java
deleted file mode 100644
index eb8b168decaf184f380617bd9fd15936a08de24e..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagApiAcceptance.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// (C) Copyright IBM Corporation 2019
-// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.legal.ibm.acceptanceTests;
-
-import org.junit.After;
-import org.junit.Before;
-import org.opengroup.osdu.legal.acceptanceTests.GetLegalTagApiAcceptanceTests;
-import org.opengroup.osdu.legal.ibm.acceptanceTests.util.IBMLegalTagUtils;
-
-public class TestGetLegalTagApiAcceptance extends GetLegalTagApiAcceptanceTests {
-
- @Before
- @Override
- public void setup() throws Exception {
- this.legalTagUtils = new IBMLegalTagUtils();
- super.setup();
- }
-
- @After
- @Override
- public void teardown() throws Exception {
- super.teardown();
- this.legalTagUtils = null;
- }
-
-}
-
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagPropertiesApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagPropertiesApiAcceptance.java
deleted file mode 100644
index 612a9be18fdba831b7180090da0c6e8748ba7430..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagPropertiesApiAcceptance.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// (C) Copyright IBM Corporation 2019
-// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.legal.ibm.acceptanceTests;
-
-import org.junit.After;
-import org.junit.Before;
-import org.opengroup.osdu.legal.acceptanceTests.GetLegalTagPropertiesApiAcceptanceTests;
-import org.opengroup.osdu.legal.ibm.acceptanceTests.util.IBMLegalTagUtils;
-
-
-public class TestGetLegalTagPropertiesApiAcceptance extends GetLegalTagPropertiesApiAcceptanceTests {
-
- @Before
- @Override
- public void setup() throws Exception {
- this.legalTagUtils = new IBMLegalTagUtils();
- super.setup();
- }
-
- @After
- @Override
- public void teardown() throws Exception {
- super.teardown();
- this.legalTagUtils = null;
- }
-
-}
\ No newline at end of file
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagsApiAcceptance.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagsApiAcceptance.java
deleted file mode 100644
index 2c490d638d6f2e0bceeca9e3e31d5eaf8d101267..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/TestGetLegalTagsApiAcceptance.java
+++ /dev/null
@@ -1,43 +0,0 @@
-// (C) Copyright IBM Corporation 2019
-// U.S. Government Users Restricted Rights: Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.legal.ibm.acceptanceTests;
-
-import org.junit.After;
-import org.junit.Before;
-import org.opengroup.osdu.legal.acceptanceTests.GetLegalTagsApiAcceptanceTests;
-import org.opengroup.osdu.legal.ibm.acceptanceTests.util.IBMLegalTagUtils;
-
-/**
- * @author mbayser
- *
- */
-public class TestGetLegalTagsApiAcceptance extends GetLegalTagsApiAcceptanceTests {
-
- @Before
- @Override
- public void setup() throws Exception {
- this.legalTagUtils = new IBMLegalTagUtils();
- super.setup();
- }
-
- @After
- @Override
- public void teardown() throws Exception {
- super.teardown();
- this.legalTagUtils = null;
- }
-
-}
\ No newline at end of file
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/util/IBMLegalTagUtils.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/util/IBMLegalTagUtils.java
deleted file mode 100644
index 661ca0c09932097e1776034fc9733492d9f684af..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/ibm/acceptanceTests/util/IBMLegalTagUtils.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.opengroup.osdu.legal.ibm.acceptanceTests.util;
-
-import org.opengroup.osdu.legal.util.LegalTagUtils;
-
-public class IBMLegalTagUtils extends LegalTagUtils {
-
- public IBMLegalTagUtils() {
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public void uploadTenantTestingConfigFile() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public String accessToken() throws Exception {
- return System.getenv("LEGAL_TEST_TOKEN");
- }
-}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/util/IBMLegalTagUtils.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/util/IBMLegalTagUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..5dadd1f942b5f41b79866b513696eec5209507db
--- /dev/null
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/util/IBMLegalTagUtils.java
@@ -0,0 +1,48 @@
+// Copyright 2020 IBM Corp. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.legal.util;
+
+import org.opengroup.osdu.core.ibm.util.Config;
+import org.opengroup.osdu.core.ibm.util.IdentityClient;
+
+import com.google.common.base.Strings;
+
+public class IBMLegalTagUtils extends LegalTagUtils {
+
+ @Override
+ public synchronized void uploadTenantTestingConfigFile() {
+ // not needed for IBM
+ }
+
+ @Override
+ public synchronized String accessToken() throws Exception {
+ if (Strings.isNullOrEmpty(token)) {
+ token = IdentityClient.getTokenForUserWithAccess();
+ }
+ return "Bearer " + token;
+ }
+
+ private static final String mqConnection = "IBM_LEGAL_MQ_CONNECTION";
+ private static final String envPrefix = "IBM_ENV_PREFIX";
+
+ public static String getMessageQueueConnectionString() {
+ return Config.getEnvironmentVariable(mqConnection);
+ }
+
+ public static String getQueueName() {
+ return Config.getEnvironmentVariable(envPrefix);
+ }
+
+}
diff --git a/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/util/IBMServiceBusHelper.java b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/util/IBMServiceBusHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..55cf1ebbbd31063784d17a750631e5de14b55d7f
--- /dev/null
+++ b/testing/legal-test-ibm/src/test/java/org/opengroup/osdu/legal/util/IBMServiceBusHelper.java
@@ -0,0 +1,100 @@
+// Copyright 2020 IBM Corp. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.legal.util;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.concurrent.TimeoutException;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Session;
+
+import org.opengroup.osdu.core.ibm.messagebus.IMessageFactory;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+
+public class IBMServiceBusHelper {
+
+ // TODO should be reimplemented for AMQ
+ /*
+ public static boolean checkLegalTagNameSent(String message, String name) throws Exception {
+ if(message == null)
+ return false;
+ JsonParser jsonParser = new JsonParser();
+ JsonElement jsonMessageElement = jsonParser.parse(message);
+ JsonObject jsonMessage = jsonMessageElement.getAsJsonObject();
+ String data = jsonMessage.get("data").getAsString();
+ return data.equals("{\"statusChangedTags\":[{\"changedTagName\":\"" + name + "\",\"changedTagStatus\":\"incompliant\"}]}");
+ }
+
+ public static String getMessage(int waitSeconds) throws Exception {
+
+ Thread.sleep(Duration.ofSeconds(waitSeconds).toMillis());
+
+ String queueName = IBMLegalTagUtils.getQueueName() + "-" + IMessageFactory.LEGAL_QUEUE_NAME;
+
+ Channel channel = null;
+
+ try {
+ ConnectionFactory factory = new ConnectionFactory();
+
+ ConnectionFactory connectionFactory = jmsTemplate.getConnectionFactory();
+ Connection connection = connectionFactory.createConnection();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ for (String queue : Arrays.asList(INDEXER_QUEUE_NAME, LEGAL_QUEUE_NAME, DEFAULT_QUEUE_NAME)) {
+ session.createQueue(prefix + "-" + queue);
+ logger.debug("Queue [" + prefix + "-" + queue + "] declared");
+ }
+
+
+ factory.setUri(IBMLegalTagUtils.getMessageQueueConnectionString());
+ factory.setAutomaticRecoveryEnabled(true);
+ Connection conn = factory.newConnection();
+ channel = conn.createChannel();
+ channel.queueDeclare(queueName, false, false, false, null);
+ } catch (KeyManagementException | NoSuchAlgorithmException | URISyntaxException | IOException | TimeoutException e) {
+ e.printStackTrace();
+ }
+ String msg = null;
+ try {
+ boolean autoAck = false;
+ GetResponse response = channel.basicGet(queueName, autoAck);
+ if (response == null) {
+ // No message retrieved.
+ } else {
+ //AMQP.BasicProperties props = response.getProps();
+ byte[] body = response.getBody();
+ long deliveryTag = response.getEnvelope().getDeliveryTag();
+ msg = new String(body);
+ System.out.println(" [x] Received '" + msg + "'");
+ channel.basicAck(deliveryTag, false); // acknowledge receipt of the message
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return msg;
+
+ }
+ */
+}
diff --git a/testing/legal-test-ibm/src/test/resources/InitialTags.json b/testing/legal-test-ibm/src/test/resources/InitialTags.json
deleted file mode 100644
index 34ed7cfff435657af648278106e914db26eff702..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/src/test/resources/InitialTags.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "docs": [
- {
- "_id": "1001",
- "name": "valid_tag1",
- "description": "description",
- "is_valid": true,
- "properties": {
- "countryOfOrigin": [
- "US"
- ],
- "contractId": "Contract 1",
- "expirationDate": 1765464244000,
- "originator": "John Smith",
- "dataType": "Wellbore",
- "securityClassification": "confidential",
- "personalData": "none",
- "exportClassification": "restricted"
- }
- },
- {
- "_id": "1002",
- "name": "valid_tag1",
- "description": "description",
- "is_valid": true,
- "properties": {
- "countryOfOrigin": [
- "US"
- ],
- "contractId": "Contract 1",
- "expirationDate": 1765464244000,
- "originator": "John Smith",
- "dataType": "Wellbore",
- "securityClassification": "confidential",
- "personalData": "none",
- "exportClassification": "restricted"
- }
- },
- {
- "_id": "1003",
- "name": "invalid_tag1",
- "description": "description",
- "is_valid": false,
- "properties": {
- "countryOfOrigin": [
- "US"
- ],
- "contractId": "Contract 1",
- "expirationDate": 1765464244000,
- "originator": "John Smith",
- "dataType": "Wellbore",
- "securityClassification": "confidential",
- "personalData": "none",
- "exportClassification": "restricted"
- }
- },
- {
- "_id": "1291004374",
- "name": "TENANT1-dps-integration-test-1566474656479",
- "description": "invalid date",
- "is_valid": true,
- "properties": {
- "countryOfOrigin": [
- "US"
- ],
- "contractId": "A1234",
- "expirationDate": 1134312244000,
- "originator": "MyCompany",
- "dataType": "Transferred Data",
- "securityClassification": "Public",
- "personalData": "No Personal Data",
- "exportClassification": "EAR99"
- }
- }
- ]
-}
diff --git a/testing/legal-test-ibm/src/test/resources/Tenant.json b/testing/legal-test-ibm/src/test/resources/Tenant.json
deleted file mode 100644
index 965fdf592dd3bb75d69623d3e502d199820bb880..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/src/test/resources/Tenant.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "docs": [
- {
- "_id": "1001",
- "name": "TENANT1",
- "projectId": "PROJECT1",
- "serviceAccount": "SERVICE1",
- "complianceRuleSet": "shared",
- "dataPartitionId": "PARTITION1",
- "crmAccountIds": [
- "CRM0001",
- "CRM0002",
- "TENANT1"
- ]
- }
- ]
-}
diff --git a/testing/legal-test-ibm/teardown_acceptance.sh b/testing/legal-test-ibm/teardown_acceptance.sh
deleted file mode 100644
index 6009e2c560a845509b0d87aa403520473e37e9de..0000000000000000000000000000000000000000
--- a/testing/legal-test-ibm/teardown_acceptance.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DATABASE_PREFIX=acceptance-test
-BASE_URL=$(jq -r ".url" < ${IBM_CREDENTIALS_FILE})
-USERNAME=$(jq -r ".username" < ${IBM_CREDENTIALS_FILE})
-PASSWORD=$(jq -r ".password" < ${IBM_CREDENTIALS_FILE})
-
-curl -XDELETE -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-countries
-curl -XDELETE -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-legal-tags
-curl -XDELETE -u $USERNAME:$PASSWORD $BASE_URL/$DATABASE_PREFIX-tenant-info