Merge branch 'master' into sumo.170432.permission.api.resource

Author: sumovishal

.github/workflows/test.yml

@@ -91,6 +91,7 @@ jobs:
         SUMOLOGIC_ENVIRONMENT:  ${{ secrets.SUMOLOGIC_ENVIRONMENT }}
         SUMOLOGIC_TEST_BUCKET_NAME:  ${{ secrets.SUMOLOGIC_TEST_BUCKET_NAME }}
         SUMOLOGIC_TEST_ROLE_ARN:  ${{ secrets.SUMOLOGIC_TEST_ROLE_ARN }}
+        SUMOLOGIC_TEST_GOOGLE_APPLICATION_CREDENTIALS:  ${{ secrets.SUMOLOGIC_TEST_GOOGLE_APPLICATION_CREDENTIALS }}
 
       # disable go test timeout. We rely on GitHub action timeout.
       run: |

CHANGELOG.md

@@ -1,4 +1,22 @@
-## 2.12.0 (Unreleased)
+## 2.12.1 (Unreleased)
+
+ENHANCEMENTS:
+* Add support for importing folder resource (GH-345)
+* Allow AtLeastOnce resolution conditions for Metrics monitors  (GH-346)
+
+## 2.12.0 (February 7, 2022)
+
+FEATURES:
+* **New Resource:** Gcp Metrics Source `sumologic_gcp_metrics_source` (GH-329, 332)
+
+ENHANCEMENTS:
+* Add support for OTLP in HTTP source resource (GH-335)
+* Add backoff on http 429s (GH-338)
+* Add `domain` field to the dashboard resource (GH-341)
+
+BUG FIXES:
+* Fix to allow more than one topology_label for Dashboard resource (GH-336)
+* sumologic_cse_log_mapping split_index as int (GH-333)
 
 ## 2.11.5 (December 14, 2021)
 

README.md

@@ -53,7 +53,11 @@ Then run `terraform init` to initialize it.
 
 In order to run the full suite of Acceptance tests, run `make testacc`.
 
-*Note:* Acceptance tests *create real resources*, and often cost money to run. The environment variables `SUMOLOGIC_ACCESSID`, `SUMOLOGIC_ACCESSKEY`, and `SUMOLOGIC_ENVIRONMENT` must also be set for acceptance tests to work properly.
+*Note:* 
+- Acceptance tests *create real resources*, and often cost money to run. The environment variables `SUMOLOGIC_ACCESSID`, `SUMOLOGIC_ACCESSKEY`, and `SUMOLOGIC_ENVIRONMENT` must also be set for acceptance tests to work properly.
+- Environment variable `SUMOLOGIC_TEST_GOOGLE_APPLICATION_CREDENTIALS` must be set for gcp metrics acceptance tests to work properly (ex. below).
+    - export SUMOLOGIC_TEST_GOOGLE_APPLICATION_CREDENTIALS=`cat /path/to/service_acccount.json`
+    - Set Environment variable `SUMOLOGIC_ENABLE_GCP_METRICS_ACC_TESTS` to false, to disable acceptance test for Gcp Metrics. 
 
 [0]: https://help.sumologic.com/Manage/Security/Access-Keys
 [1]: https://help.sumologic.com/APIs/General_API_Information/Sumo_Logic_Endpoints_and_Firewall_Security

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/go-errors/errors v1.4.0
 	github.com/go-test/deep v1.0.7 // indirect
 	github.com/hashicorp/go-hclog v0.16.2 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/terraform-config-inspect v0.0.0-20210625153042-09f34846faab // indirect

go.sum

@@ -224,6 +224,8 @@ github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uP
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-plugin v1.3.0 h1:4d/wJojzvHV1I4i/rrjVaeuyxWrLzDE1mDCyDy8fXS8=
 github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0=
+github.com/hashicorp/go-retryablehttp v0.7.0 h1:eu1EI/mbirUgP5C8hVsTNaGZreBDlYiwC1FZWkvQPQ4=
+github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
 github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=

sumologic/provider.go

@@ -68,6 +68,7 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_cloudtrail_source":                  resourceSumologicGenericPollingSource(),
 			"sumologic_elb_source":                         resourceSumologicGenericPollingSource(),
 			"sumologic_cloudfront_source":                  resourceSumologicGenericPollingSource(),
+			"sumologic_gcp_metrics_source":                 resourceSumologicGenericPollingSource(),
 			"sumologic_cloud_to_cloud_source":              resourceSumologicCloudToCloudSource(),
 			"sumologic_metadata_source":                    resourceSumologicMetadataSource(),
 			"sumologic_cloudsyslog_source":                 resourceSumologicCloudsyslogSource(),
