Merge pull request #34084 from carcher5432/fix-canary-schedule-condition

Fixed diff suppress function on canary schedule expression
hashicorp · Nov 10, 2023 · aeb7416 · aeb7416
2 parents 8e6e118 + 2421f68
commit aeb7416
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/34084.txt b/.changelog/34084.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_synthetics_canary: Fix to properly suppress differences when `expression` is `rate(0 minutes)`
+```
diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go
@@ -185,7 +185,7 @@ func ResourceCanary() *schema.Resource {
 							Type:     schema.TypeString,
 							Required: true,
 							DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-								return new == "rate(0 minute)" && old == "rate(0 hour)"
+								return (new == "rate(0 minute)" || new == "rate(0 minutes)") && old == "rate(0 hour)"
 							},
 						},
 					},

diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go
@@ -895,7 +895,7 @@ resource "aws_synthetics_canary" "test" {
   execution_role_arn   = aws_iam_role.test.arn
   handler              = "exports.handler"
   zip_file             = "test-fixtures/lambdatest.zip"
-  runtime_version      = "syn-nodejs-puppeteer-3.3"
+  runtime_version      = "syn-nodejs-puppeteer-3.9"
   delete_lambda        = true
 
   artifact_config {
@@ -926,7 +926,7 @@ resource "aws_synthetics_canary" "test" {
   execution_role_arn   = aws_iam_role.test.arn
   handler              = "exports.handler"
   zip_file             = "test-fixtures/lambdatest.zip"
-  runtime_version      = "syn-nodejs-puppeteer-3.3"
+  runtime_version      = "syn-nodejs-puppeteer-3.9"
   delete_lambda        = true
 
   artifact_config {