Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.

Commit 054ef10

Browse files
fran6coFrancisco Facioni
authored andcommitted
Update AWS SDK, fixed GCC 9 on ubuntu 20.04
1 parent b7aab87 commit 054ef10

File tree

6 files changed

+16
-20
lines changed

6 files changed

+16
-20
lines changed

aws_common/awssdk/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.0.2)
22
project(AWSSDK)
3-
set(AWSSDK_VERSION 1.6.53)
4-
set(AWSSDK_MD5 8c04cd7a0670bc4a0cdcbb2f416efa7a)
3+
set(AWSSDK_VERSION 1.8.85)
4+
set(AWSSDK_MD5 889124168bfa13bf0c70c09c36c7ff36)
55

66
if(NOT EXTERNAL_INSTALL_LOCATION)
77
set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external)

aws_common/src/sdk_utils/aws_profile_provider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ AWSProfileProvider::AWSProfileProvider()
2828
{
2929
config_file_loader_ =
3030
std::shared_ptr<AWSProfileConfigLoader>(Aws::MakeShared<AWSConfigFileProfileConfigLoader>(
31-
kProfileLogTag, GetConfigProfileFilename(), true));
31+
kProfileLogTag, Aws::Auth::GetConfigProfileFilename(), true));
3232
config_file_loader_->Load();
3333
credentials_file_loader_ =
3434
std::shared_ptr<AWSProfileConfigLoader>(Aws::MakeShared<AWSConfigFileProfileConfigLoader>(

aws_common/src/sdk_utils/client_configuration_provider.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ ClientConfiguration ClientConfigurationProvider::GetClientConfiguration(
141141
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "use_dual_stack"), config.useDualStack);
142142
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "enable_clock_skew_adjustment"),
143143
config.enableClockSkewAdjustment);
144-
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "follow_redirects"), config.followRedirects);
144+
bool followRedirects;
145+
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "follow_redirects"), followRedirects);
146+
config.followRedirects = followRedirects ? Aws::Client::FollowRedirectsPolicy::ALWAYS : Aws::Client::FollowRedirectsPolicy::NEVER;
145147
reader_->ReadParam(ParameterPath(CLIENT_CONFIG_PREFIX, "verify_SSL"), config.verifySSL);
146148

147149
// check for non-default strategy

aws_common/test/sdk_utils/auth/service_credentials_provider_test.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,6 @@ using ::testing::SetArgReferee;
3131
using ::testing::Return;
3232
using Aws::AwsError;
3333

34-
namespace Aws {
35-
namespace Auth {
36-
37-
bool operator==(const AWSCredentials & left, const AWSCredentials & right)
38-
{
39-
return (
40-
(left.GetAWSAccessKeyId() == right.GetAWSAccessKeyId())
41-
&& (left.GetAWSSecretKey() == right.GetAWSSecretKey())
42-
&& (left.GetSessionToken() == right.GetSessionToken())
43-
);
44-
}
45-
46-
} // namespace Auth
47-
} // namespace Aws
4834

4935
class ServiceCredentialsProviderFixture : public ::testing::Test
5036
{

aws_common/test/sdk_utils/client_configuration_provider_test.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515

1616
#include <gtest/gtest.h>
17+
#include <aws/core/Aws.h>
1718
#include <aws_common/sdk_utils/parameter_reader_mock.h>
1819
#include <aws_common/sdk_utils/client_configuration_provider.h>
1920

@@ -128,7 +129,7 @@ client_conf_mutator g_client_conf_mutators[] =
128129
[](ClientConfiguration & config)->void { config.proxyPort = config.proxyPort + 2; },
129130
[](ClientConfiguration & config)->void { config.useDualStack = ! config.useDualStack; },
130131
[](ClientConfiguration & config)->void { config.enableClockSkewAdjustment = ! config.enableClockSkewAdjustment; },
131-
[](ClientConfiguration & config)->void { config.followRedirects = !config.followRedirects; },
132+
[](ClientConfiguration & config)->void { config.followRedirects = (config.followRedirects == FollowRedirectsPolicy::NEVER ? FollowRedirectsPolicy::ALWAYS : FollowRedirectsPolicy::NEVER); },
132133
[](ClientConfiguration & config)->void { config.verifySSL = !config.verifySSL; }
133134
};
134135
INSTANTIATE_TEST_CASE_P(
@@ -139,6 +140,10 @@ INSTANTIATE_TEST_CASE_P(
139140

140141
int main(int argc, char ** argv)
141142
{
143+
Aws::SDKOptions options;
144+
Aws::InitAPI(options);
142145
testing::InitGoogleTest(&argc, argv);
143-
return RUN_ALL_TESTS();
146+
auto ret = RUN_ALL_TESTS();
147+
Aws::ShutdownAPI(options);
148+
return ret;
144149
}

aws_common/test/sdk_utils/logging/aws_log_system_test.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ class ClassUnderTest : public AWSLogSystem
148148
class_under_test->log_error_count_ = 0;
149149
class_under_test->log_fatal_count_ = 0;
150150
}
151+
152+
void Flush() override {
153+
}
151154
};
152155

153156
TEST(TestAWSLogSystem, TestLogMethod)

0 commit comments

Comments
 (0)