From 0de848ea6c7fdd627ba5b59abf1137ce4e49bd3f Mon Sep 17 00:00:00 2001
From: Jim Paine <jim@jimpaine.io>
Date: Wed, 5 Sep 2018 17:23:00 +0100
Subject: [PATCH] Removed validation from arm_function_app (#1872)

* Removed validation from arm_function_app

* Removing the entry from the changelog

* Fixing the test
---
 azurerm/resource_arm_function_app.go      | 4 ----
 azurerm/resource_arm_function_app_test.go | 8 ++++----
 website/docs/r/function_app.html.markdown | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/azurerm/resource_arm_function_app.go b/azurerm/resource_arm_function_app.go
index 9941e1ca8a3c..071ae1084297 100644
--- a/azurerm/resource_arm_function_app.go
+++ b/azurerm/resource_arm_function_app.go
@@ -52,10 +52,6 @@ func resourceArmFunctionApp() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				Default:  "~1",
-				ValidateFunc: validation.StringInSlice([]string{
-					"~1",
-					"beta",
-				}, false),
 			},
 
 			"storage_connection_string": {
diff --git a/azurerm/resource_arm_function_app_test.go b/azurerm/resource_arm_function_app_test.go
index 09b26c55c65d..640304a7dcf7 100644
--- a/azurerm/resource_arm_function_app_test.go
+++ b/azurerm/resource_arm_function_app_test.go
@@ -234,8 +234,8 @@ func TestAccAzureRMFunctionApp_updateVersion(t *testing.T) {
 	resourceName := "azurerm_function_app.test"
 	ri := acctest.RandInt()
 	rs := strings.ToLower(acctest.RandString(11))
-	preConfig := testAccAzureRMFunctionApp_version(ri, rs, testLocation(), "beta")
-	postConfig := testAccAzureRMFunctionApp_version(ri, rs, testLocation(), "~1")
+	preConfig := testAccAzureRMFunctionApp_version(ri, rs, testLocation(), "~1")
+	postConfig := testAccAzureRMFunctionApp_version(ri, rs, testLocation(), "~2")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -246,14 +246,14 @@ func TestAccAzureRMFunctionApp_updateVersion(t *testing.T) {
 				Config: preConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMFunctionAppExists(resourceName),
-					resource.TestCheckResourceAttr(resourceName, "version", "beta"),
+					resource.TestCheckResourceAttr(resourceName, "version", "~1"),
 				),
 			},
 			{
 				Config: postConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMFunctionAppExists(resourceName),
-					resource.TestCheckResourceAttr(resourceName, "version", "~1"),
+					resource.TestCheckResourceAttr(resourceName, "version", "~2"),
 				),
 			},
 		},
diff --git a/website/docs/r/function_app.html.markdown b/website/docs/r/function_app.html.markdown
index a370386b0f39..ddfadae55db3 100644
--- a/website/docs/r/function_app.html.markdown
+++ b/website/docs/r/function_app.html.markdown
@@ -107,7 +107,7 @@ The following arguments are supported:
 
 * `https_only` - (Optional) Can the Function App only be accessed via HTTPS? Defaults to `false`.
 
-* `version` - (Optional) The runtime version associated with the Function App. Possible values are `~1` and `beta`. Defaults to `~1`.
+* `version` - (Optional) The runtime version associated with the Function App. Defaults to `~1`.
 
 * `site_config` - (Optional) A `site_config` object as defined below.