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

Merge pull request #2434 from hashicorp/b-sg-rule-crash 

provider/aws: fix sg rule crash
This commit is contained in:
Paul Hinze 2015-06-23 15:01:35 -05:00
parent 95235ba2cc e0fccf2dcc
commit 7d26e1408a
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ func resourceAwsSecurityGroupRuleCreate(d *schema.ResourceData, meta interface{}
sg, err := findResourceSecurityGroup(conn, sg_id) sg, err := findResourceSecurityGroup(conn, sg_id)
if err != nil { if err != nil {
return fmt.Errorf("sorry") return err
} }
perm := expandIPPerm(d, sg) perm := expandIPPerm(d, sg)
@ -205,7 +205,7 @@ func resourceAwsSecurityGroupRuleDelete(d *schema.ResourceData, meta interface{}
sg, err := findResourceSecurityGroup(conn, sg_id) sg, err := findResourceSecurityGroup(conn, sg_id)
if err != nil { if err != nil {
return fmt.Errorf("sorry") return err
} }
perm := expandIPPerm(d, sg) perm := expandIPPerm(d, sg)
@ -255,18 +255,12 @@ func findResourceSecurityGroup(conn *ec2.EC2, id string) (*ec2.SecurityGroup, er
} }
resp, err := conn.DescribeSecurityGroups(req) resp, err := conn.DescribeSecurityGroups(req)
if err != nil { if err != nil {
if ec2err, ok := err.(awserr.Error); ok {
if ec2err.Code() == "InvalidSecurityGroupID.NotFound" ||
ec2err.Code() == "InvalidGroup.NotFound" {
resp = nil
err = nil
}
}
if err != nil {
log.Printf("Error on findResourceSecurityGroup: %s", err)
return nil, err return nil, err
} }
if len(resp.SecurityGroups) != 1 {
return nil, fmt.Errorf(
"Expected to find one security group with ID %q, got: %#v",
id, resp.SecurityGroups)
} }
return resp.SecurityGroups[0], nil return resp.SecurityGroups[0], nil