Fix Github workflow AWS env variables (#1065)

* Fix Github workflow AWS env variables * AWS Test Env variable annotation to check empty string * Fix Azure Env Variable annotations
Consensys · Feb 27, 2025 · c4fddf9 · c4fddf9
1 parent dbd20bf
commit c4fddf9
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 88 deletions.
diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml
@@ -38,8 +38,8 @@ jobs:
         uses: ./.github/actions/build-test
         env:
           AWS_REGION: ${{ secrets.AWS_REGION }}
-          RO_AWS_ACCESS_KEY_ID: ${{ secrets.RO_AWS_ACCESS_KEY_ID }}
-          RO_AWS_SECRET_ACCESS_KEY: ${{ secrets.RO_AWS_SECRET_ACCESS_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.RO_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.RO_AWS_SECRET_ACCESS_KEY }}
           RW_AWS_ACCESS_KEY_ID: ${{ secrets.RW_AWS_ACCESS_KEY_ID }}
           RW_AWS_SECRET_ACCESS_KEY: ${{ secrets.RW_AWS_SECRET_ACCESS_KEY }}
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}

diff --git a/...e-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsKmsAcceptanceTest.java b/...e-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsKmsAcceptanceTest.java
@@ -48,23 +48,23 @@
 
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_REGION",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_REGION env variable is required")
 @TestInstance(TestInstance.Lifecycle.PER_CLASS) // same instance is shared across test methods
 public class AwsKmsAcceptanceTest extends AcceptanceTestBase {

diff --git a/.../test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerAcceptanceTest.java b/.../test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerAcceptanceTest.java
@@ -49,23 +49,23 @@
 
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_REGION",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_REGION env variable is required")
 @TestInstance(TestInstance.Lifecycle.PER_CLASS) // same instance is shared across test methods
 public class AwsSecretsManagerAcceptanceTest extends AcceptanceTestBase {

diff --git a/.../tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerMultiValueAcceptanceTest.java b/.../tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerMultiValueAcceptanceTest.java
@@ -44,23 +44,23 @@
 
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_REGION",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_REGION env variable is required")
 @TestInstance(TestInstance.Lifecycle.PER_CLASS) // same instance is shared across test methods
 public class AwsSecretsManagerMultiValueAcceptanceTest extends AcceptanceTestBase {

diff --git a/...tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerPerformanceAcceptanceTest.java b/...tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerPerformanceAcceptanceTest.java
@@ -53,23 +53,23 @@
     disabledReason = "AWS_PERF_AT_ENABLED env variable is required and must be set to true")
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_REGION",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_REGION env variable is required")
 @TestInstance(TestInstance.Lifecycle.PER_CLASS) // same instance is shared across test methods
 public class AwsSecretsManagerPerformanceAcceptanceTest extends AcceptanceTestBase {

diff --git a/.../src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultAcceptanceTest.java b/.../src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultAcceptanceTest.java
@@ -16,6 +16,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static tech.pegasys.web3signer.core.config.HealthCheckNames.KEYS_CHECK_AZURE_BULK_LOADING;
 import static tech.pegasys.web3signer.dsl.utils.HealthCheckResultUtil.getHealtcheckKeysLoaded;
 import static tech.pegasys.web3signer.dsl.utils.HealthCheckResultUtil.getHealthcheckErrorCount;
@@ -32,7 +33,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
-import org.junit.jupiter.api.Assumptions;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -56,10 +57,10 @@ public class AzureKeyVaultAcceptanceTest extends AcceptanceTestBase {
 
   @BeforeAll
   public static void setup() {
-    Assumptions.assumeTrue(CLIENT_ID != null, "Set AZURE_CLIENT_ID environment variable");
-    Assumptions.assumeTrue(CLIENT_SECRET != null, "Set AZURE_CLIENT_SECRET environment variable");
-    Assumptions.assumeTrue(TENANT_ID != null, "Set AZURE_TENANT_ID environment variable");
-    Assumptions.assumeTrue(VAULT_NAME != null, "Set AZURE_KEY_VAULT_NAME environment variable");
+    assumeTrue(!StringUtils.isEmpty(CLIENT_ID), "Set AZURE_CLIENT_ID environment variable");
+    assumeTrue(!StringUtils.isEmpty(CLIENT_SECRET), "Set AZURE_CLIENT_SECRET environment variable");
+    assumeTrue(!StringUtils.isEmpty(TENANT_ID), "Set AZURE_TENANT_ID environment variable");
+    assumeTrue(!StringUtils.isEmpty(VAULT_NAME), "Set AZURE_KEY_VAULT_NAME environment variable");
   }
 
   @ParameterizedTest

diff --git a/...java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultMultiValueAcceptanceTest.java b/...java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultMultiValueAcceptanceTest.java
@@ -48,19 +48,19 @@
 
 @EnabledIfEnvironmentVariable(
     named = "AZURE_CLIENT_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AZURE_CLIENT_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AZURE_CLIENT_SECRET",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AZURE_CLIENT_SECRET env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AZURE_TENANT_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AZURE_TENANT_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AZURE_KEY_VAULT_NAME",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AZURE_KEY_VAULT_NAME env variable is required")
 public class AzureKeyVaultMultiValueAcceptanceTest extends AcceptanceTestBase {
 

diff --git a/...c/test/java/tech/pegasys/web3signer/tests/publickeys/AwsKeyIdentifiersAcceptanceTest.java b/...c/test/java/tech/pegasys/web3signer/tests/publickeys/AwsKeyIdentifiersAcceptanceTest.java
@@ -31,23 +31,23 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_REGION",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_REGION env variable is required")
 public class AwsKeyIdentifiersAcceptanceTest extends KeyIdentifiersAcceptanceTestBase {
 

diff --git a/.../src/test/java/tech/pegasys/web3signer/tests/publickeys/KeyIdentifiersAcceptanceTest.java b/.../src/test/java/tech/pegasys/web3signer/tests/publickeys/KeyIdentifiersAcceptanceTest.java
@@ -205,10 +205,10 @@ public void allLoadedKeysAreReturnedPublicKeyResponseWithEmptyAccept(final KeyTy
 
   @Test
   @EnabledIfEnvironmentVariables({
-    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_ID", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_SECRET", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_KEY_VAULT_NAME", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_TENANT_ID", matches = ".*")
+    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_ID", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_SECRET", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_KEY_VAULT_NAME", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_TENANT_ID", matches = ".+")
   })
   public void azureKeysReturnAppropriatePublicKey() {
     final String clientId = System.getenv("AZURE_CLIENT_ID");

diff --git a/...e-tests/src/test/java/tech/pegasys/web3signer/tests/signing/BlsSigningAcceptanceTest.java b/...e-tests/src/test/java/tech/pegasys/web3signer/tests/signing/BlsSigningAcceptanceTest.java
@@ -156,10 +156,10 @@ public void ableToSignUsingHashicorpWithHttpProtocolOverride(
 
   @Test
   @EnabledIfEnvironmentVariables({
-    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_ID", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_SECRET", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_KEY_VAULT_NAME", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_TENANT_ID", matches = ".*")
+    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_ID", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_SECRET", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_KEY_VAULT_NAME", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_TENANT_ID", matches = ".+")
   })
   public void ableToSignUsingAzure() throws JsonProcessingException {
     final String clientId = System.getenv("AZURE_CLIENT_ID");
@@ -180,23 +180,23 @@ public void ableToSignUsingAzure() throws JsonProcessingException {
   @EnabledIfEnvironmentVariables({
     @EnabledIfEnvironmentVariable(
         named = "RW_AWS_ACCESS_KEY_ID",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required"),
     @EnabledIfEnvironmentVariable(
         named = "RW_AWS_SECRET_ACCESS_KEY",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required"),
     @EnabledIfEnvironmentVariable(
         named = "AWS_ACCESS_KEY_ID",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "AWS_ACCESS_KEY_ID env variable is required"),
     @EnabledIfEnvironmentVariable(
         named = "AWS_SECRET_ACCESS_KEY",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required"),
     @EnabledIfEnvironmentVariable(
         named = "AWS_REGION",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "AWS_REGION env variable is required")
   })
   public void ableToSignUsingAws() throws JsonProcessingException {

diff --git a/...-tests/src/test/java/tech/pegasys/web3signer/tests/signing/SecpSigningAcceptanceTest.java b/...-tests/src/test/java/tech/pegasys/web3signer/tests/signing/SecpSigningAcceptanceTest.java
@@ -99,10 +99,10 @@ public void signDataWithKeyFromHashicorp() {
 
   @Test
   @EnabledIfEnvironmentVariables({
-    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_ID", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_SECRET", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_KEY_VAULT_NAME", matches = ".*"),
-    @EnabledIfEnvironmentVariable(named = "AZURE_TENANT_ID", matches = ".*")
+    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_ID", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_CLIENT_SECRET", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_KEY_VAULT_NAME", matches = ".+"),
+    @EnabledIfEnvironmentVariable(named = "AZURE_TENANT_ID", matches = ".+")
   })
   public void signDataWithKeyInAzure() {
     METADATA_FILE_HELPERS.createAzureKeyYamlFileAt(
@@ -119,19 +119,19 @@ public void signDataWithKeyInAzure() {
   @EnabledIfEnvironmentVariables({
     @EnabledIfEnvironmentVariable(
         named = "RW_AWS_ACCESS_KEY_ID",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required"),
     @EnabledIfEnvironmentVariable(
         named = "RW_AWS_SECRET_ACCESS_KEY",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required"),
     @EnabledIfEnvironmentVariable(
         named = "AWS_ACCESS_KEY_ID",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "AWS_ACCESS_KEY_ID env variable is required"),
     @EnabledIfEnvironmentVariable(
         named = "AWS_SECRET_ACCESS_KEY",
-        matches = ".*",
+        matches = ".+",
         disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required"),
   })
   public void remoteSignWithAwsKMS() {

diff --git a/...e/src/test/java/tech/pegasys/web3signer/keystorage/aws/AwsSecretsManagerProviderTest.java b/...e/src/test/java/tech/pegasys/web3signer/keystorage/aws/AwsSecretsManagerProviderTest.java
@@ -26,23 +26,23 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_REGION",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_REGION env variable is required")
 class AwsSecretsManagerProviderTest {
 

diff --git a/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/aws/AwsSecretsManagerTest.java b/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/aws/AwsSecretsManagerTest.java
@@ -51,23 +51,23 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "RW_AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "RW_AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_ACCESS_KEY_ID",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_ACCESS_KEY_ID env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_SECRET_ACCESS_KEY",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_SECRET_ACCESS_KEY env variable is required")
 @EnabledIfEnvironmentVariable(
     named = "AWS_REGION",
-    matches = ".*",
+    matches = ".+",
     disabledReason = "AWS_REGION env variable is required")
 class AwsSecretsManagerTest {