Skip to content

Commit ac03e73

Browse files
matthewdalematthewdale
authored
GODRIVER-3324 Upgrade CI Go to 1.22 and golangci-lint to 1.59.1. (#1783)
1 parent 56e75b2 commit ac03e73

File tree

80 files changed

+464
-471
lines changed

Some content is hidden

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

80 files changed

+464
-471
lines changed

‎.evergreen/config.yml

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,102 +2090,102 @@ axes:
20902090
- id: os-ssl-32
20912091
display_name: OS
20922092
values:
2093-
- id: "windows-64-go-1-20"
2093+
- id: "windows-64"
20942094
display_name: "Windows 64-bit"
20952095
run_on:
20962096
- windows-vsCurrent-small
20972097
variables:
20982098
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
2099-
GO_DIST: "C:\\golang\\go1.20"
2099+
GO_DIST: "C:\\golang\\go1.22"
21002100
VENV_BIN_DIR: "Scripts"
2101-
- id: "rhel87-64-go-1-20"
2101+
- id: "rhel87-64"
21022102
display_name: "RHEL 8.7"
21032103
run_on: rhel8.7-large
21042104
variables:
2105-
GO_DIST: "/opt/golang/go1.20"
2106-
- id: "macos11-go-1-20"
2105+
GO_DIST: "/opt/golang/go1.22"
2106+
- id: "macos11"
21072107
display_name: "MacOS 11.0"
21082108
run_on: macos-1100
21092109
batchtime: 1440 # Run at most once per 24 hours.
21102110
variables:
2111-
GO_DIST: "/opt/golang/go1.20"
2111+
GO_DIST: "/opt/golang/go1.22"
21122112

21132113
# OSes that require >= 4.0 for SSL
21142114
- id: os-ssl-40
21152115
display_name: OS
21162116
values:
2117-
- id: "windows-64-go-1-20"
2117+
- id: "windows-64"
21182118
display_name: "Windows 64-bit"
21192119
run_on:
21202120
- windows-vsCurrent-small
21212121
variables:
21222122
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
2123-
GO_DIST: "C:\\golang\\go1.20"
2123+
GO_DIST: "C:\\golang\\go1.22"
21242124
VENV_BIN_DIR: "Scripts"
2125-
- id: "rhel87-64-go-1-20"
2125+
- id: "rhel87-64"
21262126
display_name: "RHEL 8.7"
21272127
run_on: rhel8.7-large
21282128
variables:
2129-
GO_DIST: "/opt/golang/go1.20"
2130-
- id: "macos11-go-1-20"
2129+
GO_DIST: "/opt/golang/go1.22"
2130+
- id: "macos11"
21312131
display_name: "MacOS 11.0"
21322132
run_on: macos-1100
21332133
batchtime: 1440 # Run at most once per 24 hours.
21342134
variables:
2135-
GO_DIST: "/opt/golang/go1.20"
2135+
GO_DIST: "/opt/golang/go1.22"
21362136

21372137
- id: ocsp-rhel-87
21382138
display_name: OS
21392139
values:
2140-
- id: "rhel87-go-1-20"
2140+
- id: "rhel87"
21412141
display_name: "RHEL 8.7"
21422142
run_on: rhel8.7-large
21432143
variables:
2144-
GO_DIST: "/opt/golang/go1.20"
2144+
GO_DIST: "/opt/golang/go1.22"
21452145

21462146
- id: os-aws-auth
21472147
display_name: OS
21482148
values:
2149-
- id: "windows-64-vsCurrent-latest-small-go-1-20"
2149+
- id: "windows-64-vsCurrent-latest-small"
21502150
display_name: "Windows 64-bit"
21512151
run_on:
21522152
- windows-vsCurrent-small
21532153
variables:
21542154
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
2155-
GO_DIST: "C:\\golang\\go1.20"
2155+
GO_DIST: "C:\\golang\\go1.22"
21562156
SKIP_ECS_AUTH_TEST: true
2157-
- id: "ubuntu2004-64-go-1-20"
2157+
- id: "ubuntu2004-64"
21582158
display_name: "Ubuntu 20.04"
21592159
run_on: ubuntu2004-test
21602160
variables:
2161-
GO_DIST: "/opt/golang/go1.20"
2162-
- id: "macos11-go-1-20"
2161+
GO_DIST: "/opt/golang/go1.22"
2162+
- id: "macos11"
21632163
display_name: "MacOS 11.0"
21642164
run_on: macos-1100
21652165
batchtime: 1440 # Run at most once per 24 hours.
21662166
variables:
2167-
GO_DIST: "/opt/golang/go1.20"
2167+
GO_DIST: "/opt/golang/go1.22"
21682168
SKIP_ECS_AUTH_TEST: true
21692169
SKIP_EC2_AUTH_TEST: true
21702170
SKIP_WEB_IDENTITY_AUTH_TEST: true
21712171

21722172
- id: os-faas-80
21732173
display_name: OS
21742174
values:
2175-
- id: "rhel87-large-go-1-20"
2175+
- id: "rhel87-large"
21762176
display_name: "RHEL 8.7"
21772177
run_on: rhel8.7-large
21782178
variables:
2179-
GO_DIST: "/opt/golang/go1.20"
2179+
GO_DIST: "/opt/golang/go1.22"
21802180

21812181
- id: os-serverless
21822182
display_name: OS
21832183
values:
2184-
- id: "rhel87-go-1-20"
2184+
- id: "rhel87"
21852185
display_name: "RHEL 8.7"
21862186
run_on: rhel8.7-small
21872187
variables:
2188-
GO_DIST: "/opt/golang/go1.20"
2188+
GO_DIST: "/opt/golang/go1.22"
21892189

21902190
task_groups:
21912191
- name: serverless_task_group
@@ -2470,7 +2470,7 @@ buildvariants:
24702470
run_on:
24712471
- rhel8.7-large
24722472
expansions:
2473-
GO_DIST: "/opt/golang/go1.20"
2473+
GO_DIST: "/opt/golang/go1.22"
24742474
tasks:
24752475
- name: ".static-analysis"
24762476

@@ -2480,7 +2480,7 @@ buildvariants:
24802480
run_on:
24812481
- rhel8.7-small
24822482
expansions:
2483-
GO_DIST: "/opt/golang/go1.20"
2483+
GO_DIST: "/opt/golang/go1.22"
24842484
tasks:
24852485
- name: "pull-request-helpers"
24862486

@@ -2489,7 +2489,7 @@ buildvariants:
24892489
run_on:
24902490
- rhel8.7-large
24912491
expansions:
2492-
GO_DIST: "/opt/golang/go1.20"
2492+
GO_DIST: "/opt/golang/go1.22"
24932493
tasks:
24942494
- name: ".performance"
24952495

@@ -2499,7 +2499,7 @@ buildvariants:
24992499
run_on:
25002500
- rhel8.7-large
25012501
expansions:
2502-
GO_DIST: "/opt/golang/go1.20"
2502+
GO_DIST: "/opt/golang/go1.22"
25032503
tasks:
25042504
- name: ".compile-check"
25052505

@@ -2508,7 +2508,7 @@ buildvariants:
25082508
run_on:
25092509
- rhel8.7-large
25102510
expansions:
2511-
GO_DIST: "/opt/golang/go1.20"
2511+
GO_DIST: "/opt/golang/go1.22"
25122512
tasks:
25132513
- name: "backport-pr"
25142514

@@ -2518,7 +2518,7 @@ buildvariants:
25182518
run_on:
25192519
- rhel8.7-large
25202520
expansions:
2521-
GO_DIST: "/opt/golang/go1.20"
2521+
GO_DIST: "/opt/golang/go1.22"
25222522
tasks:
25232523
- name: "atlas-test"
25242524

@@ -2528,7 +2528,7 @@ buildvariants:
25282528
run_on:
25292529
- ubuntu2004-large
25302530
expansions:
2531-
GO_DIST: "/opt/golang/go1.20"
2531+
GO_DIST: "/opt/golang/go1.22"
25322532
tasks:
25332533
- name: "test-atlas-data-lake"
25342534

@@ -2538,58 +2538,58 @@ buildvariants:
25382538
run_on:
25392539
- ubuntu2204-large
25402540
expansions:
2541-
GO_DIST: "/opt/golang/go1.20"
2541+
GO_DIST: "/opt/golang/go1.22"
25422542
tasks:
25432543
- name: "test-docker-runner"
25442544

25452545
- matrix_name: "tests-rhel-36-with-zlib-support"
25462546
tags: ["pullrequest"]
2547-
matrix_spec: { version: ["3.6"], os-ssl-32: ["rhel87-64-go-1-20"] }
2547+
matrix_spec: { version: ["3.6"], os-ssl-32: ["rhel87-64"] }
25482548
display_name: "${version} ${os-ssl-32}"
25492549
tasks:
25502550
- name: ".test !.enterprise-auth !.snappy !.zstd"
25512551

25522552
- matrix_name: "tests-windows-36-with-zlib-support"
2553-
matrix_spec: { version: ["3.6"], os-ssl-32: ["windows-64-go-1-20"] }
2553+
matrix_spec: { version: ["3.6"], os-ssl-32: ["windows-64"] }
25542554
display_name: "${version} ${os-ssl-32}"
25552555
tasks:
25562556
- name: ".test !.enterprise-auth !.snappy !.zstd"
25572557

25582558
- matrix_name: "tests-rhel-40-with-zlib-support"
25592559
tags: ["pullrequest"]
2560-
matrix_spec: { version: ["4.0"], os-ssl-40: ["rhel87-64-go-1-20"] }
2560+
matrix_spec: { version: ["4.0"], os-ssl-40: ["rhel87-64"] }
25612561
display_name: "${version} ${os-ssl-40}"
25622562
tasks:
25632563
- name: ".test !.enterprise-auth !.snappy !.zstd"
25642564

25652565
- matrix_name: "tests-windows-40-with-zlib-support"
2566-
matrix_spec: { version: ["4.0"], os-ssl-40: ["windows-64-go-1-20"] }
2566+
matrix_spec: { version: ["4.0"], os-ssl-40: ["windows-64"] }
25672567
display_name: "${version} ${os-ssl-40}"
25682568
tasks:
25692569
- name: ".test !.enterprise-auth !.snappy !.zstd"
25702570

25712571
- matrix_name: "tests-rhel-42-plus-zlib-zstd-support"
25722572
tags: ["pullrequest"]
2573-
matrix_spec: { version: ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["rhel87-64-go-1-20"] }
2573+
matrix_spec: { version: ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["rhel87-64"] }
25742574
display_name: "${version} ${os-ssl-40}"
25752575
tasks:
25762576
- name: ".test !.enterprise-auth !.snappy"
25772577

25782578
- matrix_name: "tests-windows-42-plus-zlib-zstd-support"
2579-
matrix_spec: { version: ["4.2", "4.4", "5.0", "6.0", "7.0"], os-ssl-40: ["windows-64-go-1-20"] }
2579+
matrix_spec: { version: ["4.2", "4.4", "5.0", "6.0", "7.0"], os-ssl-40: ["windows-64"] }
25802580
display_name: "${version} ${os-ssl-40}"
25812581
tasks:
25822582
- name: ".test !.enterprise-auth !.snappy"
25832583

25842584
- matrix_name: "tests-windows-80-zlib-zstd-support"
25852585
tags: ["pullrequest"]
2586-
matrix_spec: { version: ["8.0"], os-ssl-40: ["windows-64-go-1-20"] }
2586+
matrix_spec: { version: ["8.0"], os-ssl-40: ["windows-64"] }
25872587
display_name: "${version} ${os-ssl-40}"
25882588
tasks:
25892589
- name: ".test !.enterprise-auth !.snappy"
25902590

25912591
- matrix_name: "tests-latest-zlib-zstd-support"
2592-
matrix_spec: { version: ["latest"], os-ssl-40: ["windows-64-go-1-20", "rhel87-64-go-1-20"] }
2592+
matrix_spec: { version: ["latest"], os-ssl-40: ["windows-64", "rhel87-64"] }
25932593
display_name: "${version} ${os-ssl-40}"
25942594
tasks:
25952595
- name: ".test !.enterprise-auth !.snappy"
@@ -2607,22 +2607,22 @@ buildvariants:
26072607
- name: "aws-auth-test"
26082608

26092609
- matrix_name: "ocsp-test"
2610-
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], ocsp-rhel-87: ["rhel87-go-1-20"] }
2610+
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], ocsp-rhel-87: ["rhel87"] }
26112611
display_name: "OCSP ${version} ${ocsp-rhel-87}"
26122612
batchtime: 20160 # Use a batchtime of 14 days as suggested by the OCSP test README
26132613
tasks:
26142614
- name: ".ocsp"
26152615

