Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 2 of 2.

1 files changed, 120 insertions, 120 deletions

diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp
index b4b4cae940..31e28b996f 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp
@@ -1,7 +1,7 @@
-/** 
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. 
- * SPDX-License-Identifier: Apache-2.0. 
- */ 
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
 
 
 #include <aws/core/auth/AWSCredentialsProvider.h>
@@ -14,9 +14,9 @@
 #include <aws/core/utils/StringUtils.h>
 #include <aws/core/utils/json/JsonSerializer.h>
 #include <aws/core/utils/FileSystemUtils.h>
-#include <aws/core/client/AWSError.h> 
-#include <aws/core/utils/StringUtils.h> 
-#include <aws/core/utils/xml/XmlSerializer.h> 
+#include <aws/core/client/AWSError.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
 #include <cstdlib>
 #include <fstream>
 #include <string.h>
@@ -28,8 +28,8 @@ using namespace Aws::Utils::Logging;
 using namespace Aws::Auth;
 using namespace Aws::Internal;
 using namespace Aws::FileSystem;
-using namespace Aws::Utils::Xml; 
-using namespace Aws::Client; 
+using namespace Aws::Utils::Xml;
+using namespace Aws::Client;
 using Aws::Utils::Threading::ReaderLockGuard;
 using Aws::Utils::Threading::WriterLockGuard;
 
@@ -41,11 +41,11 @@ static const char AWS_PROFILE_ENV_VAR[] = "AWS_PROFILE";
 static const char AWS_PROFILE_DEFAULT_ENV_VAR[] = "AWS_DEFAULT_PROFILE";
 
 static const char AWS_CREDENTIALS_FILE[] = "AWS_SHARED_CREDENTIALS_FILE";
-extern const char AWS_CONFIG_FILE[] = "AWS_CONFIG_FILE"; 
+extern const char AWS_CONFIG_FILE[] = "AWS_CONFIG_FILE";
 
-extern const char PROFILE_DIRECTORY[] = ".aws"; 
+extern const char PROFILE_DIRECTORY[] = ".aws";
 static const char DEFAULT_CREDENTIALS_FILE[] = "credentials";
-extern const char DEFAULT_CONFIG_FILE[] = "config"; 
+extern const char DEFAULT_CONFIG_FILE[] = "config";
 
 
 static const int EXPIRATION_GRACE_PERIOD = 5 * 1000;
@@ -71,7 +71,7 @@ static const char* ENVIRONMENT_LOG_TAG = "EnvironmentAWSCredentialsProvider";
 AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials()
 {
     auto accessKey = Aws::Environment::GetEnv(ACCESS_KEY_ENV_VAR);
-    AWSCredentials credentials; 
+    AWSCredentials credentials;
 
     if (!accessKey.empty())
     {
@@ -107,41 +107,41 @@ Aws::String Aws::Auth::GetConfigProfileFilename()
     }
     else
     {
-        return Aws::FileSystem::GetHomeDirectory() + PROFILE_DIRECTORY + PATH_DELIM + DEFAULT_CONFIG_FILE; 
+        return Aws::FileSystem::GetHomeDirectory() + PROFILE_DIRECTORY + PATH_DELIM + DEFAULT_CONFIG_FILE;
+    }
+}
+
+Aws::String Aws::Auth::GetConfigProfileName()
+{
+    auto profileFromVar = Aws::Environment::GetEnv(AWS_PROFILE_DEFAULT_ENV_VAR);
+    if (profileFromVar.empty())
+    {
+        profileFromVar = Aws::Environment::GetEnv(AWS_PROFILE_ENV_VAR);
+    }
+
+    if (profileFromVar.empty())
+    {
+        return Aws::String(DEFAULT_PROFILE);
+    }
+    else
+    {
+        return profileFromVar;
     }
 }
 
