Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

@uppy/aws-s3: allow uploads to fail/succeed independently #5603

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

Murderlon
Copy link
Member

Closes #3972

@Murderlon Murderlon requested a review from mifi January 14, 2025 12:53
@Murderlon Murderlon self-assigned this Jan 14, 2025
Copy link
Contributor

Diff output files
diff --git a/packages/@uppy/aws-s3/lib/index.js b/packages/@uppy/aws-s3/lib/index.js
index e081a90..9c860cc 100644
--- a/packages/@uppy/aws-s3/lib/index.js
+++ b/packages/@uppy/aws-s3/lib/index.js
@@ -176,7 +176,7 @@ export default class AwsS3Multipart extends BasePlugin {
           }
           return _classPrivateFieldLooseBase(this, _uploadLocalFile)[_uploadLocalFile](file);
         });
-        const upload = await Promise.all(promises);
+        const upload = await Promise.allSettled(promises);
         _classPrivateFieldLooseBase(this, _setResumableUploadsCapability)[_setResumableUploadsCapability](true);
         return upload;
       },

@Murderlon
Copy link
Member Author

CI is unrelated. Looking into it separately.

@Murderlon Murderlon merged commit 7586ab4 into main Jan 15, 2025
15 of 16 checks passed
@Murderlon Murderlon deleted the aws-s3-all-settled branch January 15, 2025 08:59
github-actions bot added a commit that referenced this pull request Jan 15, 2025
| Package         | Version | Package         | Version |
| --------------- | ------- | --------------- | ------- |
| @uppy/aws-s3    |   4.2.2 | @uppy/unsplash  |   4.3.2 |
| @uppy/companion |   5.5.0 | uppy            |  4.13.0 |

- @uppy/aws-s3: always set S3 meta to UppyFile & include key (Merlijn Vos / #5602)
- @uppy/companion: fix forcePathStyle boolean conversion (Mikael Finstad / #5308)
- meta: Fix Webpack CI (Merlijn Vos / #5604)
- @uppy/aws-s3: allow uploads to fail/succeed independently (Merlijn Vos / #5603)
- meta: Add types for css files (Merlijn Vos / #5591)
- @uppy/unsplash: make utmSource optional (Merlijn Vos / #5601)
- meta: build(deps): bump docker/setup-qemu-action from 3.2.0 to 3.3.0 (dependabot[bot] / #5599)
- meta: build(deps): bump docker/build-push-action from 6.10.0 to 6.11.0 (dependabot[bot] / #5600)
- @uppy/companion: add COMPANION_TUS_DEFERRED_UPLOAD_LENGTH (Dominik Schmidt / #5561)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

S3 multipart: network error causes uppy to get stuck in corrupt state
1 participant