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.

Sign up for GitHub

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

@uppy/aws-s3: Update index.d.ts #4294

Merged
merged 1 commit into from
Apr 3, 2023
Merged

@uppy/aws-s3: Update index.d.ts #4294

merged 1 commit into from
Apr 3, 2023

Conversation

ken-kuro
Copy link
Contributor

@ken-kuro ken-kuro commented Feb 1, 2023 •
edited

Add companionHeaders to AwsS3Options object

@ken-kuro
Update index.d.ts
b0724fa 
Adds companionHeaders to aws s3 options object
@ken-kuro
Copy link
Contributor Author

ken-kuro commented Feb 1, 2023

Solves #4293

@ken-kuro ken-kuro changed the title Update index.d.ts @uppy/aws-s3: Update index.d.ts Feb 1, 2023
aduh95
aduh95 reviewed Feb 2, 2023
View reviewed changes
Copy link
Member

@aduh95 aduh95 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a better fix would be to make AwsS3Options also extend RequestClientOptions, so we wouldn't have to maintain both and make sure they are sync'ed. Would you like to do it on this PR? Otherwise I can push more commits to your branch if that's OK.

@aduh95 aduh95 linked an issue Feb 2, 2023 that may be closed by this pull request
AWS S3 Types do not include companionHeaders #4293
Closed
2 tasks
@aduh95
Copy link
Member

aduh95 commented Feb 2, 2023

You can use the changes I've made on #4298 and use them on your PR if you want.

@ken-kuro
Copy link
Contributor Author

ken-kuro commented Feb 7, 2023

Sorry for taking so long to reply to you, about that, I kinda think we should keep it the way it is, at least until the two plugins is combined. Cause extend RequestClientOptions will make companionCookiesRule available in AwsS3Options. Of course we can also omit the field from it, something like if you want:

type Parent = PluginOptions & Partial<Omit<RequestClientOptions,'companionCookiesRule'>>
export interface AwsS3Options extends Parent

@Murderlon
Copy link
Member

@aduh95 what do you think?

@arturi arturi requested a review from aduh95 April 3, 2023 12:20
aduh95
aduh95 approved these changes Apr 3, 2023
View reviewed changes
Copy link
Member

@aduh95 aduh95 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge, sorry for the delay.

