Skip to content

Upgrade Provider Versions #281

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
merged 3 commits into from
Nov 4, 2024
Merged

Upgrade Provider Versions #281

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
e7d442a
Bump azure/azapi from 1.15.0 to 2.0.1 in /code/infra
marvinbuss Nov 4, 2024
b94be8a
Bump hashicorp/azurerm from 4.6.0 to 4.8.0 in /code/infra
marvinbuss Nov 4, 2024
259fdef
Merge branch 'main' into marvinbuss/provider_upgrades
marvinbuss Nov 4, 2024
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
12 changes: 7 additions & 5 deletions code/infra/function.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ resource "azapi_resource" "function" {
type = "SystemAssigned"
}

body = jsonencode({
body = {
kind = "functionapp,linux,container"
properties = {
clientAffinityEnabled = false
Expand Down Expand Up @@ -171,12 +171,14 @@ resource "azapi_resource" "function" {
webSocketsEnabled = false
}
}
})
}

schema_validation_enabled = false
# ignore_body_changes = [ # Required when app settings are managed in a separate process
# "properties.siteConfig.appSettings"
# ]
# lifecycle {
# ignore_changes = [
# body.properties.siteConfig.appSettings, # Required when app settings are managed in a separate process
# ]
# }
depends_on = [
module.key_vault.key_vault_setup_completed,
module.storage_account.storage_setup_completed,
Expand Down
12 changes: 6 additions & 6 deletions code/infra/network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
resource "azapi_resource" "subnet_function" {
type = "Microsoft.Network/virtualNetworks/subnets@2022-07-01"
type = "Microsoft.Network/virtualNetworks/subnets@2024-03-01"
name = "FunctionSubnet"
parent_id = data.azurerm_virtual_network.virtual_network.id

body = jsonencode({
body = {
properties = {
addressPrefix = var.subnet_cidr_function
delegations = [
Expand All @@ -26,15 +26,15 @@ resource "azapi_resource" "subnet_function" {
serviceEndpointPolicies = []
serviceEndpoints = []
}
})
}
}

resource "azapi_resource" "subnet_private_endpoints" {
type = "Microsoft.Network/virtualNetworks/subnets@2022-07-01"
type = "Microsoft.Network/virtualNetworks/subnets@2024-03-01"
name = "PeSubnet"
parent_id = data.azurerm_virtual_network.virtual_network.id

body = jsonencode({
body = {
properties = {
addressPrefix = var.subnet_cidr_private_endpoints
delegations = []
Expand All @@ -50,7 +50,7 @@ resource "azapi_resource" "subnet_private_endpoints" {
serviceEndpointPolicies = []
serviceEndpoints = []
}
})
}

depends_on = [
azapi_resource.subnet_function
Expand Down
4 changes: 2 additions & 2 deletions code/infra/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "4.6.0"
version = "4.8.0"
}
azapi = {
source = "azure/azapi"
version = "1.15.0"
version = "2.0.1"
}
time = {
source = "hashicorp/time"
Expand Down