-Aws::String Aws::Auth::GetConfigProfileName() 
-{ 
-    auto profileFromVar = Aws::Environment::GetEnv(AWS_PROFILE_DEFAULT_ENV_VAR); 
-    if (profileFromVar.empty()) 
-    { 
-        profileFromVar = Aws::Environment::GetEnv(AWS_PROFILE_ENV_VAR); 
-    } 
- 
-    if (profileFromVar.empty()) 
-    { 
-        return Aws::String(DEFAULT_PROFILE); 
-    } 
-    else 
-    { 
-        return profileFromVar; 
-    } 
-} 
- 
 static const char* PROFILE_LOG_TAG = "ProfileConfigFileAWSCredentialsProvider";
 
 Aws::String ProfileConfigFileAWSCredentialsProvider::GetCredentialsProfileFilename()
 {
     auto credentialsFileNameFromVar = Aws::Environment::GetEnv(AWS_CREDENTIALS_FILE);
 
-    if (credentialsFileNameFromVar.empty()) 
+    if (credentialsFileNameFromVar.empty())
     {
-        return Aws::FileSystem::GetHomeDirectory() + PROFILE_DIRECTORY + PATH_DELIM + DEFAULT_CREDENTIALS_FILE; 
+        return Aws::FileSystem::GetHomeDirectory() + PROFILE_DIRECTORY + PATH_DELIM + DEFAULT_CREDENTIALS_FILE;
     }
     else
     {
-        return credentialsFileNameFromVar; 
+        return credentialsFileNameFromVar;
     }
 }
 
@@ -160,9 +160,9 @@ Aws::String ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory()
 }
 
 ProfileConfigFileAWSCredentialsProvider::ProfileConfigFileAWSCredentialsProvider(long refreshRateMs) :
