update: vnet image fixes and vnet backup restore feature (#201)

* removing azapi components for webapp, functionapp

* new functionality for vnet_image_pull_enabled and virtual_network_backup_restore_enabled features

* avm scripts

---------

Co-authored-by: root <[email protected]>

Author: donovm4

README.md

@@ -16,8 +16,6 @@ The following requirements are needed by this module:
 
 - <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.11)
 
-- <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (~> 2.0)
-
 - <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 4.0, >= 4.8.0, >= 4.21.1, < 5.0.0)
 
 - <a name="requirement_modtm"></a> [modtm](#requirement\_modtm) (~> 0.3)
@@ -28,10 +26,6 @@ The following requirements are needed by this module:
 
 The following resources are used by this module:
 
-- [azapi_update_resource.linux_functionapp](https://registry.terraform.io/providers/Azure/azapi/latest/docs/resources/update_resource) (resource)
-- [azapi_update_resource.linux_webapp](https://registry.terraform.io/providers/Azure/azapi/latest/docs/resources/update_resource) (resource)
-- [azapi_update_resource.windows_functionapp](https://registry.terraform.io/providers/Azure/azapi/latest/docs/resources/update_resource) (resource)
-- [azapi_update_resource.windows_webapp](https://registry.terraform.io/providers/Azure/azapi/latest/docs/resources/update_resource) (resource)
 - [azurerm_app_service_certificate.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/app_service_certificate) (resource)
 - [azurerm_app_service_custom_hostname_binding.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/app_service_custom_hostname_binding) (resource)
 - [azurerm_app_service_slot_custom_hostname_binding.slot](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/app_service_slot_custom_hostname_binding) (resource)
@@ -2132,6 +2126,14 @@ Type: `bool`
 
 Default: `true`
 
+### <a name="input_virtual_network_backup_restore_enabled"></a> [virtual\_network\_backup\_restore\_enabled](#input\_virtual\_network\_backup\_restore\_enabled)
+
+Description: Should backup and restore operations over the linked virtual network are enabled? Defaults to `false`.
+
+Type: `bool`
+
+Default: `false`
+
 ### <a name="input_virtual_network_subnet_id"></a> [virtual\_network\_subnet\_id](#input\_virtual\_network\_subnet\_id)
 
 Description: The ID of the subnet to deploy the Function App in.
@@ -2142,7 +2144,7 @@ Default: `null`
 
 ### <a name="input_vnet_image_pull_enabled"></a> [vnet\_image\_pull\_enabled](#input\_vnet\_image\_pull\_enabled)
 
-Description: Should the App Service pull images from a Virtual Network? Defaults to `false`.
+Description: Should the traffic for the image pull be routed over virtual network enabled? Defaults to `false`.
 
 Type: `bool`
 

main.function_app.tf

@@ -23,7 +23,9 @@ resource "azurerm_windows_function_app" "this" {
   storage_key_vault_secret_id                    = var.storage_key_vault_secret_id
   storage_uses_managed_identity                  = var.storage_uses_managed_identity == true && var.storage_account_access_key == null ? var.storage_uses_managed_identity : null
   tags                                           = var.tags
+  virtual_network_backup_restore_enabled         = var.virtual_network_backup_restore_enabled
   virtual_network_subnet_id                      = var.virtual_network_subnet_id
+  vnet_image_pull_enabled                        = var.vnet_image_pull_enabled
   webdeploy_publish_basic_authentication_enabled = var.site_config.ftps_state == "Disabled" ? false : var.webdeploy_publish_basic_authentication_enabled
   zip_deploy_file                                = var.zip_deploy_file
 
@@ -412,17 +414,17 @@ resource "azurerm_windows_function_app" "this" {
   }
 }
 
-resource "azapi_update_resource" "windows_functionapp" {
-  count = var.kind == "functionapp" && var.os_type == "Windows" && var.vnet_image_pull_enabled ? 1 : 0
+# resource "azapi_update_resource" "windows_functionapp" {
+#   count = var.kind == "functionapp" && var.os_type == "Windows" && var.vnet_image_pull_enabled ? 1 : 0
 
-  resource_id = azurerm_windows_function_app.this[0].id
-  type        = "Microsoft.Web/sites@2024-04-01"
-  body = {
-    properties = {
-      vnetImagePullEnabled = var.vnet_image_pull_enabled
-    }
-  }
-}
+#   resource_id = azurerm_windows_function_app.this[0].id
+#   type        = "Microsoft.Web/sites@2024-04-01"
+#   body = {
+#     properties = {
+#       vnetImagePullEnabled = var.vnet_image_pull_enabled
+#     }
+#   }
+# }
 
 resource "azurerm_linux_function_app" "this" {
   count = var.kind == "functionapp" && var.os_type == "Linux" && var.function_app_uses_fc1 == false ? 1 : 0
@@ -449,7 +451,9 @@ resource "azurerm_linux_function_app" "this" {
   storage_key_vault_secret_id                    = var.storage_key_vault_secret_id
   storage_uses_managed_identity                  = var.storage_uses_managed_identity == true && var.storage_account_access_key == null ? var.storage_uses_managed_identity : null
   tags                                           = var.tags
+  virtual_network_backup_restore_enabled         = var.virtual_network_backup_restore_enabled
   virtual_network_subnet_id                      = var.virtual_network_subnet_id
+  vnet_image_pull_enabled                        = var.vnet_image_pull_enabled
   webdeploy_publish_basic_authentication_enabled = var.site_config.ftps_state == "Disabled" ? false : var.webdeploy_publish_basic_authentication_enabled
   zip_deploy_file                                = var.zip_deploy_file
 
@@ -853,17 +857,17 @@ resource "azurerm_linux_function_app" "this" {
   }
 }
 
-resource "azapi_update_resource" "linux_functionapp" {
-  count = var.kind == "functionapp" && var.os_type == "Linux" && var.vnet_image_pull_enabled ? 1 : 0
-
-  resource_id = azurerm_linux_function_app.this[0].id
-  type        = "Microsoft.Web/sites@2024-04-01"
-  body = {
-    properties = {
-      vnetImagePullEnabled = var.vnet_image_pull_enabled
-    }
-  }
-}
+# resource "azapi_update_resource" "linux_functionapp" {
+#   count = var.kind == "functionapp" && var.os_type == "Linux" && var.vnet_image_pull_enabled ? 1 : 0
+
+#   resource_id = azurerm_linux_function_app.this[0].id
+#   type        = "Microsoft.Web/sites@2024-04-01"
+#   body = {
+#     properties = {
+#       vnetImagePullEnabled = var.vnet_image_pull_enabled
+#     }
+#   }
+# }
 
 resource "azurerm_function_app_flex_consumption" "this" {
   count = var.kind == "functionapp" && var.os_type == "Linux" && var.function_app_uses_fc1 == true ? 1 : 0

main.web_app.tf

@@ -527,17 +527,17 @@ resource "azurerm_windows_web_app" "this" {
   }
 }
 
-resource "azapi_update_resource" "windows_webapp" {
-  count = var.kind == "webapp" && var.os_type == "Windows" && var.vnet_image_pull_enabled ? 1 : 0
-
-  resource_id = azurerm_windows_web_app.this[0].id
-  type        = "Microsoft.Web/sites@2024-04-01"
-  body = {
-    properties = {
-      vnetImagePullEnabled = var.vnet_image_pull_enabled
-    }
-  }
-}
+# resource "azapi_update_resource" "windows_webapp" {
+#   count = var.kind == "webapp" && var.os_type == "Windows" && var.vnet_image_pull_enabled ? 1 : 0
+
+#   resource_id = azurerm_windows_web_app.this[0].id
+#   type        = "Microsoft.Web/sites@2024-04-01"
+#   body = {
+#     properties = {
+#       vnetImagePullEnabled = var.vnet_image_pull_enabled
+#     }
+#   }
+# }
 
 resource "azurerm_linux_web_app" "this" {
   count = var.kind == "webapp" && var.os_type == "Linux" ? 1 : 0
@@ -1044,14 +1044,14 @@ resource "azurerm_linux_web_app" "this" {
   }
 }
 
-resource "azapi_update_resource" "linux_webapp" {
-  count = var.kind == "webapp" && var.os_type == "Linux" && var.vnet_image_pull_enabled ? 1 : 0
-
-  resource_id = azurerm_linux_web_app.this[0].id
-  type        = "Microsoft.Web/sites@2024-04-01"
-  body = {
-    properties = {
-      vnetImagePullEnabled = var.vnet_image_pull_enabled
-    }
-  }
-}
+# resource "azapi_update_resource" "linux_webapp" {
+#   count = var.kind == "webapp" && var.os_type == "Linux" && var.vnet_image_pull_enabled ? 1 : 0
+
+#   resource_id = azurerm_linux_web_app.this[0].id
+#   type        = "Microsoft.Web/sites@2024-04-01"
+#   body = {
+#     properties = {
+#       vnetImagePullEnabled = var.vnet_image_pull_enabled
+#     }
+#   }
+# }

terraform.tf

@@ -1,10 +1,6 @@
 terraform {
   required_version = "~> 1.11"
   required_providers {
-    azapi = {
-      source  = "Azure/azapi"
-      version = "~> 2.0"
-    }
     azurerm = {
       source  = "hashicorp/azurerm"
       version = "~> 4.0, >= 4.8.0, >= 4.21.1, < 5.0.0"

variables.tf

@@ -1498,6 +1498,12 @@ variable "use_extension_bundle" {
   description = "Should the extension bundle be used? (Logic App)"
 }
 
+variable "virtual_network_backup_restore_enabled" {
+  type        = bool
+  default     = false
+  description = "Should backup and restore operations over the linked virtual network are enabled? Defaults to `false`."
+}
+
 variable "virtual_network_subnet_id" {
   type        = string
   default     = null
@@ -1507,7 +1513,7 @@ variable "virtual_network_subnet_id" {
 variable "vnet_image_pull_enabled" {
   type        = bool
   default     = false
-  description = "Should the App Service pull images from a Virtual Network? Defaults to `false`."
+  description = "Should the traffic for the image pull be routed over virtual network enabled? Defaults to `false`."
 }
 
 variable "webdeploy_publish_basic_authentication_enabled" {