remove copy-props

Sean O'Brien · Sean O'Brien · commit 17848f402898 · 2026-06-16T15:42:38.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 3.385.0 - 2026-06-16
 
-* `Aws\S3` - Added support for copying tags and annotations to the destination object in `MultipartCopy`. Set `copy_props` to `default` to copy metadata, tags, and annotations. Set `tags_directive` and `annotations_directive` to override individually. Tag and annotation work runs only when explicitly opted in to preserve backwards compatibility.
+* `Aws\S3` - Added support for copying tags and annotations to the destination object in `MultipartCopy`. Set `tags_directive` and `annotations_directive` to override individually. Tag and annotation work runs only when explicitly opted in to preserve backwards compatibility.
 
 ## 3.384.11 - 2026-06-16
 
diff --git a/features/multipart/s3.feature b/features/multipart/s3.feature
@@ -69,19 +69,19 @@ Feature: S3 Multipart Uploads
     Then the copied file "tags-no-auto-copy" should have tags "k=v&Project=X"
 
   @s3annotations
-  Scenario: copy_props=default copies tags to the destination
+  Scenario: tags_directive=COPY copies tags to the destination
     Given I have an s3 client and an uploaded file named "tags-default" with tags
-    When I call multipartCopy on "tags-default" with copy_props "default"
+    When I call multipartCopy on "tags-default" with tags_directive "COPY"
     Then the copied file "tags-default-copy" should have the same tags as "tags-default"
 
-  Scenario: copy_props=metadata-directive does not copy tags
+  Scenario: Default directives skip tag copying
     Given I have an s3 client and an uploaded file named "tags-skip" with tags
-    When I call multipartCopy on "tags-skip" with copy_props "metadata-directive"
+    When I call multipartCopy on "tags-skip" to a new key in the same bucket
     Then the copied file "tags-skip-copy" should have no tags
 
-  Scenario: copy_props=none strips metadata and tags
+  Scenario: REPLACE+UNSPECIFIED+EXCLUDE strips metadata and tags
     Given I have an s3 client and an uploaded file named "none-strip" with metadata and tags
-    When I call multipartCopy on "none-strip" with copy_props "none"
+    When I call multipartCopy on "none-strip" with metadata_directive "REPLACE" and tags_directive "UNSPECIFIED" and annotations_directive "EXCLUDE"
     Then the copied file "none-strip-copy" should have no user-defined metadata
     And the copied file "none-strip-copy" should have no tags
 
@@ -90,25 +90,20 @@ Feature: S3 Multipart Uploads
     When I call multipartCopy on "tags-replace" with tags_directive "REPLACE" and tagging "Project=Override&Env=prod"
     Then the copied file "tags-replace-copy" should have tags "Project=Override&Env=prod"
 
-  Scenario: tags_directive=COPY explicitly enables tag copying under metadata-directive copy_props
-    Given I have an s3 client and an uploaded file named "tags-explicit" with tags
-    When I call multipartCopy on "tags-explicit" with copy_props "metadata-directive" and tags_directive "COPY"
-    Then the copied file "tags-explicit-copy" should have the same tags as "tags-explicit"
-
 
   # TODO: re-enable once concurrent PutObjectAnnotation behavior enabled.
   # Tracking: <ticket-id>. ETA: <date>.
   # @s3annotations
-  # Scenario: copy_props=default copies annotations to the destination
+  # Scenario: annotations_directive=COPY copies annotations to the destination
   #   Given I have an s3 client and an uploaded file named "annot-default" with annotations
-  #   When I call multipartCopy on "annot-default" with copy_props "default"
+  #   When I call multipartCopy on "annot-default" with annotations_directive "COPY"
   #   Then the copied file "annot-default-copy" should have the same annotations as "annot-default"
 
 
   @s3annotations
-  Scenario: annotations_directive=EXCLUDE skips annotation copying under copy_props=default
+  Scenario: annotations_directive=EXCLUDE skips annotation copying
     Given I have an s3 client and an uploaded file named "annot-exclude" with annotations
-    When I call multipartCopy on "annot-exclude" with copy_props "default" and annotations_directive "EXCLUDE"
+    When I call multipartCopy on "annot-exclude" with annotations_directive "EXCLUDE"
     Then the copied file "annot-exclude-copy" should have no annotations
 
   @versioned