-    m_profileToUse(Aws::Auth::GetConfigProfileName()), 
-    m_credentialsFileLoader(GetCredentialsProfileFilename()), 
-    m_loadFrequencyMs(refreshRateMs) 
+    m_profileToUse(Aws::Auth::GetConfigProfileName()),
+    m_credentialsFileLoader(GetCredentialsProfileFilename()),
+    m_loadFrequencyMs(refreshRateMs)
 {
     AWS_LOGSTREAM_INFO(PROFILE_LOG_TAG, "Setting provider to read credentials from " <<  GetCredentialsProfileFilename() << " for credentials file"
                                       << " and " <<  GetConfigProfileFilename() << " for the config file "
@@ -170,9 +170,9 @@ ProfileConfigFileAWSCredentialsProvider::ProfileConfigFileAWSCredentialsProvider
 }
 
 ProfileConfigFileAWSCredentialsProvider::ProfileConfigFileAWSCredentialsProvider(const char* profile, long refreshRateMs) :
-    m_profileToUse(profile), 
-    m_credentialsFileLoader(GetCredentialsProfileFilename()), 
-    m_loadFrequencyMs(refreshRateMs) 
+    m_profileToUse(profile),
+    m_credentialsFileLoader(GetCredentialsProfileFilename()),
+    m_loadFrequencyMs(refreshRateMs)
 {
     AWS_LOGSTREAM_INFO(PROFILE_LOG_TAG, "Setting provider to read credentials from " <<  GetCredentialsProfileFilename() << " for credentials file"
                                       << " and " <<  GetConfigProfileFilename() << " for the config file "
@@ -196,7 +196,7 @@ AWSCredentials ProfileConfigFileAWSCredentialsProvider::GetAWSCredentials()
 
 void ProfileConfigFileAWSCredentialsProvider::Reload()
 {
-    m_credentialsFileLoader.Load(); 
+    m_credentialsFileLoader.Load();
     AWSCredentialsProvider::Reload();
 }
 
@@ -220,16 +220,16 @@ void ProfileConfigFileAWSCredentialsProvider::RefreshIfExpired()
 static const char* INSTANCE_LOG_TAG = "InstanceProfileCredentialsProvider";
 
 InstanceProfileCredentialsProvider::InstanceProfileCredentialsProvider(long refreshRateMs) :
-    m_ec2MetadataConfigLoader(Aws::MakeShared<Aws::Config::EC2InstanceProfileConfigLoader>(INSTANCE_LOG_TAG)), 
-    m_loadFrequencyMs(refreshRateMs) 
+    m_ec2MetadataConfigLoader(Aws::MakeShared<Aws::Config::EC2InstanceProfileConfigLoader>(INSTANCE_LOG_TAG)),
+    m_loadFrequencyMs(refreshRateMs)
 {
     AWS_LOGSTREAM_INFO(INSTANCE_LOG_TAG, "Creating Instance with default EC2MetadataClient and refresh rate " << refreshRateMs);
 }
 
 
-InstanceProfileCredentialsProvider::InstanceProfileCredentialsProvider(const std::shared_ptr<Aws::Config::EC2InstanceProfileConfigLoader>& loader, long refreshRateMs) : 
-    m_ec2MetadataConfigLoader(loader), 
-    m_loadFrequencyMs(refreshRateMs) 
+InstanceProfileCredentialsProvider::InstanceProfileCredentialsProvider(const std::shared_ptr<Aws::Config::EC2InstanceProfileConfigLoader>& loader, long refreshRateMs) :
+    m_ec2MetadataConfigLoader(loader),
+    m_loadFrequencyMs(refreshRateMs)
 {
     AWS_LOGSTREAM_INFO(INSTANCE_LOG_TAG, "Creating Instance with injected EC2MetadataClient and refresh rate " << refreshRateMs);
 }
@@ -268,7 +268,7 @@ void InstanceProfileCredentialsProvider::RefreshIfExpired()
     guard.UpgradeToWriterLock();
     if (!IsTimeToRefresh(m_loadFrequencyMs)) // double-checked lock to avoid refreshing twice
     {
-        return; 
+        return;
     }
     Reload();
 }
@@ -277,14 +277,14 @@ static const char TASK_ROLE_LOG_TAG[] = "TaskRoleCredentialsProvider";
 
 TaskRoleCredentialsProvider::TaskRoleCredentialsProvider(const char* URI, long refreshRateMs) :
     m_ecsCredentialsClient(Aws::MakeShared<Aws::Internal::ECSCredentialsClient>(TASK_ROLE_LOG_TAG, URI)),
-    m_loadFrequencyMs(refreshRateMs) 
+    m_loadFrequencyMs(refreshRateMs)
 {
     AWS_LOGSTREAM_INFO(TASK_ROLE_LOG_TAG, "Creating TaskRole with default ECSCredentialsClient and refresh rate " << refreshRateMs);
 }
 
 TaskRoleCredentialsProvider::TaskRoleCredentialsProvider(const char* endpoint, const char* token, long refreshRateMs) :
-    m_ecsCredentialsClient(Aws::MakeShared<Aws::Internal::ECSCredentialsClient>(TASK_ROLE_LOG_TAG, ""/*resourcePath*/, endpoint, token)), 
-    m_loadFrequencyMs(refreshRateMs) 
+    m_ecsCredentialsClient(Aws::MakeShared<Aws::Internal::ECSCredentialsClient>(TASK_ROLE_LOG_TAG, ""/*resourcePath*/, endpoint, token)),
+    m_loadFrequencyMs(refreshRateMs)
 {
     AWS_LOGSTREAM_INFO(TASK_ROLE_LOG_TAG, "Creating TaskRole with default ECSCredentialsClient and refresh rate " << refreshRateMs);
 }
@@ -292,7 +292,7 @@ TaskRoleCredentialsProvider::TaskRoleCredentialsProvider(const char* endpoint, c
 TaskRoleCredentialsProvider::TaskRoleCredentialsProvider(
         const std::shared_ptr<Aws::Internal::ECSCredentialsClient>& client, long refreshRateMs) :
     m_ecsCredentialsClient(client),
-    m_loadFrequencyMs(refreshRateMs) 
+    m_loadFrequencyMs(refreshRateMs)
 {
     AWS_LOGSTREAM_INFO(TASK_ROLE_LOG_TAG, "Creating TaskRole with default ECSCredentialsClient and refresh rate " << refreshRateMs);
 }
@@ -306,7 +306,7 @@ AWSCredentials TaskRoleCredentialsProvider::GetAWSCredentials()
 
 bool TaskRoleCredentialsProvider::ExpiresSoon() const
 {
-    return ((m_credentials.GetExpiration() - Aws::Utils::DateTime::Now()).count() < EXPIRATION_GRACE_PERIOD); 
+    return ((m_credentials.GetExpiration() - Aws::Utils::DateTime::Now()).count() < EXPIRATION_GRACE_PERIOD);
 }
 
 void TaskRoleCredentialsProvider::Reload()
@@ -317,9 +317,9 @@ void TaskRoleCredentialsProvider::Reload()
     if (credentialsStr.empty()) return;
 
     Json::JsonValue credentialsDoc(credentialsStr);
-    if (!credentialsDoc.WasParseSuccessful()) 
+    if (!credentialsDoc.WasParseSuccessful())
     {
-        AWS_LOGSTREAM_ERROR(TASK_ROLE_LOG_TAG, "Failed to parse output from ECSCredentialService."); 
+        AWS_LOGSTREAM_ERROR(TASK_ROLE_LOG_TAG, "Failed to parse output from ECSCredentialService.");
         return;
     }
 
@@ -333,7 +333,7 @@ void TaskRoleCredentialsProvider::Reload()
     m_credentials.SetAWSAccessKeyId(accessKey);
     m_credentials.SetAWSSecretKey(secretKey);
     m_credentials.SetSessionToken(token);
-    m_credentials.SetExpiration(Aws::Utils::DateTime(credentialsView.GetString("Expiration"), DateFormat::ISO_8601)); 
+    m_credentials.SetExpiration(Aws::Utils::DateTime(credentialsView.GetString("Expiration"), DateFormat::ISO_8601));
     AWSCredentialsProvider::Reload();
 }
 
@@ -341,14 +341,14 @@ void TaskRoleCredentialsProvider::RefreshIfExpired()
 {
     AWS_LOGSTREAM_DEBUG(TASK_ROLE_LOG_TAG, "Checking if latest credential pull has expired.");
     ReaderLockGuard guard(m_reloadLock);
-    if (!m_credentials.IsEmpty() && !IsTimeToRefresh(m_loadFrequencyMs) && !ExpiresSoon()) 
+    if (!m_credentials.IsEmpty() && !IsTimeToRefresh(m_loadFrequencyMs) && !ExpiresSoon())
     {
         return;
     }
 
     guard.UpgradeToWriterLock();
 
-    if (!m_credentials.IsEmpty() && !IsTimeToRefresh(m_loadFrequencyMs) && !ExpiresSoon()) 
+    if (!m_credentials.IsEmpty() && !IsTimeToRefresh(m_loadFrequencyMs) && !ExpiresSoon())
     {
         return;
     }
@@ -358,13 +358,13 @@ void TaskRoleCredentialsProvider::RefreshIfExpired()
 
 static const char PROCESS_LOG_TAG[] = "ProcessCredentialsProvider";
 ProcessCredentialsProvider::ProcessCredentialsProvider() :
-    m_profileToUse(Aws::Auth::GetConfigProfileName()) 
+    m_profileToUse(Aws::Auth::GetConfigProfileName())
 {
     AWS_LOGSTREAM_INFO(PROCESS_LOG_TAG, "Setting process credentials provider to read config from " <<  m_profileToUse);
 }
 
 ProcessCredentialsProvider::ProcessCredentialsProvider(const Aws::String& profile) :
-    m_profileToUse(profile) 
+    m_profileToUse(profile)
 {
     AWS_LOGSTREAM_INFO(PROCESS_LOG_TAG, "Setting process credentials provider to read config from " <<  m_profileToUse);
 }
@@ -379,88 +379,88 @@ AWSCredentials ProcessCredentialsProvider::GetAWSCredentials()
 
 void ProcessCredentialsProvider::Reload()
 {
-    auto profile = Aws::Config::GetCachedConfigProfile(m_profileToUse); 
-    const Aws::String &command = profile.GetCredentialProcess(); 
-    if (command.empty()) 
+    auto profile = Aws::Config::GetCachedConfigProfile(m_profileToUse);
+    const Aws::String &command = profile.GetCredentialProcess();
+    if (command.empty())
     {
         AWS_LOGSTREAM_ERROR(PROCESS_LOG_TAG, "Failed to find credential process's profile: " << m_profileToUse);
         return;
     }
-    m_credentials = GetCredentialsFromProcess(command); 
-} 
- 
-void ProcessCredentialsProvider::RefreshIfExpired() 
-{ 
-    ReaderLockGuard guard(m_reloadLock); 
-    if (!m_credentials.IsExpiredOrEmpty()) 
-    { 
-       return; 
-    } 
- 
-    guard.UpgradeToWriterLock(); 
-    if (!m_credentials.IsExpiredOrEmpty()) // double-checked lock to avoid refreshing twice 
-    { 
-        return; 
-    } 
- 
-    Reload(); 
-} 
- 
-AWSCredentials Aws::Auth::GetCredentialsFromProcess(const Aws::String& process) 
-{ 
-    Aws::String command = process; 
+    m_credentials = GetCredentialsFromProcess(command);
+}
+
+void ProcessCredentialsProvider::RefreshIfExpired()
+{
+    ReaderLockGuard guard(m_reloadLock);
+    if (!m_credentials.IsExpiredOrEmpty())
+    {
+       return;
+    }
+
+    guard.UpgradeToWriterLock();
+    if (!m_credentials.IsExpiredOrEmpty()) // double-checked lock to avoid refreshing twice
+    {
+        return;
+    }
+
+    Reload();
+}
+
+AWSCredentials Aws::Auth::GetCredentialsFromProcess(const Aws::String& process)
+{
+    Aws::String command = process;
     command.append(" 2>&1"); // redirect stderr to stdout
     Aws::String result = Aws::Utils::StringUtils::Trim(Aws::OSVersionInfo::GetSysCommandOutput(command.c_str()).c_str());
     Json::JsonValue credentialsDoc(result);
-    if (!credentialsDoc.WasParseSuccessful()) 
+    if (!credentialsDoc.WasParseSuccessful())
     {
-        AWS_LOGSTREAM_ERROR(PROFILE_LOG_TAG, "Failed to load credential from running: " << command << " Error: " << result); 
-        return {}; 
+        AWS_LOGSTREAM_ERROR(PROFILE_LOG_TAG, "Failed to load credential from running: " << command << " Error: " << result);
+        return {};
     }
 
     Aws::Utils::Json::JsonView credentialsView(credentialsDoc);
     if (!credentialsView.KeyExists("Version") || credentialsView.GetInteger("Version") != 1)
     {
-        AWS_LOGSTREAM_ERROR(PROFILE_LOG_TAG, "Encountered an unsupported process credentials payload version:" << credentialsView.GetInteger("Version")); 
-        return {}; 
+        AWS_LOGSTREAM_ERROR(PROFILE_LOG_TAG, "Encountered an unsupported process credentials payload version:" << credentialsView.GetInteger("Version"));
+        return {};
     }
 
-    AWSCredentials credentials; 
+    AWSCredentials credentials;
     Aws::String accessKey, secretKey, token, expire;
-    if (credentialsView.KeyExists("AccessKeyId")) 
-    { 
-        credentials.SetAWSAccessKeyId(credentialsView.GetString("AccessKeyId")); 
-    } 
+    if (credentialsView.KeyExists("AccessKeyId"))
+    {
+        credentials.SetAWSAccessKeyId(credentialsView.GetString("AccessKeyId"));
+    }
 
-    if (credentialsView.KeyExists("SecretAccessKey")) 
-    { 
-        credentials.SetAWSSecretKey(credentialsView.GetString("SecretAccessKey")); 
-    } 
+    if (credentialsView.KeyExists("SecretAccessKey"))
+    {
+        credentials.SetAWSSecretKey(credentialsView.GetString("SecretAccessKey"));
+    }
 
-    if (credentialsView.KeyExists("SessionToken")) 
+    if (credentialsView.KeyExists("SessionToken"))
     {
-        credentials.SetSessionToken(credentialsView.GetString("SessionToken")); 
+        credentials.SetSessionToken(credentialsView.GetString("SessionToken"));
     }
 
-    if (credentialsView.KeyExists("Expiration")) 
+    if (credentialsView.KeyExists("Expiration"))
     {
-        const auto expiration = Aws::Utils::DateTime(credentialsView.GetString("Expiration"), DateFormat::ISO_8601); 
-        if (expiration.WasParseSuccessful()) 
-        { 
-            credentials.SetExpiration(expiration); 
-        } 
-        else 
-        { 
-            AWS_LOGSTREAM_ERROR(PROFILE_LOG_TAG, "Failed to parse credential's expiration value as an ISO 8601 Date. Credentials will be marked expired."); 
-            credentials.SetExpiration(Aws::Utils::DateTime::Now()); 
-        } 
+        const auto expiration = Aws::Utils::DateTime(credentialsView.GetString("Expiration"), DateFormat::ISO_8601);
+        if (expiration.WasParseSuccessful())
+        {
+            credentials.SetExpiration(expiration);
+        }
+        else
+        {
+            AWS_LOGSTREAM_ERROR(PROFILE_LOG_TAG, "Failed to parse credential's expiration value as an ISO 8601 Date. Credentials will be marked expired.");
+            credentials.SetExpiration(Aws::Utils::DateTime::Now());
+        }
+    }
+    else
+    {
+        credentials.SetExpiration((std::chrono::time_point<std::chrono::system_clock>::max)());
     }
-    else 
-    { 
-        credentials.SetExpiration((std::chrono::time_point<std::chrono::system_clock>::max)()); 
-    } 
 
-    AWS_LOGSTREAM_DEBUG(PROFILE_LOG_TAG, "Successfully pulled credentials from process credential with AccessKey: " << accessKey << ", Expiration:" << credentialsView.GetString("Expiration")); 
-    return credentials; 
+    AWS_LOGSTREAM_DEBUG(PROFILE_LOG_TAG, "Successfully pulled credentials from process credential with AccessKey: " << accessKey << ", Expiration:" << credentialsView.GetString("Expiration"));
+    return credentials;
 }
- 
+