Move /data directory to /testdata. (#1061)

Author: matthewdale

.evergreen/config.yml

@@ -481,8 +481,8 @@ functions:
           export AWS_DEFAULT_REGION="us-east-1"
 
           # Set client-side encryption credentials.
-          export CSFLE_TLS_CA_FILE="$PROJECT_DIRECTORY/data/kmip-certs/ca-ec.pem"
-          export CSFLE_TLS_CERTIFICATE_KEY_FILE="$PROJECT_DIRECTORY/data/kmip-certs/client-ec.pem"
+          export CSFLE_TLS_CA_FILE="$PROJECT_DIRECTORY/testdata/kmip-certs/ca-ec.pem"
+          export CSFLE_TLS_CERTIFICATE_KEY_FILE="$PROJECT_DIRECTORY/testdata/kmip-certs/client-ec.pem"
 
           ${PYTHON3_BINARY} -m venv ./venv
           ./venv/${VENV_BIN_DIR|bin}/pip3 install boto3
@@ -951,13 +951,13 @@ functions:
           if [ "Windows_NT" = "$OS" ]; then
             kmstlsvenv/Scripts/python.exe -u kms_kmip_server.py \
               --port 5698 \
-              --ca_file "${PROJECT_DIRECTORY}/data/kmip-certs/ca-ec.pem" \
-              --cert_file "${PROJECT_DIRECTORY}/data/kmip-certs/server-ec.pem"
+              --ca_file "${PROJECT_DIRECTORY}/testdata/kmip-certs/ca-ec.pem" \
+              --cert_file "${PROJECT_DIRECTORY}/testdata/kmip-certs/server-ec.pem"
           else
             ./kmstlsvenv/bin/python3 -u kms_kmip_server.py \
               --port 5698 \
-              --ca_file "${PROJECT_DIRECTORY}/data/kmip-certs/ca-ec.pem" \
-              --cert_file "${PROJECT_DIRECTORY}/data/kmip-certs/server-ec.pem"
+              --ca_file "${PROJECT_DIRECTORY}/testdata/kmip-certs/ca-ec.pem" \
+              --cert_file "${PROJECT_DIRECTORY}/testdata/kmip-certs/server-ec.pem"
           fi
 
   run-kms-tls-test:
@@ -1010,8 +1010,8 @@ functions:
           AZURE_CLIENT_SECRET="${cse_azure_client_secret}" \
           GCP_EMAIL="${cse_gcp_email}" \
           GCP_PRIVATE_KEY="${cse_gcp_private_key}" \
-          CSFLE_TLS_CA_FILE="$PROJECT_DIRECTORY/data/kmip-certs/ca-ec.pem"
-          CSFLE_TLS_CERTIFICATE_KEY_FILE="$PROJECT_DIRECTORY/data/kmip-certs/client-ec.pem"
+          CSFLE_TLS_CA_FILE="$PROJECT_DIRECTORY/testdata/kmip-certs/ca-ec.pem"
+          CSFLE_TLS_CERTIFICATE_KEY_FILE="$PROJECT_DIRECTORY/testdata/kmip-certs/client-ec.pem"
           make evg-test-kmip \
           PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
           LD_LIBRARY_PATH=$LD_LIBRARY_PATH

.evergreen/run-tests.sh

@@ -96,8 +96,8 @@ else
   echo "crypt_shared library will be loaded from path: $CRYPT_SHARED_LIB_PATH"
 fi
 
-CSFLE_TLS_CA_FILE="$(pwd)/data/kmip-certs/ca-ec.pem"
-CSFLE_TLS_CERTIFICATE_KEY_FILE="$(pwd)/data/kmip-certs/client-ec.pem"
+CSFLE_TLS_CA_FILE="$(pwd)/testdata/kmip-certs/ca-ec.pem"
+CSFLE_TLS_CERTIFICATE_KEY_FILE="$(pwd)/testdata/kmip-certs/client-ec.pem"
 
 if [ "Windows_NT" = "$OS" ]; then
   CSFLE_TLS_CA_FILE=$(cygpath -m $CSFLE_TLS_CA_FILE)

.golangci.yml

@@ -82,7 +82,6 @@ issues:
   skip-dirs:
     - (^|/)vendor($|/)
     - (^|/)testdata($|/)
-    - (^|/)data($|/)
     - (^|/)etc($|/)
   exclude-rules:
     # Ignore some linters for example code that is intentionally simplified.

Makefile

@@ -202,7 +202,8 @@ driver-benchmark:perf
 	@go run cmd/godriver-benchmark/main.go | tee perf.suite
 
 perf:driver-test-data.tar.gz
-	tar -zxf $< $(if $(eq $(UNAME_S),Darwin),-s , --transform=s)/data/perf/
+	tar -zxf $< $(if $(eq $(UNAME_S),Darwin),-s , --transform=s)/testdata/perf/
 	@touch $@
+
 driver-test-data.tar.gz:
 	curl --retry 5 "https://s3.amazonaws.com/boxes.10gen.com/build/driver-test-data.tar.gz" -o driver-test-data.tar.gz --silent --max-time 120

bson/benchmark_test.go

@@ -127,10 +127,10 @@ var nestedInstance = nestedtest1{
 	},
 }
 
