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.

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

Fix unintended plan diff from unspecified defaults #465

Merged
merged 1 commit into from
May 28, 2024
Merged
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions routeros/resource_ip_dhcp_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ func ResourceDhcpServer() *schema.Resource {
"* lease-time - use time from lease-time parameter",
},
"bootp_support": {
Type: schema.TypeString,
Optional: true,
Default: "static",
Description: "Support for BOOTP clients.",
ValidateFunc: validation.StringInSlice([]string{"none", "static", "dynamic"}, false),
Type: schema.TypeString,
Optional: true,
DiffSuppressFunc: AlwaysPresentNotUserProvided,
Description: "Support for BOOTP clients.",
ValidateFunc: validation.StringInSlice([]string{"none", "static", "dynamic"}, false),
},
"client_mac_limit": {
Type: schema.TypeInt,
Expand Down Expand Up @@ -94,9 +94,9 @@ func ResourceDhcpServer() *schema.Resource {
Description: "A script that will be executed after a lease is assigned or de-assigned.",
},
"lease_time": {
Type: schema.TypeString,
Optional: true,
Default: "10m",
Type: schema.TypeString,
Optional: true,
DiffSuppressFunc: AlwaysPresentNotUserProvided,
Description: "The time that a client may use the assigned address. The client will try to renew this " +
"address after half of this time and will request a new address after the time limit expires.",
},
Expand Down