26162616
- matrix_name: "ocsp-test-windows"
2617-
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["windows-64-go-1-20"] }
2617+
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["windows-64"] }
26182618
display_name: "OCSP ${version} ${os-ssl-40}"
26192619
batchtime: 20160 # Use a batchtime of 14 days as suggested by the OCSP test README
26202620
tasks:
26212621
# Windows MongoDB servers do not staple OCSP responses and only support RSA.
26222622
- name: ".ocsp-rsa !.ocsp-staple"
26232623

26242624
- matrix_name: "ocsp-test-macos"
2625-
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["macos11-go-1-20"] }
2625+
matrix_spec: { version: ["4.4", "5.0", "6.0", "7.0", "8.0", "latest"], os-ssl-40: ["macos11"] }
26262626
display_name: "OCSP ${version} ${os-ssl-40}"
26272627
batchtime: 20160 # Use a batchtime of 14 days as suggested by the OCSP test README
26282628
tasks:
@@ -2631,39 +2631,39 @@ buildvariants:
26312631

26322632
- matrix_name: "race-test"
26332633
tags: ["pullrequest"]
2634-
matrix_spec: { version: ["7.0"], os-ssl-40: ["rhel87-64-go-1-20"] }
2634+
matrix_spec: { version: ["7.0"], os-ssl-40: ["rhel87-64"] }
26352635
display_name: "Race Detector Test"
26362636
tasks:
26372637
- name: ".race"
26382638

