fix: Fix the AlwaysPresentNotUserProvided helper to ignore stored e…

…mpty values as RouterOS started returning such in 7.15
terraform-routeros · Jul 4, 2024 · c22e017 · c22e017
1 parent 77186c0
commit c22e017
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/routeros/provider_schema_helpers.go b/routeros/provider_schema_helpers.go
@@ -671,10 +671,6 @@ var (
 	// Prevents the need of hardcode values for default values, as those are harder to track over time/versions of
 	// routeros
 	AlwaysPresentNotUserProvided = func(k, old, new string, d *schema.ResourceData) bool {
-		if old == "" {
-			return false
-		}
-
 		value := d.GetRawConfig()
 
 		// For lists and sets, the key will look like `something.12345` or `something.#`.

diff --git a/routeros/resource_interface_macvlan.go b/routeros/resource_interface_macvlan.go
@@ -27,7 +27,6 @@ func ResourceInterfaceMacVlan() *schema.Resource {
 	private - does not allow communication between MACVLAN instances on the same parent interface.
 	bridge - allows communication between MACVLAN instances on the same parent interface.`,
 			ValidateFunc:     validation.StringInSlice([]string{"private", "bridge"}, true),
-			DiffSuppressFunc: AlwaysPresentNotUserProvided,
 		},
 		KeyMacAddress: PropMacAddressRw(
 			`Static MAC address of the interface. A randomly generated MAC address will be assigned when not specified.`,