-
Notifications
You must be signed in to change notification settings - Fork 471
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
close progress with stdin #24280
close progress with stdin #24280
Conversation
e7c47a9
to
d9a8308
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #24280 +/- ##
==========================================
- Coverage 63.43% 63.42% -0.01%
==========================================
Files 1584 1584
Lines 150498 150621 +123
Branches 3771 3824 +53
==========================================
+ Hits 95465 95536 +71
- Misses 47415 47460 +45
- Partials 7618 7625 +7
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Just two small comments to address.
orbit/pkg/luks/luks_linux.go
Outdated
Title: infoTitle, | ||
Text: "Validating passphrase...", | ||
}) | ||
if err != nil { | ||
log.Error().Err(err).Msg("failed to show progress dialog") | ||
} | ||
defer func() { | ||
if err := cancelProgress(); err != nil { | ||
log.Error().Err(err).Msg("failed to cancel progress dialog") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will error because the (stdin) file is already closed, so maybe change this one to log.Debug()
? (to not create noise)
} | ||
} | ||
|
||
// ShowEntry displays an dialog that accepts end user input. It returns the entered | ||
// text or errors ErrCanceled, ErrTimeout, or ErrUnknown. | ||
func (z *Zenity) ShowEntry(ctx context.Context, opts dialog.EntryOptions) ([]byte, error) { | ||
z.killZenityFunc() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Happy to see this go away :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@sharon-fdm need a review from you as it's updating CI to use macos-13 (macos-12 is EOL) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only reviewed .github/workflows/fleet-and-orbit.yml
Approving based on Lucas' review
#24212
The zenity progress window expects stdin to update and close the window, this caused a few issues where
creating a
StdinPipe()
and closing it fixes both issueschanges/
,orbit/changes/
oree/fleetd-chrome/changes
.See Changes files for more information.
runtime.GOOS
).