Revert "bugfix: sts credential provider endpoint mode (#3198)" (#3199)

This reverts commit 67a00ab.

Author: yenfryherrerafeliz

.changes/nextrelease/sts-providers.json

@@ -36,7 +36,6 @@ class AssumeRoleWithWebIdentityCredentialProvider
 
     /** @var integer */
     private $tokenFileReadAttempts;
-
     /** @var string */
     private $source;
 
@@ -73,17 +72,14 @@ public function __construct(array $config = [])
         $this->tokenFileReadAttempts = 0;
         $this->session = $config['SessionName']
             ?? 'aws-sdk-php-' . round(microtime(true) * 1000);
-        $region = $config['region'] ?? null;
+        $region = $config['region'] ?? 'us-east-1';
         if (isset($config['client'])) {
             $this->client = $config['client'];
         } else {
             $this->client = new StsClient([
                 'credentials' => false,
-                'region' => $region ?? 'us-east-1',
-                'version' => 'latest',
-                'sts_regional_endpoints' => $region
-                    ? 'regional'
-                    : 'legacy'
+                'region' => $region,
+                'version' => 'latest'
             ]);
         }
 

src/Credentials/AssumeRoleWithWebIdentityCredentialProvider.php

@@ -708,7 +708,9 @@ private static function loadRoleProfile(
         }
 
         if (empty($stsClient)) {
-            $sourceRegion = $profiles[$sourceProfileName]['region'] ?? null;
+            $sourceRegion = isset($profiles[$sourceProfileName]['region'])
+                ? $profiles[$sourceProfileName]['region']
+                : 'us-east-1';
             $config['preferStaticCredentials'] = true;
             $sourceCredentials = null;
             if (!empty($roleProfile['source_profile'])){
@@ -723,11 +725,8 @@ private static function loadRoleProfile(
             }
             $stsClient = new StsClient([
                 'credentials' => $sourceCredentials,
-                'region' => $sourceRegion ?? 'us-east-1',
+                'region' => $sourceRegion,
                 'version' => '2011-06-15',
-                'sts_regional_endpoints' => $sourceRegion
-                    ? 'regional'
-                    : 'legacy'
             ]);
         }
 

src/Credentials/CredentialProvider.php

@@ -6,7 +6,6 @@
 use Aws\Credentials\AssumeRoleWithWebIdentityCredentialProvider;
 use Aws\Credentials\Credentials;
 use Aws\Exception\AwsException;
-use Aws\Middleware;
 use Aws\Result;
 use Aws\Sts\StsClient;
 use Aws\Sts\Exception\StsException;
@@ -397,85 +396,4 @@ public function testCanDisableInvalidIdentityTokenRetries()
             unlink($tokenPath);
         }
     }
-
-    /**
-     * @dataProvider endpointConfigurationProvider
-     */
-    public function testEndpointConfigurationBasedOnRegion(
-        ?string $region,
-        string $expectedEndpoint,
-        string $description
-    ): void
-    {
-        $tokenFile = tempnam(sys_get_temp_dir(), 'token');
-        file_put_contents($tokenFile, 'test-token-content');
-
-        $config = [
-            'RoleArn' => self::SAMPLE_ROLE_ARN,
-            'WebIdentityTokenFile' => $tokenFile,
-        ];
-
-        if ($region !== null) {
-            $config['region'] = $region;
-        }
-
-
-        $provider = new AssumeRoleWithWebIdentityCredentialProvider($config);
-        $reflection = new \ReflectionClass($provider);
-        $clientProperty = $reflection->getProperty('client');
-        $stsClient = $clientProperty->getValue($provider);
-
-        $capturedEndpoint = null;
-        $stsClient->getHandlerList()->appendBuild(
-            Middleware::tap(
-                function ($cmd, $req) use (&$capturedEndpoint) {
-                    $capturedEndpoint = (string) $req->getUri();
-                }
-            )
-        );
-
-        $stsClient->getHandlerList()->setHandler(
-            function ($c, $r) {
-                $result = [
-                    'Credentials' => [
-                        'AccessKeyId'     => 'foo',
-                        'SecretAccessKey' => 'bar',
-                        'SessionToken'    => 'baz',
-                        'Expiration'      => DateTimeResult::fromEpoch(time() + 10)
-                    ],
-                    'AssumedRoleUser' => [
-                        'AssumedRoleId' => 'ARXXXXXXXXXXXXXXXXXXX:test_session',
-                        'Arn' => self::SAMPLE_ROLE_ARN . "/test_session"
-                    ]
-                ];
-                return Promise\Create::promiseFor(new Result($result));
-            }
-        );
-
-        $provider()->wait();
-
-        $this->assertEquals(
-            $expectedEndpoint,
-            $capturedEndpoint,
-            "Failed asserting endpoint for: {$description}"
-        );
-
-        unlink($tokenFile);
-    }
-
-    public function endpointConfigurationProvider(): array
-    {
-        return [
-            'explicit us-east-1 uses regional endpoint' => [
-                'region' => 'us-east-1',
-                'expectedEndpoint' => 'https://sts.us-east-1.amazonaws.com/',
-                'description' => 'explicit us-east-1'
-            ],
-            'no region defaults to us-east-1 with global endpoint' => [
-                'region' => null,
-                'expectedEndpoint' => 'https://sts.amazonaws.com/',
-                'description' => 'default region'
-            ]
-        ];
-    }
 }