diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/auth/CognitoCachingCredentialsProvider.java b/aws-android-sdk-core/src/main/java/com/amazonaws/auth/CognitoCachingCredentialsProvider.java
index ea40fc055f2..538f4055a20 100644
--- a/aws-android-sdk-core/src/main/java/com/amazonaws/auth/CognitoCachingCredentialsProvider.java
+++ b/aws-android-sdk-core/src/main/java/com/amazonaws/auth/CognitoCachingCredentialsProvider.java
@@ -20,6 +20,7 @@
import android.util.Log;
import com.amazonaws.ClientConfiguration;
+import com.amazonaws.mobile.config.AWSConfiguration;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.cognitoidentity.AmazonCognitoIdentityClient;
import com.amazonaws.services.cognitoidentity.model.NotAuthorizedException;
@@ -191,6 +192,48 @@ public CognitoCachingCredentialsProvider(Context context, String identityPoolId,
initialize();
}
+ /**
+ * Constructs a new {@link CognitoCachingCredentialsProvider}, which will
+ * use the specified Amazon Cognito identity pool to make a request to
+ * Cognito, using the enhanced flow, to get short lived session credentials,
+ * which will then be returned by this class's {@link #getCredentials()}
+ * method.
+ *
+ * Note: if you haven't yet associated your IAM roles with your identity
+ * pool, please do so via the Cognito console before using this constructor.
+ * You will get an InvalidIdentityPoolConfigurationException if you use it
+ * and have not. The existing constructor (mirroring this one but with roles
+ * and an account id) will work without doing so, but will not use the
+ * enhanced flow.
+ *
+ *
+ * Example json file:
+ * {
+ * "CredentialsProvider": {
+ * "CognitoIdentity": {
+ * "Default": {
+ * "PoolId": "us-east-1:example-pool-id1234",
+ * "Region": "us-east-1"
+ * }
+ * }
+ * }
+ * }
+ *
+ * @param context The Android context to be used for the caching
+ * @param awsConfiguration The configuration holding you identity pool id
+ * and the region to use when contacting
+ * Cognito Identity
+ */
+ public CognitoCachingCredentialsProvider(Context context, AWSConfiguration awsConfiguration) {
+ super(awsConfiguration);
+ if (context == null) {
+ throw new IllegalArgumentException("context can't be null");
+ }
+ this.prefs = context.getSharedPreferences(DEFAULT_SHAREDPREFERENCES_NAME,
+ Context.MODE_PRIVATE);
+ initialize();
+ }
+
/**
* Constructs a new {@link CognitoCachingCredentialsProvider}, which will
* use the specified Amazon Cognito identity pool to make a request to
diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/auth/CognitoCredentialsProvider.java b/aws-android-sdk-core/src/main/java/com/amazonaws/auth/CognitoCredentialsProvider.java
index b5157986648..a84e3bbf4c5 100644
--- a/aws-android-sdk-core/src/main/java/com/amazonaws/auth/CognitoCredentialsProvider.java
+++ b/aws-android-sdk-core/src/main/java/com/amazonaws/auth/CognitoCredentialsProvider.java
@@ -19,6 +19,7 @@
import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.ClientConfiguration;
import com.amazonaws.SDKGlobalConfiguration;
+import com.amazonaws.mobile.config.AWSConfiguration;
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.cognitoidentity.AmazonCognitoIdentity;
@@ -32,6 +33,8 @@
import com.amazonaws.services.securitytoken.model.AssumeRoleWithWebIdentityResult;
import com.amazonaws.services.securitytoken.model.Credentials;
+import org.json.JSONObject;
+
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.Date;
import java.util.HashMap;
@@ -133,6 +136,60 @@ public CognitoCredentialsProvider(String accountId, String identityPoolId,
this.cib.setRegion(Region.getRegion(region));
}
+ /**
+ * Constructs a new {@link CognitoCredentialsProvider}, which will use the
+ * specified Amazon Cognito identity pool to make a request to Cognito,
+ * using the enhanced flow, to get short lived session credentials, which
+ * will then be returned by this class's {@link #getCredentials()} method.
+ *
+ * Example json file:
+ * {
+ * "CredentialsProvider": {
+ * "CognitoIdentity": {
+ * "Default": {
+ * "PoolId": "us-east-1:example-pool-id1234",
+ * "Region": "us-east-1"
+ * }
+ * }
+ * }
+ * }
+ *
+ * @param awsConfiguration The configuration holding you identity pool id
+ * and the region to use when contacting
+ * Cognito Identity
+ */
+ public CognitoCredentialsProvider(AWSConfiguration awsConfiguration) {
+ this(null, getIdentityPoolId(awsConfiguration), null, null, getRegions(awsConfiguration), getClientConfiguration(awsConfiguration));
+ }
+
+ private static String getIdentityPoolId(AWSConfiguration awsConfiguration) {
+ try {
+ final JSONObject ccpConfig = awsConfiguration.optJsonObject("CredentialsProvider")
+ .optJSONObject("CognitoIdentity")
+ .getJSONObject(awsConfiguration.getConfiguration());
+ return ccpConfig.getString("PoolId");
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Failed to read CognitoIdentity please check your setup or awsconfiguration.json file", e);
+ }
+ }
+
+ private static Regions getRegions(AWSConfiguration awsConfiguration) {
+ try {
+ final JSONObject ccpConfig = awsConfiguration.optJsonObject("CredentialsProvider")
+ .optJSONObject("CognitoIdentity")
+ .getJSONObject(awsConfiguration.getConfiguration());
+ return Regions.fromName(ccpConfig.getString("Region"));
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Failed to read CognitoIdentity please check your setup or awsconfiguration.json file", e);
+ }
+ }
+
+ private static ClientConfiguration getClientConfiguration(AWSConfiguration awsConfiguration) {
+ final ClientConfiguration clientConfig = new ClientConfiguration();
+ clientConfig.setUserAgent(awsConfiguration.getUserAgent());
+ return clientConfig;
+ }
+
/**
* Constructs a new {@link CognitoCredentialsProvider}, which will use the
* specified Amazon Cognito identity pool to make a request to Cognito,
diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/mobile/config/AWSConfiguration.java b/aws-android-sdk-core/src/main/java/com/amazonaws/mobile/config/AWSConfiguration.java
new file mode 100644
index 00000000000..38fab0f8ffb
--- /dev/null
+++ b/aws-android-sdk-core/src/main/java/com/amazonaws/mobile/config/AWSConfiguration.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2017-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.amazonaws.mobile.config;
+
+import android.content.Context;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.InputStream;
+import java.util.Scanner;
+
+/**
+ * A container for the JSONObject representation of SDK configuration. Reads the
+ * res/raw/awsconfiguration.json file in your project by default. This can be
+ * specified in the constructor through the resource id, if you wish to read a
+ * different resource as your configuration source.
+ */
+public class AWSConfiguration {
+ private static final String DEFAULT = "Default";
+ private static final String DEFAULT_IDENTIFIER = "awsconfiguration";
+
+ private JSONObject mJSONObject;
+ private String configName; // "Default" or something else like "Backup"
+
+ /**
+ * Constructs an AWSConfiguration object
+ *
+ * @param context application context, used to retrieve
+ * awsconfiguration.json from resources
+ */
+ public AWSConfiguration(Context context) {
+ this(context, getConfigResourceId(context));
+ }
+
+ private static int getConfigResourceId(Context context) {
+ try {
+ return context.getResources().getIdentifier(DEFAULT_IDENTIFIER,
+ "raw", context.getPackageName());
+ } catch (Exception e) {
+ throw new RuntimeException(
+ "Failed to read awsconfiguration.json"
+ + " please check that it is correctly formed.",
+ e);
+ }
+ }
+
+ /**
+ * Constructs an AWSConfiguration object
+ *
+ * @param context application context, used to retrieve the resource
+ * specified by configResourceId
+ * @param configResourceId resource id of the json file to be read
+ */
+ public AWSConfiguration(Context context, int configResourceId) {
+ this(context, configResourceId, DEFAULT);
+ }
+
+ /**
+ * Construct an AWSConfiguration object
+ *
+ * @param context application context, used to retrieve the resource
+ * specified by configResourceId
+ * @param configResourceId resource id of the json file to be read
+ * @param configName instructs the reader of this configuration to pick the
+ * specified configName
+ */
+ public AWSConfiguration(Context context, int configResourceId,
+ String configName) {
+ this.configName = configName;
+ readInputJson(context, configResourceId);
+ }
+
+ private void readInputJson(Context context, int resourceId) {
+ try {
+ final InputStream inputStream = context.getResources().openRawResource(
+ resourceId);
+ final Scanner in = new Scanner(inputStream);
+ final StringBuilder sb = new StringBuilder();
+ while (in.hasNextLine()) {
+ sb.append(in.nextLine());
+ }
+ in.close();
+
+ this.mJSONObject = new JSONObject(sb.toString());
+ } catch (Exception je) {
+ throw new RuntimeException(
+ "Failed to read awsconfiguration.json please check that it is correctly formed.",
+ je);
+ }
+ }
+
+ /**
+ * This method will search for the name provided in the json and unwrap the
+ * configuration specified by {@link #setConfiguration(String)}.
+ *
+ * Example:
+ * {
+ * "S3TransferUtility": {
+ * "Default": {
+ * "Bucket": "waterBucket",
+ * "Region": "us-west-2"
+ * }
+ * }
+ * }
+ *
+ * When name is "S3TransferUtility" and setConfiguration is "Default",
+ * The value return is:
+ * {
+ * "Bucket": "waterBucket",
+ * "Region": "us-west-2"
+ * }
+ *
+ * Certain keys do not have a configuration (i.e. "Default") and
+ * when this happens the value for the key is directly returned.
+ *
+ * @param key used to search for in JSON map
+ * @return an immutable copy of the value mapped by {@code name} if it
+ * exists and is a {@code JSONObject}, or null otherwise.
+ */
+ public JSONObject optJsonObject(String key) {
+ try {
+ JSONObject value = this.mJSONObject.getJSONObject(key);
+
+ if (value.has(this.configName)) {
+ value = value.getJSONObject(this.configName);
+ }
+
+ return new JSONObject(value.toString());
+ } catch (JSONException je) {
+ return null;
+ }
+ }
+
+ /**
+ * @return The user agent specified in the configuration file.
+ */
+ public String getUserAgent() {
+ try {
+ return this.mJSONObject.getString("UserAgent");
+ } catch (JSONException je) {
+ return "";
+ }
+ }
+
+ /**
+ * Change the settings that are being read in. This is "Default" by default.
+ *
+ * @param configurationName the key used to differentiate between configuration settings
+ */
+ public void setConfiguration(String configurationName) {
+ this.configName = configurationName;
+ }
+
+ /**
+ *
+ * @return the configuration This is "Default" by default.
+ */
+ public String getConfiguration() {
+ return this.configName;
+ }
+
+ @Override
+ public String toString() {
+ return mJSONObject.toString();
+ }
+}
diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/regions/Region.java b/aws-android-sdk-core/src/main/java/com/amazonaws/regions/Region.java
index c52d6721b9d..6a38d22ffbc 100644
--- a/aws-android-sdk-core/src/main/java/com/amazonaws/regions/Region.java
+++ b/aws-android-sdk-core/src/main/java/com/amazonaws/regions/Region.java
@@ -62,6 +62,15 @@ public static Region getRegion(Regions region) {
return RegionUtils.getRegion(region.getName());
}
+ /**
+ * @param regionString the region represented as a string. i.e. us-east-1
+ * @return the region with the id given, or null if it cannot be found in
+ * the current regions.xml file.
+ */
+ public static Region getRegion(String regionString) {
+ return RegionUtils.getRegion(regionString);
+ }
+
/**
* The unique system ID for this region; ex: "us-east-1".
*
diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/regions/RegionDefaults.java b/aws-android-sdk-core/src/main/java/com/amazonaws/regions/RegionDefaults.java
index d6c4ad5c960..222b375f753 100644
--- a/aws-android-sdk-core/src/main/java/com/amazonaws/regions/RegionDefaults.java
+++ b/aws-android-sdk-core/src/main/java/com/amazonaws/regions/RegionDefaults.java
@@ -27,324 +27,324 @@ public static List getRegions() {
region = new Region("ap-northeast-1", "");
ret.add(region);
- updateRegion(region, "elasticloadbalancing",
- "elasticloadbalancing.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-identity", "cognito-identity.ap-northeast-1.amazonaws.com",
- false, true);
- updateRegion(region, "dynamodb", "dynamodb.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "s3", "s3-ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "autoscaling", "autoscaling.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-idp", "cognito-idp.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "data.iot", "data.iot.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "iot", "iot.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "kinesis", "kinesis.ap-northeast-1.amazonaws.com", false, true);
updateRegion(region, "sns", "sns.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-sync", "cognito-sync.ap-northeast-1.amazonaws.com", false,
+ true);
updateRegion(region, "ec2", "ec2.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
updateRegion(region, "sqs", "sqs.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "sdb", "sdb.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "kinesis", "kinesis.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-identity", "cognito-identity.ap-northeast-1.amazonaws.com",
+ false, true);
updateRegion(region, "kms", "kms.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-sync", "cognito-sync.ap-northeast-1.amazonaws.com", false,
- true);
+ updateRegion(region, "iot", "iot.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "data.iot", "data.iot.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3-ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-idp", "cognito-idp.ap-northeast-1.amazonaws.com", false, true);
updateRegion(region, "lambda", "lambda.ap-northeast-1.amazonaws.com", false, true);
- updateRegion(region, "sdb", "sdb.ap-northeast-1.amazonaws.com", false, true);
+ updateRegion(region, "elasticloadbalancing",
+ "elasticloadbalancing.ap-northeast-1.amazonaws.com", false, true);
region = new Region("ap-northeast-2", "");
ret.add(region);
- updateRegion(region, "lambda", "lambda.ap-northeast-2.amazonaws.com", false, true);
- updateRegion(region, "sqs", "sqs.ap-northeast-2.amazonaws.com", false, true);
- updateRegion(region, "ec2", "ec2.ap-northeast-2.amazonaws.com", false, true);
updateRegion(region, "s3", "s3.ap-northeast-2.amazonaws.com", false, true);
- updateRegion(region, "sns", "sns.ap-northeast-2.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.ap-northeast-2.amazonaws.com", false, true);
- updateRegion(region, "iot", "iot.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "ec2", "ec2.ap-northeast-2.amazonaws.com", false, true);
updateRegion(region, "cognito-sync", "cognito-sync.ap-northeast-2.amazonaws.com", false,
true);
- updateRegion(region, "elasticloadbalancing",
- "elasticloadbalancing.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.ap-northeast-2.amazonaws.com", false, true);
updateRegion(region, "cognito-identity", "cognito-identity.ap-northeast-2.amazonaws.com",
false, true);
- updateRegion(region, "autoscaling", "autoscaling.ap-northeast-2.amazonaws.com", false, true);
- updateRegion(region, "kinesis", "kinesis.ap-northeast-2.amazonaws.com", false, true);
updateRegion(region, "cognito-idp", "cognito-idp.ap-northeast-2.amazonaws.com", false, true);
- updateRegion(region, "data.iot", "data.iot.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "sqs", "sqs.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "iot", "iot.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "sns", "sns.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "elasticloadbalancing",
+ "elasticloadbalancing.ap-northeast-2.amazonaws.com", false, true);
updateRegion(region, "kms", "kms.ap-northeast-2.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "kinesis", "kinesis.ap-northeast-2.amazonaws.com", false, true);
+ updateRegion(region, "data.iot", "data.iot.ap-northeast-2.amazonaws.com", false, true);
region = new Region("ap-south-1", "");
ret.add(region);
- updateRegion(region, "sqs", "sqs.ap-south-1.amazonaws.com", false, true);
updateRegion(region, "cognito-idp", "cognito-idp.ap-south-1.amazonaws.com", false, true);
updateRegion(region, "kms", "kms.ap-south-1.amazonaws.com", false, true);
- updateRegion(region, "kinesis", "kinesis.ap-south-1.amazonaws.com", false, true);
- updateRegion(region, "s3", "s3.ap-south-1.amazonaws.com", false, true);
+ updateRegion(region, "ec2", "ec2.ap-south-1.amazonaws.com", false, true);
updateRegion(region, "autoscaling", "autoscaling.ap-south-1.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.ap-south-1.amazonaws.com", false, true);
+ updateRegion(region, "kinesis", "kinesis.ap-south-1.amazonaws.com", false, true);
updateRegion(region, "sns", "sns.ap-south-1.amazonaws.com", false, true);
updateRegion(region, "cognito-identity", "cognito-identity.ap-south-1.amazonaws.com",
false, true);
- updateRegion(region, "ec2", "ec2.ap-south-1.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.ap-south-1.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.ap-south-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-sync", "cognito-sync.ap-south-1.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.ap-south-1.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.ap-south-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-sync", "cognito-sync.ap-south-1.amazonaws.com", false, true);
+ updateRegion(region, "sqs", "sqs.ap-south-1.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3.ap-south-1.amazonaws.com", false, true);
region = new Region("ap-southeast-1", "");
ret.add(region);
updateRegion(region, "kms", "kms.ap-southeast-1.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.ap-southeast-1.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3-ap-southeast-1.amazonaws.com", false, true);
updateRegion(region, "sns", "sns.ap-southeast-1.amazonaws.com", false, true);
- updateRegion(region, "data.iot", "data.iot.ap-southeast-1.amazonaws.com", false, true);
- updateRegion(region, "kinesis", "kinesis.ap-southeast-1.amazonaws.com", false, true);
updateRegion(region, "ec2", "ec2.ap-southeast-1.amazonaws.com", false, true);
- updateRegion(region, "iot", "iot.ap-southeast-1.amazonaws.com", false, true);
- updateRegion(region, "s3", "s3-ap-southeast-1.amazonaws.com", false, true);
updateRegion(region, "dynamodb", "dynamodb.ap-southeast-1.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.ap-southeast-1.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.ap-southeast-1.amazonaws.com", false, true);
updateRegion(region, "sdb", "sdb.ap-southeast-1.amazonaws.com", false, true);
+ updateRegion(region, "iot", "iot.ap-southeast-1.amazonaws.com", false, true);
updateRegion(region, "sqs", "sqs.ap-southeast-1.amazonaws.com", false, true);
+ updateRegion(region, "data.iot", "data.iot.ap-southeast-1.amazonaws.com", false, true);
updateRegion(region, "autoscaling", "autoscaling.ap-southeast-1.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "kinesis", "kinesis.ap-southeast-1.amazonaws.com", false, true);
region = new Region("ap-southeast-2", "");
ret.add(region);
- updateRegion(region, "cognito-identity", "cognito-identity.ap-southeast-2.amazonaws.com",
- false, true);
- updateRegion(region, "elasticloadbalancing",
- "elasticloadbalancing.ap-southeast-2.amazonaws.com", false, true);
- updateRegion(region, "s3", "s3-ap-southeast-2.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
updateRegion(region, "ec2", "ec2.ap-southeast-2.amazonaws.com", false, true);
- updateRegion(region, "sqs", "sqs.ap-southeast-2.amazonaws.com", false, true);
- updateRegion(region, "autoscaling", "autoscaling.ap-southeast-2.amazonaws.com", false, true);
updateRegion(region, "data.iot", "data.iot.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "iot", "iot.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3-ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "cognito-sync", "cognito-sync.ap-southeast-2.amazonaws.com", false,
+ true);
updateRegion(region, "cognito-idp", "cognito-idp.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "elasticloadbalancing",
+ "elasticloadbalancing.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "sns", "sns.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "kms", "kms.ap-southeast-2.amazonaws.com", false, true);
updateRegion(region, "dynamodb", "dynamodb.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "cognito-identity", "cognito-identity.ap-southeast-2.amazonaws.com",
+ false, true);
updateRegion(region, "kinesis", "kinesis.ap-southeast-2.amazonaws.com", false, true);
- updateRegion(region, "sns", "sns.ap-southeast-2.amazonaws.com", false, true);
- updateRegion(region, "cognito-sync", "cognito-sync.ap-southeast-2.amazonaws.com", false,
- true);
- updateRegion(region, "iot", "iot.ap-southeast-2.amazonaws.com", false, true);
updateRegion(region, "sdb", "sdb.ap-southeast-2.amazonaws.com", false, true);
- updateRegion(region, "kms", "kms.ap-southeast-2.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "sqs", "sqs.ap-southeast-2.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
region = new Region("ca-central-1", "");
ret.add(region);
- updateRegion(region, "autoscaling", "autoscaling.ca-central-1.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.ca-central-1.amazonaws.com", false, true);
+ updateRegion(region, "sns", "sns.ca-central-1.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.ca-central-1.amazonaws.com", false, true);
updateRegion(region, "ec2", "ec2.ca-central-1.amazonaws.com", false, true);
- updateRegion(region, "sqs", "sqs.ca-central-1.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.ca-central-1.amazonaws.com", false, true);
- updateRegion(region, "kms", "kms.ca-central-1.amazonaws.com", false, true);
- updateRegion(region, "s3", "s3.ca-central-1.amazonaws.com", false, true);
updateRegion(region, "kinesis", "kinesis.ca-central-1.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
- updateRegion(region, "sns", "sns.ca-central-1.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3.ca-central-1.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.ca-central-1.amazonaws.com", false, true);
+ updateRegion(region, "kms", "kms.ca-central-1.amazonaws.com", false, true);
+ updateRegion(region, "sqs", "sqs.ca-central-1.amazonaws.com", false, true);
region = new Region("eu-central-1", "");
ret.add(region);
- updateRegion(region, "ec2", "ec2.eu-central-1.amazonaws.com", false, true);
- updateRegion(region, "sqs", "sqs.eu-central-1.amazonaws.com", false, true);
- updateRegion(region, "data.iot", "data.iot.eu-central-1.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.eu-central-1.amazonaws.com", false, true);
+ updateRegion(region, "iot", "iot.eu-central-1.amazonaws.com", false, true);
+ updateRegion(region, "sns", "sns.eu-central-1.amazonaws.com", false, true);
updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "cognito-identity", "cognito-identity.eu-central-1.amazonaws.com",
+ false, true);
updateRegion(region, "cognito-idp", "cognito-idp.eu-central-1.amazonaws.com", false, true);
+ updateRegion(region, "ec2", "ec2.eu-central-1.amazonaws.com", false, true);
updateRegion(region, "s3", "s3.eu-central-1.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.eu-central-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-identity", "cognito-identity.eu-central-1.amazonaws.com",
- false, true);
- updateRegion(region, "iot", "iot.eu-central-1.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.eu-central-1.amazonaws.com", false, true);
+ updateRegion(region, "sqs", "sqs.eu-central-1.amazonaws.com", false, true);
updateRegion(region, "kinesis", "kinesis.eu-central-1.amazonaws.com", false, true);
+ updateRegion(region, "data.iot", "data.iot.eu-central-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-sync", "cognito-sync.eu-central-1.amazonaws.com", false, true);
updateRegion(region, "kms", "kms.eu-central-1.amazonaws.com", false, true);
- updateRegion(region, "sns", "sns.eu-central-1.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.eu-central-1.amazonaws.com", false, true);
updateRegion(region, "autoscaling", "autoscaling.eu-central-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-sync", "cognito-sync.eu-central-1.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.eu-central-1.amazonaws.com", false, true);
region = new Region("eu-west-1", "");
ret.add(region);
+ updateRegion(region, "lambda", "lambda.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "machinelearning", "machinelearning.eu-west-1.amazonaws.com", false,
+ true);
+ updateRegion(region, "data.iot", "data.iot.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "sdb", "sdb.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-sync", "cognito-sync.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
updateRegion(region, "sqs", "sqs.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-idp", "cognito-idp.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "polly", "polly.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "firehose", "firehose.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-identity", "cognito-identity.eu-west-1.amazonaws.com", false,
+ true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "polly", "polly.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "sns", "sns.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-sync", "cognito-sync.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "data.iot", "data.iot.eu-west-1.amazonaws.com", false, true);
+ updateRegion(region, "iot", "iot.eu-west-1.amazonaws.com", false, true);
updateRegion(region, "email", "email.eu-west-1.amazonaws.com", false, true);
updateRegion(region, "kms", "kms.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "sns", "sns.eu-west-1.amazonaws.com", false, true);
updateRegion(region, "kinesis", "kinesis.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "iot", "iot.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "sdb", "sdb.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-identity", "cognito-identity.eu-west-1.amazonaws.com", false,
- true);
updateRegion(region, "ec2", "ec2.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "autoscaling", "autoscaling.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-idp", "cognito-idp.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "firehose", "firehose.eu-west-1.amazonaws.com", false, true);
- updateRegion(region, "machinelearning", "machinelearning.eu-west-1.amazonaws.com", false,
- true);
updateRegion(region, "s3", "s3-eu-west-1.amazonaws.com", false, true);
region = new Region("eu-west-2", "");
ret.add(region);
+ updateRegion(region, "cognito-identity", "cognito-identity.eu-west-2.amazonaws.com", false,
+ true);
+ updateRegion(region, "cognito-sync", "cognito-sync.eu-west-2.amazonaws.com", false, true);
+ updateRegion(region, "iot", "iot.eu-west-2.amazonaws.com", false, true);
updateRegion(region, "kinesis", "kinesis.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "kms", "kms.eu-west-2.amazonaws.com", false, true);
updateRegion(region, "autoscaling", "autoscaling.eu-west-2.amazonaws.com", false, true);
+ updateRegion(region, "kms", "kms.eu-west-2.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "ec2", "ec2.eu-west-2.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.eu-west-2.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3.eu-west-2.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "cognito-idp", "cognito-idp.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.eu-west-2.amazonaws.com", false, true);
updateRegion(region, "sqs", "sqs.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "iot", "iot.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
- updateRegion(region, "s3", "s3.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "cognito-sync", "cognito-sync.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "cognito-identity", "cognito-identity.eu-west-2.amazonaws.com", false,
- true);
updateRegion(region, "sns", "sns.eu-west-2.amazonaws.com", false, true);
- updateRegion(region, "ec2", "ec2.eu-west-2.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.eu-west-2.amazonaws.com", false, true);
+ updateRegion(region, "cognito-idp", "cognito-idp.eu-west-2.amazonaws.com", false, true);
region = new Region("sa-east-1", "");
ret.add(region);
- updateRegion(region, "s3", "s3-sa-east-1.amazonaws.com", false, true);
- updateRegion(region, "sdb", "sdb.sa-east-1.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.sa-east-1.amazonaws.com", false, true);
updateRegion(region, "ec2", "ec2.sa-east-1.amazonaws.com", false, true);
- updateRegion(region, "autoscaling", "autoscaling.sa-east-1.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3-sa-east-1.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.sa-east-1.amazonaws.com", false, true);
updateRegion(region, "sns", "sns.sa-east-1.amazonaws.com", false, true);
updateRegion(region, "sts", "sts.amazonaws.com", false, true);
- updateRegion(region, "kms", "kms.sa-east-1.amazonaws.com", false, true);
+ updateRegion(region, "sdb", "sdb.sa-east-1.amazonaws.com", false, true);
updateRegion(region, "sqs", "sqs.sa-east-1.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.sa-east-1.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.sa-east-1.amazonaws.com", false, true);
+ updateRegion(region, "kms", "kms.sa-east-1.amazonaws.com", false, true);
updateRegion(region, "kinesis", "kinesis.sa-east-1.amazonaws.com", false, true);
region = new Region("us-east-1", "");
ret.add(region);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
- updateRegion(region, "sns", "sns.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-sync", "cognito-sync.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "kms", "kms.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "data.iot", "data.iot.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "pinpoint", "pinpoint.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-identity", "cognito-identity.us-east-1.amazonaws.com", false,
- true);
- updateRegion(region, "iot", "iot.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "kinesis", "kinesis.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "sqs", "sqs.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "ec2", "ec2.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "machinelearning", "machinelearning.us-east-1.amazonaws.com", false,
- true);
+ updateRegion(region, "firehose", "firehose.us-east-1.amazonaws.com", false, true);
updateRegion(region, "polly", "polly.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "s3", "s3.amazonaws.com", false, true);
+ updateRegion(region, "kinesis", "kinesis.us-east-1.amazonaws.com", false, true);
updateRegion(region, "dynamodb", "dynamodb.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "email", "email.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "iot", "iot.us-east-1.amazonaws.com", false, true);
updateRegion(region, "lambda", "lambda.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "machinelearning", "machinelearning.us-east-1.amazonaws.com", false,
+ true);
+ updateRegion(region, "cognito-identity", "cognito-identity.us-east-1.amazonaws.com", false,
+ true);
+ updateRegion(region, "cognito-sync", "cognito-sync.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "elasticloadbalancing",
+ "elasticloadbalancing.us-east-1.amazonaws.com", false, true);
updateRegion(region, "sdb", "sdb.amazonaws.com", false, true);
updateRegion(region, "autoscaling", "autoscaling.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "cognito-idp", "cognito-idp.us-east-1.amazonaws.com", false, true);
updateRegion(region, "mobileanalytics", "mobileanalytics.us-east-1.amazonaws.com", false,
true);
- updateRegion(region, "elasticloadbalancing",
- "elasticloadbalancing.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "firehose", "firehose.us-east-1.amazonaws.com", false, true);
- updateRegion(region, "email", "email.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "pinpoint", "pinpoint.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "ec2", "ec2.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "sqs", "sqs.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "cognito-idp", "cognito-idp.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "kms", "kms.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "data.iot", "data.iot.us-east-1.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3.amazonaws.com", false, true);
+ updateRegion(region, "sns", "sns.us-east-1.amazonaws.com", false, true);
region = new Region("us-east-2", "");
ret.add(region);
- updateRegion(region, "kms", "kms.us-east-2.amazonaws.com", false, true);
updateRegion(region, "cognito-sync", "cognito-sync.us-east-2.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.us-east-2.amazonaws.com", false, true);
- updateRegion(region, "ec2", "ec2.us-east-2.amazonaws.com", false, true);
- updateRegion(region, "polly", "polly.us-east-2.amazonaws.com", false, true);
- updateRegion(region, "kinesis", "kinesis.us-east-2.amazonaws.com", false, true);
updateRegion(region, "iot", "iot.us-east-2.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.us-east-2.amazonaws.com", false, true);
+ updateRegion(region, "polly", "polly.us-east-2.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.us-east-2.amazonaws.com", false, true);
updateRegion(region, "cognito-identity", "cognito-identity.us-east-2.amazonaws.com", false,
true);
- updateRegion(region, "autoscaling", "autoscaling.us-east-2.amazonaws.com", false, true);
updateRegion(region, "sns", "sns.us-east-2.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.us-east-2.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.us-east-2.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
updateRegion(region, "cognito-idp", "cognito-idp.us-east-2.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.us-east-2.amazonaws.com", false, true);
+ updateRegion(region, "kms", "kms.us-east-2.amazonaws.com", false, true);
updateRegion(region, "s3", "s3.us-east-2.amazonaws.com", false, true);
updateRegion(region, "sqs", "sqs.us-east-2.amazonaws.com", false, true);
+ updateRegion(region, "ec2", "ec2.us-east-2.amazonaws.com", false, true);
+ updateRegion(region, "kinesis", "kinesis.us-east-2.amazonaws.com", false, true);
region = new Region("us-west-1", "");
ret.add(region);
- updateRegion(region, "kms", "kms.us-west-1.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "sqs", "sqs.us-west-1.amazonaws.com", false, true);
+ updateRegion(region, "kinesis", "kinesis.us-west-1.amazonaws.com", false, true);
updateRegion(region, "autoscaling", "autoscaling.us-west-1.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.us-west-1.amazonaws.com", false, true);
+ updateRegion(region, "s3", "s3-us-west-1.amazonaws.com", false, true);
+ updateRegion(region, "kms", "kms.us-west-1.amazonaws.com", false, true);
+ updateRegion(region, "sdb", "sdb.us-west-1.amazonaws.com", false, true);
+ updateRegion(region, "sns", "sns.us-west-1.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.us-west-1.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
updateRegion(region, "dynamodb", "dynamodb.us-west-1.amazonaws.com", false, true);
updateRegion(region, "ec2", "ec2.us-west-1.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.us-west-1.amazonaws.com", false, true);
- updateRegion(region, "sqs", "sqs.us-west-1.amazonaws.com", false, true);
- updateRegion(region, "kinesis", "kinesis.us-west-1.amazonaws.com", false, true);
- updateRegion(region, "sns", "sns.us-west-1.amazonaws.com", false, true);
- updateRegion(region, "s3", "s3-us-west-1.amazonaws.com", false, true);
- updateRegion(region, "sdb", "sdb.us-west-1.amazonaws.com", false, true);
region = new Region("us-west-2", "");
ret.add(region);
- updateRegion(region, "elasticloadbalancing",
- "elasticloadbalancing.us-west-2.amazonaws.com", false, true);
updateRegion(region, "cognito-sync", "cognito-sync.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "email", "email.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "cognito-idp", "cognito-idp.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "firehose", "firehose.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "data.iot", "data.iot.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "dynamodb", "dynamodb.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "sns", "sns.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "ec2", "ec2.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "lambda", "lambda.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "autoscaling", "autoscaling.us-west-2.amazonaws.com", false, true);
updateRegion(region, "s3", "s3-us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "iot", "iot.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "sns", "sns.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "data.iot", "data.iot.us-west-2.amazonaws.com", false, true);
updateRegion(region, "kinesis", "kinesis.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "lambda", "lambda.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "cognito-identity", "cognito-identity.us-west-2.amazonaws.com", false,
+ true);
updateRegion(region, "sdb", "sdb.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.us-west-2.amazonaws.com", false, true);
updateRegion(region, "sqs", "sqs.us-west-2.amazonaws.com", false, true);
- updateRegion(region, "iot", "iot.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "ec2", "ec2.us-west-2.amazonaws.com", false, true);
updateRegion(region, "polly", "polly.us-west-2.amazonaws.com", false, true);
updateRegion(region, "sts", "sts.amazonaws.com", false, true);
- updateRegion(region, "cognito-identity", "cognito-identity.us-west-2.amazonaws.com", false,
- true);
+ updateRegion(region, "firehose", "firehose.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "email", "email.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "cognito-idp", "cognito-idp.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.us-west-2.amazonaws.com", false, true);
updateRegion(region, "kms", "kms.us-west-2.amazonaws.com", false, true);
+ updateRegion(region, "elasticloadbalancing",
+ "elasticloadbalancing.us-west-2.amazonaws.com", false, true);
region = new Region("cn-north-1", "");
ret.add(region);
updateRegion(region, "sts", "sts.cn-north-1.amazonaws.com.cn", false, true);
- updateRegion(region, "autoscaling", "autoscaling.cn-north-1.amazonaws.com.cn", false, true);
- updateRegion(region, "kinesis", "kinesis.cn-north-1.amazonaws.com.cn", false, true);
- updateRegion(region, "s3", "s3.cn-north-1.amazonaws.com.cn", false, true);
- updateRegion(region, "sns", "sns.cn-north-1.amazonaws.com.cn", false, true);
- updateRegion(region, "dynamodb", "dynamodb.cn-north-1.amazonaws.com.cn", false, true);
- updateRegion(region, "ec2", "ec2.cn-north-1.amazonaws.com.cn", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.cn-north-1.amazonaws.com.cn", false, true);
+ updateRegion(region, "sns", "sns.cn-north-1.amazonaws.com.cn", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.cn-north-1.amazonaws.com.cn", false, true);
+ updateRegion(region, "ec2", "ec2.cn-north-1.amazonaws.com.cn", false, true);
+ updateRegion(region, "s3", "s3.cn-north-1.amazonaws.com.cn", false, true);
updateRegion(region, "sqs", "sqs.cn-north-1.amazonaws.com.cn", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.cn-north-1.amazonaws.com.cn", false, true);
+ updateRegion(region, "kinesis", "kinesis.cn-north-1.amazonaws.com.cn", false, true);
region = new Region("us-gov-west-1", "");
ret.add(region);
- updateRegion(region, "dynamodb", "dynamodb.us-gov-west-1.amazonaws.com", false, true);
+ updateRegion(region, "ec2", "ec2.us-gov-west-1.amazonaws.com", false, true);
+ updateRegion(region, "sqs", "sqs.us-gov-west-1.amazonaws.com", false, true);
+ updateRegion(region, "autoscaling", "autoscaling.us-gov-west-1.amazonaws.com", false, true);
+ updateRegion(region, "kinesis", "kinesis.us-gov-west-1.amazonaws.com", false, true);
updateRegion(region, "s3", "s3-us-gov-west-1.amazonaws.com", false, true);
updateRegion(region, "kms", "kms.us-gov-west-1.amazonaws.com", false, true);
- updateRegion(region, "ec2", "ec2.us-gov-west-1.amazonaws.com", false, true);
updateRegion(region, "elasticloadbalancing",
"elasticloadbalancing.us-gov-west-1.amazonaws.com", false, true);
- updateRegion(region, "sts", "sts.amazonaws.com", false, true);
updateRegion(region, "sns", "sns.us-gov-west-1.amazonaws.com", false, true);
- updateRegion(region, "sqs", "sqs.us-gov-west-1.amazonaws.com", false, true);
- updateRegion(region, "autoscaling", "autoscaling.us-gov-west-1.amazonaws.com", false, true);
- updateRegion(region, "kinesis", "kinesis.us-gov-west-1.amazonaws.com", false, true);
+ updateRegion(region, "sts", "sts.amazonaws.com", false, true);
+ updateRegion(region, "dynamodb", "dynamodb.us-gov-west-1.amazonaws.com", false, true);
return ret;
}
diff --git a/aws-android-sdk-core/src/main/java/com/amazonaws/util/VersionInfoUtils.java b/aws-android-sdk-core/src/main/java/com/amazonaws/util/VersionInfoUtils.java
index 366f6f1fdc1..ef021ec3fd0 100644
--- a/aws-android-sdk-core/src/main/java/com/amazonaws/util/VersionInfoUtils.java
+++ b/aws-android-sdk-core/src/main/java/com/amazonaws/util/VersionInfoUtils.java
@@ -26,7 +26,7 @@ public class VersionInfoUtils {
private static final int DEFAULT_STRING_LENGTH = 128;
/** SDK version info */
- private static volatile String version = "2.4.7";
+ private static volatile String version = "2.6.0";
// changed build
// logic
diff --git a/aws-android-sdk-core/src/main/resources/fabric/com.amazonaws.aws-android-sdk-core.properties b/aws-android-sdk-core/src/main/resources/fabric/com.amazonaws.aws-android-sdk-core.properties
index 73d8b047ce8..6b0f25dc2c7 100644
--- a/aws-android-sdk-core/src/main/resources/fabric/com.amazonaws.aws-android-sdk-core.properties
+++ b/aws-android-sdk-core/src/main/resources/fabric/com.amazonaws.aws-android-sdk-core.properties
@@ -1,3 +1,3 @@
fabric-identifier=com.amazonaws.aws-android-sdk-core
-fabric-version=2.4.7
+fabric-version=2.6.0
fabric-build-type=binary
diff --git a/aws-android-sdk-core/src/test/java/com/amazonaws/util/VersionInfoUtilsTest.java b/aws-android-sdk-core/src/test/java/com/amazonaws/util/VersionInfoUtilsTest.java
index db6c3213e12..5fc0ef02279 100644
--- a/aws-android-sdk-core/src/test/java/com/amazonaws/util/VersionInfoUtilsTest.java
+++ b/aws-android-sdk-core/src/test/java/com/amazonaws/util/VersionInfoUtilsTest.java
@@ -24,7 +24,7 @@ public class VersionInfoUtilsTest {
@Test
public void getVersion() {
- assertEquals("2.4.7", VersionInfoUtils.getVersion());
+ assertEquals("2.6.0", VersionInfoUtils.getVersion());
}
@Test
diff --git a/aws-android-sdk-ddb-document/pom.xml b/aws-android-sdk-ddb-document/pom.xml
index 9b08fb7fe53..52305111925 100644
--- a/aws-android-sdk-ddb-document/pom.xml
+++ b/aws-android-sdk-ddb-document/pom.xml
@@ -12,7 +12,7 @@
com.amazonaws
aws-android-sdk-pom
- 2.4.7
+ 2.6.0
@@ -20,13 +20,13 @@
com.amazonaws
aws-android-sdk-core
false
- 2.4.7
+ 2.6.0