Skip to content

Commit 74ee871

Browse files
cap-angcap-ang
authored
Merge branch 'main' into PAGOPA-3466-gpd-creazione-database-di-storico
2 parents 001d305 + 03e8d9d commit 74ee871

24 files changed

+3887
-22
lines changed

‎src/core/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@
190190
| [azurerm_dns_txt_record.dns-txt-email-platform-pagopa-it-aws-ses](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/dns_txt_record) | resource |
191191
| [azurerm_dns_txt_record.dns-txt-ndp-platform-pagopa-it-aws-ses](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/dns_txt_record) | resource |
192192
| [azurerm_dns_txt_record.dns-txt-ndp-platform-pagopa-it-aws-ses-txt](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/dns_txt_record) | resource |
193+
| [azurerm_dns_txt_record.dns-txt-nexi-ndp-pagopa-it-digicert](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/dns_txt_record) | resource |
193194
| [azurerm_dns_txt_record.dns-txt-platform-pagopa-it-aws-ses](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/dns_txt_record) | resource |
195+
| [azurerm_dns_txt_record.dns-txt-test-nexi-ndp-pagopa-it-digicert](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/dns_txt_record) | resource |
194196
| [azurerm_dns_zone.ndp_public](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/dns_zone) | resource |
195197
| [azurerm_private_dns_zone.privatelink_postgres_database_azure_com](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/private_dns_zone) | resource |
196198
| [azurerm_private_dns_zone_virtual_network_link.privatelink_postgres_database_azure_com_vnet](https://registry.terraform.io/providers/hashicorp/azurerm/2.99.0/docs/resources/private_dns_zone_virtual_network_link) | resource |

‎src/core/dns_ndp.tf‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,34 @@ resource "azurerm_dns_caa_record" "ndp_pagopa_it" {
5050
tags = module.tag_config.tags
5151
}
5252

53+
# ⚠️TMP DIGICERT requires test.nexi records for validation, even if they have the same value
54+
# https://pagopa.atlassian.net/wiki/pages/resumedraft.action?draftId=2645983363
5355

56+
# Test Nexi NDP DCV TXT record
57+
resource "azurerm_dns_txt_record" "dns-txt-test-nexi-ndp-pagopa-it-digicert" {
58+
count = var.env_short == "p" ? 1 : 0
59+
name = "test.nexi"
60+
zone_name = azurerm_dns_zone.ndp_public[0].name
61+
resource_group_name = data.azurerm_resource_group.rg_vnet.name
62+
ttl = var.dns_default_ttl_sec
63+
record {
64+
value = "_gprcfymgzgntd1nozqzmjueoop4o8uf"
65+
}
66+
tags = module.tag_config.tags
67+
}
68+
69+
# ⚠️TMP DIGICERT requires nexi records for validation, even if they have the same value
70+
# https://pagopa.atlassian.net/wiki/pages/resumedraft.action?draftId=2645983363
71+
72+
# Nexi NDP DCV TXT record
73+
resource "azurerm_dns_txt_record" "dns-txt-nexi-ndp-pagopa-it-digicert" {
74+
count = var.env_short == "p" ? 1 : 0
75+
name = "nexi"
76+
zone_name = azurerm_dns_zone.ndp_public[0].name
77+
resource_group_name = data.azurerm_resource_group.rg_vnet.name
78+
ttl = var.dns_default_ttl_sec
79+
record {
80+
value = "_85zs32tukf9ctv0bv72qgbzdc2b8tlw"
81+
}
82+
tags = module.tag_config.tags
83+
}

‎src/domains/observability/04_datafactory_pipeline_smo.tf‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -825,16 +825,30 @@ resource "azurerm_data_factory_pipeline" "pipeline_SMO_IMPORT_ANAGRAFICA" {
825825
name = "SMO_IMPORT_ANAGRAFICA_Pipeline"
826826
data_factory_id = data.azurerm_data_factory.qi_data_factory.id
827827

828+
variables = {
829+
run_id = "",
830+
start_date = ""
831+
}
832+
833+
828834
activities_json = "[${templatefile("datafactory/pipelines/IMPORT_ANAGRAFICA.json", {
829-
inputdataset_PT_PA = "CFG_INTERMEDIARI_PA"
830-
outputdataset_PT_PA = "SMO_INTERMEDIARI_PA_DataSet"
831-
inputdataset_PT_PSP = "CFG_INTERMEDIARI_PSP"
832-
outputdataset_PT_PSP = "SMO_INTERMEDIARI_PSP_DataSet"
833-
inputdataset_PA = "CFG_PA"
834-
outputdataset_PA = "SMO_PA_DataSet"
835-
inputdataset_PSP = "CFG_PSP"
836-
outputdataset_PSP = "SMO_PSP_DataSet"
837-
dataexplorerset = "AzureDataExplorer${var.env_short}LinkService"
835+
inputdataset_PT_PA = "CFG_INTERMEDIARI_PA"
836+
outputdataset_PT_PA = "SMO_INTERMEDIARI_PA_DataSet"
837+
inputdataset_PT_PSP = "CFG_INTERMEDIARI_PSP"
838+
outputdataset_PT_PSP = "SMO_INTERMEDIARI_PSP_DataSet"
839+
inputdataset_PA = "CFG_PA"
840+
outputdataset_PA = "SMO_PA_DataSet"
841+
inputdataset_PSP = "CFG_PSP"
842+
outputdataset_PSP = "SMO_PSP_DataSet"
843+
output_PA_HISTORY = "SMO_PA_HISTORY_DataSet"
844+
output_PSP_HISTORY = "SMO_PSP_HISTORY_DataSet"
845+
output_INTERMEDIARI_PSP_HISTORY = "SMO_INTERMEDIARI_PSP_HISTORY_DataSet"
846+
output_INTERMEDIARI_PA_HISTORY = "SMO_INTERMEDIARI_PA_HISTORY_DataSet"
847+
output_INTERMEDIARI_REL_PA = "SMO_INTERMEDIARI_REL_PA_DataSet"
848+
output_INTERMEDIARI_REL_PSP = "SMO_INTERMEDIARI_REL_PSP_DataSet"
849+
output_INTERMEDIARI_REL_PA_HISTORY = "SMO_INTERMEDIARI_REL_PA_HISTORY_DataSet"
850+
output_INTERMEDIARI_REL_PSP_HISTORY = "SMO_INTERMEDIARI_REL_PSP_HISTORY_DataSet"
851+
dataexplorerset = "AzureDataExplorer${var.env_short}LinkService"
838852
})}]"
839853

