Skip to content

Commit 778312a

Browse files
authored
refactor(dafny): rename BKS Error Messages class for legibility (#1429)
1 parent 39b3dd1 commit 778312a

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/AwsCryptographyKeyStoreOperations.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include "GetKeys.dfy"
77
include "CreateKeyStoreTable.dfy"
88
include "CreateKeys.dfy"
99
include "Structure.dfy"
10-
include "ErrorMessages.dfy"
10+
include "KeyStoreErrorMessages.dfy"
1111
include "KmsArn.dfy"
1212
include "DefaultKeyStorageInterface.dfy"
1313

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/CreateKeys.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include "../Model/AwsCryptographyKeyStoreTypes.dfy"
55
include "Structure.dfy"
66
include "DefaultKeyStorageInterface.dfy"
77
include "KMSKeystoreOperations.dfy"
8-
include "ErrorMessages.dfy"
8+
include "KeyStoreErrorMessages.dfy"
99
include "../../AwsCryptographicMaterialProviders/src/AwsArnParsing.dfy"
1010
include "KmsArn.dfy"
1111

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/DefaultKeyStorageInterface.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33
include "../Model/AwsCryptographyKeyStoreTypes.dfy"
44
include "Structure.dfy"
5-
include "ErrorMessages.dfy"
5+
include "KeyStoreErrorMessages.dfy"
66
include "KmsArn.dfy"
77
include "StorageHelpers.dfy"
88

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/GetKeys.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
include "../Model/AwsCryptographyKeyStoreTypes.dfy"
55
include "Structure.dfy"
66
include "KMSKeystoreOperations.dfy"
7-
include "ErrorMessages.dfy"
7+
include "KeyStoreErrorMessages.dfy"
88
include "KmsArn.dfy"
99
include "HierarchicalVersionUtils.dfy"
1010

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/HierarchicalVersionUtils.dfy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
include "../../../dafny/AwsCryptographicMaterialProviders/Model/AwsCryptographyMaterialProvidersTypes.dfy"
44
include "../Model/AwsCryptographyKeyStoreTypes.dfy"
55
include "../../AwsCryptographicMaterialProviders/src/CanonicalEncryptionContext.dfy"
6+
include "KeyStoreErrorMessages.dfy"
67

78
module {:options "/functionSyntax:4" } HierarchicalVersionUtils {
89
import opened Wrappers
@@ -13,6 +14,7 @@ module {:options "/functionSyntax:4" } HierarchicalVersionUtils {
1314
import UTF8
1415
import CanonicalEncryptionContext
1516
import Types = AwsCryptographyKeyStoreTypes
17+
import KeyStoreErrorMessages
1618

1719
type PlainTextTuple = s: seq<uint8> | |s| == 80 witness *
1820
type BKCDigestError = e: Types.Error | (e.KeyStoreException? ) witness *
@@ -148,7 +150,6 @@ module {:options "/functionSyntax:4" } HierarchicalVersionUtils {
148150
)
149151
}
150152

151-
152153
function HasPrefix(key: string): bool {
153154
|key| > |Structure.ENCRYPTION_CONTEXT_PREFIX| &&
154155
key[..|Structure.ENCRYPTION_CONTEXT_PREFIX|] == Structure.ENCRYPTION_CONTEXT_PREFIX

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/Index.dfy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
include "../Model/AwsCryptographyKeyStoreTypes.dfy"
44
include "AwsCryptographyKeyStoreOperations.dfy"
55
include "DefaultKeyStorageInterface.dfy"
6-
7-
include "ErrorMessages.dfy"
6+
include "KeyStoreErrorMessages.dfy"
87
include "KmsArn.dfy"
98

109
module {:extern "software.amazon.cryptography.keystore.internaldafny"} KeyStore refines AbstractAwsCryptographyKeyStoreService

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/ErrorMessages.dfy renamed to AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/KeyStoreErrorMessages.dfy

File renamed without changes.

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/src/KmsArn.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
include "../Model/AwsCryptographyKeyStoreTypes.dfy"
44
include "../../../dafny/AwsCryptographicMaterialProviders/src/AwsArnParsing.dfy"
55

6-
include "ErrorMessages.dfy"
6+
include "KeyStoreErrorMessages.dfy"
77

88
module {:options "/functionSyntax:4" } KmsArn {
99
import opened Wrappers

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore/test/TestGetKeys.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
include "../src/Index.dfy"
55
include "Fixtures.dfy"
66
include "CleanupItems.dfy"
7-
include "../src/ErrorMessages.dfy"
7+
include "../src/KeyStoreErrorMessages.dfy"
88
include "BranchKeyValidators.dfy"
99

1010
module {:options "/functionSyntax:4" } TestGetKeys {

AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStoreAdmin/src/CreateKeysHV2.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include "../../../../AwsCryptographyPrimitives/Model/AwsCryptographyPrimitivesTy
66
include "../../AwsCryptographyKeyStore/src/Structure.dfy"
77
include "../../AwsCryptographyKeyStore/src/DefaultKeyStorageInterface.dfy"
88
include "../../AwsCryptographyKeyStore/src/KMSKeystoreOperations.dfy"
9-
include "../../AwsCryptographyKeyStore/src/ErrorMessages.dfy"
9+
include "../../AwsCryptographyKeyStore/src/KeyStoreErrorMessages.dfy"
1010
include "../../AwsCryptographicMaterialProviders/src/AwsArnParsing.dfy"
1111
include "../../AwsCryptographyKeyStore/src/KmsArn.dfy"
1212
include "SystemKey/ContentHandler.dfy"

0 commit comments

Comments
 (0)