Skip to content

Commit

Permalink
test(storage): split out some of the object tests (#7000)
Browse files Browse the repository at this point in the history 
* test(storage): split out some of the object tests

* add uuids to objects

Co-authored-by: Chris Cotter <cjcotter@google.com>
  • Loading branch information
@BrennaEpp @tritone
BrennaEpp and tritone committed Nov 16, 2022
1 parent ac0c5c2 commit e22ce56
Showing 1 changed file with 106 additions and 45 deletions.
151 changes: 106 additions & 45 deletions storage/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1449,23 +1449,76 @@ func TestIntegration_Objects(t *testing.T) {
if got, want := o.ContentType, defaultType; got != want {
t.Errorf("ContentType (%v) = %q; want %q", objName, got, want)
}
created := o.Created

// Check that the object is newer than its containing bucket.
bAttrs := h.mustBucketAttrs(bkt)
if o.Created.Before(bAttrs.Created) {
t.Errorf("Object %v is older than its containing bucket, %v", o, bAttrs)
}

objectHandle := bkt.Object(objName)
// Test public ACL.
publicObj := objects[0]
if err = bkt.Object(publicObj).ACL().Set(ctx, AllUsers, RoleReader); err != nil {
t.Errorf("PutACLEntry failed with %v", err)
}
publicClient, err := newTestClient(ctx, option.WithoutAuthentication())
if err != nil {
t.Fatal(err)
}

slurp := h.mustRead(publicClient.Bucket(newBucketName).Object(publicObj))
if !bytes.Equal(slurp, contents[publicObj]) {
t.Errorf("Public object's content: got %q, want %q", slurp, contents[publicObj])
}

// Test cannot write to read-only object without authentication.
wc := publicClient.Bucket(newBucketName).Object(publicObj).NewWriter(ctx)
if _, err := wc.Write([]byte("hello")); err != nil {
t.Errorf("Write unexpectedly failed with %v", err)
}
if err = wc.Close(); err == nil {
t.Error("Close expected an error, found none")
}
})
}

