Skip to content

Commit 83e6c2f

Browse files
author
Lucas McDonald
committed
Merge branch 'python-poc' of github.com:aws/aws-database-encryption-sdk-dynamodb into python-poc
2 parents ffdb761 + 06a1d7e commit 83e6c2f

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.github/workflows/ci_test_vector_java.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,17 @@ jobs:
3232
os: [
3333
# Run on ubuntu image that comes pre-configured with docker
3434
ubuntu-22.04,
35+
macos-13,
3536
]
3637
runs-on: ${{ matrix.os }}
3738
permissions:
3839
id-token: write
3940
contents: read
4041
steps:
42+
- name: Setup Docker
43+
if: matrix.os == 'macos-13' && matrix.library == 'TestVectors'
44+
uses: douglascamata/[email protected]
45+
4146
- name: Setup DynamoDB Local
4247
uses: rrainn/[email protected]
4348
with:

.github/workflows/ci_test_vector_net.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,17 @@ jobs:
2828
os: [
2929
# Run on ubuntu image that comes pre-configured with docker
3030
ubuntu-22.04,
31+
macos-13,
3132
]
3233
runs-on: ${{ matrix.os }}
3334
permissions:
3435
id-token: write
3536
contents: read
3637
steps:
38+
- name: Setup Docker
39+
if: matrix.os == 'macos-13' && matrix.library == 'TestVectors'
40+
uses: douglascamata/[email protected]
41+
3742
- name: Setup DynamoDB Local
3843
uses: rrainn/[email protected]
3944
with:

.github/workflows/library_rust_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- name: Setup Docker
3838
if: matrix.os == 'macos-13' && matrix.library == 'TestVectors'
39-
uses: douglascamata/setup-docker-macos-action@v1-alpha
39+
uses: douglascamata/setup-docker-macos-action@v1.0.0
4040

4141
- name: Setup DynamoDB Local
4242
if: matrix.library == 'TestVectors'

TestVectors/dafny/DDBEncryption/src/TestVectors.dfy

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -667,13 +667,10 @@ module {:options "-functionSyntax:4"} DdbEncryptionTestVectors {
667667
results[i] := FullSearch(client, queries[i]);
668668
}
669669

670-
var configs := tableEncryptionConfigs.Keys;
671-
while configs != {}
672-
decreases |configs|
673-
invariant forall k <- configs :: k in tableEncryptionConfigs
670+
var configs := SortedSets.ComputeSetToOrderedSequence2(tableEncryptionConfigs.Keys, CharLess);
671+
for i := 0 to |configs|
674672
{
675-
var config :| config in configs;
676-
configs := configs - { config };
673+
var config := configs[i];
677674
BasicQueryTestConfig(tableEncryptionConfigs[config], results, globalRecords);
678675
}
679676
}

0 commit comments

Comments
 (0)