Skip to content

Use status matchers where appropriate (15) #46245

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

Open
ravenblackx wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Use status matchers where appropriate (15) #46245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
856778a
Use status matchers where appropriate (14)
ravenblackx Jul 14, 2026
db2fbc1
Unify status check
ravenblackx Jul 16, 2026
982c029
EXPECT_OK and ASSERT_OK already output the message
ravenblackx Jul 16, 2026
8640b25
Combine status code and message expectations
ravenblackx Jul 16, 2026
6c6bc08
Use ASSERT if the next line would crash, and use IsOkAndHolds
ravenblackx Jul 17, 2026
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
4 changes: 4 additions & 0 deletions test/extensions/common/aws/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ envoy_cc_test(
"//test/mocks/server:factory_context_mocks",
"//test/mocks/upstream:cluster_manager_mocks",
"//test/test_common:environment_lib",
"//test/test_common:status_utility_lib",
"//test/test_common:test_runtime_lib",
],
)
Expand All @@ -51,6 +52,7 @@ envoy_cc_test(
deps = [
"//source/extensions/common/aws:aws_cluster_manager_lib",
"//test/mocks/server:server_factory_context_mocks",
"//test/test_common:status_utility_lib",
"@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
],
)
Expand All @@ -63,6 +65,7 @@ envoy_cc_test(
"//source/extensions/common/aws:utility_lib",
"//test/extensions/common/aws:aws_mocks",
"//test/mocks/server:server_factory_context_mocks",
"//test/test_common:status_utility_lib",
"//test/test_common:utility_lib",
],
)
Expand Down Expand Up @@ -107,5 +110,6 @@ envoy_cc_test(
"//source/extensions/common/aws/signers:sigv4_signer_impl_lib",
"//test/extensions/common/aws:aws_mocks",
"//test/mocks/server:factory_context_mocks",
"//test/test_common:status_utility_lib",
],
)
17 changes: 9 additions & 8 deletions test/extensions/common/aws/aws_cluster_manager_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
#include "source/extensions/common/aws/aws_cluster_manager.h"

#include "test/mocks/server/server_factory_context.h"
#include "test/test_common/status_utility.h"

#include "gtest/gtest.h"

