Skip to content

Commit 698be31

Browse files
pfcoperezpfcoperez
committed
Downgrade versions that can not be bumped due transitive dependencies and pin them
1 parent d7d414f commit 698be31

4 files changed

Lines changed: 33 additions & 11 deletions

File tree

‎flow/cmd/check_pinned_versions/main.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ import (
1717
// To update a pinned dependency, change both go.mod, this map AND
1818
// the Renovate package rules in renovate.json that skips automated updates for that dependency.
1919
var pinnedVersions = map[string]string{
20+
"cloud.google.com/go/auth": "v0.18.2",
2021
"cloud.google.com/go/bigquery": "v1.72.0",
2122
"cloud.google.com/go/kms": "v1.24.0",
2223
"cloud.google.com/go/pubsub/v2": "v2.3.0",
24+
"cloud.google.com/go/storage": "v1.59.2",
2325
"github.com/aws/aws-sdk-go-v2/feature/s3/manager": "v1.21.0",
2426
"google.golang.org/api": "v0.257.0",
2527
"github.com/tikv/pd/client": "v0.0.0-20251229071808-6173d50c004c",

‎flow/go.mod‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
cloud.google.com/go v0.123.0
77
cloud.google.com/go/bigquery v1.72.0 // PINNED: v1.73.0+ requires google.golang.org/api v0.259.0
88
cloud.google.com/go/pubsub/v2 v2.3.0 // PINNED: v2.4.0+ requires google.golang.org/api v0.259.0
9-
cloud.google.com/go/storage v1.62.1
9+
cloud.google.com/go/storage v1.59.2 // PINNED: v1.60.0+ requires google.golang.org/api v0.265.0+
1010
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
1111
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/v2 v2.0.2
1212
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.3.0
@@ -97,13 +97,13 @@ require (
9797
require github.com/quasilyte/go-ruleguard/dsl v0.3.23
9898

9999
require (
100-
cloud.google.com/go/kms v1.26.0 // PINNED: v1.26.0+ requires google.golang.org/api v0.265.0
100+
cloud.google.com/go/kms v1.24.0 // PINNED: v1.26.0+ requires google.golang.org/api v0.265.0
101101
cloud.google.com/go/longrunning v0.9.0 // indirect
102102
)
103103

104104
require (
105105
cel.dev/expr v0.25.1 // indirect
106-
cloud.google.com/go/auth v0.20.0
106+
cloud.google.com/go/auth v0.18.2 // PINNED: v0.19.0+ requires google.golang.org/api v0.267.0+
107107
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
108108
cloud.google.com/go/compute/metadata v0.9.0 // indirect
109109
cloud.google.com/go/iam v1.7.0 // indirect
@@ -311,15 +311,25 @@ replace github.com/PeerDB-io/peerdb/flow/pkg => ./pkg
311311

312312
// Block MVS from raising require minima above the pinned versions in the require block — append new releases here until unpinned.
313313
exclude (
314+
cloud.google.com/go/auth v0.19.0
315+
cloud.google.com/go/auth v0.20.0
314316
cloud.google.com/go/bigquery v1.73.0
315317
cloud.google.com/go/bigquery v1.73.1
316318
cloud.google.com/go/bigquery v1.74.0
317319
cloud.google.com/go/bigquery v1.75.0
318320
cloud.google.com/go/bigquery v1.76.0
321+
cloud.google.com/go/kms v1.26.0
319322
cloud.google.com/go/pubsub/v2 v2.4.0
320323
cloud.google.com/go/pubsub/v2 v2.5.0
321324
cloud.google.com/go/pubsub/v2 v2.5.1
322325
cloud.google.com/go/pubsub/v2 v2.6.0
326+
cloud.google.com/go/storage v1.60.0
327+
cloud.google.com/go/storage v1.61.0
328+
cloud.google.com/go/storage v1.61.1
329+
cloud.google.com/go/storage v1.61.2
330+
cloud.google.com/go/storage v1.61.3
331+
cloud.google.com/go/storage v1.62.0
332+
cloud.google.com/go/storage v1.62.1
323333
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.21.1
324334
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.0
325335
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.22.1

‎flow/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
33
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
44
cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
55
cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
6-
cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA=
7-
cloud.google.com/go/auth v0.20.0/go.mod h1:942/yi/itH1SsmpyrbnTMDgGfdy2BUqIKyd0cyYLc5Q=
6+
cloud.google.com/go/auth v0.18.2 h1:+Nbt5Ev0xEqxlNjd6c+yYUeosQ5TtEUaNcN/3FozlaM=
7+
cloud.google.com/go/auth v0.18.2/go.mod h1:xD+oY7gcahcu7G2SG2DsBerfFxgPAJz17zz2joOFF3M=
88
cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
99
cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
1010
cloud.google.com/go/bigquery v1.72.0 h1:D/yLju+3Ens2IXx7ou1DJ62juBm+/coBInn4VVOg5Cw=
@@ -15,8 +15,8 @@ cloud.google.com/go/datacatalog v1.26.1 h1:bCRKA8uSQN8wGW3Tw0gwko4E9a64GRmbW1nCb
1515
cloud.google.com/go/datacatalog v1.26.1/go.mod h1:2Qcq8vsHNxMDgjgadRFmFG47Y+uuIVsyEGUrlrKEdrg=
1616
cloud.google.com/go/iam v1.7.0 h1:JD3zh0C6LHl16aCn5Akff0+GELdp1+4hmh6ndoFLl8U=
1717
cloud.google.com/go/iam v1.7.0/go.mod h1:tetWZW1PD/m6vcuY2Zj/aU0eCHNPuxedbnbRTyKXvdY=
18-
cloud.google.com/go/kms v1.26.0 h1:cK9mN2cf+9V63D3H1f6koxTatWy39aTI/hCjz1I+adU=
19-
cloud.google.com/go/kms v1.26.0/go.mod h1:pHKOdFJm63hxBsiPkYtowZPltu9dW0MWvBa6IA4HM58=
18+
cloud.google.com/go/kms v1.24.0 h1:SWltUuoPhTdv9q/P0YEAWQfoYT32O5HdfPgTiWMvrH8=
19+
cloud.google.com/go/kms v1.24.0/go.mod h1:QDH3z2SJ50lfNOE8EokKC1G40i7I0f8xTMCoiptcb5g=
2020
cloud.google.com/go/logging v1.13.2 h1:qqlHCBvieJT9Cdq4QqYx1KPadCQ2noD4FK02eNqHAjA=
2121
cloud.google.com/go/logging v1.13.2/go.mod h1:zaybliM3yun1J8mU2dVQ1/qDzjbOqEijZCn6hSBtKak=
2222
cloud.google.com/go/longrunning v0.9.0 h1:0EzbDEGsAvOZNbqXopgniY0w0a1phvu5IdUFq8grmqY=
@@ -25,8 +25,8 @@ cloud.google.com/go/monitoring v1.24.3 h1:dde+gMNc0UhPZD1Azu6at2e79bfdztVDS5lvhO
2525
cloud.google.com/go/monitoring v1.24.3/go.mod h1:nYP6W0tm3N9H/bOw8am7t62YTzZY+zUeQ+Bi6+2eonI=
2626
cloud.google.com/go/pubsub/v2 v2.3.0 h1:DgAN907x+sP0nScYfBzneRiIhWoXcpCD8ZAut8WX9vs=
2727
cloud.google.com/go/pubsub/v2 v2.3.0/go.mod h1:O5f0KHG9zDheZAd3z5rlCRhxt2JQtB+t/IYLKK3Bpvw=
28-
cloud.google.com/go/storage v1.62.1 h1:Os0G3XbUbjZumkpDUf2Y0rLoXJTCF1kU2kWUujKYXD8=
29-
cloud.google.com/go/storage v1.62.1/go.mod h1:cpYz/kRVZ+UQAF1uHeea10/9ewcRbxGoGNKsS9daSXA=
28+
cloud.google.com/go/storage v1.59.2 h1:gmOAuG1opU8YvycMNpP+DvHfT9BfzzK5Cy+arP+Nocw=
29+
cloud.google.com/go/storage v1.59.2/go.mod h1:cMWbtM+anpC74gn6qjLh+exqYcfmB9Hqe5z6adx+CLI=
3030
cloud.google.com/go/trace v1.11.7 h1:kDNDX8JkaAG3R2nq1lIdkb7FCSi1rCmsEtKVsty7p+U=
3131
cloud.google.com/go/trace v1.11.7/go.mod h1:TNn9d5V3fQVf6s4SCveVMIBS2LJUqo73GACmq/Tky0s=
3232
entgo.io/ent v0.14.3 h1:wokAV/kIlH9TeklJWGGS7AYJdVckr0DloWjIcO9iIIQ=
@@ -740,8 +740,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bT
740740
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
741741
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 h1:RAE+JPfvEmvy+0LzyUA25/SGawPwIUbZ6u0Wug54sLc=
742742
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0/go.mod h1:AGmbycVGEsRx9mXMZ75CsOyhSP6MFIcj/6dnG+vhVjk=
743-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.43.0 h1:TC+BewnDpeiAmcscXbGMfxkO+mwYUwE/VySwvw88PfA=
744-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.43.0/go.mod h1:J/ZyF4vfPwsSr9xJSPyQ4LqtcTPULFR64KwTikGLe+A=
743+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 h1:wm/Q0GAAykXv83wzcKzGGqAnnfLFyFe7RslekZuv+VI=
744+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0/go.mod h1:ra3Pa40+oKjvYh+ZD3EdxFZZB0xdMfuileHAm4nNN7w=
745745
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
746746
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
747747
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=

‎renovate.json5‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@
5353
},
5454
// Explicit versions exclusions for pinned go dependencies, as in the previous rule, this doesn't
5555
// prevent updates if transitively required but it prevents proactive updates.
56+
{
57+
"matchManagers": ["gomod"],
58+
"matchPackageNames": ["cloud.google.com/go/auth"],
59+
"allowedVersions": "v0.18.2"
60+
},
5661
{
5762
"matchManagers": ["gomod"],
5863
"matchPackageNames": ["cloud.google.com/go/bigquery"],
@@ -63,6 +68,11 @@
6368
"matchPackageNames": ["cloud.google.com/go/pubsub/v2"],
6469
"allowedVersions": "v2.3.0"
6570
},
71+
{
72+
"matchManagers": ["gomod"],
73+
"matchPackageNames": ["cloud.google.com/go/storage"],
74+
"allowedVersions": "v1.59.2"
75+
},
6676
{
6777
"matchManagers": ["gomod"],
6878
"matchPackageNames": ["github.com/aws/aws-sdk-go-v2/feature/s3/manager"],

0 commit comments

Comments
 (0)