feat: support inner credentials client for RAM role arn

Author: yndu13

src/Clients/Client.php

@@ -32,7 +32,7 @@ class Client
     /**
      * @var CredentialsInterface|AccessKeyCredential|BearerTokenCredential|StsCredential|EcsRamRoleCredential|RamRoleArnCredential|RsaKeyPairCredential
      */
-    private $credential;
+    protected $credential;
 
     /**
      * @var SignatureInterface

src/Clients/RamRoleArnClient.php

@@ -30,4 +30,17 @@ public function __construct($accessKeyId, $accessKeySecret, $roleArn, $roleSessi
             new ShaHmac1Signature()
         );
     }
+
+    /**
+     * @param string $clientName
+     *
+     * @return $this
+     * @throws ClientException
+     */
+    public function withCredentialClient($clientName)
+    {
+        $this->credential = $this->credential->withClient($clientName);
+
+        return $this;
+    }
 }

src/Credentials/Providers/RamRoleArnProvider.php

@@ -10,6 +10,7 @@
 use AlibabaCloud\Client\Exception\ClientException;
 use AlibabaCloud\Client\Exception\ServerException;
 use AlibabaCloud\Client\Credentials\Requests\AssumeRole;
+use AlibabaCloud\Client\Filter\CredentialFilter;
 
 /**
  * Class RamRoleArnProvider
@@ -68,11 +69,15 @@ private function request($timeout, $connectTimeout)
     {
         $clientName = __CLASS__ . \uniqid('ak', true);
         $credential = $this->client->getCredential();
-
-        AlibabaCloud::accessKeyClient(
-            $credential->getAccessKeyId(),
-            $credential->getAccessKeySecret()
-        )->name($clientName);
+        if (!is_null($credential->getClient())) {
+            $clientName = $credential->getClient();
+        } else {
+            CredentialFilter::AccessKey($credential->getAccessKeyId(), $credential->getAccessKeySecret());
+            AlibabaCloud::accessKeyClient(
+                $credential->getAccessKeyId(),
+                $credential->getAccessKeySecret()
+            )->name($clientName);
+        }
 
         return (new AssumeRole($credential))
             ->client($clientName)

src/Credentials/RamRoleArnCredential.php

@@ -2,7 +2,6 @@
 
 namespace AlibabaCloud\Client\Credentials;
 
-use AlibabaCloud\Client\Filter\CredentialFilter;
 use AlibabaCloud\Client\Exception\ClientException;
 
 /**
@@ -13,6 +12,11 @@
 class RamRoleArnCredential implements CredentialsInterface
 {
 
+    /**
+     * @var string
+     */
+    private $client;
+
     /**
      * @var string
      */
@@ -51,15 +55,26 @@ class RamRoleArnCredential implements CredentialsInterface
      */
     public function __construct($accessKeyId, $accessKeySecret, $roleArn, $roleSessionName, $policy = '')
     {
-        CredentialFilter::AccessKey($accessKeyId, $accessKeySecret);
-
         $this->accessKeyId     = $accessKeyId;
         $this->accessKeySecret = $accessKeySecret;
         $this->roleArn         = $roleArn;
         $this->roleSessionName = $roleSessionName;
         $this->policy          = $policy;
     }
 
+    /**
+     * @param string $clientName
+     *
+     * @return $this
+     * @throws ClientException
+     */
+    public function withClient($clientName)
+    {
+        $this->client = $clientName;
+
+        return $this;
+    }
+
     /**
      * @return string
      */
@@ -76,6 +91,14 @@ public function getAccessKeySecret()
         return $this->accessKeySecret;
     }
 
+    /**
+     * @return string
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
     /**
      * @return string
      */
@@ -105,6 +128,6 @@ public function getPolicy()
      */
     public function __toString()
     {
-        return "$this->accessKeyId#$this->accessKeySecret#$this->roleArn#$this->roleSessionName";
+        return "$this->accessKeyId#$this->accessKeySecret#$this->client#$this->roleArn#$this->roleSessionName";
     }
 }

tests/Unit/Credentials/Providers/ProviderTest.php

@@ -78,7 +78,7 @@ public function key()
             ],
             [
                 new RamRoleArnClient('foo', 'bar', 'arn', 'name'),
-                'foo#bar#arn#name',
+                'foo#bar##arn#name',
             ],
             [
                 new RsaKeyPairClient('foo', VirtualRsaKeyPairCredential::ok()),

tests/Unit/Credentials/RamRoleArnCredentialTest.php

@@ -38,7 +38,7 @@ public function testConstruct()
         $this->assertEquals($sessionName, $credential->getRoleSessionName());
         $this->assertEquals($policy, $credential->getPolicy());
         $this->assertEquals(
-            "$accessKeyId#$accessKeySecret#$arn#$sessionName",
+            "$accessKeyId#$accessKeySecret##$arn#$sessionName",
             (string)$credential
         );
     }