Skip to content
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

Removed validation from arm_function_app #1872

Merged
merged 3 commits into from
Sep 5, 2018
Merged

Removed validation from arm_function_app #1872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
315d123
Removed validation from arm_function_app
JimPaine Sep 5, 2018
823053a
Removing the entry from the changelog
tombuildsstuff Sep 5, 2018
abbbd8e
Fixing the test
tombuildsstuff Sep 5, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ IMPROVEMENTS:
* `azurerm_storage_container` - support for import [GH-1816]
* `azurerm_storage_queue` - support for import [GH-1816]
* `azurerm_storage_table` - support for import [GH-1816]
* `azurerm_function_app` - support for specific versions [GH-1731]
Copy link
Contributor

Choose a reason for hiding this comment

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

can you revert this change? we update the CHANGELOG once things are merged to prevent conflicts (since this file changes frequently)


BUG FIXES:

Expand Down
4 changes: 0 additions & 4 deletions azurerm/resource_arm_function_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions azurerm/resource_arm_function_app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
Expand All @@ -246,7 +246,7 @@ func TestAccAzureRMFunctionApp_updateVersion(t *testing.T) {
Config: preConfig,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMFunctionAppExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "version", "beta"),
resource.TestCheckResourceAttr(resourceName, "version", "~1"),
),
},
{
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/function_app.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down