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; /**