Merge pull request #31376 from hashicorp/remove-aws_connect_routing_p…

…rofile.queue_configs_associated r/aws_connect_routing_profile: Remove `queue_configs_associated` attribute
hashicorp · May 12, 2023 · 07f171e · 07f171e
2 parents c99cf27 + 48e884c
commit 07f171e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 44 deletions.
diff --git a/.changelog/31376.txt b/.changelog/31376.txt
@@ -0,0 +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
+```
diff --git 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/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
@@ -29,6 +29,8 @@ 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)
 - [Resource: aws_ec2_client_vpn_network_association](#resource-aws_ec2_client_vpn_network_association)
@@ -119,6 +121,14 @@ 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.
+
 ## 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`.