From 417c0da6311c0eafc7d13144f2083015109875f7 Mon Sep 17 00:00:00 2001 From: Alastair Crabtree Date: Wed, 12 Sep 2018 18:17:32 +0100 Subject: [PATCH 1/2] Update resource_arm_logic_app_trigger_http_request.go Fixes #1917 --- azurerm/resource_arm_logic_app_trigger_http_request.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_logic_app_trigger_http_request.go b/azurerm/resource_arm_logic_app_trigger_http_request.go index 43722012b36e..bcd7346f2c41 100644 --- a/azurerm/resource_arm_logic_app_trigger_http_request.go +++ b/azurerm/resource_arm_logic_app_trigger_http_request.go @@ -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 From 3485c1ee761ec3cf11fce48d198879ee90be82ec Mon Sep 17 00:00:00 2001 From: Alastair Crabtree Date: Thu, 13 Sep 2018 16:39:16 +0100 Subject: [PATCH 2/2] test: logic app http trigger allows params in url --- azurerm/resource_arm_logic_app_trigger_http_request_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_logic_app_trigger_http_request_test.go b/azurerm/resource_arm_logic_app_trigger_http_request_test.go index 899e44b5154c..981b14323b6d 100644 --- a/azurerm/resource_arm_logic_app_trigger_http_request_test.go +++ b/azurerm/resource_arm_logic_app_trigger_http_request_test.go @@ -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}"), ), }, }, @@ -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) }