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

Handle S3 credential expiration more gracefully #354

Merged
merged 6 commits into from
Nov 30, 2023
Merged

Handle S3 credential expiration more gracefully #354

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64c0976
Handle S3 credential expiration more gracefully
jrbourbeau Nov 14, 2023
a33bf3a
Fix tests
jrbourbeau Nov 14, 2023
ab70e65
Fix Python 3.8 linting
jrbourbeau Nov 14, 2023
ce741a8
Apply suggestions from code review
jrbourbeau Nov 29, 2023
ad85cd4
Merge branch 'main' of https://github.com/nsidc/earthaccess into cach…
jrbourbeau Nov 29, 2023
6c342a2
Feedback
jrbourbeau Nov 29, 2023
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
12 changes: 8 additions & 4 deletions earthaccess/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,15 @@ def get_s3fs_session(
"parameters must be specified. "
)

if concept_id is not None:
provider = self._derive_concept_provider(concept_id)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯


# Get existing S3 credentials if we already have them
location = (concept_id, daac, provider, endpoint)
location = (
daac,
provider,
endpoint,
) # Identifier for where to get S3 credentials from
need_new_creds = False
try:
dt_init, creds = self._s3_credentials[location]
MattF-NSIDC marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -228,9 +235,6 @@ def get_s3fs_session(
now = datetime.datetime.now()
if endpoint is not None:
creds = self.auth.get_s3_credentials(endpoint=endpoint)
MattF-NSIDC marked this conversation as resolved.
Show resolved Hide resolved
elif concept_id is not None:
provider = self._derive_concept_provider(concept_id)
creds = self.auth.get_s3_credentials(provider=provider)
elif daac is not None:
creds = self.auth.get_s3_credentials(daac=daac)
elif provider is not None:
Expand Down
Loading