Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions aws_common/awssdk/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0.2)
project(AWSSDK)
set(AWSSDK_VERSION 1.6.53)
set(AWSSDK_MD5 8c04cd7a0670bc4a0cdcbb2f416efa7a)
set(AWSSDK_VERSION 1.8.85)
set(AWSSDK_MD5 889124168bfa13bf0c70c09c36c7ff36)

if(NOT EXTERNAL_INSTALL_LOCATION)
set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external)
Expand Down
2 changes: 1 addition & 1 deletion aws_common/src/sdk_utils/aws_profile_provider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ AWSProfileProvider::AWSProfileProvider()
{
config_file_loader_ =
std::shared_ptr<AWSProfileConfigLoader>(Aws::MakeShared<AWSConfigFileProfileConfigLoader>(
kProfileLogTag, GetConfigProfileFilename(), true));
kProfileLogTag, Aws::Auth::GetConfigProfileFilename(), true));
config_file_loader_->Load();
credentials_file_loader_ =
std::shared_ptr<AWSProfileConfigLoader>(Aws::MakeShared<AWSConfigFileProfileConfigLoader>(
Expand Down
4 changes: 3 additions & 1 deletion aws_common/src/sdk_utils/client_configuration_provider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ ClientConfiguration ClientConfigurationProvider::GetClientConfiguration(
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "use_dual_stack"), config.useDualStack);
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "enable_clock_skew_adjustment"),
config.enableClockSkewAdjustment);
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "follow_redirects"), config.followRedirects);
bool followRedirects;
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "follow_redirects"), followRedirects);
config.followRedirects = followRedirects ? Aws::Client::FollowRedirectsPolicy::ALWAYS : Aws::Client::FollowRedirectsPolicy::NEVER;
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "verify_SSL"), config.verifySSL);

// check for non-default strategy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,6 @@ using ::testing::SetArgReferee;
using ::testing::Return;
using Aws::AwsError;

namespace Aws {
namespace Auth {

bool operator==(const AWSCredentials & left, const AWSCredentials & right)
{
return (
(left.GetAWSAccessKeyId() == right.GetAWSAccessKeyId())
&& (left.GetAWSSecretKey() == right.GetAWSSecretKey())
&& (left.GetSessionToken() == right.GetSessionToken())
);
}

} // namespace Auth
} // namespace Aws

class ServiceCredentialsProviderFixture : public ::testing::Test
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/

#include <gtest/gtest.h>
#include <aws/core/Aws.h>
#include <aws_common/sdk_utils/parameter_reader_mock.h>
#include <aws_common/sdk_utils/client_configuration_provider.h>

Expand Down Expand Up @@ -128,7 +129,7 @@ client_conf_mutator g_client_conf_mutators[] =
[](ClientConfiguration & config)->void { config.proxyPort = config.proxyPort + 2; },
[](ClientConfiguration & config)->void { config.useDualStack = ! config.useDualStack; },
[](ClientConfiguration & config)->void { config.enableClockSkewAdjustment = ! config.enableClockSkewAdjustment; },
[](ClientConfiguration & config)->void { config.followRedirects = !config.followRedirects; },
[](ClientConfiguration & config)->void { config.followRedirects = (config.followRedirects == FollowRedirectsPolicy::NEVER ? FollowRedirectsPolicy::ALWAYS : FollowRedirectsPolicy::NEVER); },
[](ClientConfiguration & config)->void { config.verifySSL = !config.verifySSL; }
};
INSTANTIATE_TEST_CASE_P(
Expand All @@ -139,6 +140,10 @@ INSTANTIATE_TEST_CASE_P(

int main(int argc, char ** argv)
{
Aws::SDKOptions options;
Aws::InitAPI(options);
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
auto ret = RUN_ALL_TESTS();
Aws::ShutdownAPI(options);
return ret;
}
3 changes: 3 additions & 0 deletions aws_common/test/sdk_utils/logging/aws_log_system_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ class ClassUnderTest : public AWSLogSystem
class_under_test->log_error_count_ = 0;
class_under_test->log_fatal_count_ = 0;
}

void Flush() override {
}
};

TEST(TestAWSLogSystem, TestLogMethod)
Expand Down