From 126001ddf84498ba6953ca1385af9c41ba25bb11 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Tue, 12 Sep 2023 14:46:12 +1000 Subject: [PATCH 1/2] Fix acceptance tests since test parameters enabled flag can now be set and defaults to false --- .../web3signer/tests/bulkloading/AwsKmsAcceptanceTest.java | 3 +++ .../tests/bulkloading/AwsSecretsManagerAcceptanceTest.java | 3 +++ 2 files changed, 6 insertions(+) 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 614ebafe5..320faa1df 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 @@ -109,6 +109,7 @@ void setupAwsResources() { void keysAreLoadedFromAwsKmsAndReportedByPublicApi(final boolean useConfigFile) { final AwsVaultParameters awsVaultParameters = AwsVaultParametersBuilder.anAwsParameters() + .withEnabled(true) .withAuthenticationMode(AwsAuthenticationMode.SPECIFIED) .withRegion(AWS_REGION) .withAccessKeyId(RO_AWS_ACCESS_KEY_ID) @@ -150,6 +151,7 @@ void healthCheckErrorCountWhenInvalidCredentialsAreUsed() { final boolean useConfigFile = false; final AwsVaultParameters invalidCredsParams = AwsVaultParametersBuilder.anAwsParameters() + .withEnabled(true) .withAuthenticationMode(AwsAuthenticationMode.SPECIFIED) .withRegion("us-east-2") .withAccessKeyId("invalid") @@ -195,6 +197,7 @@ void keysAreLoadedFromAwsKmsWithEnvironmentAuthModeAndReportedByPublicApi( final boolean useConfigFile) { final AwsVaultParameters awsVaultParameters = AwsVaultParametersBuilder.anAwsParameters() + .withEnabled(true) .withAuthenticationMode(AwsAuthenticationMode.ENVIRONMENT) .withTagNamesFilter(List.of("TagName2", "TagName3")) .withTagValuesFilter(List.of("TagValue0", "TagValue2", "TagValue3")) 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 08a860319..93a0f25f8 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 @@ -107,6 +107,7 @@ void setupAwsResources() { void secretsAreLoadedFromAWSSecretsManagerAndReportedByPublicApi(final boolean useConfigFile) { final AwsVaultParameters awsVaultParameters = AwsVaultParametersBuilder.anAwsParameters() + .withEnabled(true) .withAuthenticationMode(AwsAuthenticationMode.SPECIFIED) .withRegion(AWS_REGION) .withAccessKeyId(RO_AWS_ACCESS_KEY_ID) @@ -149,6 +150,7 @@ void healthCheckErrorCountWhenInvalidCredentialsAreUsed() { final boolean useConfigFile = false; final AwsVaultParameters invalidCredsParams = AwsVaultParametersBuilder.anAwsParameters() + .withEnabled(true) .withAuthenticationMode(AwsAuthenticationMode.SPECIFIED) .withRegion("us-east-2") .withAccessKeyId("invalid") @@ -181,6 +183,7 @@ void secretsAreLoadedFromAWSSecretsManagerWithEnvironmentAuthModeAndReportedByPu final boolean useConfigFile) { final AwsVaultParameters awsVaultParameters = AwsVaultParametersBuilder.anAwsParameters() + .withEnabled(true) .withAuthenticationMode(AwsAuthenticationMode.ENVIRONMENT) .withPrefixesFilter(List.of(awsSecretsManagerUtil.getSecretsManagerPrefix())) .withTagNamesFilter(List.of("TagName2", "TagName3")) From d0ec57d5deef13f955312c9ad1fbb186c29826de Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Tue, 12 Sep 2023 14:58:52 +1000 Subject: [PATCH 2/2] Enable secrets manager for multivalue AT --- .../bulkloading/AwsSecretsManagerMultiValueAcceptanceTest.java | 1 + 1 file changed, 1 insertion(+) 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 839d4fe66..3942bc180 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 @@ -105,6 +105,7 @@ void setupAwsResources() { void secretsAreLoadedFromAWSSecretsManagerAndReportedByPublicApi(final boolean useConfigFile) { final AwsVaultParameters awsVaultParameters = AwsVaultParametersBuilder.anAwsParameters() + .withEnabled(true) .withAuthenticationMode(AwsAuthenticationMode.SPECIFIED) .withRegion(AWS_REGION) .withAccessKeyId(RO_AWS_ACCESS_KEY_ID)