Merge pull request #293 from pagopa/PAGOPA-1677-sviluppo-adeguamento-…

…schema-xsd-dei-cdi PAGOPA-1677 changing sanp pointers
pagopa · Apr 18, 2024 · 31cce95 · 31cce95
2 parents 8010213 + 5790b3a
commit 31cce95
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: core
 description: APIs to manage configuration for CI and PSP of pagoPA
 type: application
-version: 0.135.0
-appVersion: 0.58.15
+version: 0.136.0
+appVersion: 0.58.15-1-PAGOPA-1677-sviluppo-adeguamento-schema-xsd-dei-cdi
 dependencies:
   - name: microservice-chart
     version: 2.8.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -27,7 +27,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.58.15"
+    tag: "0.58.15-1-PAGOPA-1677-sviluppo-adeguamento-schema-xsd-dei-cdi"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -88,9 +88,9 @@ microservice-chart: &microservice-chart
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
     COSMOS_URI: 'https://pagopa-d-weu-afm-marketplace-cosmos-account.documents.azure.com:443/'
     APP_LOGGING_LEVEL: "INFO"
-    XSD_ICA: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/InformativaContoAccredito_1_2_1.xsd'
-    XSD_COUNTERPART: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/TabellaDelleControparti_1_0_8.xsd'
-    XSD_CDI: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/CatalogoDatiInformativiPSP.xsd'
+    XSD_ICA: 'https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/InformativaContoAccredito_1_2_1.xsd'
+    XSD_COUNTERPART: 'https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/TabellaDelleControparti_1_0_8.xsd'
+    XSD_CDI: 'https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/CatalogoDatiInformativiPSP.xsd'
     SYNC_CDI: "true"
     NODO_MONITORING_HOST: 'https://api.dev.platform.pagopa.it/nodo-monitoring/monitoring/v1'
     NODO_MONITORING_REFRESH: "true"

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -27,7 +27,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.58.15"
+    tag: "0.58.15-1-PAGOPA-1677-sviluppo-adeguamento-schema-xsd-dei-cdi"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -88,9 +88,9 @@ microservice-chart: &microservice-chart
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
     COSMOS_URI: 'https://pagopa-p-weu-afm-marketplace-cosmos-account.documents.azure.com:443/'
     APP_LOGGING_LEVEL: "INFO"
-    XSD_ICA: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/InformativaContoAccredito_1_2_1.xsd'
-    XSD_COUNTERPART: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/TabellaDelleControparti_1_0_8.xsd'
-    XSD_CDI: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/CatalogoDatiInformativiPSP.xsd'
+    XSD_ICA: 'https://raw.githubusercontent.com/pagopa/pagopa-api/master/xsd-common/InformativaContoAccredito_1_2_1.xsd'
+    XSD_COUNTERPART: 'https://raw.githubusercontent.com/pagopa/pagopa-api/master/xsd-common/TabellaDelleControparti_1_0_8.xsd'
+    XSD_CDI: 'https://raw.githubusercontent.com/pagopa/pagopa-api/master/xsd-common/CatalogoDatiInformativiPSP.xsd'
     NODO_MONITORING_HOST: 'https://api.platform.pagopa.it/nodo-monitoring/monitoring/v1'
     NODO_MONITORING_REFRESH: "true"
     AFM_UTILS_RETRY_MAX_ATTEMPTS: "1"

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -27,7 +27,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.58.15"
+    tag: "0.58.15-1-PAGOPA-1677-sviluppo-adeguamento-schema-xsd-dei-cdi"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -88,9 +88,9 @@ microservice-chart: &microservice-chart
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
     COSMOS_URI: 'https://pagopa-u-weu-afm-marketplace-cosmos-account.documents.azure.com:443/'
     APP_LOGGING_LEVEL: "INFO"
-    XSD_ICA: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/InformativaContoAccredito_1_2_1.xsd'
-    XSD_COUNTERPART: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/TabellaDelleControparti_1_0_8.xsd'
-    XSD_CDI: 'https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/CatalogoDatiInformativiPSP.xsd'
+    XSD_ICA: 'https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/InformativaContoAccredito_1_2_1.xsd'
+    XSD_COUNTERPART: 'https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/TabellaDelleControparti_1_0_8.xsd'
+    XSD_CDI: 'https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/CatalogoDatiInformativiPSP.xsd'
     NODO_MONITORING_HOST: 'https://api.uat.platform.pagopa.it/nodo-monitoring/monitoring/v1'
     NODO_MONITORING_REFRESH: "true"
     AFM_UTILS_RETRY_MAX_ATTEMPTS: "1"

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "title": "core",
     "description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.58.15"
