Skip to content

Commit

Permalink
Merge branch 'main' into add-mbd-gps-alerts
Browse files Browse the repository at this point in the history
  • Loading branch information
gioelemella authored Dec 6, 2024
2 parents c346fac + 99d7ce4 commit 9ca1e03
Show file tree
Hide file tree
Showing 90 changed files with 399 additions and 253 deletions.
6 changes: 4 additions & 2 deletions src/domains/aca-common/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# aca-common

<!-- markdownlint-disable -->
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
<!-- BEGIN_TF_DOCS -->
## Requirements

| Name | Version |
Expand All @@ -20,6 +20,7 @@

| Name | Type |
|------|------|
| [azurerm_api_management_subscription.gpd_like_for_aca_subkey](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_subscription) | resource |
| [azurerm_key_vault_access_policy.ad_group_policy](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_access_policy) | resource |
| [azurerm_key_vault_access_policy.adgroup_developers_policy](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_access_policy) | resource |
| [azurerm_key_vault_access_policy.azdevops_iac_legacy_policies](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_access_policy) | resource |
Expand All @@ -40,6 +41,7 @@
| [azuread_service_principal.iac_deploy_legacy](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/service_principal) | data source |
| [azuread_service_principal.iac_plan_legacy](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/service_principal) | data source |
| [azuread_service_principal.iac_principal](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/service_principal) | data source |
| [azurerm_api_management_product.apim_aca_product](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/api_management_product) | data source |
| [azurerm_application_insights.application_insights](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/application_insights) | data source |
| [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source |
| [azurerm_private_dns_zone.internal](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/private_dns_zone) | data source |
Expand Down Expand Up @@ -70,4 +72,4 @@
## Outputs

No outputs.
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
<!-- END_TF_DOCS -->
11 changes: 6 additions & 5 deletions src/domains/afm-app/07_gh_runner.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module "gh_runner_job" {
environment_rg = local.tools_cae_rg
gh_identity_suffix = "job-01"
runner_labels = ["self-hosted-job", "${var.env}"]
gh_env = var.env
gh_repositories = [
{
name : "pagopa-afm-calculator",
Expand Down Expand Up @@ -47,10 +48,10 @@ module "gh_runner_job" {
rg = "${local.product}-${var.location_short}-${var.instance}-aks-rg"
}

location = var.gh_runner_job_location
prefix = var.prefix
resource_group_name = data.azurerm_resource_group.identity_rg.name

tags = var.tags
location = var.gh_runner_job_location
prefix = var.prefix
resource_group_name = data.azurerm_resource_group.identity_rg.name
domain_security_rg_name = "${local.product}-${var.domain}-sec-rg"
tags = var.tags

}
4 changes: 2 additions & 2 deletions src/domains/afm-app/99_main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ provider "helm" {
}

module "__v3__" {
# v8.60.0
source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=551a56a4bf841cd431b51ec951639e74260daf6a"
# v8.62.1
source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=f3485105e35ce8c801209dcbb4ef72f3d944f0e5"
}
2 changes: 1 addition & 1 deletion src/domains/afm-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

| Name | Source | Version |
|------|--------|---------|
| <a name="module___v3__"></a> [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | 551a56a4bf841cd431b51ec951639e74260daf6a |
| <a name="module___v3__"></a> [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | f3485105e35ce8c801209dcbb4ef72f3d944f0e5 |
| <a name="module_apim_afm_calculator_node_product"></a> [apim\_afm\_calculator\_node\_product](#module\_apim\_afm\_calculator\_node\_product) | ./.terraform/modules/__v3__/api_management_product | n/a |
| <a name="module_apim_afm_calculator_product"></a> [apim\_afm\_calculator\_product](#module\_apim\_afm\_calculator\_product) | ./.terraform/modules/__v3__/api_management_product | n/a |
| <a name="module_apim_afm_marketplace_product"></a> [apim\_afm\_marketplace\_product](#module\_apim\_afm\_marketplace\_product) | ./.terraform/modules/__v3__/api_management_product | n/a |
Expand Down
12 changes: 6 additions & 6 deletions src/domains/afm-common/03_cosmosdb_afm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ module "afm_marketplace_cosmosdb_account" {
enable_free_tier = var.afm_marketplace_cosmos_db_params.enable_free_tier
analytical_storage_enabled = var.afm_marketplace_cosmos_db_params.analytical_storage_enabled

private_endpoint_sql_name = "${local.project}-marketplace-cosmos-sql-endpoint" # forced after update module vers
private_service_connection_sql_name = "${local.project}-marketplace-cosmos-sql-endpoint" # forced after update module vers
private_endpoint_sql_name = "${local.project}-marketplace-cosmos-sql-endpoint" # forced after update module vers
private_service_connection_sql_name = "${local.project}-marketplace-cosmos-sql-endpoint" # forced after update module vers

public_network_access_enabled = var.afm_marketplace_cosmos_db_params.public_network_access_enabled
private_endpoint_enabled = var.afm_marketplace_cosmos_db_params.private_endpoint_enabled
Expand Down Expand Up @@ -94,8 +94,8 @@ locals {
autoscale_settings = {
max_throughput = 1000
},
analytical_storage_ttl = -1, # ingested_2_DL
partition_key_version = null
analytical_storage_ttl = -1, # ingested_2_DL
partition_key_version = null
},
{
name = "archivedcibundles",
Expand Down Expand Up @@ -157,7 +157,7 @@ locals {
autoscale_settings = {
max_throughput = 1000
},
analytical_storage_ttl = -1, # ingested_2_DL
analytical_storage_ttl = -1, # ingested_2_DL
partition_key_version = null
},
{
Expand All @@ -166,7 +166,7 @@ locals {
autoscale_settings = {
max_throughput = 1000
},
analytical_storage_ttl = -1, # ingested_2_DL
analytical_storage_ttl = -1, # ingested_2_DL
partition_key_version = null
},
{
Expand Down
13 changes: 7 additions & 6 deletions src/domains/afm-common/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- markdownlint-disable -->
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
<!-- BEGIN_TF_DOCS -->
## Requirements

| Name | Version |
Expand All @@ -12,9 +12,9 @@

| Name | Source | Version |
|------|--------|---------|
| <a name="module_afm_marketplace_cosmosdb_account"></a> [afm\_marketplace\_cosmosdb\_account](#module\_afm\_marketplace\_cosmosdb\_account) | git::https://github.com/pagopa/terraform-azurerm-v3.git//cosmosdb_account | v6.7.0 |
| <a name="module_afm_marketplace_cosmosdb_containers"></a> [afm\_marketplace\_cosmosdb\_containers](#module\_afm\_marketplace\_cosmosdb\_containers) | git::https://github.com/pagopa/terraform-azurerm-v3.git//cosmosdb_sql_container | v6.7.0 |
| <a name="module_afm_marketplace_cosmosdb_database"></a> [afm\_marketplace\_cosmosdb\_database](#module\_afm\_marketplace\_cosmosdb\_database) | git::https://github.com/pagopa/terraform-azurerm-v3.git//cosmosdb_sql_database | v6.7.0 |
| <a name="module_afm_marketplace_cosmosdb_account"></a> [afm\_marketplace\_cosmosdb\_account](#module\_afm\_marketplace\_cosmosdb\_account) | git::https://github.com/pagopa/terraform-azurerm-v3.git//cosmosdb_account | add-analytical_storage_enabled-2-cosmos |
| <a name="module_afm_marketplace_cosmosdb_containers"></a> [afm\_marketplace\_cosmosdb\_containers](#module\_afm\_marketplace\_cosmosdb\_containers) | git::https://github.com/pagopa/terraform-azurerm-v3.git//cosmosdb_sql_container | add-analytical_storage_enabled-2-cosmos |
| <a name="module_afm_marketplace_cosmosdb_database"></a> [afm\_marketplace\_cosmosdb\_database](#module\_afm\_marketplace\_cosmosdb\_database) | git::https://github.com/pagopa/terraform-azurerm-v3.git//cosmosdb_sql_database | add-analytical_storage_enabled-2-cosmos |
| <a name="module_afm_marketplace_cosmosdb_snet"></a> [afm\_marketplace\_cosmosdb\_snet](#module\_afm\_marketplace\_cosmosdb\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.7.0 |
| <a name="module_afm_storage"></a> [afm\_storage](#module\_afm\_storage) | git::https://github.com/pagopa/terraform-azurerm-v3.git//storage_account | v7.18.0 |
| <a name="module_identity_cd_01"></a> [identity\_cd\_01](#module\_identity\_cd\_01) | github.com/pagopa/terraform-azurerm-v3//github_federated_identity | v7.45.0 |
Expand All @@ -32,6 +32,7 @@
| [azurerm_key_vault_access_policy.azdevops_iac_managed_identities](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_access_policy) | resource |
| [azurerm_key_vault_access_policy.gha_iac_managed_identities](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_access_policy) | resource |
| [azurerm_key_vault_secret.afm_calculator_subscription_key](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.afm_fee_reporting_cosmos_pkey](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.afm_marketplace_cosmos_pkey](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.afm_marketplace_subscription_key](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.ai_connection_string](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
Expand Down Expand Up @@ -71,7 +72,7 @@

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_afm_marketplace_cosmos_db_params"></a> [afm\_marketplace\_cosmos\_db\_params](#input\_afm\_marketplace\_cosmos\_db\_params) | n/a | <pre>object({<br/> kind = string<br/> capabilities = list(string)<br/> offer_type = string<br/> server_version = string<br/> consistency_policy = object({<br/> consistency_level = string<br/> max_interval_in_seconds = number<br/> max_staleness_prefix = number<br/> })<br/> main_geo_location_zone_redundant = bool<br/> enable_free_tier = bool<br/> additional_geo_locations = list(object({<br/> location = string<br/> failover_priority = number<br/> zone_redundant = bool<br/> }))<br/> private_endpoint_enabled = bool<br/> public_network_access_enabled = bool<br/> is_virtual_network_filter_enabled = bool<br/> backup_continuous_enabled = bool<br/> })</pre> | n/a | yes |
| <a name="input_afm_marketplace_cosmos_db_params"></a> [afm\_marketplace\_cosmos\_db\_params](#input\_afm\_marketplace\_cosmos\_db\_params) | n/a | <pre>object({<br/> kind = string<br/> capabilities = list(string)<br/> offer_type = string<br/> server_version = string<br/> consistency_policy = object({<br/> consistency_level = string<br/> max_interval_in_seconds = number<br/> max_staleness_prefix = number<br/> })<br/> main_geo_location_zone_redundant = bool<br/> enable_free_tier = bool<br/> additional_geo_locations = list(object({<br/> location = string<br/> failover_priority = number<br/> zone_redundant = bool<br/> }))<br/> private_endpoint_enabled = bool<br/> public_network_access_enabled = bool<br/> is_virtual_network_filter_enabled = bool<br/> backup_continuous_enabled = bool<br/> analytical_storage_enabled = bool<br/> })</pre> | n/a | yes |
| <a name="input_afm_storage_params"></a> [afm\_storage\_params](#input\_afm\_storage\_params) | n/a | <pre>object({<br/> enable_backup = optional(bool, false)<br/> enabled = bool,<br/> kind = string,<br/> tier = string,<br/> account_replication_type = string,<br/> advanced_threat_protection = bool,<br/> retention_days = number,<br/> public_network_access_enabled = bool,<br/> backup_retention_days = optional(number, 0)<br/> })</pre> | <pre>{<br/> "account_replication_type": "LRS",<br/> "advanced_threat_protection": false,<br/> "backup_retention_days": 0,<br/> "enable_backup": false,<br/> "enabled": false,<br/> "kind": "StorageV2",<br/> "public_network_access_enabled": false,<br/> "retention_days": 30,<br/> "tier": "Standard"<br/>}</pre> | no |
| <a name="input_application_insights_name"></a> [application\_insights\_name](#input\_application\_insights\_name) | Specifies the name of the Application Insights. | `string` | n/a | yes |
| <a name="input_cidr_subnet_afm_marketplace_cosmosdb"></a> [cidr\_subnet\_afm\_marketplace\_cosmosdb](#input\_cidr\_subnet\_afm\_marketplace\_cosmosdb) | Cosmos DB address space | `list(string)` | `null` | no |
Expand All @@ -94,4 +95,4 @@
## Outputs

No outputs.
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
<!-- END_TF_DOCS -->
4 changes: 2 additions & 2 deletions src/domains/afm-common/env/weu-prod/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ afm_marketplace_cosmos_db_params = {
offer_type = "Standard"
consistency_policy = {
consistency_level = "Strong" # "BoundedStaleness"
max_interval_in_seconds = 5 # 300
max_staleness_prefix = 100 # 100000
max_interval_in_seconds = 5 # 300
max_staleness_prefix = 100 # 100000
}
server_version = "4.0"
main_geo_location_zone_redundant = true
Expand Down
6 changes: 3 additions & 3 deletions src/domains/afm-secrets/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# afm-secrets

<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
<!-- BEGIN_TF_DOCS -->
## Requirements

| Name | Version |
Expand Down Expand Up @@ -42,9 +42,9 @@ No modules.
| <a name="input_location_short"></a> [location\_short](#input\_location\_short) | One of weu, neu | `string` | n/a | yes |
| <a name="input_location_string"></a> [location\_string](#input\_location\_string) | One of West Europe, North Europe | `string` | n/a | yes |
| <a name="input_prefix"></a> [prefix](#input\_prefix) | n/a | `string` | n/a | yes |
| <a name="input_tags"></a> [tags](#input\_tags) | n/a | `map(any)` | <pre>{<br> "CreatedBy": "Terraform"<br>}</pre> | no |
| <a name="input_tags"></a> [tags](#input\_tags) | n/a | `map(any)` | <pre>{<br/> "CreatedBy": "Terraform"<br/>}</pre> | no |

## Outputs

No outputs.
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
<!-- END_TF_DOCS -->
11 changes: 6 additions & 5 deletions src/domains/apiconfig-app/07_gh_runner.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module "gh_runner_job" {
environment_name = local.tools_cae_name
environment_rg = local.tools_cae_rg
gh_identity_suffix = "job-01"
gh_env = var.env
runner_labels = ["self-hosted-job", "${var.env}"]
gh_repositories = [
{
Expand All @@ -35,10 +36,10 @@ module "gh_runner_job" {
rg = "${local.product}-${var.location_short}-${var.instance}-aks-rg"
}

location = var.location
prefix = var.prefix
resource_group_name = data.azurerm_resource_group.identity_rg.name

tags = var.tags
location = var.location
prefix = var.prefix
resource_group_name = data.azurerm_resource_group.identity_rg.name
domain_security_rg_name = "${local.product}-${var.domain}-sec-rg"
tags = var.tags

}
4 changes: 2 additions & 2 deletions src/domains/apiconfig-app/99_main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ data "azurerm_subscription" "current" {}
data "azurerm_client_config" "current" {}

module "__v3__" {
# v8.60.0
source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=551a56a4bf841cd431b51ec951639e74260daf6a"
# v8.62.1
source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=f3485105e35ce8c801209dcbb4ef72f3d944f0e5"
}
2 changes: 1 addition & 1 deletion src/domains/apiconfig-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

| Name | Source | Version |
|------|--------|---------|
| <a name="module___v3__"></a> [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | 551a56a4bf841cd431b51ec951639e74260daf6a |
| <a name="module___v3__"></a> [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | f3485105e35ce8c801209dcbb4ef72f3d944f0e5 |
| <a name="module_api_config_fe_cdn"></a> [api\_config\_fe\_cdn](#module\_api\_config\_fe\_cdn) | ./.terraform/modules/__v3__/cdn | n/a |
| <a name="module_api_config_snet"></a> [api\_config\_snet](#module\_api\_config\_snet) | ./.terraform/modules/__v3__/subnet | n/a |
| <a name="module_apim_api_apiconfig_cache_node_api_v1_o"></a> [apim\_api\_apiconfig\_cache\_node\_api\_v1\_o](#module\_apim\_api\_apiconfig\_cache\_node\_api\_v1\_o) | ./.terraform/modules/__v3__/api_management_api | n/a |
Expand Down
6 changes: 4 additions & 2 deletions src/domains/apiconfig-common/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# apiconfig-common

<!-- markdownlint-disable -->
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
<!-- BEGIN_TF_DOCS -->
## Requirements

| Name | Version |
Expand Down Expand Up @@ -38,6 +38,8 @@
| [azurerm_key_vault_secret.apiconfig_selfcare_integration_api_subscription-key](https://registry.terraform.io/providers/hashicorp/azurerm/3.40.0/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.cfg_for_node_subscription_key](https://registry.terraform.io/providers/hashicorp/azurerm/3.40.0/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.db_postgres_nexi_cfg_password](https://registry.terraform.io/providers/hashicorp/azurerm/3.40.0/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.db_postgres_nexi_cfg_password_prf](https://registry.terraform.io/providers/hashicorp/azurerm/3.40.0/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.encrypted_github_token_read_packages_bot](https://registry.terraform.io/providers/hashicorp/azurerm/3.40.0/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.github_token_read_packages](https://registry.terraform.io/providers/hashicorp/azurerm/3.40.0/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.nodo5_slack_webhook_url](https://registry.terraform.io/providers/hashicorp/azurerm/3.40.0/docs/resources/key_vault_secret) | resource |
| [azurerm_key_vault_secret.oracle_db_cfg_dev_nexi_password](https://registry.terraform.io/providers/hashicorp/azurerm/3.40.0/docs/resources/key_vault_secret) | resource |
Expand Down Expand Up @@ -115,4 +117,4 @@
## Outputs

No outputs.
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
<!-- END_TF_DOCS -->
11 changes: 6 additions & 5 deletions src/domains/bizevents-app/07_gh_runner.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module "gh_runner_job" {
environment_name = local.tools_cae_name
environment_rg = local.tools_cae_rg
gh_identity_suffix = "job-01"
gh_env = var.env
runner_labels = ["self-hosted-job", "${var.env}"]
gh_repositories = [
{
Expand Down Expand Up @@ -39,10 +40,10 @@ module "gh_runner_job" {
rg = "${local.product}-${var.location_short}-${var.instance}-aks-rg"
}

location = var.gh_runner_job_location
prefix = var.prefix
resource_group_name = data.azurerm_resource_group.identity_rg.name

tags = var.tags
location = var.gh_runner_job_location
prefix = var.prefix
resource_group_name = data.azurerm_resource_group.identity_rg.name
domain_security_rg_name = "${local.product}-${var.domain}-sec-rg"
tags = var.tags

}
4 changes: 2 additions & 2 deletions src/domains/bizevents-app/99_main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ provider "helm" {
}

module "__v3__" {
# v8.60.0
source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=551a56a4bf841cd431b51ec951639e74260daf6a"
# v8.62.1
source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=f3485105e35ce8c801209dcbb4ef72f3d944f0e5"
}

Loading

0 comments on commit 9ca1e03

Please sign in to comment.