Skip to content

chore: upgrade azurerm to 5.0.1 #3981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgravois merged 3 commits into from
Aug 12, 2026
Merged

chore: upgrade azurerm to 5.0.1 #3981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a89e00
chore: upgrade azurerm to 5.0.1
jgravois Aug 12, 2026
42fb2d5
refactor: simplify logic for dynamically calculating service endpoints
jgravois Aug 12, 2026
472ddbf
chore: wire up dependabot to track terraform plugins
jgravois Aug 12, 2026
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
9 changes: 9 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,12 @@ updates:
include: "scope"
labels:
- "dependencies"
- package-ecosystem: "terraform"
directory: "/terraform"
schedule:
interval: "daily"
commit-message:
prefix: "chore"
include: "scope"
labels:
- "dependencies"
1 change: 1 addition & 0 deletions terraform/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*.tfstate.*

# Crash log files
core

@jgravois jgravois Aug 12, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a binary file that can be generated when terraform encounters an uncaught exception.

crash.log
crash.*.log

Expand Down
55 changes: 28 additions & 27 deletions terraform/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions terraform/key_vault.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@ locals {
}

resource "azurerm_key_vault" "main" {
name = local.key_vault_name
location = data.azurerm_resource_group.main.location
resource_group_name = data.azurerm_resource_group.main.name
sku_name = "standard"
tenant_id = data.azurerm_client_config.current.tenant_id
purge_protection_enabled = true
name = local.key_vault_name
location = data.azurerm_resource_group.main.location
resource_group_name = data.azurerm_resource_group.main.name
sku_name = "standard"
tenant_id = data.azurerm_client_config.current.tenant_id
purge_protection_enabled = true
rbac_authorization_enabled = false

@jgravois jgravois Aug 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

newly required property


lifecycle {
prevent_destroy = true
Expand Down
2 changes: 1 addition & 1 deletion terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 4.67"
version = "~> 5.0.1"

@thekaveman thekaveman Aug 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a way to configure @dependabot to watch this version?

@jgravois jgravois Aug 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

supposedly yes! 1add207 472ddbf

https://docs.github.com/en/code-security/reference/supply-chain-security/supported-ecosystems-and-repositories#terraform

@jgravois jgravois Aug 17, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

confirmed (via #3992)

}
}

Expand Down
1 change: 1 addition & 0 deletions terraform/modules/application/environment.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ resource "azurerm_container_app_environment" "main" {
name = "CAE-CDT-PUB-VIP-CALITP-${var.env_letter}-001"
location = var.location
resource_group_name = var.resource_group_name
logs_destination = "log-analytics"

@jgravois jgravois Aug 12, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no longer computed

log_analytics_workspace_id = var.log_analytics_workspace_id
infrastructure_subnet_id = var.subnet_ca_id
internal_load_balancer_enabled = false
Expand Down
15 changes: 10 additions & 5 deletions terraform/network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ resource "azurerm_subnet" "main" {
virtual_network_name = azurerm_virtual_network.main.name
resource_group_name = data.azurerm_resource_group.main.name
address_prefixes = each.value.prefix
service_endpoints = each.value.service_endpoints

dynamic "service_endpoint" {
for_each = coalesce(each.value.service_endpoints, [])
content {
service = service_endpoint.value
}
}

@jgravois jgravois Aug 12, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this bit wasn't nearly as explicit as everything else in the upgrade guide.

what gemini suggested appears to be equivalent, but i have to admit my level of understanding of our networking is shaky at best.

@thekaveman thekaveman Aug 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this looks right to me too. I wonder if possible to make the default service_endpoints value [] (above in locals) to avoid this ternary, but nbd.

Ref: https://developer.hashicorp.com/terraform/language/expressions/dynamic-blocks

@jgravois jgravois Aug 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if possible to make the default service_endpoints value [] (above in locals) to avoid this ternary

not exactly, but d3c54fa 42fb2d5 feels like an improvement.


delegation {
name = "delegation-${lower(each.key)}"
Expand All @@ -67,10 +73,9 @@ resource "azurerm_private_dns_zone" "db" {
}

resource "azurerm_private_dns_zone_virtual_network_link" "db" {
name = "db-link-${lower(local.env_letter)}"
resource_group_name = data.azurerm_resource_group.main.name
private_dns_zone_name = azurerm_private_dns_zone.db.name

@jgravois jgravois Aug 12, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecated (in favor of "private_dns_zone_id")

@thekaveman thekaveman Aug 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was it intentional to lose the resource_group_name as well?

@jgravois jgravois Aug 12, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no! 🤦‍♂️

@jgravois jgravois Aug 12, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i take that back. totally intentional. 😎

The resource_group_name property has been removed in favour of the private_dns_zone_id property. (ref)

virtual_network_id = azurerm_virtual_network.main.id
name = "db-link-${lower(local.env_letter)}"
private_dns_zone_id = azurerm_private_dns_zone.db.id
virtual_network_id = azurerm_virtual_network.main.id

lifecycle {
ignore_changes = [tags]
Expand Down
Loading