From 8cd211129c5b519bbcd754ee56db2335037b0d7c Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Mon, 10 May 2021 10:57:06 -0400 Subject: [PATCH 1/2] Use ping instead of isMaster in Atlas connectivity tests --- tests/atlas.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/atlas.phpt b/tests/atlas.phpt index c9542c2f7..013dbc0dc 100644 --- a/tests/atlas.phpt +++ b/tests/atlas.phpt @@ -10,7 +10,7 @@ if (getenv('TESTS') !== 'tests/atlas.phpt') { echo "skip Atlas tests not wanted\ 1]); +$command = new \MongoDB\Driver\Command(['ping' => 1]); $query = new \MongoDB\Driver\Query([]); foreach ($urls as $url) { @@ -21,7 +21,7 @@ foreach ($urls as $url) { try { $m = new \MongoDB\Driver\Manager($url); - $m->executeCommand('admin', $isMasterCmd); + $m->executeCommand('admin', $command); iterator_to_array($m->executeQuery('test.test', $query)); echo "PASS\n"; } catch(Exception $e) { From ac5b15c2eaf8303a92c4612ae6b2b74cceb78964 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Mon, 10 May 2021 10:58:25 -0400 Subject: [PATCH 2/2] PHPC-1835: Rotate credentials for Atlas connectivity tests This corresponds with a change to the project's Evergreen config to rotate keys for decrypting atlas-uris.txt.enc. Additionally, this adds comments atlas-uris.txt and atlas.phpt test output for improved readability. --- .evergreen/atlas-uris.txt.enc | Bin 1888 -> 2160 bytes tests/atlas.phpt | 12 ++++++++++++ 2 files changed, 12 insertions(+) diff --git a/.evergreen/atlas-uris.txt.enc b/.evergreen/atlas-uris.txt.enc index da004296b9b92531adc57569f80196930434b9e8..664fb5740610eea557e1241f951814353e67e8e2 100644 GIT binary patch literal 2160 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 diff --git a/tests/atlas.phpt b/tests/atlas.phpt index 013dbc0dc..cf069e555 100644 --- a/tests/atlas.phpt +++ b/tests/atlas.phpt @@ -15,10 +15,16 @@ $query = new \MongoDB\Driver\Query([]); foreach ($urls as $url) { $url = trim($url); + if ($url == '') { continue; } + if (strpos($url, '#') === 0) { + echo trim(substr($url, 1)), "\n"; + continue; + } + try { $m = new \MongoDB\Driver\Manager($url); $m->executeCommand('admin', $command); @@ -32,16 +38,22 @@ foreach ($urls as $url) { ===DONE=== --EXPECTF-- +Atlas replica set (3.4) PASS PASS +Atlas sharded cluster (3.4) PASS PASS +Atlas free tier replica set (4.4) PASS PASS +Atlas with only TLSv1.1 enabled (3.4) PASS PASS +Atlas with only TLSv1.2 enabled (3.4) PASS PASS +Atlas with only TLSv1.2 enabled (3.4) and bad credentials FAIL: %s FAIL: %s ===DONE===