From d6dddd14935318e2368d7bd56f087d104c63827f Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Thu, 20 Oct 2022 22:56:05 +0100 Subject: [PATCH 1/3] Fix resource/aws_rds_proxy_endpoint: Respect `tags_all` attribute ([#25477](https://github.com/hashicorp/terraform-provider-aws/issues/25477)) --- CHANGELOG.md | 1 + internal/service/rds/proxy_endpoint.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fe3199519e..902d8dab58b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_appstream_stack: Fix panic with `application_settings`. ([#27257](https://github.com/hashicorp/terraform-provider-aws/issues/27257)) +* resource/aws_rds_proxy_endpoint: Respect `tags_all` attribute ([#25477](https://github.com/hashicorp/terraform-provider-aws/issues/25477)) * resource/aws_sqs_queue: Change `sqs_managed_sse_enabled` to `Computed` as newly created SQS queues use [SSE-SQS encryption by default](https://aws.amazon.com/about-aws/whats-new/2022/10/amazon-sqs-announces-server-side-encryption-ssq-managed-sse-sqs-default/). This means that Terraform will only perform drift detection of the attribute's value when present in a configuration ([#26843](https://github.com/hashicorp/terraform-provider-aws/issues/26843)) * resource/aws_sqs_queue: Respect configured `sqs_managed_sse_enabled` value on resource Create. In particular a configured `false` value is sent to the AWS API, which overrides the [new service default value of `true`](https://aws.amazon.com/about-aws/whats-new/2022/10/amazon-sqs-announces-server-side-encryption-ssq-managed-sse-sqs-default/) ([#27335](https://github.com/hashicorp/terraform-provider-aws/issues/27335)) diff --git a/internal/service/rds/proxy_endpoint.go b/internal/service/rds/proxy_endpoint.go index 4fb9cd73c5d..bee6aad8908 100644 --- a/internal/service/rds/proxy_endpoint.go +++ b/internal/service/rds/proxy_endpoint.go @@ -206,8 +206,8 @@ func resourceProxyEndpointUpdate(d *schema.ResourceData, meta interface{}) error } } - if d.HasChange("tags") { - o, n := d.GetChange("tags") + if d.HasChange("tags_all") { + o, n := d.GetChange("tags_all") if err := UpdateTags(conn, d.Get("arn").(string), o, n); err != nil { return fmt.Errorf("Error updating RDS DB Proxy Endpoint (%s) tags: %w", d.Get("arn").(string), err) From f6705a595b8b06c55b6ef5e9f691d9d2007f09a2 Mon Sep 17 00:00:00 2001 From: Richard Quadling Date: Thu, 20 Oct 2022 23:06:08 +0100 Subject: [PATCH 2/3] Remove CHANGELOG.md entry --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 902d8dab58b..8fe3199519e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,6 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_appstream_stack: Fix panic with `application_settings`. ([#27257](https://github.com/hashicorp/terraform-provider-aws/issues/27257)) -* resource/aws_rds_proxy_endpoint: Respect `tags_all` attribute ([#25477](https://github.com/hashicorp/terraform-provider-aws/issues/25477)) * resource/aws_sqs_queue: Change `sqs_managed_sse_enabled` to `Computed` as newly created SQS queues use [SSE-SQS encryption by default](https://aws.amazon.com/about-aws/whats-new/2022/10/amazon-sqs-announces-server-side-encryption-ssq-managed-sse-sqs-default/). This means that Terraform will only perform drift detection of the attribute's value when present in a configuration ([#26843](https://github.com/hashicorp/terraform-provider-aws/issues/26843)) * resource/aws_sqs_queue: Respect configured `sqs_managed_sse_enabled` value on resource Create. In particular a configured `false` value is sent to the AWS API, which overrides the [new service default value of `true`](https://aws.amazon.com/about-aws/whats-new/2022/10/amazon-sqs-announces-server-side-encryption-ssq-managed-sse-sqs-default/) ([#27335](https://github.com/hashicorp/terraform-provider-aws/issues/27335)) From 890e5ade9df4494272a8875d1841f37b7ab295d0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 24 Oct 2022 09:21:40 -0400 Subject: [PATCH 3/3] Add CHANGELOG entry. --- .changelog/27367.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/27367.txt diff --git a/.changelog/27367.txt b/.changelog/27367.txt new file mode 100644 index 00000000000..d2b889875ad --- /dev/null +++ b/.changelog/27367.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_rds_proxy_endpoint: Respect configured provider `default_tags` value on resource Update +``` \ No newline at end of file