From a2f5f4118cdd6898bdbc33d221af495275b123f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 12 May 2023 11:06:30 -0400 Subject: [PATCH 1/3] r/aws_connect_routing_profile: Remove 'queue_configs_associated' attribute. --- .changelog/#####.txt | 3 ++ internal/service/connect/routing_profile.go | 37 ++----------------- website/docs/guides/version-5-upgrade.html.md | 5 +++ 3 files changed, 11 insertions(+), 34 deletions(-) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 00000000000..6e93258c965 --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,3 @@ +```release-note:breaking-change +resource/aws_connect_routing_profile: The `queue_configs_associated` attribute has been removed +``` \ No newline at end of file diff --git a/internal/service/connect/routing_profile.go b/internal/service/connect/routing_profile.go index dcb07c12b64..a049041af34 100644 --- a/internal/service/connect/routing_profile.go +++ b/internal/service/connect/routing_profile.go @@ -34,10 +34,13 @@ func ResourceRoutingProfile() *schema.Resource { // Routing profiles do not support deletion today. NoOp the Delete method. // Users can rename their routing profiles manually if they want. DeleteWithoutTimeout: schema.NoopContext, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, + CustomizeDiff: verify.SetTagsDiff, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, @@ -117,39 +120,6 @@ func ResourceRoutingProfile() *schema.Resource { }, }, }, - "queue_configs_associated": { - Deprecated: "Use the queue_configs instead", - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "channel": { - Type: schema.TypeString, - Computed: true, - }, - "delay": { - Type: schema.TypeInt, - Computed: true, - }, - "priority": { - Type: schema.TypeInt, - Computed: true, - }, - "queue_arn": { - Type: schema.TypeString, - Computed: true, - }, - "queue_id": { - Type: schema.TypeString, - Computed: true, - }, - "queue_name": { - Type: schema.TypeString, - Computed: true, - }, - }, - }, - }, "routing_profile_id": { Type: schema.TypeString, Computed: true, @@ -254,7 +224,6 @@ func resourceRoutingProfileRead(ctx context.Context, d *schema.ResourceData, met } d.Set("queue_configs", queueConfigs) - d.Set("queue_configs_associated", queueConfigs) SetTagsOut(ctx, resp.RoutingProfile.Tags) diff --git a/website/docs/guides/version-5-upgrade.html.md b/website/docs/guides/version-5-upgrade.html.md index a7eb052a37d..0eadd572a8d 100644 --- a/website/docs/guides/version-5-upgrade.html.md +++ b/website/docs/guides/version-5-upgrade.html.md @@ -29,6 +29,7 @@ Upgrade topics: - [Resource: aws_autoscaling_group](#resource-aws_autoscaling_group) - [Resource: aws_ce_anomaly_subscription](#resource-aws_ce_anomaly_subscription) - [Resource: aws_cloudwatch_event_target](#resource-aws_cloudwatch_event_target) +- [Resource: aws_connect_routing_profile](#resource-aws_connect_routing_profile) - [Resource: aws_docdb_cluster](#resource-aws_docdb_cluster) - [Resource: aws_ec2_client_vpn_endpoint](#resource-aws_ec2_client_vpn_endpoint) - [Resource: aws_ec2_client_vpn_network_association](#resource-aws_ec2_client_vpn_network_association) @@ -119,6 +120,10 @@ The `threshold` attribute has been removed. The `ecs_target.propagate_tags` attribute now has no default value. If no value is specified, the tags are not propagated. +## Resource: aws_connect_routing_profile + +The `queue_configs_associated` attribute has been removed. + ## Resource: aws_docdb_cluster Changes to the `snapshot_identifier` attribute will now correctly force re-creation of the resource. Previously, changing this attribute would result in a successful apply, but without the cluster being restored (only the resource state was changed). This change brings behavior of the cluster `snapshot_identifier` attribute into alignment with other RDS resources, such as `aws_db_instance`. From 3ca05f1efeadae7b8932de19ecd293e6e700c386 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 12 May 2023 11:09:34 -0400 Subject: [PATCH 2/3] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 31376.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 31376.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/31376.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/31376.txt From 48e884cf4bd8b55f7d6e29bddd670bd16670116c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 12 May 2023 11:14:15 -0400 Subject: [PATCH 3/3] r/aws_connect_queue: Remove 'quick_connect_ids_associated' attribute. --- .changelog/31376.txt | 4 ++++ internal/service/connect/queue.go | 14 ++++---------- website/docs/guides/version-5-upgrade.html.md | 5 +++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.changelog/31376.txt b/.changelog/31376.txt index 6e93258c965..39c58b9c4a5 100644 --- a/.changelog/31376.txt +++ b/.changelog/31376.txt @@ -1,3 +1,7 @@ ```release-note:breaking-change resource/aws_connect_routing_profile: The `queue_configs_associated` attribute has been removed +``` + +```release-note:breaking-change +resource/aws_connect_queue: The `quick_connect_ids_associated` attribute has been removed ``` \ No newline at end of file diff --git a/internal/service/connect/queue.go b/internal/service/connect/queue.go index 17f86718004..55a2dba0de2 100644 --- a/internal/service/connect/queue.go +++ b/internal/service/connect/queue.go @@ -29,10 +29,13 @@ func ResourceQueue() *schema.Resource { // Queues do not support deletion today. NoOp the Delete method. // Users can rename their queues manually if they want. DeleteWithoutTimeout: schema.NoopContext, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, + CustomizeDiff: verify.SetTagsDiff, + Schema: map[string]*schema.Schema{ "arn": { Type: schema.TypeString, @@ -96,14 +99,6 @@ func ResourceQueue() *schema.Resource { Type: schema.TypeString, }, }, - "quick_connect_ids_associated": { - Deprecated: "Use the quick_connect_ids instead", - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, - }, - }, "status": { Type: schema.TypeString, Optional: true, @@ -211,8 +206,7 @@ func resourceQueueRead(ctx context.Context, d *schema.ResourceData, meta interfa return diag.FromErr(fmt.Errorf("error finding Connect Queue Quick Connect ID for Queue (%s): %w", queueID, err)) } - d.Set("quick_connect_ids", flex.FlattenStringSet(quickConnectIds)) - d.Set("quick_connect_ids_associated", flex.FlattenStringSet(quickConnectIds)) + d.Set("quick_connect_ids", aws.StringValueSlice(quickConnectIds)) SetTagsOut(ctx, resp.Queue.Tags) diff --git a/website/docs/guides/version-5-upgrade.html.md b/website/docs/guides/version-5-upgrade.html.md index 0eadd572a8d..820647ced75 100644 --- a/website/docs/guides/version-5-upgrade.html.md +++ b/website/docs/guides/version-5-upgrade.html.md @@ -29,6 +29,7 @@ Upgrade topics: - [Resource: aws_autoscaling_group](#resource-aws_autoscaling_group) - [Resource: aws_ce_anomaly_subscription](#resource-aws_ce_anomaly_subscription) - [Resource: aws_cloudwatch_event_target](#resource-aws_cloudwatch_event_target) +- [Resource: aws_connect_routing_profile](#resource-aws_connect_queue) - [Resource: aws_connect_routing_profile](#resource-aws_connect_routing_profile) - [Resource: aws_docdb_cluster](#resource-aws_docdb_cluster) - [Resource: aws_ec2_client_vpn_endpoint](#resource-aws_ec2_client_vpn_endpoint) @@ -120,6 +121,10 @@ The `threshold` attribute has been removed. The `ecs_target.propagate_tags` attribute now has no default value. If no value is specified, the tags are not propagated. +## Resource: aws_connect_queue + +The `quick_connect_ids_associated` attribute has been removed. + ## Resource: aws_connect_routing_profile The `queue_configs_associated` attribute has been removed.