@@ -91,6 +92,7 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_password_policy":                    resourceSumologicPasswordPolicy(),
 			"sumologic_saml_configuration":                 resourceSumologicSamlConfiguration(),
 			"sumologic_kinesis_metrics_source":             resourceSumologicKinesisMetricsSource(),
+			"sumologic_kinesis_log_source":                 resourceSumologicKinesisLogSource(),
 			"sumologic_token":                              resourceSumologicToken(),
 			"sumologic_policies":                           resourceSumologicPolicies(),
 			"sumologic_hierarchy":                          resourceSumologicHierarchy(),

sumologic/resource_sumologic_cse_log_mapping.go

@@ -1,6 +1,7 @@
 package sumologic
 
 import (
+	"fmt"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"log"
 )
@@ -100,7 +101,7 @@ func resourceSumologicCSELogMapping() *schema.Resource {
 							Optional: true,
 						},
 						"split_index": {
-							Type:     schema.TypeString,
+							Type:     schema.TypeInt,
 							Optional: true,
 						},
 						"field_join": {
@@ -354,7 +355,7 @@ func resourceToCSELogMappingField(data interface{}) CSELogMappingField {
 		field.AlternateValues = resourceStringArrayToStringArray(fieldObj["alternate_values"].([]interface{}))
 		field.TimeZone = fieldObj["time_zone"].(string)
 		field.SplitDelimiter = fieldObj["split_delimiter"].(string)
-		field.SplitIndex = fieldObj["split_index"].(string)
+		field.SplitIndex = fmt.Sprint(fieldObj["split_index"].(int))
 		field.FieldJoin = resourceStringArrayToStringArray(fieldObj["field_join"].([]interface{}))
 		field.JoinDelimiter = fieldObj["join_delimiter"].(string)
 		field.FormatParameters = resourceStringArrayToStringArray(fieldObj["format_parameters"].([]interface{}))

sumologic/resource_sumologic_cse_log_mapping_test.go

@@ -34,7 +34,7 @@ func TestAccSumologicSCELogMapping_create(t *testing.T) {
 		AlternateValues:  []string{"altValue"},
 		TimeZone:         "UTC",
 		SplitDelimiter:   ",",
-		SplitIndex:       "index",
+		SplitIndex:       "0",
 		FieldJoin:        []string{"and"},
 		JoinDelimiter:    "",
 		FormatParameters: []string{"param"},
@@ -90,7 +90,7 @@ func TestAccSumologicSCELogMapping_update(t *testing.T) {
 		AlternateValues:  []string{"altValue"},
 		TimeZone:         "UTC",
 		SplitDelimiter:   ",",
-		SplitIndex:       "index",
+		SplitIndex:       "0",
 		FieldJoin:        []string{"and"},
 		JoinDelimiter:    "",
 		FormatParameters: []string{"param"},

sumologic/resource_sumologic_dashboard.go

@@ -69,7 +69,7 @@ func resourceSumologicDashboard() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"data": {
-							Type:     schema.TypeList,
+							Type:     schema.TypeSet,
 							Required: true,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
@@ -91,6 +91,10 @@ func resourceSumologicDashboard() *schema.Resource {
 					},
 				},
 			},
+			"domain": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"refresh_interval": {
 				Type:         schema.TypeInt,
 				Optional:     true,
@@ -132,7 +136,7 @@ func resourceSumologicDashboard() *schema.Resource {
 				ValidateFunc: validation.StringInSlice([]string{"Light", "Dark"}, true),
 				Default:      "Light",
 			},
-			// TODO Do we need this field in terraform?
+			// TODO: This field is NOT supported. Remove it.
 			"coloring_rule": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -705,6 +709,7 @@ func resourceToDashboard(d *schema.ResourceData) Dashboard {
 		Description:      d.Get("description").(string),
 		FolderId:         d.Get("folder_id").(string),
 		TopologyLabelMap: topologyLabel,
+		Domain:           d.Get("domain").(string),
 		RefreshInterval:  d.Get("refresh_interval").(int),
 		TimeRange:        timeRange,
 		Panels:           panels,
@@ -948,9 +953,9 @@ func getTimeRangeBoundary(tfRangeBoundary map[string]interface{}) interface{} {
 }
 
 func getTopologyLabel(tfTopologyLabel map[string]interface{}) *TopologyLabel {
-	if items := tfTopologyLabel["data"].([]interface{}); len(items) == 1 {
+	if items := tfTopologyLabel["data"].(*schema.Set); items.Len() >= 1 {
 		labelMap := make(map[string][]string)
-		for _, item := range items {
+		for _, item := range items.List() {
 			dataItem := item.(map[string]interface{})
 			key := dataItem["label"].(string)
 			itemValues := dataItem["values"].([]interface{})
@@ -960,6 +965,7 @@ func getTopologyLabel(tfTopologyLabel map[string]interface{}) *TopologyLabel {
 			}
 			labelMap[key] = values
 		}
+
 		return &TopologyLabel{
 			Data: labelMap,
 		}
@@ -1101,6 +1107,9 @@ func setDashboard(d *schema.ResourceData, dashboard *Dashboard) error {
 	if err := d.Set("folder_id", dashboard.FolderId); err != nil {
 		return err
 	}
+	if err := d.Set("domain", dashboard.Domain); err != nil {
+		return err
+	}
 	if err := d.Set("refresh_interval", dashboard.RefreshInterval); err != nil {
 		return err
 	}
@@ -1139,10 +1148,11 @@ func setDashboard(d *schema.ResourceData, dashboard *Dashboard) error {
 	}
 
 	log.Println("=====================================================================")
-	log.Printf("title: %+v\n", d.Get("title"))
-	log.Printf("description: %+v\n", d.Get("description"))
-	log.Printf("folder_id: %+v\n", d.Get("folder_id"))
+	log.Printf("title: %s\n", d.Get("title"))
+	log.Printf("description: %s\n", d.Get("description"))
+	log.Printf("folder_id: %s\n", d.Get("folder_id"))
 	log.Printf("topology_label_map: %+v\n", d.Get("topology_label_map"))
+	log.Printf("domain: %s\n", d.Get("domain"))
 	log.Printf("time_range: %+v\n", d.Get("time_range"))
 	log.Printf("panel: %+v\n", d.Get("panel"))
 	log.Printf("layout: %+v\n", d.Get("layout"))

sumologic/resource_sumologic_dashboard_test.go

@@ -11,6 +11,15 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
+var firstLabelKey = "service"
+var secondLabelKey = "env"
+var topologyLabel = TopologyLabel{
+	Data: map[string][]string{
+		firstLabelKey:  {"collection-proxy"},
+		secondLabelKey: {"dev", "prod"},
+	},
+}
+
 func TestAccSumologicDashboard_basic(t *testing.T) {
 	testNameSuffix := acctest.RandString(16)
 	title := "terraform_test_dashboard_" + testNameSuffix
@@ -41,8 +50,7 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 	description := "Test dashboard description"
 	theme := "Dark"
 	refreshInterval := 120
-	topologyLabel := "service"
-	topologyLabelValue := "collection-proxy"
+	domain := "aws"
 	literalRangeName := "today"
 	textPanel := TextPanel{
 		Key:   "text-panel-001",
@@ -77,7 +85,7 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: dashboardCreateConfig(title, description, theme, refreshInterval,
-					topologyLabel, topologyLabelValue, literalRangeName, textPanel, layout, variable),
+					topologyLabel, domain, literalRangeName, textPanel, layout, variable),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -89,9 +97,9 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"theme", theme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
-						"topology_label_map.0.data.0.label", topologyLabel),
+						"topology_label_map.0.data.#", "2"),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
-						"topology_label_map.0.data.0.values.0", topologyLabelValue),
+						"domain", domain),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.#", "1"),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -124,8 +132,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 	description := "Test dashboard description"
 	theme := "Dark"
 	refreshInterval := 120
-	topologyLabel := "service"
-	topologyLabelValue := "collection-proxy"
+	domain := "aws"
 	literalRangeName := "today"
 	textPanel := TextPanel{
 		Key:   "text-panel-001",
@@ -155,7 +162,8 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 	// updated config
 	newTheme := "Light"
 	newRefreshInterval := 300
-	newTopologyLabelValue := "collection-cluster"
+	newFirstLabelValue := "collection-cluster"
+	updatedDomain := "app"
 	newLiteralRangeName := "week"
 	searchPanel := SumoSearchPanel{
 		Key:   "search-panel-001",
@@ -207,7 +215,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: dashboardCreateConfig(title, description, theme, refreshInterval,
-					topologyLabel, topologyLabelValue, literalRangeName, textPanel, layout, csvVariable),
+					topologyLabel, domain, literalRangeName, textPanel, layout, csvVariable),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -217,7 +225,9 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"theme", theme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
-						"topology_label_map.0.data.0.values.0", topologyLabelValue),
+						"topology_label_map.0.data.#", "2"),
+					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
+						"domain", domain),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.0.begin_bounded_time_range.0.from.0.literal_time_range.0.range_name",
 						literalRangeName),
@@ -237,8 +247,8 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 			},
 			{
 				Config: dashboardUpdateConfig(title, description, newTheme, newRefreshInterval,
-					topologyLabel, newTopologyLabelValue, newLiteralRangeName, textPanel, searchPanel,
-					newLayout, newVariables),
+					firstLabelKey, newFirstLabelValue, updatedDomain, newLiteralRangeName, textPanel,
+					searchPanel, newLayout, newVariables),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -248,7 +258,9 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"theme", newTheme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
-						"topology_label_map.0.data.0.values.0", newTopologyLabelValue),
+						"topology_label_map.0.data.#", "1"),
+					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
+						"domain", updatedDomain),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.0.begin_bounded_time_range.0.from.0.literal_time_range.0.range_name",
 						newLiteralRangeName),
