Skip to content
Snippets Groups Projects
Commit 7a789c12 authored by Bill Wang's avatar Bill Wang Committed by Sutton
Browse files

Squashed commit of the following

commit 07cf8431 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Tue Dec 29 2020 09:31:46 GMT-0800 (Pacific Standard Time) 

    fix minor env name


commit f3afaca1 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Tue Dec 29 2020 07:15:36 GMT-0800 (Pacific Standard Time) 

    swap env line


commit 8b5b33fc 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 18:52:44 GMT-0800 (Pacific Standard Time) 

    revert back region + endpoint, modify env setup


commit e05ce2e8 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 18:23:00 GMT-0800 (Pacific Standard Time) 

    fix S3 client instantiation


commit ee38f441 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 13:53:19 GMT-0800 (Pacific Standard Time) 

    suppress verbose log


commit d6134fbd 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 13:41:10 GMT-0800 (Pacific Standard Time) 

    resolve region


commit b8720bf2 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 13:14:41 GMT-0800 (Pacific Standard Time) 

    bump core service version


commit 110f48ec 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 21 2020 13:14:08 GMT-0800 (Pacific Standard Time) 

    bump os-core-lib-aws version 
parent 8b5bc0dd
No related branches found
No related tags found
1 merge request!99CORS Fix, AWS Updates
......@@ -28,8 +28,8 @@ phases:
java: corretto8
commands:
- if [ $(echo $CODEBUILD_SOURCE_VERSION | grep -c ^refs/heads.*) -eq 1 ]; then echo "Branch name found"; else echo "This build only supports branch builds" && exit 1; fi
- apt-get update -y
- apt-get install -y maven
- apt-get update -y -qq > /dev/null
- apt-get install -y maven -qq > /dev/null
- java -version
- mvn -version
# - mvn -B clean # .m2 is not created until the first Maven command
......@@ -58,7 +58,7 @@ phases:
- printenv
- echo "Building primary service assemblies..."
- mvn -B test install -pl legal-core,provider/legal-aws -Ddeployment.environment=prod
- mvn -ntp -B test install -pl legal-core,provider/legal-aws -Ddeployment.environment=prod
# Suspended until further notice
# - echo "Copying assemblies to dist..."
......@@ -96,4 +96,4 @@ artifacts:
name: ${REPO_NAME}_${BRANCH_NAME}_$(date +%F)_${CODEBUILD_BUILD_NUMBER}.zip
cache:
paths:
- "/root/.m2/**/*"
\ No newline at end of file
- "/root/.m2/**/*"
......@@ -37,7 +37,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.3.7</version>
<version>0.3.16</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -21,13 +21,13 @@ echo $INTEGRATION_TEST_OUTPUT_BIN_DIR
rm -rf "$INTEGRATION_TEST_OUTPUT_DIR"
mkdir -p "$INTEGRATION_TEST_OUTPUT_DIR" && mkdir -p "$INTEGRATION_TEST_OUTPUT_BIN_DIR"
echo "Building integration testing assemblies and gathering artifacts..."
mvn install -f "$INTEGRATION_TEST_SOURCE_DIR_CORE"/pom.xml
mvn install dependency:copy-dependencies -DskipTests -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml -DincludeGroupIds=org.opengroup.osdu -Dmdep.copyPom
mvn -ntp install -f "$INTEGRATION_TEST_SOURCE_DIR_CORE"/pom.xml
mvn -ntp install dependency:copy-dependencies -DskipTests -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml -DincludeGroupIds=org.opengroup.osdu -Dmdep.copyPom
cp "$INTEGRATION_TEST_SOURCE_DIR_AWS"/target/dependency/* "${INTEGRATION_TEST_OUTPUT_BIN_DIR}"
(cd "${INTEGRATION_TEST_OUTPUT_BIN_DIR}" && ls *.jar | sed -e 's/\.jar$//' | xargs -I {} echo mvn install:install-file -Dfile={}.jar -DpomFile={}.pom >> install-deps.sh)
(cd "${INTEGRATION_TEST_OUTPUT_BIN_DIR}" && ls *.jar | sed -e 's/\.jar$//' | xargs -I {} echo mvn -ntp install:install-file -Dfile={}.jar -DpomFile={}.pom >> install-deps.sh)
chmod +x "${INTEGRATION_TEST_OUTPUT_BIN_DIR}"/install-deps.sh
mvn clean -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml
mvn -ntp clean -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml
cp -R "$INTEGRATION_TEST_SOURCE_DIR_AWS"/* "${INTEGRATION_TEST_OUTPUT_DIR}"/
#copy testing parent pom to output
cp ./testing/pom.xml "${OUTPUT_DIR}/testing"
\ No newline at end of file
cp ./testing/pom.xml "${OUTPUT_DIR}/testing"
......@@ -29,10 +29,22 @@ export AWS_COGNITO_AUTH_FLOW=USER_PASSWORD_AUTH
export AWS_COGNITO_AUTH_PARAMS_PASSWORD=$ADMIN_PASSWORD
export AWS_COGNITO_AUTH_PARAMS_USER=$ADMIN_USER
export AWS_COGNITO_CLIENT_ID=$AWS_COGNITO_CLIENT_ID
export AWS_S3_ENDPOINT=s3.us-east-1.amazonaws.com
export AWS_S3_REGION=us-east-1
export DYNAMO_DB_ENDPOINT=dynamodb.us-east-1.amazonaws.com
export DYNAMO_DB_REGION=us-east-1
if [ -z "$LEGAL_S3_ENDPOINT" ]
then
export AWS_S3_ENDPOINT=s3.us-east-1.amazonaws.com
else
export AWS_S3_ENDPOINT=$LEGAL_S3_ENDPOINT
fi
export AWS_S3_REGION=$AWS_REGION
if [ -z "$LEGAL_DYNAMODB_ENDPOINT" ]
then
export DYNAMO_DB_ENDPOINT=dynamodb.us-east-1.amazonaws.com
else
export DYNAMO_DB_ENDPOINT=$LEGAL_DYNAMODB_ENDPOINT
fi
export DYNAMO_DB_REGION=$AWS_REGION
export HOST_URL=$LEGAL_URL
export MY_TENANT=int-test-legal
export S3_LEGAL_CONFIG_BUCKET=$LEGAL_S3_BUCKET
......@@ -42,7 +54,7 @@ export TABLE_PREFIX=$RESOURCE_PREFIX
#### RUN INTEGRATION TEST #########################################################################
mvn test -f "$SCRIPT_SOURCE_DIR"/../pom.xml
mvn -ntp test -f "$SCRIPT_SOURCE_DIR"/../pom.xml
TEST_EXIT_CODE=$?
#### COPY TEST REPORTS #########################################################################
......@@ -53,4 +65,4 @@ if [ -n "$1" ]
cp -R "$SCRIPT_SOURCE_DIR"/../target/surefire-reports "$1"
fi
exit $TEST_EXIT_CODE
\ No newline at end of file
exit $TEST_EXIT_CODE
......@@ -48,6 +48,7 @@ public class AwsLegalTagUtils extends LegalTagUtils {
S3Config s3Config = new S3Config(amazonS3Endpoint, amazonS3Region);
AmazonS3 s3Client = s3Config.amazonS3();
try {
s3Client.putObject(BUCKET_NAME_AWS, FILE_NAME, readTestFile("TenantConfigTestingPurpose.json"));
} catch(IOException e){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment