Skip to content

Commit

Permalink
pre-commit fixs
Browse files Browse the repository at this point in the history
  • Loading branch information
diegolagospagopa committed Dec 15, 2023
1 parent a92c14b commit 95399de
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/.env/dev/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ eventhubs = [
name = "rtd-trx"
partitions = 1
message_retention = 1
consumers = [
consumers = [
"bpd-payment-instrument",
"rtd-trx-fa-comsumer-group",
"idpay-consumer-group"
Expand Down
14 changes: 7 additions & 7 deletions src/core/03_apim_0.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ resource "azurerm_resource_group" "rg_api" {

# APIM subnet
module "apim_snet" {
source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v7.23.0"
count = var.apim_enabled == true ? 1 : 0
source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v7.23.0"
count = var.apim_enabled == true ? 1 : 0

name = "${local.project}-apim-snet"
resource_group_name = azurerm_resource_group.rg_vnet.name
Expand All @@ -34,8 +34,8 @@ module "apim_snet" {
}

module "apim_stv2_snet" {
source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v7.23.0"
count = var.apim_enabled == true ? 1 : 0
source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v7.23.0"
count = var.apim_enabled == true ? 1 : 0

name = "${local.project}-apim-stv2-snet"
resource_group_name = azurerm_resource_group.rg_vnet.name
Expand Down Expand Up @@ -68,14 +68,14 @@ resource "azurerm_network_security_rule" "apim_snet_nsg_rules" {
}

resource "azurerm_subnet_network_security_group_association" "apim_stv2_snet" {
count = var.apim_enabled == true ? 1 : 0
count = var.apim_enabled == true ? 1 : 0

subnet_id = module.apim_stv2_snet[0].id
network_security_group_id = azurerm_network_security_group.apim_snet_nsg.id
}

resource "azurerm_subnet_network_security_group_association" "apim_snet" {
count = var.apim_enabled == true ? 1 : 0
count = var.apim_enabled == true ? 1 : 0

subnet_id = module.apim_snet[0].id
network_security_group_id = azurerm_network_security_group.apim_snet_nsg.id
Expand Down Expand Up @@ -138,7 +138,7 @@ resource "azurerm_key_vault_access_policy" "api_management_policy" {
# 🏷 custom domain
#
resource "azurerm_api_management_custom_domain" "api_custom_domain" {
count = var.apim_enabled == true ? 1 : 0
count = var.apim_enabled == true ? 1 : 0

api_management_id = module.apim[0].id

Expand Down
4 changes: 2 additions & 2 deletions src/core/99_variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ locals {

#APIM
# api.internal.*.devopslab.pagopa.it
api_internal_domain = "api.internal.${var.prod_dns_zone_prefix}.${var.external_domain}"
apim_management_public_ip_name = "${local.project}-apim-management-pip"
api_internal_domain = "api.internal.${var.prod_dns_zone_prefix}.${var.external_domain}"
apim_management_public_ip_name = "${local.project}-apim-management-pip"
apim_management_public_ip_name_2 = "${local.project}-apim-management-v2-pip"

#AKS
Expand Down
2 changes: 2 additions & 0 deletions src/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ az network dns zone show \

| Name | Type |
|------|------|
| [azurerm_api_management_custom_domain.api_custom_domain](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_custom_domain) | resource |
| [azurerm_application_insights.application_insights](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/application_insights) | resource |
| [azurerm_dns_a_record.api_devopslab_pagopa_it](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/dns_a_record) | resource |
| [azurerm_dns_a_record.helm_template_ingress_devopslab_pagopa_it](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/dns_a_record) | resource |
Expand All @@ -84,6 +85,7 @@ az network dns zone show \
| [azurerm_private_dns_zone_virtual_network_link.vnet_core](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/private_dns_zone_virtual_network_link) | resource |
| [azurerm_public_ip.aks_outbound](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/public_ip) | resource |
| [azurerm_public_ip.apim_management_public_ip](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/public_ip) | resource |
| [azurerm_public_ip.apim_management_public_ip_2](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/public_ip) | resource |
| [azurerm_public_ip.appgateway_beta_public_ip](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/public_ip) | resource |
| [azurerm_public_ip.appgateway_public_ip](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/public_ip) | resource |
| [azurerm_resource_group.azdo_rg](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) | resource |
Expand Down
2 changes: 1 addition & 1 deletion src/domains/diego-common/00_network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ data "azurerm_dns_zone" "public" {
}

data "azurerm_private_dns_zone" "storage_account_private_dns_zone" {
name = "privatelink.blob.core.windows.net"
name = "privatelink.blob.core.windows.net"
resource_group_name = local.vnet_core_resource_group_name
}
1 change: 0 additions & 1 deletion src/domains/diego-common/99_variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,3 @@ variable "log_analytics_workspace_resource_group_name" {
type = string
description = "The name of the resource group in which the Log Analytics workspace is located in."
}

2 changes: 2 additions & 0 deletions src/domains/diego-common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
| [azurerm_log_analytics_workspace.log_analytics](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/log_analytics_workspace) | data source |
| [azurerm_monitor_action_group.email](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/monitor_action_group) | data source |
| [azurerm_monitor_action_group.slack](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/monitor_action_group) | data source |
| [azurerm_private_dns_zone.storage_account_private_dns_zone](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/private_dns_zone) | data source |
| [azurerm_resource_group.monitor_rg](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/resource_group) | data source |
| [azurerm_resource_group.rg_vnet_core](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/resource_group) | data source |
| [azurerm_subnet.private_endpoint](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/subnet) | data source |
| [azurerm_subscription.current](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/subscription) | data source |
| [azurerm_virtual_network.vnet_core](https://registry.terraform.io/providers/hashicorp/azurerm/3.38.0/docs/data-sources/virtual_network) | data source |
| [terraform_remote_state.core](https://registry.terraform.io/providers/hashicorp/terraform/latest/docs/data-sources/remote_state) | data source |
Expand Down
11 changes: 4 additions & 7 deletions src/domains/diego-common/env/dev/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,10 @@ log_analytics_workspace_resource_group_name = "dvopla-d-monitor-rg"

storage_management_policy_rules = [
{
name: "rule1"
enabled: true
filters: {
name : "rule1"
enabled : true
filters : {

}
}
]



0 comments on commit 95399de

Please sign in to comment.