Allow user providing non offical AWS region with custom endpoint (#706)

* Allow user provising non offical AWS region with custom endpoint

* Add changelog entry

Author: jderusse

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## NOT RELEASED
 
+### Fixed
+
+- Allows non-AWS regions when using custom endpoints
+
 ## 1.2.0
 
 ### Added

src/AbstractApi.php

@@ -193,11 +193,11 @@ protected function getEndpoint(string $uri, array $query, ?string $region): stri
     {
         /** @var string $region */
         $region = $region ?? $this->configuration->isDefault('region') ? null : $this->configuration->get('region');
-        $metadata = $this->getEndpointMetadata($region);
         if (!$this->configuration->isDefault('endpoint')) {
             /** @var string $endpoint */
             $endpoint = $this->configuration->get('endpoint');
         } else {
+            $metadata = $this->getEndpointMetadata($region);
             $endpoint = $metadata['endpoint'];
         }
 

tests/Integration/StsClientTest.php

@@ -3,6 +3,7 @@
 namespace AsyncAws\Core\Tests\Integration;
 
 use AsyncAws\Core\Credentials\NullProvider;
+use AsyncAws\Core\Exception\UnsupportedRegion;
 use AsyncAws\Core\Sts\Input\AssumeRoleRequest;
 use AsyncAws\Core\Sts\Input\AssumeRoleWithWebIdentityRequest;
 use AsyncAws\Core\Sts\Input\GetCallerIdentityRequest;
@@ -86,6 +87,25 @@ public function testGetCallerIdentity(): void
         self::assertStringContainsString('change it', $result->getArn());
     }
 
+    public function testNonAwsRegionWithCustomEndpoint(): void
+    {
+        $client = new StsClient([
+            'endpoint' => 'http://localhost',
+            'region' => 'test',
+        ], new NullProvider());
+        self::assertNotEmpty($client->presign(new AssumeRoleRequest(['RoleArn' => 'demo', 'RoleSessionName' => 'demo'])));
+    }
+
+    public function testNonAwsRegion(): void
+    {
+        $client = new StsClient([
+            'region' => 'test',
+        ], new NullProvider());
+
+        $this->expectException(UnsupportedRegion::class);
+        $client->presign(new AssumeRoleRequest(['RoleArn' => 'demo', 'RoleSessionName' => 'demo']));
+    }
+
     private function getClient(): StsClient
     {
         self::markTestSkipped('No Docker image for STS');