From cf6c256afd347d12ca50e8e73035be7276f2e1ba Mon Sep 17 00:00:00 2001 From: andrea-putzu <106688558+andrea-putzu@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:12:43 +0200 Subject: [PATCH 1/3] Releases/0.3.2 add logs (#418) --- .../service/NotificationEventServiceDefault.java | 11 +++++++---- .../service/NotificationEventServiceDefaultTest.java | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java index 9d15309c0..240492208 100644 --- a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java +++ b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java @@ -37,6 +37,7 @@ public class NotificationEventServiceDefault implements NotificationEventService public static final String EVENT_ONBOARDING_FN_NAME = "ONBOARDING-FN"; public static final String EVENT_ONBOARDING_INSTTITUTION_FN_FAILURE = "EventsOnboardingInstitution_failures"; + public static final String EVENT_ONBOARDING_INSTTITUTION_FN_ERROR = "EventsOnboardingInstitution_error"; public static final String EVENT_ONBOARDING_INSTTITUTION_FN_SUCCESS = "EventsOnboardingInstitution_success"; public static final String OPERATION_NAME = "ONBOARDING-FN"; private final TelemetryClient telemetryClient; @@ -98,7 +99,8 @@ public void send(ExecutionContext context, Onboarding onboarding, QueueEvent que prepareAndSendNotification(context, product, consumerConfig, onboarding, token.orElse(null), institution, queueEvent); } } catch (Exception e) { - telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, onboardingEventMap(onboarding), Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_FAILURE, 1D)); + telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, onboardingEventMap(onboarding), Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_ERROR, 1D)); + context.getLogger().severe(String.format("Impossible to send notification for onboarding with ID %s %s", onboarding.getId(), Arrays.toString(e.getStackTrace()))); throw new NotificationException(String.format("Impossible to send notification for onboarding with ID %s", onboarding.getId()), e); } } @@ -120,9 +122,9 @@ private void sendNotification(ExecutionContext context, String topic, Notificati try { eventHubRestClient.sendMessage(topic, message); - telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, notificationEventMap(notificationToSend), Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_SUCCESS, 1D)); + telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, notificationEventMap(notificationToSend, topic), Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_SUCCESS, 1D)); } catch (Exception e) { - telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, notificationEventMap(notificationToSend), Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_FAILURE, 1D)); + telemetryClient.trackEvent(EVENT_ONBOARDING_FN_NAME, notificationEventMap(notificationToSend, topic), Map.of(EVENT_ONBOARDING_INSTTITUTION_FN_FAILURE, 1D)); throw new NotificationException(e.getMessage()); } } @@ -144,8 +146,9 @@ public static Map onboardingEventMap(Onboarding onboarding) { return propertiesMap; } - public static Map notificationEventMap(NotificationToSend notificationToSend) { + public static Map notificationEventMap(NotificationToSend notificationToSend, String topic) { Map propertiesMap = new HashMap<>(); + Optional.ofNullable(topic).ifPresent(value -> propertiesMap.put("topic", value)); Optional.ofNullable(notificationToSend.getId()).ifPresent(value -> propertiesMap.put("id", value)); Optional.ofNullable(notificationToSend.getInternalIstitutionID()).ifPresent(value -> propertiesMap.put("internalIstitutionID", value)); Optional.ofNullable(notificationToSend.getInstitutionId()).ifPresent(value -> propertiesMap.put("institutionId", value)); diff --git a/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java b/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java index d2e4d6a8f..57741694c 100644 --- a/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java +++ b/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java @@ -214,7 +214,7 @@ void notificationEventMapTest() { billing.setPublicService(false); notificationToSend.setBilling(billing); - Map properties = NotificationEventServiceDefault.notificationEventMap(notificationToSend); + Map properties = NotificationEventServiceDefault.notificationEventMap(notificationToSend, "topic"); assertNotNull(properties); assertEquals(properties.get("id"), "id"); assertEquals(properties.get("internalIstitutionID"), "internal"); @@ -261,7 +261,7 @@ void notificationEventMapRootParentTest() { billing.setTaxCodeInvoicing("456"); notificationToSend.setBilling(billing); - Map properties = NotificationEventServiceDefault.notificationEventMap(notificationToSend); + Map properties = NotificationEventServiceDefault.notificationEventMap(notificationToSend, "topic"); assertNotNull(properties); assertEquals(properties.get("id"), "id"); assertEquals(properties.get("internalIstitutionID"), "internal"); From 4995412bb0e2a54a7dba6eec8cd80f7138aa2709 Mon Sep 17 00:00:00 2001 From: Manuel Rafeli Date: Wed, 24 Jul 2024 16:37:03 +0200 Subject: [PATCH 2/3] chore: Move to Container App Env workload PROD (#423) --- .../container_apps/hub_spid_login/env/prod/terraform.tfvars | 2 ++ .../container_apps/onboarding-cdc/env/prod/terraform.tfvars | 2 ++ .../container_apps/onboarding-ms/env/prod/terraform.tfvars | 2 ++ .../onboarding-functions/env/prod/terraform.tfvars | 6 +++--- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/infra/container_apps/hub_spid_login/env/prod/terraform.tfvars b/infra/container_apps/hub_spid_login/env/prod/terraform.tfvars index bc37bfa9c..75f5e56ea 100644 --- a/infra/container_apps/hub_spid_login/env/prod/terraform.tfvars +++ b/infra/container_apps/hub_spid_login/env/prod/terraform.tfvars @@ -1,5 +1,7 @@ prefix = "selc" env_short = "p" +suffix_increment = "-002" +cae_name = "cae-002" tags = { CreatedBy = "Terraform" diff --git a/infra/container_apps/onboarding-cdc/env/prod/terraform.tfvars b/infra/container_apps/onboarding-cdc/env/prod/terraform.tfvars index fb423df9e..7d644a155 100644 --- a/infra/container_apps/onboarding-cdc/env/prod/terraform.tfvars +++ b/infra/container_apps/onboarding-cdc/env/prod/terraform.tfvars @@ -1,5 +1,7 @@ prefix = "selc" env_short = "p" +suffix_increment = "-002" +cae_name = "cae-002" tags = { CreatedBy = "Terraform" diff --git a/infra/container_apps/onboarding-ms/env/prod/terraform.tfvars b/infra/container_apps/onboarding-ms/env/prod/terraform.tfvars index f33e514e1..59cba00f3 100644 --- a/infra/container_apps/onboarding-ms/env/prod/terraform.tfvars +++ b/infra/container_apps/onboarding-ms/env/prod/terraform.tfvars @@ -1,5 +1,7 @@ prefix = "selc" env_short = "p" +suffix_increment = "-002" +cae_name = "cae-002" tags = { CreatedBy = "Terraform" diff --git a/infra/functions/onboarding-functions/env/prod/terraform.tfvars b/infra/functions/onboarding-functions/env/prod/terraform.tfvars index cd7913c50..9e0bd82ac 100644 --- a/infra/functions/onboarding-functions/env/prod/terraform.tfvars +++ b/infra/functions/onboarding-functions/env/prod/terraform.tfvars @@ -75,10 +75,10 @@ app_settings = { "MAIL_USER_CONFIRMATION_LINK" = "https://selfcare.pagopa.it/onboarding/confirm?add-user=true&jwt=", "MAIL_ONBOARDING_REJECTION_LINK" = "https://selfcare.pagopa.it/onboarding/cancel?jwt=", "MAIL_ONBOARDING_URL" = "https://selfcare.pagopa.it/onboarding/", - "MS_CORE_URL" = "https://selc-p-ms-core-ca.greensand-62fc96da.westeurope.azurecontainerapps.io", + "MS_CORE_URL" = "https://selc-p-ms-core-ca.lemonpond-bb0b750e.westeurope.azurecontainerapps.io", "JWT_BEARER_TOKEN" = "@Microsoft.KeyVault(SecretUri=https://selc-p-kv.vault.azure.net/secrets/jwt-bearer-token-functions/)", - "MS_USER_URL" = "https://selc-p-user-ms-ca.greensand-62fc96da.westeurope.azurecontainerapps.io", - "MS_PARTY_REGISTRY_URL" = "https://selc-p-party-reg-proxy-ca.greensand-62fc96da.westeurope.azurecontainerapps.io", + "MS_USER_URL" = "https://selc-p-user-ms-ca.lemonpond-bb0b750e.westeurope.azurecontainerapps.io", + "MS_PARTY_REGISTRY_URL" = "https://selc-p-party-reg-proxy-ca.lemonpond-bb0b750e.westeurope.azurecontainerapps.io", "USER_MS_SEND_MAIL" = "false", "EVENT_HUB_BASE_PATH" = "https://selc-p-eventhub-ns.servicebus.windows.net", "STANDARD_SHARED_ACCESS_KEY_NAME" = "selfcare-wo" From 3ffaeda9e1a4699f48642203be0bd796c285d358 Mon Sep 17 00:00:00 2001 From: pierpaolodidato89 <137791912+pierpaolodidato89@users.noreply.github.com> Date: Thu, 25 Jul 2024 17:49:30 +0200 Subject: [PATCH 3/3] chore: Set USER_MS_SEND_MAIL true in env PROD (#426) Co-authored-by: pierpaolo.didato@emeal.nttdata.com --- .../onboarding-functions/env/prod-pnpg/terraform.tfvars | 2 +- infra/functions/onboarding-functions/env/prod/terraform.tfvars | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/functions/onboarding-functions/env/prod-pnpg/terraform.tfvars b/infra/functions/onboarding-functions/env/prod-pnpg/terraform.tfvars index 0f5142dd5..e9381e496 100644 --- a/infra/functions/onboarding-functions/env/prod-pnpg/terraform.tfvars +++ b/infra/functions/onboarding-functions/env/prod-pnpg/terraform.tfvars @@ -104,7 +104,7 @@ app_settings = { "MAIL_USER_CONFIRMATION_LINK" = "https://imprese.notifichedigitali.it/onboarding/confirm?jwt=%s#add-user=true", "MAIL_ONBOARDING_REJECTION_LINK" = "https://imprese.notifichedigitali.it/onboarding/cancel?jwt=", "MAIL_ONBOARDING_URL" = "https://imprese.notifichedigitali.it/onboarding/", - "USER_MS_SEND_MAIL" = "false", + "USER_MS_SEND_MAIL" = "true", "FORCE_INSTITUTION_PERSIST" = "true", "EMAIL_SERVICE_AVAILABLE" = "true" "JWT_TOKEN_ISSUER" = "SPID" diff --git a/infra/functions/onboarding-functions/env/prod/terraform.tfvars b/infra/functions/onboarding-functions/env/prod/terraform.tfvars index 9e0bd82ac..ec2668201 100644 --- a/infra/functions/onboarding-functions/env/prod/terraform.tfvars +++ b/infra/functions/onboarding-functions/env/prod/terraform.tfvars @@ -79,7 +79,7 @@ app_settings = { "JWT_BEARER_TOKEN" = "@Microsoft.KeyVault(SecretUri=https://selc-p-kv.vault.azure.net/secrets/jwt-bearer-token-functions/)", "MS_USER_URL" = "https://selc-p-user-ms-ca.lemonpond-bb0b750e.westeurope.azurecontainerapps.io", "MS_PARTY_REGISTRY_URL" = "https://selc-p-party-reg-proxy-ca.lemonpond-bb0b750e.westeurope.azurecontainerapps.io", - "USER_MS_SEND_MAIL" = "false", + "USER_MS_SEND_MAIL" = "true", "EVENT_HUB_BASE_PATH" = "https://selc-p-eventhub-ns.servicebus.windows.net", "STANDARD_SHARED_ACCESS_KEY_NAME" = "selfcare-wo" "EVENTHUB_SC_CONTRACTS_SELFCARE_WO_KEY_LC" = "@Microsoft.KeyVault(SecretUri=https://selc-p-kv.vault.azure.net/secrets/eventhub-sc-contracts-selfcare-wo-key-lc/)"