Merge branch 'main' into PIDM-41-update-deprecated-pipeline-tasks

helm/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-ecommerce-transactions-service
 description: Microservice that handles transactions lifecycle and workflow in ecommerce pagoPA
 type: application
-version: 1.48.3
-appVersion: 1.48.3
+version: 1.48.4
+appVersion: 1.48.4
 dependencies:
   - name: microservice-chart
     version: 2.8.0

helm/values-dev.yaml

@@ -30,7 +30,7 @@ microservice-chart:
         CHECKOUT_OUTCOME_URL: "https://pagopa-d-checkout-cdn-endpoint.azureedge.net/esito"
   image:
     repository: pagopadcommonacr.azurecr.io/pagopaecommercetransactionsservice
-    tag: "1.48.3" #improve
+    tag: "1.48.4" #improve
     pullPolicy: Always
   livenessProbe:
     handlerType: httpGet

helm/values-prod.yaml

@@ -28,7 +28,7 @@ microservice-chart:
         ECS_SERVICE_NAME: pagopa-ecommerce-transactions-service-blue
   image:
     repository: pagopapcommonacr.azurecr.io/pagopaecommercetransactionsservice
-    tag: "1.48.3"
+    tag: "1.48.4"
     pullPolicy: Always
   livenessProbe:
     handlerType: httpGet

helm/values-uat.yaml

@@ -28,7 +28,7 @@ microservice-chart:
         ECS_SERVICE_NAME: pagopa-ecommerce-transactions-service-blue
   image:
     repository: pagopaucommonacr.azurecr.io/pagopaecommercetransactionsservice
-    tag: "1.48.3"
+    tag: "1.48.4"
     pullPolicy: Always
   livenessProbe:
     handlerType: httpGet

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <groupId>it.pagopa</groupId>
     <artifactId>pagopa-ecommerce-transactions-service</artifactId>
-    <version>1.48.3</version>
+    <version>1.48.4</version>
     <name>pagopa-ecommerce-transactions-service</name>
     <description>pagopa-ecommerce-transactions-service</description>
     <properties>

src/main/resources/logback-spring.xml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <springProperty name="ECS_SERVICE_VERSION" source="build.version"/>
-    <appender name="ECS_JSON_CONSOLE_MASKED" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="it.pagopa.transactions.utils.EcsEncoderLogMasker">
+    <appender name="ECS_JSON_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="co.elastic.logging.logback.EcsEncoder">
             <serviceName>${ECS_SERVICE_NAME:-undefined}</serviceName>
             <serviceVersion>${ECS_SERVICE_VERSION}</serviceVersion>
             <serviceEnvironment>${ECS_SERVICE_ENVIRONMENT:-undefined}</serviceEnvironment>
-            <maskPattern>([\d+]{3,20})</maskPattern> <!-- each string of digits from 3 to 20 char -->
-            <maskPattern>([a-z0-9.-]+@[a-z]+\.[a-z]{2,3})</maskPattern> <!-- email -->
         </encoder>
     </appender>
     <root level="INFO">
-        <appender-ref ref="ECS_JSON_CONSOLE_MASKED"/>
+        <appender-ref ref="ECS_JSON_CONSOLE"/>
     </root>
 </configuration>

src/test/java/it/pagopa/transactions/utils/LogMaskTests.java → src/test/java/it/pagopa/transactions/utils/LogFormatterTests.java

@@ -1,5 +1,8 @@
 package it.pagopa.transactions.utils;
 
+import it.pagopa.ecommerce.commons.domain.RptId;
+import it.pagopa.ecommerce.commons.domain.TransactionId;
+import it.pagopa.ecommerce.commons.v2.TransactionTestUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -19,7 +22,7 @@
 @Slf4j
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-tests.properties")
-class LogMaskTests {
+class LogFormatterTests {
 
     private static final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
     private static final ByteArrayOutputStream errContent = new ByteArrayOutputStream();
@@ -37,32 +40,19 @@ public static void restoreStreams() {
     }
 
     @Test
-    void testSimpleLog() {
-        String simpleMail = "[email protected]";
-        log.info(simpleMail);
-        String complexmail = "[email protected]";
-        log.info(complexmail);
-        String cvvMsg3 = "cvv: 123";
-        log.info(cvvMsg3);
-        String cvvMsg4 = "cvv: 1234";
-        log.info(cvvMsg4);
-        String pan14 = "pan: 12345678901234";
-        log.info(pan14);
-        String pan16 = "pan: 1234567890123456";
-        log.info(pan16);
+    void testShouldNotMaskValues() {
+        // pre-conditions
+        TransactionId transactionId = new TransactionId(TransactionTestUtils.TRANSACTION_ID);
+        RptId rptId = new RptId(TransactionTestUtils.RPT_ID);
+        // test
+        log.info("TransactionId: [{}]", transactionId.value());
+        log.info("RPT ID: [{}]", rptId.value());
+        // assertions
         String outcontentString = outContent.toString(StandardCharsets.UTF_8);
-        assertFalse(outcontentString.contains(simpleMail));
-        assertFalse(outcontentString.contains(complexmail));
-        assertFalse(outcontentString.contains(cvvMsg3));
-        assertFalse(outcontentString.contains(cvvMsg4));
-        assertFalse(outcontentString.contains(pan14));
-        assertFalse(outcontentString.contains(pan16));
-        assertTrue(outcontentString.contains("cvv: ***"));
-        assertTrue(outcontentString.contains("cvv: ****"));
-        assertTrue(outcontentString.contains("pan: ****************"));
-        assertTrue(outcontentString.contains("pan: **************"));
-        assertTrue(outcontentString.contains("*****************"));
-        assertTrue(outcontentString.contains("************"));
+        assertTrue(outcontentString.contains("TransactionId: [" + transactionId.value() + "]"));
+        assertTrue(outcontentString.contains("RPT ID: [" + rptId.value() + "]"));
+        // We expect some additional data in the log string
+        assertTrue(outcontentString.contains("@timestamp"));
     }
 
 }