Optimize global product support (#216)

aliyun · May 22, 2020 · 23e1ab1 · 23e1ab1
1 parent ae6d8f7
commit 23e1ab1
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 1.5.23 - 2020-05-22
+- Optimized global product support.
+
 ## 1.5.22 - 2020-05-12
 - Updated Endpoints.
 

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

diff --git a/src/Config/Data.php b/src/Config/Data.php
@@ -5,7 +5,6 @@
         [
             'dysmsapi'        =>
                 [
-                    'global'         => 'dysmsapi.aliyuncs.com',
                     'cn-hangzhou'    => 'dysmsapi.aliyuncs.com',
                     'ap-southeast-1' => 'dysmsapi.ap-southeast-1.aliyuncs.com',
                 ],

diff --git a/src/Request/Traits/AcsTrait.php b/src/Request/Traits/AcsTrait.php
@@ -250,6 +250,10 @@ public function realRegionId()
             return AlibabaCloud::getDefaultRegionId();
         }
 
+        if ($this->product && AlibabaCloud::isGlobalProduct($this->product)) {
+            return 'global';
+        }
+
         throw new ClientException("Missing required 'RegionId' for Request", SDK::INVALID_REGION_ID);
     }
 }
diff --git a/src/Traits/EndpointTrait.php b/src/Traits/EndpointTrait.php
@@ -53,6 +53,17 @@ public static function resolveHost($product, $regionId = LocationService::GLOBAL
         return $domain;
     }
 
+    /**
+     * @param $productCode
+     *
+     * @return bool
+     */
+    public static function isGlobalProduct($productCode)
+    {
+        $productCode = strtolower($productCode);
+        return (bool)Config::get("endpoints.{$productCode}.global");
+    }
+
     /**
      * @param string $product
      * @param string $regionId

diff --git a/tests/Feature/Product/RamTest.php b/tests/Feature/Product/RamTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace AlibabaCloud\Client\Tests\Feature\Product;
+
+use AlibabaCloud\Client\AlibabaCloud;
+use AlibabaCloud\Client\Exception\ClientException;
+use PHPUnit\Framework\TestCase;
+
+
+class RamTest extends TestCase
+{
+    /**
+     * @throws ClientException
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        AlibabaCloud::accessKeyClient(\getenv('ACCESS_KEY_ID'), \getenv('ACCESS_KEY_SECRET'))
+                    ->asDefaultClient();
+    }
+
+    /**
+     * @throws ClientException
+     * @throws \AlibabaCloud\Client\Exception\ServerException
+     */
+    public function testRamByCore()
+    {
+        $result = AlibabaCloud::rpc()
+                              ->product('ram')
+                              ->version('2015-05-01')
+                              ->method('POST')
+                              ->action('ListAccessKeys')
+                              ->scheme('https')
+                              ->connectTimeout(25)
+                              ->timeout(30)
+                              ->request();
+        self::assertTrue(isset($result['AccessKeys']));
+    }
+}
diff --git a/tests/Unit/Traits/EndpointTraitTest.php b/tests/Unit/Traits/EndpointTraitTest.php
@@ -185,10 +185,22 @@ public function testAddGlobalHost()
     public function testGlobal()
     {
         // Assert
-        self::assertEquals('dysmsapi.aliyuncs.com', AlibabaCloud::resolveHost('dysmsapi'));
+        self::assertEquals('', AlibabaCloud::resolveHost('dysmsapi'));
         self::assertEquals('dysmsapi.aliyuncs.com', AlibabaCloud::resolveHost('dysmsapi', 'cn-hangzhou'));
     }
 
+
+    public function testIsGlobalProduct()
+    {
+        self::assertTrue(AlibabaCloud::isGlobalProduct('ccc'));
+        self::assertFalse(AlibabaCloud::isGlobalProduct('no'));
+        self::assertTrue(AlibabaCloud::isGlobalProduct('Ram'));
+        self::assertTrue(AlibabaCloud::isGlobalProduct('ram'));
+        self::assertFalse(AlibabaCloud::isGlobalProduct('tdsr'));
+        self::assertFalse(AlibabaCloud::isGlobalProduct(''));
+        self::assertFalse(AlibabaCloud::isGlobalProduct(null));
+    }
+
     /**
      * Test for Null
      *