Skip to content

Commit b10839b

Browse files
Merge branch 'main' into scchatur/PerfTest
2 parents 5d70d74 + 1889e31 commit b10839b

File tree

119 files changed

+5014
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+5014
-522
lines changed

.github/workflows/ci_examples_java.yml

Lines changed: 2 additions & 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
@@ -92,5 +92,6 @@ jobs:
9292
# Run simple examples
9393
gradle -p runtimes/java/DynamoDbEncryption test
9494
# Run migration examples
95+
gradle -p runtimes/java/Migration/PlaintextToAWSDBE test
9596
gradle -p runtimes/java/Migration/DDBECToAWSDBE test
9697

.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

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ If you discover a potential security issue in this project we ask that you notif
5656

5757
## Licensing
5858

59-
See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
59+
See the [LICENSE](LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution.

DynamoDbEncryption/README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
## DynamoDb Encryption
1+
## DynamoDbEncryption
2+
3+
This project implements the AWS Database Encryption SDK for DynamoDB.
24

35
### Code Organization
46

5-
DynamoDb Encryption is a project containing the following Dafny 'localServices' under `dafny`:
7+
DynamoDbEncryption is a project containing the following Dafny 'localServices' under `dafny`:
68
- DynamoDbEncryption: A config-less entry point for shared structures and helper methods related to DDB Encryption.
79
- DynamoDbItemEncryptor: A client responsible for the encryption and decryption of DDB Items (sans any DDB API call).
810
- DynamoDbEncryptionTransforms: An internal interface responsible for appropriately adding encryption to DDB APIs.
@@ -63,7 +65,8 @@ Common Makefile targets are:
6365

6466
### Development Requirements
6567

66-
TODO
68+
* Dafny 4.1.0: https://github.com/dafny-lang/dafny
69+
* A Java 8 or newer development environment
6770

6871
#### (Optional) Dafny Report Generator Requirements
6972

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 *

0 commit comments

Comments
 (0)