From 6b4dda7c8c3d19d62ebf644e299596f11df0e939 Mon Sep 17 00:00:00 2001 From: Kaitlin Mahar Date: Mon, 27 Sep 2021 18:17:09 -0400 Subject: [PATCH 1/2] Remove legacy hello workaround, add serverless instance tests --- .evergreen/config.yml | 1 + Sources/AtlasConnectivity/main.swift | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f912ae44d..4b5c00024 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -179,6 +179,7 @@ functions: # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does) SWIFT_VERSION=${SWIFT_VERSION} ATLAS_REPL='${ATLAS_REPL}' ATLAS_SHRD='${ATLAS_SHRD}' ATLAS_FREE='${ATLAS_FREE}' ATLAS_TLS11='${ATLAS_TLS11}' ATLAS_TLS12='${ATLAS_TLS12}' \ ATLAS_REPL_SRV='${ATLAS_REPL_SRV}' ATLAS_SHRD_SRV='${ATLAS_SHRD_SRV}' ATLAS_FREE_SRV='${ATLAS_FREE_SRV}' ATLAS_TLS11_SRV='${ATLAS_TLS11_SRV}' ATLAS_TLS12_SRV='${ATLAS_TLS12_SRV}' \ + ATLAS_SERVERLESS='${ATLAS_SERVERLESS}' ATLAS_SERVERLESS_SRV='${ATLAS_SERVERLESS_SRV}' \ sh ${PROJECT_DIRECTORY}/.evergreen/run-atlas-tests.sh "run serverless tests": diff --git a/Sources/AtlasConnectivity/main.swift b/Sources/AtlasConnectivity/main.swift index b9479fdfa..7f544fe73 100644 --- a/Sources/AtlasConnectivity/main.swift +++ b/Sources/AtlasConnectivity/main.swift @@ -1,11 +1,8 @@ import Foundation import MongoSwiftSync -private let configs = ["ATLAS_REPL", "ATLAS_SHRD", "ATLAS_FREE", "ATLAS_TLS11", "ATLAS_TLS12"] +private let configs = ["ATLAS_REPL", "ATLAS_SHRD", "ATLAS_FREE", "ATLAS_TLS11", "ATLAS_TLS12", "ATLAS_SERVERLESS"] private let srvConfigs = configs.map { $0 + "_SRV" } -/// Currently, almost all of the Atlas test instances are running 3.4 which does not support the new "hello" command. -private let legacyHello = "ismaster" -private let supportsHello = ["ATLAS_FREE", "ATLAS_FREE_SRV"] for config in configs + srvConfigs { print("Testing config \(config)... ", terminator: "") @@ -19,11 +16,7 @@ for config in configs + srvConfigs { let client = try MongoClient(uri) // run legacy hello command let db = client.db("test") - if supportsHello.contains(config) { - _ = try db.runCommand(["hello": 1]) - } else { - _ = try db.runCommand([legacyHello: 1]) - } + _ = try db.runCommand(["hello": 1]) // findOne let coll = db.collection("test") From 2ad4f6365f172c7164a06f89bdcb32838f88843f Mon Sep 17 00:00:00 2001 From: Kaitlin Mahar Date: Mon, 27 Sep 2021 20:03:51 -0400 Subject: [PATCH 2/2] Update main.swift --- Sources/AtlasConnectivity/main.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/AtlasConnectivity/main.swift b/Sources/AtlasConnectivity/main.swift index 7f544fe73..7306a922d 100644 --- a/Sources/AtlasConnectivity/main.swift +++ b/Sources/AtlasConnectivity/main.swift @@ -14,7 +14,6 @@ for config in configs + srvConfigs { do { let client = try MongoClient(uri) - // run legacy hello command let db = client.db("test") _ = try db.runCommand(["hello": 1])