Merge branch 'aws-eks' into 'master'

move aws to eks

See merge request !69

.gitlab-ci.yml

@@ -13,6 +13,8 @@ variables:
   AWS_SERVICE: crs-conversion
   AWS_ENVIRONMENT: dev
   AWS_INT_TEST_TYPE: python
+  AWS_DEPLOY_TARGET: EKS
+  AWS_EKS_DEPLOYMENT_NAME: os-crs-conversion
 
   IBM_BUILD_SUBDIR: provider/crs-converter-ibm/crs-converter-ocp
   IBM_INT_TEST_PY_SUBDIR: testing/crs_converter_test_ibm

provider/crs-converter-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:
@@ -59,7 +64,7 @@ phases:
 
       - echo "Building primary service assemblies..."
       - export SIS_DATA=${CODEBUILD_SRC_DIR}/apachesis_setup/SIS_DATA #needed by unit tests
-      - mvn -B test install -pl crs-converter-core,provider/crs-converter-aws -Ddeployment.environment=prod
+      - mvn -B test install sonar:sonar -pl .,crs-converter-core,provider/crs-converter-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/crs_converter_test_aws/build-aws/prepare-dist.sh
@@ -79,6 +84,9 @@ phases:
         python provider/crs-converter-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/crs-converter-aws/target/dependency-check-report.html ${OUTPUT_DIR}
 reports:
   SurefireReports: # CodeBuild will create a report group called "SurefireReports".
     files: #Store all of the files

provider/crs-converter-aws/maven/settings.xml

@@ -53,6 +53,17 @@
                 <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>

provider/crs-converter-aws/pom.xml

@@ -94,6 +94,18 @@
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </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>