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

ec2/network_acl: Remove empty validation #22928

Merged
merged 6 commits into from
Feb 3, 2022
Merged

ec2/network_acl: Remove empty validation #22928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3fd337a
ec2/network_acl: Remove empty validation
YakDriver Feb 3, 2022
85e2220
Add changelog
YakDriver Feb 3, 2022
5456190
Update docs, changelog
YakDriver Feb 3, 2022
51e7fc7
Add info to docs
YakDriver Feb 3, 2022
dcd6ab6
Add info to docs
YakDriver Feb 3, 2022
0ea4823
Fix comments
YakDriver Feb 3, 2022
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/22928.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_default_network_acl: These arguments can no longer be set to `""`: `egress.*.cidr_block`, `egress.*.ipv6_cidr_block`, `ingress.*.cidr_block`, or `ingress.*.ipv6_cidr_block`
```

```release-note:breaking-change
resource/aws_network_acl: These arguments can no longer be set to `""`: `egress.*.cidr_block`, `egress.*.ipv6_cidr_block`, `ingress.*.cidr_block`, or `ingress.*.ipv6_cidr_block`
```
36 changes: 12 additions & 24 deletions internal/service/ec2/default_network_acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,14 @@ func ResourceDefaultNetworkACL() *schema.Resource {
Required: true,
},
"cidr_block": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.StringIsEmpty,
validation.IsCIDR,
),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.IsCIDR,
},
"ipv6_cidr_block": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.StringIsEmpty,
validation.IsCIDR,
),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.IsCIDR,
},
"icmp_type": {
Type: schema.TypeInt,
Expand Down Expand Up @@ -157,20 +151,14 @@ func ResourceDefaultNetworkACL() *schema.Resource {
Required: true,
},
"cidr_block": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.StringIsEmpty,
validation.IsCIDR,
),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.IsCIDR,
},
"ipv6_cidr_block": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.StringIsEmpty,
validation.IsCIDR,
),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.IsCIDR,
},
"icmp_type": {
Type: schema.TypeInt,
Expand Down
36 changes: 12 additions & 24 deletions internal/service/ec2/network_acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,14 @@ func ResourceNetworkACL() *schema.Resource {
Required: true,
},
"cidr_block": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.StringIsEmpty,
validation.IsCIDR,
),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.IsCIDR,
},
"ipv6_cidr_block": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.StringIsEmpty,
validation.IsCIDR,
),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.IsCIDR,
},
"icmp_type": {
Type: schema.TypeInt,
Expand Down Expand Up @@ -153,20 +147,14 @@ func ResourceNetworkACL() *schema.Resource {
Required: true,
},
"cidr_block": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.StringIsEmpty,
validation.IsCIDR,
),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.IsCIDR,
},
"ipv6_cidr_block": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.Any(
validation.StringIsEmpty,
validation.IsCIDR,
),
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.IsCIDR,
},
"icmp_type": {
Type: schema.TypeInt,
Expand Down
60 changes: 60 additions & 0 deletions website/docs/guides/version-4-upgrade.html.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ Upgrade topics:
- [Resource: aws_batch_compute_environment](#resource-aws_batch_compute_environment)
- [Resource: aws_cloudwatch_event_target](#resource-aws_cloudwatch_event_target)
- [Resource: aws_customer_gateway](#resource-aws_customer_gateway)
- [Resource: aws_default_network_acl](#resource-aws_default_network_acl)
- [Resource: aws_elasticache_cluster](#resource-aws_elasticache_cluster)
- [Resource: aws_elasticache_global_replication_group](#resource-aws_elasticache_global_replication_group)
- [Resource: aws_elasticache_replication_group](#resource-aws_elasticache_replication_group)
- [Resource: aws_fsx_ontap_storage_virtual_machine](#resource-aws_fsx_ontap_storage_virtual_machine)
- [Resource: aws_network_acl](#resource-aws_network_acl)
- [Resource: aws_network_interface](#resource-aws_network_interface)
- [Resource: aws_s3_bucket](#resource-aws_s3_bucket)
- [Resource: aws_s3_bucket_object](#resource-aws_s3_bucket_object)
Expand Down Expand Up @@ -411,6 +413,35 @@ resource "aws_cloudwatch_event_target" "test" {

Previously, `ip_address` could be set to `""`, which would result in an AWS error. However, this value is no longer accepted by the provider.

## Resource: aws_default_network_acl

Previously, `egress.*.cidr_block`, `egress.*.ipv6_cidr_block`, `ingress.*.cidr_block`, or `ingress.*.ipv6_cidr_block` could be set to `""`. However, the value `""` is no longer valid.

For example, previously this type of configuration was valid:

```terraform
resource "aws_default_network_acl" "default" {
# ...
egress {
cidr_block = "0.0.0.0/0"
ipv6_cidr_block = ""
# ...
}
}
```

Now, set the argument to null (`ipv6_cidr_block = null`) or simply remove the empty-value configuration:

```terraform
resource "aws_default_network_acl" "default" {
# ...
egress {
cidr_block = "0.0.0.0/0"
# ...
}
}
```

## Resource: aws_elasticache_cluster

### Error raised if neither `engine` nor `replication_group_id` is specified
Expand Down Expand Up @@ -469,6 +500,35 @@ output "elasticache_global_replication_group_version_result" {

We removed the misspelled argument `active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguidshed_name` that was previously deprecated. Use `active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_name` now instead. Terraform will automatically migrate the state to `active_directory_configuration.0.self_managed_active_directory_configuration.0.organizational_unit_distinguished_name` during planning.

## Resource: aws_network_acl

Previously, `egress.*.cidr_block`, `egress.*.ipv6_cidr_block`, `ingress.*.cidr_block`, or `ingress.*.ipv6_cidr_block` could be set to `""`. However, the value `""` is no longer valid.

For example, previously this type of configuration was valid:

```terraform
resource "aws_network_acl" "default" {
# ...
egress {
cidr_block = "0.0.0.0/0"
ipv6_cidr_block = ""
# ...
}
}
```

Now, set the argument to null (`ipv6_cidr_block = null`) or simply remove the empty-value configuration:

```terraform
resource "aws_network_acl" "default" {
# ...
egress {
cidr_block = "0.0.0.0/0"
# ...
}
}
```

## Resource: aws_network_interface

!> **WARNING:** This topic is placeholder documentation.
Expand Down