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

PropSkipFields
terraform-routeros · Aug 12, 2024 · 99d5f05 · 99d5f05
2 parents 07dc03e + 5999414
commit 99d5f05
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/routeros/datasource_files.go b/routeros/datasource_files.go
@@ -53,7 +53,7 @@ func DatasourceFiles() *schema.Resource {
 							Computed: true,
 						},
 						"size": {
-							Type:     schema.TypeFloat,
+							Type:     schema.TypeInt,
 							Computed: true,
 						},
 						"type": {

diff --git a/routeros/datasource_interfaces.go b/routeros/datasource_interfaces.go
@@ -13,7 +13,11 @@ func DatasourceInterfaces() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 			MetaResourcePath: PropResourcePath("/interface"),
 			MetaId:           PropId(Id),
-
+			MetaSkipFields: PropSkipFields(
+				"fp_rx_byte", "fp_rx_packet", "fp_tx_byte", "fp_tx_packet", "link_downs",
+				"rx_byte", "rx_drop", "rx_error", "rx_packet", "tx_byte",
+				"tx_drop", "tx_error", "tx_packet", "tx_queue_drop",
+			),
 			KeyFilter: PropFilterRw,
 			"interfaces": {
 				Type:     schema.TypeList,

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

diff --git a/routeros/datasource_ip_firewall_filter.go b/routeros/datasource_ip_firewall_filter.go
@@ -23,7 +23,7 @@ func getIPFirewallFilterSchema() *schema.Schema {
 					Computed: true,
 				},
 				"bytes": {
-					Type:     schema.TypeFloat,
+					Type:     schema.TypeInt,
 					Computed: true,
 				},
 				"chain": {

diff --git a/routeros/datasource_ip_firewall_mangle.go b/routeros/datasource_ip_firewall_mangle.go
@@ -29,7 +29,7 @@ func getIPFirewallMangleSchema() *schema.Schema {
 					Computed: true,
 				},
 				"bytes": {
-					Type:     schema.TypeFloat,
+					Type:     schema.TypeInt,
 					Computed: true,
 				},
 				"chain": {

diff --git a/routeros/datasource_ip_firewall_nat.go b/routeros/datasource_ip_firewall_nat.go
@@ -29,7 +29,7 @@ func getIPFirewallNatSchema() *schema.Schema {
 					Computed: true,
 				},
 				"bytes": {
-					Type:     schema.TypeFloat,
+					Type:     schema.TypeInt,
 					Computed: true,
 				},
 				"chain": {

diff --git a/routeros/datasource_ipv6_firewall_filter.go b/routeros/datasource_ipv6_firewall_filter.go
@@ -19,7 +19,7 @@ func getIPv6FirewallFilterSchema() *schema.Schema {
 					Computed: true,
 				},
 				"bytes": {
-					Type:     schema.TypeFloat,
+					Type:     schema.TypeInt,
 					Computed: true,
 				},
 				"chain": {

diff --git a/routeros/datasource_system_resource.go b/routeros/datasource_system_resource.go
@@ -10,6 +10,10 @@ func DatasourceSystemResource() *schema.Resource {
 	resSchema := map[string]*schema.Schema{
 		MetaResourcePath: PropResourcePath("/system/resource"),
 		MetaId:           PropId(Id),
+		MetaSkipFields: PropSkipFields(
+			"cpu_frequency", "cpu_load", "free_hdd_space", "free_memory",
+			"uptime", "write_sect_since_reboot", "write_sect_total",
+		),
 		"architecture_name": { // Sample = architecture-name: "x86_64"
 			Type:     schema.TypeString,
 			Computed: true,
@@ -39,11 +43,11 @@ func DatasourceSystemResource() *schema.Resource {
 			Computed: true,
 		},
 		"total_hdd_space": { // Sample = total-hdd-space: "93564928"
-			Type:     schema.TypeFloat,
+			Type:     schema.TypeInt,
 			Computed: true,
 		},
 		"total_memory": { // Sample = total-memory: "469762048"
-			Type:     schema.TypeFloat,
+			Type:     schema.TypeInt,
 			Computed: true,
 		},
 		"version": { // Sample = version: "7.10 (stable)"