Commit 682b7ce4 authored by Orsu Akhil's avatar Orsu Akhil
Browse files

merge master and resolve conflicts

parents 2cd10061 fc67e09e
Pipeline #42915 failed with stages
in 56 minutes and 16 seconds
......@@ -35,7 +35,7 @@ variables:
OSDU_GCP_VENDOR: gcp
OSDU_GCP_APPLICATION_NAME: os-schema
OSDU_GCP_TESTS_SUBDIR: testing/schema-test-core
OSDU_GCP_ENV_VARS: AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_URL,AUTHORIZE_API_KEY=$OSDU_GCP_AUTHORIZE_API_KEY,LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB=DEBUG,SHARED_TENANT_NAME=$TENANT --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
OSDU_GCP_ENV_VARS: AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_URL,AUTHORIZE_API_KEY=$OSDU_GCP_AUTHORIZE_API_KEY,LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB=DEBUG,SHARED_TENANT_NAME=$TENANT,PARTITION_API=$OSDU_GCP_PARTITION_API,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
include:
- project: "osdu/platform/ci-cd-pipelines"
......@@ -83,4 +83,4 @@ osdu-gcp-test:
- $OSDU_GCP_TESTS_SUBDIR/target/*/TEST-*.xml
reports:
junit:
- $OSDU_GCP_TESTS_SUBDIR/target/*/TEST-*.xml
\ No newline at end of file
- $OSDU_GCP_TESTS_SUBDIR/target/*/TEST-*.xml
......@@ -46,6 +46,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)
......@@ -61,10 +62,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)
......@@ -79,9 +84,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)
......@@ -91,25 +98,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)
......@@ -118,24 +136,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)
......@@ -144,18 +178,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)
......@@ -164,16 +209,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)
......@@ -184,6 +240,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)
......@@ -194,18 +251,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)
......@@ -213,18 +275,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 )
......
......@@ -106,5 +106,9 @@ spec:
value: {{ .Values.default_tenant}}
- name: azure_istioauth_enabled
value: "true"
- name: event_grid_enabled
value: "false"
- name: event_grid_topic
value: "schemachangedtopic"
......@@ -27,7 +27,7 @@
<packaging>jar</packaging>
<properties>
<aws.version>1.11.637</aws.version>
<aws.version>1.11.1018</aws.version>
</properties>
<dependencies>
......@@ -67,7 +67,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>
......
......@@ -14,17 +14,12 @@
package org.opengroup.osdu.schema.provider.aws.config;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import org.opengroup.osdu.core.aws.ssm.ParameterStorePropertySource;
import org.opengroup.osdu.core.aws.ssm.SSMConfig;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
@Component
public class AwsServiceConfig {
......@@ -39,49 +34,10 @@ public class AwsServiceConfig {
@Setter(AccessLevel.PROTECTED)
public String environment;
@Value("${aws.dynamodb.table.prefix}")
@Getter()
@Setter(AccessLevel.PROTECTED)
public String dynamoDbTablePrefix;
@Value("${aws.dynamodb.endpoint}")
@Getter()
@Setter(AccessLevel.PROTECTED)
public String dynamoDbEndpoint;
@Value("${aws.s3.endpoint}")
@Getter()
@Setter(AccessLevel.PROTECTED)
public String s3Endpoint;
@Value("${aws.s3.bucket}")
@Getter()
@Setter(AccessLevel.PROTECTED)
public String s3DataBucket;
@Value("${aws.ssm}")
@Getter()
@Setter(AccessLevel.PROTECTED)
public Boolean ssmEnabled;
/*@Inject
protected JaxRsDpsLog logger;*/
@PostConstruct
public void init() {
if (ssmEnabled) {
SSMConfig ssmConfig = new SSMConfig();
ParameterStorePropertySource ssm = ssmConfig.amazonSSM();
// String s3DataBucketParameter = "/osdu/" + environment + "/global-s3-bucket";
String s3DataBucketParameter = "/osdu/" + environment + "/schema/schema-s3-bucket-name";
try {
s3DataBucket = ssm.getProperty(s3DataBucketParameter).toString();
} catch (Exception e) {
//logger.error(String.format("SSM property %s not found", s3DataBucketParameter));
System.out.println(String.format("SSM property %s not found", s3DataBucketParameter));
}
}
}
}
package org.opengroup.osdu.schema.provider.aws.impl.messagebus;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.schema.provider.interfaces.messagebus.IMessageBus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class MessageBusImpl implements IMessageBus{
@Autowired
private JaxRsDpsLog logger;
@Override
public void publishMessage(String schemaId, String eventType) {
// TODO Auto-generated method stub
logger.warning("publish message not implemented yet");
}
}
......@@ -13,7 +13,8 @@
// limitations under the License.
package org.opengroup.osdu.schema.provider.aws.impl.schemainfostore;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelper;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperFactory;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperV2;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.schema.constants.SchemaConstants;
......@@ -24,9 +25,9 @@ import org.opengroup.osdu.schema.model.Authority;
import org.opengroup.osdu.schema.provider.aws.config.AwsServiceConfig;
import org.opengroup.osdu.schema.provider.aws.models.AuthorityDoc;
import org.opengroup.osdu.schema.provider.interfaces.schemainfostore.IAuthorityStore;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import java.text.MessageFormat;
......@@ -40,30 +41,34 @@ public class AwsAuthorityStore implements IAuthorityStore {
private JaxRsDpsLog logger;
@Inject
private AwsServiceConfig serviceConfig;
private DynamoDBQueryHelperFactory dynamoDBQueryHelperFactory;
private DynamoDBQueryHelper queryHelper;
@Value("${aws.dynamodb.authorityTable.ssm.relativePath}")
String authorityTableParameterRelativePath;
@PostConstruct
public void init() {
// TODO: serviceConfig.environment isn't correct and needs to be table prefix. Maybe the "-" will fix it
queryHelper = new DynamoDBQueryHelper(serviceConfig.getDynamoDbEndpoint(),
serviceConfig.getAmazonRegion(),
serviceConfig.getDynamoDbTablePrefix());
private DynamoDBQueryHelperV2 getAuthorityTableQueryHelper() {
return dynamoDBQueryHelperFactory.getQueryHelperForPartition(headers, authorityTableParameterRelativePath);
}
@Override
public Authority get(String authorityId) throws NotFoundException, ApplicationException {
String id = headers.getPartitionId() + ":" + authorityId;
AuthorityDoc result = queryHelper.loadByPrimaryKey(AuthorityDoc.class, id);
if (result == null) {
throw new NotFoundException(SchemaConstants.INVALID_INPUT);
}
return result.getAuthority();
DynamoDBQueryHelperV2 queryHelper = getAuthorityTableQueryHelper();
String id = headers.getPartitionId() + ":" + authorityId;
AuthorityDoc result = queryHelper.loadByPrimaryKey(AuthorityDoc.class, id);
if (result == null) {
throw new NotFoundException(SchemaConstants.INVALID_INPUT);
}
return result.getAuthority();
}
@Override
public Authority create(Authority authority) throws ApplicationException, BadRequestException {
public Authority create(Authority authority) throws ApplicationException, BadRequestException {
DynamoDBQueryHelperV2 queryHelper = getAuthorityTableQueryHelper();
String id = headers.getPartitionId() + ":" + authority.getAuthorityId();
AuthorityDoc doc = new AuthorityDoc();
......
......@@ -13,7 +13,8 @@
// limitations under the License.
package org.opengroup.osdu.schema.provider.aws.impl.schemainfostore;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelper;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperFactory;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperV2;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.schema.constants.SchemaConstants;
......@@ -21,12 +22,11 @@ import org.opengroup.osdu.schema.exceptions.ApplicationException;
import org.opengroup.osdu.schema.exceptions.BadRequestException;
import org.opengroup.osdu.schema.exceptions.NotFoundException;
import org.opengroup.osdu.schema.model.EntityType;
import org.opengroup.osdu.schema.provider.aws.config.AwsServiceConfig;
import org.opengroup.osdu.schema.provider.aws.models.EntityTypeDoc;
import org.opengroup.osdu.schema.provider.interfaces.schemainfostore.IEntityTypeStore;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import java.text.MessageFormat;
......@@ -40,19 +40,20 @@ public class AwsEntityTypeStore implements IEntityTypeStore {
private JaxRsDpsLog log;
@Inject
private AwsServiceConfig serviceConfig;
private DynamoDBQueryHelperFactory dynamoDBQueryHelperFactory;
private DynamoDBQueryHelper queryHelper;
@Value("${aws.dynamodb.entityTypeTable.ssm.relativePath}")
String entityTypeTableParameterRelativePath;
@PostConstruct
public void init() {
queryHelper = new DynamoDBQueryHelper(serviceConfig.getDynamoDbEndpoint(),
serviceConfig.getAmazonRegion(),
serviceConfig.getDynamoDbTablePrefix());
private DynamoDBQueryHelperV2 getEntityTypeTableQueryHelper() {
return dynamoDBQueryHelperFactory.getQueryHelperForPartition(headers, entityTypeTableParameterRelativePath);
}
@Override
public EntityType get(String entityTypeId) throws NotFoundException, ApplicationException {
DynamoDBQueryHelperV2 queryHelper = getEntityTypeTableQueryHelper();
String id = headers.getPartitionId() + ":" + entityTypeId;
EntityTypeDoc result = queryHelper.loadByPrimaryKey(EntityTypeDoc.class, id);
if (result == null) {
......@@ -63,6 +64,9 @@ public class AwsEntityTypeStore implements IEntityTypeStore {
@Override
public EntityType create(EntityType entityType) throws BadRequestException, ApplicationException {
DynamoDBQueryHelperV2 queryHelper = getEntityTypeTableQueryHelper();
String id = headers.getPartitionId() + ":" + entityType.getEntityTypeId();
EntityTypeDoc doc = new EntityTypeDoc();
......
......@@ -25,11 +25,11 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.joda.time.DateTime;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelper;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperFactory;
import org.opengroup.osdu.core.aws.dynamodb.DynamoDBQueryHelperV2;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
......@@ -42,7 +42,6 @@ import org.opengroup.osdu.schema.model.QueryParams;
import org.opengroup.osdu.schema.model.SchemaIdentity;
import org.opengroup.osdu.schema.model.SchemaInfo;
import org.opengroup.osdu.schema.model.SchemaRequest;
import org.opengroup.osdu.schema.provider.aws.config.AwsServiceConfig;
import org.opengroup.osdu.schema.provider.aws.models.SchemaInfoDoc;
import org.opengroup.osdu.schema.provider.interfaces.schemainfostore.ISchemaInfoStore;
import org.opengroup.osdu.schema.provider.interfaces.schemastore.ISchemaStore;
......@@ -64,28 +63,34 @@ public class AwsSchemaInfoStore implements ISchemaInfoStore {
private ITenantFactory tenantFactory;
@Inject
private JaxRsDpsLog log;
private JaxRsDpsLog log;
@Inject
private AwsServiceConfig serviceConfig;
private ISchemaStore schemaStore;
@Inject
private ISchemaStore schemaStore;
private DynamoDBQueryHelperFactory dynamoDBQueryHelperFactory;
private DynamoDBQueryHelper queryHelper;
@Value("${aws.dynamodb.schemaInfoTable.ssm.relativePath}")
String schemaInfoTableParameterRelativePath;
@Value("${shared.tenant.name:common}")
private String sharedTenant;
@PostConstruct
public void init() {
queryHelper = new DynamoDBQueryHelper(serviceConfig.getDynamoDbEndpoint(),
serviceConfig.getAmazonRegion(),
serviceConfig.getDynamoDbTablePrefix());
private DynamoDBQueryHelperV2 getSchemaInfoTableQueryHelper() {
return dynamoDBQueryHelperFactory.getQueryHelperForPartition(headers, schemaInfoTableParameterRelativePath);
}
private DynamoDBQueryHelperV2 getSchemaInfoTableQueryHelper(String dataPartitionId) {
return dynamoDBQueryHelperFactory.getQueryHelperForPartition(dataPartitionId, schemaInfoTableParameterRelativePath);
}
@Override
public SchemaInfo getSchemaInfo(String schemaId) throws ApplicationException, NotFoundException {
DynamoDBQueryHelperV2 queryHelper = getSchemaInfoTableQueryHelper();
String id = headers.getPartitionId() + ":" + schemaId;
SchemaInfoDoc result = queryHelper.loadByPrimaryKey(SchemaInfoDoc.class, id);
if (result == null) {
......@@ -101,6 +106,8 @@ public class AwsSchemaInfoStore implements ISchemaInfoStore {
// createdBy and createdOn. This causes the need to query the entity twice which is inefficient.
// This should be fixed
DynamoDBQueryHelperV2 queryHelper = getSchemaInfoTableQueryHelper();
String partitionId = headers.getPartitionId();
String userEmail = headers.getUserEmail();
String id = partitionId + ":" + schema.getSchemaInfo().getSchemaIdentity().getId();
......@@ -128,6 +135,9 @@ public class AwsSchemaInfoStore implements ISchemaInfoStore {
@Override
public SchemaInfo createSchemaInfo(SchemaRequest schema) throws ApplicationException, BadRequestException {
DynamoDBQueryHelperV2 queryHelper = getSchemaInfoTableQueryHelper();
String partitionId = headers.getPartitionId();
String userEmail = headers.getUserEmail();
String id = partitionId + ":" + schema.getSchemaInfo().getSchemaIdentity().getId();
......@@ -158,6 +168,9 @@ public class AwsSchemaInfoStore implements ISchemaInfoStore {
@Override
public String getLatestMinorVerSchema(SchemaInfo schemaInfo) throws ApplicationException {
DynamoDBQueryHelperV2 queryHelper = getSchemaInfoTableQueryHelper();
String dataPartitionId = headers.getPartitionId();
SchemaInfoDoc fullSchemaInfoDoc