rename AuthUtils.getPrivateKey() to AuthUtils.readFile()

Author: JacksonTian

aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/OIDCCredentialsProvider.java

@@ -17,6 +17,7 @@
 import com.aliyuncs.http.HttpResponse;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.http.clients.CompatibleUrlConnClient;
+import com.aliyuncs.utils.AuthUtils;
 import com.aliyuncs.utils.ParameterHelper;
 import com.aliyuncs.utils.StringUtils;
 import com.google.gson.Gson;
@@ -147,24 +148,9 @@ private String invokeAssumeRoleWithOIDC() throws ClientException {
         httpRequest.setHttpContentType(FormatType.FORM);
         httpRequest.setSysConnectTimeout(1000);
         httpRequest.setSysReadTimeout(3000);
-        String oidcToken;
-        FileInputStream in = null;
-        byte[] buffer;
-        try {
-            in = new FileInputStream(oidcTokenFilePath);
-            buffer = new byte[in.available()];
-            in.read(buffer);
-            oidcToken = new String(buffer, "UTF-8");
-        } catch (IOException e) {
-            throw new ClientException("Read OIDC token failed " + e.toString());
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
+        String oidcToken = AuthUtils.readFile(oidcTokenFilePath);
+        if (oidcToken == null) {
+            throw new ClientException("Read OIDC token failed");
         }
 
         Map<String, String> body = new HashMap<String, String>();

aliyun-java-sdk-core/src/main/java/com/aliyuncs/auth/ProfileCredentialsProvider.java

@@ -117,7 +117,7 @@ private AlibabaCloudCredentials getSTSGetSessionAccessKeyCredentials(Map<String,
         if (StringUtils.isEmpty(privateKeyFile)) {
             throw new ClientException("The configured private_key_file is empty");
         }
-        String privateKey = AuthUtils.getPrivateKey(privateKeyFile);
+        String privateKey = AuthUtils.readFile(privateKeyFile);
         if (StringUtils.isEmpty(publicKeyId) || StringUtils.isEmpty(privateKey)) {
             throw new ClientException("The configured public_key_id or private_key_file content is empty");
         }

aliyun-java-sdk-core/src/main/java/com/aliyuncs/utils/AuthUtils.java

@@ -11,7 +11,8 @@ public class AuthUtils {
     private static volatile String environmentECSMetaData;
     private static volatile String environmentCredentialsFile;
 
-    public static String getPrivateKey(String filePath) {
+
+    public static String readFile(String filePath) {
         FileInputStream in = null;
         byte[] buffer;
         try {
@@ -33,6 +34,11 @@ public static String getPrivateKey(String filePath) {
         }
     }
 
+    @Deprecated
+    public static String getPrivateKey(String filePath) {
+        return readFile(filePath);
+    }
+
     @Deprecated
     public static void setPrivateKey(String key) {
     }

aliyun-java-sdk-core/src/test/java/com/aliyuncs/auth/ProfileCredentialsProviderTest.java

@@ -135,15 +135,13 @@ public void  getSTSGetSessionAccessKeyCredentialsTest() throws NoSuchMethodExcep
                     e.getCause().getLocalizedMessage());
         }
         client.put(AuthConstant.INI_PRIVATE_KEY_FILE, "sads");
-        AuthUtils.setPrivateKey("test");
         try {
             createCredential.invoke(provider, client, factory);
             Assert.fail();
         } catch (Exception e) {
             Assert.assertEquals("The configured public_key_id or private_key_file content is empty",
                     e.getCause().getLocalizedMessage());
         }
-        AuthUtils.setPrivateKey(null);
     }
 
 

aliyun-java-sdk-core/src/test/java/com/aliyuncs/utils/AuthUtilsTest.java

@@ -11,6 +11,5 @@ public void getPrivateKeyTest(){
         String path = AuthUtils.class.getClassLoader().getResource("project.properties").getPath();
         String privateKey = AuthUtils.getPrivateKey(path);
         Assert.assertNotNull(privateKey);
-        Assert.assertEquals(privateKey , AuthUtils.getPrivateKey(path));
     }
 }