Skip to content

Commit 689624d

Browse files
rishav-karanjitrishav-karanjit
authored
chore: rename EncryptionSdk Dafny module name (#707)
1 parent 7acf387 commit 689624d

File tree

9 files changed

+44
-44
lines changed

9 files changed

+44
-44
lines changed

‎AwsEncryptionSDK/dafny/AwsEncryptionSdk/src/Index.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include "AwsEncryptionSdkOperations.dfy"
55

66
module
77
{:extern "software.amazon.cryptography.encryptionsdk.internaldafny" }
8-
EncryptionSdk refines AbstractAwsCryptographyEncryptionSdkService {
8+
ESDK refines AbstractAwsCryptographyEncryptionSdkService {
99
import Operations = AwsEncryptionSdkOperations
1010
import Primitives = AtomicPrimitives
1111
import MaterialProviders

‎AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/TestCreateEsdkClient.dfy

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include "../src/Index.dfy"
66
module TestCreateEsdkClient {
77
import Types = AwsCryptographyEncryptionSdkTypes
88
import mplTypes = AwsCryptographyMaterialProvidersTypes
9-
import EncryptionSdk
9+
import ESDK
1010
import MaterialProviders
1111
import opened Wrappers
1212
import opened UInt = StandardLibrary.UInt
@@ -50,11 +50,11 @@ module TestCreateEsdkClient {
5050
];
5151

5252
method {:test} TestClientCreation() {
53-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
53+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
5454

55-
var esdk: Types.IAwsEncryptionSdkClient :- expect EncryptionSdk.ESDK(config := defaultConfig);
56-
expect esdk is EncryptionSdk.ESDKClient;
57-
var esdkClient := esdk as EncryptionSdk.ESDKClient;
55+
var esdk: Types.IAwsEncryptionSdkClient :- expect ESDK.ESDK(config := defaultConfig);
56+
expect esdk is ESDK.ESDKClient;
57+
var esdkClient := esdk as ESDK.ESDKClient;
5858

5959
expect esdkClient.config.commitmentPolicy == defaultConfig.commitmentPolicy.value;
6060
expect esdkClient.config.maxEncryptedDataKeys == defaultConfig.maxEncryptedDataKeys;
@@ -82,7 +82,7 @@ module TestCreateEsdkClient {
8282
netV4_0_0_RetryPolicy := Some(Types.NetV4_0_0_RetryPolicy.FORBID_RETRY)
8383
);
8484

85-
var noRetryEsdk :- expect EncryptionSdk.ESDK(config := esdkConfig);
85+
var noRetryEsdk :- expect ESDK.ESDK(config := esdkConfig);
8686

8787
var expectFailureDecryptOutput := noRetryEsdk.Decrypt(Types.DecryptInput(
8888
ciphertext := ESDK_NET_V400_MESSAGE,
@@ -95,8 +95,8 @@ module TestCreateEsdkClient {
9595

9696
// Decrypt v4.0.0 message with the default configuration which is to retry
9797
// and expect decryption to pass
98-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
99-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
98+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
99+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
100100

101101
var decryptOutput := esdk.Decrypt(Types.DecryptInput(
102102
ciphertext := ESDK_NET_V400_MESSAGE,

‎AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/TestEncryptDecrypt.dfy

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module TestEncryptDecrypt {
99
import Types = AwsCryptographyEncryptionSdkTypes
1010
import mplTypes = AwsCryptographyMaterialProvidersTypes
1111
import MaterialProviders
12-
import EncryptionSdk
12+
import ESDK
1313
import opened Wrappers
1414

1515
import Fixtures
@@ -20,8 +20,8 @@ module TestEncryptDecrypt {
2020
// The string "asdf" as bytes
2121
var asdf := [ 97, 115, 100, 102 ];
2222

23-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
24-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
23+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
24+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
2525
var mpl :- expect MaterialProviders.MaterialProviders();
2626
var clientSupplier :- expect mpl.CreateDefaultClientSupplier(mplTypes.CreateDefaultClientSupplierInput);
2727
var kmsClient :- expect clientSupplier.GetClient(mplTypes.GetClientInput(region := "us-west-2"));

‎AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/TestReproducedEncContext.dfy

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module TestReproducedEncryptionContext {
99
import Types = AwsCryptographyEncryptionSdkTypes
1010
import mplTypes = AwsCryptographyMaterialProvidersTypes
1111
import MaterialProviders
12-
import EncryptionSdk
12+
import ESDK
1313
import opened Wrappers
1414

1515
import Fixtures
@@ -20,8 +20,8 @@ module TestReproducedEncryptionContext {
2020
// The string "asdf" as bytes
2121
var asdf := [ 97, 115, 100, 102 ];
2222

23-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
24-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
23+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
24+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
2525
var mpl :- expect MaterialProviders.MaterialProviders();
2626
var clientSupplier :- expect mpl.CreateDefaultClientSupplier(mplTypes.CreateDefaultClientSupplierInput);
2727
var kmsClient :- expect clientSupplier.GetClient(mplTypes.GetClientInput(region := "us-west-2"));
@@ -67,8 +67,8 @@ module TestReproducedEncryptionContext {
6767
// The string "asdf" as bytes
6868
var asdf := [ 97, 115, 100, 102 ];
6969

70-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
71-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
70+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
71+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
7272
var mpl :- expect MaterialProviders.MaterialProviders();
7373
var clientSupplier :- expect mpl.CreateDefaultClientSupplier(mplTypes.CreateDefaultClientSupplierInput);
7474
var kmsClient :- expect clientSupplier.GetClient(mplTypes.GetClientInput(region := "us-west-2"));
@@ -113,8 +113,8 @@ module TestReproducedEncryptionContext {
113113
var asdf := [ 97, 115, 100, 102 ];
114114

115115
var namespace, name := Fixtures.NamespaceAndName(0);
116-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
117-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
116+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
117+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
118118
var mpl :- expect MaterialProviders.MaterialProviders();
119119
var rawAESKeyring :- expect mpl.CreateRawAesKeyring(mplTypes.CreateRawAesKeyringInput(
120120
keyNamespace := namespace,

‎AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/TestRequiredEncryptionContext.dfy

+21-21
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module TestRequiredEncryptionContext {
1616
import KMS = Com.Amazonaws.Kms
1717
import DDB = Com.Amazonaws.Dynamodb
1818
import DDBTypes = ComAmazonawsDynamodbTypes
19-
import EncryptionSdk
19+
import ESDK
2020
import opened Wrappers
2121
import UTF8
2222

@@ -35,8 +35,8 @@ module TestRequiredEncryptionContext {
3535
// The string "asdf" as bytes
3636
var asdf := [ 97, 115, 100, 102 ];
3737

38-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
39-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
38+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
39+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
4040
var mpl :- expect MaterialProviders.MaterialProviders();
4141

4242
// get keyrings
@@ -120,8 +120,8 @@ module TestRequiredEncryptionContext {
120120
// The string "asdf" as bytes
121121
var asdf := [ 97, 115, 100, 102 ];
122122

123-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
124-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
123+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
124+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
125125
var mpl :- expect MaterialProviders.MaterialProviders();
126126

127127
// get keyrings
@@ -229,8 +229,8 @@ module TestRequiredEncryptionContext {
229229
// The string "asdf" as bytes
230230
var asdf := [ 97, 115, 100, 102 ];
231231

232-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
233-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
232+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
233+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
234234
var mpl :- expect MaterialProviders.MaterialProviders();
235235

236236
// get keyrings
@@ -411,8 +411,8 @@ module TestRequiredEncryptionContext {
411411
// The string "asdf" as bytes
412412
var asdf := [ 97, 115, 100, 102 ];
413413

414-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
415-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
414+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
415+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
416416
var mpl :- expect MaterialProviders.MaterialProviders();
417417

418418
// get keyrings
@@ -586,8 +586,8 @@ module TestRequiredEncryptionContext {
586586
// The string "asdf" as bytes
587587
var asdf := [ 97, 115, 100, 102 ];
588588

589-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
590-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
589+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
590+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
591591
var mpl :- expect MaterialProviders.MaterialProviders();
592592

593593
// get keyrings
@@ -711,8 +711,8 @@ module TestRequiredEncryptionContext {
711711
// The string "asdf" as bytes
712712
var asdf := [ 97, 115, 100, 102 ];
713713

714-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
715-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
714+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
715+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
716716
var mpl :- expect MaterialProviders.MaterialProviders();
717717

718718
// get keyrings
@@ -814,8 +814,8 @@ module TestRequiredEncryptionContext {
814814
// The string "asdf" as bytes
815815
var asdf := [ 97, 115, 100, 102 ];
816816

817-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
818-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
817+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
818+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
819819
var mpl :- expect MaterialProviders.MaterialProviders();
820820

821821
// get keyrings
@@ -918,8 +918,8 @@ module TestRequiredEncryptionContext {
918918
// The string "asdf" as bytes
919919
var asdf := [ 97, 115, 100, 102 ];
920920

921-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
922-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
921+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
922+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
923923
var mpl :- expect MaterialProviders.MaterialProviders();
924924

925925
// get keyrings
@@ -1018,8 +1018,8 @@ module TestRequiredEncryptionContext {
10181018
// The string "asdf" as bytes
10191019
var asdf := [ 97, 115, 100, 102 ];
10201020

1021-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
1022-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
1021+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
1022+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
10231023
var mpl :- expect MaterialProviders.MaterialProviders();
10241024

10251025
// get keyrings
@@ -1133,8 +1133,8 @@ module TestRequiredEncryptionContext {
11331133
ensures output.ValidState() && fresh(output) && fresh(output.History) && fresh(output.Modifies)
11341134
{
11351135
var kmsKey := Fixtures.keyArn;
1136-
var defaultConfig := EncryptionSdk.DefaultAwsEncryptionSdkConfig();
1137-
var esdk :- expect EncryptionSdk.ESDK(config := defaultConfig);
1136+
var defaultConfig := ESDK.DefaultAwsEncryptionSdkConfig();
1137+
var esdk :- expect ESDK.ESDK(config := defaultConfig);
11381138
var mpl :- expect MaterialProviders.MaterialProviders();
11391139
var clientSupplier :- expect mpl.CreateDefaultClientSupplier(mplTypes.CreateDefaultClientSupplierInput);
11401140
var kmsClient :- expect clientSupplier.GetClient(mplTypes.GetClientInput(region := "us-west-2"));

‎TestVectors/dafny/TestVectors/src/LibraryIndex.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module
77
{:extern "software.amazon.cryptography.encryptionsdk.internaldafny.wrapped" }
88
WrappedESDK refines WrappedAbstractAwsCryptographyEncryptionSdkService
99
{
10-
import WrappedService = EncryptionSdk
10+
import WrappedService = ESDK
1111

1212
function method WrappedDefaultAwsEncryptionSdkConfig(): AwsEncryptionSdkConfig
1313
{

‎TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module {:options "/functionSyntax:4"} AllEsdkV4NoReqEc {
77
import Types = AwsCryptographyEncryptionSdkTypes
88
import mplTypes = AwsCryptographyMaterialProvidersTypes
99
import keyVectorKeyTypes = AwsCryptographyMaterialProvidersTestVectorKeysTypes
10-
import EncryptionSdk
10+
import ESDK
1111
import MaterialProviders
1212
import opened CompleteVectors
1313
import opened KeyDescription

‎TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4WithReqEc.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include "../LibraryIndex.dfy"
66
module {:options "/functionSyntax:4" } AllEsdkV4WithReqEc {
77
import Types = AwsCryptographyEncryptionSdkTypes
88
import mplTypes = AwsCryptographyMaterialProvidersTypes
9-
import EncryptionSdk
9+
import ESDK
1010
import MaterialProviders
1111
import opened CompleteVectors
1212
import opened KeyDescription

‎TestVectors/dafny/TestVectors/src/WriteVectors.dfy

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include "WriteEsdkJsonManifests.dfy"
99
module {:options "-functionSyntax:4"} WriteVectors {
1010
import Types = AwsCryptographyEncryptionSdkTypes
1111
import mplTypes = AwsCryptographyMaterialProvidersTypes
12-
import EncryptionSdk
12+
import ESDK
1313
import MaterialProviders
1414
import opened CompleteVectors
1515
import opened Wrappers

0 commit comments

Comments
 (0)