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

Jump to bottom

Update resource_arm_logic_app_trigger_http_request.go #1918

Merged
merged 2 commits into from
Sep 13, 2018
Merged

Update resource_arm_logic_app_trigger_http_request.go #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
417c0da
Update resource_arm_logic_app_trigger_http_request.go
alastairtree Sep 12, 2018
3485c1e
test: logic app http trigger allows params in url
alastairtree Sep 13, 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
4 changes: 2 additions & 2 deletions azurerm/resource_arm_logic_app_trigger_http_request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ func resourceArmLogicAppTriggerHttpRequestDelete(d *schema.ResourceData, meta in
func validateLogicAppTriggerHttpRequestRelativePath(v interface{}, k string) (ws []string, errors []error) {
value := v.(string)

r, _ := regexp.Compile("^[A-Za-z0-9_]+$")
r, _ := regexp.Compile("^[A-Za-z0-9_/}{]+$")
if !r.MatchString(value) {
errors = append(errors, fmt.Errorf("Relative Path can only contain alphanumeric characters and underscores."))
errors = append(errors, fmt.Errorf("Relative Path can only contain alphanumeric characters, underscores, forward slashes and curly braces."))
}

return
Expand Down
4 changes: 2 additions & 2 deletions azurerm/resource_arm_logic_app_trigger_http_request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func TestAccAzureRMLogicAppTriggerHttpRequest_relativePath(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMLogicAppTriggerExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "method", "POST"),
resource.TestCheckResourceAttr(resourceName, "relative_path", "hello_there"),
resource.TestCheckResourceAttr(resourceName, "relative_path", "customers/{id}"),
),
},
},
Expand Down Expand Up @@ -178,7 +178,7 @@ resource "azurerm_logic_app_trigger_http_request" "test" {
logic_app_id = "${azurerm_logic_app_workflow.test.id}"
schema = "{}"
method = "POST"
relative_path = "hello_there"
relative_path = "customers/{id}"
}
`, template)
}
Expand Down