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.

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

Client VPN resources: Remove status #31223

Merged
merged 3 commits into from
May 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/31223.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:breaking-change
resource/aws_ec2_client_vpn_endpoint: The `status` attribute has been removed
```

```release-note:breaking-change
resource/aws_ec2_client_vpn_network_association: The `status` attribute has been removed
```
6 changes: 0 additions & 6 deletions internal/service/ec2/vpnclient_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,6 @@ func ResourceClientVPNEndpoint() *schema.Resource {
Optional: true,
Default: false,
},
"status": {
Type: schema.TypeString,
Computed: true,
Deprecated: `This attribute has been deprecated.`,
},
names.AttrTags: tftags.TagsSchema(),
names.AttrTagsAll: tftags.TagsSchemaComputed(),
"transport_protocol": {
Expand Down Expand Up @@ -350,7 +345,6 @@ func resourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData,
d.Set("server_certificate_arn", ep.ServerCertificateArn)
d.Set("session_timeout_hours", ep.SessionTimeoutHours)
d.Set("split_tunnel", ep.SplitTunnel)
d.Set("status", ep.Status.Code)
d.Set("transport_protocol", ep.TransportProtocol)
d.Set("vpc_id", ep.VpcId)
d.Set("vpn_port", ep.VpnPort)
Expand Down
1 change: 0 additions & 1 deletion internal/service/ec2/vpnclient_endpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ func testAccClientVPNEndpoint_basic(t *testing.T) {
resource.TestCheckResourceAttrSet(resourceName, "server_certificate_arn"),
resource.TestCheckResourceAttr(resourceName, "session_timeout_hours", "24"),
resource.TestCheckResourceAttr(resourceName, "split_tunnel", "false"),
resource.TestCheckResourceAttr(resourceName, "status", ec2.ClientVpnEndpointStatusCodePendingAssociate),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(resourceName, "tags.Name", rName),
resource.TestCheckResourceAttr(resourceName, "transport_protocol", "udp"),
Expand Down
6 changes: 0 additions & 6 deletions internal/service/ec2/vpnclient_network_association.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ func ResourceClientVPNNetworkAssociation() *schema.Resource {
Set: schema.HashString,
Deprecated: "Use the `security_group_ids` attribute of the `aws_ec2_client_vpn_endpoint` resource instead.",
},
"status": {
Type: schema.TypeString,
Computed: true,
Deprecated: `This attribute has been deprecated.`,
},
"subnet_id": {
Type: schema.TypeString,
Required: true,
Expand Down Expand Up @@ -135,7 +130,6 @@ func resourceClientVPNNetworkAssociationRead(ctx context.Context, d *schema.Reso
d.Set("association_id", network.AssociationId)
d.Set("client_vpn_endpoint_id", network.ClientVpnEndpointId)
d.Set("security_groups", aws.StringValueSlice(network.SecurityGroups))
d.Set("status", network.Status.Code)
d.Set("subnet_id", network.TargetNetworkId)
d.Set("vpc_id", network.VpcId)

Expand Down
10 changes: 10 additions & 0 deletions website/docs/guides/version-5-upgrade.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Upgrade topics:
- [Data Source: aws_subnet_ids](#data-source-aws_subnet_ids)
- [Resource: aws_acmpca_certificate_authority](#resource-aws_acmpca_certificate_authority)
- [Resource: aws_ce_anomaly_subscription](#resource-aws_ce_anomaly_subscription)
- [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)

<!-- /TOC -->

Expand Down Expand Up @@ -92,6 +94,14 @@ The `status` attribute is superfluous and sometimes incorrect. It has been remov

The `threshold` attribute has been removed.

## Resource: aws_ec2_client_vpn_endpoint

The `status` attribute has been removed.

## Resource: aws_ec2_client_vpn_network_association

The `status` attribute has been removed.

## Data Source: aws_redshift_service_account

[AWS document](https://docs.aws.amazon.com/redshift/latest/mgmt/db-auditing.html#db-auditing-bucket-permissions) that [a service principal name](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements_principal.html#principal-services) be used instead of AWS account ID in any relevant IAM policy.
Expand Down
1 change: 0 additions & 1 deletion website/docs/r/ec2_client_vpn_endpoint.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ In addition to all arguments above, the following attributes are exported:
* `arn` - The ARN of the Client VPN endpoint.
* `dns_name` - The DNS name to be used by clients when establishing their VPN session.
* `id` - The ID of the Client VPN endpoint.
* `status` - **Deprecated** The current state of the Client VPN endpoint.
* `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).

## Import
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ In addition to all arguments above, the following attributes are exported:

* `id` - The unique ID of the target network association.
* `association_id` - The unique ID of the target network association.
* `status` - **Deprecated** The current state of the target network association.
* `vpc_id` - The ID of the VPC in which the target subnet is located.

## Timeouts
Expand Down
Loading