feat(storage): migrate deleteSourceObjects to native GCS request body parameter

Author: salilg-eng

Storage/src/Bucket.php

@@ -1187,35 +1187,11 @@ public function compose(array $sourceObjects, $name, array $options = [])
             throw new \InvalidArgumentException('A content type could not be detected and must be provided manually.');
         }
 
-        $deleteSourceObjects = $options['deleteSourceObjects'] ?? false;
-
-        if (!is_bool($deleteSourceObjects)) {
-            throw new \InvalidArgumentException('The deleteSourceObjects option should be a boolean.');
-        }
-
         unset($options['metadata']);
         unset($options['predefinedAcl']);
 
         $response = $this->connection->composeObject(array_filter($options));
 
-        if ($deleteSourceObjects) {
-            $deleteOptions = array_filter([
-                'userProject' => $this->identity['userProject']
-            ]);
-
-            foreach ($sourceObjects as $sourceObject) {
-                try {
-                    if ($sourceObject instanceof StorageObject) {
-                        $sourceObject->delete($deleteOptions);
-                    } else {
-                        $this->object($sourceObject)->delete($deleteOptions);
-                    }
-                } catch (NotFoundException $e) {
-                    // Gracefully ignore duplicate source files or parallel deletions
-                }
-            }
-        }
-
         return new StorageObject(
             $this->connection,
             $response['name'],

Storage/src/Connection/ServiceDefinition/storage-v1.json

@@ -897,6 +897,10 @@
                     "$ref": "Object",
                     "description": "Properties of the resulting object."
                 },
+                "deleteSourceObjects": {
+                    "type": "boolean",
+                    "description": "If true, the source objects will be deleted after a successful compose operation."
+                },
                 "kind": {
                     "type": "string",
                     "description": "The kind of item this is.",
@@ -4398,11 +4402,6 @@
                             "type": "string",
                             "description": "The project to be billed for this request. Required for Requester Pays buckets.",
                             "location": "query"
-                        },
-                        "deleteSourceObjects": {
-                            "type": "boolean",
-                            "description": "If true, the source objects will be deleted after a successful compose operation.",
-                            "location": "query"
                         }
                     },
                     "parameterOrder": [

Storage/tests/Unit/BucketTest.php

@@ -387,16 +387,6 @@ public function testComposeThrowsExceptionWithUnknownContentType()
         $bucket->compose(['file1.txt', 'file2.txt'], 'combined-files.abc');
     }
 
-    public function testComposeThrowsExceptionWithInvalidDeleteSourceObjects()
-    {
-        $this->expectException(InvalidArgumentException::class);
-
-        $bucket = $this->getBucket();
-
-        $bucket->compose(['file1.txt', 'file2.txt'], 'combined-files.txt', [
-            'deleteSourceObjects' => 'not-a-boolean'
-        ]);
-    }
 
     /**
      * @dataProvider composeProvider
@@ -448,16 +438,6 @@ public function testComposeWithDeleteSourceObjects()
             ])
             ->shouldBeCalledTimes(1);
 
-        $this->connection->deleteObject([
-            'bucket' => self::BUCKET_NAME,
-            'object' => 'file1.txt'
-        ])->shouldBeCalledTimes(1);
-
-        $this->connection->deleteObject([
-            'bucket' => self::BUCKET_NAME,
-            'object' => 'file2.txt'
-        ])->shouldBeCalledTimes(1);
-
         $bucket = $this->getBucket();
 
         $object = $bucket->compose(['file1.txt', 'file2.txt'], $destinationObject, [