Skip to content

Commit 2e87da0

Browse files
committed
Merge branch 'master' into experiment-any-mongo
2 parents 8de46c8 + af4285f commit 2e87da0

File tree

112 files changed

+4663
-2321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+4663
-2321
lines changed

.evergreen/config.yml

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ functions:
195195

196196
run-tests:
197197
- command: subprocess.exec
198-
type: test
199198
params:
200199
binary: bash
201200
env:
@@ -204,6 +203,7 @@ functions:
204203
args: [*task-runner, setup-test]
205204
- command: subprocess.exec
206205
type: test
206+
retry_on_failure: true
207207
params:
208208
binary: bash
209209
args: [*task-runner, "${DEFAULT_TASK}" ]
@@ -219,28 +219,6 @@ functions:
219219
HEAD_SHA: "${github_commit}"
220220
args: [*task-runner, api-report]
221221

222-
"add PR labels":
223-
- command: subprocess.exec
224-
type: test
225-
params:
226-
binary: bash
227-
add_expansions_to_env: true
228-
env:
229-
COMMIT: "${github_commit}"
230-
PR_TASK: apply-labels
231-
args: [*task-runner, pr-task]
232-
233-
"add PR reviewer":
234-
- command: subprocess.exec
235-
type: test
236-
params:
237-
binary: bash
238-
add_expansions_to_env: true
239-
env:
240-
COMMIT: "${github_commit}"
241-
PR_TASK: assign-reviewer
242-
args: [*task-runner, pr-task]
243-
244222
"backport pr":
245223
- command: subprocess.exec
246224
type: test
@@ -285,12 +263,21 @@ functions:
285263
echo "Response Body: $response_body"
286264
echo "HTTP Status: $http_status"
287265
266+
send-perf-pr-comment:
267+
- command: subprocess.exec
268+
type: test
269+
params:
270+
binary: bash
271+
env:
272+
VERSION_ID: ${version_id}
273+
include_expansions_in_env: [PERF_URI_PRIVATE_ENDPOINT]
274+
args: [*task-runner, perf-pr-comment]
275+
288276
run-enterprise-auth-tests:
289277
- command: ec2.assume_role
290278
params:
291279
role_arn: "${aws_test_secrets_role}"
292280
- command: subprocess.exec
293-
type: test
294281
params:
295282
binary: bash
296283
include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
@@ -299,6 +286,7 @@ functions:
299286
args: [*task-runner, setup-test]
300287
- command: subprocess.exec
301288
type: test
289+
retry_on_failure: true
302290
params:
303291
binary: bash
304292
args: [*task-runner, --silent, evg-test-enterprise-auth]
@@ -308,7 +296,6 @@ functions:
308296
params:
309297
role_arn: "${aws_test_secrets_role}"
310298
- command: subprocess.exec
311-
type: test
312299
params:
313300
binary: bash
314301
include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
@@ -317,6 +304,7 @@ functions:
317304
args: [*task-runner, setup-test]
318305
- command: subprocess.exec
319306
type: test
307+
retry_on_failure: true
320308
params:
321309
binary: bash
322310
args: [*task-runner, --silent, evg-test-enterprise-auth]
@@ -326,7 +314,6 @@ functions:
326314
params:
327315
role_arn: "${aws_test_secrets_role}"
328316
- command: subprocess.exec
329-
type: test
330317
params:
331318
binary: bash
332319
include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
@@ -335,13 +322,13 @@ functions:
335322
args: [*task-runner, setup-test]
336323
- command: subprocess.exec
337324
type: test
325+
retry_on_failure: true
338326
params:
339327
binary: bash
340328
args: [*task-runner, test-atlas-connect]
341329

342330
run-ocsp-test:
343331
- command: subprocess.exec
344-
type: test
345332
params:
346333
binary: bash
347334
env:
@@ -352,14 +339,14 @@ functions:
352339
args: [*task-runner, setup-test]
353340
- command: subprocess.exec
354341
type: test
342+
retry_on_failure: true
355343
params:
356344
binary: bash
357345
include_expansions_in_env: [OCSP_TLS_SHOULD_SUCCEED]
358346
args: [*task-runner, evg-test-ocsp]
359347

360348
run-versioned-api-test:
361349
- command: subprocess.exec
362-
type: test
363350
params:
364351
binary: bash
365352
env:
@@ -369,13 +356,13 @@ functions:
369356
args: [*task-runner, setup-test]
370357
- command: subprocess.exec
371358
type: test
359+
retry_on_failure: true
372360
params:
373361
binary: bash
374362
args: [*task-runner, evg-test-versioned-api]
375363

376364
run-load-balancer-tests:
377365
- command: subprocess.exec
378-
type: test
379366
params:
380367
binary: bash
381368
include_expansions_in_env: [SINGLE_MONGOS_LB_URI, MULTI_MONGOS_LB_URI, AUTH, SSL, MONGO_GO_DRIVER_COMPRESSOR]
@@ -384,13 +371,13 @@ functions:
384371
args: [*task-runner, setup-test]
385372
- command: subprocess.exec
386373
type: test
374+
retry_on_failure: true
387375
params:
388376
binary: bash
389377
args: [*task-runner, evg-test-load-balancers]
390378

391379
run-atlas-data-lake-test:
392380
- command: subprocess.exec
393-
type: test
394381
params:
395382
binary: "bash"
396383
env:
@@ -401,6 +388,7 @@ functions:
401388
args: [*task-runner, setup-test]
402389
- command: subprocess.exec
403390
type: test
391+
retry_on_failure: true
404392
params:
405393
binary: "bash"
406394
args: [*task-runner, evg-test-atlas-data-lake]
@@ -572,7 +560,6 @@ functions:
572560

573561
run-kms-tls-test:
574562
- command: subprocess.exec
575-
type: test
576563
params:
577564
binary: "bash"
578565
env:
@@ -582,14 +569,14 @@ functions:
582569
args: [*task-runner, setup-test]
583570
- command: subprocess.exec
584571
type: test
572+
retry_on_failure: true
585573
params:
586574
binary: "bash"
587575
include_expansions_in_env: [KMS_TLS_TESTCASE]
588576
args: [*task-runner, evg-test-kms]
589577

590578
run-kmip-tests:
591579
- command: subprocess.exec
592-
type: test
593580
params:
594581
binary: "bash"
595582
env:
@@ -599,6 +586,7 @@ functions:
599586
args: [*task-runner, setup-test]
600587
- command: subprocess.exec
601588
type: test
589+
retry_on_failure: true
602590
params:
603591
binary: "bash"
604592
env:
@@ -607,7 +595,6 @@ functions:
607595

608596
run-retry-kms-requests:
609597
- command: subprocess.exec
610-
type: test
611598
params:
612599
binary: "bash"
613600
env:
@@ -617,6 +604,7 @@ functions:
617604
args: [*task-runner, setup-test]
618605
- command: subprocess.exec
619606
type: test
607+
retry_on_failure: true
620608
params:
621609
binary: "bash"
622610
env:
@@ -659,8 +647,6 @@ tasks:
659647
allowed_requesters: ["patch", "github_pr"]
660648
commands:
661649
- func: assume-test-secrets-ec2-role
662-
- func: "add PR reviewer"
663-
- func: "add PR labels"
664650
- func: "create-api-report"
665651

666652
- name: backport-pr
@@ -684,6 +670,7 @@ tasks:
684670
binary: bash
685671
args: [*task-runner, driver-benchmark]
686672
- func: send-perf-data
673+
- func: send-perf-pr-comment
687674

688675
- name: test-standalone-noauth-nossl
689676
tags: ["test", "standalone"]

.github/labeler.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
21
priority-3-low:
32
- changed-files:
43
- any-glob-to-any-file: '*'
54

65
documentation:
76
- changed-files:
8-
- any-glob-to-any-file:
7+
- any-glob-to-any-file:
98
- docs/**
109
- examples/**
1110

1211
dependencies:
1312
- changed-files:
14-
- any-glob-to-any-file:
13+
- any-glob-to-any-file:
1514
- go.mod

.github/release.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@ changelog:
22
exclude:
33
labels:
44
- ignore-for-release
5+
- github_actions
56
- submodules
67
authors:
78
- mongodb-drivers-pr-bot
89
categories:
9-
- title: Breaking Changes 🛠
10+
- title: ⚠️ Breaking Changes
1011
labels:
11-
- breaking-change
12-
- title: New Features
12+
- breaking
13+
- title: New Features
1314
labels:
1415
- enhancement
15-
- title: Fixed
16+
- feature
17+
- title: 🐛 Fixed
1618
labels:
1719
- bug
18-
- fixed
19-
- title: Other Changes
20+
- title: 📦 Dependency Updates
21+
labels:
22+
- dependencies
23+
- title: 📝 Other Changes
2024
labels:
2125
- "*"

.github/reviewers.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/check-labels.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Label Checker
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
- reopened
8+
- labeled
9+
- unlabeled
10+
11+
jobs:
12+
check_labels:
13+
name: Check labels
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: docker://agilepathway/pull-request-label-checker:latest
17+
with:
18+
one_of: bug,feature,enhancement,documentation,dependencies
19+
repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/labeler.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: "Pull Request Labeler"
2+
on:
3+
- pull_request_target
4+
5+
jobs:
6+
labeler:
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/labeler@v5

Taskfile.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ tasks:
7070

7171
pr-task: bash etc/pr-task.sh
7272

73+
perf-pr-comment: bash etc/perf-pr-comment.sh
74+
7375
# Lint with various GOOS and GOARCH tasks to catch static analysis failures that may only affect
7476
# specific operating systems or architectures. For example, staticcheck will only check for 64-bit
7577
# alignment of atomically accessed variables on 32-bit architectures (see

bson/benchmark_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ var nestedInstance = nestedtest1{
147147
const extendedBSONDir = "../testdata/extended_bson"
148148

149149
var (
150-
extJSONFiles map[string]map[string]interface{}
150+
extJSONFiles map[string]map[string]any
151151
extJSONFilesMu sync.Mutex
152152
)
153153

154154
// readExtJSONFile reads the GZIP-compressed extended JSON document from the given filename in the
155155
// "extended BSON" test data directory (../testdata/extended_bson) and returns it as a
156-
// map[string]interface{}. It panics on any errors.
157-
func readExtJSONFile(filename string) map[string]interface{} {
156+
// map[string]any. It panics on any errors.
157+
func readExtJSONFile(filename string) map[string]any {
158158
extJSONFilesMu.Lock()
159159
defer extJSONFilesMu.Unlock()
160160
if v, ok := extJSONFiles[filename]; ok {
@@ -182,14 +182,14 @@ func readExtJSONFile(filename string) map[string]interface{} {
182182
panic(fmt.Sprintf("error reading GZIP contents of file: %s", err))
183183
}
184184

185-
var v map[string]interface{}
185+
var v map[string]any
186186
err = UnmarshalExtJSON(data, false, &v)
187187
if err != nil {
188188
panic(fmt.Sprintf("error unmarshalling extended JSON: %s", err))
189189
}
190190

191191
if extJSONFiles == nil {
192-
extJSONFiles = make(map[string]map[string]interface{})
192+
extJSONFiles = make(map[string]map[string]any)
193193
}
194194
extJSONFiles[filename] = v
195195
return v

0 commit comments

Comments
 (0)