Skip to content

Restyle S3: Use key_id and key_secret directly #4225

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

Closed
wants to merge 2 commits into from
Closed

Restyle S3: Use key_id and key_secret directly #4225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f42c054
key api
farizrahman4u Jul 17, 2020
63fd3be
Restyled by black
restyled-commits Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions dvc/tree/s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,32 @@ def __init__(self, repo, config):

self._append_aws_grants_to_extra_args(config)

self.key_id = config.get("s3_key_id")
self.key_secret = config.get("s3_key_secret")

shared_creds = config.get("credentialpath")
if shared_creds:
os.environ.setdefault("AWS_SHARED_CREDENTIALS_FILE", shared_creds)
self._validate_config()

def _validate_config(self):
if bool(self.key_id) != bool(self.key_secret):
raise DvcException(
"Provide either both or none of `s3_key_id` and `s3_key_secret`."
)

@wrap_prop(threading.Lock())
@cached_property
def s3(self):
import boto3

session = boto3.session.Session(
profile_name=self.profile, region_name=self.region
)
session_opts = dict(profile_name=self.profile, region_name=self.region)

if self.key_id and self.key_secret:
session_opts["aws_access_key_id"] = self.key_id
session_opts["aws_secret_access_key"] = self.key_secret

session = boto3.session.Session(**session_opts)

return session.client(
"s3", endpoint_url=self.endpoint_url, use_ssl=self.use_ssl
Expand Down