From c4fddf90832b258e0faef06143f603ff2be11ff3 Mon Sep 17 00:00:00 2001 From: Usman Saleem Date: Thu, 27 Feb 2025 15:23:06 +1000 Subject: [PATCH] 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 --- .github/workflows/ci_main.yml | 4 ++-- .../bulkloading/AwsKmsAcceptanceTest.java | 10 +++++----- .../AwsSecretsManagerAcceptanceTest.java | 10 +++++----- ...SecretsManagerMultiValueAcceptanceTest.java | 10 +++++----- ...ecretsManagerPerformanceAcceptanceTest.java | 10 +++++----- .../AzureKeyVaultAcceptanceTest.java | 11 ++++++----- .../AzureKeyVaultMultiValueAcceptanceTest.java | 8 ++++---- .../AwsKeyIdentifiersAcceptanceTest.java | 10 +++++----- .../KeyIdentifiersAcceptanceTest.java | 8 ++++---- .../signing/BlsSigningAcceptanceTest.java | 18 +++++++++--------- .../signing/SecpSigningAcceptanceTest.java | 16 ++++++++-------- .../aws/AwsSecretsManagerProviderTest.java | 10 +++++----- .../keystorage/aws/AwsSecretsManagerTest.java | 10 +++++----- .../keystorage/azure/AzureKeyVaultTest.java | 11 ++++++----- .../secp256k1/aws/AwsKmsClientTest.java | 10 +++++----- .../secp256k1/aws/AwsKmsSignerTest.java | 8 ++++---- .../azure/AzureKeyVaultSignerTest.java | 15 ++++++++------- 17 files changed, 91 insertions(+), 88 deletions(-) diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml index 95f555ed5..b761105f8 100644 --- 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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsKmsAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsKmsAcceptanceTest.java index e393309c8..83c135529 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsKmsAcceptanceTest.java +++ b/acceptance-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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerAcceptanceTest.java index 5477b5b8d..40c7fc3e6 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerAcceptanceTest.java +++ b/acceptance-tests/src/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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerMultiValueAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerMultiValueAcceptanceTest.java index ba419b065..39ec2ce03 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerMultiValueAcceptanceTest.java +++ b/acceptance-tests/src/test/java/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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerPerformanceAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerPerformanceAcceptanceTest.java index b22d6b772..c0c1b970f 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerPerformanceAcceptanceTest.java +++ b/acceptance-tests/src/test/java/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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultAcceptanceTest.java index 79f8ba922..bab10b0eb 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultAcceptanceTest.java +++ b/acceptance-tests/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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultMultiValueAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultMultiValueAcceptanceTest.java index b193a56aa..09affd7dd 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AzureKeyVaultMultiValueAcceptanceTest.java +++ b/acceptance-tests/src/test/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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/publickeys/AwsKeyIdentifiersAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/publickeys/AwsKeyIdentifiersAcceptanceTest.java index 1049fe6b8..b3dba5faa 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/publickeys/AwsKeyIdentifiersAcceptanceTest.java +++ b/acceptance-tests/src/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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/publickeys/KeyIdentifiersAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/publickeys/KeyIdentifiersAcceptanceTest.java index 1aa01d6d6..6d2b38c48 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/publickeys/KeyIdentifiersAcceptanceTest.java +++ b/acceptance-tests/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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/signing/BlsSigningAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/signing/BlsSigningAcceptanceTest.java index d6aabc94d..acae228b5 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/signing/BlsSigningAcceptanceTest.java +++ b/acceptance-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/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/signing/SecpSigningAcceptanceTest.java b/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/signing/SecpSigningAcceptanceTest.java index cc2e3603c..914db1bac 100644 --- a/acceptance-tests/src/test/java/tech/pegasys/web3signer/tests/signing/SecpSigningAcceptanceTest.java +++ b/acceptance-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/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/aws/AwsSecretsManagerProviderTest.java b/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/aws/AwsSecretsManagerProviderTest.java index 9c1355f57..d62b56181 100644 --- a/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/aws/AwsSecretsManagerProviderTest.java +++ b/keystorage/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 index f5f8ccdde..2cf3f526e 100644 --- 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 { diff --git a/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/azure/AzureKeyVaultTest.java b/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/azure/AzureKeyVaultTest.java index c875eb8ef..14cf376f1 100644 --- a/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/azure/AzureKeyVaultTest.java +++ b/keystorage/src/test/java/tech/pegasys/web3signer/keystorage/azure/AzureKeyVaultTest.java @@ -13,6 +13,7 @@ package tech.pegasys.web3signer.keystorage.azure; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static tech.pegasys.web3signer.keystorage.azure.AzureKeyVault.createUsingClientSecretCredentials; import tech.pegasys.web3signer.keystorage.common.MappedResults; @@ -26,8 +27,8 @@ import java.util.concurrent.Executors; import com.azure.security.keyvault.keys.models.KeyProperties; +import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -49,10 +50,10 @@ public class AzureKeyVaultTest { @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"); } @Test diff --git a/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/aws/AwsKmsClientTest.java b/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/aws/AwsKmsClientTest.java index 89589ef00..0b5a20caa 100644 --- a/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/aws/AwsKmsClientTest.java +++ b/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/aws/AwsKmsClientTest.java @@ -38,23 +38,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") public class AwsKmsClientTest { private static final String AWS_ACCESS_KEY_ID = System.getenv("AWS_ACCESS_KEY_ID"); diff --git a/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/aws/AwsKmsSignerTest.java b/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/aws/AwsKmsSignerTest.java index 03e397dbc..e24913af9 100644 --- a/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/aws/AwsKmsSignerTest.java +++ b/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/aws/AwsKmsSignerTest.java @@ -41,19 +41,19 @@ @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") public class AwsKmsSignerTest { private static final String AWS_ACCESS_KEY_ID = System.getenv("AWS_ACCESS_KEY_ID"); diff --git a/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/azure/AzureKeyVaultSignerTest.java b/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/azure/AzureKeyVaultSignerTest.java index 4933fa90c..d4df342a9 100644 --- a/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/azure/AzureKeyVaultSignerTest.java +++ b/signing/src/test/java/tech/pegasys/web3signer/signing/secp256k1/azure/AzureKeyVaultSignerTest.java @@ -14,6 +14,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static tech.pegasys.web3signer.signing.secp256k1.azure.AzureKeyVaultSignerFactory.UNSUPPORTED_CURVE_NAME; import tech.pegasys.web3signer.signing.config.AzureKeyVaultFactory; @@ -25,8 +26,8 @@ import java.math.BigInteger; import java.security.SignatureException; +import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.web3j.crypto.Sign; @@ -47,12 +48,12 @@ public class AzureKeyVaultSignerTest { @BeforeAll static void preChecks() { - Assumptions.assumeTrue( - AZURE_CLIENT_ID != null - && AZURE_CLIENT_SECRET != null - && AZURE_KEY_VAULT_NAME != null - && AZURE_INVALID_KEY_VAULT_NAME != null - && AZURE_TENANT_ID != null, + assumeTrue( + !StringUtils.isEmpty(AZURE_CLIENT_ID) + && !StringUtils.isEmpty(AZURE_CLIENT_SECRET) + && !StringUtils.isEmpty(AZURE_KEY_VAULT_NAME) + && !StringUtils.isEmpty(AZURE_INVALID_KEY_VAULT_NAME) + && !StringUtils.isEmpty(AZURE_TENANT_ID), "Ensure Azure env variables are set"); }