func TestIntegration_ObjectUpdate(t *testing.T) {
multiTransportTest(skipGRPC("metadata pending b/230510191"), t, func(t *testing.T, ctx context.Context, bucket string, _ string, client *Client) {
b := client.Bucket(bucket)

o := b.Object("update-obj" + uidSpace.New())
w := o.NewWriter(ctx)
_, err := io.Copy(w, bytes.NewReader(randomContents()))
if err != nil {
t.Fatalf("io.Copy: %v", err)
}
if err := w.Close(); err != nil {
t.Fatalf("w.Close: %v", err)
}
t.Cleanup(func() {
if err := o.Delete(ctx); err != nil {
t.Errorf("o.Delete : %v", err)
}
})

attrs, err := o.Attrs(ctx)
if err != nil {
t.Fatalf("o.Attrs: %v", err)
}

// Test UpdateAttrs.
metadata := map[string]string{"key": "value"}
updated := h.mustUpdateObject(objectHandle, ObjectAttrsToUpdate{

updated, err := o.If(Conditions{MetagenerationMatch: attrs.Metageneration}).Update(ctx, ObjectAttrsToUpdate{
ContentType: "text/html",
ContentLanguage: "en",
Metadata: metadata,
ACL: []ACLRule{{Entity: "domain-google.com", Role: RoleReader}},
}, h.mustObjectAttrs(objectHandle).Metageneration)
})
if err != nil {
t.Fatalf("o.Update: %v", err)
}

if got, want := updated.ContentType, "text/html"; got != want {
t.Errorf("updated.ContentType == %q; want %q", got, want)
}
Expand All @@ -1475,19 +1528,24 @@ func TestIntegration_Objects(t *testing.T) {
if got, want := updated.Metadata, metadata; !testutil.Equal(got, want) {
t.Errorf("updated.Metadata == %+v; want %+v", updated.Metadata, want)
}
if got, want := updated.Created, created; got != want {
if got, want := updated.Created, attrs.Created; got != want {
t.Errorf("updated.Created == %q; want %q", got, want)
}
if !updated.Created.Before(updated.Updated) {
t.Errorf("updated.Updated should be newer than update.Created")
}

// Delete ContentType and ContentLanguage.
updated = h.mustUpdateObject(objectHandle, ObjectAttrsToUpdate{
// Delete ContentType and ContentLanguage and Metadata.
updated, err = o.If(Conditions{MetagenerationMatch: updated.Metageneration}).Update(ctx, ObjectAttrsToUpdate{
ContentType: "",
ContentLanguage: "",
Metadata: map[string]string{},
}, h.mustObjectAttrs(objectHandle).Metageneration)
ACL: []ACLRule{{Entity: "domain-google.com", Role: RoleReader}},
})
if err != nil {
t.Fatalf("o.Update: %v", err)
}

if got, want := updated.ContentType, ""; got != want {
t.Errorf("updated.ContentType == %q; want %q", got, want)
}
Expand All @@ -1497,14 +1555,18 @@ func TestIntegration_Objects(t *testing.T) {
if updated.Metadata != nil {
t.Errorf("updated.Metadata == %+v; want nil", updated.Metadata)
}
if got, want := updated.Created, created; got != want {
if got, want := updated.Created, attrs.Created; got != want {
t.Errorf("updated.Created == %q; want %q", got, want)
}
if !updated.Created.Before(updated.Updated) {
t.Errorf("updated.Updated should be newer than update.Created")
}
})
}

// Test checksums.
func TestIntegration_ObjectChecksums(t *testing.T) {
multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, bucket string, _ string, client *Client) {
b := client.Bucket(bucket)
checksumCases := []struct {
name string
contents [][]byte
Expand All @@ -1528,13 +1590,13 @@ func TestIntegration_Objects(t *testing.T) {
},
}
for _, c := range checksumCases {
wc := bkt.Object(c.name).NewWriter(ctx)
wc := b.Object(c.name + uidSpace.New()).NewWriter(ctx)
for _, data := range c.contents {
if _, err := wc.Write(data); err != nil {
t.Errorf("Write(%q) failed with %q", data, err)
}
}
if err = wc.Close(); err != nil {
if err := wc.Close(); err != nil {
t.Errorf("%q: close failed with %q", c.name, err)
}
obj := wc.Attrs()
Expand All @@ -1548,63 +1610,62 @@ func TestIntegration_Objects(t *testing.T) {
t.Errorf("Object (%q) CRC32C = %v; want %v", c.name, got, want)
}
}
})
}

// Test public ACL.
publicObj := objects[0]
if err = bkt.Object(publicObj).ACL().Set(ctx, AllUsers, RoleReader); err != nil {
t.Errorf("PutACLEntry failed with %v", err)
}
publicClient, err := newTestClient(ctx, option.WithoutAuthentication())
if err != nil {
t.Fatal(err)
}

slurp := h.mustRead(publicClient.Bucket(newBucketName).Object(publicObj))
if !bytes.Equal(slurp, contents[publicObj]) {
t.Errorf("Public object's content: got %q, want %q", slurp, contents[publicObj])
}
func TestIntegration_Compose(t *testing.T) {
multiTransportTest(skipGRPC("content type mismatch"), t, func(t *testing.T, ctx context.Context, bucket string, _ string, client *Client) {
b := client.Bucket(bucket)

// Test writer error handling.
wc := publicClient.Bucket(newBucketName).Object(publicObj).NewWriter(ctx)
if _, err := wc.Write([]byte("hello")); err != nil {
t.Errorf("Write unexpectedly failed with %v", err)
}
if err = wc.Close(); err == nil {
t.Error("Close expected an error, found none")
objects := []*ObjectHandle{
b.Object("obj1" + uidSpace.New()),
b.Object("obj2" + uidSpace.New()),
b.Object("obj/with/slashes" + uidSpace.New()),
b.Object("obj/" + uidSpace.New()),
}

// Test object composition.
var compSrcs []*ObjectHandle
var wantContents []byte
wantContents := make([]byte, 0)

// Write objects to compose
for _, obj := range objects {
compSrcs = append(compSrcs, bkt.Object(obj))
wantContents = append(wantContents, contents[obj]...)
c := randomContents()
if err := writeObject(ctx, obj, "text/plain", c); err != nil {
t.Errorf("Write for %v failed with %v", obj, err)
}
compSrcs = append(compSrcs, obj)
wantContents = append(wantContents, c...)
defer obj.Delete(ctx)
}

checkCompose := func(obj *ObjectHandle, wantContentType string) {
rc := h.mustNewReader(obj)
slurp, err = ioutil.ReadAll(rc)
r, err := obj.NewReader(ctx)
if err != nil {
t.Fatalf("new reader: %v", err)
}

slurp, err := ioutil.ReadAll(r)
if err != nil {
t.Fatalf("ioutil.ReadAll: %v", err)
}
defer rc.Close()
defer r.Close()
if !bytes.Equal(slurp, wantContents) {
t.Errorf("Composed object contents\ngot: %q\nwant: %q", slurp, wantContents)
}
if got := rc.ContentType(); got != wantContentType {
if got := r.ContentType(); got != wantContentType {
t.Errorf("Composed object content-type = %q, want %q", got, wantContentType)
}
}

// Compose should work even if the user sets no destination attributes.
compDst := bkt.Object("composed1")
compDst := b.Object("composed1")
c := compDst.ComposerFrom(compSrcs...)
if _, err := c.Run(ctx); err != nil {
t.Fatalf("ComposeFrom error: %v", err)
}
checkCompose(compDst, "application/octet-stream")

// It should also work if we do.
compDst = bkt.Object("composed2")
compDst = b.Object("composed2")
c = compDst.ComposerFrom(compSrcs...)
c.ContentType = "text/json"
if _, err := c.Run(ctx); err != nil {
Expand Down Expand Up @@ -2184,7 +2245,7 @@ func TestIntegration_SignedURL_EmptyStringObjectName(t *testing.T) {
}
}

func TestIntegration_ACL(t *testing.T) {
func TestIntegration_BucketACL(t *testing.T) {
multiTransportTest(context.Background(), t, func(t *testing.T, ctx context.Context, _ string, prefix string, client *Client) {
h := testHelper{t}

Expand Down

0 comments on commit e22ce56

Please sign in to comment.