1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 09:19:36 +01:00

Rewrite StoreConfig::getUri in terms of new StoreConfig::getReference

Rather than having store implementations return a free-form URI string,
have them return a `StoreReference`. This reflects that fact that this
method is supposed to invert `resolveStoreConfig`, which goes from a
`StoreReference` to some `StoreConfig` concrete derived class (based on
the registry).

`StoreConfig::getUri` is kept only as a convenience for the common case
that we want to immediately render the `StoreReference`.

A few tests were changed to use `local://` not `local`, since
`StoreReference` does not encode the `local` and `daemon` shorthands
(and instead desugars them to `local://` and `unix://` right away). I
think that is fine. `local` and `daemon` still work as input.
This commit is contained in:
John Ericson 2025-08-12 10:50:45 -04:00
parent be3a508b74
commit 3e7879e6df
22 changed files with 181 additions and 60 deletions

View file

@ -25,9 +25,16 @@ std::string SSHStoreConfig::doc()
;
}
std::string SSHStoreConfig::getUri() const
StoreReference SSHStoreConfig::getReference() const
{
return ParsedURL{.scheme = *uriSchemes().begin(), .authority = authority, .query = getQueryParams()}.to_string();
return {
.variant =
StoreReference::Specified{
.scheme = *uriSchemes().begin(),
.authority = authority.to_string(),
},
.params = getQueryParams(),
};
}
struct SSHStore : virtual RemoteStore