Update MDM migration flow with offline dialog #21274

gillespi314 · 2024-08-13T15:48:25Z

Replaces #21209 (because the commit history got all messed up by a bad rebase attempt)

…eetdm/fleet into mdm-migration-offline-watcher

roperzh

looks good, left some comments that can be fixed in a follow up

roperzh · 2024-08-13T15:56:27Z

orbit/cmd/desktop/desktop.go

@@ -60,6 +61,10 @@ func setupRunners() {
 }

 func main() {
+	// FIXME: we need to do a better job of graceful shutdown, releasing resources, stopping
+	// tickers, etc. (https://github.com/fleetdm/fleet/issues/21256)
+	ctx, cancel := context.WithCancel(context.Background())


nit and a question:

Is this meant to be used as a general purpose context? if yes ctx makes sense, if no, could we rename it?

Should we rename cancel now that's called way down below?

roperzh · 2024-08-13T15:57:11Z

orbit/pkg/migration/readwriter.go

@@ -57,7 +57,7 @@ func (rw *ReadWriter) RemoveFile() error {
 }

 func (rw *ReadWriter) GetMigrationType() (string, error) {
-	data, err := rw.read()
+	data, err := rw.read() // TODO: confirm error handling with jahziel, what about other errors?


sanity check: have you folks decided here?

I think this is referring to this function previously swallowing all errors that
weren'tErrNotExist. I updated it in one of my PRs to return the error correctly.

roperzh · 2024-08-13T16:04:38Z

orbit/pkg/useraction/mdm_migration_darwin.go

+	select {
+	case <-ctx.Done():
+		log.Debug().Msg("dialog context canceled")
+		// TODO: do we care about this? anything we need to clean up?


baseDialog has a method Exit() that's supposed to send a signal to kill swiftDialog, should we call it here?

roperzh · 2024-08-13T16:06:32Z

orbit/pkg/useraction/mdm_migration_darwin.go

+	if !m.props.DisableTakeover {
+		flags = append(flags,
+			"--blurscreen",
+			"--ontop",
+		)
+	}


nit: those are handled by the inner baseDialog, correct? so technically not required here? only asking because it was a tiny bit confused and had to go back to the other definition

codecov · 2024-08-13T16:07:49Z

Codecov Report

Attention: Patch coverage is 0% with 12 lines in your changes missing coverage. Please review.

Please upload report for BASE (feat-mdm-migration-updates@6664822). Learn more about missing BASE report.

Files	Patch %	Lines
orbit/pkg/migration/readwriter.go	0.00%	9 Missing ⚠️
orbit/pkg/useraction/mdm_migration_notdarwin.go	0.00%	3 Missing ⚠️

Additional details and impacted files

@@                      Coverage Diff                      @@
##             feat-mdm-migration-updates   #21274   +/-   ##
=============================================================
  Coverage                              ?   54.10%           
=============================================================
  Files                                 ?     1458           
  Lines                                 ?   137833           
  Branches                              ?     3349           
=============================================================
  Hits                                  ?    74577           
  Misses                                ?    57198           
  Partials                              ?     6058

Flag	Coverage Δ
backend	`54.21% <0.00%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

jahzielv · 2024-08-13T17:07:55Z

orbit/cmd/desktop/desktop.go

@@ -192,6 +194,46 @@ func main() {
 			migrateMDMItem.Hide()
 		}

+		// TODO: we can probably extract this into a function that sets up both the migrator and the


Is this worth doing now? I'd say yes but not too big a deal.

@jahzielv, do you want to give that a try as follow up in the feature branch?

jahzielv · 2024-08-13T17:17:16Z

orbit/pkg/useraction/mdm_migration_darwin.go

@@ -581,3 +598,222 @@ func (m *swiftDialogMDMMigrator) MigrationInProgress() (bool, error) {
 func (m *swiftDialogMDMMigrator) MarkMigrationCompleted() error {
 	return m.mrw.RemoveFile()
 }
+
+// StartMDMMigrationOfflineWatcher starts a watcher running on a 3-minute loop that checks if the
+// device goes offline in the process of migrating to Fleet's MDM and offline. If so, it shows a


Typo I think?

Suggested change

// device goes offline in the process of migrating to Fleet's MDM and offline. If so, it shows a

// device goes offline in the process of migrating to Fleet's MDM and is offline. If so, it shows a

jahzielv · 2024-08-13T17:21:16Z

orbit/pkg/useraction/mdm_migration_darwin.go

+
+	log.Debug().Msgf("offline dialog, device is unmanaged, migration type %s", mt)
+
+	// TODO: Maybe check show profiles and skip showing the dialog if the device is managed?


Alas, this will have to wait for another day as profiles show requires root :'(

gillespi314 · 2024-08-13T18:00:21Z

Lint and other comments will be addressed separately

gillespi314 added 23 commits August 8, 2024 17:07

Initial implementation

b6a8d96

Refactor offline dialog; experiment with message contents

0cfb7cf

Minor cleanup

6ab7acf

Remove early return in swift dialog runner

ed602de

Remove unused struct property

886a726

Integrate with migration file reader

f035f0e

Refactor dialog props to disable default screen takeover

e4f78c8

Fix crash from nil error

90c42f0

Update offline dialog UI

01254ab

Update logs; todos

0e9acf6

Address comments

0c33839

Initial implementation

a365adf

Refactor offline dialog; experiment with message contents

6342e64

Minor cleanup

91d29f8

Remove early return in swift dialog runner

30e01ee

Remove unused struct property

4006a6e

Integrate with migration file reader

1587738

Refactor dialog props to disable default screen takeover

282ca2b

Fix crash from nil error

c257a51

Update offline dialog UI

9e3bed7

Update logs; todos

77931a7

Address comments

2987e4b

Merge branch 'mdm-migration-offline-watcher' of https://github.com/fl…

186f850

…eetdm/fleet into mdm-migration-offline-watcher

gillespi314 requested review from lucasmrod, getvictor and roperzh as code owners August 13, 2024 15:48

gillespi314 temporarily deployed to Docker Hub August 13, 2024 15:48 — with GitHub Actions Inactive

gillespi314 mentioned this pull request Aug 13, 2024

Update MDM migration flow with offline dialog #21209

Closed

12 tasks

roperzh approved these changes Aug 13, 2024

View reviewed changes

jahzielv reviewed Aug 13, 2024

View reviewed changes

gillespi314 merged commit 73658dd into feat-mdm-migration-updates Aug 13, 2024
53 of 57 checks passed

gillespi314 deleted the mdm-migration-offline-dialog branch August 13, 2024 17:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update MDM migration flow with offline dialog #21274

Update MDM migration flow with offline dialog #21274

gillespi314 commented Aug 13, 2024 •

edited

Loading

roperzh left a comment

roperzh Aug 13, 2024

roperzh Aug 13, 2024

jahzielv Aug 13, 2024

roperzh Aug 13, 2024

roperzh Aug 13, 2024

codecov bot commented Aug 13, 2024

jahzielv Aug 13, 2024

gillespi314 Aug 13, 2024

jahzielv Aug 13, 2024

jahzielv Aug 13, 2024

jahzielv Aug 13, 2024

gillespi314 commented Aug 13, 2024

	// device goes offline in the process of migrating to Fleet's MDM and offline. If so, it shows a
	// device goes offline in the process of migrating to Fleet's MDM and is offline. If so, it shows a


		log.Debug().Msgf("offline dialog, device is unmanaged, migration type %s", mt)

		// TODO: Maybe check show profiles and skip showing the dialog if the device is managed?

Update MDM migration flow with offline dialog #21274

Update MDM migration flow with offline dialog #21274

Conversation

gillespi314 commented Aug 13, 2024 • edited Loading

roperzh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Aug 13, 2024

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gillespi314 commented Aug 13, 2024

gillespi314 commented Aug 13, 2024 •

edited

Loading