Skip to content

Commit 09ade46

Browse files
shyam12860shyam12860
authored
TOOLS-3793: Update package 'net' to v0.36.0 (#778)
Ran the following commands: go mod edit -require=golang.org/x/[email protected] go mod tidy -v go mod vendor -v Looks like net 0.36 requires go version 1.23.0+, so that has been updated. Updating the go version requires an update to set_goenv.sh, and the problem was not obvious in the evergreen task failure, so I'm also adding an echo statement to that script.
1 parent 6bc612b commit 09ade46

Some content is hidden

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

54 files changed

+1181
-997
lines changed

‎cyclonedx.sbom.json

+37-37
Original file line numberDiff line numberDiff line change
@@ -1049,15 +1049,15 @@
10491049
"version": "v1.17.3"
10501050
},
10511051
{
1052-
"bom-ref": "pkg:golang/golang.org/x/crypto@v0.32.0",
1052+
"bom-ref": "pkg:golang/golang.org/x/crypto@v0.35.0",
10531053
"externalReferences": [
10541054
{
10551055
"type": "vcs",
10561056
"url": "https://go.googlesource.com/crypto"
10571057
},
10581058
{
10591059
"type": "website",
1060-
"url": "https://pkg.go.dev/golang.org/x/crypto@v0.32.0"
1060+
"url": "https://pkg.go.dev/golang.org/x/crypto@v0.35.0"
10611061
}
10621062
],
10631063
"group": "golang.org/x",
@@ -1069,9 +1069,9 @@
10691069
}
10701070
],
10711071
"name": "crypto",
1072-
"purl": "pkg:golang/golang.org/x/crypto@v0.32.0",
1072+
"purl": "pkg:golang/golang.org/x/crypto@v0.35.0",
10731073
"type": "library",
1074-
"version": "v0.32.0"
1074+
"version": "v0.35.0"
10751075
},
10761076
{
10771077
"bom-ref": "pkg:golang/golang.org/x/[email protected]",
@@ -1124,15 +1124,15 @@
11241124
"version": "v0.22.0"
11251125
},
11261126
{
1127-
"bom-ref": "pkg:golang/golang.org/x/net@v0.34.0",
1127+
"bom-ref": "pkg:golang/golang.org/x/net@v0.36.0",
11281128
"externalReferences": [
11291129
{
11301130
"type": "vcs",
11311131
"url": "https://go.googlesource.com/net"
11321132
},
11331133
{
11341134
"type": "website",
1135-
"url": "https://pkg.go.dev/golang.org/x/net@v0.34.0"
1135+
"url": "https://pkg.go.dev/golang.org/x/net@v0.36.0"
11361136
}
11371137
],
11381138
"group": "golang.org/x",
@@ -1144,20 +1144,20 @@
11441144
}
11451145
],
11461146
"name": "net",
1147-
"purl": "pkg:golang/golang.org/x/net@v0.34.0",
1147+
"purl": "pkg:golang/golang.org/x/net@v0.36.0",
11481148
"type": "library",
1149-
"version": "v0.34.0"
1149+
"version": "v0.36.0"
11501150
},
11511151
{
1152-
"bom-ref": "pkg:golang/golang.org/x/sync@v0.10.0",
1152+
"bom-ref": "pkg:golang/golang.org/x/sync@v0.11.0",
11531153
"externalReferences": [
11541154
{
11551155
"type": "vcs",
11561156
"url": "https://go.googlesource.com/sync"
11571157
},
11581158
{
11591159
"type": "website",
1160-
"url": "https://pkg.go.dev/golang.org/x/sync@v0.10.0"
1160+
"url": "https://pkg.go.dev/golang.org/x/sync@v0.11.0"
11611161
}
11621162
],
11631163
"group": "golang.org/x",
@@ -1169,20 +1169,20 @@
11691169
}
11701170
],
11711171
"name": "sync",
1172-
"purl": "pkg:golang/golang.org/x/sync@v0.10.0",
1172+
"purl": "pkg:golang/golang.org/x/sync@v0.11.0",
11731173
"type": "library",
1174-
"version": "v0.10.0"
1174+
"version": "v0.11.0"
11751175
},
11761176
{
1177-
"bom-ref": "pkg:golang/golang.org/x/sys@v0.29.0",
1177+
"bom-ref": "pkg:golang/golang.org/x/sys@v0.30.0",
11781178
"externalReferences": [
11791179
{
11801180
"type": "vcs",
11811181
"url": "https://go.googlesource.com/sys"
11821182
},
11831183
{
11841184
"type": "website",
1185-
"url": "https://pkg.go.dev/golang.org/x/sys@v0.29.0"
1185+
"url": "https://pkg.go.dev/golang.org/x/sys@v0.30.0"
11861186
}
11871187
],
11881188
"group": "golang.org/x",
@@ -1194,20 +1194,20 @@
11941194
}
11951195
],
11961196
"name": "sys",
1197-
"purl": "pkg:golang/golang.org/x/sys@v0.29.0",
1197+
"purl": "pkg:golang/golang.org/x/sys@v0.30.0",
11981198
"type": "library",
1199-
"version": "v0.29.0"
1199+
"version": "v0.30.0"
12001200
},
12011201
{
1202-
"bom-ref": "pkg:golang/golang.org/x/term@v0.28.0",
1202+
"bom-ref": "pkg:golang/golang.org/x/term@v0.29.0",
12031203
"externalReferences": [
12041204
{
12051205
"type": "vcs",
12061206
"url": "https://go.googlesource.com/term"
12071207
},
12081208
{
12091209
"type": "website",
1210-
"url": "https://pkg.go.dev/golang.org/x/term@v0.28.0"
1210+
"url": "https://pkg.go.dev/golang.org/x/term@v0.29.0"
12111211
}
12121212
],
12131213
"group": "golang.org/x",
@@ -1219,20 +1219,20 @@
12191219
}
12201220
],
12211221
"name": "term",
1222-
"purl": "pkg:golang/golang.org/x/term@v0.28.0",
1222+
"purl": "pkg:golang/golang.org/x/term@v0.29.0",
12231223
"type": "library",
1224-
"version": "v0.28.0"
1224+
"version": "v0.29.0"
12251225
},
12261226
{
1227-
"bom-ref": "pkg:golang/golang.org/x/text@v0.21.0",
1227+
"bom-ref": "pkg:golang/golang.org/x/text@v0.22.0",
12281228
"externalReferences": [
12291229
{
12301230
"type": "vcs",
12311231
"url": "https://go.googlesource.com/text"
12321232
},
12331233
{
12341234
"type": "website",
1235-
"url": "https://pkg.go.dev/golang.org/x/text@v0.21.0"
1235+
"url": "https://pkg.go.dev/golang.org/x/text@v0.22.0"
12361236
}
12371237
],
12381238
"group": "golang.org/x",
@@ -1244,9 +1244,9 @@
12441244
}
12451245
],
12461246
"name": "text",
1247-
"purl": "pkg:golang/golang.org/x/text@v0.21.0",
1247+
"purl": "pkg:golang/golang.org/x/text@v0.22.0",
12481248
"type": "library",
1249-
"version": "v0.21.0"
1249+
"version": "v0.22.0"
12501250
},
12511251
{
12521252
"bom-ref": "pkg:golang/gopkg.in/[email protected]",
@@ -1291,17 +1291,17 @@
12911291
"version": "v3.0.1"
12921292
},
12931293
{
1294-
"bom-ref": "pkg:golang/std@go1.22.12",
1294+
"bom-ref": "pkg:golang/std@go1.23.7",
12951295
"externalReferences": [
12961296
{
12971297
"type": "website",
1298-
"url": "https://pkg.go.dev/None/std@go1.22.12"
1298+
"url": "https://pkg.go.dev/None/std@go1.23.7"
12991299
}
13001300
],
13011301
"name": "std",
1302-
"purl": "pkg:golang/std@go1.22.12",
1302+
"purl": "pkg:golang/std@go1.23.7",
13031303
"type": "library",
1304-
"version": "go1.22.12"
1304+
"version": "go1.23.7"
13051305
}
13061306
],
13071307
"dependencies": [
@@ -1432,7 +1432,7 @@
14321432
"ref": "pkg:golang/go.mongodb.org/[email protected]"
14331433
},
14341434
{
1435-
"ref": "pkg:golang/golang.org/x/crypto@v0.32.0"
1435+
"ref": "pkg:golang/golang.org/x/crypto@v0.35.0"
14361436
},
14371437
{
14381438
"ref": "pkg:golang/golang.org/x/[email protected]"
@@ -1441,19 +1441,19 @@
14411441
"ref": "pkg:golang/golang.org/x/[email protected]"
14421442
},
14431443
{
1444-
"ref": "pkg:golang/golang.org/x/net@v0.34.0"
1444+
"ref": "pkg:golang/golang.org/x/net@v0.36.0"
14451445
},
14461446
{
1447-
"ref": "pkg:golang/golang.org/x/sync@v0.10.0"
1447+
"ref": "pkg:golang/golang.org/x/sync@v0.11.0"
14481448
},
14491449
{
1450-
"ref": "pkg:golang/golang.org/x/sys@v0.29.0"
1450+
"ref": "pkg:golang/golang.org/x/sys@v0.30.0"
14511451
},
14521452
{
1453-
"ref": "pkg:golang/golang.org/x/term@v0.28.0"
1453+
"ref": "pkg:golang/golang.org/x/term@v0.29.0"
14541454
},
14551455
{
1456-
"ref": "pkg:golang/golang.org/x/text@v0.21.0"
1456+
"ref": "pkg:golang/golang.org/x/text@v0.22.0"
14571457
},
14581458
{
14591459
"ref": "pkg:golang/gopkg.in/[email protected]"
@@ -1465,11 +1465,11 @@
14651465
"ref": "pkg:golang/gopkg.in/[email protected]"
14661466
},
14671467
{
1468-
"ref": "pkg:golang/std@go1.22.12"
1468+
"ref": "pkg:golang/std@go1.23.7"
14691469
}
14701470
],
14711471
"metadata": {
1472-
"timestamp": "2025-03-12T12:29:32.664815+00:00",
1472+
"timestamp": "2025-03-26T15:44:23.147449+00:00",
14731473
"tools": [
14741474
{
14751475
"externalReferences": [
@@ -1513,7 +1513,7 @@
15131513
]
15141514
},
15151515
"serialNumber": "urn:uuid:ecf433fd-8f8f-476e-bb32-15507acd4361",
1516-
"version": 22,
1516+
"version": 24,
15171517
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
15181518
"bomFormat": "CycloneDX",
15191519
"specVersion": "1.5",

‎go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/mongodb/mongo-tools
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.11
5+
toolchain go1.23.7
66

77
require (
88
github.com/aws/aws-sdk-go v1.53.11
@@ -20,10 +20,10 @@ require (
2020
// Later versions remove a package the tools use, so we're sticking with
2121
// this older version for now.
2222
go.mongodb.org/mongo-driver v1.17.3
23-
golang.org/x/crypto v0.32.0 // indirect
23+
golang.org/x/crypto v0.35.0 // indirect
2424
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c
2525
golang.org/x/mod v0.22.0
26-
golang.org/x/term v0.28.0
26+
golang.org/x/term v0.29.0
2727
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637
2828
gopkg.in/yaml.v2 v2.4.0
2929
gopkg.in/yaml.v3 v3.0.1
@@ -62,8 +62,8 @@ require (
6262
github.com/xdg-go/scram v1.1.2 // indirect
6363
github.com/xdg-go/stringprep v1.0.4 // indirect
6464
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
65-
golang.org/x/net v0.34.0 // indirect
66-
golang.org/x/sync v0.10.0 // indirect
67-
golang.org/x/sys v0.29.0 // indirect
68-
golang.org/x/text v0.21.0 // indirect
65+
golang.org/x/net v0.36.0 // indirect
66+
golang.org/x/sync v0.11.0 // indirect
67+
golang.org/x/sys v0.30.0 // indirect
68+
golang.org/x/text v0.22.0 // indirect
6969
)

‎go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ go.mongodb.org/mongo-driver v1.17.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeH
114114
go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
115115
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
116116
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
117-
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
118-
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
117+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
118+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
119119
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
120120
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
121121
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -125,12 +125,12 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
125125
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
126126
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
127127
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
128-
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
129-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
128+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
129+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
130130
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
131131
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
132-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
133-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
132+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
133+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
134134
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
135135
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
136136
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -141,18 +141,18 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
141141
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
142142
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
143143
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
144-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
145-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
144+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
145+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
146146
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
147147
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
148-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
149-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
148+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
149+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
150150
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
151151
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
152152
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
153153
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
154-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
155-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
154+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
155+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
156156
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
157157
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
158158
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

‎set_goenv.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
22

33
set_goenv() {
4+
5+
echo "Setting go env in set_goenv.sh"
46
# Error out if not in the same directory as this script
57
if [ ! -f ./set_goenv.sh ]; then
68
echo "Must be run from mongo-tools top-level directory. Aborting."
@@ -11,11 +13,11 @@ set_goenv() {
1113
UNAME_S=$(PATH="/usr/bin:/bin" uname -s)
1214
case $UNAME_S in
1315
CYGWIN*)
14-
PREF_GOROOT="c:/golang/go1.22"
16+
PREF_GOROOT="c:/golang/go1.23"
1517
PREF_PATH="/cygdrive/c/golang/go1.22/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH"
1618
;;
1719
*)
18-
PREF_GOROOT="/opt/golang/go1.22"
20+
PREF_GOROOT="/opt/golang/go1.23"
1921
PREF_PATH="$PREF_GOROOT/bin:$PATH"
2022
;;
2123
esac

0 commit comments

Comments
 (0)