Skip to content
GitLab
Commit 779761e8 authored by Mingyang Zhu's avatar Mingyang Zhu
Browse files

rebase latest master

parent 7a9ab23d
Pipeline #40649 canceled with stages
in 2 minutes and 24 seconds
Hide whitespace changes
Inline Side-by-side
NOTICE
View file @ 779761e8
......@@ -55,6 +55,7 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AWS AppSync (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Application Auto Scaling (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Application Discovery Service (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Audit Manager (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Auto Scaling Plans (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Backup (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Batch (from https://aws.amazon.com/sdkforjava)
......@@ -70,10 +71,14 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AWS CodeDeploy (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS CodePipeline (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS CodeStar (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS CodeStar Notifications (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS CodeStar connections (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Comprehend Medical (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Compute Optimizer (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Config (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Cost Explorer (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Cost and Usage Report (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Data Exchange (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Data Pipeline (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS DataSync (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Database Migration Service (from https://aws.amazon.com/sdkforjava)
......@@ -88,9 +93,11 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AWS Elemental MediaPackage VOD (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Elemental MediaStore (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Elemental MediaStore Data Plane (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Fault Injection Simulator (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS GameLift (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Global Accelerator (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Glue (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Glue DataBrew (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Greengrass (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Ground Station (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Health APIs and Notifications (from https://aws.amazon.com/sdkforjava)
......@@ -100,25 +107,36 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AWS IoT 1-Click Devices (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT 1-Click Projects (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Analytics (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Core Device Advisor (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Events (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Events Data (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Fleet Hub (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Greengrass V2 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Jobs Data Plane (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Secure Tunneling (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT SiteWise (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Things Graph (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS IoT Wireless (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS KMS (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Lake Formation (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Lambda (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Lex (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS License Manager (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Marketplace Catalog (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Marketplace Commerce Analytics (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Marketplace Entitlement (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Marketplace Metering Service (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS MediaConnect (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS MediaTailor (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Migration Hub (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Migration Hub Config (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Mobile (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Network Firewall (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Network Manager (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS OpsWorks (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS OpsWorks for Chef Automate (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Organizations (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Outposts (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Performance Insights (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Pricing (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS RDS Data (from https://aws.amazon.com/sdkforjava)
......@@ -127,24 +145,40 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AWS Resource Groups Tagging API (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS RoboMaker (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS S3 Control (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS SSO Identity Store (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS SSO OIDC (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS STS (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Savings Plans (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Secrets Manager (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS SecurityHub (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Server Migration (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Service Catalog (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Service Catalog App Registry (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Shield (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Signer (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Single Sign-On (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Single Sign-On Admin (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Step Functions (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Storage Gateway (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Support (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Systems Manager Incident Manager (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Systems Manager Incident Manager Contacts (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Transfer for SFTP (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS WAF (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS WAFV2 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS Well-Architected Tool (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS X-Ray (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWSKendraFrontend (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWSServerlessApplicationRepository (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Access Analyzer (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Alexa For Business (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon API Gateway (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon AppConfig (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon AppIntegrations (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon AppStream (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Appflow (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Athena (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Augmented AI Runtime (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Chime (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon CloudDirectory (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon CloudFront (from https://aws.amazon.com/sdkforjava)
......@@ -153,18 +187,29 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for Amazon CloudWatch Application Insights (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon CloudWatch Events (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon CloudWatch Logs (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon CodeGuru Profiler (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon CodeGuru Reviewer (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Cognito Identity (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Cognito Identity Provider Service (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Cognito Sync (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Comprehend (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Connect (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Connect Contact Lens (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Connect Customer Profiles (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Connect Participant (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Data Lifecycle Manager (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Detective (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon DevOps Guru (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon DocumentDB with MongoDB compatibility (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon DynamoDB (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon DynamoDB Accelerator (DAX) (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon EC2 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon EMR (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon EMR Containers (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon ElastiCache (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Elastic Inference (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Elastic Block Store (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Elastic Container Registry Public (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Elastic Container Service for Kubernetes (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Elastic File System (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Elastic Transcoder (from https://aws.amazon.com/sdkforjava)
......@@ -173,16 +218,27 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for Amazon FSx (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Forecast (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Forecast Query (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Fraud Detector (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Glacier (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon GuardDuty (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Inspector Service (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon HealthLake (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Honeycode (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Interactive Video (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Kinesis (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Kinesis Analytics (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Kinesis Video Signaling Channels (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Kinesis Video Streams (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Lex Model Building (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Lex Model Building V2 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Lex Runtime V2 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Lightsail (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Location (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Lookout for Equipment (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Lookout for Metrics (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Lookout for Vision (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Machine Learning (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Macie (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Macie 2 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Managed Blockchain (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Mechanical Turk Requester (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Neptune (from https://aws.amazon.com/sdkforjava)
......@@ -193,6 +249,7 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for Amazon Pinpoint Email (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Pinpoint SMS and Voice (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Polly (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Prometheus (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon QLDB (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon QLDB Session (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon QuickSight (from https://aws.amazon.com/sdkforjava)
......@@ -203,18 +260,23 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for Amazon Route 53 Resolver (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Route53 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon S3 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon S3 on Outposts (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SES (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SNS (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SQS (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SWF (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SageMaker (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SageMaker Feature Store Runtime (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SageMaker Runtime (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Sagemaker Edge Manager (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Simple Email (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon SimpleDB (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Snowball (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Textract (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Timestream Query (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Timestream Write (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Transcribe (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon Translate (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon WorkDocs (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon WorkLink (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon WorkMail (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Amazon WorkMail Message Flow (from https://aws.amazon.com/sdkforjava)
......@@ -222,18 +284,28 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AmazonApiGatewayManagementApi (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AmazonApiGatewayV2 (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AmazonMQ (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AmazonMWAA (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AmazonNimbleStudio (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AmplifyBackend (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Application Migration (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Auto Scaling (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Braket (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for CodeArtifact (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for EC2 Image Builder (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Elastic Load Balancing (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Elastic Load Balancing (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for FinSpace Public API (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for FinSpace User Environment Management (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Firewall Management (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Managed Streaming for Kafka (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Redshift Data API (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Schemas (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Service Quotas (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for Synthetics (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for the AWS CloudHSM (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for the AWS Simple Systems Management (SSM) Service (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for the Amazon EC2 Container Registry (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for the Amazon EC2 Container Service (from https://aws.amazon.com/sdkforjava)
- AWS SDK For Java (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - BOM (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Core (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
- Adapter: RxJava (from )
......
provider/partition-aws/pom.xml
View file @ 779761e8
......@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<properties>
<aws.version>1.11.637</aws.version>
<aws.version>1.11.1018</aws.version>
<deployment.environment>dev</deployment.environment>
</properties>
......@@ -57,7 +57,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.3.17</version>
<version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
provider/partition-aws/src/main/resources/application.properties
View file @ 779761e8
......@@ -19,7 +19,7 @@ spring.data.redis.repositories.enabled=false
springfox.documentation.swagger.v2.path=/api-docs
ACCEPT_HTTP=true
AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v1
AUTHORIZE_API=${ENTITLEMENTS_BASE_URL}/api/entitlements/v2
#logging configuration
logging.transaction.enabled=true
......
testing/partition-test-aws/build-aws/run-tests.sh
View file @ 779761e8
......@@ -32,6 +32,7 @@ export PARTITION_BASE_URL=$PARTITION_BASE_URL
export CLIENT_TENANT=common
export MY_TENANT=opendes
export RESOURCE_PREFIX=$RESOURCE_PREFIX
export ENVIRONMENT=$RESOURCE_PREFIX
#### RUN INTEGRATION TEST #########################################################################
......
testing/partition-test-aws/pom.xml
View file @ 779761e8
......@@ -71,7 +71,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.3.17</version>
<version>0.9.1-SNAPSHOT</version>
</dependency>
<dependency>
......
testing/partition-test-aws/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java
View file @ 779761e8
......@@ -14,9 +14,12 @@
package org.opengroup.osdu.partition.api;
import com.sun.jersey.api.client.ClientResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.opengroup.osdu.partition.api.descriptor.DeletePartitionDescriptor;
import org.opengroup.osdu.partition.util.AwsTestUtils;
public class TestUpdatePartition extends UpdatePartitionTest {
......@@ -30,7 +33,20 @@ public class TestUpdatePartition extends UpdatePartitionTest {
@After
@Override
public void tearDown() {
try {
this.deleteResource();
}
catch (Exception e) {
}
this.testUtils = null;
}
@Override
protected void deleteResource() throws Exception {
DeletePartitionDescriptor deletePartitionDes = new DeletePartitionDescriptor();
deletePartitionDes.setPartitionId(partitionId);
ClientResponse response = deletePartitionDes.run(this.getId(), this.testUtils.getAccessToken());
}
}
testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
View file @ 779761e8
......@@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals;
public abstract class UpdatePartitionTest extends BaseTestTemplate {
private String partitionId = getIntegrationTestPrefix() + System.currentTimeMillis();
protected String partitionId = getIntegrationTestPrefix() + System.currentTimeMillis();
private String nonExistentPartitionId = "nonexistent-partition"+System.currentTimeMillis();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment