Skip to content

Commit

Permalink
azurerm_[linux|windows]_function_app and `azurerm_[linux|windows]_f…
Browse files Browse the repository at this point in the history
…unction_app_slot` fix `app_settings` diff when `vnet_route_all_enabled = true` (#18836)
  • Loading branch information
jackofallops authored Oct 18, 2022
1 parent 12894da commit 37bf035
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions internal/services/appservice/linux_function_app_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,8 @@ func (m *LinuxFunctionAppModel) unpackLinuxFunctionAppSettings(input web.StringD
appSettings[k] = utils.NormalizeNilableString(v)
}

case "WEBSITE_VNET_ROUTE_ALL":
// Filter out - handled by site_config setting `vnet_route_all_enabled`
default:
appSettings[k] = utils.NormalizeNilableString(v)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,9 @@ func (m *LinuxFunctionAppSlotModel) unpackLinuxFunctionAppSettings(input web.Str
appSettings[k] = utils.NormalizeNilableString(v)
}

case "WEBSITE_VNET_ROUTE_ALL":
// Filter out - handled by site_config setting `vnet_route_all_enabled`

default:
appSettings[k] = utils.NormalizeNilableString(v)
}
Expand Down
3 changes: 3 additions & 0 deletions internal/services/appservice/windows_function_app_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,9 @@ func (m *WindowsFunctionAppModel) unpackWindowsFunctionAppSettings(input web.Str
case "AzureWebJobsDashboard__accountName":
m.BuiltinLogging = true

case "WEBSITE_VNET_ROUTE_ALL":
// Filter out - handled by site_config setting `vnet_route_all_enabled`

default:
appSettings[k] = utils.NormalizeNilableString(v)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,9 @@ func (m *WindowsFunctionAppSlotModel) unpackWindowsFunctionAppSettings(input web
case "AzureWebJobsDashboard__accountName":
m.BuiltinLogging = true

case "WEBSITE_VNET_ROUTE_ALL":
// Filter out - handled by site_config setting `vnet_route_all_enabled`

default:
appSettings[k] = utils.NormalizeNilableString(v)
}
Expand Down

0 comments on commit 37bf035

Please sign in to comment.