fix(auth): skip scope picker when gws auth login --services is provided#671
fix(auth): skip scope picker when gws auth login --services is provided#671hy0235 wants to merge 2 commits intogoogleworkspace:mainfrom
gws auth login --services is provided#671Conversation
🦋 Changeset detectedLatest commit: fbb03c6 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Summary of ChangesHello, I'm Gemini Code Assist1! 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 optimizes the authentication process for the CLI by bypassing the interactive scope selection when specific services are requested via the command line. It also enhances the flexibility of service filtering by allowing exact matches for scope short names, ensuring more precise scope resolution. Highlights
Using Gemini Code AssistThe 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
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 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. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates the authentication logic to skip the interactive scope picker when a services filter is provided and allows the filter to match exact scope short names. The review feedback identifies a potential compatibility issue with the is_none_or method in older Rust versions and suggests passing the ScopeMode enum by reference to avoid moving ownership of non-Copy data.
| services_filter: Option<&HashSet<String>>, | ||
| ) -> bool { | ||
| matches!(scope_mode, ScopeMode::Default) | ||
| && services_filter.is_none_or(|services| services.is_empty()) |
There was a problem hiding this comment.
The use of Option::is_none_or was stabilized in Rust 1.82.0. If this project maintains a Minimum Supported Rust Version (MSRV) lower than 1.82, this will cause a compilation error. To ensure broader compatibility, consider using map_or(true, ...) or a simple match statement.
| && services_filter.is_none_or(|services| services.is_empty()) | |
| && services_filter.as_ref().map_or(true, |services| services.is_empty()) |
| fn should_run_interactive_scope_picker( | ||
| scope_mode: ScopeMode, | ||
| services_filter: Option<&HashSet<String>>, |
There was a problem hiding this comment.
The scope_mode parameter is passed by value, which moves the ScopeMode enum. Since ScopeMode contains a Vec<String> in its Custom variant, it does not implement Copy. While this works here because scope_mode is not used after the call in resolve_scopes, it is better practice to pass it by reference to avoid unnecessary moves and potential future use-after-move errors.
| fn should_run_interactive_scope_picker( | |
| scope_mode: ScopeMode, | |
| services_filter: Option<&HashSet<String>>, | |
| fn should_run_interactive_scope_picker( | |
| scope_mode: &ScopeMode, | |
| services_filter: Option<&HashSet<String>>, | |
| ) -> bool { |
2 participants
Supersedes #645, which was auto-closed by the stale bot.
Description
Fixes #577.
This change makes
gws auth login --services ...skip the interactive scope picker in default login mode and resolve scopes directly from the provided service filter.It also improves service filtering so exact scope short names such as
documents.readonlyare accepted in addition to prefix-based matches.Dry Run Output: Not applicable for this bug fix.
Checklist:
AGENTS.mdguidelines (no generatedgoogle-*crates).cargo fmt --allto format the code perfectly.cargo clippy -- -D warningsand resolved all warnings.pnpx changeset) to document my changes.