Improve exception message for Region ID (#124)

aliyun · Apr 11, 2019 · 774aa9f · 774aa9f
1 parent 6562adf
commit 774aa9f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.2.0 - 2019-04-11
+- Improve exception message for `Region ID`.
+
+
 ## 1.1.1 - 2019-04-02
 - Added endpoints for `batchcomputenew`, `privatelink`.
 - Improve Region ID tips.

diff --git a/composer.json b/composer.json
@@ -73,11 +73,6 @@
         "classmap": [
         ]
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
-    },
     "config": {
         "sort-packages": true,
         "preferred-install": "dist",

diff --git a/src/AlibabaCloud.php b/src/AlibabaCloud.php
@@ -30,7 +30,7 @@ class AlibabaCloud
     /**
      * Version of the Client
      */
-    const VERSION = '1.1.1';
+    const VERSION = '1.2.0';
 
     /**
      * This static method can directly call the specific service.

diff --git a/src/Request/Traits/AcsTrait.php b/src/Request/Traits/AcsTrait.php
@@ -3,7 +3,6 @@
 namespace AlibabaCloud\Client\Request\Traits;
 
 use AlibabaCloud\Client\AlibabaCloud;
-use AlibabaCloud\Client\Config\Config;
 use AlibabaCloud\Client\Exception\ClientException;
 use AlibabaCloud\Client\Exception\ServerException;
 use AlibabaCloud\Client\Filter\ApiFilter;
@@ -141,17 +140,8 @@ public function resolveUri()
             }
 
             if (!$host) {
-                $product = Config::get("endpoints.{$this->product}");
-                unset($product['global'], $product[$regionId]);
-                if ($product) {
-                    $regions = implode(', ', array_keys($product));
-                    $message = "Product {$this->product} does not support [{$regionId}], but supports [$regions]";
-                } else {
-                    $message = "Can't resolve host for {$this->product} in $regionId";
-                }
-
                 throw new ClientException(
-                    $message . ', you still can specify host via the host() method.',
+                    "Did not find the {$this->product} host in {$regionId}, you can specify host by host() method.",
                     SDK::INVALID_REGION_ID
                 );
             }

diff --git a/tests/Unit/Request/AcsTraitTest.php b/tests/Unit/Request/AcsTraitTest.php
@@ -461,7 +461,7 @@ public function testFindDomainOnLocationService()
 
     /**
      * @expectedException \AlibabaCloud\Client\Exception\ClientException
-     * @expectedExceptionMessage Can't resolve host for no in cn-hangzhou, you still can specify host via the host() method.
+     * @expectedExceptionMessage Did not find the no host in cn-hangzhou, you can specify host by host() method.
      * @throws ClientException
      * @throws ServerException
      */
@@ -492,27 +492,6 @@ public function testFindDomainOnLocationServiceWithEmpty()
         self::assertEquals('ecs-cn-hangzhou.aliyuncs.com', $request->uri->getHost());
     }
 
-    /**
-     * @expectedException \AlibabaCloud\Client\Exception\ClientException
-     * @expectedExceptionMessage Product nlp does not support [cn-beijing], but supports [cn-shanghai], you still can specify host via the host() method.
-     * @throws ClientException
-     * @throws ServerException
-     */
-    public function testReturnSupportsRegions()
-    {
-        // Setup
-        AlibabaCloud::cancelMock();
-        AlibabaCloud::setDefaultRegionId('cn-beijing');
-        AlibabaCloud::accessKeyClient('ak', 'bar')->asDefaultClient();
-
-        // Test
-        $request = AlibabaCloud::roa();
-        $request->product('nlp');
-
-        // Assert
-        $request->resolveUri();
-    }
-
     protected function tearDown()
     {
         parent::tearDown();