diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6926218df..0314eb0f6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,12 @@ dcicutils Change Log ---------- +8.15.0 +====== +* 2024-10-04 (dmichaels) +* Added optional bucket argument to s3_utils.s3Utils.read_s3 (initially for Andy). + + 8.14.3 ====== diff --git a/dcicutils/s3_utils.py b/dcicutils/s3_utils.py index c09cbec07..b204f74a6 100644 --- a/dcicutils/s3_utils.py +++ b/dcicutils/s3_utils.py @@ -328,8 +328,10 @@ def get_key(self, keyfile_name: str = 'access_key_admin' # maybe its not json after all return auth_text - def read_s3(self, filename: str): - response = self.s3.get_object(Bucket=self.outfile_bucket, Key=filename) + def read_s3(self, filename: str, bucket: Optional[str] = None): + if (not isinstance(bucket, str)) or (not bucket): + bucket = self.outfile_bucket + response = self.s3.get_object(Bucket=bucket, Key=filename) logger.info(str(response)) return response['Body'].read() diff --git a/pyproject.toml b/pyproject.toml index 3d1dd5044..24dc1c42f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicutils" -version = "8.14.3" +version = "8.15.0" description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources" authors = ["4DN-DCIC Team "] license = "MIT"