feat: support sts vpc endpoint

Author: yndu13

src/Credential/RefreshResult.php

@@ -4,8 +4,6 @@
 
 use AlibabaCloud\Credentials\Providers\Credentials;
 
-use function PHPUnit\Framework\isNull;
-
 class RefreshResult
 {
 

src/Providers/OIDCRoleArnCredentialsProvider.php

@@ -167,12 +167,16 @@ private function filterPolicy(array $params)
 
     private function filterSTSEndpoint(array $params)
     {
+        $prefix = 'sts';
+        if (Helper::envNotEmpty('ALIBABA_CLOUD_VPC_ENDPOINT_ENABLED') || (isset($params['enableVpc']) && $params['enableVpc'] === true)) {
+            $prefix = 'sts-vpc';
+        }
         if (Helper::envNotEmpty('ALIBABA_CLOUD_STS_REGION')) {
-            $this->stsEndpoint = 'sts' . Helper::env('ALIBABA_CLOUD_STS_REGION') . '.aliyuncs.com';
+            $this->stsEndpoint = $prefix . '.' . Helper::env('ALIBABA_CLOUD_STS_REGION') . '.aliyuncs.com';
         }
 
         if (isset($params['stsRegionId'])) {
-            $this->stsEndpoint = 'sts' . $params['stsRegionId'] . '.aliyuncs.com';
+            $this->stsEndpoint = $prefix . '.' . $params['stsRegionId'] . '.aliyuncs.com';
         }
 
         if (isset($params['stsEndpoint'])) {
@@ -249,7 +253,7 @@ public function refreshCredentials()
             'securityToken' => $credentials['SecurityToken'],
             'expiration' => \strtotime($credentials['Expiration']),
             'providerName' => $this->getProviderName(),
-        ]), $this->getStaleTime(strtotime($credentials['Expiration'])) );
+        ]), $this->getStaleTime(strtotime($credentials['Expiration'])));
     }
 
     public function key()

src/Providers/RamRoleArnCredentialsProvider.php

@@ -149,12 +149,16 @@ private function filterExternalId(array $params)
 
     private function filterSTSEndpoint(array $params)
     {
+        $prefix = 'sts';
+        if (Helper::envNotEmpty('ALIBABA_CLOUD_VPC_ENDPOINT_ENABLED') || (isset($params['enableVpc']) && $params['enableVpc'] === true)) {
+            $prefix = 'sts-vpc';
+        }
         if (Helper::envNotEmpty('ALIBABA_CLOUD_STS_REGION')) {
-            $this->stsEndpoint = 'sts.' . Helper::env('ALIBABA_CLOUD_STS_REGION') . '.aliyuncs.com';
+            $this->stsEndpoint = $prefix . '.' . Helper::env('ALIBABA_CLOUD_STS_REGION') . '.aliyuncs.com';
         }
 
         if (isset($params['stsRegionId'])) {
-            $this->stsEndpoint = 'sts.' . $params['stsRegionId'] . '.aliyuncs.com';
+            $this->stsEndpoint = $prefix . '.' . $params['stsRegionId'] . '.aliyuncs.com';
         }
 
         if (isset($params['stsEndpoint'])) {

tests/Unit/Providers/OIDCRoleArnCredentialsProviderTest.php

@@ -46,6 +46,7 @@ public function testConstruct()
             'durationSeconds' => 3600,
             'policy' => 'policy',
             'stsRegionId' => 'cn-beijing',
+            'enableVpc' => true,
             'stsEndpoint' => 'sts.cn-zhangjiakou.aliyuncs.com'
         ];
         $config = [
@@ -57,6 +58,7 @@ public function testConstruct()
         putenv("ALIBABA_CLOUD_OIDC_TOKEN_FILE=/b/c");
         putenv("ALIBABA_CLOUD_ROLE_SESSION_NAME=sessionName");
         putenv("ALIBABA_CLOUD_STS_REGION=cn-hangzhou");
+        putenv("ALIBABA_CLOUD_VPC_ENDPOINT_ENABLED=true");
 
         $provider = new OIDCRoleArnCredentialsProvider($params, $config);
         self::assertEquals('oidc_role_arn', $provider->getProviderName());
@@ -77,7 +79,7 @@ public function testConstruct()
         $policy = $this->getPrivateField($provider, 'policy');
         $oidcTokenFilePath = $this->getPrivateField($provider, 'oidcTokenFilePath');
         $durationSeconds = $this->getPrivateField($provider, 'durationSeconds');
-        self::assertEquals('stscn-hangzhou.aliyuncs.com', $stsEndpoint);
+        self::assertEquals('sts-vpc.cn-hangzhou.aliyuncs.com', $stsEndpoint);
         self::assertNull($policy);
         self::assertEquals('/b/c', $oidcTokenFilePath);
         self::assertEquals(3600, $durationSeconds);
@@ -87,6 +89,7 @@ public function testConstruct()
         putenv("ALIBABA_CLOUD_OIDC_TOKEN_FILE=");
         putenv("ALIBABA_CLOUD_ROLE_SESSION_NAME=");
         putenv("ALIBABA_CLOUD_STS_REGION=");
+        putenv("ALIBABA_CLOUD_VPC_ENDPOINT_ENABLED=");
     }
 
     public function testConstructErrorRoleArn()

tests/Unit/Providers/RamRoleArnCredentialsProviderTest.php

@@ -47,6 +47,7 @@ public function testConstruct()
             'policy' => 'policy',
             'externalId' => 'externalId',
             'stsRegionId' => 'cn-beijing',
+            'enableVpc' => true,
             'stsEndpoint' => 'sts.cn-zhangjiakou.aliyuncs.com'
         ];
         $config = [
@@ -56,6 +57,7 @@ public function testConstruct()
         putenv("ALIBABA_CLOUD_ROLE_ARN=roleArn");
         putenv("ALIBABA_CLOUD_ROLE_SESSION_NAME=sessionName");
         putenv("ALIBABA_CLOUD_STS_REGION=cn-hangzhou");
+        putenv("ALIBABA_CLOUD_VPC_ENDPOINT_ENABLED=true");
 
         $provider = new RamRoleArnCredentialsProvider($params, $config);
 
@@ -86,12 +88,13 @@ public function testConstruct()
         self::assertEquals('ram_role_arn#credential#foo#roleArn#roleArn#roleSessionName#sessionName', $provider->key());
         $stsEndpoint = $this->getPrivateField($provider, 'stsEndpoint');
         $externalId = $this->getPrivateField($provider, 'externalId');
-        self::assertEquals('sts.cn-hangzhou.aliyuncs.com', $stsEndpoint);
+        self::assertEquals('sts-vpc.cn-hangzhou.aliyuncs.com', $stsEndpoint);
         self::assertNull($externalId);
 
         putenv("ALIBABA_CLOUD_ROLE_ARN=");
         putenv("ALIBABA_CLOUD_ROLE_SESSION_NAME=");
         putenv("ALIBABA_CLOUD_STS_REGION=");
+        putenv("ALIBABA_CLOUD_VPC_ENDPOINT_ENABLED=");
     }
 
     public function testConstructErrorCredentials()