Merge branch 'main' of github.com:aws/aws-database-encryption-sdk-dynamodb-java into robin-aws/fix-nightly-build-2024-05-15

# Conflicts:
#	DynamoDbEncryption/runtimes/java/src/main/java/software/amazon/cryptography/dbencryptionsdk/dynamodb/itemencryptor/internaldafny/legacy/InternalLegacyOverride.java

Author: robin-aws

.github/workflows/ci_codegen.yml

@@ -11,11 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        library:
-          [
-            DynamoDbEncryption,
-            TestVectors
-          ]
+        library: [DynamoDbEncryption, TestVectors]
         # Note dotnet is only used for formatting generated code
         # in this workflow
         dotnet-version: ["6.0.x"]

.github/workflows/ci_duvet.yml

@@ -3,7 +3,7 @@
 # with respect to the specification
 name: Duvet report
 
-on: 
+on:
   pull_request:
   push:
     branches:

.github/workflows/ci_examples_java.yml

@@ -1,7 +1,7 @@
 # This workflow performs tests in Java.
 name: Java Examples
 
-on: 
+on:
   pull_request:
   push:
     branches:
@@ -12,7 +12,7 @@ on:
     # (accordingly to the "nightly" parameter).
     inputs:
       nightly:
-        description: 'Run the nightly build'
+        description: "Run the nightly build"
         required: false
         type: boolean
   schedule:
@@ -30,10 +30,8 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        java-version: [ 8, 11, 16, 17 ]
-        os: [
-          macos-12
-        ]
+        java-version: [8, 11, 16, 17]
+        os: [macos-12]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -48,12 +46,12 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          submodules: recursive        
+          submodules: recursive
 
       - name: Setup Java ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:
-          distribution: 'corretto'
+          distribution: "corretto"
           java-version: ${{ matrix.java-version }}
 
       - name: Setup Dafny
@@ -89,4 +87,3 @@ jobs:
           # Run migration examples
           gradle -p runtimes/java/Migration/PlaintextToAWSDBE test
           gradle -p runtimes/java/Migration/DDBECToAWSDBE test
-

.github/workflows/ci_examples_net.yml

@@ -1,7 +1,7 @@
 # This workflow performs tests in .NET.
 name: dotnet examples
 
-on: 
+on:
   pull_request:
   push:
     branches:
@@ -13,13 +13,9 @@ jobs:
     if: (github.repository_owner == 'aws')
     strategy:
       matrix:
-        library: [
-          DynamoDbEncryption,
-        ]
-        dotnet-version: [ '6.0.x' ]
-        os: [
-          macos-12,
-        ]
+        library: [DynamoDbEncryption]
+        dotnet-version: ["6.0.x"]
+        os: [macos-12]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -30,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          submodules: recursive        
+          submodules: recursive
 
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
         uses: actions/setup-dotnet@v4
@@ -42,7 +38,7 @@ jobs:
         with:
           dafny-version: ${{ '4.2.0' }}
 
-      - name: Download Dependencies 
+      - name: Download Dependencies
         working-directory: ./${{ matrix.library }}
         run: make setup_net
 

.github/workflows/ci_test_java.yml

@@ -1,7 +1,7 @@
 # This workflow performs tests in Java.
 name: Library Java tests
 
-on: 
+on:
   pull_request:
   push:
     branches:
@@ -12,7 +12,7 @@ on:
     # (accordingly to the "nightly" parameter).
     inputs:
       nightly:
-        description: 'Run the nightly build'
+        description: "Run the nightly build"
         required: false
         type: boolean
   schedule:
@@ -29,13 +29,9 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'aws'
     strategy:
       matrix:
-        library: [
-          DynamoDbEncryption
-        ]
-        java-version: [ 8, 11, 16, 17 ]
-        os: [
-          macos-12
-        ]
+        library: [DynamoDbEncryption]
+        java-version: [8, 11, 16, 17]
+        os: [macos-12]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -70,7 +66,7 @@ jobs:
       - name: Setup Java ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:
-          distribution: 'corretto'
+          distribution: "corretto"
           java-version: ${{ matrix.java-version }}
 
       - name: Build ${{ matrix.library }} implementation

.github/workflows/ci_test_net.yml

@@ -1,7 +1,7 @@
 # This workflow performs tests in .NET.
 name: test dotnet
 
-on: 
+on:
   pull_request:
   push:
     branches:
@@ -12,7 +12,7 @@ on:
     # (accordingly to the "nightly" parameter).
     inputs:
       nightly:
-        description: 'Run the nightly build'
+        description: "Run the nightly build"
         required: false
         type: boolean
   schedule:
@@ -30,15 +30,9 @@ jobs:
     if: (github.event_name != 'schedule' || github.repository_owner == 'aws')
     strategy:
       matrix:
