fix: Fix empty value check to handle default numeric values correctly (…

…#286)
terraform-routeros · Nov 2, 2023 · 661e49c · 661e49c
1 parent 678c9a4
commit 661e49c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/resources/interface_eoip.md b/docs/resources/interface_eoip.md
@@ -43,7 +43,7 @@ resource "routeros_interface_eoip" "eoip_tunnel1" {
 - `loop_protect_send_interval` (String)
 - `mtu` (String) Layer3 Maximum transmission unit ('auto', 0 .. 65535)
 - `remote_address` (String) IP address of the remote end of the tunnel.
-- `tunnel_id` (String) Unique tunnel identifier, which must match the other side of the tunnel.
+- `tunnel_id` (Number) Unique tunnel identifier, which must match the other side of the tunnel.
 
 ### Read-Only
 

diff --git a/routeros/mikrotik_serialize.go b/routeros/mikrotik_serialize.go
@@ -48,7 +48,7 @@ func isEmpty(propName string, schemaProp *schema.Schema, d *schema.ResourceData,
 		}
 		return v.(string) == "" && confValue.IsNull()
 	case schema.TypeInt:
-		return !d.HasChange(propName)
+		return confValue.IsNull() && schemaProp.Default == nil
 	case schema.TypeBool:
 		// If true, it is always not empty:
 		if v.(bool) {

diff --git a/routeros/resource_interface_eoip.go b/routeros/resource_interface_eoip.go
@@ -34,9 +34,9 @@ func ResourceInterfaceEoip() *schema.Resource {
 		KeyRemoteAddress:           PropRemoteAddressRw,
 		KeyRunning:                 PropRunningRo,
 		"tunnel_id": {
-			Type:        schema.TypeString,
+			Type:        schema.TypeInt,
 			Optional:    true,
-			Default:     "0",
+			Default:     0,
 			Description: "Unique tunnel identifier, which must match the other side of the tunnel.",
 		},
 	}