return attrs for newly created object in rewrite (#823)

* return attrs for newly created object in rewrite * update rewrite tests to fail if generation == 0 * gofumpt
fsouza · Jun 9, 2022 · c5eaf3b · c5eaf3b
1 parent 9723597
commit c5eaf3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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) {

diff --git 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)
@@ -1268,6 +1271,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)