ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/aws: Guard against panic when no aws_default_vpc found (#15070) 

Found as part of #15065, when there is no default VPC, Terraform will
throw a panic. This prevents that as a user should never get that

```
% make testacc TEST=./builtin/providers/aws/ TESTARGS='-run=TestAccAWSDefaultVpc_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/06/05 12:16:09 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws/ -v -run=TestAccAWSDefaultVpc_basic -timeout 120m
=== RUN   TestAccAWSDefaultVpc_basic
--- PASS: TestAccAWSDefaultVpc_basic (44.65s)
PASS
ok  	github.com/hashicorp/terraform/builtin/providers/aws	44.669s
```
This commit is contained in:
Paul Stack 2017-06-05 12:28:12 +03:00 committed by GitHub
parent 1244309579
commit 89aedb4802
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/providers/aws/resource_aws_default_vpc.go
View File

@ -1,6 +1,7 @@
package aws
import (
"fmt"
"log"
"github.com/aws/aws-sdk-go/aws"
@ -37,7 +38,7 @@ func resourceAwsDefaultVpcCreate(d *schema.ResourceData, meta interface{}) error
conn := meta.(*AWSClient).ec2conn
req := &ec2.DescribeVpcsInput{
Filters: []*ec2.Filter{
&ec2.Filter{
{
Name: aws.String("isDefault"),
Values: aws.StringSlice([]string{"true"}),
},
@ -49,6 +50,10 @@ func resourceAwsDefaultVpcCreate(d *schema.ResourceData, meta interface{}) error
return err
}
if resp.Vpcs == nil || len(resp.Vpcs) == 0 {
return fmt.Errorf("No default VPC found in this region.")
}
d.SetId(aws.StringValue(resp.Vpcs[0].VpcId))
return resourceAwsVpcUpdate(d, meta)