Merge branch 'sli-SUMO-172431-monitor-playbook' of https://github.com/SumoLogic/terraform-provider-sumologic into sli-SUMO-172431-monitor-playbook

Author: stevenxqli

CHANGELOG.md

@@ -3,9 +3,14 @@
 FEATURES:
 
 * Add a new optional field `playbook` to resource/sumologic_monitor.
+* Add a new optional field `evaluation_delay` to resource/sumologic_monitor.
 
 ## 2.9.9 (August 12, 2021)
 
+FEATURES:
+
+* **New Resource:** sumologic_policies (GH-248)
+
 BUG FIXES:
 
 * resource/sumologic_monitor: Removed deprecation warning for `triggers`.

sumologic/provider.go

@@ -74,6 +74,7 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_saml_configuration":                 resourceSumologicSamlConfiguration(),
 			"sumologic_kinesis_metrics_source":             resourceSumologicKinesisMetricsSource(),
 			"sumologic_token":                              resourceSumologicToken(),
+			"sumologic_policies":                           resourceSumologicPolicies(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
 			"sumologic_admin_recommended_folder": dataSourceSumologicAdminRecommendedFolder(),

sumologic/resource_sumologic_monitors_library_monitor.go

@@ -2,6 +2,7 @@ package sumologic
 
 import (
 	"log"
+	"regexp"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -267,6 +268,13 @@ func resourceSumologicMonitorsLibraryMonitor() *schema.Resource {
 				ValidateFunc: validation.StringInSlice([]string{"Logs", "Metrics"}, false),
 			},
 
+			"evaluation_delay": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validation.StringMatch(regexp.MustCompile(`((\d)+[smh])+`), "This value is not in correct format. Example: 1m30s"),
+			},
+
 			"is_locked": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -510,6 +518,7 @@ func resourceSumologicMonitorsLibraryMonitorRead(d *schema.ResourceData, meta in
 	d.Set("created_by", monitor.CreatedBy)
 	d.Set("created_at", monitor.CreatedAt)
 	d.Set("monitor_type", monitor.MonitorType)
+	d.Set("evaluation_delay", monitor.EvaluationDelay)
 	d.Set("modified_by", monitor.ModifiedBy)
 	d.Set("is_mutable", monitor.IsMutable)
 	d.Set("version", monitor.Version)
@@ -1091,6 +1100,7 @@ func resourceToMonitorsLibraryMonitor(d *schema.ResourceData) MonitorsLibraryMon
 		CreatedAt:          d.Get("created_at").(string),
 		MonitorType:        d.Get("monitor_type").(string),
 		Description:        d.Get("description").(string),
+		EvaluationDelay:    d.Get("evaluation_delay").(string),
 		Queries:            queries,
 		ModifiedBy:         d.Get("modified_by").(string),
 		IsMutable:          d.Get("is_mutable").(bool),

sumologic/resource_sumologic_monitors_library_monitor_test.go

@@ -138,6 +138,7 @@ func TestAccSumologicMonitorsLibraryMonitor_create(t *testing.T) {
 	testContentType := "Monitor"
 	testMonitorType := "Logs"
 	testIsDisabled := false
+	testEvaluationDelay := "5m"
 	testQueries := []MonitorQuery{
 		{
 			RowID: "A",
@@ -203,6 +204,7 @@ func TestAccSumologicMonitorsLibraryMonitor_create(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "name", testName),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "type", testType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "description", testDescription),
+					resource.TestCheckResourceAttr("sumologic_monitor.test", "evaluation_delay", testEvaluationDelay),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "content_type", testContentType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "queries.0.row_id", testQueries[0].RowID),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "triggers.0.trigger_type", testTriggers[0].TriggerType),
@@ -251,6 +253,7 @@ func TestAccSumologicMonitorsLibraryMonitor_update(t *testing.T) {
 	testMonitorType := "Logs"
 	testPlaybook := "This is a test playbook"
 	testIsDisabled := false
+	testEvaluationDelay := "5m"
 	testQueries := []MonitorQuery{
 		{
 			RowID: "A",
@@ -309,6 +312,7 @@ func TestAccSumologicMonitorsLibraryMonitor_update(t *testing.T) {
 	testUpdatedMonitorType := "Logs"
 	testUpdatedPlaybook := "This is an updated test playbook"
 	testUpdatedIsDisabled := true
+	testUpdatedEvaluationDelay := "8m"
 	testUpdatedQueries := []MonitorQuery{
 		{
 			RowID: "A",
@@ -374,6 +378,7 @@ func TestAccSumologicMonitorsLibraryMonitor_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "name", testName),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "type", testType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "description", testDescription),
+					resource.TestCheckResourceAttr("sumologic_monitor.test", "evaluation_delay", testEvaluationDelay),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "content_type", testContentType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "queries.0.row_id", testQueries[0].RowID),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "triggers.0.trigger_type", testTriggers[0].TriggerType),
@@ -390,6 +395,7 @@ func TestAccSumologicMonitorsLibraryMonitor_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "name", testUpdatedName),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "type", testUpdatedType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "description", testUpdatedDescription),
+					resource.TestCheckResourceAttr("sumologic_monitor.test", "evaluation_delay", testUpdatedEvaluationDelay),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "content_type", testUpdatedContentType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "queries.0.row_id", testUpdatedQueries[0].RowID),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "triggers.0.trigger_type", testUpdatedTriggers[0].TriggerType),
@@ -450,6 +456,7 @@ func testAccCheckMonitorsLibraryMonitorAttributes(name string) resource.TestChec
 			resource.TestCheckResourceAttrSet(name, "created_by"),
 			resource.TestCheckResourceAttrSet(name, "is_locked"),
 			resource.TestCheckResourceAttrSet(name, "monitor_type"),
