Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/aws_connect_hours_of_operation: Remove hours_of_operation_arn #31484

Merged
merged 4 commits into from
May 19, 2023
Merged

r/aws_connect_hours_of_operation: Remove hours_of_operation_arn #31484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2516720
r/aws_connect_hours_of_operation: Remove 'hours_of_operation_arn'.
ewbankkit May 17, 2023
5c14ee5
d/aws_connect_hours_of_operation: Remove 'hours_of_operation_arn'.
ewbankkit May 17, 2023
4ddfcad
Correct CHANGELOG entry file name.
ewbankkit May 19, 2023
dfa1c6b
Merge branch 'main' into remove-aws_connect_hours_of_operation.hours_…
ewbankkit May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changelog/31484.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:breaking-change
resource/aws_connect_hours_of_operation: The `hours_of_operation_arn` attribute has been removed
```

```release-note:breaking-change
data-source/aws_connect_hours_of_operation: The `hours_of_operation_arn` attribute has been removed
```
9 changes: 3 additions & 6 deletions internal/service/connect/hours_of_operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@ func ResourceHoursOfOperation() *schema.Resource {
ReadWithoutTimeout: resourceHoursOfOperationRead,
UpdateWithoutTimeout: resourceHoursOfOperationUpdate,
DeleteWithoutTimeout: resourceHoursOfOperationDelete,

Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},

CustomizeDiff: verify.SetTagsDiff,

Schema: map[string]*schema.Schema{
"arn": {
Type: schema.TypeString,
Expand Down Expand Up @@ -98,11 +101,6 @@ func ResourceHoursOfOperation() *schema.Resource {
Optional: true,
ValidateFunc: validation.StringLenBetween(1, 250),
},
"hours_of_operation_arn": {
Type: schema.TypeString,
Computed: true,
Deprecated: "use 'arn' attribute instead",
},
"hours_of_operation_id": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -193,7 +191,6 @@ func resourceHoursOfOperationRead(ctx context.Context, d *schema.ResourceData, m
}

d.Set("arn", resp.HoursOfOperation.HoursOfOperationArn)
d.Set("hours_of_operation_arn", resp.HoursOfOperation.HoursOfOperationArn) // Deprecated
d.Set("hours_of_operation_id", resp.HoursOfOperation.HoursOfOperationId)
d.Set("instance_id", instanceID)
d.Set("description", resp.HoursOfOperation.Description)
Expand Down
6 changes: 0 additions & 6 deletions internal/service/connect/hours_of_operation_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,6 @@ func DataSourceHoursOfOperation() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"hours_of_operation_arn": {
Type: schema.TypeString,
Computed: true,
Deprecated: "use 'arn' attribute instead",
},
"hours_of_operation_id": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -149,7 +144,6 @@ func dataSourceHoursOfOperationRead(ctx context.Context, d *schema.ResourceData,
hoursOfOperation := resp.HoursOfOperation

d.Set("arn", hoursOfOperation.HoursOfOperationArn)
d.Set("hours_of_operation_arn", hoursOfOperation.HoursOfOperationArn) // Deprecated
d.Set("hours_of_operation_id", hoursOfOperation.HoursOfOperationId)
d.Set("instance_id", instanceID)
d.Set("description", hoursOfOperation.Description)
Expand Down
2 changes: 0 additions & 2 deletions internal/service/connect/hours_of_operation_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ func testAccHoursOfOperationDataSource_hoursOfOperationID(t *testing.T) {
Config: testAccHoursOfOperationDataSourceConfig_id(rName, resourceName),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"),
resource.TestCheckResourceAttrPair(datasourceName, "hours_of_operation_arn", resourceName, "hours_of_operation_arn"), // Deprecated
resource.TestCheckResourceAttrPair(datasourceName, "hours_of_operation_id", resourceName, "hours_of_operation_id"),
resource.TestCheckResourceAttrPair(datasourceName, "instance_id", resourceName, "instance_id"),
resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"),
Expand Down Expand Up @@ -55,7 +54,6 @@ func testAccHoursOfOperationDataSource_name(t *testing.T) {
Config: testAccHoursOfOperationDataSourceConfig_name(rName, rName2),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrPair(datasourceName, "arn", resourceName, "arn"),
resource.TestCheckResourceAttrPair(datasourceName, "hours_of_operation_arn", resourceName, "hours_of_operation_arn"), // Deprecated
resource.TestCheckResourceAttrPair(datasourceName, "hours_of_operation_id", resourceName, "hours_of_operation_id"),
resource.TestCheckResourceAttrPair(datasourceName, "instance_id", resourceName, "instance_id"),
resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"),
Expand Down
2 changes: 0 additions & 2 deletions internal/service/connect/hours_of_operation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func testAccHoursOfOperation_basic(t *testing.T) {
"start_time.0.minutes": "0",
}),
resource.TestCheckResourceAttr(resourceName, "description", originalDescription),
resource.TestCheckResourceAttrSet(resourceName, "hours_of_operation_arn"), // Deprecated
resource.TestCheckResourceAttrSet(resourceName, "hours_of_operation_id"),
resource.TestCheckResourceAttrPair(resourceName, "instance_id", "aws_connect_instance.test", "id"),
resource.TestCheckResourceAttr(resourceName, "name", rName2),
Expand Down Expand Up @@ -78,7 +77,6 @@ func testAccHoursOfOperation_basic(t *testing.T) {
"start_time.0.minutes": "0",
}),
resource.TestCheckResourceAttr(resourceName, "description", updatedDescription),
resource.TestCheckResourceAttrSet(resourceName, "hours_of_operation_arn"), // Deprecated
resource.TestCheckResourceAttrSet(resourceName, "hours_of_operation_id"),
resource.TestCheckResourceAttrPair(resourceName, "instance_id", "aws_connect_instance.test", "id"),
resource.TestCheckResourceAttr(resourceName, "name", rName2),
Expand Down
1 change: 0 additions & 1 deletion website/docs/d/connect_hours_of_operation.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ In addition to all of the arguments above, the following attributes are exported
* `arn` - ARN of the Hours of Operation.
* `config` - Configuration information for the hours of operation: day, start time, and end time . Config blocks are documented below. Config blocks are documented below.
* `description` - Description of the Hours of Operation.
* `hours_of_operation_arn` - (**Deprecated**) ARN of the Hours of Operation.
* `hours_of_operation_id` - The identifier for the hours of operation.
* `instance_id` - Identifier of the hosting Amazon Connect Instance.
* `name` - Name of the Hours of Operation.
Expand Down
10 changes: 10 additions & 0 deletions website/docs/guides/version-5-upgrade.html.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Upgrade topics:
- [Provider Arguments](#provider-arguments)
- [Default Tags](#default-tags)
- [Data Source: aws_api_gateway_rest_api](#data-source-aws_api_gateway_rest_api)
- [Data Source: aws_connect_hours_of_operation](#resource-aws_connect_hours_of_operation)
- [Data Source: aws_identitystore_group](#data-source-aws_identitystore_group)
- [Data Source: aws_identitystore_user](#data-source-aws_identitystore_user)
- [Data Source: aws_redshift_service_account](#data-source-aws_redshift_service_account)
Expand All @@ -31,6 +32,7 @@ Upgrade topics:
- [Resource: aws_ce_anomaly_subscription](#resource-aws_ce_anomaly_subscription)
- [Resource: aws_cloudwatch_event_target](#resource-aws_cloudwatch_event_target)
- [Resource: aws_codebuild_project](#resource-aws_codebuild_project)
- [Resource: aws_connect_hours_of_operation](#resource-aws_connect_hours_of_operation)
- [Resource: aws_connect_queue](#resource-aws_connect_queue)
- [Resource: aws_connect_routing_profile](#resource-aws_connect_routing_profile)
- [Resource: aws_docdb_cluster](#resource-aws_docdb_cluster)
Expand Down Expand Up @@ -131,6 +133,10 @@ The `ecs_target.propagate_tags` attribute now has no default value. If no value

The `secondary_sources.auth` and `source.auth` attributes have been removed.

## Resource: aws_connect_hours_of_operation

The `hours_of_operation_arn` attribute has been removed.

## Resource: aws_connect_queue

The `quick_connect_ids_associated` attribute has been removed.
Expand Down Expand Up @@ -183,6 +189,10 @@ The `statement.rule_group_reference_statement.rule_action_override` attribute ha

The `minimum_compression_size` attribute is now a String type, allowing it to be computed when set via the `body` attribute.

## Data Source: aws_connect_hours_of_operation

The `hours_of_operation_arn` attribute has been removed.

## Data Source: aws_identitystore_group

The `filter` argument has been removed.
Expand Down
1 change: 0 additions & 1 deletion website/docs/r/connect_hours_of_operation.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ A `start_time` block supports the following arguments:
In addition to all arguments above, the following attributes are exported:

* `arn` - The Amazon Resource Name (ARN) of the Hours of Operation.
* `hours_of_operation_arn` - (**Deprecated**) The Amazon Resource Name (ARN) of the Hours of Operation.
* `hours_of_operation_id` - The identifier for the hours of operation.
* `id` - The identifier of the hosting Amazon Connect Instance and identifier of the Hours of Operation separated by a colon (`:`).
* `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block).
Expand Down