Skip to content

Commit efaba58

Browse files
authored
CSHARP-4933: Mark Server version 3.6 as EOL (#1388)
CSHARP-5164: Bump maxWireVersion for MongoDB 8.0 CSHARP-4933: Mark Server version 3.6 as EOL
1 parent 8319169 commit efaba58

37 files changed

+66
-623
lines changed

evergreen/evergreen.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,6 +1946,10 @@ axes:
19461946
display_name: "rapid"
19471947
variables:
19481948
VERSION: "rapid"
1949+
- id: "8.0"
1950+
display_name: "8.0"
1951+
variables:
1952+
VERSION: "8.0"
19491953
- id: "7.0"
19501954
display_name: "7.0"
19511955
variables:
@@ -1970,10 +1974,6 @@ axes:
19701974
display_name: "4.0"
19711975
variables:
19721976
VERSION: "4.0"
1973-
- id: "3.6"
1974-
display_name: "3.6"
1975-
variables:
1976-
VERSION: "3.6"
19771977

19781978
- id: os
19791979
display_name: OS
@@ -2369,7 +2369,7 @@ task_groups:
23692369

23702370
buildvariants:
23712371
- matrix_name: stable-api-tests
2372-
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", auth: "auth", ssl: "nossl", os: "windows-64" }
2372+
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "standalone", auth: "auth", ssl: "nossl", os: "windows-64" }
23732373
display_name: "Stable API ${version} ${topology} ${auth} ${ssl} ${os}"
23742374
run_on:
23752375
- windows-64-vs2017-test
@@ -2389,7 +2389,7 @@ buildvariants:
23892389
- name: test-netstandard21
23902390

23912391
- matrix_name: "secure-tests-macOS"
2392-
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-14", "macos-14-arm64"] }
2392+
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-14", "macos-14-arm64"] }
23932393
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
23942394
tags: ["tests-variant"]
23952395
tasks:
@@ -2404,7 +2404,7 @@ buildvariants:
24042404
- name: test-netstandard21
24052405

24062406
- matrix_name: "secure-tests-linux-2004"
2407-
matrix_spec: { version: ["7.0", "rapid", "latest"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-2004" }
2407+
matrix_spec: { version: ["7.0", "8.0", "rapid", "latest"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-2004" }
24082408
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
24092409
tags: ["tests-variant"]
24102410
tasks:
@@ -2422,22 +2422,22 @@ buildvariants:
24222422
- name: test-netstandard21
24232423

24242424
- matrix_name: "unsecure-tests-macOS"
2425-
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-14", "macos-14-arm64"] }
2425+
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-14", "macos-14-arm64"] }
24262426
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
24272427
tags: ["tests-variant"]
24282428
tasks:
24292429
- name: test-netstandard21
24302430

24312431
- matrix_name: "unsecure-tests-linux-1804"
2432-
matrix_spec: { version: ["3.6", "4.0", "4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-1804" }
2432+
matrix_spec: { version: ["4.0", "4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-1804" }
24332433
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
24342434
tags: ["tests-variant"]
24352435
tasks:
24362436
- name: test-netstandard20
24372437
- name: test-netstandard21
24382438

24392439
- matrix_name: "unsecure-tests-linux-2004"
2440-
matrix_spec: { version: ["7.0", "rapid", "latest"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-2004" }
2440+
matrix_spec: { version: ["7.0", "8.0", "rapid", "latest"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-2004" }
24412441
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
24422442
tags: ["tests-variant"]
24432443
tasks:
@@ -2455,22 +2455,22 @@ buildvariants:
24552455
- name: test-netstandard21
24562456

24572457
- matrix_name: "tests-compression-macOS"
2458-
matrix_spec: { compressor : ["snappy", "zstandard"], auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", os: ["macos-14", "macos-14-arm64"] }
2458+
matrix_spec: { compressor : ["snappy", "zstandard"], auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "standalone", os: ["macos-14", "macos-14-arm64"] }
24592459
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
24602460
tags: ["tests-variant"]
24612461
tasks:
24622462
- name: test-netstandard21
24632463

24642464
- matrix_name: "tests-compression-linux-1804"
2465-
matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["3.6", "4.0", "4.2", "4.4", "5.0", "6.0"], topology: "standalone", os: "ubuntu-1804" }
2465+
matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["4.0", "4.2", "4.4", "5.0", "6.0"], topology: "standalone", os: "ubuntu-1804" }
24662466
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
24672467
tags: ["tests-variant"]
24682468
tasks:
24692469
- name: test-netstandard20
24702470
- name: test-netstandard21
24712471

24722472
- matrix_name: "tests-compression-linux-2004"
2473-
matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["7.0", "rapid", "latest"], topology: "standalone", os: "ubuntu-2004" }
2473+
matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["7.0", "8.0", "rapid", "latest"], topology: "standalone", os: "ubuntu-2004" }
24742474
display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
24752475
tags: ["tests-variant"]
24762476
tasks:
@@ -2506,28 +2506,28 @@ buildvariants:
25062506
- name: oidc-auth-gcp-task-group
25072507

25082508
- matrix_name: "ocsp-tests"
2509-
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "rapid", "latest"], auth: "noauth", ssl: "ssl", topology: "standalone", os: "windows-64" }
2509+
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"], auth: "noauth", ssl: "ssl", topology: "standalone", os: "windows-64" }
25102510
display_name: "OCSP ${version} ${os}"
25112511
batchtime: 20160 # 14 days
25122512
tasks:
25132513
- name: ".ocsp"
25142514

25152515
- matrix_name: aws-auth-tests-windows
2516-
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "rapid", "latest"], topology: "standalone", os: "windows-64" }
2516+
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "standalone", os: "windows-64" }
25172517
display_name: "MONGODB-AWS Auth test ${version} ${os}"
25182518
run_on:
25192519
- windows-64-vs2017-test
25202520
tasks:
25212521
- name: aws-auth-tests
25222522

25232523
- matrix_name: aws-auth-tests-linux
2524-
matrix_spec: { version: ["6.0", "7.0", "rapid", "latest"], topology: "standalone", os: "ubuntu-2004" }
2524+
matrix_spec: { version: ["6.0", "7.0", "8.0", "rapid", "latest"], topology: "standalone", os: "ubuntu-2004" }
25252525
display_name: "MONGODB-AWS Auth test ${version} ${os}"
25262526
tasks:
25272527
- name: aws-auth-tests
25282528

25292529
- matrix_name: aws-auth-tests-macos
2530-
matrix_spec: { version: ["6.0", "7.0", "rapid", "latest"], topology: "standalone", os: "macos-14" }
2530+
matrix_spec: { version: ["6.0", "7.0", "8.0", "rapid", "latest"], topology: "standalone", os: "macos-14" }
25312531
display_name: "MONGODB-AWS Auth test ${version} ${os}"
25322532
tasks:
25332533
- name: aws-auth-tests
@@ -2551,14 +2551,14 @@ buildvariants:
25512551

25522552
# Load balancer tests
25532553
- matrix_name: load-balancer-tests
2554-
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], auth: "noauth", ssl: "nossl", topology: "sharded-cluster", os: "ubuntu-2004" }
2554+
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], auth: "noauth", ssl: "nossl", topology: "sharded-cluster", os: "ubuntu-2004" }
25552555
display_name: "Load Balancer ${version} ${auth} ${ssl} ${os}"
25562556
tasks:
25572557
- name: "test-load-balancer-netstandard20"
25582558
- name: "test-load-balancer-netstandard21"
25592559

