Merge branch 'master' into release-20240507135434

Consensys · May 10, 2024 · 1e5f3d4 · 1e5f3d4
2 parents f7e5590 + 32984a9
commit 1e5f3d4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -134,7 +134,7 @@ jobs:
         path: /home/runner/work/tessera/tessera/encryption/encryption-kalium/build/distributions/
     - name: Execute gradle integration tests
       run: |
-        ./gradlew :tests:acceptance-test:clean :tests:acceptance-test:test --fail-fast -PexcludeTests="RunHashicorpIT,AwsKeyVaultIT,RecoverIT,RunAzureIT,RestSuiteHttpH2RemoteEnclaveEncTypeEC,CucumberTestSuite" --info
+        ./gradlew :tests:acceptance-test:clean :tests:acceptance-test:test --fail-fast -PexcludeTests="RunHashicorpIT,AwsKeyVaultIT,RecoverIT,RunAzureIT,AzureKeyVaultIT,RestSuiteHttpH2RemoteEnclaveEncTypeEC,CucumberTestSuite" --info
     - name: Upload Junit reports
       uses: actions/upload-artifact@v2
       if: always()
@@ -311,7 +311,10 @@ jobs:
       - name: Run AWS tests
         run: |
           ./gradlew :tests:acceptance-test:test --tests AwsKeyVaultIT --info
-#      - name: Run azure tests
+      - name: Run azure tests (node starts)
+        run: |
+          ./gradlew :tests:acceptance-test:test --tests AzureKeyVaultIT --info
+#      - name: Run azure tests (cucumber)
 #        run: |
 #          ./gradlew :tests:acceptance-test:test --tests RunAzureIT --info
       - name: Run hashicorp tests

diff --git a/build.gradle b/build.gradle
@@ -158,7 +158,7 @@ allprojects {
         implementation "org.hibernate.validator:hibernate-validator:7.0.1.Final"
         implementation "com.fasterxml:classmate:1.5.1"
 
-        implementation "net.java.dev.jna:jna:5.10.0"
+        implementation "net.java.dev.jna:jna:5.13.0"
 
         testImplementation "org.apache.tuweni:tuweni-rlp:2.0.0"
         testImplementation "org.apache.tuweni:tuweni-bytes:2.0.0"

diff --git a/tests/acceptance-test/build.gradle b/tests/acceptance-test/build.gradle
@@ -108,6 +108,8 @@ test {
     "**/P2pTestSuite.class",
     "**/AwsKeyVaultIT.class",
     "**/RunHashicorpIT.class",
+    //"**/RunAzureIT.class",
+    "**/AzureKeyVaultIT.class",
     "**/ThirdPartyIT.class",
     "**/CucumberTestSuite.class",
     )

diff --git a/...ance-test/src/test/java/com/quorum/tessera/test/vault/azure/AzureKeyVaultHttpHandler.java b/...ance-test/src/test/java/com/quorum/tessera/test/vault/azure/AzureKeyVaultHttpHandler.java
@@ -16,6 +16,7 @@ public class AzureKeyVaultHttpHandler implements HttpHandler {
   private AtomicInteger counter = new AtomicInteger(0);
 
   private final String publicKey = "BULeR8JyUWhiuuCMU/HLA0Q5pzkYT+cHII3ZKBey3Bo=";
+  private final String privateKey = "Wl+xSyXVuuqzpvznOS7dOobhcn4C5auxkFRi7yLtgtA=";
 
   private final String keyVaultUrl;
 
@@ -52,8 +53,18 @@ public void handle(HttpExchange exchange) throws IOException {
       LOGGER.info("response send  {}", new String(response));
 
       exchange.close();
-    } else {
+    } else if (exchange.getRequestURI().toString().startsWith("/secrets/Key/")) {
+      JsonObject jsonObject = Json.createObjectBuilder().add("value", privateKey).build();
+
+      byte[] response = jsonObject.toString().getBytes();
+      exchange.sendResponseHeaders(200, response.length);
+      exchange.getResponseBody().write(response);
 
+      LOGGER.info("response send  {}", new String(response));
+
+      exchange.close();
+    } else {
+      LOGGER.info("response send empty");
       exchange.sendResponseHeaders(200, 0);
       exchange.close();
     }