Skip to content

feat: Only warn for token org mismatch #2382

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2025
Merged

feat: Only warn for token org mismatch #2382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,15 +346,14 @@ impl Config {
(None, Some(cli_org)) => Ok(cli_org),
(Some(token_org), None) => Ok(token_org.to_string()),
(Some(token_org), Some(cli_org)) => {
if cli_org.is_empty() {
return Ok(token_org.to_owned());
}
if cli_org != *token_org {
return Err(format_err!(
"Two different org values supplied: `{token_org}` (from token), `{cli_org}`."
));
log::warn!(
"Using organization `{token_org}` (embedded in token) rather \
than manually-configured organization `{cli_org}`. To use \
`{cli_org}`, please provide an auth token for this organization."
);
}
Ok(cli_org)
Ok(token_org.into())
}
}
}
Expand Down
6 changes: 2 additions & 4 deletions tests/integration/_cases/org_tokens/org-mismatch.trycmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
```
$ sentry-cli --auth-token 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 sourcemaps upload --org otherorg test_path
? failed
error: Two different org values supplied: `sentry` (from token), `otherorg`.

Add --log-level=[info|debug] or export SENTRY_LOG_LEVEL=[info|debug] to see more output.
Please attach the full debug log to all bug reports.
[..]WARN[..]Using organization `sentry` (embedded in token) rather than manually-configured organization `otherorg`. To use `otherorg`, please provide an auth token for this organization.
...

```
Loading