fix(windows): split bootstrap profiles#112
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Splits managed Windows bootstrap generation into explicit core, desktop, and WSL2 profiles.
--desktopnow runs only the core Windows user/OpenSSH/Git/tar setup and writes the setup marker.--desktopkeeps the TightVNC, per-user VNC startup,CrabboxUserVNC, auto-logon, and VNC readiness behavior.crabbox-readysetup without writing Windows VNC/autologon artifacts.--desktopbehavior, not default native Windows behavior.Improves #81 by tightening the Windows desktop vs WSL2 boundary that PR added for Azure. It also fixes the same WSL2/VNC boundary for AWS from #23 and keeps the AWS desktop VNC behavior from #14 isolated to desktop leases.
Implementation Notes
internal/cli/bootstrap.gowindowsBootstrapPowerShellnow composes a shared core script and selects one profile tail.windowsWSL2BootstrapPowerShell.windowsDesktopBootstrapPowerShell.windowsCoreBootstrapFinalizePowerShellfor no-desktop native Windows.internal/cli/aws_windows_bootstrap.goworker/src/bootstrap.ts--desktopbehavior.Validation
Local:
Branch live integration, direct mode:
m7i.large2m56.944saws-core-no-vnc-okm7i.large3m52.877saws-desktop-vnc-okm8i.large5m48.834saws-wsl2-no-vnc-okStandard_D2ads_v64m50.301sazure-core-no-vnc-okStandard_D2ads_v65m55.272sazure-desktop-vnc-okStandard_D2ads_v68m34.526sazure-wsl2-no-vnc-okOld-vs-new baseline, direct mode:
3m58.477s2m56.944s61.533s faster3m48.659s3m52.877s4.218s slower6m53.604s5m48.834s64.770s faster3m40.705s4m50.301s69.596s slower4m04.178s5m55.272s111.094s slower7m28.962s8m34.526s65.564s slowerAWS performance improvement from the fix:
Windows core bootstrapinstead of upstream'sWindows desktop bootstrap.3m58.477sto2m56.944s, a61.533simprovement in the live sample.6m53.604sto5m48.834s, a64.770simprovement in the live sample, while also removing unsupported Windows VNC files.Cleanup:
bin/crabbox list --provider aws --target windowsreturned no rows after cleanup.bin/crabbox list --provider azure --target windowsreturned no rows after cleanup.Risk