From 5ab61a444cb1cce7b8074aab5ee8a6f8ee806851 Mon Sep 17 00:00:00 2001 From: Francesco Cesareo Date: Wed, 3 Apr 2024 17:31:04 +0200 Subject: [PATCH] precommit --- src/domains/ecommerce-common/README.md | 2 ++ src/next-core/99_variables.tf | 6 +++--- src/next-core/README.md | 3 +-- src/next-core/env/dev/terraform.tfvars | 4 ++-- src/next-core/env/prod/terraform.tfvars | 6 +++--- src/next-core/env/uat/terraform.tfvars | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/domains/ecommerce-common/README.md b/src/domains/ecommerce-common/README.md index 45cd2a394e..12909badec 100644 --- a/src/domains/ecommerce-common/README.md +++ b/src/domains/ecommerce-common/README.md @@ -62,6 +62,8 @@ | [azurerm_key_vault_secret.pm_oracle_db_host](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | | [azurerm_key_vault_secret.pm_oracle_db_password](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | | [azurerm_key_vault_secret.redirect_url_mapping](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | +| [azurerm_key_vault_secret.redis_ecommerce_access_key](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | +| [azurerm_key_vault_secret.redis_ecommerce_hostname](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | | [azurerm_key_vault_secret.redis_ecommerce_password](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | | [azurerm_key_vault_secret.sessions_jwt_secret](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | | [azurerm_key_vault_secret.touchpoint_mail](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | diff --git a/src/next-core/99_variables.tf b/src/next-core/99_variables.tf index f1b86df4f9..c7d920c52c 100644 --- a/src/next-core/99_variables.tf +++ b/src/next-core/99_variables.tf @@ -641,10 +641,10 @@ EOD variable "is_feature_enabled" { type = object({ - vnet_ita = bool, - container_app_tools_cae = optional(bool, false), + vnet_ita = bool, + container_app_tools_cae = optional(bool, false), node_forwarder_ha_enabled = bool, - postgres_private_dns = bool + postgres_private_dns = bool }) description = "Features enabled in this domain" } diff --git a/src/next-core/README.md b/src/next-core/README.md index 37e95905ea..497e8ad9a5 100644 --- a/src/next-core/README.md +++ b/src/next-core/README.md @@ -254,7 +254,7 @@ | [integration\_appgateway\_private\_ip](#input\_integration\_appgateway\_private\_ip) | Integration app gateway private ip | `string` | n/a | yes | | [integration\_appgateway\_zones](#input\_integration\_appgateway\_zones) | Integration app gateway private ip | `list(number)` | n/a | yes | | [ip\_nodo](#input\_ip\_nodo) | Nodo pagamenti ip | `string` | n/a | yes | -| [is\_feature\_enabled](#input\_is\_feature\_enabled) | Features enabled in this domain | 
object({
    vnet_ita                  = bool,
    container_app_tools_cae   = optional(bool, false),
    node_forwarder_ha_enabled = bool
  })
| n/a | yes | +| [is\_feature\_enabled](#input\_is\_feature\_enabled) | Features enabled in this domain | 
object({
    vnet_ita                  = bool,
    container_app_tools_cae   = optional(bool, false),
    node_forwarder_ha_enabled = bool,
    postgres_private_dns      = bool
  })
| n/a | yes | | [lb\_aks](#input\_lb\_aks) | IP load balancer AKS Nexi/SIA | `string` | `"0.0.0.0"` | no | | [location](#input\_location) | One of westeurope, northeurope | `string` | n/a | yes | | [location\_ita](#input\_location\_ita) | Main location | `string` | `"italynorth"` | no | @@ -274,7 +274,6 @@ | [nodo\_pagamenti\_ec](#input\_nodo\_pagamenti\_ec) | EC' black list nodo pagamenti (separate comma list). | `string` | `","` | no | | [nodo\_pagamenti\_psp](#input\_nodo\_pagamenti\_psp) | PSP' white list nodo pagamenti (separate comma list) . | `string` | `","` | no | | [nodo\_pagamenti\_url](#input\_nodo\_pagamenti\_url) | Nodo pagamenti url | `string` | `"https://"` | no | -| [postgres\_private\_dns\_enabled](#input\_postgres\_private\_dns\_enabled) | (Optional) If true creates a private dns that can be used to access the postgres databases | `bool` | `false` | no | | [prefix](#input\_prefix) | n/a | `string` | n/a | yes | | [redis\_cache\_enabled](#input\_redis\_cache\_enabled) | redis cache enabled | `bool` | `false` | no | | [redis\_cache\_params](#input\_redis\_cache\_params) | # Redis cache | 
object({
    public_access = bool
    capacity      = number
    sku_name      = string
    family        = string
  })
| 
{
  "capacity": 1,
  "family": "C",
  "public_access": false,
  "sku_name": "Basic"
}
| no | diff --git a/src/next-core/env/dev/terraform.tfvars b/src/next-core/env/dev/terraform.tfvars index 472fbe8af4..da11601810 100644 --- a/src/next-core/env/dev/terraform.tfvars +++ b/src/next-core/env/dev/terraform.tfvars @@ -22,7 +22,7 @@ is_feature_enabled = { vnet_ita = true, container_app_tools_cae = true, node_forwarder_ha_enabled = true, - postgres_private_dns = true + postgres_private_dns = true } ### Network @@ -48,7 +48,7 @@ dns_forwarder_backup_is_enabled = false # # replica settings # -geo_replica_enabled = false +geo_replica_enabled = false # diff --git a/src/next-core/env/prod/terraform.tfvars b/src/next-core/env/prod/terraform.tfvars index 337618a792..623ebff135 100644 --- a/src/next-core/env/prod/terraform.tfvars +++ b/src/next-core/env/prod/terraform.tfvars @@ -19,10 +19,10 @@ tags = { ### Feature Flag is_feature_enabled = { - vnet_ita = false, - container_app_tools_cae = false, + vnet_ita = false, + container_app_tools_cae = false, node_forwarder_ha_enabled = false, - postgres_private_dns = true + postgres_private_dns = true } # diff --git a/src/next-core/env/uat/terraform.tfvars b/src/next-core/env/uat/terraform.tfvars index 0ea030880e..8ad15d0dbe 100644 --- a/src/next-core/env/uat/terraform.tfvars +++ b/src/next-core/env/uat/terraform.tfvars @@ -22,7 +22,7 @@ is_feature_enabled = { vnet_ita = false, container_app_tools_cae = true, node_forwarder_ha_enabled = false, - postgres_private_dns = true + postgres_private_dns = true } # @@ -53,7 +53,7 @@ dns_forwarder_vm_image_name = "pagopa-u-dns-forwarder-ubuntu2204-image-v4" # # replica settings # -geo_replica_enabled = false +geo_replica_enabled = false # # apim v2