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.

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

lint: re-enable composite linter on test files #105060

Merged
merged 1 commit into from
Jun 16, 2023
Merged

lint: re-enable composite linter on test files #105060

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
3 changes: 0 additions & 3 deletions build/bazelutil/nogo_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
}
},
"composites": {
"exclude_files": {
"cockroach/pkg/.*_test.go$": "many existing failures"
},
"only_files": {
"cockroach/pkg/.*$": "first-party code",
"cockroach/bazel-out/.*/bin/pkg/.*$": "first-party code"
Expand Down
50 changes: 25 additions & 25 deletions pkg/sql/catalog/catpb/privilege_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,54 +39,54 @@ func TestPrivilege(t *testing.T) {
}{
{username.SQLUsername{}, nil, nil,
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{username.RootUserName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.RootUserName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Table,
},
{username.RootUserName(), privilege.List{privilege.ALL}, nil,
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{username.RootUserName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.RootUserName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Table,
},
{username.RootUserName(), privilege.List{privilege.INSERT, privilege.DROP}, nil,
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{username.RootUserName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.RootUserName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Table,
},
{testUser, privilege.List{privilege.INSERT, privilege.DROP}, nil,
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{username.RootUserName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{testUser, []privilege.Privilege{{Kind: privilege.DROP}, {Kind: privilege.INSERT}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.RootUserName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: testUser, Privileges: []privilege.Privilege{{Kind: privilege.DROP}, {Kind: privilege.INSERT}}},
},
privilege.Table,
},
{barUser, nil, privilege.List{privilege.INSERT, privilege.ALL},
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{username.RootUserName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{testUser, []privilege.Privilege{{Kind: privilege.DROP}, {Kind: privilege.INSERT}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.RootUserName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: testUser, Privileges: []privilege.Privilege{{Kind: privilege.DROP}, {Kind: privilege.INSERT}}},
},
privilege.Table,
},
{testUser, privilege.List{privilege.ALL}, nil,
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{username.RootUserName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{testUser, []privilege.Privilege{{Kind: privilege.ALL}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.RootUserName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: testUser, Privileges: []privilege.Privilege{{Kind: privilege.ALL}}},
},
privilege.Table,
},
{testUser, nil, privilege.List{privilege.SELECT, privilege.INSERT},
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{username.RootUserName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{testUser, []privilege.Privilege{
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.RootUserName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: testUser, Privileges: []privilege.Privilege{
{Kind: privilege.BACKUP},
{Kind: privilege.CHANGEFEED},
{Kind: privilege.CREATE},
Expand All @@ -100,23 +100,23 @@ func TestPrivilege(t *testing.T) {
},
{testUser, nil, privilege.List{privilege.ALL},
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{username.RootUserName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.RootUserName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Table,
},
// Validate checks that root still has ALL privileges, but we do not call it here.
{username.RootUserName(), nil, privilege.List{privilege.ALL},
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Table,
},
// Ensure revoking USAGE from a user with ALL privilege on a type
// leaves the user with no privileges.
{testUser, privilege.List{privilege.ALL}, privilege.List{privilege.USAGE},
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Type,
},
Expand All @@ -125,7 +125,7 @@ func TestPrivilege(t *testing.T) {
{testUser,
privilege.List{privilege.ALL}, privilege.List{privilege.USAGE},
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Type,
},
Expand All @@ -136,7 +136,7 @@ func TestPrivilege(t *testing.T) {
privilege.List{privilege.BACKUP, privilege.CHANGEFEED, privilege.CREATE, privilege.DROP, privilege.SELECT, privilege.INSERT,
privilege.DELETE, privilege.UPDATE, privilege.ZONECONFIG},
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Table,
},
Expand All @@ -147,7 +147,7 @@ func TestPrivilege(t *testing.T) {
privilege.List{privilege.BACKUP, privilege.CONNECT, privilege.CREATE, privilege.DROP, privilege.SELECT,
privilege.INSERT, privilege.DELETE, privilege.UPDATE, privilege.ZONECONFIG, privilege.RESTORE},
[]catpb.UserPrivilege{
{username.AdminRoleName(), []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
{User: username.AdminRoleName(), Privileges: []privilege.Privilege{{Kind: privilege.ALL, GrantOption: true}}},
},
privilege.Database,
},
Expand Down