Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2902048
D3119.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D3119.diff
View Options
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -20,6 +20,7 @@
ports:
- "${COMM_SERVICES_PORT_TUNNELBROKER}:50051"
volumes:
+ - $HOME/.aws/config:/root/.aws/config:ro
- $HOME/.aws/credentials:/root/.aws/credentials:ro
- ./tunnelbroker/tunnelbroker.ini:/root/tunnelbroker/tunnelbroker.ini:ro
# backup
diff --git a/services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp b/services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp
--- a/services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp
+++ b/services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp
@@ -13,13 +13,6 @@
return profileRegion;
}
}
- if (Aws::Config::HasCachedCredentialsProfile(profileName)) {
- auto profile = Aws::Config::GetCachedCredentialsProfile(profileName);
- Aws::String credRegion = profile.GetRegion();
- if (!credRegion.empty()) {
- return credRegion;
- }
- }
return {};
}
@@ -28,7 +21,7 @@
config.region = getAwsRegion();
if (config.region.empty()) {
throw std::runtime_error(
- "Error: AWS region is not provided in the credentials.");
+ "Error: AWS region is not provided in the ~/.aws/config");
}
return std::make_unique<Aws::DynamoDB::DynamoDBClient>(config);
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Oct 6, 3:29 PM (21 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2250133
Default Alt Text
D3119.diff (1 KB)
Attached To
Mode
D3119: [services] Tunnelbroker - Get AWS region from aws/config only.
Attached
Detach File
Event Timeline
Log In to Comment