Skip to content

Commit 6b8b81a

Browse files
kevinAlbskevinAlbs
authored
CDRIVER-5514 drop support for Cyrus-SASL on Windows (#1933)
* warn if using `ENABLE_SASL=CYRUS` on Windows * remove no-longer-needed `CYRUS_PLUGIN_PATH_PREFIX` * remove Evergreen tests of Cyrus on Windows * remove Windows specific Cyrus code
1 parent 615e3dd commit 6b8b81a

File tree

8 files changed

+134
-275
lines changed

8 files changed

+134
-275
lines changed

‎.evergreen/config_generator/components/sasl/winssl.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
# pylint: disable=line-too-long
1616
# fmt: off
1717
COMPILE_MATRIX = [
18-
('windows-vsCurrent', 'mingw', None, [ 'sspi']),
19-
('windows-vsCurrent', 'vs2017x64', None, ['off', 'cyrus', 'sspi']),
20-
('windows-vsCurrent', 'vs2017x86', None, ['off', 'sspi']),
18+
('windows-vsCurrent', 'mingw', None, [ 'sspi']),
19+
('windows-vsCurrent', 'vs2017x64', None, ['off', 'sspi']),
20+
('windows-vsCurrent', 'vs2017x86', None, ['off', 'sspi']),
2121
]
2222

2323
TEST_MATRIX = [
24-
('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
24+
('windows-vsCurrent', 'vs2017x64', None, 'sspi', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']),
2525

2626
('windows-vsCurrent', 'mingw', None, 'sspi', ['auth'], ['server'], ['8.0', 'latest']),
27-
('windows-vsCurrent', 'vs2017x64', None, 'sspi', ['auth'], ['server'], ['8.0', 'latest']),
2827
('windows-vsCurrent', 'vs2017x86', None, 'sspi', ['auth'], ['server'], ['8.0', 'latest']),
2928
]
3029
# fmt: on
@@ -40,11 +39,6 @@ class SaslOffWinSSLCompile(WinSSLCompileCommon):
4039
commands = WinSSLCompileCommon.compile_commands(sasl='OFF')
4140

4241

43-
class SaslCyrusWinSSLCompile(WinSSLCompileCommon):
44-
name = 'sasl-cyrus-winssl-compile'
45-
commands = WinSSLCompileCommon.compile_commands(sasl='CYRUS')
46-
47-
4842
class SaslSspiWinSSLCompile(WinSSLCompileCommon):
4943
name = 'sasl-sspi-winssl-compile'
5044
commands = WinSSLCompileCommon.compile_commands(sasl='SSPI')
@@ -53,7 +47,6 @@ class SaslSspiWinSSLCompile(WinSSLCompileCommon):
5347
def functions():
5448
return merge_defns(
5549
SaslOffWinSSLCompile.defn(),
56-
SaslCyrusWinSSLCompile.defn(),
5750
SaslSspiWinSSLCompile.defn(),
5851
)
5952

@@ -63,7 +56,6 @@ def tasks():
6356

6457
SASL_TO_FUNC = {
6558
'off': SaslOffWinSSLCompile,
66-
'cyrus': SaslCyrusWinSSLCompile,
6759
'sspi': SaslSspiWinSSLCompile,
6860
}
6961

‎.evergreen/generated_configs/functions.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -434,19 +434,6 @@ functions:
434434
args:
435435
- -c
436436
- .evergreen/scripts/compile.sh
437-
sasl-cyrus-winssl-compile:
438-
- command: subprocess.exec
439-
type: test
440-
params:
441-
binary: bash
442-
working_dir: mongoc
443-
add_expansions_to_env: true
444-
env:
445-
SASL: CYRUS
446-
SSL: WINDOWS
447-
args:
448-
- -c
449-
- .evergreen/scripts/compile.sh
450437
sasl-off-nossl-compile:
451438
- command: subprocess.exec
452439
type: test

‎.evergreen/generated_configs/tasks.yml

Lines changed: 126 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -4326,184 +4326,6 @@ tasks:
43264326
- func: bootstrap-mongo-orchestration
43274327
- func: run-simple-http-server
43284328
- func: run-tests
4329-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4330-
run_on: windows-vsCurrent-large
4331-
tags: [sasl-matrix-winssl, compile, windows-vsCurrent, vs2017x64, sasl-cyrus]
4332-
commands:
4333-
- func: find-cmake-latest
4334-
- func: sasl-cyrus-winssl-compile
4335-
vars:
4336-
CMAKE_GENERATOR: Visual Studio 15 2017
4337-
CMAKE_GENERATOR_PLATFORM: x64
4338-
- func: upload-build
4339-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.0-server-auth
4340-
run_on: windows-vsCurrent-small
4341-
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.0", winssl]
4342-
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
4343-
commands:
4344-
- func: fetch-build
4345-
vars:
4346-
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4347-
- command: expansions.update
4348-
params:
4349-
updates:
4350-
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4351-
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4352-
- { key: AUTH, value: auth }
4353-
- { key: MONGODB_VERSION, value: "4.0" }
4354-
- { key: TOPOLOGY, value: server }
4355-
- { key: SSL, value: winssl }
4356-
- func: fetch-det
4357-
- func: bootstrap-mongo-orchestration
4358-
- func: run-simple-http-server
4359-
- func: run-tests
4360-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.2-server-auth
4361-
run_on: windows-vsCurrent-small
4362-
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.2", winssl]
4363-
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
4364-
commands:
4365-
- func: fetch-build
4366-
vars:
4367-
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4368-
- command: expansions.update
4369-
params:
4370-
updates:
4371-
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4372-
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4373-
- { key: AUTH, value: auth }
4374-
- { key: MONGODB_VERSION, value: "4.2" }
4375-
- { key: TOPOLOGY, value: server }
4376-
- { key: SSL, value: winssl }
4377-
- func: fetch-det
4378-
- func: bootstrap-mongo-orchestration
4379-
- func: run-simple-http-server
4380-
- func: run-tests
4381-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.4-server-auth
4382-
run_on: windows-vsCurrent-small
4383-
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.4", winssl]
4384-
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
4385-
commands:
4386-
- func: fetch-build
4387-
vars:
4388-
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4389-
- command: expansions.update
4390-
params:
4391-
updates:
4392-
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4393-
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4394-
- { key: AUTH, value: auth }
4395-
- { key: MONGODB_VERSION, value: "4.4" }
4396-
- { key: TOPOLOGY, value: server }
4397-
- { key: SSL, value: winssl }
4398-
- func: fetch-det
4399-
- func: bootstrap-mongo-orchestration
4400-
- func: run-simple-http-server
4401-
- func: run-tests
4402-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-5.0-server-auth
4403-
run_on: windows-vsCurrent-small
4404-
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "5.0", winssl]
4405-
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
4406-
commands:
4407-
- func: fetch-build
4408-
vars:
4409-
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4410-
- command: expansions.update
4411-
params:
4412-
updates:
4413-
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4414-
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4415-
- { key: AUTH, value: auth }
4416-
- { key: MONGODB_VERSION, value: "5.0" }
4417-
- { key: TOPOLOGY, value: server }
4418-
- { key: SSL, value: winssl }
4419-
- func: fetch-det
4420-
- func: bootstrap-mongo-orchestration
4421-
- func: run-simple-http-server
4422-
- func: run-tests
4423-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-6.0-server-auth
4424-
run_on: windows-vsCurrent-small
4425-
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "6.0", winssl]
4426-
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
4427-
commands:
4428-
- func: fetch-build
4429-
vars:
4430-
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4431-
- command: expansions.update
4432-
params:
4433-
updates:
4434-
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4435-
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4436-
- { key: AUTH, value: auth }
4437-
- { key: MONGODB_VERSION, value: "6.0" }
4438-
- { key: TOPOLOGY, value: server }
4439-
- { key: SSL, value: winssl }
4440-
- func: fetch-det
4441-
- func: bootstrap-mongo-orchestration
4442-
- func: run-simple-http-server
4443-
- func: run-tests
4444-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-7.0-server-auth
4445-
run_on: windows-vsCurrent-small
4446-
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "7.0", winssl]
4447-
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
4448-
commands:
4449-
- func: fetch-build
4450-
vars:
4451-
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4452-
- command: expansions.update
4453-
params:
4454-
updates:
4455-
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4456-
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4457-
- { key: AUTH, value: auth }
4458-
- { key: MONGODB_VERSION, value: "7.0" }
4459-
- { key: TOPOLOGY, value: server }
4460-
- { key: SSL, value: winssl }
4461-
- func: fetch-det
4462-
- func: bootstrap-mongo-orchestration
4463-
- func: run-simple-http-server
4464-
- func: run-tests
4465-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-8.0-server-auth
4466-
run_on: windows-vsCurrent-small
4467-
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "8.0", winssl]
4468-
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
4469-
commands:
4470-
- func: fetch-build
4471-
vars:
4472-
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4473-
- command: expansions.update
4474-
params:
4475-
updates:
4476-
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4477-
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4478-
- { key: AUTH, value: auth }
4479-
- { key: MONGODB_VERSION, value: "8.0" }
4480-
- { key: TOPOLOGY, value: server }
4481-
- { key: SSL, value: winssl }
4482-
- func: fetch-det
4483-
- func: bootstrap-mongo-orchestration
4484-
- func: run-simple-http-server
4485-
- func: run-tests
4486-
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-latest-server-auth
4487-
run_on: windows-vsCurrent-small
4488-
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, latest, winssl]
4489-
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
4490-
commands:
4491-
- func: fetch-build
4492-
vars:
4493-
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
4494-
- command: expansions.update
4495-
params:
4496-
updates:
4497-
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4498-
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4499-
- { key: AUTH, value: auth }
4500-
- { key: MONGODB_VERSION, value: latest }
4501-
- { key: TOPOLOGY, value: server }
4502-
- { key: SSL, value: winssl }
4503-
- func: fetch-det
4504-
- func: bootstrap-mongo-orchestration
4505-
- func: run-simple-http-server
4506-
- func: run-tests
45074329
- name: sasl-off-nossl-debian10-gcc-compile
45084330
run_on: debian10-large
45094331
tags: [sasl-matrix-nossl, compile, debian10, gcc, sasl-off]
@@ -5057,6 +4879,132 @@ tasks:
50574879
CMAKE_GENERATOR: Visual Studio 15 2017
50584880
CMAKE_GENERATOR_PLATFORM: x64
50594881
- func: upload-build
4882+
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.0-server-auth
4883+
run_on: windows-vsCurrent-small
4884+
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.0", winssl]
4885+
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
4886+
commands:
4887+
- func: fetch-build
4888+
vars:
4889+
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
4890+
- command: expansions.update
4891+
params:
4892+
updates:
4893+
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4894+
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4895+
- { key: AUTH, value: auth }
4896+
- { key: MONGODB_VERSION, value: "4.0" }
4897+
- { key: TOPOLOGY, value: server }
4898+
- { key: SSL, value: winssl }
4899+
- func: fetch-det
4900+
- func: bootstrap-mongo-orchestration
4901+
- func: run-simple-http-server
4902+
- func: run-tests
4903+
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.2-server-auth
4904+
run_on: windows-vsCurrent-small
4905+
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.2", winssl]
4906+
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
4907+
commands:
4908+
- func: fetch-build
4909+
vars:
4910+
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
4911+
- command: expansions.update
4912+
params:
4913+
updates:
4914+
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4915+
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4916+
- { key: AUTH, value: auth }
4917+
- { key: MONGODB_VERSION, value: "4.2" }
4918+
- { key: TOPOLOGY, value: server }
4919+
- { key: SSL, value: winssl }
4920+
- func: fetch-det
4921+
- func: bootstrap-mongo-orchestration
4922+
- func: run-simple-http-server
4923+
- func: run-tests
4924+
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.4-server-auth
4925+
run_on: windows-vsCurrent-small
4926+
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.4", winssl]
4927+
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
4928+
commands:
4929+
- func: fetch-build
4930+
vars:
4931+
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
4932+
- command: expansions.update
4933+
params:
4934+
updates:
4935+
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4936+
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4937+
- { key: AUTH, value: auth }
4938+
- { key: MONGODB_VERSION, value: "4.4" }
4939+
- { key: TOPOLOGY, value: server }
4940+
- { key: SSL, value: winssl }
4941+
- func: fetch-det
4942+
- func: bootstrap-mongo-orchestration
4943+
- func: run-simple-http-server
4944+
- func: run-tests
4945+
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-5.0-server-auth
4946+
run_on: windows-vsCurrent-small
4947+
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "5.0", winssl]
4948+
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
4949+
commands:
4950+
- func: fetch-build
4951+
vars:
4952+
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
4953+
- command: expansions.update
4954+
params:
4955+
updates:
4956+
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4957+
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4958+
- { key: AUTH, value: auth }
4959+
- { key: MONGODB_VERSION, value: "5.0" }
4960+
- { key: TOPOLOGY, value: server }
4961+
- { key: SSL, value: winssl }
4962+
- func: fetch-det
4963+
- func: bootstrap-mongo-orchestration
4964+
- func: run-simple-http-server
4965+
- func: run-tests
4966+
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-6.0-server-auth
4967+
run_on: windows-vsCurrent-small
4968+
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "6.0", winssl]
4969+
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
4970+
commands:
4971+
- func: fetch-build
4972+
vars:
4973+
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
4974+
- command: expansions.update
4975+
params:
4976+
updates:
4977+
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4978+
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
4979+
- { key: AUTH, value: auth }
4980+
- { key: MONGODB_VERSION, value: "6.0" }
4981+
- { key: TOPOLOGY, value: server }
4982+
- { key: SSL, value: winssl }
4983+
- func: fetch-det
4984+
- func: bootstrap-mongo-orchestration
4985+
- func: run-simple-http-server
4986+
- func: run-tests
4987+
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-7.0-server-auth
4988+
run_on: windows-vsCurrent-small
4989+
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "7.0", winssl]
4990+
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
4991+
commands:
4992+
- func: fetch-build
4993+
vars:
4994+
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
4995+
- command: expansions.update
4996+
params:
4997+
updates:
4998+
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
4999+
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
5000+
- { key: AUTH, value: auth }
5001+
- { key: MONGODB_VERSION, value: "7.0" }
5002+
- { key: TOPOLOGY, value: server }
5003+
- { key: SSL, value: winssl }
5004+
- func: fetch-det
5005+
- func: bootstrap-mongo-orchestration
5006+
- func: run-simple-http-server
5007+
- func: run-tests
50605008
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-8.0-server-auth
50615009
run_on: windows-vsCurrent-small
50625010
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "8.0", winssl]

0 commit comments

Comments
 (0)