Skip to content

Commit 78d0ca6

Browse files
authored
Merge pull request #3078 from mmamczur/update_dep_google_api
Update google.golang.org/api dependency
2 parents 65b45ff + f91b847 commit 78d0ca6

File tree

272 files changed

+115577
-125196
lines changed

Some content is hidden

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

272 files changed

+115577
-125196
lines changed

go.mod

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ require (
1515
github.com/spf13/pflag v1.0.6
1616
github.com/stretchr/testify v1.11.1
1717
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
18-
golang.org/x/oauth2 v0.34.0
19-
google.golang.org/api v0.264.0
18+
golang.org/x/oauth2 v0.36.0
19+
google.golang.org/api v0.275.0
2020
gopkg.in/ini.v1 v1.67.1
2121
istio.io/api v0.0.0-20190809125725-591cf32c1d0e
2222
k8s.io/api v0.34.0
@@ -34,7 +34,7 @@ require (
3434
require (
3535
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
3636
4d63.com/gochecknoglobals v0.2.2 // indirect
37-
cloud.google.com/go/auth v0.18.1 // indirect
37+
cloud.google.com/go/auth v0.20.0 // indirect
3838
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3939
cloud.google.com/go/compute/metadata v0.9.0 // indirect
4040
github.com/4meepo/tagalign v1.4.2 // indirect
@@ -112,8 +112,8 @@ require (
112112
github.com/google/gnostic-models v0.7.0 // indirect
113113
github.com/google/s2a-go v0.1.9 // indirect
114114
github.com/google/uuid v1.6.0 // indirect
115-
github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
116-
github.com/googleapis/gax-go/v2 v2.16.0 // indirect
115+
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
116+
github.com/googleapis/gax-go/v2 v2.21.0 // indirect
117117
github.com/gordonklaus/ineffassign v0.1.0 // indirect
118118
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
119119
github.com/gostaticanalysis/comment v1.5.0 // indirect
@@ -220,29 +220,29 @@ require (
220220
go-simpler.org/musttag v0.13.0 // indirect
221221
go-simpler.org/sloglint v0.9.0 // indirect
222222
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
223-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
224-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
225-
go.opentelemetry.io/otel v1.39.0 // indirect
226-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
227-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
223+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
224+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
225+
go.opentelemetry.io/otel v1.43.0 // indirect
226+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
227+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
228228
go.uber.org/automaxprocs v1.6.0 // indirect
229229
go.uber.org/multierr v1.11.0 // indirect
230230
go.uber.org/zap v1.27.0 // indirect
231231
go.yaml.in/yaml/v2 v2.4.2 // indirect
232232
go.yaml.in/yaml/v3 v3.0.4 // indirect
233-
golang.org/x/crypto v0.47.0 // indirect
233+
golang.org/x/crypto v0.49.0 // indirect
234234
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
235-
golang.org/x/mod v0.31.0 // indirect
236-
golang.org/x/net v0.49.0 // indirect
237-
golang.org/x/sync v0.19.0 // indirect
238-
golang.org/x/sys v0.40.0 // indirect
239-
golang.org/x/term v0.39.0 // indirect
240-
golang.org/x/text v0.33.0 // indirect
241-
golang.org/x/time v0.14.0 // indirect
242-
golang.org/x/tools v0.40.0 // indirect
235+
golang.org/x/mod v0.33.0 // indirect
236+
golang.org/x/net v0.52.0 // indirect
237+
golang.org/x/sync v0.20.0 // indirect
238+
golang.org/x/sys v0.42.0 // indirect
239+
golang.org/x/term v0.41.0 // indirect
240+
golang.org/x/text v0.35.0 // indirect
241+
golang.org/x/time v0.15.0 // indirect
242+
golang.org/x/tools v0.42.0 // indirect
243243
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
244-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d // indirect
245-
google.golang.org/grpc v1.78.0 // indirect
244+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
245+
google.golang.org/grpc v1.80.0 // indirect
246246
google.golang.org/protobuf v1.36.11 // indirect
247247
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
248248
gopkg.in/gcfg.v1 v1.2.3 // indirect

go.sum

Lines changed: 59 additions & 59 deletions
Large diffs are not rendered by default.

pkg/composite/gen.go

Lines changed: 67 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,8 @@ type Backend struct {
422422
// For usage guidelines, seeUtilization
423423
// balancing mode.
424424
MaxUtilization float64 `json:"maxUtilization,omitempty"`
425+
// Information about the resource or system that manages the backend.
426+
OrchestrationInfo *BackendBackendOrchestrationInfo `json:"orchestrationInfo,omitempty"`
425427
// This field indicates whether this backend should be fully utilized
426428
// before
427429
// sending traffic to backends with default preference. The possible
@@ -455,6 +457,14 @@ type Backend struct {
455457
NullFields []string `json:"-"`
456458
}
457459

460+
// BackendBackendOrchestrationInfo is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
461+
type BackendBackendOrchestrationInfo struct {
462+
// The URI of the resource or system that manages the backend.
463+
ResourceUri string `json:"resourceUri,omitempty"`
464+
ForceSendFields []string `json:"-"`
465+
NullFields []string `json:"-"`
466+
}
467+
458468
// BackendCustomMetric is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
459469
type BackendCustomMetric struct {
460470
// If true, the metric data is collected and reported to
@@ -552,7 +562,7 @@ type BackendService struct {
552562
//
553563
// This field is applicable to either:
554564
//
555-
// - A regional backend service with the service_protocol set to
565+
// - A regional backend service with the service protocol set to
556566
// HTTP,
557567
// HTTPS, HTTP2 or H2C, and load_balancing_scheme set to
558568
// INTERNAL_MANAGED.
@@ -844,7 +854,7 @@ type BackendService struct {
844854
// thecustomMetrics field.
845855
//
846856
// This field is applicable to either:
847-
// - A regional backend service with the service_protocol set to
857+
// - A regional backend service with the service protocol set to
848858
// HTTP,
849859
// HTTPS, HTTP2 or H2C, and load_balancing_scheme set to
850860
// INTERNAL_MANAGED.
@@ -930,6 +940,9 @@ type BackendService struct {
930940
//
931941
// networkPassThroughLbTrafficPolicy cannot be specified with haPolicy.
932942
NetworkPassThroughLbTrafficPolicy *BackendServiceNetworkPassThroughLbTrafficPolicy `json:"networkPassThroughLbTrafficPolicy,omitempty"`
943+
// Information about the resource or system that manages the backend
944+
// service.
945+
OrchestrationInfo *BackendServiceOrchestrationInfo `json:"orchestrationInfo,omitempty"`
933946
// Settings controlling the ejection of unhealthy backend endpoints from
934947
// the
935948
// load balancing pool of each individual proxy instance that processes
@@ -975,8 +988,8 @@ type BackendService struct {
975988
// - A global backend service with the loadBalancingScheme set to
976989
// INTERNAL_SELF_MANAGED or EXTERNAL_MANAGED.
977990
// - A regional backend
978-
// service with the serviceProtocol set to HTTP, HTTPS, HTTP2 or H2C,
979-
// and
991+
// service with the service protocol set to HTTP, HTTPS, HTTP2 or
992+
// H2C, and
980993
// loadBalancingScheme set to INTERNAL_MANAGED or EXTERNAL_MANAGED.
981994
// Not
982995
// supported for Serverless NEGs.
@@ -1106,21 +1119,7 @@ type BackendService struct {
11061119
TlsSettings *BackendServiceTlsSettings `json:"tlsSettings,omitempty"`
11071120
// Output only. [Output Only] List of resources referencing given
11081121
// backend service.
1109-
UsedBy []*BackendServiceUsedBy `json:"usedBy,omitempty"`
1110-
// The network scope of the backends that can be added to the
1111-
// backend
1112-
// service. This field can be either GLOBAL_VPC_NETWORK
1113-
// orREGIONAL_VPC_NETWORK.
1114-
//
1115-
// A backend service with the VPC scope set to GLOBAL_VPC_NETWORK
1116-
// is only allowed to have backends in global VPC networks.
1117-
//
1118-
// When the VPC scope is set to REGIONAL_VPC_NETWORK the backend
1119-
// service is only allowed to have backends in regional networks in the
1120-
// same
1121-
// scope as the backend service.
1122-
// Note: if not specified then GLOBAL_VPC_NETWORK will be used.
1123-
VpcNetworkScope string `json:"vpcNetworkScope,omitempty"`
1122+
UsedBy []*BackendServiceUsedBy `json:"usedBy,omitempty"`
11241123
googleapi.ServerResponse `json:"-"`
11251124
ForceSendFields []string `json:"-"`
11261125
NullFields []string `json:"-"`
@@ -1470,7 +1469,8 @@ type BackendServiceDynamicForwardingIpPortSelection struct {
14701469

14711470
// BackendServiceFailoverPolicy is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
14721471
type BackendServiceFailoverPolicy struct {
1473-
// This can be set to true only if the protocol isTCP.
1472+
// This can be set to true if the protocol isTCP, UDP, or
1473+
// UNSPECIFIED.
14741474
//
14751475
// The default is false.
14761476
DisableConnectionDrainOnFailover bool `json:"disableConnectionDrainOnFailover,omitempty"`
@@ -1896,6 +1896,16 @@ type BackendServiceNetworkPassThroughLbTrafficPolicyZonalAffinity struct {
18961896
NullFields []string `json:"-"`
18971897
}
18981898

1899+
// BackendServiceOrchestrationInfo is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
1900+
type BackendServiceOrchestrationInfo struct {
1901+
// The resource URI of the resource or system that manages the
1902+
// backend
1903+
// service.
1904+
ResourceUri string `json:"resourceUri,omitempty"`
1905+
ForceSendFields []string `json:"-"`
1906+
NullFields []string `json:"-"`
1907+
}
1908+
18991909
// BackendServiceParams is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
19001910
type BackendServiceParams struct {
19011911
// Tag keys/values directly bound to this resource.
@@ -4204,6 +4214,14 @@ type HttpRouteAction struct {
42044214
// see Load
42054215
// balancing: Routing and traffic management features.
42064216
FaultInjectionPolicy *HttpFaultInjection `json:"faultInjectionPolicy,omitempty"`
4217+
// Image optimization policy for this URL Map’s route. Available only
4218+
// for
4219+
// Global EXTERNAL_MANAGED load balancer schemes.
4220+
// Either Cloud CDN must be enabled on the backend service or backend
4221+
// bucket
4222+
// serving the route, or cache policy must be configured on the same
4223+
// route
4224+
ImageOptimizationPolicy *ImageOptimizationPolicy `json:"imageOptimizationPolicy,omitempty"`
42074225
// Specifies the maximum duration (timeout) for streams on the selected
42084226
// route.
42094227
// Unlike the timeout field where the timeout duration starts
@@ -4570,6 +4588,15 @@ type HttpRouteRuleMatch struct {
45704588
NullFields []string `json:"-"`
45714589
}
45724590

4591+
// ImageOptimizationPolicy is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
4592+
type ImageOptimizationPolicy struct {
4593+
// Specifies whether to interpret query parameters for image
4594+
// optimization.
4595+
QueryParameterInterpretation string `json:"queryParameterInterpretation,omitempty"`
4596+
ForceSendFields []string `json:"-"`
4597+
NullFields []string `json:"-"`
4598+
}
4599+
45734600
// Int64RangeMatch is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
45744601
type Int64RangeMatch struct {
45754602
// The end of the range (exclusive) in signed long integer format.
@@ -6680,6 +6707,8 @@ type UrlMap struct {
66806707
Region string `json:"region,omitempty"`
66816708
// [Output Only] Server-defined URL for the resource.
66826709
SelfLink string `json:"selfLink,omitempty"`
6710+
// Output only. [Output Only] The status of the URL map.
6711+
Status *UrlMapStatus `json:"status,omitempty"`
66836712
// The list of expected URL mapping tests. Request to update theUrlMap
66846713
// succeeds only if all test cases pass. You can specify a
66856714
// maximum of 100 tests per UrlMap.
@@ -6693,6 +6722,24 @@ type UrlMap struct {
66936722
NullFields []string `json:"-"`
66946723
}
66956724

6725+
// UrlMapQuotaUsage is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
6726+
type UrlMapQuotaUsage struct {
6727+
// Output only. The number of forwarding rules that uses this UrlMap.
6728+
ForwardingRules int64 `json:"forwardingRules,omitempty"`
6729+
// Output only. The number of quota units calculated for this UrlMap.
6730+
Units int64 `json:"units,omitempty,string"`
6731+
ForceSendFields []string `json:"-"`
6732+
NullFields []string `json:"-"`
6733+
}
6734+
6735+
// UrlMapStatus is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
6736+
type UrlMapStatus struct {
6737+
// Output only. Summary of quota usage for given UrlMap.
6738+
QuotaUsage *UrlMapQuotaUsage `json:"quotaUsage,omitempty"`
6739+
ForceSendFields []string `json:"-"`
6740+
NullFields []string `json:"-"`
6741+
}
6742+
66966743
// UrlMapTest is a composite type wrapping the Alpha, Beta, and GA methods for its GCE equivalent
66976744
type UrlMapTest struct {
66986745
// The weight to use for the supplied host and path when using

pkg/composite/gen_test.go

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,14 @@ func TestBackend(t *testing.T) {
137137
}
138138
}
139139

140+
func TestBackendBackendOrchestrationInfo(t *testing.T) {
141+
compositeType := reflect.TypeOf(BackendBackendOrchestrationInfo{})
142+
alphaType := reflect.TypeOf(computealpha.BackendBackendOrchestrationInfo{})
143+
if err := typeEquality(compositeType, alphaType, true); err != nil {
144+
t.Fatal(err)
145+
}
146+
}
147+
140148
func TestBackendCustomMetric(t *testing.T) {
141149
compositeType := reflect.TypeOf(BackendCustomMetric{})
142150
alphaType := reflect.TypeOf(computealpha.BackendCustomMetric{})
@@ -389,6 +397,14 @@ func TestBackendServiceNetworkPassThroughLbTrafficPolicyZonalAffinity(t *testing
389397
}
390398
}
391399

400+
func TestBackendServiceOrchestrationInfo(t *testing.T) {
401+
compositeType := reflect.TypeOf(BackendServiceOrchestrationInfo{})
402+
alphaType := reflect.TypeOf(computealpha.BackendServiceOrchestrationInfo{})
403+
if err := typeEquality(compositeType, alphaType, true); err != nil {
404+
t.Fatal(err)
405+
}
406+
}
407+
392408
func TestBackendServiceParams(t *testing.T) {
393409
compositeType := reflect.TypeOf(BackendServiceParams{})
394410
alphaType := reflect.TypeOf(computealpha.BackendServiceParams{})
@@ -985,6 +1001,14 @@ func TestHttpRouteRuleMatch(t *testing.T) {
9851001
}
9861002
}
9871003

1004+
func TestImageOptimizationPolicy(t *testing.T) {
1005+
compositeType := reflect.TypeOf(ImageOptimizationPolicy{})
1006+
alphaType := reflect.TypeOf(computealpha.ImageOptimizationPolicy{})
1007+
if err := typeEquality(compositeType, alphaType, true); err != nil {
1008+
t.Fatal(err)
1009+
}
1010+
}
1011+
9881012
func TestInt64RangeMatch(t *testing.T) {
9891013
compositeType := reflect.TypeOf(Int64RangeMatch{})
9901014
alphaType := reflect.TypeOf(computealpha.Int64RangeMatch{})
@@ -2109,6 +2133,22 @@ func TestUrlMapToGA(t *testing.T) {
21092133
}
21102134
}
21112135

2136+
func TestUrlMapQuotaUsage(t *testing.T) {
2137+
compositeType := reflect.TypeOf(UrlMapQuotaUsage{})
2138+
alphaType := reflect.TypeOf(computealpha.UrlMapQuotaUsage{})
2139+
if err := typeEquality(compositeType, alphaType, true); err != nil {
2140+
t.Fatal(err)
2141+
}
2142+
}
2143+
2144+
func TestUrlMapStatus(t *testing.T) {
2145+
compositeType := reflect.TypeOf(UrlMapStatus{})
2146+
alphaType := reflect.TypeOf(computealpha.UrlMapStatus{})
2147+
if err := typeEquality(compositeType, alphaType, true); err != nil {
2148+
t.Fatal(err)
2149+
}
2150+
}
2151+
21122152
func TestUrlMapTest(t *testing.T) {
21132153
compositeType := reflect.TypeOf(UrlMapTest{})
21142154
alphaType := reflect.TypeOf(computealpha.UrlMapTest{})

vendor/cloud.google.com/go/auth/CHANGES.md

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)