Skip to content
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.

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

release-23.2: builtins: allow VIEWACTIVITY priv to use crdb_internal.request_statem… #118809

Merged
merged 1 commit into from
Feb 23, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Feb 6, 2024

Backport 1/1 commits from #118760 on behalf of @xinhaoz.

/cc @cockroachdb/release


…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.


Release justification: bug fix - use privilege instead of deprecated role

@blathers-crl blathers-crl bot requested a review from a team as a code owner February 6, 2024 01:48
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-118760 branch from 1f785b7 to 8c55a25 Compare February 6, 2024 01:48
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Feb 6, 2024
Copy link
Author

blathers-crl bot commented Feb 6, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Feb 6, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@xinhaoz xinhaoz force-pushed the blathers/backport-release-23.2-118760 branch from 8c55a25 to 9e5c8e0 Compare February 6, 2024 15:47
Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

lgtm!

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @dhartunian)

Copy link
Collaborator

@dhartunian dhartunian left a comment

Choose a reason for hiding this comment

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

:lgtm: can you just move the import back to where it should be? (and check your editor's linter settings 😇)

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @blathers-crl[bot] and @xinhaoz)


pkg/sql/sem/builtins/builtins.go line 22 at r1 (raw file):

	gojson "encoding/json"
	"fmt"
	"github.com/cockroachdb/cockroach/pkg/sql/roleoption"

nit: why is this diff in here?

@xinhaoz xinhaoz force-pushed the blathers/backport-release-23.2-118760 branch from 9e5c8e0 to dd33011 Compare February 23, 2024 17:05
…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.
@xinhaoz xinhaoz force-pushed the blathers/backport-release-23.2-118760 branch from dd33011 to b268b65 Compare February 23, 2024 17:07
@xinhaoz xinhaoz merged commit f72831b into release-23.2 Feb 23, 2024
5 of 6 checks passed
@xinhaoz xinhaoz deleted the blathers/backport-release-23.2-118760 branch February 23, 2024 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants