Skip to content
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

Introduce aws env vars #274

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Introduce aws env vars #274

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c7347a
Introduce AWS environment variables to create boto client. The list o…
icaliskanoglu Sep 12, 2022
c26eda1
Merge branch 'bloomreach:master' into master
icaliskanoglu Sep 12, 2022
ae6156a
Introduce AWS environment variables to create boto client. The list o…
icaliskanoglu Sep 12, 2022
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
22 changes: 5 additions & 17 deletions s4cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ def cmp(a, b):
TEMP_FILES = set()

# Environment variable names for S3 credentials.
S3_ACCESS_KEY_NAME = "AWS_ACCESS_KEY_ID"
S3_SECRET_KEY_NAME = "AWS_SECRET_ACCESS_KEY"
S4CMD_ENV_KEY = "S4CMD_OPTS"


Expand Down Expand Up @@ -377,13 +375,15 @@ def __init__(self, opt, aws_access_key_id=None, aws_secret_access_key=None):
for each method we are going to call.
'''
self.opt = opt

session = self.boto3.session.Session()
if (aws_access_key_id is not None) and (aws_secret_access_key is not None):
self.client = self.boto3.client('s3',
self.client = session.client('s3',
aws_access_key_id=aws_access_key_id,
aws_secret_access_key=aws_secret_access_key,
endpoint_url=opt.endpoint_url)
else:
self.client = self.boto3.client('s3', endpoint_url=opt.endpoint_url)
self.client = session.client('s3', endpoint_url=opt.endpoint_url)

# Cache the result so we don't have to recalculate.
self.legal_params = {}
Expand Down Expand Up @@ -621,17 +621,6 @@ class S3Handler(object):

S3_KEYS = None

@staticmethod
def s3_keys_from_env():
'''Retrieve S3 access keys from the environment, or None if not present.'''
env = os.environ
if S3_ACCESS_KEY_NAME in env and S3_SECRET_KEY_NAME in env:
keys = (env[S3_ACCESS_KEY_NAME], env[S3_SECRET_KEY_NAME])
debug("read S3 keys from environment")
return keys
else:
return None

@staticmethod
def s3_keys_from_cmdline(opt):
'''Retrieve S3 access keys from the command line, or None if not present.'''
Expand Down Expand Up @@ -664,8 +653,7 @@ def s3_keys_from_s3cfg(opt):
@staticmethod
def init_s3_keys(opt):
'''Initialize s3 access keys from environment variable or s3cfg config file.'''
S3Handler.S3_KEYS = S3Handler.s3_keys_from_cmdline(opt) or S3Handler.s3_keys_from_env() \
or S3Handler.s3_keys_from_s3cfg(opt)
S3Handler.S3_KEYS = S3Handler.s3_keys_from_cmdline(opt) or S3Handler.s3_keys_from_s3cfg(opt)

def __init__(self, opt):
'''Constructor, connect to S3 store'''
Expand Down