Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CDRIVER-5514 drop support for Cyrus-SASL on Windows #1933

Merged
merged 6 commits into from
Mar 18, 2025
Merged

CDRIVER-5514 drop support for Cyrus-SASL on Windows #1933

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76e71d5
warn if using `ENABLE_SASL=CYRUS` on Windows
kevinAlbs Mar 18, 2025
7622145
remove no-longer-needed `CYRUS_PLUGIN_PATH_PREFIX`
kevinAlbs Mar 18, 2025
6112303
remove Evergreen tests of Cyrus on Windows
kevinAlbs Mar 18, 2025
b667d2b
remove Windows specific Cyrus code
kevinAlbs Mar 18, 2025
4da3b32
update NEWS
kevinAlbs Mar 18, 2025
cce92f7
Merge branch 'master' into remove-cyrus-windows.C5514
kevinAlbs Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .evergreen/config_generator/components/sasl/winssl.py
View file
Original file line number Diff line number Diff line change
@@ -15,16 +15,15 @@
# pylint: disable=line-too-long
# fmt: off
COMPILE_MATRIX = [
('windows-vsCurrent', 'mingw', None, [ 'sspi']),
('windows-vsCurrent', 'vs2017x64', None, ['off', 'cyrus', 'sspi']),
('windows-vsCurrent', 'vs2017x86', None, ['off', 'sspi']),
('windows-vsCurrent', 'mingw', None, [ 'sspi']),
('windows-vsCurrent', 'vs2017x64', None, ['off', 'sspi']),
('windows-vsCurrent', 'vs2017x86', None, ['off', 'sspi']),
]

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

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


class SaslCyrusWinSSLCompile(WinSSLCompileCommon):
name = 'sasl-cyrus-winssl-compile'
commands = WinSSLCompileCommon.compile_commands(sasl='CYRUS')


class SaslSspiWinSSLCompile(WinSSLCompileCommon):
name = 'sasl-sspi-winssl-compile'
commands = WinSSLCompileCommon.compile_commands(sasl='SSPI')
@@ -53,7 +47,6 @@ class SaslSspiWinSSLCompile(WinSSLCompileCommon):
def functions():
return merge_defns(
SaslOffWinSSLCompile.defn(),
SaslCyrusWinSSLCompile.defn(),
SaslSspiWinSSLCompile.defn(),
)

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

SASL_TO_FUNC = {
'off': SaslOffWinSSLCompile,
'cyrus': SaslCyrusWinSSLCompile,
'sspi': SaslSspiWinSSLCompile,
}

13 changes: 0 additions & 13 deletions .evergreen/generated_configs/functions.yml
View file
Original file line number Diff line number Diff line change
@@ -434,19 +434,6 @@ functions:
args:
- -c
- .evergreen/scripts/compile.sh
sasl-cyrus-winssl-compile:
- command: subprocess.exec
type: test
params:
binary: bash
working_dir: mongoc
add_expansions_to_env: true
env:
SASL: CYRUS
SSL: WINDOWS
args:
- -c
- .evergreen/scripts/compile.sh
sasl-off-nossl-compile:
- command: subprocess.exec
type: test
304 changes: 126 additions & 178 deletions .evergreen/generated_configs/tasks.yml
View file
Original file line number Diff line number Diff line change
@@ -4326,184 +4326,6 @@ tasks:
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
run_on: windows-vsCurrent-large
tags: [sasl-matrix-winssl, compile, windows-vsCurrent, vs2017x64, sasl-cyrus]
commands:
- func: find-cmake-latest
- func: sasl-cyrus-winssl-compile
vars:
CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_GENERATOR_PLATFORM: x64
- func: upload-build
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.0", winssl]
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "4.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.2-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.2", winssl]
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "4.2" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.4-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.4", winssl]
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "4.4" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-5.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "5.0", winssl]
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "5.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-6.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "6.0", winssl]
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "6.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-7.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "7.0", winssl]
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "7.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-8.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "8.0", winssl]
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "8.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-latest-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, latest, winssl]
depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: latest }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-off-nossl-debian10-gcc-compile
run_on: debian10-large
tags: [sasl-matrix-nossl, compile, debian10, gcc, sasl-off]
@@ -5057,6 +4879,132 @@ tasks:
CMAKE_GENERATOR: Visual Studio 15 2017
CMAKE_GENERATOR_PLATFORM: x64
- func: upload-build
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.0", winssl]
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "4.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.2-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.2", winssl]
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "4.2" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.4-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.4", winssl]
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "4.4" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-5.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "5.0", winssl]
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "5.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-6.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "6.0", winssl]
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "6.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-7.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "7.0", winssl]
depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }]
commands:
- func: fetch-build
vars:
BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile
- command: expansions.update
params:
updates:
- { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 }
- { key: CMAKE_GENERATOR_PLATFORM, value: x64 }
- { key: AUTH, value: auth }
- { key: MONGODB_VERSION, value: "7.0" }
- { key: TOPOLOGY, value: server }
- { key: SSL, value: winssl }
- func: fetch-det
- func: bootstrap-mongo-orchestration
- func: run-simple-http-server
- func: run-tests
- name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-8.0-server-auth
run_on: windows-vsCurrent-small
tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "8.0", winssl]
Loading
Oops, something went wrong.