From f32c22a8ddfcbc28a2511f6ce7da0c67d236e21e Mon Sep 17 00:00:00 2001 From: Jess Sheneberger Date: Tue, 7 Jun 2022 16:27:32 -0600 Subject: [PATCH 1/3] return attrs for newly created object in rewrite --- fakestorage/object.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fakestorage/object.go b/fakestorage/object.go index 853fb2dc81..35687fa77b 100644 --- a/fakestorage/object.go +++ b/fakestorage/object.go @@ -624,12 +624,12 @@ func (s *Server) rewriteObject(r *http.Request) jsonResponse { Content: append([]byte(nil), obj.Content...), } - _, err = s.createObject(newObject) + created, err := s.createObject(newObject) if err != nil { return errToJsonResponse(err) } - return jsonResponse{data: newObjectRewriteResponse(newObject.ObjectAttrs)} + return jsonResponse{data: newObjectRewriteResponse(created.ObjectAttrs)} } func (s *Server) downloadObject(w http.ResponseWriter, r *http.Request) { From fa1a3c2953296e2598301e8be52c86262efaad8b Mon Sep 17 00:00:00 2001 From: Jess Sheneberger Date: Wed, 8 Jun 2022 13:31:19 -0600 Subject: [PATCH 2/3] update rewrite tests to fail if generation == 0 --- fakestorage/object_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fakestorage/object_test.go b/fakestorage/object_test.go index 819919a13a..688c21990e 100644 --- a/fakestorage/object_test.go +++ b/fakestorage/object_test.go @@ -1136,6 +1136,9 @@ func TestServiceClientRewriteObject(t *testing.T) { if !bytes.Equal(attrs.MD5, hash) { t.Errorf("wrong hash returned\nwant %d\ngot %d", hash, attrs.MD5) } + if attrs.Generation == 0 { + t.Errorf("Generation was zero, expected non-zero") + } obj, err := server.GetObject(test.bucketName, test.objectName) if err != nil { t.Fatal(err) @@ -1244,6 +1247,7 @@ func TestServiceClientRewriteObjectWithGenerations(t *testing.T) { copier := dstObject.CopierFrom(sourceObject) copier.ContentType = contentType attrs, err := copier.Run(context.TODO()) + if err != nil { if test.expectErr { t.Skip("we were expecting an error for this test") @@ -1268,6 +1272,9 @@ func TestServiceClientRewriteObjectWithGenerations(t *testing.T) { if !bytes.Equal(attrs.MD5, expectedHash) { t.Errorf("wrong hash returned\nwant %d\ngot %d", expectedHash, attrs.MD5) } + if attrs.Generation == 0 { + t.Errorf("Generation was zero, expected non-zero") + } obj, err := server.GetObject(test.bucketName, test.objectName) if err != nil { t.Fatal(err) From 83441b554702c53119b920c5804b8df38ac8b30a Mon Sep 17 00:00:00 2001 From: Jess Sheneberger Date: Wed, 8 Jun 2022 14:07:53 -0600 Subject: [PATCH 3/3] gofumpt --- fakestorage/object_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/fakestorage/object_test.go b/fakestorage/object_test.go index 688c21990e..ac76a7a146 100644 --- a/fakestorage/object_test.go +++ b/fakestorage/object_test.go @@ -1247,7 +1247,6 @@ func TestServiceClientRewriteObjectWithGenerations(t *testing.T) { copier := dstObject.CopierFrom(sourceObject) copier.ContentType = contentType attrs, err := copier.Run(context.TODO()) - if err != nil { if test.expectErr { t.Skip("we were expecting an error for this test")