Skip to content

Commit fa78f23

Browse files
texastonylavaleri
andauthored
feat: Support CollectionOfErrors error message (#219)
Co-authored-by: lavaleri <[email protected]>
1 parent 9d3e101 commit fa78f23

File tree

21 files changed

+101
-23
lines changed

21 files changed

+101
-23
lines changed

.github/workflows/ci_examples_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
contents: read
4545
steps:
4646
- name: Configure AWS Credentials
47-
uses: aws-actions/configure-aws-credentials@v1
47+
uses: aws-actions/configure-aws-credentials@v2
4848
with:
4949
aws-region: us-west-2
5050
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2

.github/workflows/ci_test_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
contents: read
4747
steps:
4848
- name: Configure AWS Credentials
49-
uses: aws-actions/configure-aws-credentials@v1
49+
uses: aws-actions/configure-aws-credentials@v2
5050
with:
5151
aws-region: us-west-2
5252
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2

.github/workflows/ci_test_net.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
run: make setup_net
7979

8080
- name: Configure AWS Credentials
81-
uses: aws-actions/configure-aws-credentials@v1
81+
uses: aws-actions/configure-aws-credentials@v2
8282
with:
8383
aws-region: us-west-2
8484
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2

.github/workflows/ci_test_vector_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
cors: '*'
3030

3131
- name: Configure AWS Credentials
32-
uses: aws-actions/configure-aws-credentials@v1
32+
uses: aws-actions/configure-aws-credentials@v2
3333
with:
3434
aws-region: us-west-2
3535
role-to-assume: arn:aws:iam::370957321024:role/GitHub-CI-DDBEC-Dafny-Role-us-west-2

DynamoDbEncryption/dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ include "../../../../submodules/MaterialProviders/StandardLibrary/src/Index.dfy"
419419
// || (!exit(A(I)) && !exit(B(I)))
420420
// || (!access(A(I)) && !exit(B(I)))
421421
// || (!exit(A(I)) && !access(B(I)))
422-
| CollectionOfErrors(list: seq<Error>)
422+
| CollectionOfErrors(list: seq<Error>, nameonly message: string)
423423
// The Opaque error, used for native, extern, wrapped or unknown errors
424424
| Opaque(obj: object)
425425
type OpaqueError = e: Error | e.Opaque? witness *

DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/Model/AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ include "../../../../submodules/MaterialProviders/StandardLibrary/src/Index.dfy"
834834
// || (!exit(A(I)) && !exit(B(I)))
835835
// || (!access(A(I)) && !exit(B(I)))
836836
// || (!exit(A(I)) && !access(B(I)))
837-
| CollectionOfErrors(list: seq<Error>)
837+
| CollectionOfErrors(list: seq<Error>, nameonly message: string)
838838
// The Opaque error, used for native, extern, wrapped or unknown errors
839839
| Opaque(obj: object)
840840
type OpaqueError = e: Error | e.Opaque? witness *

DynamoDbEncryption/dafny/DynamoDbItemEncryptor/Model/AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ include "../../../../submodules/MaterialProviders/StandardLibrary/src/Index.dfy"
152152
// || (!exit(A(I)) && !exit(B(I)))
153153
// || (!access(A(I)) && !exit(B(I)))
154154
// || (!exit(A(I)) && !access(B(I)))
155-
| CollectionOfErrors(list: seq<Error>)
155+
| CollectionOfErrors(list: seq<Error>, nameonly message: string)
156156
// The Opaque error, used for native, extern, wrapped or unknown errors
157157
| Opaque(obj: object)
158158
type OpaqueError = e: Error | e.Opaque? witness *

DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/Index.dfy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ module
124124
assert UnreservedPrefix(attributeName);
125125
assert UnreservedPrefix(attributeNames[i]);
126126
}
127+
127128
assert (forall attribute <- attributeNames :: UnreservedPrefix(attribute));
128129
assert (forall attribute <- config.attributeActionsOnEncrypt.Keys :: UnreservedPrefix(attribute));
129130
assert (forall attribute <- config.attributeActionsOnEncrypt.Keys :: !(ReservedPrefix <= attribute));
@@ -201,6 +202,12 @@ module
201202
assert Operations.ValidInternalConfig?(internalConfig);
202203

203204
var client := new DynamoDbItemEncryptorClient(internalConfig);
205+
206+
assert fresh(client.Modifies
207+
- ( if config.keyring.Some? then config.keyring.value.Modifies else {})
208+
- ( if config.cmm.Some? then config.cmm.value.Modifies else {} )
209+
- ( if config.legacyOverride.Some? then config.legacyOverride.value.encryptor.Modifies else {}));
210+
204211
return Success(client);
205212
}
206213

DynamoDbEncryption/dafny/StructuredEncryption/Model/AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.dfy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ include "../../../../submodules/MaterialProviders/StandardLibrary/src/Index.dfy"
206206
// || (!exit(A(I)) && !exit(B(I)))
207207
// || (!access(A(I)) && !exit(B(I)))
208208
// || (!exit(A(I)) && !access(B(I)))
209-
| CollectionOfErrors(list: seq<Error>)
209+
| CollectionOfErrors(list: seq<Error>, nameonly message: string)
210210
// The Opaque error, used for native, extern, wrapped or unknown errors
211211
| Opaque(obj: object)
212212
type OpaqueError = e: Error | e.Opaque? witness *

DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/ToDafny.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public static Error Error(CollectionOfErrors nativeValue) {
8484
nativeValue.list(),
8585
ToDafny::Error,
8686
Error._typeDescriptor());
87-
return Error.create_CollectionOfErrors(list);
87+
DafnySequence<? extends Character> message = software.amazon.smithy.dafny.conversion.ToDafny.Simple.CharacterSequence(nativeValue.getMessage());
88+
return Error.create_CollectionOfErrors(list, message);
8889
}
8990

9091
public static BeaconVersion BeaconVersion(

0 commit comments

Comments
 (0)