Skip to content

fix: improve warning for both token & credential-provider #12626

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Sep 6, 2023

Conversation

arlosi
Copy link
Contributor

@arlosi arlosi commented Sep 6, 2023

Cargo issues a warning when both a credential-provider and a token are configured for a registry.

This change removes the warning if the credential-provider is cargo:token since that will use the token. The warning message text is also tweaked to include the name of the credential-provider that's overriding the token.

@rustbot
Copy link
Collaborator

rustbot commented Sep 6, 2023

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@arlosi arlosi marked this pull request as ready for review September 6, 2023 15:14
@rustbot rustbot added A-registry-authentication Area: registry authentication and authorization (authn authz) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 6, 2023
@arlosi
Copy link
Contributor Author

arlosi commented Sep 6, 2023

Thanks for the review @weihanglo, I'll merge this now.

@bors r=weihanglo

@bors
Copy link
Contributor

bors commented Sep 6, 2023

📌 Commit 3f004c6 has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 6, 2023
@bors
Copy link
Contributor

bors commented Sep 6, 2023

⌛ Testing commit 3f004c6 with merge d9a4cf1...

@bors
Copy link
Contributor

bors commented Sep 6, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing d9a4cf1 to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Sep 6, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing d9a4cf1 to master...

@bors bors merged commit d9a4cf1 into rust-lang:master Sep 6, 2023
@bors
Copy link
Contributor

bors commented Sep 6, 2023

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 9, 2023
Update cargo

14 commits in d14c85f4e6e7671673b1a1bc87231ff7164761e1..2fc85d15a542bfb610aff7682073412cf635352f
2023-09-05 22:28:10 +0000 to 2023-09-09 01:49:46 +0000
- feat: Stabilize lints (rust-lang/cargo#12648)
- Ues strip_prefix for cleaner code (rust-lang/cargo#12631)
- fix: don't print _TOKEN suggestion when not applicable (rust-lang/cargo#12644)
- Bump cargo-credential-1password to v0.4.0 (rust-lang/cargo#12641)
- refactor: put `Source` trait under `cargo::sources` (rust-lang/cargo#12527)
- Error out if `cargo clean --doc` is mixed with `-p`. (rust-lang/cargo#12637)
- Add wrappers around std::fs::metadata (rust-lang/cargo#12636)
- Add with_stdout_unordered. (rust-lang/cargo#12635)
- Fix example for creating a git project test. (rust-lang/cargo#12632)
- Read/write the encoded `cargo update --precise` in the same place (rust-lang/cargo#12629)
- docs(guide): Apply feedback on CI (rust-lang/cargo#12630)
- fix: improve warning for both token & credential-provider (rust-lang/cargo#12626)
- Skip clean up `profile.release.package."*"` (rust-lang/cargo#12624)
- Add MSRV validation GitHub Action for cargo-credential (rust-lang/cargo#12623)
@ehuss ehuss added this to the 1.74.0 milestone Sep 30, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-registry-authentication Area: registry authentication and authorization (authn authz) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants