Merge pull request #1 from jxie418/SUMO-226102-add-create-muting-sche…

…dular-second-part

SUMO-226523: Added more validation in the TF

sumologic/resource_sumologic_muting_schedules_library_muting_schedule.go

@@ -1,8 +1,10 @@
 package sumologic
 
 import (
+	"fmt"
 	"log"
 	"regexp"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -59,6 +61,7 @@ func getMutingScheduleBaseSchema() map[string]*schema.Schema {
 			Elem: &schema.Resource{
 				Schema: getMonitorScopeSchema(),
 			},
+			AtLeastOneOf: monitorAtleastOneKey,
 		},
 
 		"schedule": {
@@ -106,20 +109,26 @@ func getScheduleDefinitionSchemma() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			ForceNew: false,
 			Required: true,
-			ValidateFunc: validation.StringMatch(regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`),
-				"start date in format of yyyy-mm-dd"),
+			ValidateFunc: validation.All(
+				validation.StringMatch(regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`),
+					"start date in format of yyyy-mm-dd"),
+				StartDateIsAfterYesterday(),
+			),
 		},
 		"start_time": {
-			Type:         schema.TypeString,
-			Required:     true,
-			ForceNew:     false,
-			ValidateFunc: validation.StringLenBetween(5, 5),
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: false,
+			ValidateFunc: validation.All(
+				validation.StringMatch(regexp.MustCompile(`^(?:[01]\d|2[0-3]):[0-5]\d$`),
+					"start time in format of 00:00"),
+			),
 		},
 		"duration": {
 			Type:         schema.TypeInt,
 			Required:     true,
 			ForceNew:     false,
-			ValidateFunc: validation.IntAtLeast(0),
+			ValidateFunc: validation.IntAtLeast(15),
 		},
 		"rrule": {
 			Type:     schema.TypeString,
@@ -301,6 +310,33 @@ func getScheduleDefinition(d *schema.ResourceData) ScheduleDefinition {
 	return scheduleDefinition
 }
 
+func StartDateIsAfterYesterday() schema.SchemaValidateFunc {
+	return func(i interface{}, k string) (warnings []string, errors []error) {
+		v, ok := i.(string)
+		if !ok {
+			return warnings, []error{fmt.Errorf("expected type of %q to be string", k)}
+		}
+
+		date, err := time.Parse("2006-01-02", v)
+
+		if err != nil {
+			return warnings, []error{fmt.Errorf("expected %q to be an valid start date yyyy-mm-dd : got %v", k, v)}
+		}
+
+		yesterday := time.Now().AddDate(0, 0, -1).Truncate(24 * time.Hour)
+
+		if date.Before(yesterday) {
+			return warnings, []error{fmt.Errorf("expected %q to be an valid start date : got %v", k, v)}
+		}
+		return warnings, errors
+	}
+}
+
+var monitorAtleastOneKey = []string{
+	"monitor.0.ids",
+	"monitor.0.all",
+}
+
 func resourceToMutingSchedulesLibraryMutingSchedule(d *schema.ResourceData) MutingSchedulesLibraryMutingSchedule {
 	monitorScope := getMonitorScope(d)
 	scheduleDefinition := getScheduleDefinition(d)

sumologic/resource_sumologic_muting_schedules_library_muting_schedule_test.go

@@ -2,6 +2,7 @@ package sumologic
 
 import (
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 	"testing"
@@ -160,6 +161,25 @@ func TestAccSumologicMutingSchedulesLibraryMutingSchedule_update(t *testing.T) {
 	})
 }
 
+func TestAccSumologicMutingSchedulesLibraryMutingSchedule_monitorScopeValidations(t *testing.T) {
+	var mutingSchedulesLibraryMutingSchedule MutingSchedulesLibraryMutingSchedule
+	testNameSuffix := acctest.RandString(16)
+	testName := "terraform_test_muting_schedule_" + testNameSuffix
+	config := testAccSumologicMutingSchedulesLibraryMutingScheduleBadMonitorScope(testName)
+	expectedError := regexp.MustCompile("An argument named \"abc\" is not expected here. Did you mean \"all\"?")
+	resource.Test(t, resource.TestCase{
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckMutingSchedulesLibraryMutingScheduleDestroy(mutingSchedulesLibraryMutingSchedule),
+		Steps: []resource.TestStep{
+			{
+				Config:      config,
+				PlanOnly:    true,
+				ExpectError: expectedError,
+			},
+		},
+	})
+}
+
 func testAccCheckMutingSchedulesLibraryMutingScheduleDestroy(mutingSchedulesLibraryMutingSchedule MutingSchedulesLibraryMutingSchedule) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client := testAccProvider.Meta().(*Client)
@@ -267,3 +287,27 @@ func testAccSumologicMutingSchedulesLibraryMutingScheduleUpdate(testName string)
 }
 `, testName, startDate)
 }
+
+func testAccSumologicMutingSchedulesLibraryMutingScheduleBadMonitorScope(testName string) string {
+	tomorrow := time.Now().AddDate(0, 0, 1)
+	startDate := tomorrow.Format("2006-01-02")
+	return fmt.Sprintf(`
+   resource "sumologic_muting_schedule" "test" {
+	name = "terraform_test_muting_schedule_%s"
+	description = "terraform_test_muting_schedule_description"
+	type = "MutingSchedulesLibraryMutingSchedule"
+	content_type = "MutingSchedule"
+	monitor {
+		abc="not right"
+	  }
+	schedule  {
+	timezone = "America/Los_Angeles"
+	start_date = "%s"
+	start_time = "01:00"
+	duration = 50
+	rrule = "FREQ=DAILY;INTERVAL=1"
+	is_form = false
+	}
+}
+`, testName, startDate)
+}