Fixes fs.js s3 read/write issues introduced by switching clients #282
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Stripped leading slashes in object paths supplied to fs functions to be more consistent with expected fs behavior (as well as the older s3fs-based implementation) - Changed s3_readFile() to return a Promise<Buffer> by default and only returns a string if the user specifies an encoding. Additionally, an empty body results in a Promise<Void> rather than an empty string.
DavidSeptimus-Klotho
force-pushed
the
bugfix/js-cloud-fs
branch
from
c7d050b
to
311f018
Compare
Comment on lines
100
to
106
| return new Promise((resolve, reject) => { | ||
| const stream = data.Body; | ||
| const chunks = []; | ||
| stream.on('data', chunk => chunks.push(chunk)) | ||
| stream.once('end', () => resolve(Buffer.concat(chunks))) | ||
| stream.once('error', reject) | ||
| }); |
There was a problem hiding this comment.
nit: make this reusable? Looks similar to steamToString as well but maybe nothing to pull out between the 2
There was a problem hiding this comment.
Simple enough. I hadn't even looked at the content of streamToString.
jhsinger-klotho
approved these changes
Feb 23, 2023
DavidSeptimus-Klotho
temporarily deployed
to
integ_test
GitHub Actions
Inactive
DavidSeptimus-Klotho
temporarily deployed
to
integ_test
GitHub Actions
Inactive
DavidSeptimus-Klotho
force-pushed
the
bugfix/js-cloud-fs
branch
from
ed2edce
to
0041cc8
Compare
gordon-klotho
approved these changes
Feb 23, 2023
| @@ -123,7 +127,7 @@ async function s3_readFile(...args) { | |||
| async function s3_readdir(path) { | |||
| const bucketParams: ListObjectsCommandInput = { | |||
| Bucket: bucketName, | |||
| Prefix: `${path}`, | |||
| Prefix: stripLeadingSlashes(`${path}`), | |||
There was a problem hiding this comment.
Did this really used to be the behaviour? If so, we broke backwards compat, then we'll be breaking backwards compat again to return it.
There was a problem hiding this comment.
The actual behavior was actually quite a bit more complex as seen here:
https://github.com/hasnat/s3fs/blob/master/lib/utils.js
The key bit is that all the keys were normalized across host operating systems to match a specific format. Removing that from our FS breaks the expectation that you can use the Cloud FS the same as your local FS.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #280
Standard checks
v0.6.1that using Cloud FS for JavaScript that intend to use/as an actual s3 object prefix or that expectfs.readFile()to always return a string.