Skip to content

Commit 1be4d62

Browse files
authored
chore: bump mpl (#787)
1 parent d2f9d82 commit 1be4d62

File tree

12 files changed

+14
-18
lines changed

12 files changed

+14
-18
lines changed

.github/workflows/library_go_tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ jobs:
5555
with:
5656
dafny-version: ${{ inputs.dafny }}
5757

58+
- name: Install Smithy-Dafny codegen dependencies
59+
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
60+
5861
- name: Setup NASM for Windows (aws-lc-sys)
5962
if: matrix.os == 'windows-latest'
6063
uses: ilammy/setup-nasm@v1

.github/workflows/library_interop_keyring_test_vectors.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
aws-region: us-west-2
5050
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Dafny-Role-us-west-2
5151
role-session-name: InterOpTests
52-
role-duration-seconds: 3600
52+
role-duration-seconds: 7200
5353

5454
- uses: actions/checkout@v4
5555
with:
@@ -189,7 +189,6 @@ jobs:
189189
dafny-version: ${{ inputs.dafny }}
190190

191191
- name: Install Smithy-Dafny codegen dependencies
192-
if: ${{ inputs.regenerate-code }}
193192
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
194193

195194
- name: Regenerate code using smithy-dafny if necessary
@@ -333,7 +332,7 @@ jobs:
333332
aws-region: us-west-2
334333
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Dafny-Role-us-west-2
335334
role-session-name: InterOpTests
336-
role-duration-seconds: 3600
335+
role-duration-seconds: 7200
337336

338337
- uses: actions/checkout@v4
339338
with:
@@ -477,7 +476,6 @@ jobs:
477476
dafny-version: ${{ inputs.dafny }}
478477

479478
- name: Install Smithy-Dafny codegen dependencies
480-
if: ${{ inputs.regenerate-code }}
481479
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
482480

483481
- name: Regenerate code using smithy-dafny if necessary

.github/workflows/library_interop_mkp_test_vectors.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ jobs:
129129
dafny-version: ${{ inputs.dafny }}
130130

131131
- name: Install Smithy-Dafny codegen dependencies
132-
if: ${{ inputs.regenerate-code }}
133132
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
134133

135134
- name: Regenerate code using smithy-dafny if necessary
@@ -332,7 +331,6 @@ jobs:
332331
dafny-version: ${{ inputs.dafny }}
333332

334333
- name: Install Smithy-Dafny codegen dependencies
335-
if: ${{ inputs.regenerate-code }}
336334
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
337335

338336
- name: Regenerate code using smithy-dafny if necessary
@@ -643,7 +641,6 @@ jobs:
643641
dafny-version: ${{ inputs.dafny }}
644642

645643
- name: Install Smithy-Dafny codegen dependencies
646-
if: ${{ inputs.regenerate-code }}
647644
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
648645

649646
- name: Regenerate code using smithy-dafny if necessary

.github/workflows/library_legacy_interop_test_vectors.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ jobs:
8686
pip install poetry
8787
8888
- name: Install Smithy-Dafny codegen dependencies
89-
if: ${{ inputs.regenerate-code }}
9089
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
9190

9291
- name: Regenerate code using smithy-dafny if necessary

.github/workflows/library_net_tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ jobs:
7373
dafny-version: ${{ inputs.dafny }}
7474

7575
- name: Install Smithy-Dafny codegen dependencies
76-
if: ${{ inputs.regenerate-code }}
7776
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
7877

7978
- name: Regenerate code using smithy-dafny if necessary
@@ -184,7 +183,6 @@ jobs:
184183
dafny-version: ${{ inputs.dafny }}
185184

186185
- name: Install Smithy-Dafny codegen dependencies
187-
if: ${{ inputs.regenerate-code }}
188186
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
189187

190188
- name: Regenerate code using smithy-dafny if necessary

AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl ClientSupplier for RegionalRoleClientSupplier {
2424

2525
if !region_iam_role_map.contains_key(&region) {
2626
return Err(Error::AwsCryptographicMaterialProvidersException {
27-
message: format!("Region {} is not supported by this client supplier", region).to_string(),
27+
message: format!("Region {region} is not supported by this client supplier").to_string(),
2828
});
2929
}
3030

AwsEncryptionSDK/runtimes/rust/examples/example_utils/utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,18 +204,18 @@ fn generate_raw_ecc_key_pair(
204204
// This key is created here for example purposes only.
205205
let private_key =
206206
aws_lc_rs::agreement::PrivateKey::generate(get_alg(ecdh_curve_spec))
207-
.map_err(|e| format!("{:?}", e))?;
207+
.map_err(|e| format!("{e:?}"))?;
208208

209209
let public_key = private_key
210210
.compute_public_key()
211-
.map_err(|e| format!("{:?}", e))?;
211+
.map_err(|e| format!("{e:?}"))?;
212212

213213
let public_key: Vec<u8> = x962_to_x509(public_key.as_ref(), get_nid(ecdh_curve_spec))?;
214214
let public_key = pem::Pem::new("PUBLIC KEY", public_key);
215215
let public_key = pem::encode(&public_key);
216216

217217
let private_key_der = AsDer::<EcPrivateKeyRfc5915Der>::as_der(&private_key)
218-
.map_err(|e| format!("{:?}", e))?;
218+
.map_err(|e| format!("{e:?}"))?;
219219
let private_key = pem::Pem::new("PRIVATE KEY", private_key_der.as_ref());
220220
let private_key = pem::encode(&private_key);
221221

AwsEncryptionSDK/runtimes/rust/examples/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl From<BoxError> for BoxError2 {
3737

3838
impl<T: std::fmt::Debug> From<T> for BoxError {
3939
fn from(error: T) -> Self {
40-
let my_str = format!("{:?}", error);
40+
let my_str = format!("{error:?}");
4141
BoxError(my_str)
4242
}
4343
}

TestVectors/runtimes/python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ aws-cryptography-internal-mpl-testvectors = { path = "../../../mpl/TestVectorsAw
1919
aws-encryption-sdk-dafny = { path = "../../../AwsEncryptionSDK/runtimes/python", develop = false}
2020

2121
# Run TestVectors against the released native ESDK-Python
22-
aws-encryption-sdk = { path = "../../../dist/aws_encryption_sdk-4.0.0-py2.py3-none-any.whl", develop = false}
22+
aws-encryption-sdk = ">=4.0.1"
2323

2424
[tool.poetry.group.test.dependencies]
2525
pytest = "^7.4.0"

cfn/CI.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Resources:
2424
Type: "AWS::IAM::Role"
2525
Properties:
2626
RoleName: !Sub "GitHub-CI-${ProjectName}-Role-${AWS::Region}"
27+
MaxSessionDuration: 3600
2728
Description: "Access DDB, KMS, Resources for CI from GitHub"
2829
ManagedPolicyArns:
2930
- "arn:aws:iam::370957321024:policy/ESDK-Dafny-DDB-ReadWriteDelete-us-west-2"

0 commit comments

Comments
 (0)