@aduh95 aduh95 merged commit 6df62c5 into transloadit:main Apr 3, 2023
@github-actions github-actions bot mentioned this pull request Apr 4, 2023
Merged
github-actions bot added a commit that referenced this pull request Apr 4, 2023
@github-actions
Release: uppy@3.7.0 (#4400)
ffabc21 
| Package                | Version | Package                | Version |
| ---------------------- | ------- | ---------------------- | ------- |
| @uppy/aws-s3           |   3.0.6 | @uppy/status-bar       |   3.1.0 |
| @uppy/aws-s3-multipart |   3.1.3 | @uppy/transloadit      |   3.1.2 |
| @uppy/companion        |   4.4.0 | @uppy/tus              |   3.0.6 |
| @uppy/companion-client |   3.1.2 | @uppy/unsplash         |   3.2.0 |
| @uppy/core             |   3.1.2 | @uppy/url              |   3.3.0 |
| @uppy/dashboard        |   3.3.2 | @uppy/utils            |   5.2.0 |
| @uppy/locales          |   3.1.0 | @uppy/xhr-upload       |   3.1.1 |
| @uppy/provider-views   |   3.2.0 | uppy                   |   3.7.0 |
| @uppy/react            |   3.1.1 |                        |         |

- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/tus,@uppy/xhr-upload: make sure that we reset serverToken when an upload fails (Mikael Finstad / #4376)
- @uppy/aws-s3-multipart: do not auto-open sockets, clean them up on abort (Antoine du Hamel)
- @uppy/aws-s3: Update types (Minh Hieu / #4294)
- @uppy/companion-client: do not open socket more than once (Artur Paikin)
- @uppy/companion: add `service: 'companion'` to periodic ping (Mikael Finstad / #4383)
- @uppy/companion: add connection keep-alive to dropbox (Mikael Finstad / #4365)
- @uppy/companion: add missing env variable for standalone option (Mikael Finstad / #4382)
- @uppy/companion: add S3 prefix env variable (Mikael Finstad / #4320)
- @uppy/companion: allow local ips when testing (Mikael Finstad / #4328)
- @uppy/companion: fix typo in redis-emitter.js (Ikko Eltociear Ashimine / #4362)
- @uppy/companion: merge Provider/SearchProvider (Mikael Finstad / #4330)
- @uppy/companion: only body parse when needed & increased body size for s3 (Mikael Finstad / #4372)
- @uppy/core: fix bug with `setOptions` (Nguyễn bảo Trung / #4350)
- @uppy/locales: locales: add es_MX (Kevin van Zonneveld / #4393)
- @uppy/locales: locales: add hi_IN (Kevin van Zonneveld / #4391)
- @uppy/provider-views: fix race condition when adding folders (Mikael Finstad / #4384)
- @uppy/provider-views: UI: Use form attribite with a form in doc root to prevent outer form submit (Artur Paikin / #4283)
- @uppy/transloadit: fix socket error message (Artur Paikin / #4352)
- @uppy/tus: do not auto-open sockets, clean them up on abort (Antoine du Hamel)
- meta: add version info in the bundlers CI (Antoine du Hamel / #4386)
- meta: deploy to Heroku on every companion commit (Mikael Finstad / #4367)
- meta: example: migrate `redux` to ESM (Antoine du Hamel / #4158)
- meta: fix all ESLint warnings and turn them into errors (Antoine du Hamel / #4398)
- meta: fixup! website: update links to work under the new URL (Antoine du Hamel / #4371)
- meta: remove duplicate outdated OSS support docs (Mikael Finstad, Artur Paikin / #4364)
- meta: use overrides to make sure no uppy package is fetch from npm (Antoine du Hamel / #4395)
- website: add a deprecation notice and a link to the new website (Antoine du Hamel / #4370)
- website: fix home page (Antoine du Hamel)
- website: Remove the website (Merlijn Vos / #4369)
- website: update links to work under the new URL (Antoine du Hamel / #4371)
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
@github-actions
Release: uppy@3.7.0 (transloadit#4400)
14c9715 
| Package                | Version | Package                | Version |
| ---------------------- | ------- | ---------------------- | ------- |
| @uppy/aws-s3           |   3.0.6 | @uppy/status-bar       |   3.1.0 |
| @uppy/aws-s3-multipart |   3.1.3 | @uppy/transloadit      |   3.1.2 |
| @uppy/companion        |   4.4.0 | @uppy/tus              |   3.0.6 |
| @uppy/companion-client |   3.1.2 | @uppy/unsplash         |   3.2.0 |
| @uppy/core             |   3.1.2 | @uppy/url              |   3.3.0 |
| @uppy/dashboard        |   3.3.2 | @uppy/utils            |   5.2.0 |
| @uppy/locales          |   3.1.0 | @uppy/xhr-upload       |   3.1.1 |
| @uppy/provider-views   |   3.2.0 | uppy                   |   3.7.0 |
| @uppy/react            |   3.1.1 |                        |         |

- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/tus,@uppy/xhr-upload: make sure that we reset serverToken when an upload fails (Mikael Finstad / transloadit#4376)
- @uppy/aws-s3-multipart: do not auto-open sockets, clean them up on abort (Antoine du Hamel)
- @uppy/aws-s3: Update types (Minh Hieu / transloadit#4294)
- @uppy/companion-client: do not open socket more than once (Artur Paikin)
- @uppy/companion: add `service: 'companion'` to periodic ping (Mikael Finstad / transloadit#4383)
- @uppy/companion: add connection keep-alive to dropbox (Mikael Finstad / transloadit#4365)
- @uppy/companion: add missing env variable for standalone option (Mikael Finstad / transloadit#4382)
- @uppy/companion: add S3 prefix env variable (Mikael Finstad / transloadit#4320)
- @uppy/companion: allow local ips when testing (Mikael Finstad / transloadit#4328)
- @uppy/companion: fix typo in redis-emitter.js (Ikko Eltociear Ashimine / transloadit#4362)
- @uppy/companion: merge Provider/SearchProvider (Mikael Finstad / transloadit#4330)
- @uppy/companion: only body parse when needed & increased body size for s3 (Mikael Finstad / transloadit#4372)
- @uppy/core: fix bug with `setOptions` (Nguyễn bảo Trung / transloadit#4350)
- @uppy/locales: locales: add es_MX (Kevin van Zonneveld / transloadit#4393)
- @uppy/locales: locales: add hi_IN (Kevin van Zonneveld / transloadit#4391)
- @uppy/provider-views: fix race condition when adding folders (Mikael Finstad / transloadit#4384)
- @uppy/provider-views: UI: Use form attribite with a form in doc root to prevent outer form submit (Artur Paikin / transloadit#4283)
- @uppy/transloadit: fix socket error message (Artur Paikin / transloadit#4352)
- @uppy/tus: do not auto-open sockets, clean them up on abort (Antoine du Hamel)
- meta: add version info in the bundlers CI (Antoine du Hamel / transloadit#4386)
- meta: deploy to Heroku on every companion commit (Mikael Finstad / transloadit#4367)
- meta: example: migrate `redux` to ESM (Antoine du Hamel / transloadit#4158)
- meta: fix all ESLint warnings and turn them into errors (Antoine du Hamel / transloadit#4398)
- meta: fixup! website: update links to work under the new URL (Antoine du Hamel / transloadit#4371)
- meta: remove duplicate outdated OSS support docs (Mikael Finstad, Artur Paikin / transloadit#4364)
- meta: use overrides to make sure no uppy package is fetch from npm (Antoine du Hamel / transloadit#4395)
- website: add a deprecation notice and a link to the new website (Antoine du Hamel / transloadit#4370)
- website: fix home page (Antoine du Hamel)
- website: Remove the website (Merlijn Vos / transloadit#4369)
- website: update links to work under the new URL (Antoine du Hamel / transloadit#4371)
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 S3 Types do not include companionHeaders
3 participants
@ken-kuro @aduh95 @Murderlon