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

Jump to bottom

[WIP] Pass EnvironmentName to S3 downloader. #20667

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −4
Draft

[WIP] Pass EnvironmentName to S3 downloader. #20667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/python/pants/backend/url_handlers/s3/register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class AWSCredentials:


@rule
async def access_aws_credentials() -> AWSCredentials:
async def access_aws_credentials(subprocess_env: SubprocessEnvironmentVars) -> AWSCredentials:
try:
from botocore import credentials, session
except ImportError:
Expand All @@ -47,7 +47,7 @@ async def access_aws_credentials() -> AWSCredentials:
)
raise

session = session.get_session()
session = session.get_session(env_vars=subprocess_env.vars)
creds = credentials.create_credential_resolver(session).load_credentials()

return AWSCredentials(creds)
Expand Down Expand Up @@ -106,12 +106,15 @@ async def download_from_s3(request: S3DownloadFile, aws_credentials: AWSCredenti
)


@union(in_scope_types=[EnvironmentName])
class DownloadS3SchemeURL(URLDownloadHandler):
match_scheme = "s3"


@rule
async def download_file_from_s3_scheme(request: DownloadS3SchemeURL) -> Digest:
async def download_file_from_s3_scheme(
request: DownloadS3SchemeURL,
) -> Digest:
split = urlsplit(request.url)
return await Get(
Digest,
Expand Down
4 changes: 3 additions & 1 deletion src/python/pants/core/target_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,11 @@ async def _hydrate_asset_source(
source = source.get_value_for_platform(platform)

file_digest = FileDigest(source.sha256, source.len)
environment_name = await Get(EnvironmentName, EnvironmentNameRequest, EnvironmentNameRequest.from_target(target))
# NB: This just has to run, we don't actually need the result because we know the Digest's
# FileEntry metadata.
await Get(Digest, DownloadFile(source.url, file_digest))
await Get(Digest, {DownloadFile(source.url, file_digest): DownloadFile, environment_name: EnvironmentName})

snapshot = await Get(
Snapshot,
CreateDigest(
Expand Down
Loading