Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fffaa72

Browse files
JonathanHensonJonathanHenson
committed
Merge branch 'master' into release-candidate
2 parents 7c28580 + 5815229 commit fffaa72

File tree

277 files changed

+12485
-5589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+12485
-5589
lines changed

‎aws-cpp-sdk-acm/nuget/aws-cpp-sdk-acm.autopkg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ nuget {
1313
id = AWSSDKCPP-ACM;
1414

1515
// Version number. Follows NuGet standards. (currently SemVer 1.0)
16-
version : 1.0.20151208.44;
16+
version : 1.0.20151208.45;
1717

1818
// Display name for package.
1919
title: AWS SDK for C++ (AWS Certificate Manager);

‎aws-cpp-sdk-apigateway/include/aws/apigateway/APIGatewayClient.h‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
#include <aws/apigateway/model/GetRestApiResult.h>
6565
#include <aws/apigateway/model/GetRestApisResult.h>
6666
#include <aws/apigateway/model/GetSdkResult.h>
67+
#include <aws/apigateway/model/GetSdkTypeResult.h>
68+
#include <aws/apigateway/model/GetSdkTypesResult.h>
6769
#include <aws/apigateway/model/GetStageResult.h>
6870
#include <aws/apigateway/model/GetStagesResult.h>
6971
#include <aws/apigateway/model/GetUsageResult.h>
@@ -210,6 +212,8 @@ namespace Model
210212
class GetRestApiRequest;
211213
class GetRestApisRequest;
212214
class GetSdkRequest;
215+
class GetSdkTypeRequest;
216+
class GetSdkTypesRequest;
213217
class GetStageRequest;
214218
class GetStagesRequest;
215219
class GetUsageRequest;
@@ -311,6 +315,8 @@ namespace Model
311315
typedef Aws::Utils::Outcome<GetRestApiResult, Aws::Client::AWSError<APIGatewayErrors>> GetRestApiOutcome;
312316
typedef Aws::Utils::Outcome<GetRestApisResult, Aws::Client::AWSError<APIGatewayErrors>> GetRestApisOutcome;
313317
typedef Aws::Utils::Outcome<GetSdkResult, Aws::Client::AWSError<APIGatewayErrors>> GetSdkOutcome;
318+
typedef Aws::Utils::Outcome<GetSdkTypeResult, Aws::Client::AWSError<APIGatewayErrors>> GetSdkTypeOutcome;
319+
typedef Aws::Utils::Outcome<GetSdkTypesResult, Aws::Client::AWSError<APIGatewayErrors>> GetSdkTypesOutcome;
314320
typedef Aws::Utils::Outcome<GetStageResult, Aws::Client::AWSError<APIGatewayErrors>> GetStageOutcome;
315321
typedef Aws::Utils::Outcome<GetStagesResult, Aws::Client::AWSError<APIGatewayErrors>> GetStagesOutcome;
316322
typedef Aws::Utils::Outcome<GetUsageResult, Aws::Client::AWSError<APIGatewayErrors>> GetUsageOutcome;
@@ -412,6 +418,8 @@ namespace Model
412418
typedef std::future<GetRestApiOutcome> GetRestApiOutcomeCallable;
413419
typedef std::future<GetRestApisOutcome> GetRestApisOutcomeCallable;
414420
typedef std::future<GetSdkOutcome> GetSdkOutcomeCallable;
421+
typedef std::future<GetSdkTypeOutcome> GetSdkTypeOutcomeCallable;
422+
typedef std::future<GetSdkTypesOutcome> GetSdkTypesOutcomeCallable;
415423
typedef std::future<GetStageOutcome> GetStageOutcomeCallable;
416424
typedef std::future<GetStagesOutcome> GetStagesOutcomeCallable;
417425
typedef std::future<GetUsageOutcome> GetUsageOutcomeCallable;
@@ -516,6 +524,8 @@ namespace Model
516524
typedef std::function<void(const APIGatewayClient*, const Model::GetRestApiRequest&, const Model::GetRestApiOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetRestApiResponseReceivedHandler;
517525
typedef std::function<void(const APIGatewayClient*, const Model::GetRestApisRequest&, const Model::GetRestApisOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetRestApisResponseReceivedHandler;
518526
typedef std::function<void(const APIGatewayClient*, const Model::GetSdkRequest&, const Model::GetSdkOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetSdkResponseReceivedHandler;
527+
typedef std::function<void(const APIGatewayClient*, const Model::GetSdkTypeRequest&, const Model::GetSdkTypeOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetSdkTypeResponseReceivedHandler;
528+
typedef std::function<void(const APIGatewayClient*, const Model::GetSdkTypesRequest&, const Model::GetSdkTypesOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetSdkTypesResponseReceivedHandler;
519529
typedef std::function<void(const APIGatewayClient*, const Model::GetStageRequest&, const Model::GetStageOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetStageResponseReceivedHandler;
520530
typedef std::function<void(const APIGatewayClient*, const Model::GetStagesRequest&, const Model::GetStagesOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetStagesResponseReceivedHandler;
521531
typedef std::function<void(const APIGatewayClient*, const Model::GetUsageRequest&, const Model::GetUsageOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetUsageResponseReceivedHandler;
@@ -2255,6 +2265,44 @@ namespace Model
22552265
*/
22562266
virtual void GetSdkAsync(const Model::GetSdkRequest& request, const GetSdkResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
22572267

2268+
/**
2269+
*
2270+
*/
2271+
virtual Model::GetSdkTypeOutcome GetSdkType(const Model::GetSdkTypeRequest& request) const;
2272+
2273+
/**
2274+
*
2275+
*
2276+
* returns a future to the operation so that it can be executed in parallel to other requests.
2277+
*/
2278+
virtual Model::GetSdkTypeOutcomeCallable GetSdkTypeCallable(const Model::GetSdkTypeRequest& request) const;
2279+
2280+
/**
2281+
*
2282+
*
2283+
* Queues the request into a thread executor and triggers associated callback when operation has finished.
2284+
*/
2285+
virtual void GetSdkTypeAsync(const Model::GetSdkTypeRequest& request, const GetSdkTypeResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
2286+
2287+
/**
2288+
*
2289+
*/
2290+
virtual Model::GetSdkTypesOutcome GetSdkTypes(const Model::GetSdkTypesRequest& request) const;
2291+
2292+
/**
2293+
*
2294+
*
2295+
* returns a future to the operation so that it can be executed in parallel to other requests.
2296+
*/
2297+
virtual Model::GetSdkTypesOutcomeCallable GetSdkTypesCallable(const Model::GetSdkTypesRequest& request) const;
2298+
2299+
/**
2300+
*
2301+
*
2302+
* Queues the request into a thread executor and triggers associated callback when operation has finished.
2303+
*/
2304+
virtual void GetSdkTypesAsync(const Model::GetSdkTypesRequest& request, const GetSdkTypesResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
2305+
22582306
/**
22592307
* <p>Gets information about a <a>Stage</a> resource.</p><p><h3>See Also:</h3> <a
22602308
* href="http://docs.aws.amazon.com/goto/WebAPI/apigateway-2015-07-09/GetStage">AWS
@@ -3290,6 +3338,8 @@ namespace Model
32903338
void GetRestApiAsyncHelper(const Model::GetRestApiRequest& request, const GetRestApiResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
32913339
void GetRestApisAsyncHelper(const Model::GetRestApisRequest& request, const GetRestApisResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
32923340
void GetSdkAsyncHelper(const Model::GetSdkRequest& request, const GetSdkResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
3341+
void GetSdkTypeAsyncHelper(const Model::GetSdkTypeRequest& request, const GetSdkTypeResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
3342+
void GetSdkTypesAsyncHelper(const Model::GetSdkTypesRequest& request, const GetSdkTypesResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
32933343
void GetStageAsyncHelper(const Model::GetStageRequest& request, const GetStageResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
32943344
void GetStagesAsyncHelper(const Model::GetStagesRequest& request, const GetStagesResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
32953345
void GetUsageAsyncHelper(const Model::GetUsageRequest& request, const GetUsageResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;

‎aws-cpp-sdk-apigateway/include/aws/apigateway/model/GetIntegrationResult.h‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ namespace Model
4242
* class="remarks">In the API Gateway console, the built-in Lambda integration is
4343
* an AWS integration.</div> <div class="seeAlso"> <a
4444
* href="http://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-create-api.html">Creating
45-
* an API</a>, <a
46-
* href="http://docs.aws.amazon.com/apigateway/latest/developerguide/.html"/>
47-
* </div><p><h3>See Also:</h3> <a
45+
* an API</a> </div><p><h3>See Also:</h3> <a
4846
* href="http://docs.aws.amazon.com/goto/WebAPI/apigateway-2015-07-09/Integration">AWS
4947
* API Reference</a></p>
5048
*/
@@ -143,8 +141,9 @@ namespace Model
143141
/**
144142
* <p>Specifies the integration's Uniform Resource Identifier (URI). For HTTP
145143
* integrations, the URI must be a fully formed, encoded HTTP(S) URL according to
146-
* the <a href="https://www.ietf.org/rfc/rfc3986.txt" target="_blank">RFC-3986
147-
* specification</a>. For AWS integrations, the URI should be of the form
144+
* the <a href="https://en.wikipedia.org/wiki/Uniform_Resource_Identifier"
145+
* target="_blank">RFC-3986 specification</a>. For AWS integrations, the URI should
146+
* be of the form
148147
* <code>arn:aws:apigateway:{region}:{subdomain.service|service}:{path|action}/{service_api}</code>.
149148
* <code>Region</code>, <code>subdomain</code> and <code>service</code> are used to
150149
* determine the right endpoint. For AWS services that use the <code>Action=</code>
@@ -158,8 +157,9 @@ namespace Model
158157
/**
159158
* <p>Specifies the integration's Uniform Resource Identifier (URI). For HTTP
160159
* integrations, the URI must be a fully formed, encoded HTTP(S) URL according to
161-
* the <a href="https://www.ietf.org/rfc/rfc3986.txt" target="_blank">RFC-3986
162-
* specification</a>. For AWS integrations, the URI should be of the form
160+
* the <a href="https://en.wikipedia.org/wiki/Uniform_Resource_Identifier"
161+
* target="_blank">RFC-3986 specification</a>. For AWS integrations, the URI should
162+
* be of the form
163163
* <code>arn:aws:apigateway:{region}:{subdomain.service|service}:{path|action}/{service_api}</code>.
164164
* <code>Region</code>, <code>subdomain</code> and <code>service</code> are used to
165165
* determine the right endpoint. For AWS services that use the <code>Action=</code>
@@ -173,8 +173,9 @@ namespace Model
173173
/**
174174
* <p>Specifies the integration's Uniform Resource Identifier (URI). For HTTP
175175
* integrations, the URI must be a fully formed, encoded HTTP(S) URL according to
176-
* the <a href="https://www.ietf.org/rfc/rfc3986.txt" target="_blank">RFC-3986
177-
* specification</a>. For AWS integrations, the URI should be of the form
176+
* the <a href="https://en.wikipedia.org/wiki/Uniform_Resource_Identifier"
177+
* target="_blank">RFC-3986 specification</a>. For AWS integrations, the URI should
178+
* be of the form
178179
* <code>arn:aws:apigateway:{region}:{subdomain.service|service}:{path|action}/{service_api}</code>.
179180
* <code>Region</code>, <code>subdomain</code> and <code>service</code> are used to
180181
* determine the right endpoint. For AWS services that use the <code>Action=</code>
@@ -188,8 +189,9 @@ namespace Model
188189
/**
189190
* <p>Specifies the integration's Uniform Resource Identifier (URI). For HTTP
190191
* integrations, the URI must be a fully formed, encoded HTTP(S) URL according to
191-
* the <a href="https://www.ietf.org/rfc/rfc3986.txt" target="_blank">RFC-3986
192-
* specification</a>. For AWS integrations, the URI should be of the form
192+
* the <a href="https://en.wikipedia.org/wiki/Uniform_Resource_Identifier"
193+
* target="_blank">RFC-3986 specification</a>. For AWS integrations, the URI should
194+
* be of the form
193195
* <code>arn:aws:apigateway:{region}:{subdomain.service|service}:{path|action}/{service_api}</code>.
194196
* <code>Region</code>, <code>subdomain</code> and <code>service</code> are used to
195197
* determine the right endpoint. For AWS services that use the <code>Action=</code>
@@ -203,8 +205,9 @@ namespace Model
203205
/**
204206
* <p>Specifies the integration's Uniform Resource Identifier (URI). For HTTP
205207
* integrations, the URI must be a fully formed, encoded HTTP(S) URL according to
206-
* the <a href="https://www.ietf.org/rfc/rfc3986.txt" target="_blank">RFC-3986
207-
* specification</a>. For AWS integrations, the URI should be of the form
208+
* the <a href="https://en.wikipedia.org/wiki/Uniform_Resource_Identifier"
209+
* target="_blank">RFC-3986 specification</a>. For AWS integrations, the URI should
210+
* be of the form
208211
* <code>arn:aws:apigateway:{region}:{subdomain.service|service}:{path|action}/{service_api}</code>.
209212
* <code>Region</code>, <code>subdomain</code> and <code>service</code> are used to
210213
* determine the right endpoint. For AWS services that use the <code>Action=</code>
@@ -218,8 +221,9 @@ namespace Model
218221
/**
219222
* <p>Specifies the integration's Uniform Resource Identifier (URI). For HTTP
220223
* integrations, the URI must be a fully formed, encoded HTTP(S) URL according to
221-
* the <a href="https://www.ietf.org/rfc/rfc3986.txt" target="_blank">RFC-3986
222-
* specification</a>. For AWS integrations, the URI should be of the form
224+
* the <a href="https://en.wikipedia.org/wiki/Uniform_Resource_Identifier"
225+
* target="_blank">RFC-3986 specification</a>. For AWS integrations, the URI should
226+
* be of the form
223227
* <code>arn:aws:apigateway:{region}:{subdomain.service|service}:{path|action}/{service_api}</code>.
224228
* <code>Region</code>, <code>subdomain</code> and <code>service</code> are used to
225229
* determine the right endpoint. For AWS services that use the <code>Action=</code>
@@ -233,8 +237,9 @@ namespace Model
233237
/**
234238
* <p>Specifies the integration's Uniform Resource Identifier (URI). For HTTP
235239
* integrations, the URI must be a fully formed, encoded HTTP(S) URL according to
236-
* the <a href="https://www.ietf.org/rfc/rfc3986.txt" target="_blank">RFC-3986
237-
* specification</a>. For AWS integrations, the URI should be of the form
240+
* the <a href="https://en.wikipedia.org/wiki/Uniform_Resource_Identifier"
241+
* target="_blank">RFC-3986 specification</a>. For AWS integrations, the URI should
242+
* be of the form
238243
* <code>arn:aws:apigateway:{region}:{subdomain.service|service}:{path|action}/{service_api}</code>.
239244
* <code>Region</code>, <code>subdomain</code> and <code>service</code> are used to
240245
* determine the right endpoint. For AWS services that use the <code>Action=</code>

‎aws-cpp-sdk-apigateway/include/aws/apigateway/model/GetMethodResult.h‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,69 @@ namespace Model
262262
*/
263263
inline GetMethodResult& WithApiKeyRequired(bool value) { SetApiKeyRequired(value); return *this;}
264264

265+
/**
266+
* <p>A human-friendly operation identifier for the method. For example, you can
267+
* assign the <code>operationName</code> of <code>ListPets</code> for the <code>GET
268+
* /pets</code> method in <a
269+
* href="http://petstore-demo-endpoint.execute-api.com/petstore/pets">PetStore</a>
270+
* example.</p>
271+
*/
272+
inline const Aws::String& GetOperationName() const{ return m_operationName; }
273+
274+
/**
275+
* <p>A human-friendly operation identifier for the method. For example, you can
276+
* assign the <code>operationName</code> of <code>ListPets</code> for the <code>GET
277+
* /pets</code> method in <a
278+
* href="http://petstore-demo-endpoint.execute-api.com/petstore/pets">PetStore</a>
279+
* example.</p>
280+
*/
281+
inline void SetOperationName(const Aws::String& value) { m_operationName = value; }
282+
283+
/**
284+
* <p>A human-friendly operation identifier for the method. For example, you can
285+
* assign the <code>operationName</code> of <code>ListPets</code> for the <code>GET
286+
* /pets</code> method in <a
287+
* href="http://petstore-demo-endpoint.execute-api.com/petstore/pets">PetStore</a>
288+
* example.</p>
289+
*/
290+
inline void SetOperationName(Aws::String&& value) { m_operationName = value; }
291+
292+
/**
293+
* <p>A human-friendly operation identifier for the method. For example, you can
294+
* assign the <code>operationName</code> of <code>ListPets</code> for the <code>GET
295+
* /pets</code> method in <a
296+
* href="http://petstore-demo-endpoint.execute-api.com/petstore/pets">PetStore</a>
297+
* example.</p>
298+
*/
299+
inline void SetOperationName(const char* value) { m_operationName.assign(value); }
300+
301+
/**
302+
* <p>A human-friendly operation identifier for the method. For example, you can
303+
* assign the <code>operationName</code> of <code>ListPets</code> for the <code>GET
304+
* /pets</code> method in <a
305+
* href="http://petstore-demo-endpoint.execute-api.com/petstore/pets">PetStore</a>
306+
* example.</p>
307+
*/
308+
inline GetMethodResult& WithOperationName(const Aws::String& value) { SetOperationName(value); return *this;}
309+
310+
/**
311+
* <p>A human-friendly operation identifier for the method. For example, you can
312+
* assign the <code>operationName</code> of <code>ListPets</code> for the <code>GET
313+
* /pets</code> method in <a
314+
* href="http://petstore-demo-endpoint.execute-api.com/petstore/pets">PetStore</a>
315+
* example.</p>
316+
*/
317+
inline GetMethodResult& WithOperationName(Aws::String&& value) { SetOperationName(value); return *this;}
318+
319+
/**
320+
* <p>A human-friendly operation identifier for the method. For example, you can
321+
* assign the <code>operationName</code> of <code>ListPets</code> for the <code>GET
322+
* /pets</code> method in <a
323+
* href="http://petstore-demo-endpoint.execute-api.com/petstore/pets">PetStore</a>
324+
* example.</p>
325+
*/
326+
inline GetMethodResult& WithOperationName(const char* value) { SetOperationName(value); return *this;}
327+
265328
/**
266329
* <p>A key-value map defining required or optional method request parameters that
267330
* can be accepted by Amazon API Gateway. A key is a method request parameter name
@@ -1056,6 +1119,7 @@ namespace Model
10561119
Aws::String m_authorizationType;
10571120
Aws::String m_authorizerId;
10581121
bool m_apiKeyRequired;
1122+
Aws::String m_operationName;
10591123
Aws::Map<Aws::String, bool> m_requestParameters;
10601124
Aws::Map<Aws::String, Aws::String> m_requestModels;
10611125
Aws::Map<Aws::String, MethodResponse> m_methodResponses;

0 commit comments

Comments
 (0)