Add support for Integration Account with Integration Service Environm…

…ent (#14015)

internal/services/logic/logic_app_integration_account_resource.go

@@ -59,6 +59,13 @@ func resourceLogicAppIntegrationAccount() *pluginsdk.Resource {
 				}, false),
 			},
 
+			"integration_service_environment_id": {
+				Type:         pluginsdk.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				ValidateFunc: validate.IntegrationServiceEnvironmentID,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -93,6 +100,12 @@ func resourceLogicAppIntegrationAccountCreateUpdate(d *pluginsdk.ResourceData, m
 		Tags: tags.Expand(d.Get("tags").(map[string]interface{})),
 	}
 
+	if v, ok := d.GetOk("integration_service_environment_id"); ok {
+		account.IntegrationAccountProperties.IntegrationServiceEnvironment = &logic.ResourceReference{
+			ID: utils.String(v.(string)),
+		}
+	}
+
 	if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, account); err != nil {
 		return fmt.Errorf("creating Integration Account %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
@@ -130,6 +143,14 @@ func resourceLogicAppIntegrationAccountRead(d *pluginsdk.ResourceData, meta inte
 	d.Set("location", location.NormalizeNilable(resp.Location))
 	d.Set("sku_name", string(resp.Sku.Name))
 
+	if props := resp.IntegrationAccountProperties; props != nil {
+		iseId := ""
+		if props.IntegrationServiceEnvironment != nil && props.IntegrationServiceEnvironment.ID != nil {
+			iseId = *props.IntegrationServiceEnvironment.ID
+		}
+		d.Set("integration_service_environment_id", iseId)
+	}
+
 	return tags.FlattenAndSet(d, resp.Tags)
 }
 

internal/services/logic/logic_app_integration_account_resource_test.go

@@ -96,6 +96,21 @@ func TestAccLogicAppIntegrationAccount_update(t *testing.T) {
 	})
 }
 
+func TestAccLogicAppIntegrationAccount_integrationServiceEnvironment(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_logic_app_integration_account", "test")
+	r := LogicAppIntegrationAccountResource{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.integrationServiceEnvironment(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func (LogicAppIntegrationAccountResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
 	id, err := parse.IntegrationAccountID(state.ID)
 	if err != nil {
@@ -180,3 +195,17 @@ resource "azurerm_logic_app_integration_account" "test" {
 }
 `, r.template(data), data.RandomInteger)
 }
+
+func (r LogicAppIntegrationAccountResource) integrationServiceEnvironment(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_logic_app_integration_account" "test" {
+  name                               = "acctest-IA-%d"
+  location                           = azurerm_resource_group.test.location
+  resource_group_name                = azurerm_resource_group.test.name
+  sku_name                           = "Standard"
+  integration_service_environment_id = azurerm_integration_service_environment.test.id
+}
+`, IntegrationServiceEnvironmentResource{}.basic(data), data.RandomInteger)
+}

website/docs/r/logic_app_integration_account.html.markdown

@@ -43,6 +43,8 @@ The following arguments are supported:
 
 ---
 
+* `integration_service_environment_id` - (Optional) The resource ID of the Integration Service Environment. Changing this forces a new Logic App Integration Account to be created.
+
 * `tags` - (Optional) A mapping of tags which should be assigned to the Logic App Integration Account.
 
 ## Attributes Reference