updated conflicts

kai-ion · kai-ion · commit 7ff6c82c1294 · 2025-07-31T11:40:02.000-04:00
diff --git a/src/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h b/src/aws-cpp-sdk-core/include/aws/core/client/ClientConfiguration.h
@@ -493,6 +493,11 @@ namespace Aws
             */
             Aws::String profile;
 
+            /**
+             * Region to use for calls
+             */
+            Aws::String region;
+
             /**
              * IMDS configuration settings
              */
diff --git a/src/aws-cpp-sdk-core/source/auth/STSCredentialsProvider.cpp b/src/aws-cpp-sdk-core/source/auth/STSCredentialsProvider.cpp
@@ -107,7 +107,7 @@ Aws::String LegacyGetRegion() {
 
 STSAssumeRoleWebIdentityCredentialsProvider::STSAssumeRoleWebIdentityCredentialsProvider()
     : STSAssumeRoleWebIdentityCredentialsProvider(
-          Aws::Client::ClientConfiguration::CredentialProviderConfiguration{Aws::Auth::GetConfigProfileName(), LegacyGetRegion()}) {}
+          Aws::Client::ClientConfiguration::CredentialProviderConfiguration{Aws::Auth::GetConfigProfileName(), LegacyGetRegion(), {}}) {}
 
 AWSCredentials STSAssumeRoleWebIdentityCredentialsProvider::GetAWSCredentials()
 {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ Aws::String LegacyGetRegion() {`
`107`	`107`
`108`	`108`	`STSAssumeRoleWebIdentityCredentialsProvider::STSAssumeRoleWebIdentityCredentialsProvider()`
`109`	`109`	`: STSAssumeRoleWebIdentityCredentialsProvider(`
`110`		`- Aws::Client::ClientConfiguration::CredentialProviderConfiguration{Aws::Auth::GetConfigProfileName(), LegacyGetRegion()}) {}`
	`110`	`+ Aws::Client::ClientConfiguration::CredentialProviderConfiguration{Aws::Auth::GetConfigProfileName(), LegacyGetRegion(), {}}) {}`
`111`	`111`
`112`	`112`	`AWSCredentials STSAssumeRoleWebIdentityCredentialsProvider::GetAWSCredentials()`
`113`	`113`	`{`