Skip to content

Commit 462afb7

Browse files
committed
update to use a service object instead of using getvalue
1 parent 4fd1886 commit 462afb7

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/aws-cpp-sdk-core/include/aws/core/config/AWSProfileConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ namespace Aws
115115
return iter->second;
116116
}
117117

118-
inline const Services& GetServiceEndpoints() const { return m_services; }
118+
inline const Services& GetServices() const { return m_services; }
119119

120120
inline Aws::Crt::Optional<Aws::String> GetEndpointUrl() const {
121121
const Aws::String& endpoint = GetValue("endpoint_url");

tests/aws-cpp-sdk-core-tests/aws/config/ServiceEndpointsConfigFileLoaderTest.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificEndpoints)
4747
ASSERT_STREQ("https://global.example.com", globalEndpoint->c_str());
4848

4949
// Test services endpoints are parsed correctly
50-
const auto& services = profile.GetServiceEndpoints();
50+
const auto& services = profile.GetServices();
5151
ASSERT_TRUE(services.IsSet());
5252
const auto& endpoints = services.GetEndpoints();
5353
ASSERT_EQ(2u, endpoints.size());
@@ -79,7 +79,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificEndpointsOnly)
7979
ASSERT_FALSE(globalEndpoint.has_value());
8080

8181
// Test services endpoints are parsed correctly
82-
const auto& services = profile.GetServiceEndpoints();
82+
const auto& services = profile.GetServices();
8383
ASSERT_TRUE(services.IsSet());
8484
const auto& endpoints = services.GetEndpoints();
8585
ASSERT_EQ(1u, endpoints.size());
@@ -108,7 +108,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestGlobalEndpointOnly)
108108
ASSERT_STREQ("https://play.min.io:9000", globalEndpoint->c_str());
109109

110110
// Test that services endpoints are not set
111-
const auto& services = profile.GetServiceEndpoints();
111+
const auto& services = profile.GetServices();
112112
ASSERT_FALSE(services.IsSet());
113113
}
114114

@@ -133,7 +133,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestServiceSpecificAndGlobalEndpoin
133133
const auto& profile = profileIt->second;
134134

135135
// Test services endpoints are parsed correctly
136-
const auto& services = profile.GetServiceEndpoints();
136+
const auto& services = profile.GetServices();
137137
ASSERT_TRUE(services.IsSet());
138138
const auto& endpoints = services.GetEndpoints();
139139
ASSERT_EQ(1u, endpoints.size());
@@ -167,7 +167,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestMultipleServicesInDefinition)
167167
const auto& profile = profileIt->second;
168168

169169
// Test services endpoints are parsed correctly
170-
const auto& services = profile.GetServiceEndpoints();
170+
const auto& services = profile.GetServices();
171171
ASSERT_TRUE(services.IsSet());
172172
const auto& endpoints = services.GetEndpoints();
173173
ASSERT_EQ(2u, endpoints.size());
@@ -198,7 +198,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestIgnoreGlobalEndpointInServicesS
198198
ASSERT_FALSE(globalEndpoint.has_value());
199199

200200
// Test that services endpoints are empty (global endpoint_url ignored)
201-
const auto& services = profile.GetServiceEndpoints();
201+
const auto& services = profile.GetServices();
202202
ASSERT_TRUE(services.IsSet());
203203
const auto& endpoints = services.GetEndpoints();
204204
ASSERT_EQ(0u, endpoints.size());
@@ -232,7 +232,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestSourceProfileEndpointIsolation)
232232
const auto& profileA = profileAIt->second;
233233

234234
// Test that profile B has services endpoints
235-
const auto& servicesB = profileB.GetServiceEndpoints();
235+
const auto& servicesB = profileB.GetServices();
236236
ASSERT_TRUE(servicesB.IsSet());
237237
const auto& endpointsB = servicesB.GetEndpoints();
238238
ASSERT_EQ(1u, endpointsB.size());
@@ -248,7 +248,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestSourceProfileEndpointIsolation)
248248
ASSERT_STREQ("https://profile-a-endpoint.aws/", globalEndpointA->c_str());
249249

250250
// Test that profile A has no services name
251-
const auto& servicesA = profileA.GetServiceEndpoints();
251+
const auto& servicesA = profileA.GetServices();
252252
ASSERT_FALSE(servicesA.IsSet());
253253
}
254254

@@ -299,7 +299,7 @@ TEST_F(ServiceEndpointsConfigFileLoaderTest, TestMultipleServicesDefinitions)
299299
const auto& profile = profileIt->second;
300300

301301
// Test services endpoints are parsed correctly
302-
const auto& services = profile.GetServiceEndpoints();
302+
const auto& services = profile.GetServices();
303303
ASSERT_TRUE(services.IsSet());
304304
const auto& endpoints = services.GetEndpoints();
305305
ASSERT_EQ(1u, endpoints.size());

0 commit comments

Comments
 (0)