Skip to content

fix(releases): Allow filtering by a project when listing #3048

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

Open
szokeasaurusrex wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −11
Open

fix(releases): Allow filtering by a project when listing #3048

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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- Fixed a bug, introduced in version 3.0.0, where the `sentry-cli releases list` command ignored the `--project` option ([#3048](https://github.com/getsentry/sentry-cli/pull/3048)). The command now correctly can filter releases by a single project when supplied via `--project`. This change does not enable filtering by multiple projects, which has never been supported.

## 3.0.1

### Performance Improvements
Expand Down
14 changes: 10 additions & 4 deletions src/api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,10 +542,16 @@ impl AuthenticatedApi<'_> {

/// Returns a list of releases for a given project. This is currently a
/// capped list by what the server deems an acceptable default limit.
pub fn list_releases(&self, org: &str) -> ApiResult<Vec<ReleaseInfo>> {
let path = format!("/organizations/{}/releases/", PathArg(org));
self.get(&path)?
.convert_rnf::<Vec<ReleaseInfo>>(ApiErrorKind::OrganizationNotFound)
pub fn list_releases(&self, org: &str, project: Option<&str>) -> ApiResult<Vec<ReleaseInfo>> {
if let Some(project) = project {
let path = format!("/projects/{}/{}/releases/", PathArg(org), PathArg(project));
self.get(&path)?
.convert_rnf::<Vec<ReleaseInfo>>(ApiErrorKind::ProjectNotFound)
} else {
let path = format!("/organizations/{}/releases/", PathArg(org));
self.get(&path)?
.convert_rnf::<Vec<ReleaseInfo>>(ApiErrorKind::OrganizationNotFound)
}
}

/// Looks up a release commits and returns it. If it does not exist `None`
Expand Down
3 changes: 2 additions & 1 deletion src/commands/releases/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ pub fn make_command(command: Command) -> Command {
pub fn execute(matches: &ArgMatches) -> Result<()> {
let config = Config::current();
let api = Api::current();
let project = config.get_project(matches).ok();
let releases = api
.authenticated()?
.list_releases(&config.get_org(matches)?)?;
.list_releases(&config.get_org(matches)?, project.as_deref())?;

if matches.get_flag("raw") {
let versions = releases
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/releases/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::integration::{MockEndpointBuilder, TestManager};
fn displays_releases() {
TestManager::new()
.mock_endpoint(
MockEndpointBuilder::new("GET", "/api/0/organizations/wat-org/releases/")
MockEndpointBuilder::new("GET", "/api/0/projects/wat-org/wat-project/releases/")
.with_response_file("releases/get-releases.json"),
)
.register_trycmd_test("releases/releases-list.trycmd")
Expand All @@ -15,7 +15,7 @@ fn displays_releases() {
fn displays_releases_with_projects() {
TestManager::new()
.mock_endpoint(
MockEndpointBuilder::new("GET", "/api/0/organizations/wat-org/releases/")
MockEndpointBuilder::new("GET", "/api/0/projects/wat-org/wat-project/releases/")
.with_response_file("releases/get-releases.json"),
)
.register_trycmd_test("releases/releases-list-with-projects.trycmd")
Expand All @@ -26,7 +26,7 @@ fn displays_releases_with_projects() {
fn doesnt_fail_with_empty_response() {
TestManager::new()
.mock_endpoint(
MockEndpointBuilder::new("GET", "/api/0/organizations/wat-org/releases/")
MockEndpointBuilder::new("GET", "/api/0/projects/wat-org/wat-project/releases/")
.with_response_body("[]"),
)
.register_trycmd_test("releases/releases-list-empty.trycmd")
Expand All @@ -37,7 +37,7 @@ fn doesnt_fail_with_empty_response() {
fn can_override_org() {
TestManager::new()
.mock_endpoint(
MockEndpointBuilder::new("GET", "/api/0/organizations/whynot/releases/")
MockEndpointBuilder::new("GET", "/api/0/projects/whynot/wat-project/releases/")
.with_response_file("releases/get-releases.json"),
)
.register_trycmd_test("releases/releases-list-override-org.trycmd")
Expand All @@ -48,7 +48,7 @@ fn can_override_org() {
fn displays_releases_in_raw_mode() {
TestManager::new()
.mock_endpoint(
MockEndpointBuilder::new("GET", "/api/0/organizations/wat-org/releases/")
MockEndpointBuilder::new("GET", "/api/0/projects/wat-org/wat-project/releases/")
.with_response_file("releases/get-releases.json"),
)
.register_trycmd_test("releases/releases-list-raw.trycmd")
Expand All @@ -59,7 +59,7 @@ fn displays_releases_in_raw_mode() {
fn displays_releases_in_raw_mode_with_delimiter() {
TestManager::new()
.mock_endpoint(
MockEndpointBuilder::new("GET", "/api/0/organizations/wat-org/releases/")
MockEndpointBuilder::new("GET", "/api/0/projects/wat-org/wat-project/releases/")
.with_response_file("releases/get-releases.json"),
)
.register_trycmd_test("releases/releases-list-raw-delimiter.trycmd")
Expand Down