26392639
- matrix_name: "versioned-api-test"
26402640
tags: ["pullrequest"]
2641-
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["windows-64-go-1-20", "rhel87-64-go-1-20"] }
2641+
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["windows-64", "rhel87-64"] }
26422642
display_name: "API Version ${version} ${os-ssl-40}"
26432643
tasks:
26442644
- name: ".versioned-api"
26452645

26462646
- matrix_name: "versioned-api-latest-test"
2647-
matrix_spec: { version: ["latest"], os-ssl-40: ["windows-64-go-1-20", "rhel87-64-go-1-20"] }
2647+
matrix_spec: { version: ["latest"], os-ssl-40: ["windows-64", "rhel87-64"] }
26482648
display_name: "API Version ${version} ${os-ssl-40}"
26492649
tasks:
26502650
- name: ".versioned-api"
26512651

26522652
- matrix_name: "kms-tls-test"
2653-
matrix_spec: { version: ["7.0"], os-ssl-40: ["rhel87-64-go-1-20"] }
2653+
matrix_spec: { version: ["7.0"], os-ssl-40: ["rhel87-64"] }
26542654
display_name: "KMS TLS ${os-ssl-40}"
26552655
tasks:
26562656
- name: ".kms-tls"
26572657

26582658
- matrix_name: "load-balancer-test"
26592659
tags: ["pullrequest"]
2660-
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["rhel87-64-go-1-20"] }
2660+
matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["rhel87-64"] }
26612661
display_name: "Load Balancer Support ${version} ${os-ssl-40}"
26622662
tasks:
26632663
- name: ".load-balancer"
26642664

