Skip to content

builtins: allow VIEWACTIVITY priv to use crdb_internal.request_statem…#118760

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
xinhaoz:viewactivity-stmt-bundle
Feb 6, 2024
Merged

builtins: allow VIEWACTIVITY priv to use crdb_internal.request_statem…#118760
craig[bot] merged 1 commit intocockroachdb:masterfrom
xinhaoz:viewactivity-stmt-bundle

Conversation

@xinhaoz
Copy link
Copy Markdown
Contributor

@xinhaoz xinhaoz commented Feb 5, 2024

…ent_bundle

Previously only those with the VIEWACTIVITY role could use the crdb_internal.request_statement_bundle builtin. We should allow the VIEWACTIVITY privilege as well since role options are now deprecated. This allow also allow stmt bundle requests to be made from db-console for users with this granted privilege.

Epic: none
Fixes: #118759

Release note (bug fix): Those with VIEWACTIVITY privilege can now request statement bundles using crdb_internal.requets_statement_bundle or via db-console's sql activity page.

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Feb 5, 2024

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@xinhaoz xinhaoz force-pushed the viewactivity-stmt-bundle branch from 5f9cae3 to 35a94c8 Compare February 5, 2024 16:53
@xinhaoz xinhaoz marked this pull request as ready for review February 5, 2024 16:54
@xinhaoz xinhaoz requested a review from a team as a code owner February 5, 2024 16:54
@xinhaoz xinhaoz requested review from a team and maryliag and removed request for a team February 5, 2024 16:54
@xinhaoz xinhaoz added backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only backport-23.2.x PAST MAINTENANCE SUPPORT: 23.2 patch releases via ER request only labels Feb 5, 2024
@xinhaoz xinhaoz requested a review from a team February 5, 2024 16:55
Copy link
Copy Markdown
Contributor

@maryliag maryliag left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 3 of 3 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @xinhaoz)

…ent_bundle

Previously only those with the VIEWACTIVITY role could use the
crdb_internal.request_statement_bundle builtin. We should allow
the VIEWACTIVITY privilege as well since role options are now
deprecated. This allow also allow stmt bundle requests to be made
from db-console for users with this granted privilege.

Epic: none
Fixes: cockroachdb#118759

Release note (bug fix): Those with VIEWACTIVITY privilege can now
request statement bundles using crdb_internal.requets_statement_bundle
or via db-console's sql activity page.
@xinhaoz xinhaoz force-pushed the viewactivity-stmt-bundle branch from 35a94c8 to ce81ca1 Compare February 5, 2024 18:43
@xinhaoz
Copy link
Copy Markdown
Contributor Author

xinhaoz commented Feb 5, 2024

TFTR!
bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 5, 2024

Build failed (retrying...):

@craig craig bot merged commit 804d37e into cockroachdb:master Feb 6, 2024
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Feb 6, 2024

Build succeeded:

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Feb 6, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from ce81ca1 to blathers/backport-release-23.1-118760: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


error setting reviewers, but backport branch blathers/backport-release-23.2-118760 is ready: POST https://api.github.com/repos/cockroachdb/cockroach/pulls/118809/requested_reviewers: 422 Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the cockroachdb/cockroach repository. []

Backport to branch 23.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only backport-23.2.x PAST MAINTENANCE SUPPORT: 23.2 patch releases via ER request only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

builtins: crdb_internal.request_statement_bundle should work with VIEWACTIVITY privilege

3 participants