From 1819a6d019e78f3e91039ec326c0d8e1938736fa Mon Sep 17 00:00:00 2001
From: ccuffari <75679158+ccuffari@users.noreply.github.com>
Date: Tue, 5 Nov 2024 14:33:35 +0100
Subject: [PATCH 1/7] CES-464-migrate-iopweumessagesbetauserst new module code

---
 src/domains/messages-common/04_storage.tf | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/domains/messages-common/04_storage.tf b/src/domains/messages-common/04_storage.tf
index 1189380a7..c4cf0e4f8 100644
--- a/src/domains/messages-common/04_storage.tf
+++ b/src/domains/messages-common/04_storage.tf
@@ -80,3 +80,32 @@ resource "azurerm_key_vault_secret" "push_notifications_storage_connection_strin
 
   key_vault_id = module.key_vault.id
 }
+
+
+
+module "azure_storage_account" {
+    source = "github.com/pagopa/dx//infra/modules/azure_storage_account?ref=main"
+
+  environment         = var.env
+  resource_group_name = var.resource_group_name ###TO CHECK
+  access_tier        = "Hot"
+
+  subservices_enabled = {
+    blob  = false
+    file  = false
+    queue  = false
+    table  = true
+  }
+
+###TO CHECK
+  network_rules = {
+    default_action             = "Deny"
+    bypass                     = ["AzureServices"]
+    ip_rules                   = ["203.0.113.0/24"]
+    virtual_network_subnet_ids = [azurerm_subnet.example.id]
+  }
+
+  force_public_network_access_enabled = false
+
+  tags = var.tags
+}
\ No newline at end of file

From 1d6bf073bdcc7e2cf5c8c104eac6b0d54043cf8a Mon Sep 17 00:00:00 2001
From: ccuffari <75679158+ccuffari@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:53:11 +0100
Subject: [PATCH 2/7] CES-464-migrate-iopweumessagesbetauserst modify new 
 module code

---
 src/domains/messages-common/04_storage.tf | 14 +++-----------
 src/domains/messages-common/99_locals.tf  | 10 ++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/domains/messages-common/04_storage.tf b/src/domains/messages-common/04_storage.tf
index c4cf0e4f8..7bc6fb1b5 100644
--- a/src/domains/messages-common/04_storage.tf
+++ b/src/domains/messages-common/04_storage.tf
@@ -86,8 +86,8 @@ resource "azurerm_key_vault_secret" "push_notifications_storage_connection_strin
 module "azure_storage_account" {
     source = "github.com/pagopa/dx//infra/modules/azure_storage_account?ref=main"
 
-  environment         = var.env
-  resource_group_name = var.resource_group_name ###TO CHECK
+  environment         = local.itn_environment
+  resource_group_name = azurerm_resource_group.notifications_rg.name
   access_tier        = "Hot"
 
   subservices_enabled = {
@@ -97,15 +97,7 @@ module "azure_storage_account" {
     table  = true
   }
 
-###TO CHECK
-  network_rules = {
-    default_action             = "Deny"
-    bypass                     = ["AzureServices"]
-    ip_rules                   = ["203.0.113.0/24"]
-    virtual_network_subnet_ids = [azurerm_subnet.example.id]
-  }
-
-  force_public_network_access_enabled = false
+  force_public_network_access_enabled = true
 
   tags = var.tags
 }
\ No newline at end of file
diff --git a/src/domains/messages-common/99_locals.tf b/src/domains/messages-common/99_locals.tf
index b03dedabd..dfaad180e 100644
--- a/src/domains/messages-common/99_locals.tf
+++ b/src/domains/messages-common/99_locals.tf
@@ -18,3 +18,13 @@ locals {
   apim_v2_name             = "${local.product}-apim-v2-api"
   apim_resource_group_name = "${local.product}-rg-internal"
 }
+###Italy North
+locals {
+  itn_environment = {
+    prefix          = var.prefix
+    env_short       = var.env_short
+    location        = var.location
+    domain          = var.domain
+    instance_number = var.instance
+    }
+}
\ No newline at end of file

From 935cdfc8ee641136a2223023d3577f68f1666481 Mon Sep 17 00:00:00 2001
From: ccuffari <75679158+ccuffari@users.noreply.github.com>
Date: Thu, 7 Nov 2024 10:37:20 +0100
Subject: [PATCH 3/7] CES-464-migrate-iopweumessagesbetauserst private endpoint
 added

---
 src/domains/messages-common/04_storage.tf |  3 +++
 src/domains/messages-common/07_data.tf    | 10 ++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 src/domains/messages-common/07_data.tf

diff --git a/src/domains/messages-common/04_storage.tf b/src/domains/messages-common/04_storage.tf
index 7bc6fb1b5..8087c7656 100644
--- a/src/domains/messages-common/04_storage.tf
+++ b/src/domains/messages-common/04_storage.tf
@@ -90,6 +90,9 @@ module "azure_storage_account" {
   resource_group_name = azurerm_resource_group.notifications_rg.name
   access_tier        = "Hot"
 
+  subnet_pep_id                        = data.azurerm_subnet.subnet_pep_itn.id
+  private_dns_zone_resource_group_name = "${local.prefix}-${local.env_short}-itn-common-rg-01"
+
   subservices_enabled = {
     blob  = false
     file  = false
diff --git a/src/domains/messages-common/07_data.tf b/src/domains/messages-common/07_data.tf
new file mode 100644
index 000000000..059708ede
--- /dev/null
+++ b/src/domains/messages-common/07_data.tf
@@ -0,0 +1,10 @@
+data "azurerm_virtual_network" "vnet_itn" {
+  name                = "${local.project}-itn-common-vnet-01"
+  resource_group_name = "${local.project}-itn-common-rg-01"
+}
+
+data "azurerm_subnet" "subnet_private_endpoints_itn" {
+  name                 = "io-p-itn-pep-snet-01 "
+  resource_group_name  = data.azurerm_virtual_network.vnet_itn.resource_group_name
+  virtual_network_name = data.azurerm_virtual_network.vnet_itn.name
+}
\ No newline at end of file

From 42b54ef1c670636af1783f83de7b6a76dc870d90 Mon Sep 17 00:00:00 2001
From: ccuffari <75679158+ccuffari@users.noreply.github.com>
Date: Thu, 7 Nov 2024 14:17:45 +0100
Subject: [PATCH 4/7] CES-464-migrate-iopweumessagesbetauserst new code
 modified

---
 src/domains/messages-common/04_storage.tf | 15 +++++++--------
 src/domains/messages-common/07_data.tf    |  6 +++---
 src/domains/messages-common/99_locals.tf  |  4 +++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/domains/messages-common/04_storage.tf b/src/domains/messages-common/04_storage.tf
index 8087c7656..2bbacae68 100644
--- a/src/domains/messages-common/04_storage.tf
+++ b/src/domains/messages-common/04_storage.tf
@@ -84,20 +84,19 @@ resource "azurerm_key_vault_secret" "push_notifications_storage_connection_strin
 
 
 module "azure_storage_account" {
-    source = "github.com/pagopa/dx//infra/modules/azure_storage_account?ref=main"
-
-  environment         = local.itn_environment
-  resource_group_name = azurerm_resource_group.notifications_rg.name
-  access_tier        = "Hot"
+  source = "github.com/pagopa/dx//infra/modules/azure_storage_account?ref=main"
 
+  environment                          = local.itn_environment
+  resource_group_name                  = azurerm_resource_group.notifications_rg.name
+  tier                                 = "l"
   subnet_pep_id                        = data.azurerm_subnet.subnet_pep_itn.id
-  private_dns_zone_resource_group_name = "${local.prefix}-${local.env_short}-itn-common-rg-01"
+  private_dns_zone_resource_group_name = "${local.prefix}-${local.env_short}-rg-common"
 
   subservices_enabled = {
     blob  = false
     file  = false
-    queue  = false
-    table  = true
+    queue = false
+    table = true
   }
 
   force_public_network_access_enabled = true
diff --git a/src/domains/messages-common/07_data.tf b/src/domains/messages-common/07_data.tf
index 059708ede..ddb65d0ab 100644
--- a/src/domains/messages-common/07_data.tf
+++ b/src/domains/messages-common/07_data.tf
@@ -1,9 +1,9 @@
 data "azurerm_virtual_network" "vnet_itn" {
-  name                = "${local.project}-itn-common-vnet-01"
-  resource_group_name = "${local.project}-itn-common-rg-01"
+  name                = "${var.prefix}-${var.env_short}-itn-common-vnet-01"
+  resource_group_name = "${var.prefix}-${var.env_short}-itn-common-rg-01"
 }
 
-data "azurerm_subnet" "subnet_private_endpoints_itn" {
+data "azurerm_subnet" "subnet_pep_itn" {
   name                 = "io-p-itn-pep-snet-01 "
   resource_group_name  = data.azurerm_virtual_network.vnet_itn.resource_group_name
   virtual_network_name = data.azurerm_virtual_network.vnet_itn.name
diff --git a/src/domains/messages-common/99_locals.tf b/src/domains/messages-common/99_locals.tf
index dfaad180e..8f3430d2e 100644
--- a/src/domains/messages-common/99_locals.tf
+++ b/src/domains/messages-common/99_locals.tf
@@ -20,11 +20,13 @@ locals {
 }
 ###Italy North
 locals {
+  app_name = "ex"
   itn_environment = {
     prefix          = var.prefix
     env_short       = var.env_short
     location        = var.location
+    app_name        = local.app_name
     domain          = var.domain
     instance_number = var.instance
-    }
+  }
 }
\ No newline at end of file

From 35c41bf6f78df44d74bed0cb7c6dcf8ccf7b1df1 Mon Sep 17 00:00:00 2001
From: ccuffari <75679158+ccuffari@users.noreply.github.com>
Date: Thu, 7 Nov 2024 15:04:04 +0100
Subject: [PATCH 5/7] CES-464-migrate-iopweumessagesbetauserst new code
 modified

---
 src/domains/messages-common/04_storage.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/domains/messages-common/04_storage.tf b/src/domains/messages-common/04_storage.tf
index 2bbacae68..26afb2146 100644
--- a/src/domains/messages-common/04_storage.tf
+++ b/src/domains/messages-common/04_storage.tf
@@ -90,7 +90,7 @@ module "azure_storage_account" {
   resource_group_name                  = azurerm_resource_group.notifications_rg.name
   tier                                 = "l"
   subnet_pep_id                        = data.azurerm_subnet.subnet_pep_itn.id
-  private_dns_zone_resource_group_name = "${local.prefix}-${local.env_short}-rg-common"
+  private_dns_zone_resource_group_name = "${var.prefix}-${var.env_short}-rg-common"
 
   subservices_enabled = {
     blob  = false

From 025763de536892cc95aad298043da73375a91315 Mon Sep 17 00:00:00 2001
From: ccuffari <75679158+ccuffari@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:15:01 +0100
Subject: [PATCH 6/7] [CES-464] Added new storage account
 iopweumessagesbetauserst for ITN migration with latests suggestions

---
 src/domains/messages-common/04_storage.tf | 6 +++---
 src/domains/messages-common/99_locals.tf  | 2 +-
 src/domains/messages-common/99_main.tf    | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/domains/messages-common/04_storage.tf b/src/domains/messages-common/04_storage.tf
index 26afb2146..225cc594c 100644
--- a/src/domains/messages-common/04_storage.tf
+++ b/src/domains/messages-common/04_storage.tf
@@ -83,14 +83,14 @@ resource "azurerm_key_vault_secret" "push_notifications_storage_connection_strin
 
 
 
-module "azure_storage_account" {
+module "azure_storage_account_itn" {
   source = "github.com/pagopa/dx//infra/modules/azure_storage_account?ref=main"
 
   environment                          = local.itn_environment
   resource_group_name                  = azurerm_resource_group.notifications_rg.name
   tier                                 = "l"
-  subnet_pep_id                        = data.azurerm_subnet.subnet_pep_itn.id
-  private_dns_zone_resource_group_name = "${var.prefix}-${var.env_short}-rg-common"
+  subnet_pep_id                        = module.common_values.pep_subnets.itn.id
+  private_dns_zone_resource_group_name = module.common_values.resource_groups.weu.common
 
   subservices_enabled = {
     blob  = false
diff --git a/src/domains/messages-common/99_locals.tf b/src/domains/messages-common/99_locals.tf
index 8f3430d2e..1342f574d 100644
--- a/src/domains/messages-common/99_locals.tf
+++ b/src/domains/messages-common/99_locals.tf
@@ -20,7 +20,7 @@ locals {
 }
 ###Italy North
 locals {
-  app_name = "ex"
+  app_name = "messages"
   itn_environment = {
     prefix          = var.prefix
     env_short       = var.env_short
diff --git a/src/domains/messages-common/99_main.tf b/src/domains/messages-common/99_main.tf
index f6d35293a..827eddded 100644
--- a/src/domains/messages-common/99_main.tf
+++ b/src/domains/messages-common/99_main.tf
@@ -28,3 +28,7 @@ provider "azurerm" {
 data "azurerm_subscription" "current" {}
 
 data "azurerm_client_config" "current" {}
+
+module "common_values" {
+  source = "github.com/pagopa/io-infra//src/_modules/common_values?ref=main"
+}
\ No newline at end of file

From a86d189c5bcc306bfb56fe2dd9192a5974d1b08f Mon Sep 17 00:00:00 2001
From: ccuffari <75679158+ccuffari@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:28:21 +0100
Subject: [PATCH 7/7] [CES-464] Added new storage account
 iopweumessagesbetauserst for ITN migration

---
 src/domains/messages-common/04_storage.tf | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/domains/messages-common/04_storage.tf b/src/domains/messages-common/04_storage.tf
index 225cc594c..cad1cf62d 100644
--- a/src/domains/messages-common/04_storage.tf
+++ b/src/domains/messages-common/04_storage.tf
@@ -83,7 +83,7 @@ resource "azurerm_key_vault_secret" "push_notifications_storage_connection_strin
 
 
 
-module "azure_storage_account_itn" {
+module "push_notifications_storage_itn" {
   source = "github.com/pagopa/dx//infra/modules/azure_storage_account?ref=main"
 
   environment                          = local.itn_environment
@@ -102,4 +102,9 @@ module "azure_storage_account_itn" {
   force_public_network_access_enabled = true
 
   tags = var.tags
+}
+
+resource "azurerm_storage_queue" "push_notifications_queue" {
+  name                 = "push-notifications"
+  storage_account_name = module.push_notifications_storage_itn.name
 }
\ No newline at end of file