26652665
- matrix_name: "load-balancer-latest-test"
2666-
matrix_spec: { version: ["latest"], os-ssl-40: ["rhel87-64-go-1-20"] }
2666+
matrix_spec: { version: ["latest"], os-ssl-40: ["rhel87-64"] }
26672667
display_name: "Load Balancer Support ${version} ${os-ssl-40}"
26682668
tasks:
26692669
- name: ".load-balancer"
@@ -2676,26 +2676,26 @@ buildvariants:
26762676
- "serverless_task_group"
26772677

26782678
- matrix_name: "kms-kmip-test"
2679-
matrix_spec: { version: ["7.0"], os-ssl-40: ["rhel87-64-go-1-20"] }
2679+
matrix_spec: { version: ["7.0"], os-ssl-40: ["rhel87-64"] }
26802680
display_name: "KMS KMIP ${os-ssl-40}"
26812681
tasks:
26822682
- name: ".kms-kmip"
26832683

26842684
- matrix_name: "fuzz-test"
2685-
matrix_spec: { version: ["5.0"], os-ssl-40: ["rhel87-64-go-1-20"] }
2685+
matrix_spec: { version: ["5.0"], os-ssl-40: ["rhel87-64"] }
26862686
display_name: "Fuzz ${version} ${os-ssl-40}"
26872687
tasks:
26882688
- name: "test-fuzz"
26892689
batchtime: 1440 # Run at most once per 24 hours.
26902690

