vendor: update

16 files changed, 592 insertions, 201 deletions

diff --git a/vendor/cloud.google.com/go/storage/CHANGES.md b/vendor/cloud.google.com/go/storage/CHANGES.md
index 625ad4fbe..e9fb55585 100644
--- a/vendor/cloud.google.com/go/storage/CHANGES.md
+++ b/vendor/cloud.google.com/go/storage/CHANGES.md
@@ -1,6 +1,70 @@
 # Changes
 
 
+## [1.43.0](https://github.com/googleapis/google-cloud-go/compare/storage/v1.42.0...storage/v1.43.0) (2024-07-03)
+
+
+### Features
+
+* **storage/transfermanager:** Add DownloadDirectory  ([#10430](https://github.com/googleapis/google-cloud-go/issues/10430)) ([0d0e5dd](https://github.com/googleapis/google-cloud-go/commit/0d0e5dd5214769cc2c197991c2ece1303bd600de))
+* **storage/transfermanager:** Automatically shard downloads ([#10379](https://github.com/googleapis/google-cloud-go/issues/10379)) ([05816f9](https://github.com/googleapis/google-cloud-go/commit/05816f9fafd3132c371da37f3a879bb9e8e7e604))
+
+
+### Bug Fixes
+
+* **storage/transfermanager:** WaitAndClose waits for Callbacks to finish ([#10504](https://github.com/googleapis/google-cloud-go/issues/10504)) ([0e81002](https://github.com/googleapis/google-cloud-go/commit/0e81002b3a5e560c874d814d28a35a102311d9ef)), refs [#10502](https://github.com/googleapis/google-cloud-go/issues/10502)
+* **storage:** Allow empty soft delete on Create ([#10394](https://github.com/googleapis/google-cloud-go/issues/10394)) ([d8bd2c1](https://github.com/googleapis/google-cloud-go/commit/d8bd2c1ffc4f27503a74ded438d8bfbdd7707c63)), refs [#10380](https://github.com/googleapis/google-cloud-go/issues/10380)
+* **storage:** Bump google.golang.org/api@v0.187.0 ([8fa9e39](https://github.com/googleapis/google-cloud-go/commit/8fa9e398e512fd8533fd49060371e61b5725a85b))
+* **storage:** Retry broken pipe error ([#10374](https://github.com/googleapis/google-cloud-go/issues/10374)) ([2f4daa1](https://github.com/googleapis/google-cloud-go/commit/2f4daa11acf9d3f260fa888333090359c4d9198e)), refs [#9178](https://github.com/googleapis/google-cloud-go/issues/9178)
+
+
+### Documentation
+
+* **storage/control:** Remove allowlist note from Folders RPCs ([d6c543c](https://github.com/googleapis/google-cloud-go/commit/d6c543c3969016c63e158a862fc173dff60fb8d9))
+
+## [1.42.0](https://github.com/googleapis/google-cloud-go/compare/storage/v1.41.0...storage/v1.42.0) (2024-06-10)
+
+
+### Features
+
+* **storage:** Add new package transfermanager. This package is intended for parallel uploads and downloads, and is in preview. It is not stable, and is likely to change. ([#10045](https://github.com/googleapis/google-cloud-go/issues/10045)) ([cde5cbb](https://github.com/googleapis/google-cloud-go/commit/cde5cbba3145d5a702683656a42158621234fe71))
+* **storage:** Add bucket HierarchicalNamespace ([#10315](https://github.com/googleapis/google-cloud-go/issues/10315)) ([b92406c](https://github.com/googleapis/google-cloud-go/commit/b92406ccfadfdcee379e86d6f78c901d772401a9)), refs [#10146](https://github.com/googleapis/google-cloud-go/issues/10146)
+* **storage:** Add BucketName to BucketHandle ([#10127](https://github.com/googleapis/google-cloud-go/issues/10127)) ([203cc59](https://github.com/googleapis/google-cloud-go/commit/203cc599e5e2f2f821dc75b47c5a4c9073333f05))
+
+
+### Bug Fixes
+
+* **storage:** Set invocation headers on xml reads ([#10250](https://github.com/googleapis/google-cloud-go/issues/10250)) ([c87e1ab](https://github.com/googleapis/google-cloud-go/commit/c87e1ab6f9618b8b3f4d0005ac159abd87b0daaf))
+
+
+### Documentation
+
+* **storage:** Update autoclass doc ([#10135](https://github.com/googleapis/google-cloud-go/issues/10135)) ([e4b2737](https://github.com/googleapis/google-cloud-go/commit/e4b2737ddc16d3bf8139a6def7326ac905f62acd))
+
+## [1.41.0](https://github.com/googleapis/google-cloud-go/compare/storage/v1.40.0...storage/v1.41.0) (2024-05-13)
+
+
+### Features
+
+* **storage/control:** Make Managed Folders operations public ([264a6dc](https://github.com/googleapis/google-cloud-go/commit/264a6dcddbffaec987dce1dc00f6550c263d2df7))
+* **storage:** Support for soft delete policies and restore ([#9520](https://github.com/googleapis/google-cloud-go/issues/9520)) ([985deb2](https://github.com/googleapis/google-cloud-go/commit/985deb2bdd1c79944cdd960bd3fbfa38cbfa1c91))
+
+
+### Bug Fixes
+
+* **storage/control:** An existing resource pattern value `projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**}` to resource definition `storage.googleapis.com/ManagedFolder` is removed ([3e25053](https://github.com/googleapis/google-cloud-go/commit/3e250530567ee81ed4f51a3856c5940dbec35289))
+* **storage:** Add internaloption.WithDefaultEndpointTemplate ([3b41408](https://github.com/googleapis/google-cloud-go/commit/3b414084450a5764a0248756e95e13383a645f90))
+* **storage:** Bump x/net to v0.24.0 ([ba31ed5](https://github.com/googleapis/google-cloud-go/commit/ba31ed5fda2c9664f2e1cf972469295e63deb5b4))
+* **storage:** Disable gax retries for gRPC ([#9747](https://github.com/googleapis/google-cloud-go/issues/9747)) ([bbfc0ac](https://github.com/googleapis/google-cloud-go/commit/bbfc0acc272f21bf1f558ea23648183d5a11cda5))
+* **storage:** More strongly match regex ([#9706](https://github.com/googleapis/google-cloud-go/issues/9706)) ([3cfc8eb](https://github.com/googleapis/google-cloud-go/commit/3cfc8eb418e064d734bf3d8708162062dbbe988f)), refs [#9705](https://github.com/googleapis/google-cloud-go/issues/9705)
+* **storage:** Retry net.OpError on connection reset ([#10154](https://github.com/googleapis/google-cloud-go/issues/10154)) ([54fab10](https://github.com/googleapis/google-cloud-go/commit/54fab107f98b4f79c9df2959a05b981be0a613c1)), refs [#9478](https://github.com/googleapis/google-cloud-go/issues/9478)
+* **storage:** Wrap error when MaxAttempts is hit ([#9767](https://github.com/googleapis/google-cloud-go/issues/9767)) ([9cb262b](https://github.com/googleapis/google-cloud-go/commit/9cb262bb65a162665bfb8bed0022615131bae1f2)), refs [#9720](https://github.com/googleapis/google-cloud-go/issues/9720)
+
+
+### Documentation
+
+* **storage/control:** Update storage control documentation and add PHP for publishing ([1d757c6](https://github.com/googleapis/google-cloud-go/commit/1d757c66478963d6cbbef13fee939632c742759c))
+
 ## [1.40.0](https://github.com/googleapis/google-cloud-go/compare/storage/v1.39.1...storage/v1.40.0) (2024-03-29)
 
 
diff --git a/vendor/cloud.google.com/go/storage/acl.go b/vendor/cloud.google.com/go/storage/acl.go
index 74799e55e..560a5605d 100644
--- a/vendor/cloud.google.com/go/storage/acl.go
+++ b/vendor/cloud.google.com/go/storage/acl.go
@@ -16,8 +16,6 @@ package storage
 
 import (
 	"context"
-	"net/http"
-	"reflect"
 
 	"cloud.google.com/go/internal/trace"
 	"cloud.google.com/go/storage/internal/apiv2/storagepb"
@@ -162,15 +160,6 @@ func (a *ACLHandle) objectDelete(ctx context.Context, entity ACLEntity) error {
 	return a.c.tc.DeleteObjectACL(ctx, a.bucket, a.object, entity, opts...)
 }
 
-func (a *ACLHandle) configureCall(ctx context.Context, call interface{ Header() http.Header }) {
-	vc := reflect.ValueOf(call)
-	vc.MethodByName("Context").Call([]reflect.Value{reflect.ValueOf(ctx)})
-	if a.userProject != "" {
-		vc.MethodByName("UserProject").Call([]reflect.Value{reflect.ValueOf(a.userProject)})
-	}
-	setClientHeader(call.Header())
-}
-
 func toObjectACLRules(items []*raw.ObjectAccessControl) []ACLRule {
 	var rs []ACLRule
 	for _, item := range items {
diff --git a/vendor/cloud.google.com/go/storage/bucket.go b/vendor/cloud.google.com/go/storage/bucket.go
index 0344ef9de..d582a60d0 100644
--- a/vendor/cloud.google.com/go/storage/bucket.go
+++ b/vendor/cloud.google.com/go/storage/bucket.go
@@ -116,6 +116,11 @@ func (b *BucketHandle) DefaultObjectACL() *ACLHandle {
 	return &b.defaultObjectACL
 }
 
+// BucketName returns the name of the bucket.
+func (b *BucketHandle) BucketName() string {
+	return b.name
+}
+
 // Object returns an ObjectHandle, which provides operations on the named object.
 // This call does not perform any network operations such as fetching the object or verifying its existence.
 // Use methods on ObjectHandle to perform network operations.
@@ -479,6 +484,20 @@ type BucketAttrs struct {
 	// cannot be modified once the bucket is created.
 	// ObjectRetention cannot be configured or reported through the gRPC API.
 	ObjectRetentionMode string
+
+	// SoftDeletePolicy contains the bucket's soft delete policy, which defines
+	// the period of time that soft-deleted objects will be retained, and cannot
+	// be permanently deleted. By default, new buckets will be created with a
+	// 7 day retention duration. In order to fully disable soft delete, you need
+	// to set a policy with a RetentionDuration of 0.
+	SoftDeletePolicy *SoftDeletePolicy
+
+	// HierarchicalNamespace contains the bucket's hierarchical namespace
+	// configuration. Hierarchical namespace enabled buckets can contain
+	// [cloud.google.com/go/storage/control/apiv2/controlpb.Folder] resources.
+	// It cannot be modified after bucket creation time.
+	// UniformBucketLevelAccess must also also be enabled on the bucket.
+	HierarchicalNamespace *HierarchicalNamespace
 }
 
 // BucketPolicyOnly is an alias for UniformBucketLevelAccess.
@@ -760,12 +779,35 @@ type Autoclass struct {
 	// TerminalStorageClass: The storage class that objects in the bucket
 	// eventually transition to if they are not read for a certain length of
 	// time. Valid values are NEARLINE and ARCHIVE.
+	// To modify TerminalStorageClass, Enabled must be set to true.
 	TerminalStorageClass string
 	// TerminalStorageClassUpdateTime represents the time of the most recent
 	// update to "TerminalStorageClass".
 	TerminalStorageClassUpdateTime time.Time
 }
 
+// SoftDeletePolicy contains the bucket's soft delete policy, which defines the
+// period of time that soft-deleted objects will be retained, and cannot be
+// permanently deleted.
+type SoftDeletePolicy struct {
+	// EffectiveTime indicates the time from which the policy, or one with a
+	// greater retention, was effective. This field is read-only.
+	EffectiveTime time.Time
+
+	// RetentionDuration is the amount of time that soft-deleted objects in the
+	// bucket will be retained and cannot be permanently deleted.
+	RetentionDuration time.Duration
+}
+
+// HierarchicalNamespace contains the bucket's hierarchical namespace
+// configuration. Hierarchical namespace enabled buckets can contain
+// [cloud.google.com/go/storage/control/apiv2/controlpb.Folder] resources.
+type HierarchicalNamespace struct {
+	// Enabled indicates whether hierarchical namespace features are enabled on
+	// the bucket. This can only be set at bucket creation time currently.
+	Enabled bool
+}
+
 func newBucket(b *raw.Bucket) (*BucketAttrs, error) {
 	if b == nil {
 		return nil, nil
@@ -803,6 +845,8 @@ func newBucket(b *raw.Bucket) (*BucketAttrs, error) {
 		RPO:                      toRPO(b),
 		CustomPlacementConfig:    customPlacementFromRaw(b.CustomPlacementConfig),
 		Autoclass:                toAutoclassFromRaw(b.Autoclass),
+		SoftDeletePolicy:         toSoftDeletePolicyFromRaw(b.SoftDeletePolicy),
+		HierarchicalNamespace:    toHierarchicalNamespaceFromRaw(b.HierarchicalNamespace),
 	}, nil
 }
 
@@ -836,6 +880,8 @@ func newBucketFromProto(b *storagepb.Bucket) *BucketAttrs {
 		CustomPlacementConfig:    customPlacementFromProto(b.GetCustomPlacementConfig()),
 		ProjectNumber:            parseProjectNumber(b.GetProject()), // this can return 0 the project resource name is ID based
 		Autoclass:                toAutoclassFromProto(b.GetAutoclass()),
+		SoftDeletePolicy:         toSoftDeletePolicyFromProto(b.SoftDeletePolicy),
+		HierarchicalNamespace:    toHierarchicalNamespaceFromProto(b.HierarchicalNamespace),
 	}
 }
 
@@ -891,6 +937,8 @@ func (b *BucketAttrs) toRawBucket() *raw.Bucket {
 		Rpo:                   b.RPO.String(),
 		CustomPlacementConfig: b.CustomPlacementConfig.toRawCustomPlacement(),
 		Autoclass:             b.Autoclass.toRawAutoclass(),
+		SoftDeletePolicy:      b.SoftDeletePolicy.toRawSoftDeletePolicy(),
+		HierarchicalNamespace: b.HierarchicalNamespace.toRawHierarchicalNamespace(),
 	}
 }
 
@@ -951,6 +999,8 @@ func (b *BucketAttrs) toProtoBucket() *storagepb.Bucket {
 		Rpo:                   b.RPO.String(),
 		CustomPlacementConfig: b.CustomPlacementConfig.toProtoCustomPlacement(),
 		Autoclass:             b.Autoclass.toProtoAutoclass(),
+		SoftDeletePolicy:      b.SoftDeletePolicy.toProtoSoftDeletePolicy(),
+		HierarchicalNamespace: b.HierarchicalNamespace.toProtoHierarchicalNamespace(),
 	}
 }
 
@@ -1032,6 +1082,7 @@ func (ua *BucketAttrsToUpdate) toProtoBucket() *storagepb.Bucket {
 		IamConfig:             bktIAM,
 		Rpo:                   ua.RPO.String(),
 		Autoclass:             ua.Autoclass.toProtoAutoclass(),
+		SoftDeletePolicy:      ua.SoftDeletePolicy.toProtoSoftDeletePolicy(),
 		Labels:                ua.setLabels,
 	}
 }
@@ -1149,9 +1200,15 @@ type BucketAttrsToUpdate struct {
 	RPO RPO
 
 	// If set, updates the autoclass configuration of the bucket.
+	// To disable autoclass on the bucket, set to an empty &Autoclass{}.
+	// To update the configuration for Autoclass.TerminalStorageClass,
+	// Autoclass.Enabled must also be set to true.
 	// See https://cloud.google.com/storage/docs/using-autoclass for more information.
 	Autoclass *Autoclass
 
+	// If set, updates the soft delete policy of the bucket.
+	SoftDeletePolicy *SoftDeletePolicy
+
 	// acl is the list of access control rules on the bucket.
 	// It is unexported and only used internally by the gRPC client.
 	// Library users should use ACLHandle methods directly.
@@ -1273,6 +1330,14 @@ func (ua *BucketAttrsToUpdate) toRawBucket() *raw.Bucket {
 		}
 		rb.ForceSendFields = append(rb.ForceSendFields, "Autoclass")
 	}
+	if ua.SoftDeletePolicy != nil {
+		if ua.SoftDeletePolicy.RetentionDuration == 0 {
+			rb.NullFields = append(rb.NullFields, "SoftDeletePolicy")
+			rb.SoftDeletePolicy = nil
+		} else {
+			rb.SoftDeletePolicy = ua.SoftDeletePolicy.toRawSoftDeletePolicy()
+		}
+	}
 	if ua.PredefinedACL != "" {
 		// Clear ACL or the call will fail.
 		rb.Acl = nil
@@ -2053,6 +2118,92 @@ func toAutoclassFromProto(a *storagepb.Bucket_Autoclass) *Autoclass {
 	}
 }
 
+func (p *SoftDeletePolicy) toRawSoftDeletePolicy() *raw.BucketSoftDeletePolicy {
+	if p == nil {
+		return nil
+	}
+	// Excluding read only field EffectiveTime.
+	// ForceSendFields must be set to send a zero value for RetentionDuration and disable
+	// soft delete.
+	return &raw.BucketSoftDeletePolicy{
+		RetentionDurationSeconds: int64(p.RetentionDuration.Seconds()),
+		ForceSendFields:          []string{"RetentionDurationSeconds"},
+	}
+}
+
+func (p *SoftDeletePolicy) toProtoSoftDeletePolicy() *storagepb.Bucket_SoftDeletePolicy {
+	if p == nil {
+		return nil
+	}
+	// Excluding read only field EffectiveTime.
+	return &storagepb.Bucket_SoftDeletePolicy{
+		RetentionDuration: durationpb.New(p.RetentionDuration),
+	}
+}
+
+func toSoftDeletePolicyFromRaw(p *raw.BucketSoftDeletePolicy) *SoftDeletePolicy {
+	if p == nil {
+		return nil
+	}
+
+	policy := &SoftDeletePolicy{
+		RetentionDuration: time.Duration(p.RetentionDurationSeconds) * time.Second,
+	}
+
+	// Return EffectiveTime only if parsed to a valid value.
+	if t, err := time.Parse(time.RFC3339, p.EffectiveTime); err == nil {
+		policy.EffectiveTime = t
+	}
+
+	return policy
+}
+
+func toSoftDeletePolicyFromProto(p *storagepb.Bucket_SoftDeletePolicy) *SoftDeletePolicy {
+	if p == nil {
+		return nil
+	}
+	return &SoftDeletePolicy{
+		EffectiveTime:     p.GetEffectiveTime().AsTime(),
+		RetentionDuration: p.GetRetentionDuration().AsDuration(),
+	}
+}
+
+func (hns *HierarchicalNamespace) toProtoHierarchicalNamespace() *storagepb.Bucket_HierarchicalNamespace {
+	if hns == nil {
+		return nil
+	}
+	return &storagepb.Bucket_HierarchicalNamespace{
+		Enabled: hns.Enabled,
+	}
+}
+
+func (hns *HierarchicalNamespace) toRawHierarchicalNamespace() *raw.BucketHierarchicalNamespace {
+	if hns == nil {
+		return nil
+	}
+	return &raw.BucketHierarchicalNamespace{
+		Enabled: hns.Enabled,
+	}
+}
+
+func toHierarchicalNamespaceFromProto(p *storagepb.Bucket_HierarchicalNamespace) *HierarchicalNamespace {
+	if p == nil {
+		return nil
+	}
+	return &HierarchicalNamespace{
+		Enabled: p.Enabled,
+	}
+}
+
+func toHierarchicalNamespaceFromRaw(r *raw.BucketHierarchicalNamespace) *HierarchicalNamespace {
+	if r == nil {
+		return nil
+	}
+	return &HierarchicalNamespace{
+		Enabled: r.Enabled,
+	}
+}
+
 // Objects returns an iterator over the objects in the bucket that match the
 // Query q. If q is nil, no filtering is done. Objects will be iterated over
 // lexicographically by name.
diff --git a/vendor/cloud.google.com/go/storage/client.go b/vendor/cloud.google.com/go/storage/client.go
index 70b2a280e..bbe89276a 100644
--- a/vendor/cloud.google.com/go/storage/client.go
+++ b/vendor/cloud.google.com/go/storage/client.go
@@ -59,8 +59,9 @@ type storageClient interface {
 	// Object metadata methods.
 
 	DeleteObject(ctx context.Context, bucket, object string, gen int64, conds *Conditions, opts ...storageOption) error
-	GetObject(ctx context.Context, bucket, object string, gen int64, encryptionKey []byte, conds *Conditions, opts ...storageOption) (*ObjectAttrs, error)
+	GetObject(ctx context.Context, params *getObjectParams, opts ...storageOption) (*ObjectAttrs, error)
 	UpdateObject(ctx context.Context, params *updateObjectParams, opts ...storageOption) (*ObjectAttrs, error)
+	RestoreObject(ctx context.Context, params *restoreObjectParams, opts ...storageOption) (*ObjectAttrs, error)
 
 	// Default Object ACL methods.
 
@@ -182,16 +183,6 @@ type storageOption interface {
 	Apply(s *settings)
 }
 
-func withGAXOptions(opts ...gax.CallOption) storageOption {
-	return &gaxOption{opts}
-}
-
-type gaxOption struct {
-	opts []gax.CallOption
-}
-
-func (o *gaxOption) Apply(s *settings) { s.gax = o.opts }
-
 func withRetryConfig(rc *retryConfig) storageOption {
 	return &retryOption{rc}
 }
@@ -294,6 +285,14 @@ type newRangeReaderParams struct {
 	readCompressed bool // Use accept-encoding: gzip. Only works for HTTP currently.
 }
 
+type getObjectParams struct {
+	bucket, object string
+	gen            int64
+	encryptionKey  []byte
+	conds          *Conditions
+	softDeleted    bool
+}
+
 type updateObjectParams struct {
 	bucket, object    string
 	uattrs            *ObjectAttrsToUpdate
@@ -303,6 +302,14 @@ type updateObjectParams struct {
 	overrideRetention *bool
 }
 
+type restoreObjectParams struct {
+	bucket, object string
+	gen            int64
+	encryptionKey  []byte
+	conds          *Conditions
+	copySourceACL  bool
+}
+
 type composeObjectRequest struct {
 	dstBucket     string
 	dstObject     destinationObject
diff --git a/vendor/cloud.google.com/go/storage/doc.go b/vendor/cloud.google.com/go/storage/doc.go
index b23cebcb8..c274c762e 100644
--- a/vendor/cloud.google.com/go/storage/doc.go
+++ b/vendor/cloud.google.com/go/storage/doc.go
@@ -350,7 +350,7 @@ To create a client which will use gRPC, use the alternate constructor:
 	// Use client as usual.
 
 If the application is running within GCP, users may get better performance by
-enabling Google Direct Access (enabling requests to skip some proxy steps). To enable,
+enabling Direct Google Access (enabling requests to skip some proxy steps). To enable,
 set the environment variable `GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS=true` and add
 the following side-effect imports to your application:
 
@@ -359,6 +359,13 @@ the following side-effect imports to your application:
 		_ "google.golang.org/grpc/xds/googledirectpath"
 	)
 
+# Storage Control API
+
+Certain control plane and long-running operations for Cloud Storage (including Folder
+and Managed Folder operations) are supported via the autogenerated Storage Control
+client, which is available as a subpackage in this module. See package docs at
+[cloud.google.com/go/storage/control/apiv2] or reference the [Storage Control API] docs.
+
 [Cloud Storage IAM docs]: https://cloud.google.com/storage/docs/access-control/iam
 [XML POST Object docs]: https://cloud.google.com/storage/docs/xml-api/post-object
 [Cloud Storage retry docs]: https://cloud.google.com/storage/docs/retry-strategy
@@ -367,5 +374,6 @@ the following side-effect imports to your application:
 [impersonation enabled]: https://cloud.google.com/sdk/gcloud/reference#--impersonate-service-account
 [IAM Service Account Credentials API]: https://console.developers.google.com/apis/api/iamcredentials.googleapis.com/overview
 [custom audit logging]: https://cloud.google.com/storage/docs/audit-logging#add-custom-metadata
+[Storage Control API]: https://cloud.google.com/storage/docs/reference/rpc/google.storage.control.v2
 */
 package storage // import "cloud.google.com/go/storage"
diff --git a/vendor/cloud.google.com/go/storage/grpc_client.go b/vendor/cloud.google.com/go/storage/grpc_client.go
index e337213f0..d81a17b6b 100644
--- a/vendor/cloud.google.com/go/storage/grpc_client.go
+++ b/vendor/cloud.google.com/go/storage/grpc_client.go
@@ -28,7 +28,6 @@ import (
 	"cloud.google.com/go/internal/trace"
 	gapic "cloud.google.com/go/storage/internal/apiv2"
 	"cloud.google.com/go/storage/internal/apiv2/storagepb"
-	"github.com/golang/protobuf/proto"
 	"github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/iterator"
@@ -40,6 +39,7 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/encoding/protowire"
+	"google.golang.org/protobuf/proto"
 	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
@@ -116,6 +116,8 @@ type grpcStorageClient struct {
 func newGRPCStorageClient(ctx context.Context, opts ...storageOption) (storageClient, error) {
 	s := initSettings(opts...)
 	s.clientOption = append(defaultGRPCOptions(), s.clientOption...)
+	// Disable all gax-level retries in favor of retry logic in the veneer client.
+	s.gax = append(s.gax, gax.WithRetry(nil))
 
 	config := newStorageConfig(s.clientOption...)
 	if config.readAPIWasSet {
@@ -365,6 +367,9 @@ func (c *grpcStorageClient) UpdateBucket(ctx context.Context, bucket string, uat
 	if uattrs.Autoclass != nil {
 		fieldMask.Paths = append(fieldMask.Paths, "autoclass")
 	}
+	if uattrs.SoftDeletePolicy != nil {
+		fieldMask.Paths = append(fieldMask.Paths, "soft_delete_policy")
+	}
 
 	for label := range uattrs.setLabels {
 		fieldMask.Paths = append(fieldMask.Paths, fmt.Sprintf("labels.%s", label))
@@ -377,6 +382,13 @@ func (c *grpcStorageClient) UpdateBucket(ctx context.Context, bucket string, uat
 
 	req.UpdateMask = fieldMask
 
+	if len(fieldMask.Paths) < 1 {
+		// Nothing to update. Send a get request for current attrs instead. This
+		// maintains consistency with JSON bucket updates.
+		opts = append(opts, idempotent(true))
+		return c.GetBucket(ctx, bucket, conds, opts...)
+	}
+
 	var battrs *BucketAttrs
 	err := run(ctx, func(ctx context.Context) error {
 		res, err := c.raw.UpdateBucket(ctx, req, s.gax...)
@@ -419,6 +431,7 @@ func (c *grpcStorageClient) ListObjects(ctx context.Context, bucket string, q *Q
 		IncludeTrailingDelimiter: it.query.IncludeTrailingDelimiter,
 		MatchGlob:                it.query.MatchGlob,
 		ReadMask:                 q.toFieldMask(), // a nil Query still results in a "*" FieldMask
+		SoftDeleted:              it.query.SoftDeleted,
 	}
 	if s.userProject != "" {
 		ctx = setUserProjectMetadata(ctx, s.userProject)
@@ -488,22 +501,25 @@ func (c *grpcStorageClient) DeleteObject(ctx context.Context, bucket, object str
 	return err
 }
 
-func (c *grpcStorageClient) GetObject(ctx context.Context, bucket, object string, gen int64, encryptionKey []byte, conds *Conditions, opts ...storageOption) (*ObjectAttrs, error) {
+func (c *grpcStorageClient) GetObject(ctx context.Context, params *getObjectParams, opts ...storageOption) (*ObjectAttrs, error) {
 	s := callSettings(c.settings, opts...)
 	req := &storagepb.GetObjectRequest{
-		Bucket: bucketResourceName(globalProjectAlias, bucket),
-		Object: object,
+		Bucket: bucketResourceName(globalProjectAlias, params.bucket),
+		Object: params.object,
 		// ProjectionFull by default.
 		ReadMask: &fieldmaskpb.FieldMask{Paths: []string{"*"}},
 	}
-	if err := applyCondsProto("grpcStorageClient.GetObject", gen, conds, req); err != nil {
+	if err := applyCondsProto("grpcStorageClient.GetObject", params.gen, params.conds, req); err != nil {
 		return nil, err
 	}
 	if s.userProject != "" {
 		ctx = setUserProjectMetadata(ctx, s.userProject)
 	}
-	if encryptionKey != nil {
-		req.CommonObjectRequestParams = toProtoCommonObjectRequestParams(encryptionKey)
+	if params.encryptionKey != nil {
+		req.CommonObjectRequestParams = toProtoCommonObjectRequestParams(params.encryptionKey)
+	}
+	if params.softDeleted {
+		req.SoftDeleted = &params.softDeleted
 	}
 
 	var attrs *ObjectAttrs
@@ -593,6 +609,17 @@ func (c *grpcStorageClient) UpdateObject(ctx context.Context, params *updateObje
 
 	req.UpdateMask = fieldMask
 
+	if len(fieldMask.Paths) < 1 {
+		// Nothing to update. To maintain consistency with JSON, we must still
+		// update the object because metageneration and other fields are
+		// updated even on an empty update.
+		// gRPC will fail if the fieldmask is empty, so instead we add an
+		// output-only field to the update mask. Output-only fields are (and must
+		// be - see AIP 161) ignored, but allow us to send an empty update because
+		// any mask that is valid for read (as this one is) must be valid for write.
+		fieldMask.Paths = append(fieldMask.Paths, "create_time")
+	}
+
 	var attrs *ObjectAttrs
 	err := run(ctx, func(ctx context.Context) error {
 		res, err := c.raw.UpdateObject(ctx, req, s.gax...)
@@ -606,6 +633,32 @@ func (c *grpcStorageClient) UpdateObject(ctx context.Context, params *updateObje
 	return attrs, err
 }
 
+func (c *grpcStorageClient) RestoreObject(ctx context.Context, params *restoreObjectParams, opts ...storageOption) (*ObjectAttrs, error) {
+	s := callSettings(c.settings, opts...)
+	req := &storagepb.RestoreObjectRequest{
+		Bucket:        bucketResourceName(globalProjectAlias, params.bucket),
+		Object:        params.object,
+		CopySourceAcl: &params.copySourceACL,
+	}
+	if err := applyCondsProto("grpcStorageClient.RestoreObject", params.gen, params.conds, req); err != nil {
+		return nil, err
+	}
+	if s.userProject != "" {
+		ctx = setUserProjectMetadata(ctx, s.userProject)
+	}
+
+	var attrs *ObjectAttrs
+	err := run(ctx, func(ctx context.Context) error {
+		res, err := c.raw.RestoreObject(ctx, req, s.gax...)
+		attrs = newObjectFromProto(res)
+		return err
+	}, s.retry, s.idempotent)
+	if s, ok := status.FromError(err); ok && s.Code() == codes.NotFound {
+		return nil, ErrObjectNotExist
+	}
+	return attrs, err
+}
+
 // Default Object ACL methods.
 
 func (c *grpcStorageClient) DeleteDefaultObjectACL(ctx context.Context, bucket string, entity ACLEntity, opts ...storageOption) error {
@@ -735,7 +788,7 @@ func (c *grpcStorageClient) UpdateBucketACL(ctx context.Context, bucket string,
 func (c *grpcStorageClient) DeleteObjectACL(ctx context.Context, bucket, object string, entity ACLEntity, opts ...storageOption) error {
 	// There is no separate API for PATCH in gRPC.
 	// Make a GET call first to retrieve ObjectAttrs.
-	attrs, err := c.GetObject(ctx, bucket, object, defaultGen, nil, nil, opts...)
+	attrs, err := c.GetObject(ctx, &getObjectParams{bucket, object, defaultGen, nil, nil, false}, opts...)
 	if err != nil {
 		return err
 	}
@@ -768,7 +821,7 @@ func (c *grpcStorageClient) DeleteObjectACL(ctx context.Context, bucket, object
 // ListObjectACLs retrieves object ACL entries. By default, it operates on the latest generation of this object.
 // Selecting a specific generation of this object is not currently supported by the client.
 func (c *grpcStorageClient) ListObjectACLs(ctx context.Context, bucket, object string, opts ...storageOption) ([]ACLRule, error) {
-	o, err := c.GetObject(ctx, bucket, object, defaultGen, nil, nil, opts...)
+	o, err := c.GetObject(ctx, &getObjectParams{bucket, object, defaultGen, nil, nil, false}, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -778,7 +831,7 @@ func (c *grpcStorageClient) ListObjectACLs(ctx context.Context, bucket, object s
 func (c *grpcStorageClient) UpdateObjectACL(ctx context.Context, bucket, object string, entity ACLEntity, role ACLRole, opts ...storageOption) error {
 	// There is no separate API for PATCH in gRPC.
 	// Make a GET call first to retrieve ObjectAttrs.
-	attrs, err := c.GetObject(ctx, bucket, object, defaultGen, nil, nil, opts...)
+	attrs, err := c.GetObject(ctx, &getObjectParams{bucket, object, defaultGen, nil, nil, false}, opts...)
 	if err != nil {
 		return err
 	}
diff --git a/vendor/cloud.google.com/go/storage/hmac.go b/vendor/cloud.google.com/go/storage/hmac.go
index 1b9fbe9dd..f7811a5d1 100644
--- a/vendor/cloud.google.com/go/storage/hmac.go
+++ b/vendor/cloud.google.com/go/storage/hmac.go
@@ -272,7 +272,6 @@ func (it *HMACKeysIterator) fetch(pageSize int, pageToken string) (token string,
 	// TODO: Remove fetch method upon integration. This method is internalized into
 	// httpStorageClient.ListHMACKeys() as it is the only caller.
 	call := it.raw.List(it.projectID)
-	setClientHeader(call.Header())
 	if pageToken != "" {
 		call = call.PageToken(pageToken)
 	}
diff --git a/vendor/cloud.google.com/go/storage/http_client.go b/vendor/cloud.google.com/go/storage/http_client.go
index f75d93897..0e213a663 100644
--- a/vendor/cloud.google.com/go/storage/http_client.go
+++ b/vendor/cloud.google.com/go/storage/http_client.go
@@ -107,12 +107,12 @@ func newHTTPStorageClient(ctx context.Context, opts ...storageOption) (storageCl
 		// Append the emulator host as default endpoint for the user
 		o = append([]option.ClientOption{option.WithoutAuthentication()}, o...)
 
-		o = append(o, internaloption.WithDefaultEndpoint(endpoint))
+		o = append(o, internaloption.WithDefaultEndpointTemplate(endpoint))
 		o = append(o, internaloption.WithDefaultMTLSEndpoint(endpoint))
 	}
 	s.clientOption = o
 
-	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpoint, and WithDefaultMTLSEndpoint.
+	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpointTemplate, and WithDefaultMTLSEndpoint.
 	hc, ep, err := htransport.NewClient(ctx, s.clientOption...)
 	if err != nil {
 		return nil, fmt.Errorf("dialing: %w", err)
@@ -176,7 +176,6 @@ func (c *httpStorageClient) CreateBucket(ctx context.Context, project, bucket st
 		bkt.Location = "US"
 	}
 	req := c.raw.Buckets.Insert(project, bkt)
-	setClientHeader(req.Header())
 	if attrs != nil && attrs.PredefinedACL != "" {
 		req.PredefinedAcl(attrs.PredefinedACL)
 	}
@@ -207,7 +206,6 @@ func (c *httpStorageClient) ListBuckets(ctx context.Context, project string, opt
 
 	fetch := func(pageSize int, pageToken string) (token string, err error) {
 		req := c.raw.Buckets.List(it.projectID)
-		setClientHeader(req.Header())
 		req.Projection("full")
 		req.Prefix(it.Prefix)
 		req.PageToken(pageToken)
@@ -245,7 +243,6 @@ func (c *httpStorageClient) ListBuckets(ctx context.Context, project string, opt
 func (c *httpStorageClient) DeleteBucket(ctx context.Context, bucket string, conds *BucketConditions, opts ...storageOption) error {
 	s := callSettings(c.settings, opts...)
 	req := c.raw.Buckets.Delete(bucket)
-	setClientHeader(req.Header())
 	if err := applyBucketConds("httpStorageClient.DeleteBucket", conds, req); err != nil {
 		return err
 	}
@@ -259,7 +256,6 @@ func (c *httpStorageClient) DeleteBucket(ctx context.Context, bucket string, con
 func (c *httpStorageClient) GetBucket(ctx context.Context, bucket string, conds *BucketConditions, opts ...storageOption) (*BucketAttrs, error) {
 	s := callSettings(c.settings, opts...)
 	req := c.raw.Buckets.Get(bucket).Projection("full")
-	setClientHeader(req.Header())
 	err := applyBucketConds("httpStorageClient.GetBucket", conds, req)
 	if err != nil {
 		return nil, err
@@ -287,7 +283,6 @@ func (c *httpStorageClient) UpdateBucket(ctx context.Context, bucket string, uat
 	s := callSettings(c.settings, opts...)
 	rb := uattrs.toRawBucket()
 	req := c.raw.Buckets.Patch(bucket, rb).Projection("full")
-	setClientHeader(req.Header())
 	err := applyBucketConds("httpStorageClient.UpdateBucket", conds, req)
 	if err != nil {
 		return nil, err
@@ -337,7 +332,9 @@ func (c *httpStorageClient) ListObjects(ctx context.Context, bucket string, q *Q
 	}
 	fetch := func(pageSize int, pageToken string) (string, error) {
 		req := c.raw.Objects.List(bucket)
-		setClientHeader(req.Header())
+		if it.query.SoftDeleted {
+			req.SoftDeleted(it.query.SoftDeleted)
+		}
 		projection := it.query.Projection
 		if projection == ProjectionDefault {
 			projection = ProjectionFull
@@ -409,18 +406,22 @@ func (c *httpStorageClient) DeleteObject(ctx context.Context, bucket, object str
 	return err
 }
 
-func (c *httpStorageClient) GetObject(ctx context.Context, bucket, object string, gen int64, encryptionKey []byte, conds *Conditions, opts ...storageOption) (*ObjectAttrs, error) {
+func (c *httpStorageClient) GetObject(ctx context.Context, params *getObjectParams, opts ...storageOption) (*ObjectAttrs, error) {
 	s := callSettings(c.settings, opts...)
-	req := c.raw.Objects.Get(bucket, object).Projection("full").Context(ctx)
-	if err := applyConds("Attrs", gen, conds, req); err != nil {
+	req := c.raw.Objects.Get(params.bucket, params.object).Projection("full").Context(ctx)
+	if err := applyConds("Attrs", params.gen, params.conds, req); err != nil {
 		return nil, err
 	}
 	if s.userProject != "" {
 		req.UserProject(s.userProject)
 	}
-	if err := setEncryptionHeaders(req.Header(), encryptionKey, false); err != nil {
+	if err := setEncryptionHeaders(req.Header(), params.encryptionKey, false); err != nil {
 		return nil, err
 	}
+	if params.softDeleted {
+		req.SoftDeleted(params.softDeleted)
+	}
+
 	var obj *raw.Object
 	var err error
 	err = run(ctx, func(ctx context.Context) error {
@@ -547,6 +548,33 @@ func (c *httpStorageClient) UpdateObject(ctx context.Context, params *updateObje
 	return newObject(obj), nil
 }
 
+func (c *httpStorageClient) RestoreObject(ctx context.Context, params *restoreObjectParams, opts ...storageOption) (*ObjectAttrs, error) {
+	s := callSettings(c.settings, opts...)
+	req := c.raw.Objects.Restore(params.bucket, params.object, params.gen).Context(ctx)
+	// Do not set the generation here since it's not an optional condition; it gets set above.
+	if err := applyConds("RestoreObject", defaultGen, params.conds, req); err != nil {
+		return nil, err
+	}
+	if s.userProject != "" {
+		req.UserProject(s.userProject)
+	}
+	if params.copySourceACL {
+		req.CopySourceAcl(params.copySourceACL)
+	}
+	if err := setEncryptionHeaders(req.Header(), params.encryptionKey, false); err != nil {
+		return nil, err
+	}
+
+	var obj *raw.Object
+	var err error
+	err = run(ctx, func(ctx context.Context) error { obj, err = req.Context(ctx).Do(); return err }, s.retry, s.idempotent)
+	var e *googleapi.Error
+	if ok := errors.As(err, &e); ok && e.Code == http.StatusNotFound {
+		return nil, ErrObjectNotExist
+	}
+	return newObject(obj), err
+}
+
 // Default Object ACL methods.
 
 func (c *httpStorageClient) DeleteDefaultObjectACL(ctx context.Context, bucket string, entity ACLEntity, opts ...storageOption) error {
@@ -632,7 +660,7 @@ func (c *httpStorageClient) UpdateBucketACL(ctx context.Context, bucket string,
 	}, s.retry, s.idempotent)
 }
 
-// configureACLCall sets the context, user project and headers on the apiary library call.
+// configureACLCall sets the context and user project on the apiary library call.
 // This will panic if the call does not have the correct methods.
 func configureACLCall(ctx context.Context, userProject string, call interface{ Header() http.Header }) {
 	vc := reflect.ValueOf(call)
@@ -640,7 +668,6 @@ func configureACLCall(ctx context.Context, userProject string, call interface{ H
 	if userProject != "" {
 		vc.MethodByName("UserProject").Call([]reflect.Value{reflect.ValueOf(userProject)})
 	}
-	setClientHeader(call.Header())
 }
 
 // Object ACL methods.
@@ -726,7 +753,6 @@ func (c *httpStorageClient) ComposeObject(ctx context.Context, req *composeObjec
 		return nil, err
 	}
 	var obj *raw.Object
-	setClientHeader(call.Header())
 
 	var err error
 	retryCall := func(ctx context.Context) error { obj, err = call.Context(ctx).Do(); return err }
@@ -775,7 +801,6 @@ func (c *httpStorageClient) RewriteObject(ctx context.Context, req *rewriteObjec
 
 	var res *raw.RewriteResponse
 	var err error
-	setClientHeader(call.Header())
 
 	retryCall := func(ctx context.Context) error { res, err = call.Context(ctx).Do(); return err }
 
@@ -830,17 +855,18 @@ func (c *httpStorageClient) newRangeReaderXML(ctx context.Context, params *newRa
 		return nil, err
 	}
 
-	// Set custom headers passed in via the context. This is only required for XML;
-	// for gRPC & JSON this is handled in the GAPIC and Apiary layers respectively.
-	ctxHeaders := callctx.HeadersFromContext(ctx)
-	for k, vals := range ctxHeaders {
-		for _, v := range vals {
-			req.Header.Add(k, v)
-		}
-	}
-
 	reopen := readerReopen(ctx, req.Header, params, s,
-		func(ctx context.Context) (*http.Response, error) { return c.hc.Do(req.WithContext(ctx)) },
+		func(ctx context.Context) (*http.Response, error) {
+			// Set custom headers passed in via the context. This is only required for XML;
+			// for gRPC & JSON this is handled in the GAPIC and Apiary layers respectively.
+			ctxHeaders := callctx.HeadersFromContext(ctx)
+			for k, vals := range ctxHeaders {
+				for _, v := range vals {
+					req.Header.Set(k, v)
+				}
+			}
+			return c.hc.Do(req.WithContext(ctx))
+		},
 		func() error { return setConditionsHeaders(req.Header, params.conds) },
 		func() { req.URL.RawQuery = fmt.Sprintf("generation=%d", params.gen) })
 
@@ -854,7 +880,6 @@ func (c *httpStorageClient) newRangeReaderXML(ctx context.Context, params *newRa
 func (c *httpStorageClient) newRangeReaderJSON(ctx context.Context, params *newRangeReaderParams, s *settings) (r *Reader, err error) {
 	call := c.raw.Objects.Get(params.bucket, params.object)
 
-	setClientHeader(call.Header())
 	call.Projection("full")
 
 	if s.userProject != "" {
@@ -970,7 +995,6 @@ func (c *httpStorageClient) OpenWriter(params *openWriterParams, opts ...storage
 func (c *httpStorageClient) GetIamPolicy(ctx context.Context, resource string, version int32, opts ...storageOption) (*iampb.Policy, error) {
 	s := callSettings(c.settings, opts...)
 	call := c.raw.Buckets.GetIamPolicy(resource).OptionsRequestedPolicyVersion(int64(version))
-	setClientHeader(call.Header())
 	if s.userProject != "" {
 		call.UserProject(s.userProject)
 	}
@@ -991,7 +1015,6 @@ func (c *httpStorageClient) SetIamPolicy(ctx context.Context, resource string, p
 
 	rp := iamToStoragePolicy(policy)
 	call := c.raw.Buckets.SetIamPolicy(resource, rp)
-	setClientHeader(call.Header())
 	if s.userProject != "" {
 		call.UserProject(s.userProject)
 	}
@@ -1005,7 +1028,6 @@ func (c *httpStorageClient) SetIamPolicy(ctx context.Context, resource string, p
 func (c *httpStorageClient) TestIamPermissions(ctx context.Context, resource string, permissions []string, opts ...storageOption) ([]string, error) {
 	s := callSettings(c.settings, opts...)
 	call := c.raw.Buckets.TestIamPermissions(resource, permissions)
-	setClientHeader(call.Header())
 	if s.userProject != "" {
 		call.UserProject(s.userProject)
 	}
@@ -1054,7 +1076,6 @@ func (c *httpStorageClient) ListHMACKeys(ctx context.Context, project, serviceAc
 	}
 	fetch := func(pageSize int, pageToken string) (token string, err error) {
 		call := c.raw.Projects.HmacKeys.List(project)
-		setClientHeader(call.Header())
 		if pageToken != "" {
 			call = call.PageToken(pageToken)
 		}
diff --git a/vendor/cloud.google.com/go/storage/internal/apiv2/storage_client.go b/vendor/cloud.google.com/go/storage/internal/apiv2/storage_client.go
index 47300d7a1..82ec5db90 100644
--- a/vendor/cloud.google.com/go/storage/internal/apiv2/storage_client.go
+++ b/vendor/cloud.google.com/go/storage/internal/apiv2/storage_client.go
@@ -962,7 +962,9 @@ func (c *gRPCClient) Connection() *grpc.ClientConn {
 func (c *gRPCClient) setGoogleClientInfo(keyval ...string) {
 	kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
 	kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
-	c.xGoogHeaders = []string{"x-goog-api-client", gax.XGoogHeader(kv...)}
+	c.xGoogHeaders = []string{
+		"x-goog-api-client", gax.XGoogHeader(kv...),
+	}
 }
 
 // Close closes the connection to the API service. The user should invoke this when
diff --git a/vendor/cloud.google.com/go/storage/internal/apiv2/storagepb/storage.pb.go b/vendor/cloud.google.com/go/storage/internal/apiv2/storagepb/storage.pb.go
index 9637bc0a5..aeb7512f4 100644
--- a/vendor/cloud.google.com/go/storage/internal/apiv2/storagepb/storage.pb.go
+++ b/vendor/cloud.google.com/go/storage/internal/apiv2/storagepb/storage.pb.go
@@ -1,4 +1,4 @@
-// Copyright 2023 Google LLC
+// Copyright 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.32.0
-// 	protoc        v4.25.2
+// 	protoc-gen-go v1.34.2
+// 	protoc        v4.25.3
 // source: google/storage/v2/storage.proto
 
 package storagepb
@@ -8968,7 +8968,7 @@ func file_google_storage_v2_storage_proto_rawDescGZIP() []byte {
 
 var file_google_storage_v2_storage_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_storage_v2_storage_proto_msgTypes = make([]protoimpl.MessageInfo, 79)
-var file_google_storage_v2_storage_proto_goTypes = []interface{}{
+var file_google_storage_v2_storage_proto_goTypes = []any{
 	(ServiceConstants_Values)(0),                                  // 0: google.storage.v2.ServiceConstants.Values
 	(*DeleteBucketRequest)(nil),                                   // 1: google.storage.v2.DeleteBucketRequest
 	(*GetBucketRequest)(nil),                                      // 2: google.storage.v2.GetBucketRequest
@@ -9241,7 +9241,7 @@ func file_google_storage_v2_storage_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_google_storage_v2_storage_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*DeleteBucketRequest); i {
 			case 0:
 				return &v.state
@@ -9253,7 +9253,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*GetBucketRequest); i {
 			case 0:
 				return &v.state
@@ -9265,7 +9265,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateBucketRequest); i {
 			case 0:
 				return &v.state
@@ -9277,7 +9277,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[3].Exporter = func(v any, i int) any {
 			switch v := v.(*ListBucketsRequest); i {
 			case 0:
 				return &v.state
@@ -9289,7 +9289,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[4].Exporter = func(v any, i int) any {
 			switch v := v.(*ListBucketsResponse); i {
 			case 0:
 				return &v.state
@@ -9301,7 +9301,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[5].Exporter = func(v any, i int) any {
 			switch v := v.(*LockBucketRetentionPolicyRequest); i {
 			case 0:
 				return &v.state
@@ -9313,7 +9313,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[6].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateBucketRequest); i {
 			case 0:
 				return &v.state
@@ -9325,7 +9325,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[7].Exporter = func(v any, i int) any {
 			switch v := v.(*DeleteNotificationConfigRequest); i {
 			case 0:
 				return &v.state
@@ -9337,7 +9337,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[8].Exporter = func(v any, i int) any {
 			switch v := v.(*GetNotificationConfigRequest); i {
 			case 0:
 				return &v.state
@@ -9349,7 +9349,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[9].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateNotificationConfigRequest); i {
 			case 0:
 				return &v.state
@@ -9361,7 +9361,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[10].Exporter = func(v any, i int) any {
 			switch v := v.(*ListNotificationConfigsRequest); i {
 			case 0:
 				return &v.state
@@ -9373,7 +9373,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[11].Exporter = func(v any, i int) any {
 			switch v := v.(*ListNotificationConfigsResponse); i {
 			case 0:
 				return &v.state
@@ -9385,7 +9385,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[12].Exporter = func(v any, i int) any {
 			switch v := v.(*ComposeObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9397,7 +9397,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[13].Exporter = func(v any, i int) any {
 			switch v := v.(*DeleteObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9409,7 +9409,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[14].Exporter = func(v any, i int) any {
 			switch v := v.(*RestoreObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9421,7 +9421,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[15].Exporter = func(v any, i int) any {
 			switch v := v.(*CancelResumableWriteRequest); i {
 			case 0:
 				return &v.state
@@ -9433,7 +9433,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[16].Exporter = func(v any, i int) any {
 			switch v := v.(*CancelResumableWriteResponse); i {
 			case 0:
 				return &v.state
@@ -9445,7 +9445,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[17].Exporter = func(v any, i int) any {
 			switch v := v.(*ReadObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9457,7 +9457,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[18].Exporter = func(v any, i int) any {
 			switch v := v.(*GetObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9469,7 +9469,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[19].Exporter = func(v any, i int) any {
 			switch v := v.(*ReadObjectResponse); i {
 			case 0:
 				return &v.state
@@ -9481,7 +9481,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[20].Exporter = func(v any, i int) any {
 			switch v := v.(*WriteObjectSpec); i {
 			case 0:
 				return &v.state
@@ -9493,7 +9493,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[21].Exporter = func(v any, i int) any {
 			switch v := v.(*WriteObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9505,7 +9505,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[22].Exporter = func(v any, i int) any {
 			switch v := v.(*WriteObjectResponse); i {
 			case 0:
 				return &v.state
@@ -9517,7 +9517,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[23].Exporter = func(v any, i int) any {
 			switch v := v.(*BidiWriteObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9529,7 +9529,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[24].Exporter = func(v any, i int) any {
 			switch v := v.(*BidiWriteObjectResponse); i {
 			case 0:
 				return &v.state
@@ -9541,7 +9541,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[25].Exporter = func(v any, i int) any {
 			switch v := v.(*ListObjectsRequest); i {
 			case 0:
 				return &v.state
@@ -9553,7 +9553,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[26].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryWriteStatusRequest); i {
 			case 0:
 				return &v.state
@@ -9565,7 +9565,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[27].Exporter = func(v any, i int) any {
 			switch v := v.(*QueryWriteStatusResponse); i {
 			case 0:
 				return &v.state
@@ -9577,7 +9577,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[28].Exporter = func(v any, i int) any {
 			switch v := v.(*RewriteObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9589,7 +9589,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[29].Exporter = func(v any, i int) any {
 			switch v := v.(*RewriteResponse); i {
 			case 0:
 				return &v.state
@@ -9601,7 +9601,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[30].Exporter = func(v any, i int) any {
 			switch v := v.(*StartResumableWriteRequest); i {
 			case 0:
 				return &v.state
@@ -9613,7 +9613,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[31].Exporter = func(v any, i int) any {
 			switch v := v.(*StartResumableWriteResponse); i {
 			case 0:
 				return &v.state
@@ -9625,7 +9625,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[32].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateObjectRequest); i {
 			case 0:
 				return &v.state
@@ -9637,7 +9637,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[33].Exporter = func(v any, i int) any {
 			switch v := v.(*GetServiceAccountRequest); i {
 			case 0:
 				return &v.state
@@ -9649,7 +9649,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[34].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateHmacKeyRequest); i {
 			case 0:
 				return &v.state
@@ -9661,7 +9661,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[35].Exporter = func(v any, i int) any {
 			switch v := v.(*CreateHmacKeyResponse); i {
 			case 0:
 				return &v.state
@@ -9673,7 +9673,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[36].Exporter = func(v any, i int) any {
 			switch v := v.(*DeleteHmacKeyRequest); i {
 			case 0:
 				return &v.state
@@ -9685,7 +9685,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[37].Exporter = func(v any, i int) any {
 			switch v := v.(*GetHmacKeyRequest); i {
 			case 0:
 				return &v.state
@@ -9697,7 +9697,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[38].Exporter = func(v any, i int) any {
 			switch v := v.(*ListHmacKeysRequest); i {
 			case 0:
 				return &v.state
@@ -9709,7 +9709,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[39].Exporter = func(v any, i int) any {
 			switch v := v.(*ListHmacKeysResponse); i {
 			case 0:
 				return &v.state
@@ -9721,7 +9721,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[40].Exporter = func(v any, i int) any {
 			switch v := v.(*UpdateHmacKeyRequest); i {
 			case 0:
 				return &v.state
@@ -9733,7 +9733,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[41].Exporter = func(v any, i int) any {
 			switch v := v.(*CommonObjectRequestParams); i {
 			case 0:
 				return &v.state
@@ -9745,7 +9745,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[42].Exporter = func(v any, i int) any {
 			switch v := v.(*ServiceConstants); i {
 			case 0:
 				return &v.state
@@ -9757,7 +9757,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[43].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket); i {
 			case 0:
 				return &v.state
@@ -9769,7 +9769,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[44].Exporter = func(v any, i int) any {
 			switch v := v.(*BucketAccessControl); i {
 			case 0:
 				return &v.state
@@ -9781,7 +9781,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[45].Exporter = func(v any, i int) any {
 			switch v := v.(*ChecksummedData); i {
 			case 0:
 				return &v.state
@@ -9793,7 +9793,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[46].Exporter = func(v any, i int) any {
 			switch v := v.(*ObjectChecksums); i {
 			case 0:
 				return &v.state
@@ -9805,7 +9805,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[47].Exporter = func(v any, i int) any {
 			switch v := v.(*HmacKeyMetadata); i {
 			case 0:
 				return &v.state
@@ -9817,7 +9817,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[48].Exporter = func(v any, i int) any {
 			switch v := v.(*NotificationConfig); i {
 			case 0:
 				return &v.state
@@ -9829,7 +9829,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[49].Exporter = func(v any, i int) any {
 			switch v := v.(*CustomerEncryption); i {
 			case 0:
 				return &v.state
@@ -9841,7 +9841,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[50].Exporter = func(v any, i int) any {
 			switch v := v.(*Object); i {
 			case 0:
 				return &v.state
@@ -9853,7 +9853,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[51].Exporter = func(v any, i int) any {
 			switch v := v.(*ObjectAccessControl); i {
 			case 0:
 				return &v.state
@@ -9865,7 +9865,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[52].Exporter = func(v any, i int) any {
 			switch v := v.(*ListObjectsResponse); i {
 			case 0:
 				return &v.state
@@ -9877,7 +9877,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[53].Exporter = func(v any, i int) any {
 			switch v := v.(*ProjectTeam); i {
 			case 0:
 				return &v.state
@@ -9889,7 +9889,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[54].Exporter = func(v any, i int) any {
 			switch v := v.(*ServiceAccount); i {
 			case 0:
 				return &v.state
@@ -9901,7 +9901,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[55].Exporter = func(v any, i int) any {
 			switch v := v.(*Owner); i {
 			case 0:
 				return &v.state
@@ -9913,7 +9913,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[56].Exporter = func(v any, i int) any {
 			switch v := v.(*ContentRange); i {
 			case 0:
 				return &v.state
@@ -9925,7 +9925,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[57].Exporter = func(v any, i int) any {
 			switch v := v.(*ComposeObjectRequest_SourceObject); i {
 			case 0:
 				return &v.state
@@ -9937,7 +9937,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[58].Exporter = func(v any, i int) any {
 			switch v := v.(*ComposeObjectRequest_SourceObject_ObjectPreconditions); i {
 			case 0:
 				return &v.state
@@ -9949,7 +9949,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[59].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Billing); i {
 			case 0:
 				return &v.state
@@ -9961,7 +9961,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[60].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Cors); i {
 			case 0:
 				return &v.state
@@ -9973,7 +9973,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[61].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Encryption); i {
 			case 0:
 				return &v.state
@@ -9985,7 +9985,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[62].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_IamConfig); i {
 			case 0:
 				return &v.state
@@ -9997,7 +9997,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[63].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Lifecycle); i {
 			case 0:
 				return &v.state
@@ -10009,7 +10009,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[64].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Logging); i {
 			case 0:
 				return &v.state
@@ -10021,7 +10021,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[65].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_RetentionPolicy); i {
 			case 0:
 				return &v.state
@@ -10033,7 +10033,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[66].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_SoftDeletePolicy); i {
 			case 0:
 				return &v.state
@@ -10045,7 +10045,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[67].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Versioning); i {
 			case 0:
 				return &v.state
@@ -10057,7 +10057,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[68].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Website); i {
 			case 0:
 				return &v.state
@@ -10069,7 +10069,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[69].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_CustomPlacementConfig); i {
 			case 0:
 				return &v.state
@@ -10081,7 +10081,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[70].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Autoclass); i {
 			case 0:
 				return &v.state
@@ -10093,7 +10093,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[71].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_HierarchicalNamespace); i {
 			case 0:
 				return &v.state
@@ -10105,7 +10105,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[73].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_IamConfig_UniformBucketLevelAccess); i {
 			case 0:
 				return &v.state
@@ -10117,7 +10117,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[74].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Lifecycle_Rule); i {
 			case 0:
 				return &v.state
@@ -10129,7 +10129,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[75].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Lifecycle_Rule_Action); i {
 			case 0:
 				return &v.state
@@ -10141,7 +10141,7 @@ func file_google_storage_v2_storage_proto_init() {
 				return nil
 			}
 		}
-		file_google_storage_v2_storage_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} {
+		file_google_storage_v2_storage_proto_msgTypes[76].Exporter = func(v any, i int) any {
 			switch v := v.(*Bucket_Lifecycle_Rule_Condition); i {
 			case 0:
 				return &v.state
@@ -10154,48 +10154,48 @@ func file_google_storage_v2_storage_proto_init() {
 			}
 		}
 	}
-	file_google_storage_v2_storage_proto_msgTypes[0].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[1].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[3].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[6].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[12].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[13].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[14].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[17].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[18].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[20].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[21].OneofWrappers = []interface{}{
+	file_google_storage_v2_storage_proto_msgTypes[0].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[1].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[3].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[6].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[12].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[13].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[14].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[17].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[18].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[20].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[21].OneofWrappers = []any{
 		(*WriteObjectRequest_UploadId)(nil),
 		(*WriteObjectRequest_WriteObjectSpec)(nil),
 		(*WriteObjectRequest_ChecksummedData)(nil),
 	}
-	file_google_storage_v2_storage_proto_msgTypes[22].OneofWrappers = []interface{}{
+	file_google_storage_v2_storage_proto_msgTypes[22].OneofWrappers = []any{
 		(*WriteObjectResponse_PersistedSize)(nil),
 		(*WriteObjectResponse_Resource)(nil),
 	}
-	file_google_storage_v2_storage_proto_msgTypes[23].OneofWrappers = []interface{}{
+	file_google_storage_v2_storage_proto_msgTypes[23].OneofWrappers = []any{
 		(*BidiWriteObjectRequest_UploadId)(nil),
 		(*BidiWriteObjectRequest_WriteObjectSpec)(nil),
 		(*BidiWriteObjectRequest_ChecksummedData)(nil),
 	}
-	file_google_storage_v2_storage_proto_msgTypes[24].OneofWrappers = []interface{}{
+	file_google_storage_v2_storage_proto_msgTypes[24].OneofWrappers = []any{
 		(*BidiWriteObjectResponse_PersistedSize)(nil),
 		(*BidiWriteObjectResponse_Resource)(nil),
 	}
-	file_google_storage_v2_storage_proto_msgTypes[25].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[27].OneofWrappers = []interface{}{
+	file_google_storage_v2_storage_proto_msgTypes[25].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[27].OneofWrappers = []any{
 		(*QueryWriteStatusResponse_PersistedSize)(nil),
 		(*QueryWriteStatusResponse_Resource)(nil),
 	}
-	file_google_storage_v2_storage_proto_msgTypes[28].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[32].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[45].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[46].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[50].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[58].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[66].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[70].OneofWrappers = []interface{}{}
-	file_google_storage_v2_storage_proto_msgTypes[76].OneofWrappers = []interface{}{}
+	file_google_storage_v2_storage_proto_msgTypes[28].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[32].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[45].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[46].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[50].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[58].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[66].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[70].OneofWrappers = []any{}
+	file_google_storage_v2_storage_proto_msgTypes[76].OneofWrappers = []any{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/vendor/cloud.google.com/go/storage/internal/version.go b/vendor/cloud.google.com/go/storage/internal/version.go
index 1c52a3504..e5b2de091 100644
--- a/vendor/cloud.google.com/go/storage/internal/version.go
+++ b/vendor/cloud.google.com/go/storage/internal/version.go
@@ -15,4 +15,4 @@
 package internal
 
 // Version is the current tagged release of the library.
-const Version = "1.40.0"
+const Version = "1.43.0"
diff --git a/vendor/cloud.google.com/go/storage/invoke.go b/vendor/cloud.google.com/go/storage/invoke.go
index 1b52eb5d2..de57b4bbb 100644
--- a/vendor/cloud.google.com/go/storage/invoke.go
+++ b/vendor/cloud.google.com/go/storage/invoke.go
@@ -70,8 +70,8 @@ func run(ctx context.Context, call func(ctx context.Context) error, retry *retry
 	return internal.Retry(ctx, bo, func() (stop bool, err error) {
 		ctxWithHeaders := setInvocationHeaders(ctx, invocationID, attempts)
 		err = call(ctxWithHeaders)
-		if retry.maxAttempts != nil && attempts >= *retry.maxAttempts {
-			return true, err
+		if err != nil && retry.maxAttempts != nil && attempts >= *retry.maxAttempts {
+			return true, fmt.Errorf("storage: retry failed after %v attempts; last error: %w", *retry.maxAttempts, err)
 		}
 		attempts++
 		return !errorFunc(err), err
@@ -84,7 +84,21 @@ func setInvocationHeaders(ctx context.Context, invocationID string, attempts int
 	invocationHeader := fmt.Sprintf("gccl-invocation-id/%v gccl-attempt-count/%v", invocationID, attempts)
 	xGoogHeader := strings.Join([]string{invocationHeader, xGoogDefaultHeader}, " ")
 
-	ctx = callctx.SetHeaders(ctx, xGoogHeaderKey, xGoogHeader)
+	// TODO: remove this once the respective transport packages merge xGoogHeader.
+	// Also remove gl-go at that time, as it will be repeated.
+	hdrs := callctx.HeadersFromContext(ctx)
+	for _, v := range hdrs[xGoogHeaderKey] {
+		xGoogHeader = strings.Join([]string{xGoogHeader, v}, " ")
+	}
+
+	if hdrs[xGoogHeaderKey] != nil {
+		// Replace the key instead of adding it, if there was anything to merge with.
+		hdrs[xGoogHeaderKey] = []string{xGoogHeader}
+	} else {
+		// TODO: keep this line when removing the above code.
+		ctx = callctx.SetHeaders(ctx, xGoogHeaderKey, xGoogHeader)
+	}
+
 	ctx = callctx.SetHeaders(ctx, idempotencyHeaderKey, invocationID)
 	return ctx
 }
@@ -105,22 +119,20 @@ func ShouldRetry(err error) bool {
 	if errors.Is(err, io.ErrUnexpectedEOF) {
 		return true
 	}
+	if errors.Is(err, net.ErrClosed) {
+		return true
+	}
 
 	switch e := err.(type) {
-	case *net.OpError:
-		if strings.Contains(e.Error(), "use of closed network connection") {
-			// TODO: check against net.ErrClosed (go 1.16+) instead of string
-			return true
-		}
 	case *googleapi.Error:
 		// Retry on 408, 429, and 5xx, according to
 		// https://cloud.google.com/storage/docs/exponential-backoff.
 		return e.Code == 408 || e.Code == 429 || (e.Code >= 500 && e.Code < 600)
-	case *url.Error:
+	case *net.OpError, *url.Error:
 		// Retry socket-level errors ECONNREFUSED and ECONNRESET (from syscall).
 		// Unfortunately the error type is unexported, so we resort to string
 		// matching.
-		retriable := []string{"connection refused", "connection reset"}
+		retriable := []string{"connection refused", "connection reset", "broken pipe"}
 		for _, s := range retriable {
 			if strings.Contains(e.Error(), s) {
 				return true
diff --git a/vendor/cloud.google.com/go/storage/notifications.go b/vendor/cloud.google.com/go/storage/notifications.go
index 56f3e3daa..1d6cfdf59 100644
--- a/vendor/cloud.google.com/go/storage/notifications.go
+++ b/vendor/cloud.google.com/go/storage/notifications.go
@@ -116,7 +116,7 @@ func toProtoNotification(n *Notification) *storagepb.NotificationConfig {
 	}
 }
 
-var topicRE = regexp.MustCompile("^//pubsub.googleapis.com/projects/([^/]+)/topics/([^/]+)")
+var topicRE = regexp.MustCompile(`^//pubsub\.googleapis\.com/projects/([^/]+)/topics/([^/]+)`)
 
 // parseNotificationTopic extracts the project and topic IDs from from the full
 // resource name returned by the service. If the name is malformed, it returns
diff --git a/vendor/cloud.google.com/go/storage/option.go b/vendor/cloud.google.com/go/storage/option.go
index e72ceb78f..debdb0f52 100644
--- a/vendor/cloud.google.com/go/storage/option.go
+++ b/vendor/cloud.google.com/go/storage/option.go
@@ -44,10 +44,14 @@ type storageClientOption interface {
 	ApplyStorageOpt(*storageConfig)
 }
 
-// WithJSONReads is an option that may be passed to a Storage Client on creation.
-// It sets the client to use the JSON API for object reads. Currently, the
-// default API used for reads is XML.
-// Setting this option is required to use the GenerationNotMatch condition.
+// WithJSONReads is an option that may be passed to [NewClient].
+// It sets the client to use the Cloud Storage JSON API for object
+// reads. Currently, the default API used for reads is XML, but JSON will
+// become the default in a future release.
+//
+// Setting this option is required to use the GenerationNotMatch condition. We
+// also recommend using JSON reads to ensure consistency with other client
+// operations (all of which use JSON by default).
 //
 // Note that when this option is set, reads will return a zero date for
 // [ReaderObjectAttrs].LastModified and may return a different value for
@@ -56,10 +60,11 @@ func WithJSONReads() option.ClientOption {
 	return &withReadAPI{useJSON: true}
 }
 
-// WithXMLReads is an option that may be passed to a Storage Client on creation.
-// It sets the client to use the XML API for object reads.
+// WithXMLReads is an option that may be passed to [NewClient].
+// It sets the client to use the Cloud Storage XML API for object reads.
 //
-// This is the current default.
+// This is the current default, but the default will switch to JSON in a future
+// release.
 func WithXMLReads() option.ClientOption {
 	return &withReadAPI{useJSON: false}
 }
diff --git a/vendor/cloud.google.com/go/storage/reader.go b/vendor/cloud.google.com/go/storage/reader.go
index 0b228a6a7..6da2432f0 100644
--- a/vendor/cloud.google.com/go/storage/reader.go
+++ b/vendor/cloud.google.com/go/storage/reader.go
@@ -72,6 +72,12 @@ type ReaderObjectAttrs struct {
 // ErrObjectNotExist will be returned if the object is not found.
 //
 // The caller must call Close on the returned Reader when done reading.
+//
+// By default, reads are made using the Cloud Storage XML API. We recommend
+// using the JSON API instead, which can be done by setting [WithJSONReads]
+// when calling [NewClient]. This ensures consistency with other client
+// operations, which all use JSON. JSON will become the default in a future
+// release.
 func (o *ObjectHandle) NewReader(ctx context.Context) (*Reader, error) {
 	return o.NewRangeReader(ctx, 0, -1)
 }
@@ -86,6 +92,12 @@ func (o *ObjectHandle) NewReader(ctx context.Context) (*Reader, error) {
 // decompressive transcoding per https://cloud.google.com/storage/docs/transcoding
 // that file will be served back whole, regardless of the requested range as
 // Google Cloud Storage dictates.
+//
+// By default, reads are made using the Cloud Storage XML API. We recommend
+// using the JSON API instead, which can be done by setting [WithJSONReads]
+// when calling [NewClient]. This ensures consistency with other client
+// operations, which all use JSON. JSON will become the default in a future
+// release.
 func (o *ObjectHandle) NewRangeReader(ctx context.Context, offset, length int64) (r *Reader, err error) {
 	// This span covers the life of the reader. It is closed via the context
 	// in Reader.Close.
diff --git a/vendor/cloud.google.com/go/storage/storage.go b/vendor/cloud.google.com/go/storage/storage.go
index c01085f35..b6316fa66 100644
--- a/vendor/cloud.google.com/go/storage/storage.go
+++ b/vendor/cloud.google.com/go/storage/storage.go
@@ -117,10 +117,6 @@ type Client struct {
 
 	// tc is the transport-agnostic client implemented with either gRPC or HTTP.
 	tc storageClient
-	// useGRPC flags whether the client uses gRPC. This is needed while the
-	// integration piece is only partially complete.
-	// TODO: remove before merging to main.
-	useGRPC bool
 }
 
 // NewClient creates a new Google Cloud Storage client using the HTTP transport.
@@ -180,12 +176,12 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
 		opts = append([]option.ClientOption{
 			option.WithoutAuthentication(),
 			internaloption.SkipDialSettingsValidation(),
-			internaloption.WithDefaultEndpoint(endpoint),
+			internaloption.WithDefaultEndpointTemplate(endpoint),
 			internaloption.WithDefaultMTLSEndpoint(endpoint),
 		}, opts...)
 	}
 
-	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpoint, and WithDefaultMTLSEndpoint.
+	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpointTemplate, and WithDefaultMTLSEndpoint.
 	hc, ep, err := htransport.NewClient(ctx, opts...)
 	if err != nil {
 		return nil, fmt.Errorf("dialing: %w", err)
@@ -232,13 +228,12 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
 // You may configure the client by passing in options from the [google.golang.org/api/option]
 // package.
 func NewGRPCClient(ctx context.Context, opts ...option.ClientOption) (*Client, error) {
-	opts = append(defaultGRPCOptions(), opts...)
 	tc, err := newGRPCStorageClient(ctx, withClientOptions(opts...))
 	if err != nil {
 		return nil, err
 	}
 
-	return &Client{tc: tc, useGRPC: true}, nil
+	return &Client{tc: tc}, nil
 }
 
 // Close closes the Client.
@@ -898,6 +893,7 @@ type ObjectHandle struct {
 	readCompressed    bool   // Accept-Encoding: gzip
 	retry             *retryConfig
 	overrideRetention *bool
+	softDeleted       bool
 }
 
 // ACL provides access to the object's access control list.
@@ -952,7 +948,7 @@ func (o *ObjectHandle) Attrs(ctx context.Context) (attrs *ObjectAttrs, err error
 		return nil, err
 	}
 	opts := makeStorageOpts(true, o.retry, o.userProject)
-	return o.c.tc.GetObject(ctx, o.bucket, o.object, o.gen, o.encryptionKey, o.conds, opts...)
+	return o.c.tc.GetObject(ctx, &getObjectParams{o.bucket, o.object, o.gen, o.encryptionKey, o.conds, o.softDeleted}, opts...)
 }
 
 // Update updates an object with the provided attributes. See
@@ -975,7 +971,8 @@ func (o *ObjectHandle) Update(ctx context.Context, uattrs ObjectAttrsToUpdate) (
 			gen:               o.gen,
 			encryptionKey:     o.encryptionKey,
 			conds:             o.conds,
-			overrideRetention: o.overrideRetention}, opts...)
+			overrideRetention: o.overrideRetention,
+		}, opts...)
 }
 
 // BucketName returns the name of the bucket.
@@ -1057,6 +1054,50 @@ func (o *ObjectHandle) OverrideUnlockedRetention(override bool) *ObjectHandle {
 	return &o2
 }
 
+// SoftDeleted returns an object handle that can be used to get an object that
+// has been soft deleted. To get a soft deleted object, the generation must be
+// set on the object using ObjectHandle.Generation.
+// Note that an error will be returned if a live object is queried using this.
+func (o *ObjectHandle) SoftDeleted() *ObjectHandle {
+	o2 := *o
+	o2.softDeleted = true
+	return &o2
+}
+
+// RestoreOptions allows you to set options when restoring an object.
+type RestoreOptions struct {
+	/// CopySourceACL indicates whether the restored object should copy the
+	// access controls of the source object. Only valid for buckets with
+	// fine-grained access. If uniform bucket-level access is enabled, setting
+	// CopySourceACL will cause an error.
+	CopySourceACL bool
+}
+
+// Restore will restore a soft-deleted object to a live object.
+// Note that you must specify a generation to use this method.
+func (o *ObjectHandle) Restore(ctx context.Context, opts *RestoreOptions) (*ObjectAttrs, error) {
+	if err := o.validate(); err != nil {
+		return nil, err
+	}
+
+	// Since the generation is required by restore calls, we set the default to
+	// 0 instead of a negative value, which returns a more descriptive error.
+	gen := o.gen
+	if o.gen == defaultGen {
+		gen = 0
+	}
+
+	// Restore is always idempotent because Generation is a required param.
+	sOpts := makeStorageOpts(true, o.retry, o.userProject)
+	return o.c.tc.RestoreObject(ctx, &restoreObjectParams{
+		bucket:        o.bucket,
+		object:        o.object,
+		gen:           gen,
+		conds:         o.conds,
+		copySourceACL: opts.CopySourceACL,
+	}, sOpts...)
+}
+
 // NewWriter returns a storage Writer that writes to the GCS object
 // associated with this ObjectHandle.
 //
@@ -1390,6 +1431,21 @@ type ObjectAttrs struct {
 	// Retention contains the retention configuration for this object.
 	// ObjectRetention cannot be configured or reported through the gRPC API.
 	Retention *ObjectRetention
+
+	// SoftDeleteTime is the time when the object became soft-deleted.
+	// Soft-deleted objects are only accessible on an object handle returned by
+	// ObjectHandle.SoftDeleted; if ObjectHandle.SoftDeleted has not been set,
+	// ObjectHandle.Attrs will return ErrObjectNotExist if the object is soft-deleted.
+	// This field is read-only.
+	SoftDeleteTime time.Time
+
+	// HardDeleteTime is the time when the object will be permanently deleted.
+	// Only set when an object becomes soft-deleted with a soft delete policy.
+	// Soft-deleted objects are only accessible on an object handle returned by
+	// ObjectHandle.SoftDeleted; if ObjectHandle.SoftDeleted has not been set,
+	// ObjectHandle.Attrs will return ErrObjectNotExist if the object is soft-deleted.
+	// This field is read-only.
+	HardDeleteTime time.Time
 }
 
 // ObjectRetention contains the retention configuration for this object.
@@ -1494,6 +1550,8 @@ func newObject(o *raw.Object) *ObjectAttrs {
 		CustomTime:              convertTime(o.CustomTime),
 		ComponentCount:          o.ComponentCount,
 		Retention:               toObjectRetention(o.Retention),
+		SoftDeleteTime:          convertTime(o.SoftDeleteTime),
+		HardDeleteTime:          convertTime(o.HardDeleteTime),
 	}
 }
 
@@ -1529,6 +1587,8 @@ func newObjectFromProto(o *storagepb.Object) *ObjectAttrs {
 		Updated:           convertProtoTime(o.GetUpdateTime()),
 		CustomTime:        convertProtoTime(o.GetCustomTime()),
 		ComponentCount:    int64(o.ComponentCount),
+		SoftDeleteTime:    convertProtoTime(o.GetSoftDeleteTime()),
+		HardDeleteTime:    convertProtoTime(o.GetHardDeleteTime()),
 	}
 }
 
@@ -1637,6 +1697,11 @@ type Query struct {
 	// prefixes returned by the query. Only applicable if Delimiter is set to /.
 	// IncludeFoldersAsPrefixes is not yet implemented in the gRPC API.
 	IncludeFoldersAsPrefixes bool
+
+	// SoftDeleted indicates whether to list soft-deleted objects.
+	// If true, only objects that have been soft-deleted will be listed.
+	// By default, soft-deleted objects are not listed.
+	SoftDeleted bool
 }
 
 // attrToFieldMap maps the field names of ObjectAttrs to the underlying field
@@ -1672,6 +1737,8 @@ var attrToFieldMap = map[string]string{
 	"CustomTime":              "customTime",
 	"ComponentCount":          "componentCount",
 	"Retention":               "retention",
+	"HardDeleteTime":          "hardDeleteTime",
+	"SoftDeleteTime":          "softDeleteTime",
 }
 
 // attrToProtoFieldMap maps the field names of ObjectAttrs to the underlying field
@@ -1704,6 +1771,8 @@ var attrToProtoFieldMap = map[string]string{
 	"CustomerKeySHA256":       "customer_encryption",
 	"CustomTime":              "custom_time",
 	"ComponentCount":          "component_count",
+	"HardDeleteTime":          "hard_delete_time",
+	"SoftDeleteTime":          "soft_delete_time",
 	// MediaLink was explicitly excluded from the proto as it is an HTTP-ism.
 	// "MediaLink":               "mediaLink",
 	// TODO: add object retention - b/308194853
@@ -2284,7 +2353,6 @@ func toProtoChecksums(sendCRC32C bool, attrs *ObjectAttrs) *storagepb.ObjectChec
 func (c *Client) ServiceAccount(ctx context.Context, projectID string) (string, error) {
 	o := makeStorageOpts(true, c.retry, "")
 	return c.tc.GetServiceAccount(ctx, projectID, o...)
-
 }
 
 // bucketResourceName formats the given project ID and bucketResourceName ID