-        library: [
-          DynamoDbEncryption,
-        ]
-        dotnet-version: [ '6.0.x' ]
-        os: [
-          macos-12,
-          ubuntu-latest,
-          windows-latest
-        ]
+        library: [DynamoDbEncryption]
+        dotnet-version: ["6.0.x"]
+        os: [macos-12, ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -52,7 +46,7 @@ jobs:
           git config --global core.longpaths true
       - uses: actions/checkout@v3
         with:
-          submodules: recursive        
+          submodules: recursive
 
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
         uses: actions/setup-dotnet@v4
@@ -73,8 +67,8 @@ jobs:
           library: ${{ matrix.library }}
           diff-generated-code: false
           update-and-regenerate-mpl: true
-            
-      - name: Download Dependencies 
+
+      - name: Download Dependencies
         working-directory: ./${{ matrix.library }}
         run: make setup_net
 
@@ -92,16 +86,16 @@ jobs:
           # This works because `node` is installed by default on GHA runners
           CORES=$(node -e 'console.log(os.cpus().length)')
           make transpile_net CORES=$CORES
-      
+
       - name: Test ${{ matrix.library }} net48
         if: matrix.os == 'windows-latest'
         working-directory: ./${{ matrix.library }}
         shell: bash
         run: |
-            dotnet restore runtimes/net/tests
-            dotnet build runtimes/net/tests
-            make test_net FRAMEWORK=net48
-      
+          dotnet restore runtimes/net/tests
+          dotnet build runtimes/net/tests
+          make test_net FRAMEWORK=net48
+
       - name: Test ${{ matrix.library }} net6.0
         working-directory: ./${{ matrix.library }}
         shell: bash
@@ -113,12 +107,11 @@ jobs:
           else
             make test_net FRAMEWORK=net6.0
           fi
-      
+
       - name: Test Build and Pack ${{ matrix.library}}
         shell: bash
         if: matrix.os != 'windows-latest'
         working-directory: ./${{ matrix.library }}
         run: |
           dotnet build runtimes/net /p:Configuration=Release -nowarn:CS0162,CS0168
           dotnet pack runtimes/net/DynamoDbEncryption.csproj --no-build /p:Configuration=Release --output build
-

.github/workflows/ci_test_vector_java.yml

@@ -1,7 +1,7 @@
 # This workflow performs test vectors in Java.
 name: Library Java Test Vectors
 
-on: 
+on:
   pull_request:
   push:
     branches:
@@ -11,11 +11,11 @@ jobs:
   testJava:
     strategy:
       matrix:
-        java-version: [ 8, 11, 16, 17 ]
+        java-version: [8, 11, 16, 17]
         os: [
-          # Run on ubuntu image that comes pre-configured with docker
-          ubuntu-latest
-        ]
+            # Run on ubuntu image that comes pre-configured with docker
+            ubuntu-latest,
+          ]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -25,7 +25,7 @@ jobs:
         uses: rrainn/[email protected]
         with:
           port: 8000
-          cors: '*'
+          cors: "*"
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -41,12 +41,12 @@ jobs:
       - name: Setup Dafny
         uses: dafny-lang/[email protected]
         with:
-          dafny-version: '4.2.0'
+          dafny-version: "4.2.0"
 
       - name: Setup Java ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:
-          distribution: 'corretto'
+          distribution: "corretto"
           java-version: ${{ matrix.java-version }}
 
       - name: Build TestVectors implementation

.github/workflows/ci_test_vector_net.yml

@@ -1,7 +1,7 @@
 # This workflow performs test vectors in DotNet.
 name: Library DotNet Test Vectors
 
-on: 
+on:
   pull_request:
   push:
     branches:
@@ -11,11 +11,11 @@ jobs:
   testDotNet:
     strategy:
       matrix:
-        dotnet-version: [ '6.0.x' ]
+        dotnet-version: ["6.0.x"]
         os: [
-          # Run on ubuntu image that comes pre-configured with docker
-          ubuntu-latest
-        ]
+            # Run on ubuntu image that comes pre-configured with docker
+            ubuntu-latest,
+          ]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write
@@ -25,7 +25,7 @@ jobs:
         uses: rrainn/[email protected]
         with:
           port: 8000
-          cors: '*'
+          cors: "*"
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Dafny
         uses: dafny-lang/[email protected]
         with:
-          dafny-version: '4.2.0'
+          dafny-version: "4.2.0"
 
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
         uses: actions/setup-dotnet@v4
@@ -62,4 +62,3 @@ jobs:
           dotnet run
           cp ../java/*.json .
           dotnet run --framework net6.0
-

.github/workflows/ci_todos.yml

@@ -1,7 +1,7 @@
 # This workflow prevents TODOs in code
 name: Check TODOs in code
 
-on: 
+on:
   pull_request:
   push:
     branches:

.github/workflows/ci_tv_verification.yml

@@ -12,7 +12,7 @@ on:
     # (accordingly to the "nightly" parameter).
     inputs:
       nightly:
-        description: 'Run the nightly build'
+        description: "Run the nightly build"
         required: false
         type: boolean
   schedule:
@@ -31,12 +31,8 @@ jobs:
       matrix:
         # Break up verification between namespaces over multiple
         # actions to take advantage of parallelization
-        service: [
-          DDBEncryption
-        ]
-        os: [
-          macos-12,
-        ]
+        service: [DDBEncryption]
+        os: [macos-12]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3