Bug Fix: azurerm_log_analytics_linked_service crash fix (#4142)

hashicorp · Aug 28, 2019 · 73f1756 · 73f1756
1 parent e831fab
commit 73f1756
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 6 deletions.
diff --git a/azurerm/resource_arm_log_analytics_linked_service.go b/azurerm/resource_arm_log_analytics_linked_service.go
@@ -57,10 +57,13 @@ func resourceArmLogAnalyticsLinkedService() *schema.Resource {
 			},
 
 			"linked_service_properties": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
+				Type:          schema.TypeList,
+				Optional:      true,
+				Computed:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"resource_id"},
+				MaxItems:      1,
+				Deprecated:    "This property has been deprecated in favour of the 'resource_id' property and will be removed in version 2.0 of the provider",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"resource_id": {
@@ -109,8 +112,8 @@ func resourceArmLogAnalyticsLinkedServiceCreateUpdate(d *schema.ResourceData, me
 
 	resourceId := d.Get("resource_id").(string)
 	if resourceId == "" {
-		props := d.Get("linked_service_properties").(map[string]interface{})
-		resourceId = props["resource_id"].(string)
+		props := d.Get("linked_service_properties").([]interface{})
+		resourceId = expandLogAnalyticsLinkedServiceProperties(props)
 		if resourceId == "" {
 			return fmt.Errorf("A `resource_id` must be specified either using the `resource_id` field at the top level or within the `linked_service_properties` block")
 		}
@@ -205,6 +208,15 @@ func resourceArmLogAnalyticsLinkedServiceDelete(d *schema.ResourceData, meta int
 	return nil
 }
 
+func expandLogAnalyticsLinkedServiceProperties(input []interface{}) string {
+	if len(input) == 0 {
+		return ""
+	}
+
+	props := input[0].(map[string]interface{})
+	return props["resource_id"].(string)
+}
+
 func flattenLogAnalyticsLinkedServiceProperties(input *operationalinsights.LinkedServiceProperties) []interface{} {
 	if input == nil {
 		return []interface{}{}

diff --git a/azurerm/resource_arm_log_analytics_linked_service_test.go b/azurerm/resource_arm_log_analytics_linked_service_test.go
@@ -3,6 +3,7 @@ package azurerm
 import (
 	"fmt"
 	"net/http"
+	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
@@ -95,6 +96,48 @@ func TestAccAzureRMLogAnalyticsLinkedService_complete(t *testing.T) {
 	})
 }
 
+// Deprecated - remove in 2.0
+func TestAccAzureRMLogAnalyticsLinkedService_noResourceID(t *testing.T) {
+	ri := tf.AccRandTimeInt()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config:      testAccAzureRMLogAnalyticsLinkedService_noResourceID(ri, testLocation()),
+				ExpectError: regexp.MustCompile("A `resource_id` must be specified either using the `resource_id` field at the top level or within the `linked_service_properties` block"),
+			},
+		},
+	})
+}
+
+// Deprecated - remove in 2.0
+func TestAccAzureRMLogAnalyticsLinkedService_linkedServiceProperties(t *testing.T) {
+	resourceName := "azurerm_log_analytics_linked_service.test"
+	ri := tf.AccRandTimeInt()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAzureRMLogAnalyticsLinkedService_linkedServiceProperties(ri, testLocation()),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMLogAnalyticsLinkedServiceExists(resourceName),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func testCheckAzureRMLogAnalyticsLinkedServiceDestroy(s *terraform.State) error {
 	conn := testAccProvider.Meta().(*ArmClient).logAnalytics.LinkedServicesClient
 	ctx := testAccProvider.Meta().(*ArmClient).StopContext
@@ -197,6 +240,33 @@ resource "azurerm_log_analytics_linked_service" "test" {
 `, template)
 }
 
+func testAccAzureRMLogAnalyticsLinkedService_noResourceID(rInt int, location string) string {
+	template := testAccAzureRMLogAnalyticsLinkedService_template(rInt, location)
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_log_analytics_linked_service" "test" {
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  workspace_name      = "${azurerm_log_analytics_workspace.test.name}"
+}
+`, template)
+}
+
+func testAccAzureRMLogAnalyticsLinkedService_linkedServiceProperties(rInt int, location string) string {
+	template := testAccAzureRMLogAnalyticsLinkedService_template(rInt, location)
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_log_analytics_linked_service" "test" {
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  workspace_name      = "${azurerm_log_analytics_workspace.test.name}"
+  linked_service_properties {
+    resource_id = "${azurerm_automation_account.test.id}"
+  }
+}
+`, template)
+}
+
 func testAccAzureRMLogAnalyticsLinkedService_template(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {