Merge pull request hashicorp#32716 from taktakpeops/fix/opensearchdom…

…ain-offpeakwindow fix: allow setting offpeakwindow at 00:00
DanielMSchmidt · Jul 27, 2023 · 1adfde3 · 1adfde3
2 parents 00e4286 + c888d0c
commit 1adfde3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/.changelog/32716.txt b/.changelog/32716.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_opensearch_domain: Correctly handle `off_peak_window_options.off_peak_window.window_start_time` value of `00:00`
+```
diff --git a/internal/service/opensearch/domain_structure.go b/internal/service/opensearch/domain_structure.go
@@ -212,11 +212,11 @@ func expandWindowStartTime(tfMap map[string]interface{}) *opensearchservice.Wind
 
 	apiObject := &opensearchservice.WindowStartTime{}
 
-	if v, ok := tfMap["hours"].(int); ok && v != 0 {
+	if v, ok := tfMap["hours"].(int); ok {
 		apiObject.Hours = aws.Int64(int64(v))
 	}
 
-	if v, ok := tfMap["minutes"].(int); ok && v != 0 {
+	if v, ok := tfMap["minutes"].(int); ok {
 		apiObject.Minutes = aws.Int64(int64(v))
 	}
 

diff --git a/internal/service/opensearch/domain_test.go b/internal/service/opensearch/domain_test.go
@@ -1529,6 +1529,18 @@ func TestAccOpenSearchDomain_offPeakWindowOptions(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "off_peak_window_options.0.off_peak_window.0.window_start_time.0.minutes", "15"),
 				),
 			},
+			{
+				Config: testAccDomainConfig_offPeakWindowOptions(rName, 0, 0),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckDomainExists(ctx, resourceName, &domain),
+					resource.TestCheckResourceAttr(resourceName, "off_peak_window_options.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "off_peak_window_options.0.enabled", "true"),
+					resource.TestCheckResourceAttr(resourceName, "off_peak_window_options.0.off_peak_window.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "off_peak_window_options.0.off_peak_window.0.window_start_time.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "off_peak_window_options.0.off_peak_window.0.window_start_time.0.hours", "0"),
+					resource.TestCheckResourceAttr(resourceName, "off_peak_window_options.0.off_peak_window.0.window_start_time.0.minutes", "0"),
+				),
+			},
 		},
 	})
 }