Using us-east-1 for IAM clients in integration tests.

Author: wps132230

aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp

@@ -57,8 +57,10 @@ class IdentityPoolOperationTest : public ::testing::Test
 protected:
     void SetUp()
     {
+        Aws::Client::ClientConfiguration config;
+        config.region = Aws::Region::US_EAST_1;
         //TODO: move this over to profile config file.
-        client = Aws::MakeShared<CognitoIdentityClient>(ALLOCATION_TAG);
+        client = Aws::MakeShared<CognitoIdentityClient>(ALLOCATION_TAG, config);
         CleanupPreviousFailedTests();
     }
 
@@ -97,7 +99,7 @@ class IdentityPoolOperationTest : public ::testing::Test
             ListIdentitiesRequest listIdentitiesRequest;
             listIdentitiesRequest.WithIdentityPoolId(identityPoolId).WithMaxResults(10);
             ListIdentitiesOutcome listIdentitiesOutcome = client->ListIdentities(listIdentitiesRequest);
-            
+
             if (listIdentitiesOutcome.IsSuccess())
             {
                 if (listIdentitiesOutcome.GetResult().GetIdentities().size() > 0)
@@ -246,12 +248,13 @@ TEST_F(IdentityPoolOperationTest, TestIdentityActions)
 
     GetIdRequest getIdRequest;
     getIdRequest.WithIdentityPoolId(identityPoolId);
-    
+
     ClientConfiguration clientConfig;
+    clientConfig.region = Aws::Region::US_EAST_1;
 
     auto iamClient = Aws::MakeShared<Aws::IAM::IAMClient>(ALLOCATION_TAG, clientConfig);
     Aws::AccessManagement::AccessManagementClient accessManagementClient(iamClient, client);
-    
+
     getIdRequest.WithAccountId(accessManagementClient.GetAccountId());
 
     GetIdOutcome getIdOutcome = client->GetId(getIdRequest);

aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp

@@ -110,6 +110,7 @@ class FunctionTest : public ::testing::Test {
 
         // Create a client
         ClientConfiguration config;
+        config.region = Aws::Region::US_EAST_1;
         config.scheme = Scheme::HTTPS;
         config.connectTimeoutMs = 30000;
         config.requestTimeoutMs = 30000;
@@ -123,6 +124,7 @@ class FunctionTest : public ::testing::Test {
         //Create our IAM Role, so that the Lambda tests have the right policies.
         m_role = Aws::MakeShared<Aws::IAM::Model::Role>(ALLOCATION_TAG);
         ClientConfiguration clientConfig;
+        clientConfig.region = Aws::Region::US_EAST_1;
         m_iamClient = Aws::MakeShared<Aws::IAM::IAMClient>(ALLOCATION_TAG, clientConfig);
         auto cognitoClient = Aws::MakeShared<CognitoIdentityClient>(ALLOCATION_TAG);
         m_accessManagementClient = Aws::MakeShared<Aws::AccessManagement::AccessManagementClient>(ALLOCATION_TAG, m_iamClient, cognitoClient);

aws-cpp-sdk-s3-encryption-integration-tests/LiveClientTests.cpp

@@ -48,7 +48,9 @@ class LiveClientTest : public ::testing::Test
     {
         TimeStamp = DateTime::Now().CalculateLocalTimestampAsString("%Y%m%dt%H%M%Sz").c_str();
 
-        StandardClient = Aws::MakeShared<Aws::S3::S3Client>(ALLOCATION_TAG);
+        ClientConfiguration config;
+        config.region = Aws::Region::US_EAST_1;
+        StandardClient = Aws::MakeShared<Aws::S3::S3Client>(ALLOCATION_TAG, config);
         BucketName = ComputeUniqueBucketName(ENCRYPTED_BUCKET_TEST_NAME).c_str();
         Model::CreateBucketRequest createBucketRequest;
         createBucketRequest.WithBucket(BucketName.c_str())
@@ -86,12 +88,15 @@ TEST_F(LiveClientTest, TestEOMode)
     configuration.SetCryptoMode(CryptoMode::ENCRYPTION_ONLY);
     configuration.SetStorageMethod(StorageMethod::METADATA);
 
+    ClientConfiguration s3ClientConfig;
+    s3ClientConfig.region = Aws::Region::US_EAST_1;
+
     auto key = SymmetricCipher::GenerateKey();
     auto simpleEncryptionMaterials = Aws::MakeShared<Materials::SimpleEncryptionMaterialsWithGCMAAD>(ALLOCATION_TAG, key);
 
     static const char* objectKey = "TestEOKey";
 
-    S3EncryptionClient client(simpleEncryptionMaterials, configuration);
+    S3EncryptionClient client(simpleEncryptionMaterials, configuration, s3ClientConfig);
 
     Model::PutObjectRequest putObjectRequest;
     putObjectRequest.WithBucket(BucketName.c_str())
@@ -164,12 +169,15 @@ TEST_F(LiveClientTest, TestAEMode)
     configuration.SetCryptoMode(CryptoMode::AUTHENTICATED_ENCRYPTION);
     configuration.SetStorageMethod(StorageMethod::METADATA);
 
+    ClientConfiguration s3ClientConfig;
+    s3ClientConfig.region = Aws::Region::US_EAST_1;
+
     auto key = SymmetricCipher::GenerateKey();
     auto simpleEncryptionMaterials = Aws::MakeShared<Materials::SimpleEncryptionMaterialsWithGCMAAD>(ALLOCATION_TAG, key);
 
     static const char* objectKey = "TestAEKey";
 
-    S3EncryptionClient client(simpleEncryptionMaterials, configuration);
+    S3EncryptionClient client(simpleEncryptionMaterials, configuration, s3ClientConfig);
 
     Model::PutObjectRequest putObjectRequest;
     putObjectRequest.WithBucket(BucketName.c_str())
@@ -248,12 +256,15 @@ TEST_F(LiveClientTest, TestAEModeRangeGet)
     configuration.SetCryptoMode(CryptoMode::AUTHENTICATED_ENCRYPTION);
     configuration.SetStorageMethod(StorageMethod::METADATA);
 
+    ClientConfiguration s3ClientConfig;
+    s3ClientConfig.region = Aws::Region::US_EAST_1;
+
     auto key = SymmetricCipher::GenerateKey();
     auto simpleEncryptionMaterials = Aws::MakeShared<Materials::SimpleEncryptionMaterialsWithGCMAAD>(ALLOCATION_TAG, key);
 
     static const char* objectKey = "TestAERangeGetKey";
 
-    S3EncryptionClient client(simpleEncryptionMaterials, configuration);
+    S3EncryptionClient client(simpleEncryptionMaterials, configuration, s3ClientConfig);
 
     Model::PutObjectRequest putObjectRequest;
     putObjectRequest.WithBucket(BucketName.c_str())
@@ -329,10 +340,13 @@ TEST_F(LiveClientTest, TestAEModeRangeGet)
 
 TEST_F(LiveClientTest, TestS3EncryptionError)
 {
+    ClientConfiguration s3ClientConfig;
+    s3ClientConfig.region = Aws::Region::US_EAST_1;
+
     auto kmsMaterials = Aws::MakeShared<Aws::S3Encryption::Materials::KMSWithContextEncryptionMaterials>("s3Encryption", "badKey");
     Aws::S3Encryption::CryptoConfiguration cryptoConfiguration(Aws::S3Encryption::StorageMethod::METADATA, Aws::S3Encryption::CryptoMode::ENCRYPTION_ONLY);
     auto credentials = Aws::MakeShared<Aws::Auth::DefaultAWSCredentialsProviderChain>("s3Encryption");
-    Aws::S3Encryption::S3EncryptionClient encryptionClient(kmsMaterials, cryptoConfiguration, credentials);
+    Aws::S3Encryption::S3EncryptionClient encryptionClient(kmsMaterials, cryptoConfiguration, credentials, s3ClientConfig);
 
     Model::PutObjectRequest putObjectRequest;
     putObjectRequest.WithBucket("badBucket").WithKey("badKey");

aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp

@@ -85,6 +85,7 @@ class QueueOperationTest : public ::testing::Test
     static ClientConfiguration GetConfig()
     {
         ClientConfiguration config("default");
+        config.region = Aws::Region::US_EAST_1;
 
 #if USE_PROXY_FOR_TESTS
         config.scheme = Scheme::HTTP;
@@ -148,7 +149,7 @@ class QueueOperationTest : public ::testing::Test
     Aws::String GetAwsAccountId()
     {
         auto cognitoClient = Aws::MakeShared<Aws::CognitoIdentity::CognitoIdentityClient>(ALLOCATION_TAG, GetConfig());
-        auto iamClient = Aws::MakeShared<Aws::IAM::IAMClient>(ALLOCATION_TAG);
+        auto iamClient = Aws::MakeShared<Aws::IAM::IAMClient>(ALLOCATION_TAG, GetConfig());
         Aws::AccessManagement::AccessManagementClient accessManagementClient(iamClient, cognitoClient);
         return accessManagementClient.GetAccountId();
     }