Move timeout to ContainerProvider::__construct() (#571)

* Move timeout to ContainerProvider::__construct()

This will fix #546

* Dont use hard coded timeout

Author: Nyholm

src/Configuration.php

@@ -26,7 +26,6 @@ final class Configuration
     public const OPTION_WEB_IDENTITY_TOKEN_FILE = 'webIdentityTokenFile';
     public const OPTION_ROLE_SESSION_NAME = 'roleSessionName';
     public const OPTION_CONTAINER_CREDENTIALS_RELATIVE_URI = 'containerCredentialsRelativeUri';
-    public const OPTION_METADATA_SERVICE_TIMEOUT = 'metadataServiceTimeout';
 
     private const AVAILABLE_OPTIONS = [
         self::OPTION_REGION => true,
@@ -40,7 +39,6 @@ final class Configuration
         self::OPTION_ROLE_ARN => true,
         self::OPTION_WEB_IDENTITY_TOKEN_FILE => true,
         self::OPTION_ROLE_SESSION_NAME => true,
-        self::OPTION_METADATA_SERVICE_TIMEOUT => true,
         self::OPTION_CONTAINER_CREDENTIALS_RELATIVE_URI => true,
     ];
 
@@ -61,7 +59,6 @@ final class Configuration
             self::OPTION_ROLE_SESSION_NAME => 'AWS_ROLE_SESSION_NAME',
         ],
         [self::OPTION_CONTAINER_CREDENTIALS_RELATIVE_URI => 'AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'],
-        [self::OPTION_METADATA_SERVICE_TIMEOUT => 'AWS_METADATA_SERVICE_TIMEOUT'],
     ];
 
     private const DEFAULT_OPTIONS = [
@@ -71,7 +68,6 @@ final class Configuration
         self::OPTION_SHARED_CONFIG_FILE => '~/.aws/config',
         // https://docs.aws.amazon.com/general/latest/gr/rande.html
         self::OPTION_ENDPOINT => 'https://%service%.%region%.amazonaws.com',
-        self::OPTION_METADATA_SERVICE_TIMEOUT => 1.0,
     ];
 
     private $data = [];

src/Credentials/ContainerProvider.php

@@ -26,23 +26,26 @@ final class ContainerProvider implements CredentialProvider
 
     private $httpClient;
 
-    public function __construct(?HttpClientInterface $httpClient = null, ?LoggerInterface $logger = null)
+    private $timeout;
+
+    public function __construct(?HttpClientInterface $httpClient = null, ?LoggerInterface $logger = null, float $timeout = 1.0)
     {
         $this->logger = $logger ?? new NullLogger();
         $this->httpClient = $httpClient ?? HttpClient::create();
+        $this->timeout = $timeout;
     }
 
     public function getCredentials(Configuration $configuration): ?Credentials
     {
-        $timeout = $configuration->get(Configuration::OPTION_METADATA_SERVICE_TIMEOUT);
         $relativeUri = $configuration->get(Configuration::OPTION_CONTAINER_CREDENTIALS_RELATIVE_URI);
         // introduces an early exit if the env variable is not set.
         if (empty($relativeUri)) {
             return null;
         }
+
         // fetch credentials from ecs endpoint
         try {
-            $response = $this->httpClient->request('GET', self::ENDPOINT . $relativeUri, ['timeout' => $timeout]);
+            $response = $this->httpClient->request('GET', self::ENDPOINT . $relativeUri, ['timeout' => $this->timeout]);
             $result = $response->toArray();
         } catch (DecodingExceptionInterface $e) {
             $this->logger->info('Failed to decode Credentials.', ['exception' => $e]);

src/Credentials/InstanceProvider.php

@@ -42,7 +42,7 @@ public function __construct(?HttpClientInterface $httpClient = null, ?LoggerInte
 
     public function getCredentials(Configuration $configuration): ?Credentials
     {
-        // fetch current Profile
+        // Fetch current Profile
         try {
             $response = $this->httpClient->request('GET', self::ENDPOINT, ['timeout' => $this->timeout]);
             $profile = $response->getContent();
@@ -56,9 +56,9 @@ public function getCredentials(Configuration $configuration): ?Credentials
             return null;
         }
 
-        // fetch credentials from profile
+        // Fetch credentials from profile
         try {
-            $response = $this->httpClient->request('GET', self::ENDPOINT . '/' . $profile, ['timeout' => 1.0]);
+            $response = $this->httpClient->request('GET', self::ENDPOINT . '/' . $profile, ['timeout' => $this->timeout]);
             $result = $this->toArray($response);
 
             if ('Success' !== $result['Code']) {