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

data-source/aws_vpc_endpoint_service: Switch service_type filtering from client-side to API #17641

Merged
merged 3 commits into from
Mar 18, 2021
Merged

data-source/aws_vpc_endpoint_service: Switch service_type filtering from client-side to API #17641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ce56d8
data-soruce/aws_vpc_endpoint_service: Switch service_type filtering f…
bflad Feb 16, 2021
a50c2da
Update CHANGELOG for #17641
bflad Feb 16, 2021
03d69c4
data-source/aws_vpc_endpoint_service: Validate service_type argument,…
bflad Feb 16, 2021
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/17641.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:note
data-source/aws_vpc_endpoint_service: The `service_type` argument filtering has been switched from client-side to new EC2 API functionality
```

```release-note:bug
data-source/aws_vpc_endpoint_service: Prevent panic with incorrect `service_type` argument values
```
38 changes: 15 additions & 23 deletions aws/data_source_aws_vpc_endpoint_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/aws/aws-sdk-go/aws/arn"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/hashcode"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
)
Expand Down Expand Up @@ -66,9 +67,10 @@ func dataSourceAwsVpcEndpointService() *schema.Resource {
ConflictsWith: []string{"service"},
},
"service_type": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice(ec2.ServiceType_Values(), false),
},
"tags": tagsSchemaComputed(),
"vpc_endpoint_policy_supported": {
Expand Down Expand Up @@ -104,6 +106,14 @@ func dataSourceAwsVpcEndpointServiceRead(d *schema.ResourceData, meta interface{
if serviceNameOk {
req.ServiceNames = aws.StringSlice([]string{serviceName})
}

if v, ok := d.GetOk("service_type"); ok {
req.Filters = append(req.Filters, &ec2.Filter{
Name: aws.String("service-type"),
Values: aws.StringSlice([]string{v.(string)}),
})
}

if tagsOk {
req.Filters = append(req.Filters, ec2TagFiltersFromMap(tags.(map[string]interface{}))...)
}
Expand Down Expand Up @@ -134,29 +144,11 @@ func dataSourceAwsVpcEndpointServiceRead(d *schema.ResourceData, meta interface{
return fmt.Errorf("no matching VPC Endpoint Service found")
}

var serviceDetails []*ec2.ServiceDetail

// Client-side filtering. When the EC2 API supports this functionality
// server-side it should be moved.
for _, serviceDetail := range resp.ServiceDetails {
if serviceDetail == nil {
continue
}

if v, ok := d.GetOk("service_type"); ok {
if len(serviceDetail.ServiceType) > 0 && serviceDetail.ServiceType[0] != nil && v.(string) != aws.StringValue(serviceDetail.ServiceType[0].ServiceType) {
continue
}
}

serviceDetails = append(serviceDetails, serviceDetail)
}

if len(serviceDetails) > 1 {
if len(resp.ServiceDetails) > 1 {
return fmt.Errorf("multiple VPC Endpoint Services matched; use additional constraints to reduce matches to a single VPC Endpoint Service")
}

sd := serviceDetails[0]
sd := resp.ServiceDetails[0]
serviceId := aws.StringValue(sd.ServiceId)
serviceName = aws.StringValue(sd.ServiceName)

Expand Down