Skip to content

Commit f0bc695

Browse files
matthewdalematthewdale
committed
Merge branch 'master' into feature/godriver-3544-metadata-on-demand
2 parents 8d6b75d + f01f780 commit f0bc695

Some content is hidden

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

43 files changed

+612
-366
lines changed

‎.evergreen/config.yml‎

Lines changed: 25 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ functions:
198198
params:
199199
binary: bash
200200
env:
201-
GO_BUILD_TAGS: cse
201+
GO_BUILD_TAGS: "cse,mongointernal"
202202
include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "SKIP_CSOT_TESTS", "MONGODB_URI", "CRYPT_SHARED_LIB_PATH", "SKIP_CRYPT_SHARED_LIB", "RACE", "MONGO_GO_DRIVER_COMPRESSOR", "REQUIRE_API_VERSION", "LOAD_BALANCER"]
203203
args: [*task-runner, setup-test]
204204
- command: subprocess.exec
@@ -379,23 +379,6 @@ functions:
379379
binary: bash
380380
args: [*task-runner, evg-test-load-balancers]
381381

382-
run-atlas-data-lake-test:
383-
- command: subprocess.exec
384-
params:
385-
binary: "bash"
386-
env:
387-
AUTH: auth
388-
SSL: nossl
389-
TOPOLOGY: server
390-
MONGODB_URI: "mongodb://mhuser:pencil@localhost"
391-
args: [*task-runner, setup-test]
392-
- command: subprocess.exec
393-
type: test
394-
retry_on_failure: true
395-
params:
396-
binary: "bash"
397-
args: [*task-runner, evg-test-atlas-data-lake]
398-
399382
run-docker-test:
400383
- command: subprocess.exec
401384
type: test
@@ -642,6 +625,7 @@ tasks:
642625
tags: ["static-analysis"]
643626
commands:
644627
- command: subprocess.exec
628+
type: test
645629
params:
646630
binary: bash
647631
args: [*task-runner, govulncheck]
@@ -1161,11 +1145,6 @@ tasks:
11611145
OCSP_ALGORITHM: "ecdsa"
11621146
OCSP_TLS_SHOULD_SUCCEED: "false"
11631147

1164-
- name: test-atlas-data-lake
1165-
commands:
1166-
- func: bootstrap-mongohoused
1167-
- func: run-atlas-data-lake-test
1168-
11691148
- name: test-docker-runner
11701149
commands:
11711150
- func: bootstrap-mongo-orchestration
@@ -1785,7 +1764,7 @@ axes:
17851764
- windows-vsCurrent-small
17861765
variables:
17871766
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1788-
GO_DIST: "C:\\golang\\go1.23"
1767+
GO_DIST: "C:\\golang\\go1.25"
17891768
VENV_BIN_DIR: "Scripts"
17901769
DEFAULT_TASK: evg-test
17911770
# CSOT tests are unreliable on our slow Windows hosts.
@@ -1794,14 +1773,14 @@ axes:
17941773
display_name: "RHEL 8.7"
17951774
run_on: rhel8.7-large
17961775
variables:
1797-
GO_DIST: "/opt/golang/go1.23"
1776+
GO_DIST: "/opt/golang/go1.25"
17981777
DEFAULT_TASK: evg-test
17991778
- id: "macos"
18001779
display_name: "MacOS 14.0"
18011780
run_on: macos-14
18021781
batchtime: 1440 # Run at most once per 24 hours.
18031782
variables:
1804-
GO_DIST: "/opt/golang/go1.23"
1783+
GO_DIST: "/opt/golang/go1.25"
18051784
DEFAULT_TASK: evg-test-load-balancers
18061785
# CSOT tests are unreliable on our slow macOS hosts.
18071786
SKIP_CSOT_TESTS: true
@@ -1816,7 +1795,7 @@ axes:
18161795
- windows-vsCurrent-small
18171796
variables:
18181797
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1819-
GO_DIST: "C:\\golang\\go1.23"
1798+
GO_DIST: "C:\\golang\\go1.25"
18201799
VENV_BIN_DIR: "Scripts"
18211800
DEFAULT_TASK: evg-test
18221801
# CSOT tests are unreliable on our slow Windows hosts.
@@ -1825,14 +1804,14 @@ axes:
18251804
display_name: "RHEL 8.7"
18261805
run_on: rhel8.7-large
18271806
variables:
1828-
GO_DIST: "/opt/golang/go1.23"
1807+
GO_DIST: "/opt/golang/go1.25"
18291808
DEFAULT_TASK: evg-test
18301809
- id: "macos"
18311810
display_name: "MacOS 14.0"
18321811
run_on: macos-14
18331812
batchtime: 1440 # Run at most once per 24 hours.
18341813
variables:
1835-
GO_DIST: "/opt/golang/go1.23"
1814+
GO_DIST: "/opt/golang/go1.25"
18361815
DEFAULT_TASK: evg-test-load-balancers
18371816
# CSOT tests are unreliable on our slow macOS hosts.
18381817
SKIP_CSOT_TESTS: true
@@ -1844,7 +1823,7 @@ axes:
18441823
display_name: "RHEL 8.7"
18451824
run_on: rhel8.7-large
18461825
variables:
1847-
GO_DIST: "/opt/golang/go1.23"
1826+
GO_DIST: "/opt/golang/go1.25"
18481827
DEFAULT_TASK: evg-test
18491828

