Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aws KMS acceptance test fix #910

Merged
merged 2 commits into from
Sep 12, 2023
Merged

Aws KMS acceptance test fix #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
126001d
Fix acceptance tests since test parameters enabled flag can now be se…
jframe Sep 12, 2023
d0ec57d
Enable secrets manager for multivalue AT
jframe Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...e-tests/src/test/java/tech/pegasys/web3signer/tests/bulkloading/AwsKmsAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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"))
Expand Down
3 changes: 3 additions & 0 deletions .../test/java/tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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"))
Expand Down
1 change: 1 addition & 0 deletions .../tech/pegasys/web3signer/tests/bulkloading/AwsSecretsManagerMultiValueAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down