Skip to content

apple-codesign: don't use aws_config::defaults for S3 client during notarization #291

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

Open
a7g4 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

apple-codesign: don't use aws_config::defaults for S3 client during notarization #291

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
32 changes: 16 additions & 16 deletions apple-codesign/src/notarization.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,23 +299,23 @@ impl Notarizer {

// upload using s3 api
warn!("resolving AWS S3 configuration from Apple-provided credentials");
let config = rt.block_on(
aws_config::defaults(aws_config::BehaviorVersion::latest())
.credentials_provider(Credentials::new(
submission.data.attributes.aws_access_key_id.clone(),
submission.data.attributes.aws_secret_access_key.clone(),
Some(submission.data.attributes.aws_session_token.clone()),
None,
"apple-codesign",
))
// The region is not given anywhere in the Apple documentation. From
// manually testing all available regions, it appears to be
// us-west-2.
.region(Region::new("us-west-2"))
.load(),
);

let s3_client = aws_sdk_s3::Client::new(&config);
let config = aws_sdk_s3::config::Builder::new()
.credentials_provider(Credentials::new(
submission.data.attributes.aws_access_key_id.clone(),
submission.data.attributes.aws_secret_access_key.clone(),
Some(submission.data.attributes.aws_session_token.clone()),
None,
"apple-codesign",
))
// The region is not given anywhere in the Apple documentation. From
// manually testing all available regions, it appears to be
// us-west-2.
.region(Region::new("us-west-2"))
.behavior_version(aws_sdk_s3::config::BehaviorVersion::latest())
.build();

let s3_client = aws_sdk_s3::Client::from_conf(config);

warn!(
"uploading asset to s3://{}/{}",
Expand Down