From 9692640b33bc2898c7b1d274fde766cbe4eb1ae6 Mon Sep 17 00:00:00 2001
From: Spencer Sutton <suttonsp@amazon.com>
Date: Tue, 11 May 2021 19:09:50 +0000
Subject: [PATCH] Fixing int tests
commit 1c744c98
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Tue May 11 2021 14:05:13 GMT-0500 (Central Daylight Time)
merge
commit dda616dd
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Tue May 11 2021 13:10:40 GMT-0500 (Central Daylight Time)
Fixing int tests
commit b2b8fd21
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Tue May 11 2021 10:12:48 GMT-0500 (Central Daylight Time)
Version reverted?
commit d395c4ac
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Tue May 11 2021 10:07:35 GMT-0500 (Central Daylight Time)
Missed partition in table name
commit 084ccea3
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Tue May 11 2021 10:00:42 GMT-0500 (Central Daylight Time)
Updating query helper to v2
commit 64df8896
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Fri May 07 2021 13:48:53 GMT-0500 (Central Daylight Time)
Updating legal doc
commit 64a5bccd
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Fri May 07 2021 13:47:45 GMT-0500 (Central Daylight Time)
More cleanup
commit 29f09c4b
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Fri May 07 2021 13:42:23 GMT-0500 (Central Daylight Time)
Some cleanup
commit a663c3f1
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Fri May 07 2021 13:41:31 GMT-0500 (Central Daylight Time)
Updating legal testing aws pom
commit 0222a310
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Fri May 07 2021 13:40:36 GMT-0500 (Central Daylight Time)
Merge branch 'dev' of codecommit::us-east-1://default@os-legal into multi-tenant
commit ac28485a
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Fri May 07 2021 13:39:44 GMT-0500 (Central Daylight Time)
Reverting previous debug change
commit a956a5a1
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Fri May 07 2021 13:39:12 GMT-0500 (Central Daylight Time)
Fixing int tests
commit 09734341
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Fri May 07 2021 10:44:52 GMT-0500 (Central Daylight Time)
Temp debugging deployed
commit d958f657
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Wed May 05 2021 15:46:13 GMT-0500 (Central Daylight Time)
Merged
commit 7fc77652
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Wed May 05 2021 15:33:56 GMT-0500 (Central Daylight Time)
Removing superfluos code
commit 57a24b40
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Wed May 05 2021 13:01:23 GMT-0500 (Central Daylight Time)
Consolidating s3 client classes
commit c6f635ba
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Wed May 05 2021 12:40:15 GMT-0500 (Central Daylight Time)
Cleaning up
commit 5c9e8475
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Wed May 05 2021 11:59:24 GMT-0500 (Central Daylight Time)
Updating core lib aws version
commit e3e0f9c4
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Wed May 05 2021 11:45:09 GMT-0500 (Central Daylight Time)
Adjusting tests for mult-tenancy
commit 7064328e
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Wed May 05 2021 10:57:11 GMT-0500 (Central Daylight Time)
Deleted accidental key
commit a65471ea
Author: Spencer Sutton <spencerpsutton@yahoo.com>
Date: Wed May 05 2021 10:56:30 GMT-0500 (Central Daylight Time)
Updating to be multi-tenant
---
.../osdu/legal/util/AwsLegalTagUtils.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsLegalTagUtils.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsLegalTagUtils.java
index c2fc4846e..9f84b54a9 100644
--- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsLegalTagUtils.java
+++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsLegalTagUtils.java
@@ -21,10 +21,11 @@ import java.util.List;
import com.amazonaws.services.s3.AmazonS3;
import org.opengroup.osdu.core.aws.cognito.AWSCognitoClient;
-import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperFactory;
+import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelper;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperV2;
import org.opengroup.osdu.core.aws.s3.S3Config;
-
+import org.opengroup.osdu.core.common.model.legal.Properties;
+import org.springframework.beans.factory.annotation.Value;
public class AwsLegalTagUtils extends LegalTagUtils {
private static final String FILE_NAME = "Legal_COO.json";
@@ -77,7 +78,6 @@ public class AwsLegalTagUtils extends LegalTagUtils {
doc.setDescription("Expired integration test tag");
doc.setName(integrationTagTestName);
doc.setId(Integer.toString(integrationTagTestName.hashCode()));
- doc.setDataPartitionId(getMyDataPartition());
org.opengroup.osdu.core.common.model.legal.Properties properties = new org.opengroup.osdu.core.common.model.legal.Properties();
List countryOfOrigin = new ArrayList();
@@ -93,16 +93,19 @@ public class AwsLegalTagUtils extends LegalTagUtils {
properties.setExportClassification("EAR99");
doc.setProperties(properties);
- DynamoDBQueryHelperFactory dynamoDBQueryHelperFactory = new DynamoDBQueryHelperFactory();
- DynamoDBQueryHelperV2 queryHelper = dynamoDBQueryHelperFactory.getQueryHelperForPartition(getMyDataPartition(), "legal/legalTable");
+ doc.setDataPartitionId(getMyDataPartition());
+
+ String dynamoDbRegion = System.getenv(DYNAMO_DB_REGION);
+ String dynamoDbEndpoint = System.getenv(DYNAMO_DB_ENDPOINT);
+
+ String table = String.format("%s-shared-LegalRepository", System.getenv(TABLE_PREFIX));
+ DynamoDBQueryHelperV2 queryHelper = new DynamoDBQueryHelperV2(dynamoDbEndpoint, dynamoDbRegion, table);
// delete legal tag if it exists
if(queryHelper.keyExistsInTable(LegalDoc.class, doc)){
- queryHelper.deleteByPrimaryKey(LegalDoc.class, doc.getId());
+ queryHelper.deleteByPrimaryKey(LegalDoc.class, doc.getId(), doc.getDataPartitionId());
}
queryHelper.save(doc);
}
-
-
}
--
GitLab