chore(storage): enable more grpc integration tests #6842
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,6 +61,7 @@ import ( | |
| "google.golang.org/api/transport" | ||
| iampb "google.golang.org/genproto/googleapis/iam/v1" | ||
| "google.golang.org/grpc/codes" | ||
| "google.golang.org/grpc/status" | ||
| ) | ||
|
|
||
| type skipTransportTestKey string | ||
|
|
@@ -4021,109 +4022,126 @@ func TestIntegration_PredefinedACLs(t *testing.T) { | |
| } | ||
|
|
||
| func TestIntegration_ServiceAccount(t *testing.T) { | ||
| multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, _, _ string, client *Client) { | ||
| s, err := client.ServiceAccount(ctx, testutil.ProjID()) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| want := "@gs-project-accounts.iam.gserviceaccount.com" | ||
| if !strings.Contains(s, want) { | ||
| t.Fatalf("got %v, want to contain %v", s, want) | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| func TestIntegration_ReaderAttrs(t *testing.T) { | ||
| multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, bucket, _ string, client *Client) { | ||
| bkt := client.Bucket(bucket) | ||
|
|
||
| const defaultType = "text/plain" | ||
| o := bkt.Object("reader-attrs-obj") | ||
| c := randomContents() | ||
| if err := writeObject(ctx, o, defaultType, c); err != nil { | ||
| t.Errorf("Write for %v failed with %v", o.ObjectName(), err) | ||
| } | ||
| defer func() { | ||
| if err := o.Delete(ctx); err != nil { | ||
| log.Printf("failed to delete test object: %v", err) | ||
| } | ||
| }() | ||
|
|
||
| rc, err := o.NewReader(ctx) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| attrs, err := o.Attrs(ctx) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| got := rc.Attrs | ||
| want := ReaderObjectAttrs{ | ||
| Size: attrs.Size, | ||
| ContentType: attrs.ContentType, | ||
| ContentEncoding: attrs.ContentEncoding, | ||
| CacheControl: attrs.CacheControl, | ||
| LastModified: got.LastModified, // ignored, tested separately | ||
| Generation: attrs.Generation, | ||
| Metageneration: attrs.Metageneration, | ||
| } | ||
| if got != want { | ||
| t.Fatalf("got %v, wanted %v", got, want) | ||
| } | ||
|
|
||
| if got.LastModified.IsZero() { | ||
| t.Fatal("LastModified is 0, should be >0") | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| // Test that context cancellation correctly stops a download before completion. | ||
| func TestIntegration_ReaderCancel(t *testing.T) { | ||
| multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, bucket, _ string, client *Client) { | ||
| bkt := client.Bucket(bucket) | ||
| obj := bkt.Object("reader-cancel-obj") | ||
|
|
||
| minObjectSize := 2500000 // 2.5 Mb | ||
| var objectSize int | ||
|
|
||
| w := obj.NewWriter(ctx) | ||
| c := randomContents() | ||
| for written := 0; written < minObjectSize; { | ||
| n, err := w.Write(c) | ||
| if err != nil { | ||
| t.Fatalf("w.Write: %v", err) | ||
| } | ||
| written += n | ||
| objectSize = written | ||
| } | ||
|
|
||
| if err := w.Close(); err != nil { | ||
| t.Fatalf("writer close: %v", err) | ||
| } | ||
| defer func() { | ||
| if err := obj.Delete(ctx); err != nil { | ||
| log.Printf("failed to delete test object: %v", err) | ||
| } | ||
| }() | ||
|
|
||
| // Create a reader (which makes a GET request to GCS and opens the body to | ||
| // read the object) and then cancel the context before reading. | ||
| readerCtx, cancel := context.WithCancel(ctx) | ||
| r, err := obj.NewReader(readerCtx) | ||
| if err != nil { | ||
| t.Fatalf("obj.NewReader: %v", err) | ||
| } | ||
| defer func() { | ||
| if err := r.Close(); err != nil { | ||
| log.Printf("r.Close(): %v", err) | ||
| } | ||
| }() | ||
|
|
||
| cancel() | ||
|
|
||
| // Read the object 1KB a time. We cannot guarantee that Reads will return a | ||
| // context canceled error immediately, but they should always do so before we | ||
| // reach EOF. | ||
| var readErr error | ||
| for read := 0; read < objectSize; { | ||
| buf := make([]byte, 1000) | ||
| var n int | ||
| n, readErr = r.Read(buf) | ||
| if readErr != nil { | ||
| if errors.Is(readErr, context.Canceled) || status.Code(readErr) == codes.Canceled { | ||
| return | ||
| } | ||
| break | ||
| } | ||
| read += n | ||
| } | ||
| t.Fatalf("r.Read: got %v, want context.Canceled", readErr) | ||
| }) | ||
| } | ||
|
|
||
| // Ensures that a file stored with a: | ||
|
|
@@ -4378,34 +4396,77 @@ func TestIntegration_PostPolicyV4(t *testing.T) { | |
|
|
||
| // Verify that custom scopes passed in by the user are applied correctly. | ||
| func TestIntegration_Scopes(t *testing.T) { | ||
| multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, bucket, _ string, client *Client) { | ||
|
There was a problem hiding this comment. What do we think about having multiple |
||
| bkt := client.Bucket(bucket) | ||
| obj := bkt.Object("test-scopes") | ||
| contents := []byte("This object should not be written.\n") | ||
|
|
||
| // A client with ReadOnly scope should be able to read bucket successfully. | ||
| if _, err := bkt.Attrs(ctx); err != nil { | ||
| t.Errorf("client with ScopeReadOnly was not able to read attrs: %v", err) | ||
| } | ||
|
|
||
| // Should not be able to write successfully. | ||
| if err := writeObject(ctx, obj, "text/plain", contents); err == nil { | ||
| if err := obj.Delete(ctx); err != nil { | ||
| t.Logf("obj.Delete: %v", err) | ||
| } | ||
| t.Error("client with ScopeReadOnly was able to write an object unexpectedly.") | ||
| } | ||
|
|
||
| // Should not be able to change permissions. | ||
| if _, err := obj.Update(ctx, ObjectAttrsToUpdate{ACL: []ACLRule{{Entity: "domain-google.com", Role: RoleReader}}}); err == nil { | ||
| t.Error("client with ScopeReadWrite was able to change unexpectedly.") | ||
| } | ||
| }, option.WithScopes(ScopeReadOnly)) | ||
|
|
||
| multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, bucket, _ string, client *Client) { | ||
| bkt := client.Bucket(bucket) | ||
| obj := bkt.Object("test-scopes") | ||
| contents := []byte("This object should be written.\n") | ||
|
|
||
| // A client with ReadWrite scope should be able to read bucket successfully. | ||
| if _, err := bkt.Attrs(ctx); err != nil { | ||
| t.Errorf("client with ScopeReadOnly was not able to read attrs: %v", err) | ||
| } | ||
|
|
||
| // Should be able to write to an object. | ||
| if err := writeObject(ctx, obj, "text/plain", contents); err != nil { | ||
| t.Errorf("client with ScopeReadWrite was not able to write: %v", err) | ||
| } | ||
| defer func() { | ||
| if err := obj.Delete(ctx); err != nil { | ||
| t.Logf("obj.Delete: %v", err) | ||
| } | ||
| }() | ||
|
|
||
| // Should not be able to change permissions. | ||
| if _, err := obj.Update(ctx, ObjectAttrsToUpdate{ACL: []ACLRule{{Entity: "domain-google.com", Role: RoleReader}}}); err == nil { | ||
| t.Error("client with ScopeReadWrite was able to change permissions unexpectedly") | ||
| } | ||
| }, option.WithScopes(ScopeReadWrite)) | ||
|
|
||
| multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, bucket, _ string, client *Client) { | ||
| bkt := client.Bucket(bucket) | ||
| obj := bkt.Object("test-scopes") | ||
| contents := []byte("This object should be written.\n") | ||
|
|
||
| // A client without any scopes should not be able to perform ops. | ||
| if _, err := bkt.Attrs(ctx); err == nil { | ||
| t.Errorf("client with no scopes was able to read attrs unexpectedly") | ||
| } | ||
|
|
||
| if err := writeObject(ctx, obj, "text/plain", contents); err == nil { | ||
| if err := obj.Delete(ctx); err != nil { | ||
| t.Logf("obj.Delete: %v", err) | ||
| } | ||
| t.Error("client with no scopes was able to write an object unexpectedly.") | ||
| } | ||
|
|
||
| if _, err := obj.Update(ctx, ObjectAttrsToUpdate{ACL: []ACLRule{{Entity: "domain-google.com", Role: RoleReader}}}); err == nil { | ||
| t.Error("client with no scopes was able to change permissions unexpectedly") | ||
| } | ||
| }, option.WithScopes("")) | ||
| } | ||
|
|
||
| func TestIntegration_SignedURL_Bucket(t *testing.T) { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice!