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

Merge pull request #2449 from hashicorp/b-aws-sg-crash 

providers/aws: more guards against crashy cases [GH-2308]
This commit is contained in:
Mitchell Hashimoto 2015-06-24 10:35:04 -07:00
parent 6bdc44b37f fef5741ded
commit 232916a4de
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/providers/aws/resource_aws_security_group_rule.go
View File

@ -130,10 +130,10 @@ func resourceAwsSecurityGroupRuleCreate(d *schema.ResourceData, meta interface{}
if autherr != nil { if autherr != nil {
if awsErr, ok := autherr.(awserr.Error); ok { if awsErr, ok := autherr.(awserr.Error); ok {
if awsErr.Code() == "InvalidPermission.Duplicate" { if awsErr.Code() == "InvalidPermission.Duplicate" {
return fmt.Errorf(`[WARN] A duplicate Security Group rule was found. This may be return fmt.Errorf(`[WARN] A duplicate Security Group rule was found. This may be
a side effect of a now-fixed Terraform issue causing two security groups with a side effect of a now-fixed Terraform issue causing two security groups with
identical attributes but different source_security_group_ids to overwrite each identical attributes but different source_security_group_ids to overwrite each
other in the state. See https://github.com/hashicorp/terraform/pull/2376 for more other in the state. See https://github.com/hashicorp/terraform/pull/2376 for more
information and instructions for recovery. Error message: %s`, awsErr.Message()) information and instructions for recovery. Error message: %s`, awsErr.Message())
} }
} }
@ -257,7 +257,7 @@ func findResourceSecurityGroup(conn *ec2.EC2, id string) (*ec2.SecurityGroup, er
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(resp.SecurityGroups) != 1 { if resp == nil || len(resp.SecurityGroups) != 1 || resp.SecurityGroups[0] == nil {
return nil, fmt.Errorf( return nil, fmt.Errorf(
"Expected to find one security group with ID %q, got: %#v", "Expected to find one security group with ID %q, got: %#v",
id, resp.SecurityGroups) id, resp.SecurityGroups)