Skip to content

Commit a7ff522

Browse files
DamianoLozziRiccardoPompilimartiMatteiFabio Andrea Petrinimottone-dgs
authored
Feature/tech bing25.4 (#645)
* PN-11764 - update dependencies with specified versions * PN-14292: Removed QueueName definitions from containerEntries * PN-14669 always send BOOKED event and handle invalid receiver address * PN-14750 Update logging levels: replaced excessive use of debug logs with info level to improve log readability and focus on significant events. Adjusted some logs to warn where more appropriate, ensuring appropriate logging verbosity throughout. * PN-14292: removed from storage.yml unused queueNames outputs * PN-14799 Add ApplicativeEnvFileChecksum for applicative environment file. (#635) Co-authored-by: Fabio Andrea Petrini <fabioandrea.petrini@noycom.it> * Feature/pn 14930 (#636) * PN-14930: Removed start.sh, renamed application-local.properties and added init-for-localdev.sh * PN-14930: Add properties to application-test.properties * PN-14930: adapted to standard core update version dummy-pec * PN-14930: update region and application.properties update version dummy-pec * PN-14930: Update init-for-localdev.sh * PN-14930: Update path resources for dynamoDBLoad.sh * PN-14930: Fixed init-for-localdev.sh script. * PN-14930: Fixed localstack endpoint. * PN-14930: Removed check on localstack when starting init-for-localdev.sh script. * PN-14930: Removed CLI pager in init-for-localdev.sh. * PN-14930: Removed LocationConstraint on S3 bucket creation. * PN-14930: Reintroduced LOCALSTACK_ENDPOINT parameter. Updated dynamoDBLoad.sh script. * PN-14930: Changed aws.endpoint-url value for DNS issues. --------- Co-authored-by: MartinaMattei <martinamattei.mm00@gmail.com> Co-authored-by: mdisco-dgs <marco.disco@dgsspa.com> * Feature/pn 13392 (#634) * PN-13392: implemented timeout strategy * PN-13392: updated application-local.properties * PN-13392: removed default values * PN-13392: changed timeout calculation logic; set as a percentage of the visibility timeout. Added timeout to EmailService, added managed queues to application-dev.env * PN-13392: added missing value to pn.ec.sqs.timeout.managed-queues in application-local.properties --------- Co-authored-by: damiano.lozzi <damiano.lozzi@dgsspa.com> * Feature/pn 14407 (#633) * PN-14407 improve retry logic in CartaceoService and add corresponding tests * Revert "PN-14407 improve retry logic in CartaceoService and add corresponding tests" This reverts commit 12ff9d7. * PN-14407: Introduced retry reset when sending message in DLQ. * PN-14407: Fixed bug. * PN-14407: Fixed step error valorization. --------- Co-authored-by: Fabio Andrea Petrini <fabioandrea.petrini@noycom.it> * PN-15260: Add new targetStatus to retry for paper (#638) * fix error test after merge --------- Co-authored-by: Riccardo Pompili <riccardo.pompili@dgsspa.com> Co-authored-by: MartinaMattei <martinamattei.mm00@gmail.com> Co-authored-by: Fabio Andrea Petrini <fabioandrea.petrini@noycom.it> Co-authored-by: mottone-dgs <119047198+mottone-dgs@users.noreply.github.com> Co-authored-by: michelescara <79908782+michelescara@users.noreply.github.com> Co-authored-by: mdisco-dgs <marco.disco@dgsspa.com> Co-authored-by: damiano.lozzi <damiano.lozzi@dgsspa.com> Co-authored-by: Martina Mattei <82142676+martiMattei@users.noreply.github.com>
1 parent bbc1731 commit a7ff522

File tree

66 files changed

+1556
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1556
-560
lines changed

config/application-local.properties renamed to config/application.properties

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ logging.config=config/logback-local.xml
22
# Runtime mode
33
pn.env.runtime=DEVELOPMENT
44

5-
aws.region=eu-south-1
6-
aws.region-code=${aws.region}
5+
76
server.port=8080
87
pn.analyzer.cloudwatch-metric-cron=-
98

@@ -19,7 +18,7 @@ email.default-sender-address=noreply@mail.dev.notifichedigitali.it
1918

2019
ricezione-esiti-cartaceo.consider-event-without-sent-status-as-booked=true
2120
ricezione-esiti-cartaceo.allowed-future-offset-duration=1m
22-
ricezione-esiti-cartaceo.duplicates-check=productType1|productType2|productType3
21+
ricezione-esiti-cartaceo.duplicates-check=productType1;productType2;productType3
2322
lavorazione-cartaceo.raster.document-type-to-raster=PN_NOTIFICATION_ATTACHMENTS
2423
lavorazione-cartaceo.raster.document-type-for-rasterized=PN_PAPER_ATTACHMENT
2524
lavorazione-cartaceo.raster.pa-id-to-raster=15376371009
@@ -41,28 +40,61 @@ namirial.metric.duplicate.receipt.namespace=PnEcNamirialMetricDuplicateReceiptNa
4140
namirial.metric.duplicate.receipt.name=PnEcNamirialMetricDuplicateReceiptName
4241
namirial.warning-to-notdelivered.logic=true
4342

44-
43+
pn.ec.identity.pec=Pn-EC-PEC
44+
pn.ec.cron.gestione-retry-cartaceo=${PnEcCronGestioneRetryCartaceo:0 */5 * * * *}
4545
pn.ec.pec.attachment-rule=FIRST
4646
pn.ec.pec.max-message-size-mb=30
4747
pn.ec.pec.tipo-ricevuta-breve=false;2024-03-14T23:00:00Z;true
4848
pn.ec.pec.pn-pec-provider-switch-read=1970-01-01T00:00:00Z;dummy
4949
pn.ec.pec.pn-pec-provider-switch-write=1970-01-01T00:00:00Z;dummy
50+
51+
52+
5053
pn.ec.storage.sqs.messages.staging.bucket=pn-sqs-messages-staging
54+
pn.ec.pec.tipo-ricevuta-header-name=X-TipoRicevuta
55+
pn.ec.pec.tipo-ricevuta-header-value=breve
56+
57+
5158
pn.pec.dimension.metrics.schema=Pn-EC-Pec-MetricsSchema
59+
5260
cancellazione-ricevute-pec.sqs-queue-name=pn-ec-pec-cancellazione-ricevute-queue
5361

54-
localstack.endpoint=http://localhost:4566
55-
cloud.aws.sqs.endpoint=${localstack.endpoint}
56-
test.aws.sqs.endpoint=${localstack.endpoint}
57-
test.aws.event=${localstack.endpoint}
58-
test.aws.dynamodb.endpoint=${localstack.endpoint}
59-
test.aws.sns.endpoint=${localstack.endpoint}
60-
test.aws.ses.endpoint=${localstack.endpoint}
61-
test.aws.secretsmanager.endpoint=${localstack.endpoint}
62-
test.aws.cloudwatch.endpoint=${localstack.endpoint}
63-
test.aws.ssm.endpoint=${localstack.endpoint}
64-
cloud.aws.region.static=${aws.region}
6562
eventbridge.event.notificationtracker.notifications-bus-name=notifications-bus-name-test
6663

6764
pdf-raster.pdf-conversion-expiration-offset-in-days=1
68-
pn.ec.cron.lavorazione-batch-cartaceo=0 */1 * * * *
65+
66+
pn.ec.cron.lavorazione-batch-cartaceo=0 */1 * * * *
67+
pn.ec.cron.lavorazione-batch-pec=0 */5 * * * *
68+
pn.ec.cron.gestione-retry-pec=0 */5 * * * *
69+
70+
## AWS specific configurations
71+
aws.endpoint-url=http://127.0.0.1:4566
72+
aws.profile-name=${PN_AWS_PROFILE_NAME:default}
73+
aws.region-code=us-east-1
74+
cloud.aws.sqs.endpoint=${aws.endpoint-url}
75+
76+
test.aws.sqs.endpoint=${aws.endpoint-url}
77+
test.aws.event=${aws.endpoint-url}
78+
test.aws.dynamodb.endpoint=${aws.endpoint-url}
79+
test.aws.sns.endpoint=${aws.endpoint-url}
80+
test.aws.ses.endpoint=${aws.endpoint-url}
81+
test.aws.secretsmanager.endpoint=${aws.endpoint-url}
82+
test.aws.cloudwatch.endpoint=${aws.endpoint-url}
83+
test.aws.ssm.endpoint=${aws.endpoint-url}
84+
test.aws.s3.endpoint=${aws.endpoint-url}
85+
test.aws.region-code=${aws.region-code}
86+
87+
88+
cloud.aws.region.static=${aws.region-code}
89+
cloud.aws.credentials.profile-name=${PN_AWS_PROFILE_NAME:default}
90+
91+
sqs.queue.max-message-size=200000
92+
93+
94+
lavorazione-pec.max-thread-pool-size=50
95+
96+
97+
98+
pn.ec.sqs.timeout.percent=10
99+
pn.ec.sqs.timeout.managed-queues=pn-ec-email-batch-queue.fifo,pn-ec-email-interactive-queue.fifo,pn-ec-email-errori-queue.fifo,pn-ec-cartaceo-batch-queue.fifo,pn-ec-cartaceo-errori-queue.fifo,pn-ec-pec-scaricamento-esiti-queue.fifo
100+
pn.ec.sqs.timeout.default-seconds=86400

‎pom.xml‎

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>it.pagopa.pn</groupId>
4646
<artifactId>pn-commons</artifactId>
47-
<version>2.8.0</version>
47+
<version>2.10.0</version>
4848
<exclusions>
4949
<exclusion>
5050
<groupId>it.pagopa.tech.lollipop-consumer-java-sdk</groupId>
@@ -119,7 +119,7 @@
119119
<dependency>
120120
<groupId>org.springdoc</groupId>
121121
<artifactId>springdoc-openapi-webflux-ui</artifactId>
122-
<version>1.6.14</version>
122+
<version>1.8.0</version>
123123
</dependency>
124124

125125
<dependency>
@@ -161,18 +161,6 @@
161161
<groupId>org.eclipse.jetty</groupId>
162162
<artifactId>jetty-reactive-httpclient</artifactId>
163163
</dependency>
164-
165-
<dependency>
166-
<groupId>ch.qos.logback.contrib</groupId>
167-
<artifactId>logback-json-classic</artifactId>
168-
<version>${logbackjackson.version}</version>
169-
</dependency>
170-
171-
<dependency>
172-
<groupId>ch.qos.logback.contrib</groupId>
173-
<artifactId>logback-jackson</artifactId>
174-
<version>${logbackjackson.version}</version>
175-
</dependency>
176164
<!-- Finish EC WebClient dependencies -->
177165

178166
<dependency>
@@ -284,13 +272,13 @@
284272
<dependency>
285273
<groupId>org.apache.cxf</groupId>
286274
<artifactId>cxf-rt-frontend-jaxws</artifactId>
287-
<version>3.6.2</version>
275+
<version>3.6.6</version>
288276
</dependency>
289277

290278
<dependency>
291279
<groupId>org.apache.cxf.systests</groupId>
292280
<artifactId>cxf-systests-transport-hc5</artifactId>
293-
<version>4.0.0</version>
281+
<version>4.1.1</version>
294282
</dependency>
295283
<!-- End SOAP dependencies -->
296284

@@ -349,43 +337,18 @@
349337
<artifactId>jakarta.mail-api</artifactId>
350338
<version>2.1.3</version>
351339
</dependency>
352-
353-
<!-- Start SS WebClient dependencies -->
354-
<dependency>
355-
<groupId>org.eclipse.jetty</groupId>
356-
<artifactId>jetty-reactive-httpclient</artifactId>
357-
</dependency>
358-
359-
<dependency>
360-
<groupId>ch.qos.logback.contrib</groupId>
361-
<artifactId>logback-json-classic</artifactId>
362-
<version>${logbackjackson.version}</version>
363-
</dependency>
364-
365340
<dependency>
366341
<groupId>ch.qos.logback.contrib</groupId>
367342
<artifactId>logback-jackson</artifactId>
368343
<version>${logbackjackson.version}</version>
369344
</dependency>
370345

371346
<!-- Start SS WebClient dependencies -->
372-
<dependency>
373-
<groupId>org.eclipse.jetty</groupId>
374-
<artifactId>jetty-reactive-httpclient</artifactId>
375-
</dependency>
376-
377347
<dependency>
378348
<groupId>ch.qos.logback.contrib</groupId>
379349
<artifactId>logback-json-classic</artifactId>
380350
<version>${logbackjackson.version}</version>
381351
</dependency>
382-
383-
<dependency>
384-
<groupId>ch.qos.logback.contrib</groupId>
385-
<artifactId>logback-jackson</artifactId>
386-
<version>${logbackjackson.version}</version>
387-
</dependency>
388-
389352
<dependency>
390353
<groupId>com.squareup.okhttp3</groupId>
391354
<artifactId>okhttp</artifactId>

‎scripts/aws/cfn/application-dev.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ PnEcNamirialPoolSmtpMinidle=1
1414
PnEcNamirialServerCache=false
1515
PnEcNamirialServerCacheEndpoint=""
1616
PnEcNamirialWarningNotDelivered=true
17+
PnEcSqsTimeoutPercent=10
18+
PnEcSqsTimeoutManagedQueues=pn-ec-email-batch-queue.fifo,pn-ec-email-interactive-queue.fifo,pn-ec-email-errori-queue.fifo,pn-ec-cartaceo-batch-queue.fifo,pn-ec-cartaceo-errori-queue.fifo,pn-ec-pec-scaricamento-esiti-queue.fifo
19+
PnEcSqsTimeoutDefaultSeconds=86400

0 commit comments

Comments
 (0)