Skip to content

settings: Prevent new sql.defaults cluster settings from being added#80575

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
e-mbrown:eb/blockdeflts
May 3, 2022
Merged

settings: Prevent new sql.defaults cluster settings from being added#80575
craig[bot] merged 1 commit intocockroachdb:masterfrom
e-mbrown:eb/blockdeflts

Conversation

@e-mbrown
Copy link
Copy Markdown
Contributor

@e-mbrown e-mbrown commented Apr 26, 2022

Resolves #80324

In order to encourage the use of ALTER ROLE this commit adds
a panic that prevents new sql.default cluster settings from being
added.

Release note: None

@e-mbrown e-mbrown requested a review from rafiss April 26, 2022 18:42
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@e-mbrown e-mbrown force-pushed the eb/blockdeflts branch 2 times, most recently from 9d1f096 to e13897e Compare April 26, 2022 19:13
@e-mbrown e-mbrown marked this pull request as ready for review April 27, 2022 19:08
@e-mbrown e-mbrown requested a review from a team as a code owner April 27, 2022 19:08
@e-mbrown e-mbrown requested a review from a team April 28, 2022 18:27
if strings.Contains(key, "sql.defaults") {
if _, ok := sqlDefaultSettings[key]; !ok {
panic(fmt.Sprintf(
"new sql.defaults cluster settings: %s is not needed now that `ALTER ROLE..SET` syntax is supported", key))
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: new sql.defaults cluster setting detected: %s is not needed now that ALTER ROLE ... SET syntax is supported

In order to encourage the use of `ALTER ROLE` this commit adds
a panic that prevents new sql.default cluster settings from being
added.

Release note: None
@e-mbrown
Copy link
Copy Markdown
Contributor Author

e-mbrown commented May 3, 2022

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 3, 2022

Build succeeded:

@craig craig bot merged commit bd43c6f into cockroachdb:master May 3, 2022
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.

settings: prevent new sql.defaults cluster settings being added

3 participants