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

Jump to bottom

Correctly handle errors for prepareUploadParts #3912

Merged
merged 2 commits into from Aug 3, 2022
Merged

Correctly handle errors for prepareUploadParts #3912

merged 2 commits into from Aug 3, 2022

Conversation

Murderlon
Copy link
Member

@Murderlon Murderlon commented Jul 27, 2022 •
edited by aduh95

Closes #3909

  • Rename #prepareUploadParts to #prepareUploadPartsRetryable
  • Call this.#onError instead of return to correctly handle error
  • Add a test for it

@Murderlon Murderlon added the 3.0 label Jul 27, 2022
@Murderlon Murderlon requested a review from aduh95 July 27, 2022 09:50
@Murderlon Murderlon linked an issue Jul 27, 2022 that may be closed by this pull request
Aws Multipart - Error handling for prepareUploadParts #3909
Closed
2 tasks
@Jaykishan0705
Copy link

@Murderlon Can we able to merge this issue in 2.x version

@Murderlon
Copy link
Member Author

Murderlon commented Jul 27, 2022 •
edited

@Murderlon Can we able to merge this issue in 2.x version

I'm working on multiple things for aws-s3-multipart in 3.x and made the change here to avoid merge conflicts. We are currently working towards releasing 3.0, which should probably happen next week.