25602560
- matrix_name: load-balancer-tests-secure
2561-
matrix_spec: { version: ["5.0", "6.0", "7.0", "rapid", "latest"], auth: "auth", ssl: "ssl", topology: "sharded-cluster", os: "ubuntu-2004" }
2561+
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], auth: "auth", ssl: "ssl", topology: "sharded-cluster", os: "ubuntu-2004" }
25622562
display_name: "Load Balancer ${version} ${auth} ${ssl} ${os}"
25632563
tasks:
25642564
- name: "test-load-balancer-netstandard20"
@@ -2626,7 +2626,7 @@ buildvariants:
26262626

26272627
# CSFLE tests
26282628
- matrix_name: "csfle-with-mocked-kms-tests-windows"
2629-
matrix_spec: { os: "windows-64", ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "rapid", "latest"], topology: ["replicaset"] }
2629+
matrix_spec: { os: "windows-64", ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] }
26302630
display_name: "CSFLE Mocked KMS ${version} ${os}"
26312631
tasks:
26322632
- name: test-csfle-with-mocked-kms-tls-net472
@@ -2646,7 +2646,7 @@ buildvariants:
26462646
- name: test-csfle-with-mongocryptd-netstandard21
26472647

26482648
- matrix_name: "csfle-with-mocked-kms-tests-linux-2004"
2649-
matrix_spec: { os: "ubuntu-2004", ssl: "nossl", version: ["7.0", "rapid", "latest"], topology: ["replicaset"] }
2649+
matrix_spec: { os: "ubuntu-2004", ssl: "nossl", version: ["7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] }
26502650
display_name: "CSFLE Mocked KMS ${version} ${os}"
26512651
tasks:
26522652
- name: test-csfle-with-mocked-kms-tls-netstandard20
@@ -2655,7 +2655,7 @@ buildvariants:
26552655
- name: test-csfle-with-mongocryptd-netstandard21
26562656

26572657
- matrix_name: "csfle-with-mocked-kms-tests-macOS"
2658-
matrix_spec: { os: ["macos-14", "macos-14-arm64"], ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "rapid", "latest"], topology: ["replicaset"] }
2658+
matrix_spec: { os: ["macos-14", "macos-14-arm64"], ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] }
26592659
display_name: "CSFLE Mocked KMS ${version} ${os}"
26602660
tasks:
26612661
- name: test-csfle-with-mocked-kms-tls-netstandard21
@@ -2679,7 +2679,7 @@ buildvariants:
26792679

