From 6cfeceb9ab8de067c2df7d5d3474dcb3ab54aaef Mon Sep 17 00:00:00 2001 From: Colin Archer Date: Tue, 24 Oct 2023 11:09:08 -0400 Subject: [PATCH 1/3] fixed diff suppress func on schedule expression --- internal/service/synthetics/canary.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index b674d9669b8c..e191f6819dbb 100644 --- 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)" }, }, }, From e8909b5ffcacfbb0d582431e06a669640d088a03 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 10 Nov 2023 15:02:13 -0500 Subject: [PATCH 2/3] chore: changelog --- .changelog/34084.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/34084.txt diff --git a/.changelog/34084.txt b/.changelog/34084.txt new file mode 100644 index 000000000000..2cb1d78d6167 --- /dev/null +++ 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)` +``` From 2421f68395b2d171e453e02ef710dca4f9c37955 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 10 Nov 2023 15:02:43 -0500 Subject: [PATCH 3/3] r/aws_synthetics_canary(test): fix deprecated runtime errors --- internal/service/synthetics/canary_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go index 249efbcc1b65..4c35c2f1c3bc 100644 --- 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 {