feat: Renamed core and pillar folders (#73)

pagopa · Aug 3, 2023 · faae3b8 · faae3b8
1 parent 1265bfe
commit faae3b8
Show file tree

Hide file tree

Showing 54 changed files with 1,480 additions and 1,480 deletions.
diff --git a/src/core/.terraform.lock.hcl b/src/core/.terraform.lock.hcl
diff --git a/src/pillar/01_keyvault.tf → src/core/01_keyvault.tf b/src/pillar/01_keyvault.tf → src/core/01_keyvault.tf
diff --git a/src/core/01_network.tf b/src/core/01_network.tf
@@ -1,16 +1,59 @@
-# Subnet to host the api config
-module "private_endpoints_snet" {
-  source               = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v6.3.1"
-  name                 = "${local.program}-private-endpoints-snet"
-  address_prefixes     = var.cidr_subnet_private_endpoints
-  virtual_network_name = data.azurerm_virtual_network.vnet.name
-
-  resource_group_name = data.azurerm_resource_group.rg_vnet.name
-
-  private_endpoint_network_policies_enabled = false
-  service_endpoints = [
-    "Microsoft.Web",
-    "Microsoft.AzureCosmosDB",
-    "Microsoft.Storage",
-  ]
+resource "azurerm_resource_group" "rg_vnet" {
+  name     = local.vnet_resource_group_name
+  location = var.location
+
+  tags = var.tags
+}
+
+# vnet
+module "vnet" {
+  source              = "git::https://github.com/pagopa/terraform-azurerm-v3.git//virtual_network?ref=v4.1.0"
+  name                = local.vnet_name
+  location            = azurerm_resource_group.rg_vnet.location
+  resource_group_name = azurerm_resource_group.rg_vnet.name
+  address_space       = var.cidr_vnet
+
+  tags = var.tags
+}
+
+## Application gateway public ip ##
+resource "azurerm_public_ip" "appgateway_public_ip" {
+  name                = local.appgateway_public_ip_name
+  resource_group_name = azurerm_resource_group.rg_vnet.name
+  location            = azurerm_resource_group.rg_vnet.location
+  sku                 = "Standard"
+  allocation_method   = "Static"
+
+  zones = [1, 2, 3]
+
+  tags = var.tags
+}
+
+resource "azurerm_public_ip" "appgateway_beta_public_ip" {
+  name                = local.appgateway_beta_public_ip_name
+  resource_group_name = azurerm_resource_group.rg_vnet.name
+  location            = azurerm_resource_group.rg_vnet.location
+  sku                 = "Standard"
+  allocation_method   = "Static"
+
+  zones = [1, 2, 3]
+
+  tags = var.tags
+}
+
+#
+# ⛴ AKS public IP
+#
+resource "azurerm_public_ip" "aks_outbound" {
+  count = var.aks_num_outbound_ips
+
+  name                = "${local.aks_public_ip_name}-${count.index + 1}"
+  location            = azurerm_resource_group.rg_vnet.location
+  resource_group_name = azurerm_resource_group.rg_vnet.name
+  sku                 = "Standard"
+  allocation_method   = "Static"
+
+  zones = [1, 2, 3]
+
+  tags = var.tags
 }
diff --git a/src/pillar/02_dns_private.tf → src/core/02_dns_private.tf b/src/pillar/02_dns_private.tf → src/core/02_dns_private.tf
diff --git a/src/pillar/02_dns_public.tf → src/core/02_dns_public.tf b/src/pillar/02_dns_public.tf → src/core/02_dns_public.tf
diff --git a/src/pillar/02_vpn.tf → src/core/02_vpn.tf b/src/pillar/02_vpn.tf → src/core/02_vpn.tf
diff --git a/src/pillar/04_azure_devops_agent.tf → src/core/04_azure_devops_agent.tf b/src/pillar/04_azure_devops_agent.tf → src/core/04_azure_devops_agent.tf
diff --git a/src/pillar/04_docker_registry.tf → src/core/04_docker_registry.tf b/src/pillar/04_docker_registry.tf → src/core/04_docker_registry.tf
diff --git a/src/pillar/04_monitor.tf → src/core/04_monitor.tf b/src/pillar/04_monitor.tf → src/core/04_monitor.tf
diff --git a/src/pillar/05_postgres_sql.tf → src/core/05_postgres_sql.tf b/src/pillar/05_postgres_sql.tf → src/core/05_postgres_sql.tf
diff --git a/src/pillar/07_web_test_preview.tf → src/core/07_web_test_preview.tf b/src/pillar/07_web_test_preview.tf → src/core/07_web_test_preview.tf
diff --git a/src/pillar/08_redis.tf → src/core/08_redis.tf b/src/pillar/08_redis.tf → src/core/08_redis.tf
diff --git a/src/core/99_main.tf b/src/core/99_main.tf
@@ -1,14 +1,17 @@
 terraform {
-  required_version = ">=1.3.0"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.33.0,<= 3.53.0"
+      version = "<= 3.53.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
       version = "= 2.10.0"
     }
+    null = {
+      version = "= 3.1.0"
+    }
+
   }
 
   backend "azurerm" {}

diff --git a/src/core/99_main.tf.ci b/src/core/99_main.tf.ci
@@ -1,14 +1,17 @@
 terraform {
-  required_version = ">=1.3.0"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 3.33.0,<= 3.53.0"
+      version = "<= 3.53.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
       version = "= 2.10.0"
     }
+    null = {
+      version = "= 3.1.0"
+    }
+
   }
 
 }