azurerm_logic_app_action_http - body property support "@" symbol

internal/services/logic/logic_app_action_http_resource.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic" // nolint: staticcheck
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/logic/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tags"
@@ -67,10 +68,14 @@ func resourceLogicAppActionHTTP() *pluginsdk.Resource {
 			},
 
 			"body": {
-				Type:             pluginsdk.TypeString,
-				Optional:         true,
-				ValidateFunc:     validation.StringIsJSON,
-				DiffSuppressFunc: pluginsdk.SuppressJsonDiff,
+				Type:     pluginsdk.TypeString,
+				Optional: true,
+				DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool {
+					if json.Valid([]byte(oldValue)) && json.Valid([]byte(newValue)) {
+						return pluginsdk.SuppressJsonDiff(k, oldValue, newValue, d)
+					}
+					return false
+				},
 			},
 
 			"headers": {
@@ -143,13 +148,18 @@ func resourceLogicAppActionHTTPCreateUpdate(d *pluginsdk.ResourceData, meta inte
 		"queries": queries,
 	}
 
-	// storing action's body in json object to keep consistent with azure portal
+	// if it's json object then storing action's body in json object to keep consistent with azure portal
+	// if starts with dynamic function (starts with "@") then store it as string
 	if bodyRaw, ok := d.GetOk("body"); ok {
-		var body map[string]interface{}
-		if err := json.Unmarshal([]byte(bodyRaw.(string)), &body); err != nil {
-			return fmt.Errorf("unmarshalling JSON for Action %q: %+v", id.Name, err)
+		if json.Valid([]byte(bodyRaw.(string))) {
+			var body map[string]interface{}
+			if err := json.Unmarshal([]byte(bodyRaw.(string)), &body); err != nil {
+				return fmt.Errorf("unmarshalling JSON for Action %q: %+v", id.Name, err)
+			}
+			inputs["body"] = body
+		} else {
+			inputs["body"] = bodyRaw.(string)
 		}
-		inputs["body"] = body
 	}
 
 	action := map[string]interface{}{
@@ -215,12 +225,17 @@ func resourceLogicAppActionHTTPRead(d *pluginsdk.ResourceData, meta interface{})
 	}
 
 	if body := inputs["body"]; body != nil {
-		// if user edit workflow in portal, the body becomes json object
-		v, err := json.Marshal(body)
-		if err != nil {
-			return fmt.Errorf("serializing `body` for Action %q: %+v", id.Name, err)
+		switch body.(type) {
+		case map[string]interface{}:
+			// if user edit workflow in portal, the body becomes json object
+			v, err := json.Marshal(body)
+			if err != nil {
+				return fmt.Errorf("serializing `body` for Action %q: %+v", id.Name, err)
+			}
+			d.Set("body", string(v))
+		case string:
+			d.Set("body", body)
 		}
-		d.Set("body", string(v))
 	}
 
 	if headers := inputs["headers"]; headers != nil {

internal/services/logic/logic_app_action_http_resource_test.go

@@ -91,6 +91,50 @@ func TestAccLogicAppActionHttp_queries(t *testing.T) {
 	})
 }
 
+func TestAccLogicAppActionHttp_dynamicFunction(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_logic_app_action_http", "test")
+	r := LogicAppActionHttpResource{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.withDynamicFunction(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
+func TestAccLogicAppActionHttp_bodyDiff(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_logic_app_action_http", "test")
+	r := LogicAppActionHttpResource{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.basic(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+		{
+			Config: r.withDynamicFunction(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+		{
+			Config: r.complete(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func TestAccLogicAppActionHttp_disappears(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_logic_app_action_http", "test")
 	r := LogicAppActionHttpResource{}
@@ -264,6 +308,22 @@ resource "azurerm_logic_app_action_http" "test" {
 `, r.template(data), data.RandomInteger, data.RandomInteger, data.RandomInteger, condition, condition)
 }
 
+func (r LogicAppActionHttpResource) withDynamicFunction(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_logic_app_action_http" "test" {
+  name         = "action%d"
+  logic_app_id = azurerm_logic_app_workflow.test.id
+  method       = "POST"
+  uri          = "http://example.com/hello"
+  body         = <<BODY
+@concat('{\"summary\": \"Foo\", \"text\": \"',triggerBody()?['data']?['essentials']?['description'],'\"}')
+BODY
+}
+`, r.template(data), data.RandomInteger)
+}
+
 func (LogicAppActionHttpResource) template(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azurerm" {

internal/services/logic/testdata/integration_account_agreement_content_as2.json

@@ -131,4 +131,4 @@
             }
         }
     }
-}
+}

internal/services/logic/testdata/integration_account_agreement_content_x12.json

@@ -181,4 +181,4 @@
             }
         }
     }
-}
+}

internal/services/logic/testdata/integration_account_map_content.liquid

@@ -1 +1 @@
-<h2>Terraform Test</h2>
+<h2>Terraform Test</h2>

internal/services/logic/testdata/integration_account_map_content.xsd

@@ -67,4 +67,4 @@
 </StringRightTrimDestination>
 </ns0:Root>
 </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

internal/services/logic/testdata/integration_account_map_content2.xsd

@@ -67,4 +67,4 @@
             </StringRightTrimDestination>
         </ns0:Root>
     </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

internal/services/logic/testdata/integration_account_schema_content.xsd

@@ -219,4 +219,4 @@
 </xs:sequence>
 </xs:complexType>
 </xs:element>
-</xs:schema>
+</xs:schema>

internal/services/logic/testdata/integration_account_schema_content2.xsd

@@ -219,4 +219,4 @@
 </xs:sequence>
 </xs:complexType>
 </xs:element>
-</xs:schema>
+</xs:schema>