fix tests

Author: qingyang-hu

.evergreen/config.yml

@@ -575,15 +575,14 @@ functions:
         binary: "bash"
         env: 
           GO_BUILD_TAGS: cse
-          CSFLE_TLS_CA_FILE: "${PARENT_DIR}/x509gen/ca.pem"
         include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, MONGO_GO_DRIVER_COMPRESSOR]
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
       params:
         binary: "bash"
         env:
-          KMS_FAILPOINT_SERVERS_RUNNING: "true"
+          KMS_FAILPOINT_SERVER_RUNNING: "true"
         args: [*task-runner, evg-test-retry-kms-requests]
 
   run-fuzz-tests:

etc/setup-encryption.sh

@@ -12,6 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 PARENT_DIR=$(dirname $SCRIPT_DIR)
 
 # Handle the secrets
+export KMS_FAILPOINT_CA_FILE="${PARENT_DIR}/x509gen/ca.pem"
 export CSFLE_TLS_CA_FILE="${PARENT_DIR}/testdata/kmip-certs/ca-ec.pem"
 export CSFLE_TLS_CERT_FILE="${PARENT_DIR}/testdata/kmip-certs/server-ec.pem"
 export CSFLE_TLS_CLIENT_CERT_FILE="${PARENT_DIR}/testdata/kmip-certs/client-ec.pem"

internal/integration/client_side_encryption_prose_test.go

@@ -2983,18 +2983,21 @@ func TestClientSideEncryptionProse(t *testing.T) {
 	})
 
 	mt.RunOpts("24. kms retry tests", noClientOpts, func(mt *mtest.T) {
-		kmsTlsTestcase := os.Getenv("KMS_FAILPOINT_SERVERS_RUNNING")
+		kmsTlsTestcase := os.Getenv("KMS_FAILPOINT_SERVER_RUNNING")
 		if kmsTlsTestcase == "" {
-			mt.Skipf("Skipping test as KMS_FAILPOINT_SERVERS_RUNNING is not set")
+			mt.Skipf("Skipping test as KMS_FAILPOINT_SERVER_RUNNING is not set")
 		}
 
 		mt.Parallel()
 
 		var tlsCfg *tls.Config
-		if tlsCAFileKMIP != "" {
+		if tlsCAFile := os.Getenv("KMS_FAILPOINT_CA_FILE"); tlsCAFile == "" {
+			require.Fail(mt, "failed to load CA file")
+		} else {
+			mt.Logf("load CA file from %s", tlsCAFile)
 			var err error
 			clientAndCATlsMap := map[string]interface{}{
-				"tlsCAFile": tlsCAFileKMIP,
+				"tlsCAFile": tlsCAFile,
 			}
 			tlsCfg, err = options.BuildTLSConfig(clientAndCATlsMap)
 			require.Nil(mt, err, "BuildTLSConfig error: %v", err)
@@ -3064,7 +3067,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 					require.NoError(mt, err, "error on NewClientEncryption: %v", err)
 
 					err = setFailPoint(tc.failure, 1)
-					require.NoError(mt, err, "mock server error: %v, %s", err, tlsCAFileKMIP)
+					require.NoError(mt, err, "mock server error: %v", err)
 
 					dkOpts := options.DataKey().SetMasterKey(dataKey.masterKey)
 					var keyID bson.Binary