Fix schedule env vars

README.md

@@ -79,36 +79,38 @@ On terminal type:
 then replace env variables with correct values
 (if there is NO default value, the variable HAS to be defined)
 
-| VARIABLE | USAGE | DEFAULT VALUE |
-|---------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|:------------------------------------------------------:|
-| `RECEIPTS_STORAGE_CONN_STRING` | Connection string to the Receipt Queue | |
-| `RECEIPT_QUEUE_TOPIC` | Topic name of the Receipt Queue | |
-| `COSMOS_BIZ_EVENT_CONN_STRING` | Connection string to the BizEvent CosmosDB | |
-| `COSMOS_BIZ_EVENT_SERVICE_ENDPOINT` | Endpoint to the BizEvent CosmosDB | |
-| `COSMOS_BIZ_EVENT_DB_NAME` | Database name of the BizEvent database in CosmosDB | |
-| `COSMOS_BIZ_EVENT_CONTAINER_NAME` | Container name of the BizEvent container in CosmosDB | |
-| `COSMOS_RECEIPTS_CONN_STRING` | Connection string to the Receipt CosmosDB | |
-| `COSMOS_RECEIPT_SERVICE_ENDPOINT` | Endpoint to the Receipt CosmosDB | |
-| `COSMOS_RECEIPT_KEY` | Key to the Receipt CosmosDB | |
-| `COSMOS_RECEIPT_DB_NAME` | Database name of the Receipt database in CosmosDB | |
-| `COSMOS_RECEIPT_CONTAINER_NAME` | Container name of the Receipt container in CosmosDB | |
-| `COSMOS_RECEIPT_ERROR_CONTAINER_NAME` | Container name of the Receipt-message-error container in CosmosDB | |
-| `BLOB_STORAGE_ACCOUNT_ENDPOINT` | Endpoint to the Receipt Blob Storage | |
-| `BLOB_STORAGE_CONTAINER_NAME` | Container name of the Blob Storage containing the pdf attachments | |
-| `BLOB_STORAGE_DOWNLOAD_TIMEOUT` | Timeout for the call to retrieve the attachment from the blob storage | 10 |
-| `BLOB_STORAGE_DOWNLOAD_MAX_RETRY` | Max number of retry for the call to retrieve the attachment from the blob storage | 5 |
-| `PDV_TOKENIZER_BASE_PATH` | PDV Tokenizer API base path | "https://api.uat.tokenizer.pdv.pagopa.it/tokenizer/v1" |
-| `PDV_TOKENIZER_SEARCH_TOKEN_ENDPOINT` | PDV Tokenizer API search token endpoint | "/tokens/search" |
-| `PDV_TOKENIZER_FIND_PII_ENDPOINT` | PDV Tokenizer API find pii endpoint | "/tokens/%s/pii" |
-| `PDV_TOKENIZER_CREATE_TOKEN_ENDPOINT` | PDV Tokenizer API create token endpoint | "/tokens" |
-| `PDV_TOKENIZER_SUBSCRIPTION_KEY` | API azure ocp apim subscription key | |
-| `PDV_TOKENIZER_INITIAL_INTERVAL` | PDV Tokenizer initial interval for retry a request that fail with 429 status code | 200 |
-| `PDV_TOKENIZER_MULTIPLIER` | PDV Tokenizer interval multiplier for subsequent request retry | 2.0 |
-| `PDV_TOKENIZER_RANDOMIZATION_FACTOR` | PDV Tokenizer randomization factor for interval retry calculation | 0.6 |
-| `PDV_TOKENIZER_MAX_RETRIES` | PDV Tokenizer max request retry | 3 |
-| `TOKENIZER_APIM_HEADER_KEY` | Tokenizer APIM header key | x-api-key |
-| `MAX_DATE_DIFF_MILLIS` | Difference in millis between the current time and the date from witch the<br/> receipts will be fetched in massive recover operation | 360000 |
-| `RECOVER_FAILED_CRON` | CRON expression for timer trigger function that recover failed receipt | |
+| VARIABLE | USAGE | DEFAULT VALUE |
+|---------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|:------------------------------------------------------:|
+| `RECEIPTS_STORAGE_CONN_STRING` | Connection string to the Receipt Queue | |
+| `RECEIPT_QUEUE_TOPIC` | Topic name of the Receipt Queue | |
+| `COSMOS_BIZ_EVENT_CONN_STRING` | Connection string to the BizEvent CosmosDB | |
+| `COSMOS_BIZ_EVENT_SERVICE_ENDPOINT` | Endpoint to the BizEvent CosmosDB | |
+| `COSMOS_BIZ_EVENT_DB_NAME` | Database name of the BizEvent database in CosmosDB | |
+| `COSMOS_BIZ_EVENT_CONTAINER_NAME` | Container name of the BizEvent container in CosmosDB | |
+| `COSMOS_RECEIPTS_CONN_STRING` | Connection string to the Receipt CosmosDB | |
+| `COSMOS_RECEIPT_SERVICE_ENDPOINT` | Endpoint to the Receipt CosmosDB | |
+| `COSMOS_RECEIPT_KEY` | Key to the Receipt CosmosDB | |
+| `COSMOS_RECEIPT_DB_NAME` | Database name of the Receipt database in CosmosDB | |
+| `COSMOS_RECEIPT_CONTAINER_NAME` | Container name of the Receipt container in CosmosDB | |
+| `COSMOS_RECEIPT_ERROR_CONTAINER_NAME` | Container name of the Receipt-message-error container in CosmosDB | |
+| `BLOB_STORAGE_ACCOUNT_ENDPOINT` | Endpoint to the Receipt Blob Storage | |
+| `BLOB_STORAGE_CONTAINER_NAME` | Container name of the Blob Storage containing the pdf attachments | |
+| `BLOB_STORAGE_DOWNLOAD_TIMEOUT` | Timeout for the call to retrieve the attachment from the blob storage | 10 |
+| `BLOB_STORAGE_DOWNLOAD_MAX_RETRY` | Max number of retry for the call to retrieve the attachment from the blob storage | 5 |
+| `PDV_TOKENIZER_BASE_PATH` | PDV Tokenizer API base path | "https://api.uat.tokenizer.pdv.pagopa.it/tokenizer/v1" |
+| `PDV_TOKENIZER_SEARCH_TOKEN_ENDPOINT` | PDV Tokenizer API search token endpoint | "/tokens/search" |
+| `PDV_TOKENIZER_FIND_PII_ENDPOINT` | PDV Tokenizer API find pii endpoint | "/tokens/%s/pii" |
+| `PDV_TOKENIZER_CREATE_TOKEN_ENDPOINT` | PDV Tokenizer API create token endpoint | "/tokens" |
+| `PDV_TOKENIZER_SUBSCRIPTION_KEY` | API azure ocp apim subscription key | |
+| `PDV_TOKENIZER_INITIAL_INTERVAL` | PDV Tokenizer initial interval for retry a request that fail with 429 status code | 200 |
+| `PDV_TOKENIZER_MULTIPLIER` | PDV Tokenizer interval multiplier for subsequent request retry | 2.0 |
+| `PDV_TOKENIZER_RANDOMIZATION_FACTOR` | PDV Tokenizer randomization factor for interval retry calculation | 0.6 |
+| `PDV_TOKENIZER_MAX_RETRIES` | PDV Tokenizer max request retry | 3 |
+| `TOKENIZER_APIM_HEADER_KEY` | Tokenizer APIM header key | x-api-key |
+| `MAX_DATE_DIFF_MILLIS` | Difference in millis between the current time and the date from witch the<br/> receipts will be fetched in massive recover operation | 360000 |
+| `MAX_DATE_DIFF_NOTIFY_MILLIS` | Difference in millis between the current time and the date from witch the<br/> receipts to notify will be fetched in massive recover operation | 360000 |
+| `RECOVER_FAILED_CRON` | CRON expression for timer trigger function that recover failed receipt | |
+| `TRIGGER_GEN_SCHEDULE` | CRON expression for timer trigger function that recover nor notified generater receipt | |
 
 > to doc details about AZ fn config
 > see [here](https://stackoverflow.com/questions/62669672/azure-functions-what-is-the-purpose-of-having-host-json-and-local-settings-jso)

helm/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopareceiptpdfhelpdesk
 description: Microservice description
 type: application
-version: 0.105.0
-appVersion: 0.6.4
+version: 0.119.0
+appVersion: 0.6.18-fix-schedule-env-vars
 dependencies:
  - name: microservice-chart
  version: 2.4.0

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
  fullnameOverride: ""
  image:
  repository: ghcr.io/pagopa/pagopa-receipt-pdf-helpdesk
- tag: "0.6.4"
+ tag: "0.6.18-fix-schedule-env-vars"
  pullPolicy: Always
  # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
  livenessProbe:
@@ -57,8 +57,8 @@ microservice-chart:
  memory: "768Mi"
  cpu: "300m"
  limits:
- memory: "768Mi"
- cpu: "400m"
+ memory: "1512Mi"
+ cpu: "700m"
  autoscaling:
  enable: true
  minReplica: 1
@@ -109,23 +109,30 @@ microservice-chart:
  OTEL_TRACES_SAMPLER: "always_on"
  MAX_DATE_DIFF_MILLIS: "360000"
  MAX_DATE_DIFF_NOTIFY_MILLIS: "360000"
- TRIGGER_NOTIFY_REC_SCHEDULE: "0 0 */6 * * *"
- RECOVER_FAILED_CRON: "0 0 /12 * * *"
+ TRIGGER_GEN_SCHEDULE: "0 0 */6 * * *"
+ RECOVER_FAILED_CRON: "0 0 */12 * * *"
  AZURE_FUNCTIONS_MESH_JAVA_OPTS: "-javaagent:/home/site/wwwroot/jmx_prometheus_javaagent-0.19.0.jar=12345:/home/site/wwwroot/config.yaml -javaagent:/home/site/wwwroot/opentelemetry-javaagent.jar -Xmx768m -XX:+UseG1GC"
  FAILED_AUTORECOVER_ENABLED: "true"
  NOT_NOTIFIED_AUTORECOVER_ENABLED: "true"
+ envConfigMapExternals:
+ template-maps:
+ BRAND_LOGO_MAP: brand-logo-map
  envFieldRef:
  APP_NAME: "metadata.labels['app.kubernetes.io/instance']"
  APP_VERSION: "metadata.labels['app.kubernetes.io/version']"
  envSecret:
  APPLICATIONINSIGHTS_CONNECTION_STRING: "ai-d-connection-string"
  COSMOS_RECEIPTS_CONN_STRING: "cosmos-receipt-connection-string"
  RECEIPTS_STORAGE_CONN_STRING: "receipts-storage-account-connection-string"
+ AzureWebJobsStorage: "receipts-storage-account-connection-string"
  COSMOS_BIZ_EVENT_CONN_STRING: "cosmos-biz-event-d-connection-string"
  COSMOS_RECEIPT_KEY: "cosmos-receipt-pkey"
  COSMOS_BIZ_EVENT_KEY: "cosmos-bizevent-pkey"
  OTEL_EXPORTER_OTLP_HEADERS: 'elastic-otl-secret-token'
  PDV_TOKENIZER_SUBSCRIPTION_KEY: "tokenizer-api-key"
+ OCP_APIM_SUBSCRIPTION_KEY: "shared-apim-d-subscription-key"
+ AES_SECRET_KEY: "aes-secret-key"
+ AES_SALT: "aes-salt"
  keyvault:
  name: "pagopa-d-receipts-kv"
  tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"

helm/values-prod.yaml

@@ -4,7 +4,7 @@ microservice-chart:
  fullnameOverride: ""
  image:
  repository: ghcr.io/pagopa/pagopa-receipt-pdf-helpdesk
- tag: "0.6.4"
+ tag: "0.6.18-fix-schedule-env-vars"
  pullPolicy: Always
  # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
  livenessProbe:
@@ -109,23 +109,30 @@ microservice-chart:
  OTEL_TRACES_SAMPLER: "always_on"
  MAX_DATE_DIFF_MILLIS: "360000"
  MAX_DATE_DIFF_NOTIFY_MILLIS: "360000"
- TRIGGER_NOTIFY_REC_SCHEDULE: "0 0 */6 * * *"
- RECOVER_FAILED_CRON: "0 0 /12 * * *"
+ TRIGGER_GEN_SCHEDULE: "0 0 */6 * * *"
+ RECOVER_FAILED_CRON: "0 0 */12 * * *"
  AZURE_FUNCTIONS_MESH_JAVA_OPTS: "-javaagent:/home/site/wwwroot/jmx_prometheus_javaagent-0.19.0.jar=12345:/home/site/wwwroot/config.yaml -javaagent:/home/site/wwwroot/opentelemetry-javaagent.jar -Xmx768m -XX:+UseG1GC"
  FAILED_AUTORECOVER_ENABLED: "false"
  NOT_NOTIFIED_AUTORECOVER_ENABLED: "false"
+ envConfigMapExternals:
+ template-maps:
+ BRAND_LOGO_MAP: brand-logo-map
  envFieldRef:
  APP_NAME: "metadata.labels['app.kubernetes.io/instance']"
  APP_VERSION: "metadata.labels['app.kubernetes.io/version']"
  envSecret:
  APPLICATIONINSIGHTS_CONNECTION_STRING: "ai-p-connection-string"
  COSMOS_RECEIPTS_CONN_STRING: "cosmos-receipt-connection-string"
  RECEIPTS_STORAGE_CONN_STRING: "receipts-storage-account-connection-string"
+ AzureWebJobsStorage: "receipts-storage-account-connection-string"
+ OCP_APIM_SUBSCRIPTION_KEY: "shared-apim-p-subscription-key"
  COSMOS_BIZ_EVENT_CONN_STRING: "cosmos-biz-event-p-connection-string"
  COSMOS_RECEIPT_KEY: "cosmos-receipt-pkey"
  COSMOS_BIZ_EVENT_KEY: "cosmos-bizevent-pkey"
  OTEL_EXPORTER_OTLP_HEADERS: "elastic-otl-secret-token"
  PDV_TOKENIZER_SUBSCRIPTION_KEY: "tokenizer-api-key"
+ AES_SECRET_KEY: "aes-secret-key"
+ AES_SALT: "aes-salt"
  keyvault:
  name: "pagopa-p-receipts-kv"
  tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"