Merge pull request #3 from Ujstor/clean-nonstatic-ds

ingress_priority & random
terraform-routeros · Aug 12, 2024 · 7f41906 · 7f41906
2 parents 3fa5dd2 + 113cdb5
commit 7f41906
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 3 deletions.
diff --git a/docs/data-sources/ip_firewall.md b/docs/data-sources/ip_firewall.md
@@ -113,6 +113,7 @@ Read-Only:
 - `in_bridge_port_list` (String)
 - `in_interface` (String)
 - `in_interface_list` (String)
+- `ingress_priority` (Number)
 - `invalid` (Boolean)
 - `ipsec_policy` (String)
 - `ipv4_options` (String)
@@ -140,6 +141,7 @@ Read-Only:
 - `port` (String)
 - `protocol` (String)
 - `psd` (String)
+- `random` (Number)
 - `route_dst` (String)
 - `routing_mark` (String)
 - `src_address` (String)
@@ -191,6 +193,7 @@ Read-Only:
 - `in_bridge_port_list` (String)
 - `in_interface` (String)
 - `in_interface_list` (String)
+- `ingress_priority` (Number)
 - `invalid` (Boolean)
 - `ipsec_policy` (String)
 - `ipv4_options` (String)
@@ -211,6 +214,7 @@ Read-Only:
 - `priority` (Number)
 - `protocol` (String)
 - `psd` (String)
+- `random` (Number)
 - `routing_mark` (String)
 - `same_not_by_dst` (Boolean)
 - `src_address` (String)
@@ -264,6 +268,7 @@ Read-Only:
 - `in_bridge_port_list` (String)
 - `in_interface` (String)
 - `in_interface_list` (String)
+- `ingress_priority` (Number)
 - `invalid` (Boolean)
 - `ipsec_policy` (String)
 - `ipv4_options` (String)
@@ -284,6 +289,7 @@ Read-Only:
 - `priority` (Number)
 - `protocol` (String)
 - `psd` (String)
+- `random` (Number)
 - `reject_with` (String)
 - `routing_mark` (String)
 - `routing_table` (String)

diff --git a/docs/data-sources/ipv6_firewall.md b/docs/data-sources/ipv6_firewall.md
@@ -50,6 +50,7 @@ Read-Only:
 - `in_bridge_port_list` (String)
 - `in_interface` (String)
 - `in_interface_list` (String)
+- `ingress_priority` (Number)
 - `invalid` (Boolean)
 - `ipsec_policy` (String)
 - `limit` (String)
@@ -66,6 +67,7 @@ Read-Only:
 - `port` (String)
 - `priority` (Number)
 - `protocol` (String)
+- `random` (Number)
 - `reject_with` (String)
 - `routing_mark` (String)
 - `routing_table` (String)

diff --git a/routeros/datasource_ip_firewall.go b/routeros/datasource_ip_firewall.go
@@ -19,9 +19,7 @@ func DatasourceIPFirewall() *schema.Resource {
 - rules (aka filter)
 `,
 		Schema: map[string]*schema.Schema{
-			MetaSkipFields: PropSkipFields(
-				"ingress_priority", "packets", "random",
-			),
+			MetaSkipFields: PropSkipFields("packets"),
 
 			"address_list": getIPFirewallAddrListSchema(),
 			"mangle":       getIPFirewallMangleSchema(),

diff --git a/routeros/datasource_ip_firewall_filter.go b/routeros/datasource_ip_firewall_filter.go
@@ -126,6 +126,10 @@ func getIPFirewallFilterSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				"ingress_priority": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
 				"invalid": {
 					Type:     schema.TypeBool,
 					Computed: true,
@@ -210,6 +214,10 @@ func getIPFirewallFilterSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				"random": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
 				"reject_with": {
 					Type:     schema.TypeString,
 					Computed: true,

diff --git a/routeros/datasource_ip_firewall_mangle.go b/routeros/datasource_ip_firewall_mangle.go
@@ -132,6 +132,10 @@ func getIPFirewallMangleSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				"ingress_priority": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
 				"invalid": {
 					Type:     schema.TypeBool,
 					Computed: true,
@@ -184,6 +188,10 @@ func getIPFirewallMangleSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				"random": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
 				"new_routing_mark": {
 					Type:     schema.TypeString,
 					Computed: true,

diff --git a/routeros/datasource_ip_firewall_nat.go b/routeros/datasource_ip_firewall_nat.go
@@ -124,6 +124,10 @@ func getIPFirewallNatSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				"ingress_priority": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
 				"invalid": {
 					Type:     schema.TypeBool,
 					Computed: true,
@@ -204,6 +208,10 @@ func getIPFirewallNatSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				"random": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
 				"routing_mark": {
 					Type:     schema.TypeString,
 					Computed: true,

diff --git a/routeros/datasource_ipv6_firewall_filter.go b/routeros/datasource_ipv6_firewall_filter.go
@@ -114,6 +114,10 @@ func getIPv6FirewallFilterSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				"ingress_priority": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
 				"invalid": {
 					Type:     schema.TypeBool,
 					Computed: true,
@@ -178,6 +182,10 @@ func getIPv6FirewallFilterSchema() *schema.Schema {
 					Type:     schema.TypeString,
 					Computed: true,
 				},
+				"random": {
+					Type:     schema.TypeInt,
+					Computed: true,
+				},
 				"reject_with": {
 					Type:     schema.TypeString,
 					Computed: true,