+			resource.TestCheckResourceAttrSet(name, "evaluation_delay"),
 			resource.TestCheckResourceAttrSet(name, "is_system"),
 			resource.TestCheckResourceAttrSet(name, "is_disabled"),
 			resource.TestCheckResourceAttrSet(name, "name"),
@@ -475,6 +482,7 @@ resource "sumologic_monitor" "test" {
 	is_disabled = false
 	content_type = "Monitor"
 	monitor_type = "Logs"
+	evaluation_delay = "5m"
 	queries {
 		row_id = "A"
 		query = "_sourceCategory=monitor-manager error"
@@ -520,6 +528,7 @@ resource "sumologic_monitor" "test" {
 	is_disabled = true
 	content_type = "Monitor"
 	monitor_type = "Logs"
+	evaluation_delay = "8m"
 	queries {
 		row_id = "A"
 		query = "_sourceCategory=monitor-manager info"

sumologic/resource_sumologic_policies.go

@@ -0,0 +1,156 @@
+package sumologic
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+var DefaultPolicies = Policies{
+	Audit:                              AuditPolicy{Enabled: false},
+	DataAccessLevel:                    DataAccessLevelPolicy{Enabled: false},
+	MaxUserSessionTimeout:              MaxUserSessionTimeoutPolicy{MaxUserSessionTimeout: "7d"},
+	SearchAudit:                        SearchAuditPolicy{Enabled: false},
+	ShareDashboardsOutsideOrganization: ShareDashboardsOutsideOrganizationPolicy{Enabled: false},
+	UserConcurrentSessionsLimit:        UserConcurrentSessionsLimitPolicy{Enabled: false, MaxConcurrentSessions: 100},
+}
+
+func resourceSumologicPolicies() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceSumologicPoliciesCreate,
+		Read:   resourceSumologicPoliciesRead,
+		Update: resourceSumologicPoliciesUpdate,
+		Delete: resourceSumologicPoliciesDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"audit": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  DefaultPolicies.Audit.Enabled,
+			},
+			"data_access_level": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  DefaultPolicies.DataAccessLevel.Enabled,
+			},
+			"max_user_session_timeout": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Default:  DefaultPolicies.MaxUserSessionTimeout.MaxUserSessionTimeout,
+			},
+			"search_audit": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  DefaultPolicies.SearchAudit.Enabled,
+			},
+			"share_dashboards_outside_organization": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  DefaultPolicies.ShareDashboardsOutsideOrganization.Enabled,
+			},
+			"user_concurrent_sessions_limit": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"enabled": {
+							Type:     schema.TypeBool,
+							Optional: true,
+							Default:  DefaultPolicies.UserConcurrentSessionsLimit.Enabled,
+						},
+						"max_concurrent_sessions": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Default:  DefaultPolicies.UserConcurrentSessionsLimit.MaxConcurrentSessions,
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func resourceSumologicPoliciesRead(d *schema.ResourceData, meta interface{}) error {
+	c := meta.(*Client)
+
+	policies, err := c.GetPolicies()
+	if err != nil {
+		return err
+	}
+
+	setPoliciesResource(d, policies)
+	return nil
+}
+
+func resourceSumologicPoliciesCreate(d *schema.ResourceData, meta interface{}) error {
+	// Since policies can only be set and not created, we just update the policies with the given fields.
+	err := resourceSumologicPoliciesUpdate(d, meta)
+	if err != nil {
+		return err
+	}
+
+	d.SetId("org-policies")
+	return nil
+}
+
+func resourceSumologicPoliciesDelete(d *schema.ResourceData, meta interface{}) error {
+	// Since policies cannot be deleted, we just reset to the default policies configuration.
+	c := meta.(*Client)
+
+	_, err := c.UpdatePolicies(DefaultPolicies)
+	return err
+}
+
+func resourceSumologicPoliciesUpdate(d *schema.ResourceData, meta interface{}) error {
+	policies := resourceToPolicies(d)
+
+	c := meta.(*Client)
+	updatedPolicies, err := c.UpdatePolicies(policies)
+	if err != nil {
+		return err
+	}
+
+	setPoliciesResource(d, updatedPolicies)
+	return nil
+}
+
+func setPoliciesResource(d *schema.ResourceData, policies *Policies) {
+	d.Set("audit", policies.Audit.Enabled)
+	d.Set("data_access_level", policies.DataAccessLevel.Enabled)
+	d.Set("max_user_session_timeout", policies.MaxUserSessionTimeout.MaxUserSessionTimeout)
+	d.Set("search_audit", policies.SearchAudit.Enabled)
+	d.Set("share_dashboards_outside_organization", policies.ShareDashboardsOutsideOrganization.Enabled)
+	setUserConcurrentSessionsLimitPolicy(d, &policies.UserConcurrentSessionsLimit)
+}
+
+func resourceToPolicies(d *schema.ResourceData) Policies {
+	var policies Policies
+	policies.Audit = AuditPolicy{d.Get("audit").(bool)}
+	policies.DataAccessLevel = DataAccessLevelPolicy{d.Get("data_access_level").(bool)}
+	policies.MaxUserSessionTimeout = MaxUserSessionTimeoutPolicy{d.Get("max_user_session_timeout").(string)}
+	policies.SearchAudit = SearchAuditPolicy{d.Get("search_audit").(bool)}
+	policies.ShareDashboardsOutsideOrganization = ShareDashboardsOutsideOrganizationPolicy{d.Get("share_dashboards_outside_organization").(bool)}
+	policies.UserConcurrentSessionsLimit = getUserConcurrentSessionsLimitPolicy(d)
+	return policies
+}
+
+func setUserConcurrentSessionsLimitPolicy(d *schema.ResourceData, policy *UserConcurrentSessionsLimitPolicy) {
+	userConcurrentSessionsLimitPolicyMap := make(map[string]interface{})
+	userConcurrentSessionsLimitPolicyMap["enabled"] = policy.Enabled
+	userConcurrentSessionsLimitPolicyMap["max_concurrent_sessions"] = policy.MaxConcurrentSessions
+
+	userConcurrentSessionsLimitPolicy := make([]map[string]interface{}, 1)
+	userConcurrentSessionsLimitPolicy[0] = userConcurrentSessionsLimitPolicyMap
+
+	d.Set("user_concurrent_sessions_limit", userConcurrentSessionsLimitPolicy)
+}
+
+func getUserConcurrentSessionsLimitPolicy(d *schema.ResourceData) UserConcurrentSessionsLimitPolicy {
+	resourceAsMap := d.Get("user_concurrent_sessions_limit").([]interface{})[0].(map[string]interface{})
+	var userConcurrentSessionsLimitPolicy UserConcurrentSessionsLimitPolicy
+	userConcurrentSessionsLimitPolicy.Enabled = resourceAsMap["enabled"].(bool)
+	userConcurrentSessionsLimitPolicy.MaxConcurrentSessions = resourceAsMap["max_concurrent_sessions"].(int)
+	return userConcurrentSessionsLimitPolicy
+}