Merge pull request #9034 from dw511214992/add-fields-to-loganalytics-saved-search

azurerm_log_analytics_saved_search - support for `tags`

Author: katbyte

azurerm/internal/services/loganalytics/log_analytics_saved_search_resource.go

@@ -15,6 +15,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loganalytics/parse"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loganalytics/validate"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
@@ -94,6 +95,8 @@ func resourceArmLogAnalyticsSavedSearch() *schema.Resource {
 					),
 				},
 			},
+
+			"tags": tags.ForceNewSchema(),
 		},
 	}
 }
@@ -130,6 +133,7 @@ func resourceArmLogAnalyticsSavedSearchCreate(d *schema.ResourceData, meta inter
 			DisplayName:   utils.String(d.Get("display_name").(string)),
 			Query:         utils.String(d.Get("query").(string)),
 			FunctionAlias: utils.String(d.Get("function_alias").(string)),
+			Tags:          expandArmSavedSearchTag(d.Get("tags").(map[string]interface{})), // expand tags because it's defined as object set in service
 		},
 	}
 
@@ -194,6 +198,11 @@ func resourceArmLogAnalyticsSavedSearchRead(d *schema.ResourceData, meta interfa
 			functionParams = strings.Split(*props.FunctionParameters, ", ")
 		}
 		d.Set("function_parameters", functionParams)
+
+		// flatten tags because it's defined as object set in service
+		if err := d.Set("tags", flattenArmSavedSearchTag(props.Tags)); err != nil {
+			return fmt.Errorf("setting `tag`: %+v", err)
+		}
 	}
 
 	return nil
@@ -214,3 +223,35 @@ func resourceArmLogAnalyticsSavedSearchDelete(d *schema.ResourceData, meta inter
 
 	return nil
 }
+
+func expandArmSavedSearchTag(input map[string]interface{}) *[]operationalinsights.Tag {
+	results := make([]operationalinsights.Tag, 0)
+	for key, value := range input {
+		result := operationalinsights.Tag{
+			Name:  utils.String(key),
+			Value: utils.String(value.(string)),
+		}
+		results = append(results, result)
+	}
+	return &results
+}
+
+func flattenArmSavedSearchTag(input *[]operationalinsights.Tag) map[string]interface{} {
+	results := make(map[string]interface{})
+	if input == nil {
+		return results
+	}
+
+	for _, item := range *input {
+		var key string
+		if item.Name != nil {
+			key = *item.Name
+		}
+		var value string
+		if item.Value != nil {
+			value = *item.Value
+		}
+		results[key] = value
+	}
+	return results
+}

azurerm/internal/services/loganalytics/tests/log_analytics_saved_search_resource_test.go

@@ -50,6 +50,25 @@ func TestAccAzureRMLogAnalyticsSavedSearch_complete(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMLogAnalyticsSavedSearch_withTag(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_log_analytics_saved_search", "test")
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { acceptance.PreCheck(t) },
+		Providers:    acceptance.SupportedProviders,
+		CheckDestroy: testCheckAzureRMLogAnalyticsSavedSearchDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAzureRMLogAnalyticsSavedSearch_withTag(data),
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMLogAnalyticsSavedSearchExists(data.ResourceName),
+				),
+			},
+			data.ImportStep(),
+		},
+	})
+}
+
 func TestAccAzureRMLogAnalyticsSavedSearch_requiresImport(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_log_analytics_saved_search", "test")
 
@@ -205,3 +224,36 @@ resource "azurerm_log_analytics_saved_search" "test" {
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
 }
+
+func testAccAzureRMLogAnalyticsSavedSearch_withTag(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+provider "azurerm" {
+  features {}
+}
+
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_log_analytics_workspace" "test" {
+  name                = "acctestLAW-%d"
+  location            = azurerm_resource_group.test.location
+  resource_group_name = azurerm_resource_group.test.name
+  sku                 = "PerGB2018"
+}
+
+resource "azurerm_log_analytics_saved_search" "test" {
+  name                       = "acctestLASS-%d"
+  log_analytics_workspace_id = azurerm_log_analytics_workspace.test.id
+
+  category     = "Saved Search Test Category"
+  display_name = "Create or Update Saved Search Test"
+  query        = "Heartbeat | summarize Count() by Computer | take a"
+
+  tags = {
+    "Environment" = "Test"
+  }
+}
+`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
+}

website/docs/r/log_analytics_saved_search.html.markdown

@@ -54,6 +54,8 @@ The following arguments are supported:
 
 * `function_parameters` - (Optional) The function parameters if the query serves as a function. Changing this forces a new resource to be created.
 
+* `tags` - (Optional) A mapping of tags which should be assigned to the Logs Analytics Saved Search.
+
 ## Attributes Reference
 
 The following attributes are exported: