diff --git a/pkg/rpc/auth_tenant.go b/pkg/rpc/auth_tenant.go index 8a24ca21ce97..2e0b8c55f46a 100644 --- a/pkg/rpc/auth_tenant.go +++ b/pkg/rpc/auth_tenant.go @@ -149,12 +149,14 @@ var reqMethodAllowlist = [...]bool{ roachpb.Scan: true, roachpb.ReverseScan: true, roachpb.EndTxn: true, + roachpb.AdminSplit: true, roachpb.HeartbeatTxn: true, roachpb.QueryTxn: true, roachpb.QueryIntent: true, roachpb.InitPut: true, - roachpb.AddSSTable: true, roachpb.Export: true, + roachpb.AdminScatter: true, + roachpb.AddSSTable: true, roachpb.Refresh: true, roachpb.RefreshRange: true, } diff --git a/pkg/rpc/auth_test.go b/pkg/rpc/auth_test.go index c0c183b0935d..b04f8599b38a 100644 --- a/pkg/rpc/auth_test.go +++ b/pkg/rpc/auth_test.go @@ -251,33 +251,33 @@ func TestTenantAuthRequest(t *testing.T) { req: &roachpb.BatchRequest{Requests: makeReqs( makeAdminReq("a"), )}, - expErr: `request \[1 AdmSplit\] not permitted`, + expErr: `requested key span a{-\\x00} not fully contained in tenant keyspace /Tenant/1{0-1}`, }, { req: &roachpb.BatchRequest{Requests: makeReqs( makeAdminReq(prefix(10, "a")), )}, - expErr: `request \[1 AdmSplit\] not permitted`, + expErr: noError, }, { req: &roachpb.BatchRequest{Requests: makeReqs( makeAdminReq(prefix(50, "a")), )}, - expErr: `request \[1 AdmSplit\] not permitted`, + expErr: `requested key span /Tenant/50"a{"-\\x00"} not fully contained in tenant keyspace /Tenant/1{0-1}`, }, { req: &roachpb.BatchRequest{Requests: makeReqs( makeAdminReq(prefix(10, "a")), makeReq(prefix(10, "a"), prefix(10, "b")), )}, - expErr: `request \[1 Scan, 1 AdmSplit\] not permitted`, + expErr: noError, }, { req: &roachpb.BatchRequest{Requests: makeReqs( makeReq(prefix(10, "a"), prefix(10, "b")), makeAdminReq(prefix(10, "a")), )}, - expErr: `request \[1 Scan, 1 AdmSplit\] not permitted`, + expErr: noError, }, { req: &roachpb.BatchRequest{Requests: makeReqs(