+    "version": "0.58.15-1-PAGOPA-1677-sviluppo-adeguamento-schema-xsd-dei-cdi"
   },
   "servers": [
     {

diff --git a/openapi/swagger.json b/openapi/swagger.json
@@ -4,7 +4,7 @@
     "description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti",
     "termsOfService": "https://www.pagopa.gov.it/",
     "title": "core",
-    "version": "0.58.15"
+    "version": "0.58.15-1-PAGOPA-1677-sviluppo-adeguamento-schema-xsd-dei-cdi"
   },
   "host": "localhost:8080",
   "basePath": "/",

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>it.gov.pagopa.apiconfig</groupId>
   <artifactId>core</artifactId>
-  <version>0.58.15</version>
+  <version>0.58.15-1-PAGOPA-1677-sviluppo-adeguamento-schema-xsd-dei-cdi</version>
   <description>Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti</description>
 
   <properties>

diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
@@ -27,9 +27,9 @@ spring.datasource.hikari.connection-timeout=30000
 cors.configuration={"origins": ["*"], "methods": ["*"]}
 
 # XSD configuration
-xsd.ica=https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/InformativaContoAccredito_1_2_1.xsd
-xsd.counterpart=https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/TabellaDelleContropartiEstesa_1_2_0.xsd
-xsd.cdi=https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.3.0/xsd/CatalogoDatiInformativiPSP.xsd
+xsd.ica=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/InformativaContoAccredito_1_2_1.xsd
+xsd.counterpart=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/TabellaDelleContropartiEstesa_1_2_0.xsd
+xsd.cdi=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/CatalogoDatiInformativiPSP.xsd
 
 # Zip file constraint
 zip.entries=10

diff --git a/src/main/resources/application-pg-local.properties b/src/main/resources/application-pg-local.properties
@@ -27,9 +27,9 @@ spring.datasource.hikari.connection-timeout=5000
 cors.configuration={"origins": ["*"], "methods": ["*"]}
 
 # XSD configuration
-xsd.ica=https://raw.githubusercontent.com/pagopa/pagopa-api/master/general/InformativaContoAccredito_1_2_1.xsd
-xsd.counterpart=https://raw.githubusercontent.com/pagopa/pagopa-api/master/general/TabellaDelleControparti_1_0_8.xsd
-xsd.cdi=https://raw.githubusercontent.com/pagopa/pagopa-api/master/general/CatalogoDatiInformativiPSP.xsd
+xsd.ica=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/InformativaContoAccredito_1_2_1.xsd
+xsd.counterpart=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/TabellaDelleControparti_1_0_8.xsd
+xsd.cdi=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/CatalogoDatiInformativiPSP.xsd
 
 # Actuator
 management.endpoints.web.exposure.include=health,info

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
@@ -29,9 +29,9 @@ spring.jpa.hibernate.ddl-auto=create
 cors.configuration={"origins": ["*"], "methods": ["*"]}
 
 # XSD configuration
-xsd.ica=https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.2.0/xsd/InformativaContoAccredito_1_2_1.xsd
-xsd.counterpart=https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.2.0/xsd/TabellaDelleControparti_1_0_8.xsd
-xsd.cdi=https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.2.0/xsd/CatalogoDatiInformativiPSP.xsd
+xsd.ica=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/InformativaContoAccredito_1_2_1.xsd
+xsd.counterpart=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/TabellaDelleControparti_1_0_8.xsd
+xsd.cdi=https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/CatalogoDatiInformativiPSP.xsd
 sync.cdi=true
 
 # Zip file constraint

diff --git a/src/test/resources/response/ica_not_valid_xml.json b/src/test/resources/response/ica_not_valid_xml.json
@@ -1,5 +1,5 @@
 {
   "xsdCompliant": false,
-  "xsdSchema": "https://raw.githubusercontent.com/pagopa/pagopa-api/master/general/InformativaContoAccredito_1_2_1.xsd",
+  "xsdSchema": "https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/InformativaContoAccredito_1_2_1.xsd",
   "detail": "Invalid content was found starting with element 'idBancaSeller'. One of '{ibanAccredito}' is expected. Error at lineNumber: 10"
 }
diff --git a/src/test/resources/response/ica_valid_xml.json b/src/test/resources/response/ica_valid_xml.json
@@ -1,5 +1,5 @@
 {
   "xsdCompliant": true,
-  "xsdSchema": "https://raw.githubusercontent.com/pagopa/pagopa-api/SANP3.2.0/xsd/InformativaContoAccredito_1_2_1.xsd",
+  "xsdSchema": "https://raw.githubusercontent.com/pagopa/pagopa-api/develop/xsd-common/InformativaContoAccredito_1_2_1.xsd",
   "detail": "XML is valid against the XSD schema."
 }