RDISCROWD-8392 upgrade to boto3 #1069
Open
Conversation
This file contains hidden or 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
peterkle
force-pushed
the
RDISCROWD-8392
branch
from
704a157 to
b2082cb
Compare
Pull Request Test Coverage Report for Build 19114618549Details
💛 - Coveralls |
dchhabda
requested changes
Oct 6, 2025
pybossa/cloud_store_api/base_conn.py
Outdated
Comment on lines
166
to
182
| def get_path(self, path='/', **kwargs): | ||
| """ | ||
| Get the full path by prepending host_suffix if it exists. | ||
| This method provides compatibility with the legacy boto2-style interface. | ||
| """ | ||
| host_suffix = getattr(self, 'host_suffix', '') | ||
| if host_suffix: | ||
| if not host_suffix.startswith('/'): | ||
| host_suffix = '/' + host_suffix | ||
| if not host_suffix.endswith('/') and path.startswith('/'): | ||
| return host_suffix + path | ||
| elif host_suffix.endswith('/') and path.startswith('/'): | ||
| return host_suffix + path[1:] | ||
| else: | ||
| return host_suffix + path | ||
| return path | ||
|
|
There was a problem hiding this comment.
Can this be removed as it seems this method is not used anywhere except under tests.
Comment on lines
156
to
175
| def get_object(self, bucket: str, key: str, **kwargs): | ||
| return self.client.get_object(Bucket=bucket, Key=key, **kwargs) | ||
|
|
||
| def put_object(self, bucket: str, key: str, body, **kwargs): | ||
| return self.client.put_object(Bucket=bucket, Key=key, Body=body, **kwargs) | ||
|
|
||
| def list_objects(self, bucket: str, prefix: str = "", **kwargs): | ||
| return self.client.list_objects_v2(Bucket=bucket, Prefix=prefix, **kwargs) | ||
|
|
||
| def upload_file(self, filename: str, bucket: str, key: str, **kwargs): | ||
| # Uses s3transfer under the hood (built-in retries/backoff) | ||
| return self.client.upload_file(filename, bucket, key, ExtraArgs=kwargs or {}) | ||
|
|
||
| def raw(self): | ||
| """Access the underlying boto3 client if you need operations not wrapped here.""" | ||
| return self.client | ||
|
|
||
| def get_bucket(self, bucket_name, validate=False, **kwargs): | ||
| """Return a bucket adapter for boto2-style interface compatibility.""" | ||
| return ProxiedBucketAdapter(self, bucket_name) |
There was a problem hiding this comment.
Similar function definitions exists at multiple places. Please have them defined in base class. Any customization can be done in derived classes. This will make codebase easier to evolve and reduce inconsistencies over time. Thanks
Comment on lines
-238
to
-271
| def test_proxy_s3_error(self, create_connection): | ||
| admin, owner = UserFactory.create_batch(2) | ||
| project = ProjectFactory.create(owner=owner) | ||
| url = '/fileproxy/encrypted/s3/test/%s/file.pdf' % project.id | ||
| task = TaskFactory.create(project=project, info={ | ||
| 'url': url | ||
| }) | ||
|
|
||
| signature = signer.dumps({'task_id': task.id}) | ||
| req_url = '%s?api_key=%s&task-signature=%s' % (url, admin.api_key, signature) | ||
|
|
||
| key = self.get_key(create_connection) | ||
| key.get_contents_as_string.side_effect = S3ResponseError(403, 'Forbidden') | ||
|
|
||
| res = self.app.get(req_url, follow_redirects=True) | ||
| assert res.status_code == 500, f"Expected 500 Internal Server Error, got {res.status_code}" | ||
|
|
||
| @with_context | ||
| @patch('pybossa.cloud_store_api.s3.create_connection') | ||
| def test_proxy_key_not_found(self, create_connection): | ||
| admin, owner = UserFactory.create_batch(2) |
There was a problem hiding this comment.
What would be the new approach to test these cases?
peterkle
force-pushed
the
RDISCROWD-8392
branch
from
8b5557e to
b3a446e
Compare
dchhabda
requested changes
Nov 6, 2025
Author
I’ll fix the test, but I’ll keep the auto-formatting changes. While they aren’t directly related to the main changes, they improve code readability and consistency. |
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.
RDISCROWD-8392