Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Updates, bugfixes and new functionalities required after integration test #13

Merged
merged 22 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f205077
fix: updated mapping for cache and debt position
andrea-deri Apr 9, 2024
f54275f
fix: updated IUV Generation OpenAPI for SubKey inclusion
andrea-deri Apr 9, 2024
0a00666
[NOD_781] fix: explicitly set deserializer for OffsetDateTime
andrea-deri Apr 9, 2024
dd80b74
fix: changed API path from 'redirect' to 'payments'
andrea-deri Apr 9, 2024
877008c
break: migration of infrastructure resources in infra repo
andrea-deri Apr 9, 2024
162e93c
feat: added Helm chart configuration
andrea-deri Apr 9, 2024
049bae7
Bump to version 0.0.8-1-fixes-after-integration-test [skip ci]
pagopa-github-bot Apr 9, 2024
262dbfd
fix: updated Dockerfile, changind entrypoint reference
andrea-deri Apr 9, 2024
b04713a
Bump to version 0.0.8-2-fixes-after-integration-test [skip ci]
pagopa-github-bot Apr 9, 2024
c93fdd0
fix: change on cached key for APIM cache, defining it now as institut…
andrea-deri Apr 10, 2024
1f4d0b4
fix: resolved pending issues on request generation for checkout
andrea-deri Apr 10, 2024
ac8e385
Bump to version 0.0.8-3-fixes-after-integration-test [skip ci]
pagopa-github-bot Apr 10, 2024
60e1d9f
fix: replacede IUV Generator host URL
andrea-deri Apr 10, 2024
5fa3545
Bump to version 0.0.8-4-fixes-after-integration-test [skip ci]
pagopa-github-bot Apr 10, 2024
e6aeea0
fix: fixed missing ApiKey and wrong API calls flow
andrea-deri Apr 10, 2024
28cb524
Bump to version 0.0.8-5-fixes-after-integration-test [skip ci]
pagopa-github-bot Apr 10, 2024
68e5c93
fix: merged with main branch
andrea-deri Apr 10, 2024
cf7a094
Bump to version 0.0.8-6-fixes-after-integration-test [skip ci]
pagopa-github-bot Apr 11, 2024
1ab04c8
[NOD-817] feat: first working version of WISP dismantling tests
andrea-deri Apr 11, 2024
9cf396e
[NOD-817] feat: first working version of WISP dismantling tests
andrea-deri Apr 11, 2024
0a703cc
feat: new method for retrieve cached session id from Redis
andrea-deri Apr 11, 2024
0e9dfb9
Merge branch 'main' into fixes-after-integration-test
andrea-deri Apr 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ COPY --chown=spring:spring --from=builder application/ ./

