Skip to content

Commit 9500f0b

Browse files
authored
Merge pull request #9027 from Lyndon-Li/bump-kopia-v0.20.1
Bump kopia v0.20.1
2 parents fbdb74f + c080a95 commit 9500f0b

9 files changed

Lines changed: 220 additions & 202 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump kopia v0.20.1

go.mod

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ go 1.23.0
55
toolchain go1.23.6
66

77
require (
8-
cloud.google.com/go/storage v1.50.0
9-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
10-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
8+
cloud.google.com/go/storage v1.54.0
9+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
10+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.6.0
12-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0
13-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0
12+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.0
13+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.1
1414
github.com/aws/aws-sdk-go-v2 v1.24.1
1515
github.com/aws/aws-sdk-go-v2/config v1.26.3
1616
github.com/aws/aws-sdk-go-v2/credentials v1.16.14
@@ -22,7 +22,7 @@ require (
2222
github.com/evanphx/json-patch/v5 v5.9.0
2323
github.com/fatih/color v1.18.0
2424
github.com/gobwas/glob v0.2.3
25-
github.com/google/go-cmp v0.6.0
25+
github.com/google/go-cmp v0.7.0
2626
github.com/google/uuid v1.6.0
2727
github.com/hashicorp/go-hclog v0.14.1
2828
github.com/hashicorp/go-plugin v1.6.0
@@ -33,7 +33,7 @@ require (
3333
github.com/onsi/gomega v1.33.1
3434
github.com/petar/GoLLRB v0.0.0-20210522233825-ae3b015fd3e9
3535
github.com/pkg/errors v0.9.1
36-
github.com/prometheus/client_golang v1.20.5
36+
github.com/prometheus/client_golang v1.22.0
3737
github.com/robfig/cron/v3 v3.0.1
3838
github.com/sirupsen/logrus v1.9.3
3939
github.com/spf13/afero v1.10.0
@@ -43,13 +43,13 @@ require (
4343
github.com/vmware-tanzu/crash-diagnostics v0.3.7
4444
go.uber.org/zap v1.27.0
4545
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
46-
golang.org/x/mod v0.22.0
47-
golang.org/x/net v0.38.0
48-
golang.org/x/oauth2 v0.27.0
49-
golang.org/x/text v0.23.0
50-
google.golang.org/api v0.218.0
51-
google.golang.org/grpc v1.69.4
52-
google.golang.org/protobuf v1.36.3
46+
golang.org/x/mod v0.24.0
47+
golang.org/x/net v0.40.0
48+
golang.org/x/oauth2 v0.30.0
49+
golang.org/x/text v0.25.0
50+
google.golang.org/api v0.233.0
51+
google.golang.org/grpc v1.72.1
52+
google.golang.org/protobuf v1.36.6
5353
gopkg.in/yaml.v3 v3.0.1
5454
k8s.io/api v0.31.3
5555
k8s.io/apiextensions-apiserver v0.31.3
@@ -66,19 +66,19 @@ require (
6666
)
6767

6868
require (
69-
cel.dev/expr v0.16.2 // indirect
70-
cloud.google.com/go v0.116.0 // indirect
71-
cloud.google.com/go/auth v0.14.0 // indirect
72-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
69+
cel.dev/expr v0.20.0 // indirect
70+
cloud.google.com/go v0.121.0 // indirect
71+
cloud.google.com/go/auth v0.16.1 // indirect
72+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
7373
cloud.google.com/go/compute/metadata v0.6.0 // indirect
74-
cloud.google.com/go/iam v1.2.2 // indirect
75-
cloud.google.com/go/monitoring v1.21.2 // indirect
76-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
74+
cloud.google.com/go/iam v1.5.2 // indirect
75+
cloud.google.com/go/monitoring v1.24.0 // indirect
76+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
7777
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
78-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
79-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
80-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
81-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
78+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
79+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
80+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
81+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
8282
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
8383
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
8484
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
@@ -93,27 +93,27 @@ require (
9393
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 // indirect
9494
github.com/aws/smithy-go v1.19.0 // indirect
9595
github.com/beorn7/perks v1.0.1 // indirect
96-
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
9796
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9897
github.com/chmduquesne/rollinghash v4.0.0+incompatible // indirect
99-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
98+
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
10099
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
101100
github.com/dustin/go-humanize v1.0.1 // indirect
102101
github.com/edsrzf/mmap-go v1.2.0 // indirect
103102
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
104-
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
105-
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
103+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
104+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
106105
github.com/felixge/httpsnoop v1.0.4 // indirect
107106
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
108107
github.com/go-ini/ini v1.67.0 // indirect
108+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
109109
github.com/go-logr/logr v1.4.2 // indirect
110110
github.com/go-logr/stdr v1.2.2 // indirect
111111
github.com/go-ole/go-ole v1.3.0 // indirect
112112
github.com/go-openapi/jsonpointer v0.19.6 // indirect
113113
github.com/go-openapi/jsonreference v0.20.2 // indirect
114114
github.com/go-openapi/swag v0.22.4 // indirect
115115
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
116-
github.com/goccy/go-json v0.10.4 // indirect
116+
github.com/goccy/go-json v0.10.5 // indirect
117117
github.com/gofrs/flock v0.12.1 // indirect
118118
github.com/gogo/protobuf v1.3.2 // indirect
119119
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
@@ -123,7 +123,7 @@ require (
123123
github.com/google/gofuzz v1.2.0 // indirect
124124
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
125125
github.com/google/s2a-go v0.1.9 // indirect
126-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
126+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
127127
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
128128
github.com/gorilla/websocket v1.5.0 // indirect
129129
github.com/hashicorp/cronexpr v1.1.2 // indirect
@@ -133,17 +133,18 @@ require (
133133
github.com/jmespath/go-jmespath v0.4.0 // indirect
134134
github.com/josharian/intern v1.0.0 // indirect
135135
github.com/json-iterator/go v1.1.12 // indirect
136-
github.com/klauspost/compress v1.17.11 // indirect
137-
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
136+
github.com/klauspost/compress v1.18.0 // indirect
137+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
138138
github.com/klauspost/pgzip v1.2.6 // indirect
139139
github.com/klauspost/reedsolomon v1.12.4 // indirect
140140
github.com/kylelemons/godebug v1.1.0 // indirect
141141
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
142142
github.com/mailru/easyjson v0.7.7 // indirect
143143
github.com/mattn/go-colorable v0.1.14 // indirect
144144
github.com/mattn/go-isatty v0.0.20 // indirect
145+
github.com/minio/crc64nvme v1.0.1 // indirect
145146
github.com/minio/md5-simd v1.1.2 // indirect
146-
github.com/minio/minio-go/v7 v7.0.84 // indirect
147+
github.com/minio/minio-go/v7 v7.0.92 // indirect
147148
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
148149
github.com/moby/spdystream v0.4.0 // indirect
149150
github.com/moby/term v0.5.0 // indirect
@@ -155,45 +156,48 @@ require (
155156
github.com/natefinch/atomic v1.0.1 // indirect
156157
github.com/nxadm/tail v1.4.8 // indirect
157158
github.com/oklog/run v1.0.0 // indirect
159+
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
158160
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
159161
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
160162
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
161163
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
162-
github.com/prometheus/client_model v0.6.1 // indirect
163-
github.com/prometheus/common v0.62.0 // indirect
164+
github.com/prometheus/client_model v0.6.2 // indirect
165+
github.com/prometheus/common v0.64.0 // indirect
164166
github.com/prometheus/procfs v0.15.1 // indirect
165167
github.com/rs/xid v1.6.0 // indirect
168+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
166169
github.com/stretchr/objx v0.5.2 // indirect
170+
github.com/tinylib/msgp v1.3.0 // indirect
167171
github.com/vladimirvivien/gexe v0.1.1 // indirect
168172
github.com/x448/float16 v0.8.4 // indirect
169173
github.com/zeebo/blake3 v0.2.4 // indirect
170-
go.opencensus.io v0.24.0 // indirect
174+
github.com/zeebo/errs v1.4.0 // indirect
171175
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
172-
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
173-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
174-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
175-
go.opentelemetry.io/otel v1.34.0 // indirect
176-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
177-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
178-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
179-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
176+
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
177+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
178+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
179+
go.opentelemetry.io/otel v1.35.0 // indirect
180+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
181+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
182+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
183+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
180184
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
181185
go.uber.org/multierr v1.11.0 // indirect
182-
golang.org/x/crypto v0.36.0 // indirect
183-
golang.org/x/sync v0.12.0 // indirect
184-
golang.org/x/sys v0.31.0 // indirect
185-
golang.org/x/term v0.30.0 // indirect
186-
golang.org/x/time v0.9.0 // indirect
187-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
186+
golang.org/x/crypto v0.38.0 // indirect
187+
golang.org/x/sync v0.14.0 // indirect
188+
golang.org/x/sys v0.33.0 // indirect
189+
golang.org/x/term v0.32.0 // indirect
190+
golang.org/x/time v0.11.0 // indirect
191+
golang.org/x/tools v0.22.0 // indirect
188192
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
189-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
190-
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
191-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
193+
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
194+
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2 // indirect
195+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
192196
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
193197
gopkg.in/inf.v0 v0.9.1 // indirect
194198
gopkg.in/yaml.v2 v2.4.0 // indirect
195199
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
196200
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
197201
)
198202

199-
replace github.com/kopia/kopia => github.com/project-velero/kopia v0.0.0-20250227051353-20bfabbfc7a0
203+
replace github.com/kopia/kopia => github.com/project-velero/kopia v0.0.0-20250617091219-8d93c3407cdc

0 commit comments

Comments
 (0)