Merge pull request #146 from pagopa/release-uat

fix: Promote to main

Author: stedelia

Dockerfile

@@ -1,7 +1,7 @@
 #
 # Build
 #
-FROM maven:3.9.6-amazoncorretto-17-al2023@sha256:9ace9c9e506877b0e1877a7f709fa9dc7895d5fbdcc93d4170dfb3d25e2839e9 AS buildtime
+FROM maven:3.9.6-amazoncorretto-17-al2023@sha256:459be099faa25a32c06cd45ed1ef2bc9dbbf8a5414da4e72349459a1bb4d6166 AS buildtime
 
 WORKDIR /build
 COPY . .
@@ -11,7 +11,7 @@ RUN mvn clean package -DskipTests
 #
 # Docker RUNTIME
 #
-FROM amazoncorretto:17.0.9-alpine3.18@sha256:ed14b8c2f00dbb7b94446aa01d00583976ff0eda2577f5474035f3b4cf078dfd AS runtime
+FROM amazoncorretto:17-alpine3.19@sha256:539a0a188ce5a2bed985aa311e9a26d473c6c3f37d08d4fc8b6cf6c18075b9ab AS runtime
 
 RUN apk --no-cache add shadow
 RUN useradd --uid 10000 runner

helm/values.yaml

@@ -67,20 +67,23 @@ microservice-chart:
       TZ: TZ
     idpay-eventhub-01:
       KAFKA_BINDER_BROKER_ENDPOINT_REWARD_TRX: kafka_broker
-      KAFKA_TRANSACTIONS_SASL_MECHANISM: kafka_sasl_mechanism
       KAFKA_TRANSACTIONS_SECURITY_PROTOCOL: kafka_security_protocol
-      KAFKA_TRANSACTION_TOPIC: idpay_transaction_topic
-      KAFKA_TRANSACTION_GROUP_ID: idpay_transaction_consumer_group
       KAFKA_ERRORS_BROKER: kafka_broker
       KAFKA_ERRORS_TOPIC: idpay_error_topic
       KAFKA_COMMANDS_BROKER: kafka_broker
       KAFKA_COMMANDS_TOPIC: idpay_commands_topic
+    idpay-eventhub-00:
+      KAFKA_TRANSACTIONS_BROKER: kafka_broker
+      KAFKA_TRANSACTIONS_SASL_MECHANISM_00: kafka_sasl_mechanism
+      KAFKA_TRANSACTION_TOPIC: idpay_transaction_topic
+      KAFKA_TRANSACTION_GROUP_ID: idpay_transaction_consumer_group
+
     rest-client:
       PDV_BASE_URL: pdv_decrypt_base_url
 
   envSecret:
     MONGODB_URI: mongodb-connection-string
-    EVH_CONNECTION_REWARD_RESPONSE: evh-idpay-transaction-idpay-transaction-consumer-jaas-config-idpay-01
+    EVH_CONNECTION_REWARD_RESPONSE: evh-idpay-transaction-idpay-transaction-consumer-jaas-config-idpay-00
     KAFKA_ERRORS_SASL_JAAS_CONFIG: evh-idpay-errors-idpay-errors-producer-jaas-config-idpay-01
     KAFKA_COMMANDS_SASL_JAAS_CONFIG: evh-idpay-commands-idpay-commands-consumer-jaas-config-idpay-01
     PDV_DECRYPT_API_KEY: pdv-api-key

pom.xml

@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.8</version>
 	</parent>
 
 	<groupId>it.gov.pagopa</groupId>
 	<artifactId>idpay-transactions</artifactId>
 	<name>idpay-transactions</name>
 	<description>Transactions Microservice</description>
-	<version>1.2.0</version>
+	<version>1.2.1</version>
 
 	<properties>
 		<java.version>17</java.version>

src/main/java/it/gov/pagopa/idpay/transactions/dto/RewardTransactionDTO.java

@@ -1,5 +1,6 @@
 package it.gov.pagopa.idpay.transactions.dto;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import it.gov.pagopa.idpay.transactions.model.RefundInfo;
 import it.gov.pagopa.idpay.transactions.model.Reward;
 import lombok.AllArgsConstructor;
@@ -20,6 +21,7 @@
 @Builder
 public class RewardTransactionDTO {
 
+    @JsonAlias("_id")
     private String id;
     private String idTrxAcquirer;
     private String acquirerCode;

src/main/resources/application.yml

@@ -50,7 +50,7 @@ spring:
           type: kafka
           environment:
             spring.cloud.stream.kafka.binder:
-              brokers: ${KAFKA_BINDER_BROKER_ENDPOINT_REWARD_TRX:${KAFKA_BROKER:}}
+              brokers: ${KAFKA_TRANSACTIONS_BROKER:${KAFKA_BROKER:}}
               configuration:
                 sasl.jaas.config: ${EVH_CONNECTION_REWARD_RESPONSE:}
         kafka-errors:
@@ -75,7 +75,7 @@ spring:
             heartbeat.interval.ms: ${KAFKA_TRANSACTIONS_BINDER_CONFIGURATION_HEARTBEAT_INTERVAL_MS:3000}
             session.timeout.ms: ${KAFKA_TRANSACTIONS_BINDER_CONFIGURATION_SESSION_TIMEOUT_MS:60000}
             request.timeout.ms: ${KAFKA_CONFIG_REQUEST_TIMEOUT_MS:60000}
-            sasl.mechanism: ${KAFKA_TRANSACTIONS_SASL_MECHANISM:PLAIN}
+            sasl.mechanism: ${KAFKA_TRANSACTIONS_SASL_MECHANISM_00:PLAIN}
             security.protocol: ${KAFKA_TRANSACTIONS_SECURITY_PROTOCOL:SASL_SSL}
             connections.max.idle.ms: ${KAFKA_CONFIG_CONNECTION_MAX_IDLE_TIME:180000}
             metadata.max.idle.ms: ${KAFKA_CONFIG_METADATA_MAX_IDLE_MS:180000}