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

vaerh/issue323 #324

Merged
merged 2 commits into from
Dec 25, 2023
Merged

vaerh/issue323 #324

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
6a53170
fix(firewall): Fix the error of deleting field-lists
vaerh Dec 25, 2023
d54be29
refactor(move): Variant of anchor rule implementation
vaerh Dec 25, 2023
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
5 changes: 5 additions & 0 deletions routeros/mikrotik_serialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ func TerraformResourceDataToMikrotik(s map[string]*schema.Schema, d *schema.Reso

switch terraformMetadata.Type {
case schema.TypeString:
if _, ok := setUnsetFields[terraformSnakeName]; ok && value.(string) == "" {
// Unset
item["!"+mikrotikKebabName] = ""
continue
}
item[mikrotikKebabName] = value.(string)
case schema.TypeFloat:
item[mikrotikKebabName] = strconv.FormatFloat(value.(float64), 'f', -1, 64)
Expand Down
7 changes: 4 additions & 3 deletions routeros/resource_ip_firewall_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ import (
// ResourceIPFirewallFilter https://wiki.mikrotik.com/wiki/Manual:IP/Firewall/Filter
func ResourceIPFirewallFilter() *schema.Resource {
resSchema := map[string]*schema.Schema{
MetaResourcePath: PropResourcePath("/ip/firewall/filter"),
MetaId: PropId(Id),
MetaSkipFields: PropSkipFields(`"bytes","packets"`),
MetaResourcePath: PropResourcePath("/ip/firewall/filter"),
MetaId: PropId(Id),
MetaSkipFields: PropSkipFields(`"bytes","packets"`),
MetaSetUnsetFields: PropSetUnsetFields(`"dst_address_list","src_address_list","in_interface_list","out_interface_list","in_bridge_port_list","out_bridge_port_list"`),

"action": {
Type: schema.TypeString,
Expand Down
7 changes: 4 additions & 3 deletions routeros/resource_ip_firewall_mangle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ import (
// ResourceIPFirewallMangle https://wiki.mikrotik.com/wiki/Manual:IP/Firewall/Mangle
func ResourceIPFirewallMangle() *schema.Resource {
resSchema := map[string]*schema.Schema{
MetaResourcePath: PropResourcePath("/ip/firewall/mangle"),
MetaId: PropId(Id),
MetaSkipFields: PropSkipFields(`"bytes","packets"`),
MetaResourcePath: PropResourcePath("/ip/firewall/mangle"),
MetaId: PropId(Id),
MetaSkipFields: PropSkipFields(`"bytes","packets"`),
MetaSetUnsetFields: PropSetUnsetFields(`"dst_address_list","src_address_list","in_interface_list","out_interface_list","in_bridge_port_list","out_bridge_port_list"`),

"action": {
Type: schema.TypeString,
Expand Down
7 changes: 4 additions & 3 deletions routeros/resource_ip_firewall_nat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ import (
// ResourceIPFirewallNat https://wiki.mikrotik.com/wiki/Manual:IP/Firewall/NAT
func ResourceIPFirewallNat() *schema.Resource {
resSchema := map[string]*schema.Schema{
MetaResourcePath: PropResourcePath("/ip/firewall/nat"),
MetaId: PropId(Id),
MetaSkipFields: PropSkipFields(`"bytes","packets"`),
MetaResourcePath: PropResourcePath("/ip/firewall/nat"),
MetaId: PropId(Id),
MetaSkipFields: PropSkipFields(`"bytes","packets"`),
MetaSetUnsetFields: PropSetUnsetFields(`"dst_address_list","src_address_list","in_interface_list","out_interface_list","in_bridge_port_list","out_bridge_port_list"`),

"action": {
Type: schema.TypeString,
Expand Down
26 changes: 22 additions & 4 deletions routeros/resource_move.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,21 @@ func ResourceMoveItems() *schema.Resource {
AtLeastOneOf: []string{"resource_name", "resource_path"},
},
"sequence": {
Type: schema.TypeList,
Required: true,
Description: "List identifiers in the required sequence.",
Type: schema.TypeList,
Required: true,
Description: "List identifiers in the required sequence. To locate the ```sequence``` before an " +
"existing rule, add its ```id``` to the last element of the ```sequence```.",
Elem: &schema.Schema{
Type: schema.TypeString,
MinItems: 2,
},
},
// "anchor_rule": {
// Type: schema.TypeString,
// Optional: true,
// Description: "The rule before which the ```sequence``` of rules will be placed. If this field is not specified, " +
// "the rules will be placed before the last element of the ```sequence```.",
// },
}
resRead := func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
path, ok := d.GetOk("resource_path")
Expand All @@ -65,6 +72,9 @@ func ResourceMoveItems() *schema.Resource {
conf[v.(string)] = struct{}{}
}

// TODO It is necessary to sometime transfer the logic for monotonous reading of the sequence, so that it is possible
// to control the correctness of the position of the rules and possibly introduce an anchor rule.
// This check will not work in all cases!!!
var list []string
for _, r := range *res {
if id, ok := r[".id"]; ok {
Expand All @@ -84,10 +94,18 @@ func ResourceMoveItems() *schema.Resource {
list = append(list, v.(string))
}

item := MikrotikItem{
var item MikrotikItem
// if anchor, ok := d.GetOk("anchor_rule"); ok {
// item = MikrotikItem{
// "numbers": strings.Join(list, ","),
// "destination": anchor.(string),
// }
// } else {
item = MikrotikItem{
"numbers": strings.Join(list[:len(list)-1], ","),
"destination": list[len(list)-1],
}
// }

path, ok := d.GetOk("resource_path")
if !ok {
Expand Down
Loading