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

Merge pull request #1624 from hashicorp/b-network-acl-proto 

provider/aws: allow int for network acl entry [GH-1435]
This commit is contained in:
Mitchell Hashimoto 2015-04-22 16:01:25 +02:00
parent b80d6d8cf3 19b3fa1a76
commit 791f59efbf
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
builtin/providers/aws/network_acl_entry.go
View File

@ -13,11 +13,15 @@ func expandNetworkAclEntries(configured []interface{}, entryType string) ([]*ec2
for _, eRaw := range configured { for _, eRaw := range configured {
data := eRaw.(map[string]interface{}) data := eRaw.(map[string]interface{})
protocol := data["protocol"].(string) protocol := data["protocol"].(string)
_, ok := protocolIntegers()[protocol] p, err := strconv.Atoi(protocol)
if !ok { if err != nil {
return nil, fmt.Errorf("Invalid Protocol %s for rule %#v", protocol, data) var ok bool
p, ok = protocolIntegers()[protocol]
if !ok {
return nil, fmt.Errorf("Invalid Protocol %s for rule %#v", protocol, data)
}
} }
p := extractProtocolInteger(data["protocol"].(string))
e := &ec2.NetworkACLEntry{ e := &ec2.NetworkACLEntry{
Protocol: aws.String(strconv.Itoa(p)), Protocol: aws.String(strconv.Itoa(p)),
PortRange: &ec2.PortRange{ PortRange: &ec2.PortRange{
@ -52,19 +56,6 @@ func flattenNetworkAclEntries(list []*ec2.NetworkACLEntry) []map[string]interfac
} }
func extractProtocolInteger(protocol string) int {
return protocolIntegers()[protocol]
}
func extractProtocolString(protocol int) string {
for key, value := range protocolIntegers() {
if value == protocol {
return key
}
}
return ""
}
func protocolIntegers() map[string]int { func protocolIntegers() map[string]int {
var protocolIntegers = make(map[string]int) var protocolIntegers = make(map[string]int)
protocolIntegers = map[string]int{ protocolIntegers = map[string]int{

19
builtin/providers/aws/network_acl_entry_test.go
View File

@ -26,6 +26,14 @@ func Test_expandNetworkACLEntry(t *testing.T) {
"action": "deny", "action": "deny",
"rule_no": 2, "rule_no": 2,
}, },
map[string]interface{}{
"protocol": "-1",
"from_port": 443,
"to_port": 443,
"cidr_block": "0.0.0.0/0",
"action": "deny",
"rule_no": 2,
},
} }
expanded, _ := expandNetworkAclEntries(input, "egress") expanded, _ := expandNetworkAclEntries(input, "egress")
@ -52,6 +60,17 @@ func Test_expandNetworkACLEntry(t *testing.T) {
CIDRBlock: aws.String("0.0.0.0/0"), CIDRBlock: aws.String("0.0.0.0/0"),
Egress: aws.Boolean(true), Egress: aws.Boolean(true),
}, },
&ec2.NetworkACLEntry{
Protocol: aws.String("-1"),
PortRange: &ec2.PortRange{
From: aws.Long(443),
To: aws.Long(443),
},
RuleAction: aws.String("deny"),
RuleNumber: aws.Long(2),
CIDRBlock: aws.String("0.0.0.0/0"),
Egress: aws.Boolean(true),
},
} }
if !reflect.DeepEqual(expanded, expected) { if !reflect.DeepEqual(expanded, expected) {