26912691
- matrix_name: "faas-test"
2692-
matrix_spec: { version: ["7.0"], os-faas-80: ["rhel87-large-go-1-20"] }
2692+
matrix_spec: { version: ["7.0"], os-faas-80: ["rhel87-large"] }
26932693
display_name: "FaaS ${version} ${os-faas-80}"
26942694
tasks:
26952695
- test-aws-lambda-task-group
26962696

26972697
- matrix_name: "searchindex-test"
2698-
matrix_spec: { version: ["7.0"], os-faas-80: ["rhel87-large-go-1-20"] }
2698+
matrix_spec: { version: ["7.0"], os-faas-80: ["rhel87-large"] }
26992699
display_name: "Search Index ${version} ${os-faas-80}"
27002700
tasks:
27012701
- test-search-index-task-group
@@ -2705,7 +2705,7 @@ buildvariants:
27052705
run_on:
27062706
- rhel8.7-small
27072707
expansions:
2708-
GO_DIST: "/opt/golang/go1.20"
2708+
GO_DIST: "/opt/golang/go1.22"
27092709
tasks:
27102710
- name: testgcpkms_task_group
27112711
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
@@ -2716,7 +2716,7 @@ buildvariants:
27162716
run_on:
27172717
- rhel8.7-small
27182718
expansions:
2719-
GO_DIST: "/opt/golang/go1.20"
2719+
GO_DIST: "/opt/golang/go1.22"
27202720
tasks:
27212721
- testawskms-task
27222722
- testawskms-fail-task
@@ -2726,7 +2726,7 @@ buildvariants:
27262726
run_on:
27272727
- rhel8.7-small
27282728
expansions:
2729-
GO_DIST: "/opt/golang/go1.20"
2729+
GO_DIST: "/opt/golang/go1.22"
27302730
tasks:
27312731
- name: testazurekms_task_group
27322732
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
@@ -2737,7 +2737,7 @@ buildvariants:
27372737
run_on:
27382738
- ubuntu2204-large
27392739
expansions:
2740-
GO_DIST: "/opt/golang/go1.20"
2740+
GO_DIST: "/opt/golang/go1.22"
27412741
tasks:
27422742
- name: testoidc_task_group
27432743
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README

0 commit comments

Comments
 (0)