sqlproxy: move from pkg/ccl/sqlproxyccl to pkg/sqlproxy (#170263)

sqlproxy: move from pkg/ccl/sqlproxyccl to pkg/sqlproxy

Author: trunk-io[bot]

.github/CODEOWNERS

@@ -381,7 +381,7 @@
 /docs/generated/http/        @cockroachdb/obs-prs @cockroachdb/server-prs
 /pkg/cmd/docgen/http.go      @cockroachdb/obs-prs @cockroachdb/server-prs
 
-/pkg/ccl/sqlproxyccl/        @cockroachdb/sqlproxy-prs
+/pkg/sqlproxy/               @cockroachdb/sqlproxy-prs
 
 /pkg/gen/                    @cockroachdb/dev-inf
 #!/pkg/gen/*.bzl               @cockroachdb/dev-inf-noreview

build/bazelutil/nogo_config.json

@@ -60,8 +60,8 @@
             "pkg/ccl/changefeedccl/sink_kafka.go": "flagged by linter, should be evaluated",
             "pkg/ccl/changefeedccl/sink_pubsub_v2.go": "flagged by linter, should be evaluated",
             "pkg/ccl/multitenantccl/tenantcostclient/tenant_side.go": "flagged by linter, should be evaluated",
-            "pkg/ccl/sqlproxyccl/acl/watcher.go": "flagged by linter, should be evaluated",
-            "pkg/ccl/sqlproxyccl/tenantdirsvr/test_directory_svr.go": "flagged by linter, should be evaluated",
+            "pkg/sqlproxy/acl/watcher.go": "flagged by linter, should be evaluated",
+            "pkg/sqlproxy/tenantdirsvr/test_directory_svr.go": "flagged by linter, should be evaluated",
             "pkg/crosscluster/streamclient/random_stream_client.go": "flagged by linter, should be evaluated",
             "pkg/cli/clisqlexec/format_csv_tsv.go": "flagged by linter, should be evaluated",
             "pkg/cli/clisqlshell/sql.go": "flagged by linter, should be evaluated",

pkg/BUILD.bazel

@@ -51,12 +51,6 @@ ALL_TESTS = [
     "//pkg/ccl/serverccl/diagnosticsccl:diagnosticsccl_test",
     "//pkg/ccl/serverccl/statusccl:statusccl_test",
     "//pkg/ccl/serverccl:serverccl_test",
-    "//pkg/ccl/sqlproxyccl/acl:acl_test",
-    "//pkg/ccl/sqlproxyccl/balancer:balancer_test",
-    "//pkg/ccl/sqlproxyccl/interceptor:interceptor_test",
-    "//pkg/ccl/sqlproxyccl/tenant:tenant_test",
-    "//pkg/ccl/sqlproxyccl/throttler:throttler_test",
-    "//pkg/ccl/sqlproxyccl:sqlproxyccl_test",
     "//pkg/ccl/testccl/authccl:authccl_test",
     "//pkg/ccl/testccl/sqlccl:sqlccl_test",
     "//pkg/ccl/testccl/sqlstatsccl:sqlstatsccl_test",
@@ -732,6 +726,12 @@ ALL_TESTS = [
     "//pkg/sql/zoneconfig:zoneconfig_test",
     "//pkg/sql:sql_disallowed_imports_test",
     "//pkg/sql:sql_test",
+    "//pkg/sqlproxy/acl:acl_test",
+    "//pkg/sqlproxy/balancer:balancer_test",
+    "//pkg/sqlproxy/interceptor:interceptor_test",
+    "//pkg/sqlproxy/tenant:tenant_test",
+    "//pkg/sqlproxy/throttler:throttler_test",
+    "//pkg/sqlproxy:sqlproxy_test",
     "//pkg/storage/disk:disk_test",
     "//pkg/storage/enginepb:enginepb_test",
     "//pkg/storage/fs:fs_test",
@@ -1038,19 +1038,6 @@ GO_TARGETS = [
     "//pkg/ccl/serverccl/statusccl:statusccl_test",
     "//pkg/ccl/serverccl:serverccl",
     "//pkg/ccl/serverccl:serverccl_test",
-    "//pkg/ccl/sqlproxyccl/acl:acl",
-    "//pkg/ccl/sqlproxyccl/acl:acl_test",
-    "//pkg/ccl/sqlproxyccl/balancer:balancer",
-    "//pkg/ccl/sqlproxyccl/balancer:balancer_test",
-    "//pkg/ccl/sqlproxyccl/interceptor:interceptor",
-    "//pkg/ccl/sqlproxyccl/interceptor:interceptor_test",
-    "//pkg/ccl/sqlproxyccl/tenant:tenant",
-    "//pkg/ccl/sqlproxyccl/tenant:tenant_test",
-    "//pkg/ccl/sqlproxyccl/tenantdirsvr:tenantdirsvr",
-    "//pkg/ccl/sqlproxyccl/throttler:throttler",
-    "//pkg/ccl/sqlproxyccl/throttler:throttler_test",
-    "//pkg/ccl/sqlproxyccl:sqlproxyccl",
-    "//pkg/ccl/sqlproxyccl:sqlproxyccl_test",
     "//pkg/ccl/testccl/authccl:authccl_test",
     "//pkg/ccl/testccl/sqlccl:sqlccl_test",
     "//pkg/ccl/testccl/sqlstatsccl:sqlstatsccl_test",
@@ -2707,6 +2694,19 @@ GO_TARGETS = [
     "//pkg/sql/zoneconfig:zoneconfig_test",
     "//pkg/sql:sql",
     "//pkg/sql:sql_test",
+    "//pkg/sqlproxy/acl:acl",
+    "//pkg/sqlproxy/acl:acl_test",
+    "//pkg/sqlproxy/balancer:balancer",
+    "//pkg/sqlproxy/balancer:balancer_test",
+    "//pkg/sqlproxy/interceptor:interceptor",
+    "//pkg/sqlproxy/interceptor:interceptor_test",
+    "//pkg/sqlproxy/tenant:tenant",
+    "//pkg/sqlproxy/tenant:tenant_test",
+    "//pkg/sqlproxy/tenantdirsvr:tenantdirsvr",
+    "//pkg/sqlproxy/throttler:throttler",
+    "//pkg/sqlproxy/throttler:throttler_test",
+    "//pkg/sqlproxy:sqlproxy",
+    "//pkg/sqlproxy:sqlproxy_test",
     "//pkg/storage/disk:disk",
     "//pkg/storage/disk:disk_test",
     "//pkg/storage/enginepb:enginepb",

pkg/ccl/testutilsccl/BUILD.bazel

@@ -3,10 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "testutilsccl",
     testonly = 1,
-    srcs = [
-        "alter_primary_key.go",
-        "serverless_only.go",
-    ],
+    srcs = ["alter_primary_key.go"],
     importpath = "github.com/cockroachdb/cockroach/pkg/ccl/testutilsccl",
     visibility = ["//visibility:public"],
     deps = [
@@ -18,7 +15,6 @@ go_library(
         "//pkg/sql/execinfra",
         "//pkg/sql/sqltestutils",
         "//pkg/testutils/serverutils",
-        "//pkg/testutils/skip",
         "//pkg/util",
         "@com_github_stretchr_testify//require",
     ],

pkg/ccl/testutilsccl/serverless_only.go

@@ -127,9 +127,6 @@ go_library(
     deps = [
         "//pkg/base",
         "//pkg/build",
-        "//pkg/ccl/sqlproxyccl",
-        "//pkg/ccl/sqlproxyccl/tenant",
-        "//pkg/ccl/sqlproxyccl/tenantdirsvr",
         "//pkg/cli/clicfg",
         "//pkg/cli/clientflags",
         "//pkg/cli/clienturl",
@@ -215,6 +212,9 @@ go_library(
         "//pkg/sql/sem/tree",
         "//pkg/sql/sqlstats",
         "//pkg/sql/stats",
+        "//pkg/sqlproxy",
+        "//pkg/sqlproxy/tenant",
+        "//pkg/sqlproxy/tenantdirsvr",
         "//pkg/storage",
         "//pkg/storage/enginepb",
         "//pkg/storage/fs",

pkg/cli/BUILD.bazel

@@ -14,10 +14,10 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/cockroachdb/cockroach/pkg/ccl/sqlproxyccl/tenant"
-	"github.com/cockroachdb/cockroach/pkg/ccl/sqlproxyccl/tenantdirsvr"
 	"github.com/cockroachdb/cockroach/pkg/cli/clierrorplus"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
+	"github.com/cockroachdb/cockroach/pkg/sqlproxy/tenant"
+	"github.com/cockroachdb/cockroach/pkg/sqlproxy/tenantdirsvr"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"

pkg/cli/mt_http_test_directory.go

@@ -13,8 +13,8 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/cockroachdb/cockroach/pkg/ccl/sqlproxyccl"
 	"github.com/cockroachdb/cockroach/pkg/cli/clierrorplus"
+	"github.com/cockroachdb/cockroach/pkg/sqlproxy"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/log/severity"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
@@ -74,7 +74,7 @@ func runStartSQLProxy(cmd *cobra.Command, args []string) (returnErr error) {
 	}
 	stopper.AddCloser(stop.CloserFn(func() { _ = metricsLn.Close() }))
 
-	server, err := sqlproxyccl.NewServer(ctx, stopper, proxyContext)
+	server, err := sqlproxy.NewServer(ctx, stopper, proxyContext)
 	if err != nil {
 		return err
 	}
@@ -115,7 +115,7 @@ func initProxyLogging(cmd *cobra.Command) (ctx context.Context, stopper *stop.St
 
 func waitForProxySignals(
 	ctx context.Context,
-	server *sqlproxyccl.Server,
+	server *sqlproxy.Server,
 	stopper *stop.Stopper,
 	proxyLn net.Listener,
 	proxyProtocolLn net.Listener,

pkg/cli/mt_proxy.go

@@ -8,7 +8,7 @@ package cli
 import (
 	"time"
 
-	"github.com/cockroachdb/cockroach/pkg/ccl/sqlproxyccl"
+	"github.com/cockroachdb/cockroach/pkg/sqlproxy"
 )
 
 func init() {
@@ -18,7 +18,7 @@ func init() {
 }
 
 // proxyContext captures the command-line parameters of the `mt start-proxy` command.
-var proxyContext sqlproxyccl.ProxyOptions
+var proxyContext sqlproxy.ProxyOptions
 
 func setProxyContextDefaults() {
 	proxyContext.Denylist = ""

pkg/cli/mt_proxy_context.go

@@ -17,8 +17,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cockroachdb/cockroach/pkg/ccl/sqlproxyccl/tenantdirsvr"
 	"github.com/cockroachdb/cockroach/pkg/cli/clierrorplus"
+	"github.com/cockroachdb/cockroach/pkg/sqlproxy/tenantdirsvr"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"