Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/library_go_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ jobs:
with:
dafny-version: ${{ inputs.dafny }}

- name: Install Smithy-Dafny codegen dependencies
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies

- name: Setup NASM for Windows (aws-lc-sys)
if: matrix.os == 'windows-latest'
uses: ilammy/setup-nasm@v1
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/library_interop_keyring_test_vectors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
aws-region: us-west-2
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-Public-ESDK-Dafny-Role-us-west-2
role-session-name: InterOpTests
role-duration-seconds: 3600
role-duration-seconds: 7200

- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -189,7 +189,6 @@ jobs:
dafny-version: ${{ inputs.dafny }}

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

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

- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -477,7 +476,6 @@ jobs:
dafny-version: ${{ inputs.dafny }}

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

- name: Regenerate code using smithy-dafny if necessary
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/library_interop_mkp_test_vectors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ jobs:
dafny-version: ${{ inputs.dafny }}

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

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

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

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

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

- name: Regenerate code using smithy-dafny if necessary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ jobs:
pip install poetry

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

- name: Regenerate code using smithy-dafny if necessary
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/library_net_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ jobs:
dafny-version: ${{ inputs.dafny }}

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

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

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

- name: Regenerate code using smithy-dafny if necessary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl ClientSupplier for RegionalRoleClientSupplier {

if !region_iam_role_map.contains_key(&region) {
return Err(Error::AwsCryptographicMaterialProvidersException {
message: format!("Region {} is not supported by this client supplier", region).to_string(),
message: format!("Region {region} is not supported by this client supplier").to_string(),
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,18 @@ fn generate_raw_ecc_key_pair(
// This key is created here for example purposes only.
let private_key =
aws_lc_rs::agreement::PrivateKey::generate(get_alg(ecdh_curve_spec))
.map_err(|e| format!("{:?}", e))?;
.map_err(|e| format!("{e:?}"))?;

let public_key = private_key
.compute_public_key()
.map_err(|e| format!("{:?}", e))?;
.map_err(|e| format!("{e:?}"))?;

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

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

Expand Down
2 changes: 1 addition & 1 deletion AwsEncryptionSDK/runtimes/rust/examples/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl From<BoxError> for BoxError2 {

impl<T: std::fmt::Debug> From<T> for BoxError {
fn from(error: T) -> Self {
let my_str = format!("{:?}", error);
let my_str = format!("{error:?}");
BoxError(my_str)
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestVectors/runtimes/python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ aws-cryptography-internal-mpl-testvectors = { path = "../../../mpl/TestVectorsAw
aws-encryption-sdk-dafny = { path = "../../../AwsEncryptionSDK/runtimes/python", develop = false}

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

[tool.poetry.group.test.dependencies]
pytest = "^7.4.0"
Expand Down
1 change: 1 addition & 0 deletions cfn/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Resources:
Type: "AWS::IAM::Role"
Properties:
RoleName: !Sub "GitHub-CI-${ProjectName}-Role-${AWS::Region}"
MaxSessionDuration: 3600
Description: "Access DDB, KMS, Resources for CI from GitHub"
ManagedPolicyArns:
- "arn:aws:iam::370957321024:policy/ESDK-Dafny-DDB-ReadWriteDelete-us-west-2"
Expand Down
2 changes: 1 addition & 1 deletion mpl
Submodule mpl updated from e810e7 to ec013f
2 changes: 1 addition & 1 deletion project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dafnyVersion=4.9.0
dafnyVerifyVersion=4.9.0
dafnyFormatVersion=4.9.0
projectJavaVersion=4.1.0
mplDependencyJavaVersion=1.10.1-SNAPSHOT
mplDependencyJavaVersion=1.11.0-SNAPSHOT
dafnyRuntimeJavaVersion=4.9.0
smithyDafnyJavaConversionVersion=0.1.1
Loading