Skip to content

Commit 39e594b

Browse files
committed
jobsprotectedtsccl: move to jobsprotectedts
These tests are now allowed to live in the jobs package so the jobsccl package is no longer require. Epic: none Release note: None
1 parent 5433e4f commit 39e594b

File tree

5 files changed

+47
-48
lines changed

5 files changed

+47
-48
lines changed

pkg/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ ALL_TESTS = [
4848
"//pkg/ccl/cloudccl/externalconn:externalconn_test",
4949
"//pkg/ccl/cloudccl/gcp:gcp_test",
5050
"//pkg/ccl/importerccl:importerccl_test",
51-
"//pkg/ccl/jobsccl/jobsprotectedtsccl:jobsprotectedtsccl_test",
5251
"//pkg/ccl/jwtauthccl:jwtauthccl_test",
5352
"//pkg/ccl/kvccl/kvfollowerreadsccl:kvfollowerreadsccl_test",
5453
"//pkg/ccl/kvccl/kvtenantccl/upgradeccl:upgradeccl_test",
@@ -211,6 +210,7 @@ ALL_TESTS = [
211210
"//pkg/jobs/jobsauth:jobsauth_test",
212211
"//pkg/jobs/jobspb:jobspb_test",
213212
"//pkg/jobs/jobsprofiler:jobsprofiler_test",
213+
"//pkg/jobs/jobsprotectedts:jobsprotectedts_test",
214214
"//pkg/jobs:jobs_test",
215215
"//pkg/keys:keys_test",
216216
"//pkg/keyvisualizer/spanstatsconsumer:spanstatsconsumer_test",
@@ -973,7 +973,6 @@ GO_TARGETS = [
973973
"//pkg/ccl/cmdccl/stub-schema-registry:stub-schema-registry_lib",
974974
"//pkg/ccl/gssapiccl:gssapiccl",
975975
"//pkg/ccl/importerccl:importerccl_test",
976-
"//pkg/ccl/jobsccl/jobsprotectedtsccl:jobsprotectedtsccl_test",
977976
"//pkg/ccl/jwtauthccl:jwtauthccl",
978977
"//pkg/ccl/jwtauthccl:jwtauthccl_test",
979978
"//pkg/ccl/kvccl/kvfollowerreadsccl:kvfollowerreadsccl",
@@ -1428,6 +1427,7 @@ GO_TARGETS = [
14281427
"//pkg/jobs/jobsprofiler:jobsprofiler",
14291428
"//pkg/jobs/jobsprofiler:jobsprofiler_test",
14301429
"//pkg/jobs/jobsprotectedts:jobsprotectedts",
1430+
"//pkg/jobs/jobsprotectedts:jobsprotectedts_test",
14311431
"//pkg/jobs/jobstest:jobstest",
14321432
"//pkg/jobs/metricspoller:metricspoller",
14331433
"//pkg/jobs:jobs",

pkg/ccl/jobsccl/jobsprotectedtsccl/BUILD.bazel

Lines changed: 0 additions & 43 deletions
This file was deleted.

pkg/jobs/jobsprotectedts/BUILD.bazel

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_go//go:def.bzl", "go_library")
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
22

33
go_library(
44
name = "jobsprotectedts",
@@ -28,3 +28,45 @@ go_library(
2828
"@com_github_cockroachdb_errors//:errors",
2929
],
3030
)
31+
32+
go_test(
33+
name = "jobsprotectedts_test",
34+
srcs = [
35+
"jobs_protected_ts_test.go",
36+
"main_test.go",
37+
],
38+
deps = [
39+
":jobsprotectedts",
40+
"//pkg/base",
41+
"//pkg/ccl",
42+
"//pkg/ccl/kvccl/kvtenantccl",
43+
"//pkg/jobs",
44+
"//pkg/jobs/jobspb",
45+
"//pkg/jobs/jobstest",
46+
"//pkg/keys",
47+
"//pkg/kv/kvserver/protectedts",
48+
"//pkg/kv/kvserver/protectedts/ptpb",
49+
"//pkg/roachpb",
50+
"//pkg/scheduledjobs",
51+
"//pkg/security/securityassets",
52+
"//pkg/security/securitytest",
53+
"//pkg/security/username",
54+
"//pkg/server",
55+
"//pkg/settings/cluster",
56+
"//pkg/sql",
57+
"//pkg/sql/catalog/descpb",
58+
"//pkg/sql/isql",
59+
"//pkg/testutils",
60+
"//pkg/testutils/serverutils",
61+
"//pkg/testutils/sqlutils",
62+
"//pkg/testutils/testcluster",
63+
"//pkg/util/hlc",
64+
"//pkg/util/leaktest",
65+
"//pkg/util/log",
66+
"//pkg/util/randutil",
67+
"//pkg/util/uuid",
68+
"@com_github_cockroachdb_errors//:errors",
69+
"@com_github_gogo_protobuf//types",
70+
"@com_github_stretchr_testify//require",
71+
],
72+
)

pkg/ccl/jobsccl/jobsprotectedtsccl/jobs_protected_ts_test.go renamed to pkg/jobs/jobsprotectedts/jobs_protected_ts_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Use of this software is governed by the CockroachDB Software License
44
// included in the /LICENSE file.
55

6-
package jobsprotectedtsccl
6+
package jobsprotectedts_test
77

88
import (
99
"context"

pkg/ccl/jobsccl/jobsprotectedtsccl/main_test.go renamed to pkg/jobs/jobsprotectedts/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Use of this software is governed by the CockroachDB Software License
44
// included in the /LICENSE file.
55

6-
package jobsprotectedtsccl
6+
package jobsprotectedts_test
77

88
import (
99
"os"

0 commit comments

Comments
 (0)