@Murderlon Murderlon merged commit 2785885 into 3.x Aug 3, 2022
@Murderlon Murderlon deleted the prepareUploadParts-error-handling branch August 3, 2022 09:26
@github-actions github-actions bot mentioned this pull request Aug 3, 2022
Merged
github-actions bot added a commit that referenced this pull request Aug 3, 2022
@github-actions
Release: uppy@3.0.0-beta.4 (#3943)
2b87253 
| Package                |      Version | Package                |      Version |
| ---------------------- | ------------ | ---------------------- | ------------ |
| @uppy/aws-s3-multipart | 3.0.0-beta.3 | @uppy/screen-capture   | 3.0.0-beta.2 |
| @uppy/companion        | 4.0.0-beta.3 | @uppy/status-bar       | 3.0.0-beta.2 |
| @uppy/core             | 3.0.0-beta.3 | @uppy/store-default    | 3.0.0-beta.2 |
| @uppy/dashboard        | 3.0.0-beta.3 | @uppy/transloadit      | 3.0.0-beta.4 |
| @uppy/drop-target      | 2.0.0-beta.2 | @uppy/tus              | 3.0.0-beta.2 |
| @uppy/informer         | 3.0.0-beta.2 | @uppy/url              | 3.0.0-beta.2 |
| @uppy/react            | 3.0.0-beta.3 | @uppy/robodog          | 3.0.0-beta.4 |
| @uppy/remote-sources   | 1.0.0-beta.3 | uppy                   | 3.0.0-beta.4 |

- @uppy/companion,@uppy/tus: Upgrade tus-js-client to 3.0.0 (Merlijn Vos / #3942)
- meta: fix release script (Antoine du Hamel)
- @uppy/aws-s3-multipart: Correctly handle errors for `prepareUploadParts` (Merlijn Vos / #3912)
- @uppy/store-default: export the class, don't expose `.callbacks` (Antoine du Hamel / #3928)
- @uppy/remote-sources: do not rely on `.name` property (Antoine du Hamel / #3941)
- @uppy/screen-capture: fix TODOs (Antoine du Hamel / #3930)
- @uppy/status-bar: rename internal modules (Antoine du Hamel / #3929)
- @uppy/transloadit: remove static properties in favor of exports (Antoine du Hamel / #3927)
- @uppy/informer: simplify `render` method (Antoine du Hamel / #3931)
- @uppy/url: remove private methods from public API (Antoine du Hamel / #3934)
- @uppy/dashboard: change `copyToClipboard` signature (Antoine du Hamel / #3933)
- @uppy/drop-target: remove `isFileTransfer` from the public API (Antoine du Hamel / #3932)
- meta: improve beta release script (Antoine du Hamel)




| Package           | Version | Package           | Version |
| ----------------- | ------- | ----------------- | ------- |
| @uppy/transloadit |   2.3.6 | @uppy/robodog     |   2.9.2 |
| @uppy/tus         |   2.4.2 | uppy              |  2.13.2 |

- @uppy/transloadit: send `assembly-cancelled` only once (Antoine du Hamel / #3937)
- meta: `keepNames` in bundle (Antoine du Hamel / #3926)
- meta: e2e: fix Transloadit test suite with Cypress 10 (Antoine du Hamel / #3936)
- meta: Bump guzzlehttp/guzzle from 7.4.1 to 7.4.5 in /examples/aws-presigned-url (dependabot[bot] / #3842)
- @uppy/tus: fix dependencies (Antoine du Hamel / #3923)
- meta: doc: fix linter failure in `image-editor.md` (Antoine du Hamel / #3924)
- meta: doc: Fix typo in image-editor.md (Ikko Ashimine / #3921)
- website: Docs and header fix (Artur Paikin / #3920)
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
@github-actions
Release: uppy@3.0.0-beta.4 (transloadit#3943)
51fac3b 
| Package                |      Version | Package                |      Version |
| ---------------------- | ------------ | ---------------------- | ------------ |
| @uppy/aws-s3-multipart | 3.0.0-beta.3 | @uppy/screen-capture   | 3.0.0-beta.2 |
| @uppy/companion        | 4.0.0-beta.3 | @uppy/status-bar       | 3.0.0-beta.2 |
| @uppy/core             | 3.0.0-beta.3 | @uppy/store-default    | 3.0.0-beta.2 |
| @uppy/dashboard        | 3.0.0-beta.3 | @uppy/transloadit      | 3.0.0-beta.4 |
| @uppy/drop-target      | 2.0.0-beta.2 | @uppy/tus              | 3.0.0-beta.2 |
| @uppy/informer         | 3.0.0-beta.2 | @uppy/url              | 3.0.0-beta.2 |
| @uppy/react            | 3.0.0-beta.3 | @uppy/robodog          | 3.0.0-beta.4 |
| @uppy/remote-sources   | 1.0.0-beta.3 | uppy                   | 3.0.0-beta.4 |

- @uppy/companion,@uppy/tus: Upgrade tus-js-client to 3.0.0 (Merlijn Vos / transloadit#3942)
- meta: fix release script (Antoine du Hamel)
- @uppy/aws-s3-multipart: Correctly handle errors for `prepareUploadParts` (Merlijn Vos / transloadit#3912)
- @uppy/store-default: export the class, don't expose `.callbacks` (Antoine du Hamel / transloadit#3928)
- @uppy/remote-sources: do not rely on `.name` property (Antoine du Hamel / transloadit#3941)
- @uppy/screen-capture: fix TODOs (Antoine du Hamel / transloadit#3930)
- @uppy/status-bar: rename internal modules (Antoine du Hamel / transloadit#3929)
- @uppy/transloadit: remove static properties in favor of exports (Antoine du Hamel / transloadit#3927)
- @uppy/informer: simplify `render` method (Antoine du Hamel / transloadit#3931)
- @uppy/url: remove private methods from public API (Antoine du Hamel / transloadit#3934)
- @uppy/dashboard: change `copyToClipboard` signature (Antoine du Hamel / transloadit#3933)
- @uppy/drop-target: remove `isFileTransfer` from the public API (Antoine du Hamel / transloadit#3932)
- meta: improve beta release script (Antoine du Hamel)




| Package           | Version | Package           | Version |
| ----------------- | ------- | ----------------- | ------- |
| @uppy/transloadit |   2.3.6 | @uppy/robodog     |   2.9.2 |
| @uppy/tus         |   2.4.2 | uppy              |  2.13.2 |

- @uppy/transloadit: send `assembly-cancelled` only once (Antoine du Hamel / transloadit#3937)
- meta: `keepNames` in bundle (Antoine du Hamel / transloadit#3926)
- meta: e2e: fix Transloadit test suite with Cypress 10 (Antoine du Hamel / transloadit#3936)
- meta: Bump guzzlehttp/guzzle from 7.4.1 to 7.4.5 in /examples/aws-presigned-url (dependabot[bot] / transloadit#3842)
- @uppy/tus: fix dependencies (Antoine du Hamel / transloadit#3923)
- meta: doc: fix linter failure in `image-editor.md` (Antoine du Hamel / transloadit#3924)
- meta: doc: Fix typo in image-editor.md (Ikko Ashimine / transloadit#3921)
- website: Docs and header fix (Artur Paikin / transloadit#3920)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aduh95 aduh95 aduh95 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Aws Multipart - Error handling for prepareUploadParts
3 participants
@Murderlon @Jaykishan0705 @aduh95