@@ -391,7 +403,7 @@ func dashboardImportConfig(title string) string {
 }
 
 func dashboardCreateConfig(title string, description string, theme string, refreshInterval int,
-	topologyLabel string, topologyLabelValue string, rangeName string, textPanel TextPanel,
+	topologyLabel TopologyLabel, domain string, rangeName string, textPanel TextPanel,
 	layout GridLayout, variable Variable) string {
 
 	return fmt.Sprintf(`
@@ -407,7 +419,12 @@ func dashboardCreateConfig(title string, description string, theme string, refre
 					label = "%s"
 					values = ["%s"]
 				}
+				data {
+					label = "%s"
+					values = ["%s", "%s"]
+				}
 			}
+			domain = "%s"
 			time_range {
 				begin_bounded_time_range {
 					from {
@@ -448,16 +465,18 @@ func dashboardCreateConfig(title string, description string, theme string, refre
 				hide_from_ui = false
 			}
 		}`,
-		title, description, refreshInterval, theme, topologyLabel, topologyLabelValue, rangeName,
-		textPanel.Key, textPanel.Title, textPanel.Text,
+		title, description, refreshInterval, theme, firstLabelKey, topologyLabel.Data[firstLabelKey][0],
+		secondLabelKey, topologyLabel.Data[secondLabelKey][0], topologyLabel.Data[secondLabelKey][1],
+		domain, rangeName, textPanel.Key, textPanel.Title, textPanel.Text,
 		layout.LayoutStructures[0].Key, variable.Name, variable.DisplayName, variable.DefaultValue,
 		variable.SourceDefinition.(CsvVariableSourceDefinition).Values,
 	)
 }
 
 func dashboardUpdateConfig(title string, description string, theme string, refreshInterval int,
-	topologyLabel string, topologyLabelValue string, rangeName string, textPanel TextPanel,
-	searchPanel SumoSearchPanel, layout GridLayout, variables []Variable) string {
+	topologyLabel string, topologyLabelValue string, domain string, rangeName string,
+	textPanel TextPanel, searchPanel SumoSearchPanel, layout GridLayout,
+	variables []Variable) string {
 
 	loqQuerySourceDef := variables[1].SourceDefinition.(LogQueryVariableSourceDefinition)
 	csvSourceDef := variables[0].SourceDefinition.(CsvVariableSourceDefinition)
@@ -476,6 +495,7 @@ func dashboardUpdateConfig(title string, description string, theme string, refre
 					values = ["%s"]
 				}
 			}
+			domain = "%s"
 			time_range {
 				begin_bounded_time_range {
 					from {
@@ -558,8 +578,8 @@ func dashboardUpdateConfig(title string, description string, theme string, refre
 				hide_from_ui = false
 			}
 		}`,
-		title, description, refreshInterval, theme, topologyLabel, topologyLabelValue, rangeName,
-		textPanel.Key, textPanel.Title, textPanel.Text,
+		title, description, refreshInterval, theme, topologyLabel, topologyLabelValue, domain,
+		rangeName, textPanel.Key, textPanel.Title, textPanel.Text,
 		searchPanel.Key, searchPanel.Title, searchPanel.Description, searchPanel.Queries[0].QueryString,
 		searchPanel.Queries[0].QueryKey,
 		layout.LayoutStructures[0].Key, layout.LayoutStructures[1].Key,