using ::Envoy::StatusHelpers::IsOk;
using ::Envoy::StatusHelpers::IsOkAndHolds;
using testing::NiceMock;
using ::testing::Not;
using testing::Return;
namespace Envoy {
namespace Extensions {
Expand Down Expand Up @@ -57,12 +61,9 @@ TEST_F(AwsClusterManagerTest, AddClusters) {
"cluster_3",
envoy::config::cluster::v3::Cluster::DiscoveryType::Cluster_DiscoveryType_STRICT_DNS,
"uri_3");
EXPECT_TRUE(aws_cluster_manager->getUriFromClusterName("cluster_1").ok());
EXPECT_EQ(aws_cluster_manager->getUriFromClusterName("cluster_1").value(), "uri_1");
EXPECT_TRUE(aws_cluster_manager->getUriFromClusterName("cluster_2").ok());
EXPECT_EQ(aws_cluster_manager->getUriFromClusterName("cluster_2").value(), "uri_2");
EXPECT_TRUE(aws_cluster_manager->getUriFromClusterName("cluster_3").ok());
EXPECT_EQ(aws_cluster_manager->getUriFromClusterName("cluster_3").value(), "uri_3");
EXPECT_THAT(aws_cluster_manager->getUriFromClusterName("cluster_1"), IsOkAndHolds("uri_1"));
EXPECT_THAT(aws_cluster_manager->getUriFromClusterName("cluster_2"), IsOkAndHolds("uri_2"));
EXPECT_THAT(aws_cluster_manager->getUriFromClusterName("cluster_3"), IsOkAndHolds("uri_3"));
// Adding an extra with the same cluster name has no effect
status = aws_cluster_manager->addManagedCluster(
"cluster_1",
Expand Down Expand Up @@ -158,7 +159,7 @@ TEST_F(AwsClusterManagerTest, CreateQueuedViaInitManagerWithFailedCluster) {
"new_url");
// Cluster creation should be queued at this point
init_target_->initialize(init_watcher_);
EXPECT_FALSE(aws_cluster_manager->getUriFromClusterName("cluster_1").ok());
EXPECT_THAT(aws_cluster_manager->getUriFromClusterName("cluster_1"), Not(IsOk()));
}

// Checks that aws cluster manager constructor does not add an init target if the init manager is
Expand Down Expand Up @@ -208,7 +209,7 @@ TEST_F(AwsClusterManagerTest, ClusterManagerCannotAdd) {
envoy::config::cluster::v3::Cluster::DiscoveryType::Cluster_DiscoveryType_STRICT_DNS,
"new_url");
EXPECT_EQ(absl::StatusCode::kInternal, status.code());
EXPECT_FALSE(aws_cluster_manager->getUriFromClusterName("cluster_1").ok());
EXPECT_THAT(aws_cluster_manager->getUriFromClusterName("cluster_1"), Not(IsOk()));
}

// Noop test for coverage
Expand Down
34 changes: 17 additions & 17 deletions test/extensions/common/aws/credential_provider_chains_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
#include "test/mocks/server/server_factory_context.h"
#include "test/mocks/upstream/cluster_manager.h"
#include "test/test_common/environment.h"
#include "test/test_common/status_utility.h"
#include "test/test_common/test_runtime.h"

#include "gtest/gtest.h"

using ::Envoy::StatusHelpers::IsOk;
using ::Envoy::StatusHelpers::IsOkAndHolds;
using testing::_;
using testing::NiceMock;
using ::testing::Not;
using testing::Ref;
using testing::Return;
using testing::ReturnRef;
Expand All @@ -21,6 +25,10 @@ namespace Extensions {
namespace Common {
namespace Aws {

MATCHER_P(ChainHasNumProviders, num_providers, "") {
return arg->getNumProviders() == static_cast<size_t>(num_providers);
}

class DefaultCredentialsProviderChainTest : public testing::Test {
public:
DefaultCredentialsProviderChainTest() : api_(Api::createApiForTest(time_system_)) {
Expand Down Expand Up @@ -342,7 +350,7 @@ TEST_F(CustomCredentialsProviderChainTest, NoProvider) {
credential_provider_config.set_custom_credential_provider_chain(true);
auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "region", credential_provider_config);
EXPECT_FALSE(chain.ok());
EXPECT_THAT(chain, Not(IsOk()));
}

TEST_F(CustomCredentialsProviderChainTest, InstanceProfileOnly) {
Expand All @@ -351,8 +359,7 @@ TEST_F(CustomCredentialsProviderChainTest, InstanceProfileOnly) {
credential_provider_config.mutable_instance_profile_credential_provider();
auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "region", credential_provider_config);
EXPECT_TRUE(chain.ok());
EXPECT_EQ(1, chain.value()->getNumProviders());
EXPECT_THAT(chain, IsOkAndHolds(ChainHasNumProviders(1)));
}

TEST_F(CustomCredentialsProviderChainTest, InstanceProfileAndEnvironmentOnly) {
Expand All @@ -362,8 +369,7 @@ TEST_F(CustomCredentialsProviderChainTest, InstanceProfileAndEnvironmentOnly) {
credential_provider_config.mutable_environment_credential_provider();
auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "region", credential_provider_config);
EXPECT_TRUE(chain.ok());
EXPECT_EQ(2, chain.value()->getNumProviders());
EXPECT_THAT(chain, IsOkAndHolds(ChainHasNumProviders(2)));
}

TEST_F(CustomCredentialsProviderChainTest, WebIdentityOnly) {
Expand All @@ -375,8 +381,7 @@ TEST_F(CustomCredentialsProviderChainTest, WebIdentityOnly) {
->set_environment_variable("TEST");
auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "region", credential_provider_config);
EXPECT_TRUE(chain.ok());
EXPECT_EQ(1, chain.value()->getNumProviders());
EXPECT_THAT(chain, IsOkAndHolds(ChainHasNumProviders(1)));
}

TEST_F(CustomCredentialsProviderChainTest, CredentialFileOnly) {
Expand All @@ -385,8 +390,7 @@ TEST_F(CustomCredentialsProviderChainTest, CredentialFileOnly) {
credential_provider_config.mutable_credentials_file_provider();
auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "region", credential_provider_config);
EXPECT_TRUE(chain.ok());
EXPECT_EQ(1, chain.value()->getNumProviders());
EXPECT_THAT(chain, IsOkAndHolds(ChainHasNumProviders(1)));
}

TEST_F(CustomCredentialsProviderChainTest, ContainerOnly) {
Expand All @@ -397,8 +401,7 @@ TEST_F(CustomCredentialsProviderChainTest, ContainerOnly) {
credential_provider_config.mutable_container_credential_provider();
auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "region", credential_provider_config);
EXPECT_TRUE(chain.ok());
EXPECT_EQ(1, chain.value()->getNumProviders());
EXPECT_THAT(chain, IsOkAndHolds(ChainHasNumProviders(1)));
}

TEST_F(CustomCredentialsProviderChainTest, AssumeRoleOnly) {
Expand All @@ -411,8 +414,7 @@ TEST_F(CustomCredentialsProviderChainTest, AssumeRoleOnly) {

auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "us-east-1", credential_provider_config);
EXPECT_TRUE(chain.ok());
EXPECT_EQ(1, chain.value()->getNumProviders());
EXPECT_THAT(chain, IsOkAndHolds(ChainHasNumProviders(1)));
}

TEST_F(CustomCredentialsProviderChainTest, AssumeRoleWithEnvironment) {
Expand All @@ -426,8 +428,7 @@ TEST_F(CustomCredentialsProviderChainTest, AssumeRoleWithEnvironment) {

auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "us-east-1", credential_provider_config);
EXPECT_TRUE(chain.ok());
EXPECT_EQ(2, chain.value()->getNumProviders());
EXPECT_THAT(chain, IsOkAndHolds(ChainHasNumProviders(2)));
}

TEST_F(CustomCredentialsProviderChainTest, AssumeRoleWithoutSessionName) {
Expand Down Expand Up @@ -573,8 +574,7 @@ TEST_F(CustomCredentialsProviderChainTest, AssumeRoleInnerChainSubscriptionsSetu
auto chain = Envoy::Extensions::Common::Aws::CommonCredentialsProviderChain::
customCredentialsProviderChain(context_, "us-east-1", credential_provider_config);

EXPECT_TRUE(chain.ok());
EXPECT_EQ(1, chain.value()->getNumProviders());
EXPECT_THAT(chain, IsOkAndHolds(ChainHasNumProviders(1)));

auto instance_profile_provider =
context_.singletonManager()
Expand Down
3 changes: 3 additions & 0 deletions test/extensions/common/aws/credential_providers/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ envoy_cc_test(
"//test/extensions/common/aws:aws_mocks",
"//test/mocks/server:factory_context_mocks",
"//test/test_common:environment_lib",
"//test/test_common:status_utility_lib",
"//test/test_common:test_runtime_lib",
"@envoy_api//envoy/extensions/common/aws/v3:pkg_cc_proto",
],
Expand Down Expand Up @@ -126,6 +127,7 @@ envoy_cc_test(
"//test/extensions/common/aws:aws_mocks",
"//test/mocks/server:factory_context_mocks",
"//test/test_common:environment_lib",
"//test/test_common:status_utility_lib",
"//test/test_common:test_runtime_lib",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
"@envoy_api//envoy/extensions/common/aws/v3:pkg_cc_proto",
Expand All @@ -145,6 +147,7 @@ envoy_cc_test(
"//test/extensions/common/aws:aws_mocks",
"//test/mocks/server:factory_context_mocks",
"//test/test_common:environment_lib",
"//test/test_common:status_utility_lib",
"//test/test_common:test_runtime_lib",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
],
Expand Down
19 changes: 10 additions & 9 deletions ...xtensions/common/aws/credential_providers/iam_roles_anywhere_credentials_provider_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "test/mocks/upstream/cluster_manager.h"
#include "test/test_common/environment.h"
#include "test/test_common/simulated_time_system.h"
#include "test/test_common/status_utility.h"
#include "test/test_common/utility.h"

#include "gtest/gtest.h"
Expand All @@ -26,10 +27,13 @@
// Please see iam_roles_anywhere_test_generator.py in this directory to replicate these test cases

using Envoy::Extensions::Common::Aws::MetadataFetcherPtr;
using ::Envoy::StatusHelpers::HasStatusMessage;
using ::Envoy::StatusHelpers::IsOk;
using testing::Eq;
using testing::InvokeWithoutArgs;
using testing::MockFunction;
using testing::NiceMock;
using ::testing::Not;
using testing::Return;
using testing::ReturnRef;

Expand Down Expand Up @@ -1226,7 +1230,7 @@ TEST_F(IamRolesAnywhereCredentialsProviderBasicTests, SignEmptyPayload) {
headers.addCopy(Http::LowerCaseString("host"), "www.example.com");
status = roles_anywhere_signer->signEmptyPayload(headers, "ap-southeast-2");
// Will fail because credentials are invalid
EXPECT_FALSE(status.ok());
EXPECT_THAT(status, Not(IsOk()));
}

TEST_F(IamRolesAnywhereCredentialsProviderBasicTests, SignUnsignedPayload) {
Expand All @@ -1250,7 +1254,7 @@ TEST_F(IamRolesAnywhereCredentialsProviderBasicTests, SignUnsignedPayload) {
headers.addCopy(Http::LowerCaseString("host"), "www.example.com");
status = roles_anywhere_signer->signUnsignedPayload(headers, "ap-southeast-2");
// Will fail because credentials are invalid
EXPECT_FALSE(status.ok());
EXPECT_THAT(status, Not(IsOk()));
mock_credentials_provider.reset();
}

Expand All @@ -1273,8 +1277,7 @@ TEST_F(IamRolesAnywhereCredentialsProviderBasicTests, NoMethod) {
headers.setPath("/");
headers.addCopy(Http::LowerCaseString("host"), "www.example.com");
status = roles_anywhere_signer->signUnsignedPayload(headers, "ap-southeast-2");
EXPECT_FALSE(status.ok());
EXPECT_EQ(status.message(), "Message is missing :method header");
EXPECT_THAT(status, HasStatusMessage("Message is missing :method header"));
}

TEST_F(IamRolesAnywhereCredentialsProviderBasicTests, NoPath) {
Expand All @@ -1296,8 +1299,7 @@ TEST_F(IamRolesAnywhereCredentialsProviderBasicTests, NoPath) {
headers.setMethod("GET");
headers.addCopy(Http::LowerCaseString("host"), "www.example.com");
status = roles_anywhere_signer->signUnsignedPayload(headers, "ap-southeast-2");
EXPECT_FALSE(status.ok());
EXPECT_EQ(status.message(), "Message is missing :path header");
EXPECT_THAT(status, HasStatusMessage("Message is missing :path header"));
}

TEST_F(IamRolesAnywhereCredentialsProviderBasicTests, NoCredentials) {
Expand All @@ -1318,9 +1320,8 @@ TEST_F(IamRolesAnywhereCredentialsProviderBasicTests, NoCredentials) {
headers.setPath("/");
headers.addCopy(Http::LowerCaseString("host"), "www.example.com");
status = roles_anywhere_signer->signEmptyPayload(headers, "ap-southeast-2");
EXPECT_FALSE(status.ok());
EXPECT_EQ(status.message(),
"Unable to sign IAM Roles Anywhere payload - no x509 credentials found");
EXPECT_THAT(status, HasStatusMessage(
"Unable to sign IAM Roles Anywhere payload - no x509 credentials found"));
}

class ControlledCredentialsProvider : public CredentialsProvider {
Expand Down
Loading
Loading