Merge pull request #14528 from ewbankkit/issue-14527

Create rule(s) for prefix-list-only AWS security group ingress/egress permissions on 'terraform import'
This commit is contained in:
Jake Champlin 2017-05-16 08:38:22 -04:00 committed by GitHub
commit b9e188c5e0
2 changed files with 44 additions and 0 deletions

View File

@ -118,6 +118,22 @@ func resourceAwsSecurityGroupImportStatePerm(sg *ec2.SecurityGroup, ruleType str
result = append(result, r)
}
}
if len(result) == 0 && len(perm.PrefixListIds) > 0 {
p := &ec2.IpPermission{
FromPort: perm.FromPort,
IpProtocol: perm.IpProtocol,
PrefixListIds: perm.PrefixListIds,
ToPort: perm.ToPort,
}
r, err := resourceAwsSecurityGroupImportStatePermPair(sg, ruleType, p)
if err != nil {
return nil, err
}
result = append(result, r)
}
return result, nil
}

View File

@ -157,3 +157,31 @@ func TestAccAWSSecurityGroup_importIPRangesWithSameRules(t *testing.T) {
},
})
}
func TestAccAWSSecurityGroup_importPrefixList(t *testing.T) {
checkFn := func(s []*terraform.InstanceState) error {
// Expect 2: group, 1 rule
if len(s) != 2 {
return fmt.Errorf("expected 2 states: %#v", s)
}
return nil
}
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAWSSecurityGroupDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSSecurityGroupConfigPrefixListEgress,
},
{
ResourceName: "aws_security_group.egress",
ImportState: true,
ImportStateCheck: checkFn,
},
},
})
}