EXPOSE 8080

ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.launch.JarLauncher"]
6 changes: 6 additions & 0 deletions helm/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: microservice-chart
repository: https://pagopa.github.io/aks-microservice-chart-blueprint
version: 3.0.0
digest: sha256:47c6b74ce3ca60c2d4eee8e65c65597e5f62fb420653fcaec310eaa51b472413
generated: "2024-04-09T17:12:54.285532+02:00"
2 changes: 1 addition & 1 deletion helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: pagopa-wisp-converter
description: A service that permits to handle nodoInviaRPT and nodoInviaCarrelloRPT request from WISP, interfacing them with GPD system
type: application
version: 0.10.0
version: 0.15.0
appVersion: 0.0.9
dependencies:
- name: microservice-chart
Expand Down
22 changes: 20 additions & 2 deletions helm/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,40 @@ microservice-chart:
APP_LOGGING_LEVEL: 'DEBUG'
DEFAULT_LOGGING_LEVEL: 'INFO'
CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
REDIS_HOST: "pagopa-d-redis.redis.cache.windows.net"
REDIS_PORT: "6380"
OTEL_SERVICE_NAME: "pagopa-wisp-converter"
OTEL_RESOURCE_ATTRIBUTES: "service.environment=dev"
OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
OTEL_TRACES_EXPORTER: otlp
OTEL_METRICS_EXPORTER: otlp
OTEL_LOGS_EXPORTER: none
OTEL_TRACES_SAMPLER: "always_on"
REDIS_HOST: "pagopa-d-redis.redis.cache.windows.net"
REDIS_PORT: "6380"
COSMOS_URI: "https://pagopa-d-weu-nodo-wispconv-cosmos-account.documents.azure.com:443/"
CACHED_REQUESTID_MAPPING_TTL_MINUTES: "1440"
CACHE_REFRESH_CRON: "0 */60 * * * *"
CLIENT_GPD_READ_TIMEOUT: '5000'
CLIENT_IUVGENERATOR_READ_TIMEOUT: '5000'
CLIENT_CHECKOUT_READ_TIMEOUT: '5000'
CLIENT_DECOUPLERCACHING_READ_TIMEOUT: '5000'
CLIENT_CACHE_READ_TIMEOUT: '5000'
CLIENT_GPD_HOST: 'https://api.dev.platform.pagopa.it/gpd/api/v1'
CLIENT_IUVGENERATOR_HOST: 'https://api.dev.platform.pagopa.it/shared/pagopa-iuvgenerator/v1'
CLIENT_CHECKOUT_HOST: 'https://api.dev.platform.pagopa.it/checkout/ec/v1/'
CLIENT_DECOUPLERCACHING_HOST: 'https://api.dev.platform.pagopa.it/wisp-converter/caching/api/v1'
CLIENT_CACHE_HOST: 'https://api.dev.platform.pagopa.it/api-config-cache/o/v1'
secretProvider:
create: true
envSecrets:
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-d-connection-string'
OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
REDIS_PASSWORD: 'redis-primary-key'
COSMOS_KEY: 'cosmosdb-wisp-converter-account-key'
CLIENT_GPD_SUBKEY: 'gpd-pagopa-v1-subscription-key'
CLIENT_IUVGENERATOR_SUBKEY: 'iuv-generator-subscription-key'
CLIENT_DECOUPLERCACHING_SUBKEY: 'wisp-converter-caching-subscription-key'
CLIENT_CACHE_SUBKEY: 'api-config-cache-subscription-key-string'
keyvault:
name: "pagopa-d-nodo-kv"
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
Expand Down
20 changes: 20 additions & 0 deletions helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,33 @@ microservice-chart:
OTEL_METRICS_EXPORTER: otlp
OTEL_LOGS_EXPORTER: none
OTEL_TRACES_SAMPLER: "always_on"
REDIS_HOST: "pagopa-p-redis.redis.cache.windows.net"
REDIS_PORT: "6380"
COSMOS_URI: "https://pagopa-p-weu-nodo-wispconv-cosmos-account.documents.azure.com:443/"
CACHED_REQUESTID_MAPPING_TTL_MINUTES: "1440"
CACHE_REFRESH_CRON: "0 */60 * * * *"
CLIENT_GPD_READ_TIMEOUT: '5000'
CLIENT_IUVGENERATOR_READ_TIMEOUT: '5000'
CLIENT_CHECKOUT_READ_TIMEOUT: '5000'
CLIENT_DECOUPLERCACHING_READ_TIMEOUT: '5000'
CLIENT_CACHE_READ_TIMEOUT: '5000'
CLIENT_GPD_HOST: 'https://api.platform.pagopa.it/gpd/api/v1'
CLIENT_IUVGENERATOR_HOST: 'https://api.platform.pagopa.it/shared/pagopa-iuvgenerator/v1'
CLIENT_CHECKOUT_HOST: 'https://api.platform.pagopa.it/checkout/ec/v1/'
CLIENT_DECOUPLERCACHING_HOST: 'https://api.platform.pagopa.it/wisp-converter/caching/api/v1'
CLIENT_CACHE_HOST: 'https://api.platform.pagopa.it/api-config-cache/o/v1'
secretProvider:
create: true
envSecrets:
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-p-connection-string'
OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
REDIS_PASSWORD: 'redis-primary-key'
COSMOS_KEY: 'cosmosdb-wisp-converter-account-key'
CLIENT_GPD_SUBKEY: 'gpd-pagopa-v1-subscription-key'
CLIENT_IUVGENERATOR_SUBKEY: 'iuv-generator-subscription-key'
CLIENT_DECOUPLERCACHING_SUBKEY: 'wisp-converter-caching-subscription-key'
CLIENT_CACHE_SUBKEY: 'api-config-cache-subscription-key-string'
keyvault:
name: "pagopa-p-nodo-kv"
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
Expand Down
22 changes: 20 additions & 2 deletions helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,40 @@ microservice-chart:
APP_LOGGING_LEVEL: 'INFO'
DEFAULT_LOGGING_LEVEL: 'INFO'
CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
REDIS_HOST: "pagopa-u-redis.redis.cache.windows.net"
REDIS_PORT: "6380"
OTEL_SERVICE_NAME: "pagopa-wisp-converter"
OTEL_RESOURCE_ATTRIBUTES: "service.environment=uat"
OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
OTEL_TRACES_EXPORTER: otlp
OTEL_METRICS_EXPORTER: otlp
OTEL_LOGS_EXPORTER: none
OTEL_TRACES_SAMPLER: "always_on"
REDIS_HOST: "pagopa-u-redis.redis.cache.windows.net"
REDIS_PORT: "6380"
COSMOS_URI: "https://pagopa-u-weu-nodo-wispconv-cosmos-account.documents.azure.com:443/"
CACHED_REQUESTID_MAPPING_TTL_MINUTES: "1440"
CACHE_REFRESH_CRON: "0 */60 * * * *"
CLIENT_GPD_READ_TIMEOUT: '5000'
CLIENT_IUVGENERATOR_READ_TIMEOUT: '5000'
CLIENT_CHECKOUT_READ_TIMEOUT: '5000'
CLIENT_DECOUPLERCACHING_READ_TIMEOUT: '5000'
CLIENT_CACHE_READ_TIMEOUT: '5000'
CLIENT_GPD_HOST: 'https://api.uat.platform.pagopa.it/gpd/api/v1'
CLIENT_IUVGENERATOR_HOST: 'https://api.uat.platform.pagopa.it/shared/pagopa-iuvgenerator/v1'
CLIENT_CHECKOUT_HOST: 'https://api.uat.platform.pagopa.it/checkout/ec/v1/'
CLIENT_DECOUPLERCACHING_HOST: 'https://api.uat.platform.pagopa.it/wisp-converter/caching/api/v1'
CLIENT_CACHE_HOST: 'https://api.uat.platform.pagopa.it/api-config-cache/o/v1'
secretProvider:
create: true
envSecrets:
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-u-connection-string'
OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
REDIS_PASSWORD: 'redis-primary-key'
COSMOS_KEY: 'cosmosdb-wisp-converter-account-key'
CLIENT_GPD_SUBKEY: 'gpd-pagopa-v1-subscription-key'
CLIENT_IUVGENERATOR_SUBKEY: 'iuv-generator-subscription-key'
CLIENT_DECOUPLERCACHING_SUBKEY: 'wisp-converter-caching-subscription-key'
CLIENT_CACHE_SUBKEY: 'api-config-cache-subscription-key-string'
keyvault:
name: "pagopa-u-nodo-kv"
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
Expand Down
62 changes: 0 additions & 62 deletions infra/.terraform.lock.hcl

This file was deleted.

54 changes: 0 additions & 54 deletions infra/04_apim_api.tf

This file was deleted.

10 changes: 0 additions & 10 deletions infra/99_locals.tf

This file was deleted.

28 changes: 0 additions & 28 deletions infra/99_main.tf

This file was deleted.

72 changes: 0 additions & 72 deletions infra/99_variables.tf

This file was deleted.

1 change: 0 additions & 1 deletion infra/env/weu-dev/backend.ini

This file was deleted.

4 changes: 0 additions & 4 deletions infra/env/weu-dev/backend.tfvars

This file was deleted.

Loading
Loading