Merge branch 'dev' into m18-pipeline-update-master

provider/legal-aws/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.21.0-rc1</version>
+            <version>0.21.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
@@ -199,6 +199,7 @@
                     <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
                     <nugetconfAnalyzerEnabled>false</nugetconfAnalyzerEnabled>
                     <nuspecAnalyzerEnabled>false</nuspecAnalyzerEnabled>
+                    <failOnError>false</failOnError>
                 </configuration>
                 <executions>
                     <execution>

provider/legal-aws/src/main/resources/application.properties

@@ -5,11 +5,8 @@ logging.level.org.springframework.web=${LOG_LEVEL}
 server.port=${APPLICATION_PORT}
 
 ## AWS Lambda configuration
-aws.lambda.get-groups-function-name=${ENVIRONMENT}-os-entitlements-GroupsFunction
+aws.lambda.get-groups-function-name=${OSDU_INSTANCE_NAME}-os-entitlements-GroupsFunction
 
-aws.environment=${ENVIRONMENT}
-aws.parameter.prefix=/osdu/${ENVIRONMENT}
-aws.resourcePrefix=${ENVIRONMENT}
 aws.region=${AWS_REGION}
 
 REGION=${AWS_REGION}
@@ -25,11 +22,9 @@ aws.s3.legal.config.file-name=Legal_COO.json
 aws.sns.region=${AWS_REGION}
 
 aws.ssm=${SSM_ENABLED}
-aws.ssm.prefix=/osdu/${ENVIRONMENT}
 
-aws.s3.configbucket.ssm.relativePath=${CONFIG_BUCKET_SSM_RELATIVE_PATH:legal/s3DataBucket}
-aws.s3.configfilename.ssm.relativePath=${CONFIG_FILE_SSM_RELATIVE_PATH:legal/s3ConfigFileName}
-aws.dynamodb.legalTable.ssm.relativePath=${LEGAL_REPOSITORY_SSM_RELATIVE_PATH:legal/legalTable}
+aws.s3.configbucket.ssm.relativePath=${CONFIG_BUCKET_SSM_RELATIVE_PATH:services/core/legal/s3DataBucket}
+aws.dynamodb.legalTable.ssm.relativePath=${LEGAL_REPOSITORY_SSM_RELATIVE_PATH:services/core/legal/legalTable}
 
 server.ssl.enabled=${SSL_ENABLED:false}
 server.ssl.key-store-type=PKCS12

testing/legal-test-aws/build-aws/run-tests.sh

@@ -18,7 +18,7 @@ echo "$SCRIPT_SOURCE_DIR"
 # ELASTIC_PORT
 # FILE_URL
 # LEGAL_URL
-# RESOURCE_PREFIX
+# TENANT_GROUP_NAME
 # SEARCH_URL
 # LEGAL_QUEUE
 # LEGAL_S3_BUCKET
@@ -49,7 +49,7 @@ export HOST_URL=$LEGAL_URL
 export MY_TENANT=int-test-legal
 export S3_LEGAL_CONFIG_BUCKET=$LEGAL_S3_BUCKET
 export SKIP_HTTP_TESTS=true
-export TABLE_PREFIX=$RESOURCE_PREFIX
+export TABLE_PREFIX=$TENANT_GROUP_NAME
 
 
 #### RUN INTEGRATION TEST #########################################################################