18501829
- id: os-aws-auth
@@ -1856,7 +1835,7 @@ axes:
18561835
- windows-vsCurrent-small
18571836
variables:
18581837
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1859-
GO_DIST: "C:\\golang\\go1.23"
1838+
GO_DIST: "C:\\golang\\go1.25"
18601839
SKIP_ECS_AUTH_TEST: true
18611840
DEFAULT_TASK: evg-test
18621841
# CSOT tests are unreliable on our slow Windows hosts.
@@ -1865,14 +1844,14 @@ axes:
18651844
display_name: "Ubuntu 20.04"
18661845
run_on: ubuntu2004-test
18671846
variables:
1868-
GO_DIST: "/opt/golang/go1.23"
1847+
GO_DIST: "/opt/golang/go1.25"
18691848
DEFAULT_TASK: evg-test
18701849
- id: "macos"
18711850
display_name: "MacOS 14.0"
18721851
run_on: macos-14
18731852
batchtime: 1440 # Run at most once per 24 hours.
18741853
variables:
1875-
GO_DIST: "/opt/golang/go1.23"
1854+
GO_DIST: "/opt/golang/go1.25"
18761855
SKIP_ECS_AUTH_TEST: true
18771856
SKIP_EC2_AUTH_TEST: true
18781857
SKIP_WEB_IDENTITY_AUTH_TEST: true
@@ -1887,7 +1866,7 @@ axes:
18871866
display_name: "RHEL 8.7"
18881867
run_on: rhel8.7-large
18891868
variables:
1890-
GO_DIST: "/opt/golang/go1.23"
1869+
GO_DIST: "/opt/golang/go1.25"
18911870

18921871
task_groups:
18931872
- name: testgcpkms_task_group
@@ -2119,7 +2098,7 @@ buildvariants:
21192098
- rhel8.7-small
21202099
expansions:
21212100
# Keep this in sync with go version used in etc/golangci-lint.sh
2122-
GO_DIST: "/opt/golang/go1.23"
2101+
GO_DIST: "/opt/golang/go1.25"
21232102
tasks:
21242103
- name: ".static-analysis"
21252104

@@ -2129,7 +2108,7 @@ buildvariants:
21292108
run_on:
21302109
- rhel8.7-small
21312110
expansions:
2132-
GO_DIST: "/opt/golang/go1.23"
2111+
GO_DIST: "/opt/golang/go1.25"
21332112
tasks:
21342113
- name: "pull-request-helpers"
21352114

@@ -2138,7 +2117,7 @@ buildvariants:
21382117
display_name: "Performance"
21392118
run_on: rhel90-dbx-perf-large
21402119
expansions:
2141-
GO_DIST: "/opt/golang/go1.23"
2120+
GO_DIST: "/opt/golang/go1.25"
21422121
tasks:
21432122
- name: ".performance"
21442123

