SERVER-38430 Rename tlsPEMKeyFile options to conform to driver URI spec

5 files changed, 8 insertions, 8 deletions

diff --git a/jstests/ssl/config-canonicalize-normal-ports.js b/jstests/ssl/config-canonicalize-normal-ports.js
index b83f8b2efa4..a9f2878b020 100644
--- a/jstests/ssl/config-canonicalize-normal-ports.js
+++ b/jstests/ssl/config-canonicalize-normal-ports.js
@@ -5,7 +5,7 @@
 
     const mongod = MongoRunner.runMongod({
         tlsOnNormalPorts: '',
-        tlsPEMKeyFile: 'jstests/libs/server.pem',
+        tlsCertificateKeyFile: 'jstests/libs/server.pem',
     });
     assert(mongod);
     assert.commandWorked(mongod.getDB('admin').runCommand({isMaster: 1}));
diff --git a/jstests/ssl/ssl_ECDHE_suites.js b/jstests/ssl/ssl_ECDHE_suites.js
index 6abcf789fd6..7cf5c2f89fa 100644
--- a/jstests/ssl/ssl_ECDHE_suites.js
+++ b/jstests/ssl/ssl_ECDHE_suites.js
@@ -27,7 +27,7 @@ load('jstests/ssl/libs/ssl_helpers.js');
     const x509_options = {
         tlsMode: 'requireTLS',
         tlsCAFile: CA_CERT,
-        tlsPEMKeyFile: SERVER_CERT,
+        tlsCertificateKeyFile: SERVER_CERT,
         ipv6: "",
         bind_ip_all: ""
     };
diff --git a/jstests/ssl/ssl_cluster_ca.js b/jstests/ssl/ssl_cluster_ca.js
index 38b9026455d..4a38ae708bf 100644
--- a/jstests/ssl/ssl_cluster_ca.js
+++ b/jstests/ssl/ssl_cluster_ca.js
@@ -34,7 +34,7 @@
         tlsMode: 'requireTLS',
         // Servers present trusted-server.pem to clients and each other for inbound connections.
         // Peers validate trusted-server.pem using trusted-ca.pem when making those connections.
-        tlsPEMKeyFile: 'jstests/libs/trusted-server.pem',
+        tlsCertificateKeyFile: 'jstests/libs/trusted-server.pem',
         tlsCAFile: 'jstests/libs/trusted-ca.pem',
         // Servers making outbound connections to other servers present server.pem to their peers
         // which their peers validate using ca.pem.
@@ -47,11 +47,11 @@
     testRS(valid_options, true);
 
     const wrong_cluster_file =
-        Object.assign({}, valid_options, {tlsClusterFile: valid_options.tlsPEMKeyFile});
+        Object.assign({}, valid_options, {tlsClusterFile: valid_options.tlsCertificateKeyFile});
     testRS(wrong_cluster_file, false);
 
     const wrong_key_file =
-        Object.assign({}, valid_options, {tlsPEMKeyFile: valid_options.tlsClusterFile});
+        Object.assign({}, valid_options, {tlsCertificateKeyFile: valid_options.tlsClusterFile});
     testRS(wrong_key_file, false);
 
     const mongod = MongoRunner.runMongod(valid_options);
@@ -66,7 +66,7 @@
                                       "--tls",
                                       "--tlsCAFile",
                                       valid_options.tlsCAFile,
-                                      "--tlsPEMKeyFile",
+                                      "--tlsCertificateKeyFile",
                                       cert,
                                       "--eval",
                                       ";");
diff --git a/jstests/ssl/ssl_options.js b/jstests/ssl/ssl_options.js
index 909fde4c82c..8d74794dcc4 100644
--- a/jstests/ssl/ssl_options.js
+++ b/jstests/ssl/ssl_options.js
@@ -36,7 +36,7 @@ requireSSLProvider('openssl', function() {
         }
     }
 
-    assert.eq(getCmdLineOptsResult.parsed.net.tls.PEMKeyPassword,
+    assert.eq(getCmdLineOptsResult.parsed.net.tls.certificateKeyFilePassword,
               "<password>",
               "Password not properly censored: " + tojson(getCmdLineOptsResult));
     assert.eq(getCmdLineOptsResult.parsed.net.tls.clusterPassword,
diff --git a/jstests/ssl/ssl_withhold_client_cert.js b/jstests/ssl/ssl_withhold_client_cert.js
index e8084c98439..919409bbd60 100644
--- a/jstests/ssl/ssl_withhold_client_cert.js
+++ b/jstests/ssl/ssl_withhold_client_cert.js
@@ -28,7 +28,7 @@
 
     const base_options = {
         tlsMode: 'requireTLS',
-        tlsPEMKeyFile: 'jstests/libs/server.pem',
+        tlsCertificateKeyFile: 'jstests/libs/server.pem',
         tlsCAFile: 'jstests/libs/ca.pem',
         tlsAllowInvalidHostnames: '',
         useLogFiles: true,