flake: add narHash and lastModified attributes #2464
Merged
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
Add support for the `narHash` and `lastModified` attributes of flakerefs. The new `Ref.Locked` method uses these attributes to report whether a flake is locked.
savil
approved these changes
Dec 20, 2024
nix/flake/flakeref.go
Outdated
Comment on lines
199
to
208
| parsed.NARHash = refURL.Query().Get("narHash") | ||
| parsed.LastModified, err = atoiOmitZero(refURL.Query().Get("lastModified")) | ||
| if err != nil { | ||
| return Ref{}, "", redact.Errorf("parse flake reference URL query parameter: lastModified=%s: %v", redact.Safe(parsed.LastModified), redact.Safe(err)) | ||
| } | ||
|
|
||
| // lastModified and narHash get stripped from the query | ||
| // parameters, but dir stays. | ||
| query.Del("lastModified") | ||
| query.Del("narHash") |
There was a problem hiding this comment.
seems like these lines are repeated in many case-bodies. Pull into a function and call that function instead?
There was a problem hiding this comment.
Are you referring to the query.Del calls? I dunno, it seems like overkill to make those two lines a separate function.
Comment on lines
+364
to
+365
| "lastModified", itoaOmitZero(r.LastModified), | ||
| "narHash", r.NARHash, |
There was a problem hiding this comment.
what happens if lastModified or NarHash are zero?
There was a problem hiding this comment.
buildQueryString will omit them.
nix/flake/flakeref.go
Outdated
| RawQuery: buildQueryString("host", r.Host, "dir", r.Dir), | ||
| Scheme: "github", | ||
| Opaque: buildEscapedPath(r.Owner, r.Repo, r.Rev, r.Ref), | ||
| RawQuery: buildQueryString(nil, |
There was a problem hiding this comment.
It's the initial url.Values query. In this case it's nil because we're building the query string from scratch.
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.
Add support for the
narHashandlastModifiedattributes of flakerefs. The newRef.Lockedmethod uses these attributes to report whether a flake is locked.