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

provider/openstack: Change rules type to List 

Allows for ordering of rules that are applied to the firewall policy,
including addition and removal of rules in certain positions.
This commit is contained in:
Steven Crossan 2016-06-16 12:27:01 +01:00
parent 5fdcf5d16a
commit ca2d230a2c
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/providers/openstack/resource_openstack_fw_policy_v1.go
View File

@ -49,10 +49,9 @@ func resourceFWPolicyV1() *schema.Resource {
Computed: true,
},
"rules": &schema.Schema{
Type: schema.TypeSet,
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
},
},
}
@ -66,13 +65,13 @@ func resourceFWPolicyV1Create(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error creating OpenStack networking client: %s", err)
}
v := d.Get("rules").(*schema.Set)
v := d.Get("rules").([]interface{})
log.Printf("[DEBUG] Rules found : %#v", v)
log.Printf("[DEBUG] Rules count : %d", v.Len())
log.Printf("[DEBUG] Rules count : %d", len(v))
rules := make([]string, v.Len())
for i, v := range v.List() {
rules := make([]string, len(v))
for i, v := range v {
rules[i] = v.(string)
}
@ -144,13 +143,13 @@ func resourceFWPolicyV1Update(d *schema.ResourceData, meta interface{}) error {
}
if d.HasChange("rules") {
v := d.Get("rules").(*schema.Set)
v := d.Get("rules").([]interface{})
log.Printf("[DEBUG] Rules found : %#v", v)
log.Printf("[DEBUG] Rules count : %d", v.Len())
log.Printf("[DEBUG] Rules count : %d", len(v))
rules := make([]string, v.Len())
for i, v := range v.List() {
rules := make([]string, len(v))
for i, v := range v {
rules[i] = v.(string)
}
opts.Rules = rules