From 3efb8bdb0460eedf7040bd0687968f083eccad1d Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Wed, 5 Feb 2025 11:55:50 -0800 Subject: [PATCH 1/2] m --- AwsEncryptionSDK/Makefile | 14 +++++++------- TestVectors/Makefile | 16 ++++++++-------- mpl | 2 +- smithy-dafny | 1 + 4 files changed, 17 insertions(+), 16 deletions(-) create mode 160000 smithy-dafny diff --git a/AwsEncryptionSDK/Makefile b/AwsEncryptionSDK/Makefile index 0fea756cc..37b7e4acb 100644 --- a/AwsEncryptionSDK/Makefile +++ b/AwsEncryptionSDK/Makefile @@ -69,13 +69,13 @@ SERVICE_DEPS_AwsEncryptionSdk := \ GO_MODULE_NAME="github.com/aws/aws-encryption-sdk/releases/go/encryption-sdk" GO_DEPENDENCY_MODULE_NAMES := \ - --dependency-library-name=com.amazonaws.dynamodb=github.com/aws/aws-cryptographic-material-providers-library/releases/go/dynamodb \ - --dependency-library-name=com.amazonaws.kms=github.com/aws/aws-cryptographic-material-providers-library/releases/go/kms \ - --dependency-library-name=aws.cryptography.keyStore=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \ - --dependency-library-name=aws.cryptography.primitives=github.com/aws/aws-cryptographic-material-providers-library/releases/go/primitives \ - --dependency-library-name=aws.cryptography.materialProviders=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \ - --dependency-library-name=sdk.com.amazonaws.dynamodb=github.com/aws/aws-sdk-go-v2/service/dynamodb \ - --dependency-library-name=sdk.com.amazonaws.kms=github.com/aws/aws-sdk-go-v2/service/kms + --go-dependency-module-name=com.amazonaws.dynamodb=github.com/aws/aws-cryptographic-material-providers-library/releases/go/dynamodb \ + --go-dependency-module-name=com.amazonaws.kms=github.com/aws/aws-cryptographic-material-providers-library/releases/go/kms \ + --go-dependency-module-name=aws.cryptography.keyStore=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \ + --go-dependency-module-name=aws.cryptography.primitives=github.com/aws/aws-cryptographic-material-providers-library/releases/go/primitives \ + --go-dependency-module-name=aws.cryptography.materialProviders=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \ + --go-dependency-module-name=sdk.com.amazonaws.dynamodb=github.com/aws/aws-sdk-go-v2/service/dynamodb \ + --go-dependency-module-name=sdk.com.amazonaws.kms=github.com/aws/aws-sdk-go-v2/service/kms TRANSLATION_RECORD_GO := \ diff --git a/TestVectors/Makefile b/TestVectors/Makefile index 21c6dcf9e..017ebd1ad 100644 --- a/TestVectors/Makefile +++ b/TestVectors/Makefile @@ -110,14 +110,14 @@ REMOVE_WRAPPED_CLIENT_AFTER_POLYMORPH_RUST_TO_2 := '\/\/ removed wrapped module GO_MODULE_NAME="github.com/aws/aws-encryption-sdk/testvectors" GO_DEPENDENCY_MODULE_NAMES := \ - --dependency-library-name=aws.cryptography.encryptionSdk=github.com/aws/aws-encryption-sdk/releases/go/encryption-sdk \ - --dependency-library-name=com.amazonaws.dynamodb=github.com/aws/aws-cryptographic-material-providers-library/releases/go/dynamodb \ - --dependency-library-name=com.amazonaws.kms=github.com/aws/aws-cryptographic-material-providers-library/releases/go/kms \ - --dependency-library-name=aws.cryptography.keyStore=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \ - --dependency-library-name=aws.cryptography.primitives=github.com/aws/aws-cryptographic-material-providers-library/releases/go/primitives \ - --dependency-library-name=aws.cryptography.materialProviders=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \ - --dependency-library-name=sdk.com.amazonaws.dynamodb=github.com/aws/aws-sdk-go-v2/service/dynamodb \ - --dependency-library-name=sdk.com.amazonaws.kms=github.com/aws/aws-sdk-go-v2/service/kms + --go-dependency-module-name=aws.cryptography.encryptionSdk=github.com/aws/aws-encryption-sdk/releases/go/encryption-sdk \ + --go-dependency-module-name=com.amazonaws.dynamodb=github.com/aws/aws-cryptographic-material-providers-library/releases/go/dynamodb \ + --go-dependency-module-name=com.amazonaws.kms=github.com/aws/aws-cryptographic-material-providers-library/releases/go/kms \ + --go-dependency-module-name=aws.cryptography.keyStore=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \ + --go-dependency-module-name=aws.cryptography.primitives=github.com/aws/aws-cryptographic-material-providers-library/releases/go/primitives \ + --go-dependency-module-name=aws.cryptography.materialProviders=github.com/aws/aws-cryptographic-material-providers-library/releases/go/mpl \ + --go-dependency-module-name=sdk.com.amazonaws.dynamodb=github.com/aws/aws-sdk-go-v2/service/dynamodb \ + --go-dependency-module-name=sdk.com.amazonaws.kms=github.com/aws/aws-sdk-go-v2/service/kms TRANSLATION_RECORD_GO := \ AwsEncryptionSDK/runtimes/go/ImplementationFromDafny-go/ImplementationFromDafny-go.dtr \ diff --git a/mpl b/mpl index b301c6a28..c18fbad36 160000 --- a/mpl +++ b/mpl @@ -1 +1 @@ -Subproject commit b301c6a28a7c4f22bd70a41be8b57fad0bfaf4af +Subproject commit c18fbad36aafcc0ef70b72db6b65078cf7b22e6c diff --git a/smithy-dafny b/smithy-dafny new file mode 160000 index 000000000..cddc07e7a --- /dev/null +++ b/smithy-dafny @@ -0,0 +1 @@ +Subproject commit cddc07e7aaf4035e8cf7c10883a435fd7239d075 From 883d4c674db4773ac6ef1bf471bde9c0f1e53515 Mon Sep 17 00:00:00 2001 From: Lucas McDonald Date: Wed, 5 Feb 2025 12:10:31 -0800 Subject: [PATCH 2/2] m --- smithy-dafny | 1 - 1 file changed, 1 deletion(-) delete mode 160000 smithy-dafny diff --git a/smithy-dafny b/smithy-dafny deleted file mode 160000 index cddc07e7a..000000000 --- a/smithy-dafny +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cddc07e7aaf4035e8cf7c10883a435fd7239d075