Add split-receipt command that splits receipt into phase 1 and 2 uninstallation flows
#1278
Conversation
This file contains 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
cole-h
added
the
upload to s3
cole-h
force-pushed
the
phased-uninstall
branch
from
ff31e02
to
a87c3ab
Compare
cole-h
force-pushed
the
phased-uninstall-related
branch
from
dc38e40
to
445188e
Compare
cole-h
force-pushed
the
phased-uninstall
branch
from
a87c3ab
to
863f371
Compare
cole-h
force-pushed
the
phased-uninstall
branch
from
863f371
to
c047153
Compare
grahamc
reviewed
Nov 8, 2024
grahamc
reviewed
Nov 8, 2024
src/action/common/configure_determinate_nixd_init_service/mod.rs
Outdated
Show resolved
Hide resolved
… going to create / use
…installation flows
grahamc
reviewed
Nov 8, 2024
grahamc
reviewed
Nov 8, 2024
cole-h
force-pushed
the
phased-uninstall
branch
from
c047153
to
ae85929
Compare
…ssing fields plist::Value does not implement Eq, so we need to wrap it in something that does, I think, probably
colemickens
reviewed
Nov 12, 2024
src/cli/subcommand/split_receipt.rs
Outdated
Comment on lines
107
to
115
| match serde_json::from_str::<InstallPlan>(&install_receipt_string) | ||
| .ok() | ||
| .and_then(|plan| { | ||
| if plan.check_compatible().is_ok() { | ||
| Some(plan) | ||
| } else { | ||
| None | ||
| } | ||
| }) { |
There was a problem hiding this comment.
nit: not a huge fan of non-trivial expressions as match statement, would be nice to see this split out in a separate let, then match.
src/cli/subcommand/split_receipt.rs
Outdated
Comment on lines
469
to
477
| let action_json = serde_json::to_string(action).with_context(|| { | ||
| format!("serde_json::to_string'ing {action_tag} json to extract real type") | ||
| })?; | ||
| let action_unjson: StatefulAction<T> = | ||
| serde_json::from_str(&action_json).with_context(|| { | ||
| format!("serde_json::from_str'ing {action_tag} json to extract real type") | ||
| })?; | ||
|
|
||
| Ok(action_unjson) |
There was a problem hiding this comment.
nit: Is there no way to get action_tag from T? It seems weird that we pass the type-to-deserialize to as a Type (T) and also pass action_tag. I was surprised to see that, but the understand it's just used for the log message. It feels redundant though if there's some compile/runtime-way to get a human readable name of T.
colemickens
approved these changes
Nov 12, 2024
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.
Description
Depends on #1277.This will make it easier to reinstall Nix with a newer version of the nix-installer (which, as it happens, also makes it easier to install Determinate on top of an existing Nix installation without having to completely nuke your
/nix).Checklist
cargo fmtnix buildnix flake checkValidating with
install.determinate.systemsIf a maintainer has added the
upload to s3label to this PR, it will become available for installation viainstall.determinate.systems:TODO: