Skip to content

Commit e318993

Browse files
dhartuniandhartunian
committed
serverccl: move tenant test utils to serverccl pkg
Release note: None Release justification: non-production code change
1 parent fc49ea6 commit e318993

5 files changed

Lines changed: 252 additions & 169 deletions

File tree

‎pkg/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,6 @@ GO_TARGETS = [
718718
"//pkg/ccl/schemachangerccl:schemachangerccl",
719719
"//pkg/ccl/schemachangerccl:schemachangerccl_test",
720720
"//pkg/ccl/serverccl/diagnosticsccl:diagnosticsccl_test",
721-
"//pkg/ccl/serverccl/statusccl:statusccl",
722721
"//pkg/ccl/serverccl/statusccl:statusccl_test",
723722
"//pkg/ccl/serverccl:serverccl",
724723
"//pkg/ccl/serverccl:serverccl_test",

‎pkg/ccl/serverccl/BUILD.bazel‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,29 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
33

44
go_library(
55
name = "serverccl",
6-
srcs = ["doc.go"],
6+
srcs = [
7+
"doc.go",
8+
"tenant_test_utils.go",
9+
],
710
importpath = "github.com/cockroachdb/cockroach/pkg/ccl/serverccl",
811
visibility = ["//visibility:public"],
12+
deps = [
13+
"//pkg/base",
14+
"//pkg/roachpb",
15+
"//pkg/rpc",
16+
"//pkg/security",
17+
"//pkg/server/serverpb",
18+
"//pkg/sql",
19+
"//pkg/sql/contention",
20+
"//pkg/sql/pgwire",
21+
"//pkg/sql/sqlstats/persistedsqlstats",
22+
"//pkg/sql/tests",
23+
"//pkg/testutils/serverutils",
24+
"//pkg/testutils/sqlutils",
25+
"//pkg/util/httputil",
26+
"//pkg/util/protoutil",
27+
"@com_github_stretchr_testify//require",
28+
],
929
)
1030

1131
go_test(

‎pkg/ccl/serverccl/statusccl/BUILD.bazel‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,5 @@
11
load("//build/bazelutil/unused_checker:unused.bzl", "get_x_data")
2-
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
3-
4-
go_library(
5-
name = "statusccl",
6-
srcs = ["tenant_test_utils.go"],
7-
importpath = "github.com/cockroachdb/cockroach/pkg/ccl/serverccl/statusccl",
8-
visibility = ["//visibility:public"],
9-
deps = [
10-
"//pkg/base",
11-
"//pkg/roachpb",
12-
"//pkg/security",
13-
"//pkg/server/serverpb",
14-
"//pkg/sql",
15-
"//pkg/sql/contention",
16-
"//pkg/sql/pgwire",
17-
"//pkg/sql/sqlstats/persistedsqlstats",
18-
"//pkg/sql/tests",
19-
"//pkg/testutils/serverutils",
20-
"//pkg/testutils/sqlutils",
21-
"//pkg/util/httputil",
22-
"//pkg/util/protoutil",
23-
"@com_github_stretchr_testify//require",
24-
],
25-
)
2+
load("@io_bazel_rules_go//go:def.bzl", "go_test")
263

274
go_test(
285
name = "statusccl_test",
@@ -31,11 +8,11 @@ go_test(
318
"tenant_grpc_test.go",
329
"tenant_status_test.go",
3310
],
34-
embed = [":statusccl"],
3511
deps = [
3612
"//pkg/base",
3713
"//pkg/ccl",
3814
"//pkg/ccl/kvccl",
15+
"//pkg/ccl/serverccl",
3916
"//pkg/ccl/utilccl",
4017
"//pkg/keys",
4118
"//pkg/roachpb",

0 commit comments

Comments
 (0)