diff --git a/src/Multipart/UploadState.php b/src/Multipart/UploadState.php
@@ -47,10 +47,10 @@ class UploadState
     /**
      * @var array Subset of upload-manager config retained for resume flows.
      *
-     * Carries the original caller's directives (e.g. `copy_props`,
-     * `metadata_directive`, `tags_directive`, `annotations_directive`) so a
-     * later `getStateFromService(...) → new MultipartCopy(['state' => $s])`
-     * can replay Phase 3 correctly without the caller having to re-specify.
+     * Carries the original caller's directives (`metadata_directive`,
+     * `tags_directive`, `annotations_directive`) so a later
+     * `getStateFromService(...) → new MultipartCopy(['state' => $s])` can
+     * replay Phase 3 correctly without the caller having to re-specify.
      */
     private array $config = [];
 
diff --git a/src/S3/MultipartCopy.php b/src/S3/MultipartCopy.php
@@ -26,17 +26,6 @@ class MultipartCopy extends AbstractUploadManager
         'REPLACE' => true,
     ];
 
-    // copy_props presets: caller-facing top-level switch.
-    private const COPY_PROPS_NONE               = 'none';
-    private const COPY_PROPS_METADATA_DIRECTIVE = 'metadata-directive';
-    private const COPY_PROPS_DEFAULT            = 'default';
-
-    private const VALID_COPY_PROPS = [
-        self::COPY_PROPS_NONE               => true,
-        self::COPY_PROPS_METADATA_DIRECTIVE => true,
-        self::COPY_PROPS_DEFAULT            => true,
-    ];
-
     private const TAGS_DIRECTIVE_UNSPECIFIED = 'UNSPECIFIED';
     private const TAGS_DIRECTIVE_COPY        = 'COPY';
     private const TAGS_DIRECTIVE_REPLACE     = 'REPLACE';
@@ -118,36 +107,24 @@ class MultipartCopy extends AbstractUploadManager
      *   of the multipart upload and that is used to resume a previous upload.
      *   When this option is provided, the `bucket`, `key`, and `part_size`
      *   options are ignored.
-     * - copy_props: (string, default='metadata-directive') Top-level preset that
-     *   resolves defaults for metadata_directive, tags_directive, and
-     *   annotations_directive. Explicit values for those directives take
-     *   precedence. Values:
-     *     - 'none': nothing is copied. Resolves metadata_directive=REPLACE,
-     *       tags_directive=UNSPECIFIED, annotations_directive=EXCLUDE.
-     *     - 'metadata-directive': legacy default. Resolves metadata_directive=COPY,
-     *       tags_directive=UNSPECIFIED, annotations_directive=UNSPECIFIED.
-     *     - 'default': metadata, tags, and annotations are all copied.
-     *       Resolves metadata_directive=COPY, tags_directive=COPY,
-     *       annotations_directive=COPY.
-     * - metadata_directive: (string) 'COPY' or 'REPLACE'. Defaults to COPY,
-     *   except when `copy_props` is 'none' (then REPLACE). Caller-supplied
-     *   `params['Metadata']` does NOT change the directive — set this option
-     *   explicitly to opt into REPLACE. When 'COPY', source metadata fields
-     *   (Metadata, CacheControl, ContentDisposition, ContentEncoding,
-     *   ContentLanguage, ContentType, Expires) are forwarded and any
-     *   matching caller-supplied fields are dropped. When 'REPLACE', no
-     *   source metadata is read and caller-supplied params are used as-is.
-     * - tags_directive: (string) 'UNSPECIFIED', 'COPY', or 'REPLACE'.
-     *   Defaults derived from `copy_props`. UNSPECIFIED means no tag work.
-     *   COPY reads source tags via GetObjectTagging and writes to the
-     *   destination via PutObjectTagging after CompleteMultipartUpload.
-     *   REPLACE skips the read and writes caller-supplied `params['Tagging']`
-     *   to the destination.
-     * - annotations_directive: (string) 'UNSPECIFIED', 'COPY', or 'EXCLUDE'.
-     *   Defaults derived from `copy_props`. UNSPECIFIED and EXCLUDE both
-     *   skip annotation work. COPY reads source annotations via
-     *   ListObjectAnnotations and per-name GetObjectAnnotation, then writes
-     *   them to the destination via per-name PutObjectAnnotation.
+     * - metadata_directive: (string, default='COPY') 'COPY' or 'REPLACE'.
+     *   Caller-supplied `params['Metadata']` does NOT change the directive,
+     *   set this option explicitly to opt into REPLACE. When 'COPY', source
+     *   metadata fields (Metadata, CacheControl, ContentDisposition,
+     *   ContentEncoding, ContentLanguage, ContentType, Expires) are forwarded
+     *   and any matching caller-supplied fields are dropped. When 'REPLACE',
+     *   no source metadata is read and caller-supplied params are used as-is.
+     * - tags_directive: (string, default='UNSPECIFIED') 'UNSPECIFIED', 'COPY',
+     *   or 'REPLACE'. UNSPECIFIED means no tag work. COPY reads source tags
+     *   via GetObjectTagging and writes to the destination via
+     *   PutObjectTagging after CompleteMultipartUpload. REPLACE skips the
+     *   read and writes caller-supplied `params['Tagging']` to the
+     *   destination.
+     * - annotations_directive: (string, default='UNSPECIFIED') 'UNSPECIFIED',
+     *   'COPY', or 'EXCLUDE'. UNSPECIFIED and EXCLUDE both skip annotation
+     *   work. COPY reads source annotations via ListObjectAnnotations and
+     *   per-name GetObjectAnnotation, then writes them to the destination
+     *   via per-name PutObjectAnnotation.
      * - source_metadata: (Aws\ResultInterface) The result of a HeadObject call
      *   on the copy source. If not provided, the SDK makes a HeadObject request
      *   to obtain the source object's size and metadata. Providing this avoids
