diff --git a/internal/generated/snippets/go.mod b/internal/generated/snippets/go.mod
index 8286707cc64..84eeb846192 100644
--- a/internal/generated/snippets/go.mod
+++ b/internal/generated/snippets/go.mod
@@ -135,7 +135,7 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
- github.com/googleapis/gax-go/v2 v2.5.1 // indirect
+ github.com/googleapis/gax-go/v2 v2.6.0 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
diff --git a/internal/generated/snippets/go.sum b/internal/generated/snippets/go.sum
index 55357f26eda..b54e7c3cc2a 100644
--- a/internal/generated/snippets/go.sum
+++ b/internal/generated/snippets/go.sum
@@ -71,8 +71,9 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0
github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
-github.com/googleapis/gax-go/v2 v2.5.1 h1:kBRZU0PSuI7PspsSb/ChWoVResUcwNVIdpB049pKTiw=
github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
+github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
+github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/storage/go.mod b/storage/go.mod
index db049cde228..eef27f33b32 100644
--- a/storage/go.mod
+++ b/storage/go.mod
@@ -7,14 +7,14 @@ require (
cloud.google.com/go/compute v1.7.0
cloud.google.com/go/iam v0.3.0
github.com/golang/protobuf v1.5.2
- github.com/google/go-cmp v0.5.8
+ github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
- github.com/googleapis/gax-go/v2 v2.5.1
+ github.com/googleapis/gax-go/v2 v2.6.0
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f
google.golang.org/api v0.98.0
google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
- google.golang.org/grpc v1.49.0
+ google.golang.org/grpc v1.50.0
google.golang.org/protobuf v1.28.1
)
diff --git a/storage/go.sum b/storage/go.sum
index bf20cff07be..c951ed20ec2 100644
--- a/storage/go.sum
+++ b/storage/go.sum
@@ -254,8 +254,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -290,8 +291,9 @@ github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0
github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
-github.com/googleapis/gax-go/v2 v2.5.1 h1:kBRZU0PSuI7PspsSb/ChWoVResUcwNVIdpB049pKTiw=
github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
+github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
+github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -772,8 +774,9 @@ google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=
+google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
diff --git a/storage/grpc_client.go b/storage/grpc_client.go
index 826b5ab9528..00a22fc44c4 100644
--- a/storage/grpc_client.go
+++ b/storage/grpc_client.go
@@ -25,6 +25,7 @@ import (
"cloud.google.com/go/internal/trace"
gapic "cloud.google.com/go/storage/internal/apiv2"
storagepb "cloud.google.com/go/storage/internal/apiv2/stubs"
+ "github.com/googleapis/gax-go/v2"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
"google.golang.org/api/option/internaloption"
@@ -1710,7 +1711,12 @@ func (w *gRPCWriter) writeObjectSpec() (*storagepb.WriteObjectSpec, error) {
// read copies the data in the reader to the given buffer and reports how much
// data was read into the buffer and if there is no more data to read (EOF).
+// Furthermore, if the attrs.ContentType is unset, the first bytes of content
+// will be sniffed for a matching content type.
func (w *gRPCWriter) read() (int, bool, error) {
+ if w.attrs.ContentType == "" {
+ w.reader, w.attrs.ContentType = gax.DetermineContentType(w.reader)
+ }
// Set n to -1 to start the Read loop.
var n, recvd int = -1, 0
var err error
diff --git a/storage/integration_test.go b/storage/integration_test.go
index 37c5a9b295b..295ef71fcec 100644
--- a/storage/integration_test.go
+++ b/storage/integration_test.go
@@ -2153,47 +2153,47 @@ func TestIntegration_ValidObjectNames(t *testing.T) {
}
func TestIntegration_WriterContentType(t *testing.T) {
- ctx := context.Background()
- client := testConfig(ctx, t)
- defer client.Close()
-
- obj := client.Bucket(bucketName).Object("content")
- testCases := []struct {
- content string
- setType, wantType string
- }{
- {
- content: "It was the best of times, it was the worst of times.",
- wantType: "text/plain; charset=utf-8",
- },
- {
- content: "My first page",
- wantType: "text/html; charset=utf-8",
- },
- {
- content: "My first page",
- setType: "text/html",
- wantType: "text/html",
- },
- {
- content: "My first page",
- setType: "image/jpeg",
- wantType: "image/jpeg",
- },
- }
- for i, tt := range testCases {
- if err := writeObject(ctx, obj, tt.setType, []byte(tt.content)); err != nil {
- t.Errorf("writing #%d: %v", i, err)
- }
- attrs, err := obj.Attrs(ctx)
- if err != nil {
- t.Errorf("obj.Attrs: %v", err)
- continue
+ multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, bucket, _ string, client *Client) {
+ obj := client.Bucket(bucket).Object("content")
+ testCases := []struct {
+ content string
+ setType, wantType string
+ }{
+ {
+ // Sniffed content type.
+ content: "It was the best of times, it was the worst of times.",
+ wantType: "text/plain; charset=utf-8",
+ },
+ {
+ // Sniffed content type.
+ content: "My first page",
+ wantType: "text/html; charset=utf-8",
+ },
+ {
+ content: "My first page",
+ setType: "text/html",
+ wantType: "text/html",
+ },
+ {
+ content: "My first page",
+ setType: "image/jpeg",
+ wantType: "image/jpeg",
+ },
}
- if got := attrs.ContentType; got != tt.wantType {
- t.Errorf("Content-Type = %q; want %q\nContent: %q\nSet Content-Type: %q", got, tt.wantType, tt.content, tt.setType)
+ for i, tt := range testCases {
+ if err := writeObject(ctx, obj, tt.setType, []byte(tt.content)); err != nil {
+ t.Errorf("writing #%d: %v", i, err)
+ }
+ attrs, err := obj.Attrs(ctx)
+ if err != nil {
+ t.Errorf("obj.Attrs: %v", err)
+ continue
+ }
+ if got := attrs.ContentType; got != tt.wantType {
+ t.Errorf("Content-Type = %q; want %q\nContent: %q\nSet Content-Type: %q", got, tt.wantType, tt.content, tt.setType)
+ }
}
- }
+ })
}
func TestIntegration_ZeroSizedObject(t *testing.T) {