Commit 8564abc8 authored by Matt Wise's avatar Matt Wise
Browse files

Merge branch 'aws-integration' into 'master'

Adding sonar,dependency-check to aws

See merge request !107
parents 6d43cf8c cc863da6
Pipeline #60814 failed with stages
in 24 minutes and 5 seconds
......@@ -8,6 +8,8 @@ variables:
AWS_TEST_SUBDIR: testing/entitlements-v2-test-aws
AWS_SERVICE: entitlements-v2
AWS_ENVIRONMENT: dev
AWS_DEPLOY_TARGET: EKS
AWS_EKS_DEPLOYMENT_NAME: os-entitlements
IBM_BUILD_SUBDIR: provider/entitlements-v2-ibm
IBM_INT_TEST_SUBDIR: testing/entitlements-v2-test-ibm
......
......@@ -21,6 +21,11 @@ env:
secrets-manager:
DOCKER_USERNAME: /osdu/devops/docker_credentials:username
DOCKER_PASSWORD: /osdu/devops/docker_credentials:password
SONAR_USERNAME: /osdu/devops/sonar_credentials:username
SONAR_PASSWORD: /osdu/devops/sonar_credentials:password
parameter-store:
SONAR_URL: /osdu/devops/sonar_url
phases:
install:
......@@ -58,7 +63,7 @@ phases:
- printenv
- echo "Building primary service assemblies..."
- mvn -ntp -B test install -pl entitlements-v2-core,provider/entitlements-v2-aws -Ddeployment.environment=prod
- mvn -ntp -B test install sonar:sonar -pl .,entitlements-v2-core,provider/entitlements-v2-aws -Ddeployment.environment=prod -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME}
- echo "Building integration testing assemblies and gathering artifacts..."
- ./testing/entitlements-v2-test-aws/build-aws/prepare-dist.sh
......@@ -82,6 +87,9 @@ phases:
python provider/entitlements-v2-aws/build-aws/build-info.py --branch ${CODEBUILD_SOURCE_VERSION} --commit ${CODEBUILD_RESOLVED_SOURCE_VERSION} \
--buildid ${CODEBUILD_BUILD_ID} --buildnumber ${CODEBUILD_BUILD_NUMBER} --reponame ${REPO_NAME} --outdir ${OUTPUT_DIR} \
--artifact ${ECR_IMAGE}
post_build:
commands:
- cp provider/entitlements-v2-aws/target/dependency-check-report.html ${OUTPUT_DIR}
reports:
SurefireReports: # CodeBuild will create a report group called "SurefireReports".
files: #Store all of the files
......
......@@ -54,6 +54,17 @@ limitations under the License.
<azure.devops.token>no-default</azure.devops.token>
</properties>
</profile>
<profile>
<id>sonar</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<sonar.host.url>
${env.SONAR_URL}
</sonar.host.url>
</properties>
</profile>
</profiles>
<servers>
......
......@@ -13,7 +13,7 @@
<artifactId>entitlements-v2-aws</artifactId>
<properties>
<core-lib-aws.version>0.10.0</core-lib-aws.version>
<core-lib-aws.version>0.11.0-SNAPSHOT</core-lib-aws.version>
<reactor.netty.version>0.9.5.RELEASE</reactor.netty.version>
<reactor.core.version>3.3.0.RELEASE</reactor.core.version>
<springfox-version>2.7.0</springfox-version>
......@@ -195,6 +195,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>6.2.2</version>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
......@@ -19,7 +19,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.basedir>${project.basedir}</project.main.basedir>
<jackson.version>2.10.1</jackson.version>
<core-lib-aws.version>0.10.0</core-lib-aws.version>
<core-lib-aws.version>0.11.0-SNAPSHOT</core-lib-aws.version>
<junit.version>4.12</junit.version>
<netty-all.version>4.1.50.Final</netty-all.version>
</properties>
......
Markdown is supported
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