840854
depends_on = [

‎src/domains/observability/datafactory/datasets/IMPORT_ANAGRAFICA_RUN.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[
2+
{
3+
"name": "INSERTED_TIMESTAMP",
4+
"type": "datetime"
5+
},
6+
{
7+
"name": "UNIQUE_ID",
8+
"type": "guid"
9+
}
10+
]

‎src/domains/observability/datafactory/datasets/INTERMEDIARI_PA_HISTORY.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[
2+
{
3+
"name": "CF_INTERMEDIARIO_PA",
4+
"type": "string"
5+
},
6+
{
7+
"name": "RAGIONE_SOCIALE",
8+
"type": "string"
9+
},
10+
{
11+
"name": "ENABLED",
12+
"type": "string"
13+
},
14+
{
15+
"name": "INSERTED_TIMESTAMP",
16+
"type": "datetime"
17+
},
18+
{
19+
"name": "UNIQUE_ID",
20+
"type": "guid"
21+
}
22+
]

‎src/domains/observability/datafactory/datasets/INTERMEDIARI_PSP_HISTORY.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[
2+
{
3+
"name": "CF_INTERMEDIARIO_PSP",
4+
"type": "string"
5+
},
6+
{
7+
"name": "RAGIONE_SOCIALE",
8+
"type": "string"
9+
},
10+
{
11+
"name": "ENABLED",
12+
"type": "string"
13+
},
14+
{
15+
"name": "INSERTED_TIMESTAMP",
16+
"type": "datetime"
17+
},
18+
{
19+
"name": "UNIQUE_ID",
20+
"type": "guid"
21+
}
22+
]

‎src/domains/observability/datafactory/datasets/INTERMEDIARI_REL_PA.json‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
[
2+
{
3+
"name": "ID_INTERMEDIARIO_PA",
4+
"type": "string"
5+
},
6+
{
7+
"name": "DESCRIZIONE_INTERMEDIARIO",
8+
"type": "string"
9+
},
10+
{
11+
"name": "ID_DOMINIO",
12+
"type": "string"
13+
},
14+
{
15+
"name": "DESCRIZIONE_DOMINIO",
16+
"type": "string"
17+
},
18+
{
19+
"name": "RAGIONE_SOCIALE_DOMINIO",
20+
"type": "string"
21+
},
22+
{
23+
"name": "AUX_DIGIT",
24+
"type": "int"
25+
},
26+
{
27+
"name": "SEGREGAZIONE",
28+
"type": "int"
29+
},
30+
{
31+
"name": "BROADCAST",
32+
"type": "string"
33+
},
34+
{
35+
"name": "ACA",
36+
"type": "bool"
37+
},
38+
{
39+
"name": "STANDIN",
40+
"type": "bool"
41+
},
42+
{
43+
"name": "FLAG_ONLINE",
44+
"type": "string"
45+
},
46+
{
47+
"name": "VERSIONE",
48+
"type": "int"
49+
},
50+
{
51+
"name": "VERSIONE_PRIMITIVE",
52+
"type": "int"
53+
},
54+
{
55+
"name": "ID_STAZIONE",
56+
"type": "string"
57+
},
58+
{
59+
"name": "CF_ENABLED",
60+
"type": "string"
61+
},
62+
{
63+
"name": "PA_ENABLED",
64+
"type": "string"
65+
},
66+
{
67+
"name": "STAZIONE_ENABLED",
68+
"type": "string"
69+
},
70+
{
71+
"name": "IP",
72+
"type": "string"
73+
},
74+
{
75+
"name": "PORTA",
76+
"type": "int"
77+
},
78+
{
79+
"name": "PROTOCOLLO",
80+
"type": "string"
81+
},
82+
{
83+
"name": "TARGET_HOST",
84+
"type": "string"
85+
},
86+
{
87+
"name": "TARGET_PORT",
88+
"type": "string"
89+
},
90+
{
91+
"name": "TARGET_PATH",
92+
"type": "string"
93+
},
94+
{
95+
"name": "TARGET_HOST_POF",
96+
"type": "string"
97+
},
98+
{
99+
"name": "TARGET_PORT_POF",
100+
"type": "int"
101+
},
102+
{
103+
"name": "TARGET_PATH_POF",
104+
"type": "string"
105+
},
106+
{
107+
"name": "REDIRECT_PROTOCOLLO",
108+
"type": "string"
109+
},
110+
{
111+
"name": "REDIRECT_IP",
112+
"type": "string"
113+
},
114+
{
115+
"name": "REDIRECT_PORT",
116+
"type": "int"
117+
},
118+
{
119+
"name": "REDIRECT_PATH",
120+
"type": "string"
121+
},
122+
{
123+
"name": "PROXY_ENABLED",
124+
"type": "string"
125+
},
126+
{
127+
"name": "PROXY_HOST",
128+
"type": "string"
129+
},
130+
{
131+
"name": "PROXY_PORT",
132+
"type": "int"
133+
},
134+
{
135+
"name": "TIMEOUT",
136+
"type": "int"
137+
},
138+
{
139+
"name": "NUM_THREAD",
140+
"type": "int"
141+
},
142+
{
143+
"name": "TIMEOUT_A",
144+
"type": "int"
145+
},
146+
{
147+
"name": "TIMEOUT_B",
148+
"type": "int"
149+
},
150+
{
151+
"name": "TIMEOUT_C",
152+
"type": "int"
153+
},
154+
{
155+
"name": "QUARTO_MODELLO",
156+
"type": "string"
157+
},
158+
{
159+
"name": "PAGAMENTO_SPONTANEO",
160+
"type": "string"
161+
},
162+
{
163+
"name": "PROTOCOLLO_4MOD",
164+
"type": "string"
165+
},
166+
{
167+
"name": "IP_4MOD",
168+
"type": "string"
169+
},
170+
{
171+
"name": "PORTA_4MOD",
172+
"type": "int"
173+
},
174+
{
175+
"name": "SERVIZIO_4MOD",
176+
"type": "string"
177+
}
178+
]

0 commit comments

Comments
 (0)