Merge pull request #964 from yanlinly/master

support aliyun ecs role
alibaba · Mar 27, 2019 · 020350b · 020350b
2 parents 074d243 + d11fd7f
commit 020350b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java b/api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java
@@ -32,6 +32,8 @@ public class PropertyKeyConst {
 
     public final static String SECRET_KEY = "secretKey";
 
+    public final static String RAM_ROLE_NAME = "ramRoleName";
+
     public final static String SERVER_ADDR = "serverAddr";
 
     public final static String CONTEXT_PATH = "contextPath";

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java b/client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
@@ -222,6 +222,11 @@ public String call() throws Exception {
     }
 
     private void initAkSk(Properties properties) {
+        String ramRoleName = properties.getProperty(PropertyKeyConst.RAM_ROLE_NAME);
+        if (!StringUtils.isBlank(ramRoleName)) {
+            STSConfig.getInstance().setRamRoleName(ramRoleName);
+        }
+
         String ak = properties.getProperty(PropertyKeyConst.ACCESS_KEY);
         if (StringUtils.isBlank(ak)) {
             accessKey = SpasAdapter.getAk();

diff --git a/client/src/main/java/com/alibaba/nacos/client/identify/STSConfig.java b/client/src/main/java/com/alibaba/nacos/client/identify/STSConfig.java
@@ -25,7 +25,7 @@
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class STSConfig {
     private static final String RAM_SECURITY_CREDENTIALS_URL
-        = "";
+        = "http://100.100.100.200/latest/meta-data/ram/security-credentials/";
     private String ramRoleName;
     /**
      * STS 临时凭证有效期剩余多少时开始刷新（允许本地时间比 STS 服务时间最多慢多久）