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

Jump to bottom

Add aws_security_group_rules resource #9032

Closed
wants to merge 2 commits into from
Closed

Add aws_security_group_rules resource #9032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60912ef
Adds `aws_security_group_rules` resource
jakauppila Jun 18, 2019
057c17a
fixed formatting
jakauppila Jun 18, 2019
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
1 change: 1 addition & 0 deletions aws/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,7 @@ func Provider() terraform.ResourceProvider {
"aws_network_interface_sg_attachment": resourceAwsNetworkInterfaceSGAttachment(),
"aws_default_security_group": resourceAwsDefaultSecurityGroup(),
"aws_security_group_rule": resourceAwsSecurityGroupRule(),
"aws_security_group_rules": resourceAwsSecurityGroupRules(),
"aws_securityhub_account": resourceAwsSecurityHubAccount(),
"aws_securityhub_product_subscription": resourceAwsSecurityHubProductSubscription(),
"aws_securityhub_standards_subscription": resourceAwsSecurityHubStandardsSubscription(),
Expand Down
316 changes: 316 additions & 0 deletions aws/resource_aws_security_group_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,316 @@
package aws

import (
"fmt"
"log"

"github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform/helper/schema"
)

func resourceAwsSecurityGroupRules() *schema.Resource {
return &schema.Resource{
Create: resourceAwsSecurityGroupRulesCreate,
Read: resourceAwsSecurityGroupRulesRead,
Update: resourceAwsSecurityGroupRulesUpdate,
Delete: resourceAwsSecurityGroupRulesDelete,

Schema: map[string]*schema.Schema{
"security_group_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},

"ingress": {
Type: schema.TypeSet,
Optional: true,
ConfigMode: schema.SchemaConfigModeAttr,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"from_port": {
Type: schema.TypeInt,
Required: true,
},

"to_port": {
Type: schema.TypeInt,
Required: true,
},

"protocol": {
Type: schema.TypeString,
Required: true,
StateFunc: protocolStateFunc,
},

"cidr_blocks": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validateCIDRNetworkAddress,
},
},

"ipv6_cidr_blocks": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validateCIDRNetworkAddress,
},
},

"prefix_list_ids": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},

"security_groups": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},

"self": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},

"description": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validateSecurityGroupRuleDescription,
},
},
},
Set: resourceAwsSecurityGroupRuleHash,
},

"egress": {
Type: schema.TypeSet,
Optional: true,
ConfigMode: schema.SchemaConfigModeAttr,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"from_port": {
Type: schema.TypeInt,
Required: true,
},

"to_port": {
Type: schema.TypeInt,
Required: true,
},

"protocol": {
Type: schema.TypeString,
Required: true,
StateFunc: protocolStateFunc,
},

"cidr_blocks": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validateCIDRNetworkAddress,
},
},

"ipv6_cidr_blocks": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validateCIDRNetworkAddress,
},
},

"prefix_list_ids": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},

"security_groups": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},

"self": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},

"description": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validateSecurityGroupRuleDescription,
},
},
},
Set: resourceAwsSecurityGroupRuleHash,
},
},
}
}

func resourceAwsSecurityGroupRulesCreate(d *schema.ResourceData, meta interface{}) error {
return resourceAwsSecurityGroupRulesUpdate(d, meta)
}

func resourceAwsSecurityGroupRulesRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn

sgRaw, _, err := SGStateRefreshFunc(conn, d.Id())()
if err != nil {
return err
}
if sgRaw == nil {
d.SetId("")
return nil
}

sg := sgRaw.(*ec2.SecurityGroup)

remoteIngressRules := resourceAwsSecurityGroupIPPermGather(d.Id(), sg.IpPermissions, sg.OwnerId)
remoteEgressRules := resourceAwsSecurityGroupIPPermGather(d.Id(), sg.IpPermissionsEgress, sg.OwnerId)

localIngressRules := d.Get("ingress").(*schema.Set).List()
localEgressRules := d.Get("egress").(*schema.Set).List()

// Loop through the local state of rules, doing a match against the remote
// ruleSet we built above.
ingressRules := matchRules("ingress", localIngressRules, remoteIngressRules)
egressRules := matchRules("egress", localEgressRules, remoteEgressRules)

if err := d.Set("ingress", ingressRules); err != nil {
log.Printf("[WARN] Error setting Ingress rule set for (%s): %s", d.Id(), err)
}

if err := d.Set("egress", egressRules); err != nil {
log.Printf("[WARN] Error setting Egress rule set for (%s): %s", d.Id(), err)
}

return nil
}

func resourceAwsSecurityGroupRulesUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn

id := d.Get("security_group_id").(string)

awsMutexKV.Lock(id)
defer awsMutexKV.Unlock(id)

sgRaw, _, err := SGStateRefreshFunc(conn, id)()
if err != nil {
return err
}
if sgRaw == nil {
d.SetId("")
return nil
}

d.SetId(id)

group := sgRaw.(*ec2.SecurityGroup)
isVPC := group.VpcId != nil && *group.VpcId != ""

err = resourceAwsSecurityGroupUpdateRules(d, "ingress", meta, group)
if err != nil {
return err
}

if isVPC {
err = resourceAwsSecurityGroupUpdateRules(d, "egress", meta, group)
if err != nil {
return err
}
}

return resourceAwsSecurityGroupRulesRead(d, meta)
}

func resourceAwsSecurityGroupRulesDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn

id := d.Get("security_group_id").(string)

awsMutexKV.Lock(id)
defer awsMutexKV.Unlock(id)

log.Printf("[DEBUG] Security Group Rules destroy: %v", id)

sgRaw, _, err := SGStateRefreshFunc(conn, id)()
if err != nil {
return err
}
if sgRaw == nil {
return nil
}

group := sgRaw.(*ec2.SecurityGroup)

ingress, err := expandIPPerms(group, d.Get("ingress").(*schema.Set).List())
if err != nil {
return err
}
egress, err := expandIPPerms(group, d.Get("egress").(*schema.Set).List())
if err != nil {
return err
}

if len(ingress) > 0 || len(egress) > 0 {
conn := meta.(*AWSClient).ec2conn

var err error
if len(ingress) > 0 {
log.Printf("[DEBUG] Revoking security group %#v %s rule: %#v",
group, "ingress", ingress)

req := &ec2.RevokeSecurityGroupIngressInput{
GroupId: group.GroupId,
IpPermissions: ingress,
}
if group.VpcId == nil || *group.VpcId == "" {
req.GroupId = nil
req.GroupName = group.GroupName
}
_, err = conn.RevokeSecurityGroupIngress(req)
if err != nil {
return fmt.Errorf(
"Error revoking security group %s rules: %s",
"ingress", err)
}
}

if len(egress) > 0 {
log.Printf("[DEBUG] Revoking security group %#v %s rule: %#v",
group, "egress", egress)

req := &ec2.RevokeSecurityGroupEgressInput{
GroupId: group.GroupId,
IpPermissions: egress,
}
_, err = conn.RevokeSecurityGroupEgress(req)
if err != nil {
return fmt.Errorf(
"Error revoking security group %s rules: %s",
"egress", err)
}
}
}

d.SetId("")

return nil
}
Loading