Merge branch 'master' into vishal-search-tf-resource

Author: sumovishal

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 2.22.1 (Unreleased)
-
+FEATURES:
+* resource/sumologic_slo: Added support for associating tags with an SLO
 ## 2.22.0 (March 23, 2023)
 FEATURES:
 * resource/sumologic_monitor: Added support for creating SLO Monitors with multiple burn rates (GH-499)

GNUmakefile

@@ -4,6 +4,7 @@ WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=sumologic
 PLUGIN_DIR=~/.terraform.d/plugins
 UNAME=$(shell uname -m)
+DEBUG_FLAGS=-gcflags="all=-N -l"
 
 default: build
 
@@ -22,9 +23,9 @@ install: fmtcheck
 install-dev: fmtcheck
 	mkdir -vp $(PLUGIN_DIR)
 ifeq ($(UNAME), arm64)
-	go build -o $(PLUGIN_DIR)/sumologic.com/dev/sumologic/1.0.0/darwin_arm64/terraform-provider-sumologic 
+	go build ${DEBUG_FLAGS} -o $(PLUGIN_DIR)/sumologic.com/dev/sumologic/1.0.0/darwin_arm64/terraform-provider-sumologic 
 else
-	go build -o $(PLUGIN_DIR)/sumologic.com/dev/sumologic/1.0.0/darwin_amd64/terraform-provider-sumologic
+	go build ${DEBUG_FLAGS} -o $(PLUGIN_DIR)/sumologic.com/dev/sumologic/1.0.0/darwin_amd64/terraform-provider-sumologic
 endif
 
 uninstall:

sumologic/resource_sumologic_content.go

@@ -3,6 +3,7 @@ package sumologic
 import (
 	"encoding/json"
 	"log"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -28,6 +29,7 @@ func resourceSumologicContent() *schema.Resource {
 				ValidateFunc:     validation.StringIsJSON,
 				Required:         true,
 				DiffSuppressFunc: structure.SuppressJsonDiff,
+				StateFunc:        configStateFunc,
 			},
 		},
 		Timeouts: &schema.ResourceTimeout{
@@ -39,6 +41,73 @@ func resourceSumologicContent() *schema.Resource {
 	}
 }
 
+func configStateFunc(value interface{}) string {
+	return normalizeConfig(value.(string))
+}
+
+// modify json config to remove logically equivalent changes in terrafrom diff output
+// e.g. absent map entry vs map entry with null value
+// or absent map entry vs map entry with default value
+func normalizeConfig(originalConfig string) string {
+	config, err := structure.ExpandJsonFromString(originalConfig)
+
+	if err != nil {
+		log.Println("Couldn't expand config json from string")
+		return originalConfig
+	}
+
+	removeEmptyValues(config)
+	fillPanelQueriesDefaultValues(config)
+
+	if config["theme"] != nil {
+		config["theme"] = strings.ToLower(config["theme"].(string))
+	}
+
+	children, ok := config["children"].([]interface{})
+	if ok {
+		for _, childItemObject := range children {
+			childItemMap, ok := childItemObject.(map[string]interface{})
+			if ok {
+				fillPanelQueriesDefaultValues(childItemMap)
+			}
+		}
+	}
+	configString, err := structure.FlattenJsonToString(config)
+	if err != nil {
+		log.Println("Couldn't flatten config json to string")
+		return originalConfig
+	}
+
+	return configString
+}
+
+func fillPanelQueriesDefaultValues(config map[string]interface{}) {
+	if config["panels"] != nil {
+		panels := config["panels"].([]interface{})
+
+		for _, panelInterface := range panels {
+			panelItem := panelInterface.(map[string]interface{})
+
+			for range panelItem {
+				if panelItem["queries"] != nil {
+					queries := panelItem["queries"].([]interface{})
+					for _, queryInterface := range queries {
+						queryItem := queryInterface.(map[string]interface{})
+
+						if queryItem["outputCardinalityLimit"] == nil {
+							queryItem["outputCardinalityLimit"] = 1000
+						}
+
+						if queryItem["transient"] == nil {
+							queryItem["transient"] = false
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 func resourceSumologicContentRead(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(*Client)
 	// Retrieve the content Id from the state
@@ -61,6 +130,9 @@ func resourceSumologicContentRead(d *schema.ResourceData, meta interface{}) erro
 
 	// Write the newly read content object into the schema
 	d.Set("config", content.Config)
+
+	normalizedConfig := normalizeConfig(content.Config)
+	d.Set("config", normalizedConfig)
 	return nil
 }
 

sumologic/resource_sumologic_kinesis_log_source.go

@@ -36,7 +36,7 @@ func resourceSumologicKinesisLogSource() *schema.Resource {
 	}
 	kinesisLogSource.Schema["authentication"] = &schema.Schema{
 		Type:     schema.TypeList,
-		Optional: true,
+		Required: true,
 		MaxItems: 1,
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
@@ -63,7 +63,7 @@ func resourceSumologicKinesisLogSource() *schema.Resource {
 
 	kinesisLogSource.Schema["path"] = &schema.Schema{
 		Type:     schema.TypeList,
-		Optional: true,
+		Required: true,
 		MaxItems: 1,
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{

sumologic/resource_sumologic_slo.go

@@ -276,6 +276,13 @@ func resourceSumologicSLO() *schema.Resource {
 					},
 				},
 			},
+			"tags": {
+				Type:     schema.TypeMap,
+				Optional: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"is_mutable": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -366,6 +373,7 @@ func resourceSLORead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("is_system", slo.IsSystem)
 	d.Set("service", slo.Service)
 	d.Set("application", slo.Application)
+	d.Set("tags", slo.Tags)
 
 	flatCompliance, err := flattenSLOCompliance(slo.Compliance)
 	if err != nil {
@@ -561,6 +569,7 @@ func resourceToSLO(d *schema.ResourceData) (*SLOLibrarySLO, error) {
 		Indicator:   *indicator,
 		Service:     d.Get("service").(string),
 		Application: d.Get("application").(string),
+		Tags:        d.Get("tags").(map[string]interface{}),
 	}
 
 	err = verifySLOObject(slo)