@@ -2148,7 +2127,7 @@ buildvariants:
21482127
run_on:
21492128
- ubuntu2204-small
21502129
expansions:
2151-
GO_DIST: "/opt/golang/go1.23"
2130+
GO_DIST: "/opt/golang/go1.25"
21522131
tasks:
21532132
- name: ".compile-check"
21542133

@@ -2157,7 +2136,7 @@ buildvariants:
21572136
run_on:
21582137
- rhel8.7-small
21592138
expansions:
2160-
GO_DIST: "/opt/golang/go1.23"
2139+
GO_DIST: "/opt/golang/go1.25"
21612140
tasks:
21622141
- name: "backport-pr"
21632142

@@ -2167,27 +2146,17 @@ buildvariants:
21672146
run_on:
21682147
- rhel8.7-large
21692148
expansions:
2170-
GO_DIST: "/opt/golang/go1.23"
2149+
GO_DIST: "/opt/golang/go1.25"
21712150
tasks:
21722151
- name: "atlas-test"
21732152

2174-
- name: atlas-data-lake-test
2175-
tags: ["pullrequest"]
2176-
display_name: "Atlas Data Lake Test"
2177-
run_on:
2178-
- ubuntu2004-large
2179-
expansions:
2180-
GO_DIST: "/opt/golang/go1.23"
2181-
tasks:
2182-
- name: "test-atlas-data-lake"
2183-
21842153
- name: docker-runner-test
21852154
tags: ["pullrequest"]
21862155
display_name: "Docker Runner Test"
21872156
run_on:
21882157
- ubuntu2204-large
21892158
expansions:
2190-
GO_DIST: "/opt/golang/go1.23"
2159+
GO_DIST: "/opt/golang/go1.25"
21912160
tasks:
21922161
- name: "test-docker-runner"
21932162

@@ -2197,7 +2166,7 @@ buildvariants:
21972166
run_on:
21982167
- ubuntu2204-large
21992168
expansions:
2200-
GO_DIST: "/opt/golang/go1.23"
2169+
GO_DIST: "/opt/golang/go1.25"
22012170
tasks:
22022171
- name: ".goleak"
22032172

@@ -2344,7 +2313,7 @@ buildvariants:
23442313
run_on:
23452314
- rhel8.7-small
23462315
expansions:
2347-
GO_DIST: "/opt/golang/go1.23"
2316+
GO_DIST: "/opt/golang/go1.25"
23482317
tasks:
23492318
- name: testgcpkms_task_group
23502319
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
@@ -2355,7 +2324,7 @@ buildvariants:
23552324
run_on:
23562325
- rhel8.7-small
23572326
expansions:
2358-
GO_DIST: "/opt/golang/go1.23"
2327+
GO_DIST: "/opt/golang/go1.25"
23592328
tasks:
23602329
- testawskms-task
23612330
- testawskms-fail-task
@@ -2365,7 +2334,7 @@ buildvariants:
23652334
run_on:
23662335
- rhel8.7-small
23672336
expansions:
2368-
GO_DIST: "/opt/golang/go1.23"
2337+
GO_DIST: "/opt/golang/go1.25"
23692338
tasks:
23702339
- name: testazurekms_task_group
23712340
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
@@ -2376,7 +2345,7 @@ buildvariants:
23762345
run_on:
23772346
- ubuntu2204-small
23782347
expansions:
2379-
GO_DIST: "/opt/golang/go1.23"
2348+
GO_DIST: "/opt/golang/go1.25"
23802349
tasks:
23812350
- name: testoidc_task_group
23822351
- name: testazureoidc_task_group

‎.github/workflows/check-labels.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
steps:
1616
- uses: docker://agilepathway/pull-request-label-checker:latest
1717
with:
18-
one_of: bug,feature,enhancement,documentation,dependencies
18+
one_of: bug,feature,enhancement,documentation,dependencies,ignore-for-release
1919
repo_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
# Initializes the CodeQL tools for scanning.
4040
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@v3
41+
uses: github/codeql-action/init@v4
4242
with:
4343
languages: go
4444
build-mode: manual
@@ -50,6 +50,6 @@ jobs:
5050
run: task build
5151

