Skip to content

feat(proguard): upload-proguardproguard upload#3174

Merged
szokeasaurusrex merged 1 commit intomasterfrom
szokeasaurusrex/proguard-upload
Mar 4, 2026
Merged

feat(proguard): upload-proguardproguard upload#3174
szokeasaurusrex merged 1 commit intomasterfrom
szokeasaurusrex/proguard-upload

Conversation

@szokeasaurusrex
Copy link
Member

@szokeasaurusrex szokeasaurusrex commented Mar 3, 2026

Move the sentry-cli upload-proguard command to sentry-cli proguard upload.

This new API matches the API for the debug-files upload and sourcemap upload commands. This API will also enable us to add new subcommands, which will be useful for #3173.

sentry-cli upload-proguard is retained as an alias to sentry-cli proguard upload, and we intend to keep it around for the foreseeable future, so no one needs to migrate.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 3, 2026

Messages
📖 Do not forget to update Sentry-docs with your feature once the pull request gets approved.

Generated by 🚫 dangerJS against be51270

@szokeasaurusrex szokeasaurusrex changed the title feat(proguard): Add proguard upload command alias feat(proguard): upload-proguardproguard upload Mar 3, 2026
@szokeasaurusrex szokeasaurusrex requested a review from lcian March 3, 2026 15:31
@szokeasaurusrex szokeasaurusrex marked this pull request as ready for review March 3, 2026 15:31
@szokeasaurusrex szokeasaurusrex requested a review from a team as a code owner March 3, 2026 15:31
@szokeasaurusrex szokeasaurusrex force-pushed the szokeasaurusrex/proguard-upload branch from d83e440 to 124418a Compare March 3, 2026 15:32
Copy link
Member

@lcian lcian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

szokeasaurusrex added a commit that referenced this pull request Mar 4, 2026
Move the `sentry-cli upload-proguard` command to `sentry-cli proguard upload`.

This new API matches the API for the `debug-files upload` and `sourcemap upload` commands. This API will also enable us to add new subcommands, which will be useful for #3173.

`sentry-cli upload-proguard` is retained as an alias to `sentry-cli proguard upload`, and we intend to keep it around for the foreseeable future, so no one needs to migrate.
@szokeasaurusrex szokeasaurusrex force-pushed the szokeasaurusrex/proguard-upload branch from 124418a to 718df71 Compare March 4, 2026 10:30
Move the `sentry-cli upload-proguard` command to `sentry-cli proguard upload`.

This new API matches the API for the `debug-files upload` and `sourcemap upload` commands. This API will also enable us to add new subcommands, which will be useful for #3173.

`sentry-cli upload-proguard` is retained as an alias to `sentry-cli proguard upload`, and we intend to keep it around for the foreseeable future, so no one needs to migrate.
@szokeasaurusrex szokeasaurusrex force-pushed the szokeasaurusrex/proguard-upload branch from 718df71 to be51270 Compare March 4, 2026 11:56
Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

}
})),
]
.into(),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Redundant AnyOf wrapping order-independent Matcher::Json matchers

Low Severity

In chunk_upload_two_files, the Matcher::AnyOf wraps two Matcher::Json values that differ only in JSON object key ordering. Since mockito's Matcher::Json uses assert-json-diff under the hood, which performs order-independent comparison of object keys, the AnyOf with both orderings is redundant. A single Matcher::Json would achieve the same result. The original test in upload_proguard.rs needed AnyOf because it used string-based matching (order-dependent), but the switch to Matcher::Json made it unnecessary.

Fix in Cursor Fix in Web

@szokeasaurusrex szokeasaurusrex merged commit be51270 into master Mar 4, 2026
25 checks passed
@szokeasaurusrex szokeasaurusrex deleted the szokeasaurusrex/proguard-upload branch March 4, 2026 12:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants