From b5dc985610f9d94e9db94838f8521d32fed83c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Schmelczer?= Date: Wed, 6 Apr 2022 17:18:51 +0200 Subject: [PATCH] Refactor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: AndrĂ¡s Schmelczer --- good_ai/example_secrets.ini | 2 +- good_ai/src/good_ai/open_s3/large_file.py | 37 ++++++++++++----------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/good_ai/example_secrets.ini b/good_ai/example_secrets.ini index 2bb053f..439d79a 100644 --- a/good_ai/example_secrets.ini +++ b/good_ai/example_secrets.ini @@ -3,4 +3,4 @@ aws_region_name = your_region_like_eu-west-2 aws_access_key_id = YOUR_ACCESS_KEY_ID aws_secret_access_key = YOUR_VERY_SECRET_ACCESS_KEY large_files_bucket_name = create_a_bucket_and_put_its_name_here -endpoint_url = this is optional, for backblaze, use this: https://s3.us-west-002.backblazeb2.com +aws_endpoint_url = this is optional, for backblaze, use this: https://s3.us-west-002.backblazeb2.com diff --git a/good_ai/src/good_ai/open_s3/large_file.py b/good_ai/src/good_ai/open_s3/large_file.py index d0175d7..59c07d9 100644 --- a/good_ai/src/good_ai/open_s3/large_file.py +++ b/good_ai/src/good_ai/open_s3/large_file.py @@ -80,29 +80,11 @@ class LargeFile: self._find_versions() self._check_mode_and_set_version() - @classmethod - def configure_credentials( - cls, - *, - aws_region_name: str, - aws_access_key_id: str, - aws_secret_access_key: str, - large_files_bucket_name: str, - endpoint_url: Optional[str] = None, - **_: Mapping[str, Any], - ) -> None: - cls.region_name = aws_region_name - cls.access_key_id = aws_access_key_id - cls.secret_access_key = aws_secret_access_key - cls.bucket_name = large_files_bucket_name - cls.endpoint_url = endpoint_url - @classmethod def configure_credentials_from_file( cls, secrets_path: Union[Path, str], ) -> None: - if isinstance(secrets_path, str): secrets_path = Path(secrets_path) @@ -114,6 +96,25 @@ class LargeFile: credentials.default_section cls.configure_credentials(**credentials[credentials.default_section]) + + @classmethod + def configure_credentials( + cls, + *, + aws_region_name: str, + aws_access_key_id: str, + aws_secret_access_key: str, + large_files_bucket_name: str, + aws_endpoint_url: Optional[str] = None, + **_: Mapping[str, Any], + ) -> None: + cls.region_name = aws_region_name + cls.access_key_id = aws_access_key_id + cls.secret_access_key = aws_secret_access_key + cls.bucket_name = large_files_bucket_name + cls.endpoint_url = aws_endpoint_url + + def __enter__(self) -> IO: self._file: IO[Any] = ( tempfile.NamedTemporaryFile(