Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions modules/azure/event_hubs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module "event_hubs" {
example_namespace = {
sku = "Standard"
capacity = 1
zone_redundant = false
auto_inflate = {
enabled = true
maximum_throughput_units = 2
Expand Down Expand Up @@ -106,7 +105,7 @@ No modules.

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_event_hubs_namespaces"></a> [event\_hubs\_namespaces](#input\_event\_hubs\_namespaces) | Azure event hub configurations | <pre>map(object({<br/> override_name = optional(string, null)<br/> sku = string<br/> capacity = number<br/> zone_redundant = bool<br/> auto_inflate = object({<br/> enabled = bool<br/> maximum_throughput_units = number<br/> })<br/> public_network_access_enabled = optional(bool, false)<br/> trusted_service_access_enabled = optional(bool, false)<br/> ip_rules = optional(list(string), [])<br/> public_uri_key_vaults = optional(map(object({<br/> resource_group_name = string<br/> })), {})<br/> subnets = optional(map(object({<br/> vnet_name = string<br/> resource_group_name = string<br/> location = string<br/> key_vault_name = optional(string, null)<br/> create_private_endpoint = optional(bool, false)<br/> })), {})<br/> extra_subnet_ids_no_private_endpoint = optional(list(string), [])<br/> event_hubs = map(object({<br/> message_retention = number<br/> partition_count = number<br/> authorization_rules = optional(map(object({<br/> listen = optional(bool, false)<br/> send = optional(bool, false)<br/> manage = optional(bool, false)<br/> })),<br/> {})<br/> }))<br/> }))</pre> | n/a | yes |
| <a name="input_event_hubs_namespaces"></a> [event\_hubs\_namespaces](#input\_event\_hubs\_namespaces) | Azure event hub configurations | <pre>map(object({<br/> override_name = optional(string, null)<br/> sku = string<br/> capacity = number<br/> auto_inflate = object({<br/> enabled = bool<br/> maximum_throughput_units = number<br/> })<br/> public_network_access_enabled = optional(bool, false)<br/> trusted_service_access_enabled = optional(bool, false)<br/> ip_rules = optional(list(string), [])<br/> public_uri_key_vaults = optional(map(object({<br/> resource_group_name = string<br/> })), {})<br/> subnets = optional(map(object({<br/> vnet_name = string<br/> resource_group_name = string<br/> location = string<br/> key_vault_name = optional(string, null)<br/> create_private_endpoint = optional(bool, false)<br/> })), {})<br/> extra_subnet_ids_no_private_endpoint = optional(list(string), [])<br/> event_hubs = map(object({<br/> message_retention = number<br/> partition_count = number<br/> authorization_rules = optional(map(object({<br/> listen = optional(bool, false)<br/> send = optional(bool, false)<br/> manage = optional(bool, false)<br/> })),<br/> {})<br/> }))<br/> }))</pre> | n/a | yes |
| <a name="input_location"></a> [location](#input\_location) | Azure location | `string` | n/a | yes |
| <a name="input_resource_group_name"></a> [resource\_group\_name](#input\_resource\_group\_name) | Azure resource group name | `string` | n/a | yes |

Expand Down
1 change: 0 additions & 1 deletion modules/azure/event_hubs/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions modules/azure/event_hubs/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions modules/gcp/velero/main.tf
Original file line number Diff line number Diff line change
@@ -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)
}
}

Expand Down
Loading