5252
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@v3
53+
uses: github/codeql-action/analyze@v4
5454
with:
5555
category: "/language:go"

‎.github/workflows/create-release-branch.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ jobs:
3333
outputs:
3434
version: ${{ steps.pre-publish.outputs.version }}
3535
steps:
36-
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v2
36+
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v3
3737
with:
3838
app_id: ${{ vars.APP_ID }}
3939
private_key: ${{ secrets.APP_PRIVATE_KEY }}
40-
- uses: mongodb-labs/drivers-github-tools/setup@v2
40+
- uses: mongodb-labs/drivers-github-tools/setup@v3
4141
with:
4242
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
4343
aws_region_name: ${{ vars.AWS_REGION_NAME }}
4444
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
4545
artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }}
46-
- uses: mongodb-labs/drivers-github-tools/create-branch@v2
46+
- uses: mongodb-labs/drivers-github-tools/create-branch@v3
4747
id: create-branch
4848
with:
4949
branch_name: ${{ inputs.branch_name }}

‎.github/workflows/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v6

‎.github/workflows/merge-up.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v2
20+
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v3
2121
with:
2222
app_id: ${{ vars.PR_APP_ID }}
2323
private_key: ${{ secrets.PR_APP_PRIVATE_KEY }}

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ jobs:
3333
outputs:
3434
prev_version: ${{ steps.pre-publish.outputs.prev_version }}
3535
steps:
36-
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v2
36+
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v3
3737
with:
3838
app_id: ${{ vars.APP_ID }}
3939
private_key: ${{ secrets.APP_PRIVATE_KEY }}
40-
- uses: mongodb-labs/drivers-github-tools/setup@v2
40+
- uses: mongodb-labs/drivers-github-tools/setup@v3
4141
with:
4242
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
4343
aws_region_name: ${{ vars.AWS_REGION_NAME }}
4444
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
4545
artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }}
4646
- name: Pre Publish
4747
id: pre-publish
48-
uses: mongodb-labs/drivers-github-tools/golang/pre-publish@v2
48+
uses: mongodb-labs/drivers-github-tools/golang/pre-publish@v3
4949
with:
5050
version: ${{ inputs.version }}
5151
push_changes: ${{ inputs.push_changes }}
@@ -68,18 +68,18 @@ jobs:
6868
contents: write
6969
security-events: read
7070
steps:
71-
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v2
71+
- uses: mongodb-labs/drivers-github-tools/secure-checkout@v3
7272
with:
7373
app_id: ${{ vars.APP_ID }}
7474
private_key: ${{ secrets.APP_PRIVATE_KEY }}
75-
- uses: mongodb-labs/drivers-github-tools/setup@v2
75+
- uses: mongodb-labs/drivers-github-tools/setup@v3
7676
with:
7777
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
7878
aws_region_name: ${{ vars.AWS_REGION_NAME }}
7979
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
8080
artifactory_username: ${{ vars.ARTIFACTORY_USERNAME }}
8181
- name: Publish
82-
uses: mongodb-labs/drivers-github-tools/golang/publish@v2
82+
uses: mongodb-labs/drivers-github-tools/golang/publish@v3
8383
with:
8484
version: ${{ inputs.version }}
8585
silk_asset_group: ${{ env.SILK_ASSET_GROUP }}

‎.github/workflows/scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
persist-credentials: false
4040

4141
- name: "Run analysis"
42-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
42+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
4343
with:
4444
results_file: results.sarif
4545
results_format: sarif
@@ -73,6 +73,6 @@ jobs:
7373
# Upload the results to GitHub's code scanning dashboard (optional).
7474
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7575
- name: "Upload to code-scanning"
76-
uses: github/codeql-action/upload-sarif@v3
76+
uses: github/codeql-action/upload-sarif@v4
7777
with:
7878
sarif_file: results.sarif

0 commit comments

Comments
 (0)