26802680
# Smoke tests
26812681
- matrix_name: "smoke-tests-windows"
2682-
matrix_spec: { os: "windows-64", ssl: "nossl", version: ["5.0", "6.0", "7.0", "latest"], topology: ["replicaset"] }
2682+
matrix_spec: { os: "windows-64", ssl: "nossl", version: ["5.0", "6.0", "7.0", "8.0", "latest"], topology: ["replicaset"] }
26832683
display_name: "smoke-tests ${version} ${os}"
26842684
batchtime: 1440 # 1 day
26852685
tasks:
@@ -2691,7 +2691,7 @@ buildvariants:
26912691
- name: test-smoke-tests-net80
26922692

26932693
- matrix_name: "smoke-tests-linux"
2694-
matrix_spec: { os: "ubuntu-2004", ssl: "nossl", version: ["5.0", "6.0", "7.0", "latest"], topology: ["replicaset"] }
2694+
matrix_spec: { os: "ubuntu-2004", ssl: "nossl", version: ["5.0", "6.0", "7.0", "8.0", "latest"], topology: ["replicaset"] }
26952695
display_name: "smoke-tests ${version} ${os}"
26962696
batchtime: 1440 # 1 day
26972697
tasks:
@@ -2702,7 +2702,7 @@ buildvariants:
27022702
- name: test-smoke-tests-net80
27032703

27042704
- matrix_name: "smoke-tests-macOS"
2705-
matrix_spec: { os: "macos-14", ssl: "nossl", version: ["5.0", "6.0", "7.0", "latest"], topology: ["replicaset"] }
2705+
matrix_spec: { os: "macos-14", ssl: "nossl", version: ["5.0", "6.0", "7.0", "8.0", "latest"], topology: ["replicaset"] }
27062706
display_name: "smoke-tests ${version} ${os}"
27072707
batchtime: 1440 # 1 day
27082708
tasks:
@@ -2796,7 +2796,7 @@ buildvariants:
27962796
batchtime: 720 # 12 hours
27972797
matrix_spec:
27982798
os: ["ubuntu-2004", "windows-64"]
2799-
version: ["4.2", "7.0", "latest"]
2799+
version: ["4.2", "8.0", "latest"]
28002800
exclude_spec:
28012801
# We do not have MongoDB 4.2 binaries for Ubuntu 2004
28022802
- os: "ubuntu-2004"