@@ -849,23 +826,6 @@ private function putAnnotationWithRetries(array $baseParams): PromiseInterface
         });
     }
 
-    /**
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    private function resolveCopyProps(): string
-    {
-        $value = $this->config['copy_props'] ?? self::COPY_PROPS_METADATA_DIRECTIVE;
-        if (!isset(self::VALID_COPY_PROPS[$value])) {
-            throw new \InvalidArgumentException(
-                "Invalid copy_props value '$value'. Must be one of: "
-                . implode(', ', array_keys(self::VALID_COPY_PROPS)) . '.'
-            );
-        }
-
-        return $value;
-    }
-
     /**
      * @return string
      */
@@ -876,11 +836,6 @@ private function resolveMetadataDirective(): string
             return strtoupper((string) $explicit);
         }
 
-        // copy_props=none implies REPLACE.
-        if ($this->resolveCopyProps() === self::COPY_PROPS_NONE) {
-            return 'REPLACE';
-        }
-
         return 'COPY';
     }
 
@@ -891,22 +846,19 @@ private function resolveMetadataDirective(): string
     private function resolveTagsDirective(): string
     {
         $explicit = $this->config['tags_directive'] ?? null;
-        if ($explicit !== null) {
-            $value = strtoupper((string) $explicit);
-            if (!isset(self::VALID_TAGS_DIRECTIVES[$value])) {
-                throw new \InvalidArgumentException(
-                    "Invalid tags_directive value '$value'. Must be one of: "
-                    . implode(', ', array_keys(self::VALID_TAGS_DIRECTIVES)) . '.'
-                );
-            }
+        if ($explicit === null) {
+            return self::TAGS_DIRECTIVE_UNSPECIFIED;
+        }
 
-            return $value;
+        $value = strtoupper((string) $explicit);
+        if (!isset(self::VALID_TAGS_DIRECTIVES[$value])) {
+            throw new \InvalidArgumentException(
+                "Invalid tags_directive value '$value'. Must be one of: "
+                . implode(', ', array_keys(self::VALID_TAGS_DIRECTIVES)) . '.'
+            );
         }
 
-        return match ($this->resolveCopyProps()) {
-            self::COPY_PROPS_DEFAULT => self::TAGS_DIRECTIVE_COPY,
-            default => self::TAGS_DIRECTIVE_UNSPECIFIED,
-        };
+        return $value;
     }
 
     /**
@@ -916,23 +868,19 @@ private function resolveTagsDirective(): string
     private function resolveAnnotationsDirective(): string
     {
         $explicit = $this->config['annotations_directive'] ?? null;
-        if ($explicit !== null) {
-            $value = strtoupper((string) $explicit);
-            if (!isset(self::VALID_ANNOTATIONS_DIRECTIVES[$value])) {
-                throw new \InvalidArgumentException(
-                    "Invalid annotations_directive value '$value'. Must be one of: "
-                    . implode(', ', array_keys(self::VALID_ANNOTATIONS_DIRECTIVES)) . '.'
-                );
-            }
+        if ($explicit === null) {
+            return self::ANNOTATIONS_DIRECTIVE_UNSPECIFIED;
+        }
 
-            return $value;
+        $value = strtoupper((string) $explicit);
+        if (!isset(self::VALID_ANNOTATIONS_DIRECTIVES[$value])) {
+            throw new \InvalidArgumentException(
+                "Invalid annotations_directive value '$value'. Must be one of: "
+                . implode(', ', array_keys(self::VALID_ANNOTATIONS_DIRECTIVES)) . '.'
+            );
         }
 
-        return match ($this->resolveCopyProps()) {
-            self::COPY_PROPS_DEFAULT => self::ANNOTATIONS_DIRECTIVE_COPY,
-            self::COPY_PROPS_NONE => self::ANNOTATIONS_DIRECTIVE_EXCLUDE,
-            default => self::ANNOTATIONS_DIRECTIVE_UNSPECIFIED,
-        };
+        return $value;
     }
 
     /**
diff --git a/src/S3/MultipartUploadingTrait.php b/src/S3/MultipartUploadingTrait.php
@@ -19,9 +19,9 @@ trait MultipartUploadingTrait
      * @param string            $uploadId Upload ID for the multipart upload.
      * @param array             $config   Optional config to retain on the
      *                                    state. Pass the directive keys
-     *                                    (`copy_props`, `metadata_directive`,
+     *                                    (`metadata_directive`,
      *                                    `tags_directive`,
-     *                                    `annotations_directive`, etc.) the
+     *                                    `annotations_directive`) the
      *                                    original copy was launched with so
      *                                    a resumed `MultipartCopy` replays
      *                                    Phase 3 with the same behavior. The
diff --git a/tests/Integ/MultipartContext.php b/tests/Integ/MultipartContext.php
@@ -534,37 +534,42 @@ public function iHaveAnS3ClientAndAnUploadedFileNamedWithMetadataAndTags($filena
     }
 
     /**
-     * @When I call multipartCopy on :filename with copy_props :copyProps
+     * @When I call multipartCopy on :filename with tags_directive :tagsDir
      */
-    public function iCallMultipartCopyOnWithCopyProps($filename, $copyProps)
+    public function iCallMultipartCopyOnWithTagsDirective($filename, $tagsDir)
     {
         $bucket = self::getResourceName();
         $copier = new MultipartCopy(
             $this->s3Client,
             '/' . $bucket . '/' . $filename,
             [
-                'bucket'     => $bucket,
-                'key'        => $filename . '-copy',
-                'copy_props' => $copyProps,
+                'bucket'         => $bucket,
+                'key'            => $filename . '-copy',
+                'tags_directive' => $tagsDir,
             ]
         );
         $this->runCopy($copier);
     }
 
     /**
-     * @When I call multipartCopy on :filename with copy_props :copyProps and tags_directive :tagsDir
+     * @When I call multipartCopy on :filename with metadata_directive :metaDir and tags_directive :tagsDir and annotations_directive :annotDir
      */
-    public function iCallMultipartCopyOnWithCopyPropsAndTagsDirective($filename, $copyProps, $tagsDir)
-    {
+    public function iCallMultipartCopyOnWithAllThreeDirectives(
+        $filename,
+        $metaDir,
+        $tagsDir,
+        $annotDir
+    ) {
         $bucket = self::getResourceName();
         $copier = new MultipartCopy(
             $this->s3Client,
             '/' . $bucket . '/' . $filename,
             [
-                'bucket'         => $bucket,
-                'key'            => $filename . '-copy',
-                'copy_props'     => $copyProps,
-                'tags_directive' => $tagsDir,
+                'bucket'                => $bucket,
+                'key'                   => $filename . '-copy',
+                'metadata_directive'    => $metaDir,
+                'tags_directive'        => $tagsDir,
+                'annotations_directive' => $annotDir,
             ]
         );
         $this->runCopy($copier);
@@ -664,9 +669,9 @@ public function iHaveAnS3ClientAndAnUploadedFileNamedWithAnnotations($filename)
     }
 
     /**
-     * @When I call multipartCopy on :filename with copy_props :copyProps and annotations_directive :annotDir
+     * @When I call multipartCopy on :filename with annotations_directive :annotDir
      */
-    public function iCallMultipartCopyOnWithCopyPropsAndAnnotationsDirective($filename, $copyProps, $annotDir)
+    public function iCallMultipartCopyOnWithAnnotationsDirective($filename, $annotDir)
     {
         $bucket = self::getResourceName();
         $copier = new MultipartCopy(
@@ -675,7 +680,6 @@ public function iCallMultipartCopyOnWithCopyPropsAndAnnotationsDirective($filena
             [
                 'bucket'                => $bucket,
                 'key'                   => $filename . '-copy',
-                'copy_props'            => $copyProps,
                 'annotations_directive' => $annotDir,
             ]
         );
diff --git a/tests/S3/MultipartCopyTest.php b/tests/S3/MultipartCopyTest.php
