ccl: move pkg/ccl/cloudccl to pkg/cloud

.github/CODEOWNERS

@@ -279,7 +279,6 @@
 /pkg/revert/          @cockroachdb/disaster-recovery
 /pkg/storage/encryption.go           @cockroachdb/disaster-recovery
 /pkg/storage/external_sst_reader.go  @cockroachdb/disaster-recovery
-/pkg/ccl/cloudccl/           @cockroachdb/disaster-recovery
 /pkg/cloud/                  @cockroachdb/disaster-recovery
 /pkg/sql/distsql_plan_bulk*  @cockroachdb/disaster-recovery
 /pkg/sql/catalog/externalcatalog            @cockroachdb/disaster-recovery

build/teamcity/cockroach/nightlies/cloud_unit_tests_impl.sh

@@ -63,7 +63,7 @@ bazel_test_env=(--test_env=GO_TEST_WRAP_TESTV=1 \
 exit_status=0
 
 $BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci -- test --config=ci \
-    //pkg/cloud/gcp:gcp_test //pkg/cloud/amazon:amazon_test //pkg/ccl/cloudccl/gcp:gcp_test //pkg/ccl/cloudccl/amazon:amazon_test \
+    //pkg/cloud/gcp:gcp_test //pkg/cloud/amazon:amazon_test \
     //pkg/cloud/azure:azure_test //pkg/cloud/azure:azure_test \
     "${bazel_test_env[@]}" \
     --test_timeout=900 \

pkg/BUILD.bazel

@@ -39,11 +39,6 @@ ALL_TESTS = [
     "//pkg/ccl/changefeedccl/tableset:tableset_test",
     "//pkg/ccl/changefeedccl/timers:timers_test",
     "//pkg/ccl/changefeedccl:changefeedccl_test",
-    "//pkg/ccl/cloudccl/amazon:amazon_test",
-    "//pkg/ccl/cloudccl/azure:azure_test",
-    "//pkg/ccl/cloudccl/cloudprivilege:cloudprivilege_test",
-    "//pkg/ccl/cloudccl/externalconn:externalconn_test",
-    "//pkg/ccl/cloudccl/gcp:gcp_test",
     "//pkg/ccl/jwtauthccl:jwtauthccl_test",
     "//pkg/ccl/ldapccl:ldapccl_test",
     "//pkg/ccl/logictestccl/tests/3node-tenant-multiregion:3node-tenant-multiregion_test",
@@ -111,6 +106,8 @@ ALL_TESTS = [
     "//pkg/cli:cli_test",
     "//pkg/cloud/amazon:amazon_test",
     "//pkg/cloud/azure:azure_test",
+    "//pkg/cloud/cloudprivilege:cloudprivilege_test",
+    "//pkg/cloud/externalconn:externalconn_test",
     "//pkg/cloud/gcp:gcp_test",
     "//pkg/cloud/httpsink:httpsink_test",
     "//pkg/cloud/impl/cloudimpltests:cloudimpltests_test",
@@ -1015,11 +1012,6 @@ GO_TARGETS = [
     "//pkg/ccl/changefeedccl/timers:timers_test",
     "//pkg/ccl/changefeedccl:changefeedccl",
     "//pkg/ccl/changefeedccl:changefeedccl_test",
-    "//pkg/ccl/cloudccl/amazon:amazon_test",
-    "//pkg/ccl/cloudccl/azure:azure_test",
-    "//pkg/ccl/cloudccl/cloudprivilege:cloudprivilege_test",
-    "//pkg/ccl/cloudccl/externalconn:externalconn_test",
-    "//pkg/ccl/cloudccl/gcp:gcp_test",
     "//pkg/ccl/gssapiccl:gssapiccl",
     "//pkg/ccl/jwtauthccl:jwtauthccl",
     "//pkg/ccl/jwtauthccl:jwtauthccl_test",
@@ -1137,12 +1129,14 @@ GO_TARGETS = [
     "//pkg/cloud/azure:azure",
     "//pkg/cloud/azure:azure_test",
     "//pkg/cloud/cloudpb:cloudpb",
+    "//pkg/cloud/cloudprivilege:cloudprivilege_test",
     "//pkg/cloud/cloudtestutils:cloudtestutils",
     "//pkg/cloud/externalconn/connectionpb:connectionpb",
     "//pkg/cloud/externalconn/providers:providers",
     "//pkg/cloud/externalconn/testutils:testutils",
     "//pkg/cloud/externalconn/utils:utils",
     "//pkg/cloud/externalconn:externalconn",
+    "//pkg/cloud/externalconn:externalconn_test",
     "//pkg/cloud/faulty:faulty",
     "//pkg/cloud/gcp:gcp",
     "//pkg/cloud/gcp:gcp_test",

pkg/cloud/amazon/BUILD.bazel

@@ -49,25 +49,35 @@ go_library(
 
 go_test(
     name = "amazon_test",
-    size = "small",
+    size = "medium",
     srcs = [
         "aws_kms_test.go",
+        "main_test.go",
+        "s3_connection_test.go",
         "s3_storage_test.go",
     ],
     embed = [":amazon"],
     deps = [
+        "//pkg/backup",
         "//pkg/base",
         "//pkg/blobs",
         "//pkg/cloud",
         "//pkg/cloud/cloudpb",
         "//pkg/cloud/cloudtestutils",
+        "//pkg/cloud/externalconn/providers",
+        "//pkg/security/securityassets",
+        "//pkg/security/securitytest",
         "//pkg/security/username",
+        "//pkg/server",
         "//pkg/settings",
         "//pkg/settings/cluster",
         "//pkg/testutils",
+        "//pkg/testutils/serverutils",
         "//pkg/testutils/skip",
+        "//pkg/testutils/sqlutils",
         "//pkg/util/leaktest",
         "//pkg/util/log",
+        "//pkg/util/randutil",
         "//pkg/util/uuid",
         "@com_github_aws_aws_sdk_go//aws/awserr",
         "@com_github_aws_aws_sdk_go//aws/request",

pkg/cloud/amazon/aws_kms_test.go

@@ -239,9 +239,14 @@ func TestKMSAgainstMockAWS(t *testing.T) {
 	tempDir, cleanup := testutils.TempDir(t)
 	defer cleanup()
 	credFile := filepath.Join(tempDir, "credentials")
+	origCredsFile, hasCredsFile := os.LookupEnv("AWS_SHARED_CREDENTIALS_FILE")
 	require.NoError(t, os.Setenv("AWS_SHARED_CREDENTIALS_FILE", credFile))
 	defer func() {
-		require.NoError(t, os.Unsetenv("AWS_SHARED_CREDENTIALS_FILE"))
+		if hasCredsFile {
+			require.NoError(t, os.Setenv("AWS_SHARED_CREDENTIALS_FILE", origCredsFile))
+		} else {
+			require.NoError(t, os.Unsetenv("AWS_SHARED_CREDENTIALS_FILE"))
+		}
 	}()
 	require.NoError(t, os.WriteFile(credFile, []byte(`[default]
 		aws_access_key_id = abc
@@ -354,6 +359,7 @@ func TestAWSKMSDisallowImplicitCredentials(t *testing.T) {
 }
 
 func TestAWSKMSInaccessibleError(t *testing.T) {
+	defer leaktest.AfterTest(t)()
 	q := make(url.Values)
 	expect := map[string]string{
 		"AWS_ACCESS_KEY_ID":     AWSAccessKeyParam,
@@ -454,12 +460,22 @@ func TestAWSKMSImplicitAuthRequiresNoSharedConfigFiles(t *testing.T) {
 	// so in order to circumvent this and test the case where the shared config
 	// files are not present, we need to set the AWS_CONFIG_FILE and
 	// AWS_SHARED_CREDENTIALS_FILE.
+	origConfigFile, hasConfigFile := os.LookupEnv("AWS_CONFIG_FILE")
+	origCredsFile, hasCredsFile := os.LookupEnv("AWS_SHARED_CREDENTIALS_FILE")
 	require.NoError(t, os.Setenv("AWS_CONFIG_FILE", "/tmp/config"))
 	require.NoError(t, os.Setenv("AWS_SHARED_CREDENTIALS_FILE",
 		"/tmp/credentials"))
 	defer func() {
-		require.NoError(t, os.Unsetenv("AWS_CONFIG_FILE"))
-		require.NoError(t, os.Unsetenv("AWS_SHARED_CREDENTIALS_FILE"))
+		if hasConfigFile {
+			require.NoError(t, os.Setenv("AWS_CONFIG_FILE", origConfigFile))
+		} else {
+			require.NoError(t, os.Unsetenv("AWS_CONFIG_FILE"))
+		}
+		if hasCredsFile {
+			require.NoError(t, os.Setenv("AWS_SHARED_CREDENTIALS_FILE", origCredsFile))
+		} else {
+			require.NoError(t, os.Unsetenv("AWS_SHARED_CREDENTIALS_FILE"))
+		}
 	}()
 
 	testEnv := &cloud.TestKMSEnv{

pkg/ccl/cloudccl/amazon/main_test.go → pkg/cloud/amazon/main_test.go

@@ -9,8 +9,9 @@ import (
 	"os"
 	"testing"
 
+	_ "github.com/cockroachdb/cockroach/pkg/backup" // register BACKUP/RESTORE plan hooks.
 	"github.com/cockroachdb/cockroach/pkg/base"
-	"github.com/cockroachdb/cockroach/pkg/ccl"
+	_ "github.com/cockroachdb/cockroach/pkg/cloud/externalconn/providers" // register External Connection providers.
 	"github.com/cockroachdb/cockroach/pkg/security/securityassets"
 	"github.com/cockroachdb/cockroach/pkg/security/securitytest"
 	"github.com/cockroachdb/cockroach/pkg/server"
@@ -19,8 +20,6 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	defer ccl.TestingEnableEnterprise()()
-
 	securityassets.SetLoader(securitytest.EmbeddedAssets)
 	randutil.SeedForTests()
 	serverutils.InitTestServerFactory(
@@ -30,4 +29,4 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-//go:generate ../../../util/leaktest/add-leaktest.sh *_test.go
+//go:generate ../../util/leaktest/add-leaktest.sh *_test.go