specifications/auth/tests/legacy/connection-string.json

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -163,47 +163,6 @@
163163
"uri": "mongodb://localhost/?authMechanism=GSSAPI",
164164
"valid": false
165165
},
166-
{
167-
"description": "should recognize the mechanism (MONGODB-CR)",
168-
"uri": "mongodb://user:password@localhost/?authMechanism=MONGODB-CR",
169-
"valid": true,
170-
"credential": {
171-
"username": "user",
172-
"password": "password",
173-
"source": "admin",
174-
"mechanism": "MONGODB-CR",
175-
"mechanism_properties": null
176-
}
177-
},
178-
{
179-
"description": "should use the database when no authSource is specified (MONGODB-CR)",
180-
"uri": "mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR",
181-
"valid": true,
182-
"credential": {
183-
"username": "user",
184-
"password": "password",
185-
"source": "foo",
186-
"mechanism": "MONGODB-CR",
187-
"mechanism_properties": null
188-
}
189-
},
190-
{
191-
"description": "should use the authSource when specified (MONGODB-CR)",
192-
"uri": "mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR&authSource=bar",
193-
"valid": true,
194-
"credential": {
195-
"username": "user",
196-
"password": "password",
197-
"source": "bar",
198-
"mechanism": "MONGODB-CR",
199-
"mechanism_properties": null
200-
}
201-
},
202-
{
203-
"description": "should throw an exception if no username is supplied (MONGODB-CR)",
204-
"uri": "mongodb://localhost/?authMechanism=MONGODB-CR",
205-
"valid": false
206-
},
207166
{
208167
"description": "should recognize the mechanism (MONGODB-X509)",
209168
"uri": "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509",

specifications/auth/tests/legacy/connection-string.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -116,36 +116,6 @@ tests:
116116
- description: should throw an exception if no username (GSSAPI)
117117
uri: mongodb://localhost/?authMechanism=GSSAPI
118118
valid: false
119-
- description: should recognize the mechanism (MONGODB-CR)
120-
uri: mongodb://user:password@localhost/?authMechanism=MONGODB-CR
121-
valid: true
122-
credential:
123-
username: user
124-
password: password
125-
source: admin
126-
mechanism: MONGODB-CR
127-
mechanism_properties:
128-
- description: should use the database when no authSource is specified (MONGODB-CR)
129-
uri: mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR
130-
valid: true
131-
credential:
132-
username: user
133-
password: password
134-
source: foo
135-
mechanism: MONGODB-CR
136-
mechanism_properties:
137-
- description: should use the authSource when specified (MONGODB-CR)
138-
uri: mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR&authSource=bar
139-
valid: true
140-
credential:
141-
username: user
142-
password: password
143-
source: bar
144-
mechanism: MONGODB-CR
145-
mechanism_properties:
146-
- description: should throw an exception if no username is supplied (MONGODB-CR)
147-
uri: mongodb://localhost/?authMechanism=MONGODB-CR
148-
valid: false
149119
- description: should recognize the mechanism (MONGODB-X509)
150120
uri: mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509
151121
valid: true

specifications/connection-string/tests/valid-auth.json

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -220,29 +220,8 @@
220220
"options": null
221221
},
222222
{
223-
"description": "Escaped user info and database (MONGODB-CR)",
224-
"uri": "mongodb://%24am:f%3Azzb%40z%2Fz%[email protected]/admin%3F?authMechanism=MONGODB-CR",
225-
"valid": true,
226-
"warning": false,
227-
"hosts": [
228-
{
229-
"type": "ipv4",
230-
"host": "127.0.0.1",
231-
"port": null
232-
}
233-
],
234-
"auth": {
235-
"username": "$am",
236-
"password": "f:zzb@z/z=",
237-
"db": "admin?"
238-
},
239-
"options": {
240-
"authmechanism": "MONGODB-CR"
241-
}
242-
},
243-
{
244-
"description": "Subdelimiters in user/pass don't need escaping (MONGODB-CR)",
245-
"uri": "mongodb://!$&'()*+,;=:!$&'()*+,;[email protected]/admin?authMechanism=MONGODB-CR",
223+
"description": "Subdelimiters in user/pass don't need escaping (PLAIN)",
224+
"uri": "mongodb://!$&'()*+,;=:!$&'()*+,;[email protected]/admin?authMechanism=PLAIN",
246225
"valid": true,
247226
"warning": false,
248227
"hosts": [
@@ -258,7 +237,7 @@
258237
"db": "admin"
259238
},
260239
"options": {
261-
"authmechanism": "MONGODB-CR"
240+
"authmechanism": "PLAIN"
262241
}
263242
},
264243
{

specifications/connection-string/tests/valid-auth.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -173,24 +173,8 @@ tests:
173173
db: "my=db"
174174
options: ~
175175
-
176-
description: "Escaped user info and database (MONGODB-CR)"
177-
uri: "mongodb://%24am:f%3Azzb%40z%2Fz%[email protected]/admin%3F?authMechanism=MONGODB-CR"
178-
valid: true
179-
warning: false
180-
hosts:
181-
-
182-
type: "ipv4"
183-
host: "127.0.0.1"
184-
port: ~
185-
auth:
186-
username: "$am"
187-
password: "f:zzb@z/z="
188-
db: "admin?"
189-
options:
190-
authmechanism: "MONGODB-CR"
191-
-
192-
description: "Subdelimiters in user/pass don't need escaping (MONGODB-CR)"
193-
uri: "mongodb://!$&'()*+,;=:!$&'()*+,;[email protected]/admin?authMechanism=MONGODB-CR"
176+
description: "Subdelimiters in user/pass don't need escaping (PLAIN)"
177+
uri: "mongodb://!$&'()*+,;=:!$&'()*+,;[email protected]/admin?authMechanism=PLAIN"
194178
valid: true
195179
warning: false
196180
hosts:
@@ -203,7 +187,7 @@ tests:
203187
password: "!$&'()*+,;="
204188
db: "admin"
205189
options:
206-
authmechanism: "MONGODB-CR"
190+
authmechanism: "PLAIN"
207191
-
208192
description: "Escaped username (MONGODB-X509)"
209193
uri: "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509"

specifications/connection-string/tests/valid-options.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"tests": [
33
{
44
"description": "Option names are normalized to lowercase",
5-
"uri": "mongodb://alice:[email protected]/admin?AUTHMechanism=MONGODB-CR",
5+
"uri": "mongodb://alice:[email protected]/admin?AUTHMechanism=PLAIN",
66
"valid": true,
77
"warning": false,
88
"hosts": [
@@ -18,7 +18,7 @@
1818
"db": "admin"
1919
},
2020
"options": {
21-
"authmechanism": "MONGODB-CR"
21+
"authmechanism": "PLAIN"
2222
}
2323
},
2424
{

0 commit comments

Comments
 (0)