Merge pull request #14 from FIAP-3SOAT-G15/improve-sonar

Improve Sonar
FIAP-3SOAT-G15 · May 20, 2024 · 41e3824 · 41e3824
2 parents 0cafe7c + 4553dda
commit 41e3824
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build, tag, and push docker image to Amazon ECR
-        #if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           ECR_REPOSITORY: ${{ vars.AWS_ECR_REPO_NAME }}

diff --git a/.github/workflows/provision.yml b/.github/workflows/provision.yml
@@ -63,5 +63,5 @@ jobs:
         run: exit 1
 
       - name: Terraform Apply
-        #if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         run: terraform apply -auto-approve -input=false
diff --git a/pom.xml b/pom.xml
@@ -31,6 +31,9 @@
         <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
         <sonar.language>kotlin</sonar.language>
         <sonar.verbose>true</sonar.verbose>
+        <sonar.exclusion>
+            **/com/fiap/order/driver/web/PaymentAPI*
+        </sonar.exclusion>
 
         <aws.java.sdk.version>1.12.724</aws.java.sdk.version>
     </properties>
@@ -383,8 +386,9 @@
                 <version>0.8.12</version>
                 <configuration>
                     <excludes>
-                        <exclude>**/*Config.*</exclude>
-                        <exclude>**/*Mapper.*</exclude>
+                        <exclude>**/com/fiap/payments/driver/database/persistence/entities/**</exclude>
+                        <exclude>**/com/fiap/payments/**/config/**</exclude>
+                        <exclude>**/com/fiap/payments/driver/web/PaymentAPI*</exclude>
                     </excludes>
                 </configuration>
                 <executions>

diff --git a/...nfiguration/ControllerExceptionHandler.kt → ...ller/config/ControllerExceptionHandler.kt b/...nfiguration/ControllerExceptionHandler.kt → ...ller/config/ControllerExceptionHandler.kt
@@ -1,4 +1,4 @@
-package com.fiap.payments.adapter.controller.configuration
+package com.fiap.payments.adapter.controller.config
 
 import com.fiap.payments.domain.errors.ErrorType
 import com.fiap.payments.domain.errors.PaymentsException

diff --git a/...controller/configuration/ServiceConfig.kt → ...dapter/controller/config/ServiceConfig.kt b/...controller/configuration/ServiceConfig.kt → ...dapter/controller/config/ServiceConfig.kt
@@ -1,4 +1,4 @@
-package com.fiap.payments.adapter.controller.configuration
+package com.fiap.payments.adapter.controller.config
 
 import com.fiap.payments.PaymentsApiApp
 import com.fiap.payments.adapter.gateway.OrderGateway

diff --git a/.../database/configuration/DynamoDBConfig.kt → .../driver/database/config/DynamoDBConfig.kt b/.../database/configuration/DynamoDBConfig.kt → .../driver/database/config/DynamoDBConfig.kt
@@ -1,4 +1,4 @@
-package com.fiap.payments.driver.database.configuration
+package com.fiap.payments.driver.database.config
 
 import com.amazonaws.auth.WebIdentityTokenCredentialsProvider
 import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration

diff --git a/...r/database/configuration/GatewayConfig.kt → ...s/driver/database/config/GatewayConfig.kt b/...r/database/configuration/GatewayConfig.kt → ...s/driver/database/config/GatewayConfig.kt
@@ -1,4 +1,4 @@
-package com.fiap.payments.driver.database.configuration
+package com.fiap.payments.driver.database.config
 
 import com.fiap.payments.PaymentsApiApp
 import com.fiap.payments.adapter.gateway.*

diff --git a/...ase/configuration/PaymentGatewayConfig.kt → ...r/database/config/PaymentGatewayConfig.kt b/...ase/configuration/PaymentGatewayConfig.kt → ...r/database/config/PaymentGatewayConfig.kt
@@ -1,4 +1,4 @@
-package com.fiap.payments.driver.database.configuration
+package com.fiap.payments.driver.database.config
 
 import com.fiap.payments.PaymentsApiApp
 import com.fiap.payments.adapter.gateway.PaymentProviderGateway

diff --git a/src/main/kotlin/com/fiap/payments/driver/database/persistence/entities/PaymentDocument.kt b/src/main/kotlin/com/fiap/payments/driver/database/persistence/entities/PaymentDocument.kt
@@ -4,7 +4,7 @@ import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted
-import com.fiap.payments.driver.database.configuration.DynamoDBConfig
+import com.fiap.payments.driver.database.config.DynamoDBConfig
 import java.time.LocalDateTime
 
 /**