-const extendedBSONDir = "../data/extended_bson"
+const extendedBSONDir = "../testdata/extended_bson"
 
 // readExtJSONFile reads the GZIP-compressed extended JSON document from the given filename in the
-// "extended BSON" test data directory (../data/extended_bson) and returns it as a
+// "extended BSON" test data directory (../testdata/extended_bson) and returns it as a
 // map[string]interface{}. It panics on any errors.
 func readExtJSONFile(filename string) map[string]interface{} {
 	filePath := path.Join(extendedBSONDir, filename)

bson/bson_corpus_spec_test.go

@@ -58,7 +58,7 @@ type parseErrorTestCase struct {
 	String      string `json:"string"`
 }
 
-const dataDir = "../data/bson-corpus/"
+const dataDir = "../testdata/bson-corpus/"
 
 func findJSONFilesInDir(t *testing.T, dir string) []string {
 	files := make([]string, 0)

mongo/description/max_staleness_spec_test.go

@@ -13,7 +13,7 @@ import (
 	"go.mongodb.org/mongo-driver/internal/testutil/helpers"
 )
 
-const maxStalenessTestsDir = "../../data/max-staleness"
+const maxStalenessTestsDir = "../../testdata/max-staleness"
 
 // Test case for all max staleness spec tests.
 func TestMaxStalenessSpec(t *testing.T) {

mongo/description/selector_spec_test.go

@@ -13,7 +13,7 @@ import (
 	"go.mongodb.org/mongo-driver/internal/testutil/helpers"
 )
 
-const selectorTestsDir = "../../data/server-selection/server_selection"
+const selectorTestsDir = "../../testdata/server-selection/server_selection"
 
 // Test case for all SDAM spec tests.
 func TestServerSelectionSpec(t *testing.T) {

mongo/integration/client_side_encryption_prose_test.go

@@ -41,7 +41,7 @@ var (
 )
 
 const (
-	clientEncryptionProseDir      = "../../data/client-side-encryption-prose"
+	clientEncryptionProseDir      = "../../testdata/client-side-encryption-prose"
 	deterministicAlgorithm        = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
 	randomAlgorithm               = "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
 	kvNamespace                   = "keyvault.datakeys" // default namespace for the key vault collection

mongo/integration/command_monitoring_test.go

@@ -18,7 +18,7 @@ import (
 )
 
 const (
-	monitoringTestDir = "../../data/command-monitoring/legacy"
+	monitoringTestDir = "../../testdata/command-monitoring/legacy"
 )
 
 type monitoringTestFile struct {