diff --git a/modules/azure/event_hubs/README.md b/modules/azure/event_hubs/README.md index 8ff64d6..3ff4409 100644 --- a/modules/azure/event_hubs/README.md +++ b/modules/azure/event_hubs/README.md @@ -13,7 +13,6 @@ module "event_hubs" { example_namespace = { sku = "Standard" capacity = 1 - zone_redundant = false auto_inflate = { enabled = true maximum_throughput_units = 2 @@ -106,7 +105,7 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [event\_hubs\_namespaces](#input\_event\_hubs\_namespaces) | Azure event hub configurations |
map(object({
override_name = optional(string, null)
sku = string
capacity = number
zone_redundant = bool
auto_inflate = object({
enabled = bool
maximum_throughput_units = number
})
public_network_access_enabled = optional(bool, false)
trusted_service_access_enabled = optional(bool, false)
ip_rules = optional(list(string), [])
public_uri_key_vaults = optional(map(object({
resource_group_name = string
})), {})
subnets = optional(map(object({
vnet_name = string
resource_group_name = string
location = string
key_vault_name = optional(string, null)
create_private_endpoint = optional(bool, false)
})), {})
extra_subnet_ids_no_private_endpoint = optional(list(string), [])
event_hubs = map(object({
message_retention = number
partition_count = number
authorization_rules = optional(map(object({
listen = optional(bool, false)
send = optional(bool, false)
manage = optional(bool, false)
})),
{})
}))
}))
| n/a | yes | +| [event\_hubs\_namespaces](#input\_event\_hubs\_namespaces) | Azure event hub configurations |
map(object({
override_name = optional(string, null)
sku = string
capacity = number
auto_inflate = object({
enabled = bool
maximum_throughput_units = number
})
public_network_access_enabled = optional(bool, false)
trusted_service_access_enabled = optional(bool, false)
ip_rules = optional(list(string), [])
public_uri_key_vaults = optional(map(object({
resource_group_name = string
})), {})
subnets = optional(map(object({
vnet_name = string
resource_group_name = string
location = string
key_vault_name = optional(string, null)
create_private_endpoint = optional(bool, false)
})), {})
extra_subnet_ids_no_private_endpoint = optional(list(string), [])
event_hubs = map(object({
message_retention = number
partition_count = number
authorization_rules = optional(map(object({
listen = optional(bool, false)
send = optional(bool, false)
manage = optional(bool, false)
})),
{})
}))
}))
| n/a | yes | | [location](#input\_location) | Azure location | `string` | n/a | yes | | [resource\_group\_name](#input\_resource\_group\_name) | Azure resource group name | `string` | n/a | yes | diff --git a/modules/azure/event_hubs/main.tf b/modules/azure/event_hubs/main.tf index 95297fa..2b149b1 100644 --- a/modules/azure/event_hubs/main.tf +++ b/modules/azure/event_hubs/main.tf @@ -48,7 +48,6 @@ resource "azurerm_eventhub_namespace" "events" { capacity = each.value.capacity auto_inflate_enabled = each.value.sku == "Standard" ? each.value.auto_inflate.enabled : false maximum_throughput_units = each.value.auto_inflate.enabled && each.value.sku == "Standard" ? each.value.auto_inflate.maximum_throughput_units : null - zone_redundant = each.value.zone_redundant public_network_access_enabled = length(each.value.ip_rules) > 0 || length(lookup(local.subnet_ids_no_private_endpoint, each.key, [])) > 0 ? true : each.value.public_network_access_enabled network_rulesets { diff --git a/modules/azure/event_hubs/variables.tf b/modules/azure/event_hubs/variables.tf index 32509e7..e40e578 100644 --- a/modules/azure/event_hubs/variables.tf +++ b/modules/azure/event_hubs/variables.tf @@ -11,10 +11,9 @@ variable "location" { variable "event_hubs_namespaces" { description = "Azure event hub configurations" type = map(object({ - override_name = optional(string, null) - sku = string - capacity = number - zone_redundant = bool + override_name = optional(string, null) + sku = string + capacity = number auto_inflate = object({ enabled = bool maximum_throughput_units = number diff --git a/modules/gcp/velero/main.tf b/modules/gcp/velero/main.tf index 17ce2c9..a2f43a4 100644 --- a/modules/gcp/velero/main.tf +++ b/modules/gcp/velero/main.tf @@ -1,11 +1,11 @@ # Create the velero backups bucket resource "google_storage_bucket" "backups" { - project = var.backup_project - name = var.backups_bucket_name - location = var.backups_bucket_location - uniform_bucket_level_access = var.backups_bucket_uniform_level_access + project = var.backup_project + name = var.backups_bucket_name + location = var.backups_bucket_location + uniform_bucket_level_access = var.backups_bucket_uniform_level_access soft_delete_policy { - retention_duration_seconds = try(var.soft_delete_policy, 0) + retention_duration_seconds = try(var.soft_delete_policy, 0) } }