From ea5e7bc6e316a74f6d53e177d57a7a53d21c7bf7 Mon Sep 17 00:00:00 2001
From: yejingtao <250234464@qq.com>
Date: Fri, 12 Jul 2019 14:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9BAWS?=
 =?UTF-8?q?=E5=9B=BD=E5=86=85=E7=89=88=E5=B7=AE=E5=BC=82=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aws/provider/agent/AmazonInstanceTypeCachingAgent.java     | 3 ++-
 .../NetflixSTSAssumeRoleSessionCredentialsProvider.java        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/provider/agent/AmazonInstanceTypeCachingAgent.java b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/provider/agent/AmazonInstanceTypeCachingAgent.java
index 3462e846..fc45ce02 100644
--- a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/provider/agent/AmazonInstanceTypeCachingAgent.java
+++ b/clouddriver-aws/src/main/groovy/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/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/security/NetflixSTSAssumeRoleSessionCredentialsProvider.java b/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/security/NetflixSTSAssumeRoleSessionCredentialsProvider.java
index 82eabcc1..84873d04 100644
--- a/clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/security/NetflixSTSAssumeRoleSessionCredentialsProvider.java
+++ b/clouddriver-aws/src/main/groovy/com/netflix/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;
 
     /**