fix: allow NAR URLs with dashes and underscores and improve NAR path handling

[kalbasit]

NAR URLs and paths can contain dashes and underscores, but the previous regex was too restrictive. This change updates the regex in pkg/nar/url.go to correctly support these characters.

Key changes:

• Updated the NAR URL regex to allow '-' and '_' in the filename portion.
• Implements NAR URL normalization to handle URLs with embedded narinfo hash prefixes, ensuring consistent lookups.
• Refactored pkg/cache/cache.go to use normalized URLs for NAR operations.
• Updated testdata/nar7.go and related tests to use the correct NAR path structure.
• Improved error handling and logging around NAR URL parsing and retrieval.

fixes #806

[gemini-code-assist]

Summary of Changes

Hello @kalbasit, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses an issue where the nar.ParseURL() function failed to correctly parse valid NAR URLs containing dashes or underscores due to an overly strict regular expression. The changes update the parsing logic to accommodate these characters and introduce new test cases to confirm the fix, enhancing the robustness and correctness of NAR URL handling.

Highlights

• Regular Expression Update: The narRegexp in pkg/nar/url.go has been updated to correctly parse NAR URLs that include dashes (-) and underscores (_) in their hash component.
• Test Coverage Expansion: New test cases have been added to pkg/nar/url_test.go to ensure the nar.ParseURL() function correctly handles URLs containing dashes and underscores, validating the regex change.

Changelog

• pkg/nar/url.go
  • Modified the narRegexp to allow dashes and underscores in the hash part of the URL.
• pkg/nar/url_test.go
  • Added two new test cases to TestParseURL to validate NAR URLs with dashes and underscores.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[dosubot]

Related Documentation

Checked 7 published document(s) in 1 knowledge base(s). No updates required.

^{How did I do? Any feedback?}  

[kalbasit]

• fix: allow NAR URLs with dashes and underscores and improve NAR path handling #820 👈 (View in Graphite)
• fix: Add support for missing FileSize and FileHash #823
• test: Ensure all NAR entries are tested in the upstream test #822
• refactor: reorganize nar and narinfo helper logic into dedicated packages #821
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[gemini-code-assist]

Code Review

The pull request successfully updates the narRegexp to allow dashes and underscores in NAR URLs, addressing the issue of overly strict parsing. The added test cases in url_test.go effectively validate this change. However, there's a potential inconsistency with the helper.ValidateHash function, which uses a stricter regex and might cause nar.ToFilePath to fail for URLs successfully parsed by this updated regex. This aligns with the project's emphasis on code consistency.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.50%. Comparing base (184373f) to head (b8bb677).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #820      +/-   ##
==========================================
+ Coverage   85.41%   85.50%   +0.09%     
==========================================
  Files           2        2              
  Lines         480      483       +3     
==========================================
+ Hits          410      413       +3     
  Misses         65       65              
  Partials        5        5              

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

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[kalbasit]

/gemini review

[gemini-code-assist]

Code Review

This pull request correctly fixes an issue where NAR URLs with dashes and underscores were not being parsed correctly by updating the regular expression for NAR hashes. The addition of test cases for these scenarios is a great way to ensure the fix is working as expected.

Furthermore, the pull request includes a significant and beneficial refactoring. Moving NAR and NarInfo related helper functions from the generic pkg/helper into their own dedicated packages (pkg/nar and pkg/narinfo) greatly improves the project's structure, modularity, and maintainability. All usages have been updated accordingly, which is excellent.

I have one minor suggestion to improve the clarity of an error message.