Update AWS SDK, fixed GCC 9 on ubuntu 20.04 (#70)

Co-authored-by: Jesse Ikawa <[email protected]>

Author: fran6co

aws_common/awssdk/CMakeLists.txt

@@ -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)

aws_common/src/sdk_utils/aws_profile_provider.cpp

@@ -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>(

aws_common/src/sdk_utils/client_configuration_provider.cpp

@@ -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

aws_common/test/sdk_utils/auth/service_credentials_provider_test.cpp

@@ -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
 {

aws_common/test/sdk_utils/client_configuration_provider_test.cpp

@@ -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>
 
@@ -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(
@@ -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;
 }

aws_common/test/sdk_utils/logging/aws_log_system_test.cpp

@@ -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)