修复一些AWS国内版差异性

xiahuai · Jul 12, 2019 · ea5e7bc · ea5e7bc
1 parent be3211b
commit ea5e7bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.../com/netflix/spinnaker/clouddriver/aws/provider/agent/AmazonInstanceTypeCachingAgent.java b/.../com/netflix/spinnaker/clouddriver/aws/provider/agent/AmazonInstanceTypeCachingAgent.java
@@ -72,7 +72,8 @@ public AmazonInstanceTypeCachingAgent(String region,
     this.region = region;
     this.accountCredentialsRepository = accountCredentialsRepository;
     pricingHost = HttpHost.create("https://pricing.us-east-1.amazonaws.com");
-    pricingUri = URI.create("/offers/v1.0/aws/AmazonEC2/current/" + region + "/index.json");
+    //pricingUri = URI.create("/offers/v1.0/aws/AmazonEC2/current/" + region + "/index.json");
+    pricingUri = URI.create("/offers/v1.0/aws/AmazonEC2/current/us-east-1/index.json");
     this.httpClient = httpClient;
   }
 

diff --git a/...ix/spinnaker/clouddriver/aws/security/NetflixSTSAssumeRoleSessionCredentialsProvider.java b/...ix/spinnaker/clouddriver/aws/security/NetflixSTSAssumeRoleSessionCredentialsProvider.java
@@ -27,6 +27,7 @@ public NetflixSTSAssumeRoleSessionCredentialsProvider(AWSCredentialsProvider lon
                                                         String roleSessionName,
                                                         String accountId) {
     super(longLivedCredentialsProvider, roleArn, roleSessionName);
+	this.setSTSClientEndpoint("sts.cn-north-1.amazonaws.com.cn");
     this.accountId = accountId;
 
     /**