Ian Littman
3d9134052f
- @noahtalerman: 12p (noon) PST for Nudge and 12p local time for DDM See #23320 and #21998 # Checklist for submitter If some of the following don't apply, delete the relevant line. <!-- Note that API documentation changes are now addressed by the product design team. --> - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. - [x] Added/updated tests - [ ] Manual QA for all new/changed functionality @xpkoala @PezHub Do y'all have a macOS 13 VM handy to test this? Test plan would be: 1. Set OS update deadline for tomorrow 2. Enroll a macOS 13 host 3. Tonight at 9:15pm Pacific there shouldn't be a nudge (there would be with the old behavior) 4. Tomorrow at 9:15am Pacific there shouldn't be a nudge (there would be with the old behavior) 5. Tomorrow at 12:15pm Pacific there _should_ be a nudge (well, 15 minutes earlier-ish) /cc @noahtalerman
97 lines
3.4 KiB
Go
97 lines
3.4 KiB
Go
package fleet
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
// NudgeConfig represents a subset of the [full Nudge configuration][0] that we
|
|
// want to override.
|
|
//
|
|
// [0]: https://github.com/macadmins/nudge/wiki
|
|
type NudgeConfig struct {
|
|
OSVersionRequirements []nudgeOSVersionRequirements `json:"osVersionRequirements"`
|
|
UserInterface nudgeUserInterface `json:"userInterface"`
|
|
UserExperience nudgeUserExperience `json:"userExperience"`
|
|
}
|
|
|
|
type nudgeAboutUpdateURLs struct {
|
|
Language string `json:"_language"`
|
|
AboutUpdateURL string `json:"aboutUpdateURL"`
|
|
}
|
|
|
|
type nudgeOSVersionRequirements struct {
|
|
RequiredInstallationDate time.Time `json:"requiredInstallationDate"`
|
|
RequiredMinimumOSVersion string `json:"requiredMinimumOSVersion"`
|
|
AboutUpdateURLs []nudgeAboutUpdateURLs `json:"aboutUpdateURLs"`
|
|
}
|
|
|
|
type nudgeUserInterface struct {
|
|
SimpleMode bool `json:"simpleMode"`
|
|
ShowDeferralCount bool `json:"showDeferralCount"`
|
|
UpdateElements []nudgeUpdateElements `json:"updateElements"`
|
|
}
|
|
|
|
type nudgeUserExperience struct {
|
|
InitialRefreshCycle int `json:"initialRefreshCycle"`
|
|
ApproachingRefreshCycle int `json:"approachingRefreshCycle"`
|
|
ImminentRefreshCycle int `json:"imminentRefreshCycle"`
|
|
ElapsedRefreshCycle int `json:"elapsedRefreshCycle"`
|
|
}
|
|
|
|
type nudgeUpdateElements struct {
|
|
Language string `json:"_language"`
|
|
ActionButtonText string `json:"actionButtonText"`
|
|
MainHeader string `json:"mainHeader"`
|
|
}
|
|
|
|
func NewNudgeConfig(macOSUpdates AppleOSUpdateSettings) (*NudgeConfig, error) {
|
|
deadline, err := time.Parse("2006-01-02", macOSUpdates.Deadline.Value)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// For macOS 14+ we use DDM, which sets deadlines relative to local time. Nudge doesn't allow local-time deadlines
|
|
// when providing JSON config, so for compatibility with existing fleetd versions we're using a somewhat sane
|
|
// UTC value here (noon Pacific Standard Time, no revision for DST). See https://github.com/fleetdm/fleet/pull/23320
|
|
deadlineWithTime := time.Date(deadline.Year(), deadline.Month(), deadline.Day(), 20, 0, 0, 0, time.UTC)
|
|
|
|
return &NudgeConfig{
|
|
OSVersionRequirements: []nudgeOSVersionRequirements{{
|
|
RequiredInstallationDate: deadlineWithTime,
|
|
RequiredMinimumOSVersion: macOSUpdates.MinimumVersion.Value,
|
|
AboutUpdateURLs: []nudgeAboutUpdateURLs{{
|
|
Language: "en",
|
|
AboutUpdateURL: "https://fleetdm.com/learn-more-about/os-updates",
|
|
}},
|
|
}},
|
|
UserInterface: nudgeUserInterface{
|
|
SimpleMode: true,
|
|
ShowDeferralCount: false,
|
|
UpdateElements: []nudgeUpdateElements{{
|
|
Language: "en",
|
|
ActionButtonText: "Update",
|
|
MainHeader: "Your device requires an update",
|
|
}},
|
|
},
|
|
UserExperience: nudgeUserExperience{
|
|
/* Initially, we show Nudge once every 24 hours */
|
|
InitialRefreshCycle: 86400,
|
|
/*
|
|
* Related to approachingWindowTime (72 hours before deadline by default)
|
|
* we still want to show the window once every 24 hours.
|
|
*/
|
|
ApproachingRefreshCycle: 86400,
|
|
/*
|
|
* Related to imminentWindowTime (24 hours before deadline by default)
|
|
* we want to show the window once every 2 hours.
|
|
*/
|
|
ImminentRefreshCycle: 7200,
|
|
/*
|
|
* Related to elapsedWindowTime (once the deadline is past)
|
|
* we want to show the window once every hour.
|
|
*/
|
|
ElapsedRefreshCycle: 3600,
|
|
},
|
|
}, nil
|
|
}
|