From de0fea6ea55ef773ba25c2b6c4a482a2d478ccb5 Mon Sep 17 00:00:00 2001
From: Spencer Sutton <suttonsp@amazon.com>
Date: Mon, 19 Jul 2021 18:56:13 +0000
Subject: [PATCH] Adding sonar,dependency-check to aws
commit 11ae9581
Author: Spencer Sutton <suttonsp@amazon.com>
Date: Mon Jul 19 2021 11:50:06 GMT-0500 (Central Daylight Time)
Fixing build
commit e9bd8727
Author: Spencer Sutton <suttonsp@amazon.com>
Date: Mon Jul 19 2021 10:43:12 GMT-0500 (Central Daylight Time)
Adding sonar,dependency-check to aws
---
provider/partition-aws/build-aws/buildspec.yaml | 10 +++++++++-
provider/partition-aws/maven/settings.xml | 11 +++++++++++
provider/partition-aws/pom.xml | 12 ++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/provider/partition-aws/build-aws/buildspec.yaml b/provider/partition-aws/build-aws/buildspec.yaml
index 788ce1a98..459686629 100644
--- a/provider/partition-aws/build-aws/buildspec.yaml
+++ b/provider/partition-aws/build-aws/buildspec.yaml
@@ -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 -B test install -pl partition-core,provider/partition-aws -Ddeployment.environment=prod
+ - mvn -B test install sonar:sonar -pl .,partition-core,provider/partition-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/partition-test-aws/build-aws/prepare-dist.sh
@@ -78,6 +83,9 @@ phases:
python provider/partition-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/partition-aws/target/dependency-check-report.html ${OUTPUT_DIR}
reports:
SurefireReports: # CodeBuild will create a report group called "SurefireReports".
files: #Store all of the files
diff --git a/provider/partition-aws/maven/settings.xml b/provider/partition-aws/maven/settings.xml
index 1bfc43ac9..3bd1cd4aa 100644
--- a/provider/partition-aws/maven/settings.xml
+++ b/provider/partition-aws/maven/settings.xml
@@ -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>
diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml
index 48fcc328f..0f75e5519 100644
--- a/provider/partition-aws/pom.xml
+++ b/provider/partition-aws/pom.xml
@@ -180,6 +180,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>
--
GitLab