Skip to content

Commit 634da03

Browse files
committed
Merge branch 'main' of https://github.com/aws/aws-sdk-cpp into integration-tests
2 parents 30b41a9 + c01a1cb commit 634da03

File tree

84 files changed

+3850
-707
lines changed

Some content is hidden

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

84 files changed

+3850
-707
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.672
1+
1.11.673

generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/RequestLimitExceeded.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace Model
3131
* impacted resource, find the <a
3232
* href="https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_ThrottlingReason.html">ThrottlingReason</a>
3333
* field in the returned exception. Contact <a
34-
* href="https://aws.amazon.com/support">Amazon Web Services Support</a> to request
34+
* href="https://aws.amazon.com/support">Amazon Web ServicesSupport</a> to request
3535
* a quota increase.</p><p><h3>See Also:</h3> <a
3636
* href="http://docs.aws.amazon.com/goto/WebAPI/dynamodb-2012-08-10/RequestLimitExceeded">AWS
3737
* API Reference</a></p>

generated/src/aws-cpp-sdk-dynamodb/source/DynamoDBEndpointRules.cpp

Lines changed: 240 additions & 235 deletions
Large diffs are not rendered by default.

generated/src/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/InstanceFleetState.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ namespace Model
2020
BOOTSTRAPPING,
2121
RUNNING,
2222
RESIZING,
23+
RECONFIGURING,
2324
SUSPENDED,
2425
TERMINATING,
2526
TERMINATED

generated/src/aws-cpp-sdk-elasticmapreduce/source/model/InstanceFleetState.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ namespace Aws
2424
static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING");
2525
static const int RUNNING_HASH = HashingUtils::HashString("RUNNING");
2626
static const int RESIZING_HASH = HashingUtils::HashString("RESIZING");
27+
static const int RECONFIGURING_HASH = HashingUtils::HashString("RECONFIGURING");
2728
static const int SUSPENDED_HASH = HashingUtils::HashString("SUSPENDED");
2829
static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING");
2930
static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED");
@@ -48,6 +49,10 @@ namespace Aws
4849
{
4950
return InstanceFleetState::RESIZING;
5051
}
52+
else if (hashCode == RECONFIGURING_HASH)
53+
{
54+
return InstanceFleetState::RECONFIGURING;
55+
}
5156
else if (hashCode == SUSPENDED_HASH)
5257
{
5358
return InstanceFleetState::SUSPENDED;
@@ -84,6 +89,8 @@ namespace Aws
8489
return "RUNNING";
8590
case InstanceFleetState::RESIZING:
8691
return "RESIZING";
92+
case InstanceFleetState::RECONFIGURING:
93+
return "RECONFIGURING";
8794
case InstanceFleetState::SUSPENDED:
8895
return "SUSPENDED";
8996
case InstanceFleetState::TERMINATING:

generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/MediaConvertClient.h

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,32 @@ namespace MediaConvert
442442
return SubmitAsync(&MediaConvertClient::GetJobTemplate, request, handler, context);
443443
}
444444

445+
/**
446+
* Retrieve a JSON array of up to twenty of your most recent jobs matched by a jobs
447+
* query.<p><h3>See Also:</h3> <a
448+
* href="http://docs.aws.amazon.com/goto/WebAPI/mediaconvert-2017-08-29/GetJobsQueryResults">AWS
449+
* API Reference</a></p>
450+
*/
451+
virtual Model::GetJobsQueryResultsOutcome GetJobsQueryResults(const Model::GetJobsQueryResultsRequest& request) const;
452+
453+
/**
454+
* A Callable wrapper for GetJobsQueryResults that returns a future to the operation so that it can be executed in parallel to other requests.
455+
*/
456+
template<typename GetJobsQueryResultsRequestT = Model::GetJobsQueryResultsRequest>
457+
Model::GetJobsQueryResultsOutcomeCallable GetJobsQueryResultsCallable(const GetJobsQueryResultsRequestT& request) const
458+
{
459+
return SubmitCallable(&MediaConvertClient::GetJobsQueryResults, request);
460+
}
461+
462+
/**
463+
* An Async wrapper for GetJobsQueryResults that queues the request into a thread executor and triggers associated callback when operation has finished.
464+
*/
465+
template<typename GetJobsQueryResultsRequestT = Model::GetJobsQueryResultsRequest>
466+
void GetJobsQueryResultsAsync(const GetJobsQueryResultsRequestT& request, const GetJobsQueryResultsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
467+
{
468+
return SubmitAsync(&MediaConvertClient::GetJobsQueryResults, request, handler, context);
469+
}
470+
445471
/**
446472
* Retrieve the JSON for your policy.<p><h3>See Also:</h3> <a
447473
* href="http://docs.aws.amazon.com/goto/WebAPI/mediaconvert-2017-08-29/GetPolicy">AWS
@@ -765,6 +791,33 @@ namespace MediaConvert
765791
return SubmitAsync(&MediaConvertClient::SearchJobs, request, handler, context);
766792
}
767793

794+
/**
795+
* Start an asynchronous jobs query using the provided filters. To receive the list
796+
* of jobs that match your query, call the GetJobsQueryResults API using the query
797+
* ID returned by this API.<p><h3>See Also:</h3> <a
798+
* href="http://docs.aws.amazon.com/goto/WebAPI/mediaconvert-2017-08-29/StartJobsQuery">AWS
799+
* API Reference</a></p>
800+
*/
801+
virtual Model::StartJobsQueryOutcome StartJobsQuery(const Model::StartJobsQueryRequest& request = {}) const;
802+
803+
/**
804+
* A Callable wrapper for StartJobsQuery that returns a future to the operation so that it can be executed in parallel to other requests.
805+
*/
806+
template<typename StartJobsQueryRequestT = Model::StartJobsQueryRequest>
807+
Model::StartJobsQueryOutcomeCallable StartJobsQueryCallable(const StartJobsQueryRequestT& request = {}) const
808+
{
809+
return SubmitCallable(&MediaConvertClient::StartJobsQuery, request);
810+
}
811+
812+
/**
813+
* An Async wrapper for StartJobsQuery that queues the request into a thread executor and triggers associated callback when operation has finished.
814+
*/
815+
template<typename StartJobsQueryRequestT = Model::StartJobsQueryRequest>
816+
void StartJobsQueryAsync(const StartJobsQueryResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr, const StartJobsQueryRequestT& request = {}) const
817+
{
818+
return SubmitAsync(&MediaConvertClient::StartJobsQuery, request, handler, context);
819+
}
820+
768821
/**
769822
* Add tags to a MediaConvert queue, preset, or job template. For information about
770823
* tagging, see the User Guide at

generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/MediaConvertErrors.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ enum class MediaConvertErrors
5252
FORBIDDEN,
5353
INTERNAL_SERVER_ERROR,
5454
NOT_FOUND,
55+
SERVICE_QUOTA_EXCEEDED,
5556
TOO_MANY_REQUESTS
5657
};
5758

generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/MediaConvertServiceClientModel.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <aws/mediaconvert/model/DisassociateCertificateResult.h>
3333
#include <aws/mediaconvert/model/GetJobResult.h>
3434
#include <aws/mediaconvert/model/GetJobTemplateResult.h>
35+
#include <aws/mediaconvert/model/GetJobsQueryResultsResult.h>
3536
#include <aws/mediaconvert/model/GetPolicyResult.h>
3637
#include <aws/mediaconvert/model/GetPresetResult.h>
3738
#include <aws/mediaconvert/model/GetQueueResult.h>
@@ -44,6 +45,7 @@
4445
#include <aws/mediaconvert/model/ProbeSdkResult.h>
4546
#include <aws/mediaconvert/model/PutPolicyResult.h>
4647
#include <aws/mediaconvert/model/SearchJobsResult.h>
48+
#include <aws/mediaconvert/model/StartJobsQueryResult.h>
4749
#include <aws/mediaconvert/model/TagResourceResult.h>
4850
#include <aws/mediaconvert/model/UntagResourceResult.h>
4951
#include <aws/mediaconvert/model/UpdateJobTemplateResult.h>
@@ -56,6 +58,7 @@
5658
#include <aws/mediaconvert/model/DeletePolicyRequest.h>
5759
#include <aws/mediaconvert/model/ListPresetsRequest.h>
5860
#include <aws/mediaconvert/model/ProbeRequest.h>
61+
#include <aws/mediaconvert/model/StartJobsQueryRequest.h>
5962
#include <aws/mediaconvert/model/GetPolicyRequest.h>
6063
#include <aws/mediaconvert/model/ListJobsRequest.h>
6164
/* End of service model headers required in MediaConvertClient header */
@@ -112,6 +115,7 @@ namespace Aws
112115
class DisassociateCertificateRequest;
113116
class GetJobRequest;
114117
class GetJobTemplateRequest;
118+
class GetJobsQueryResultsRequest;
115119
class GetPolicyRequest;
116120
class GetPresetRequest;
117121
class GetQueueRequest;
@@ -124,6 +128,7 @@ namespace Aws
124128
class ProbeRequest;
125129
class PutPolicyRequest;
126130
class SearchJobsRequest;
131+
class StartJobsQueryRequest;
127132
class TagResourceRequest;
128133
class UntagResourceRequest;
129134
class UpdateJobTemplateRequest;
@@ -146,6 +151,7 @@ namespace Aws
146151
typedef Aws::Utils::Outcome<DisassociateCertificateResult, MediaConvertError> DisassociateCertificateOutcome;
147152
typedef Aws::Utils::Outcome<GetJobResult, MediaConvertError> GetJobOutcome;
148153
typedef Aws::Utils::Outcome<GetJobTemplateResult, MediaConvertError> GetJobTemplateOutcome;
154+
typedef Aws::Utils::Outcome<GetJobsQueryResultsResult, MediaConvertError> GetJobsQueryResultsOutcome;
149155
typedef Aws::Utils::Outcome<GetPolicyResult, MediaConvertError> GetPolicyOutcome;
150156
typedef Aws::Utils::Outcome<GetPresetResult, MediaConvertError> GetPresetOutcome;
151157
typedef Aws::Utils::Outcome<GetQueueResult, MediaConvertError> GetQueueOutcome;
@@ -158,6 +164,7 @@ namespace Aws
158164
typedef Aws::Utils::Outcome<ProbeSdkResult, MediaConvertError> ProbeOutcome;
159165
typedef Aws::Utils::Outcome<PutPolicyResult, MediaConvertError> PutPolicyOutcome;
160166
typedef Aws::Utils::Outcome<SearchJobsResult, MediaConvertError> SearchJobsOutcome;
167+
typedef Aws::Utils::Outcome<StartJobsQueryResult, MediaConvertError> StartJobsQueryOutcome;
161168
typedef Aws::Utils::Outcome<TagResourceResult, MediaConvertError> TagResourceOutcome;
162169
typedef Aws::Utils::Outcome<UntagResourceResult, MediaConvertError> UntagResourceOutcome;
163170
typedef Aws::Utils::Outcome<UpdateJobTemplateResult, MediaConvertError> UpdateJobTemplateOutcome;
@@ -180,6 +187,7 @@ namespace Aws
180187
typedef std::future<DisassociateCertificateOutcome> DisassociateCertificateOutcomeCallable;
181188
typedef std::future<GetJobOutcome> GetJobOutcomeCallable;
182189
typedef std::future<GetJobTemplateOutcome> GetJobTemplateOutcomeCallable;
190+
typedef std::future<GetJobsQueryResultsOutcome> GetJobsQueryResultsOutcomeCallable;
183191
typedef std::future<GetPolicyOutcome> GetPolicyOutcomeCallable;
184192
typedef std::future<GetPresetOutcome> GetPresetOutcomeCallable;
185193
typedef std::future<GetQueueOutcome> GetQueueOutcomeCallable;
@@ -192,6 +200,7 @@ namespace Aws
192200
typedef std::future<ProbeOutcome> ProbeOutcomeCallable;
193201
typedef std::future<PutPolicyOutcome> PutPolicyOutcomeCallable;
194202
typedef std::future<SearchJobsOutcome> SearchJobsOutcomeCallable;
203+
typedef std::future<StartJobsQueryOutcome> StartJobsQueryOutcomeCallable;
195204
typedef std::future<TagResourceOutcome> TagResourceOutcomeCallable;
196205
typedef std::future<UntagResourceOutcome> UntagResourceOutcomeCallable;
197206
typedef std::future<UpdateJobTemplateOutcome> UpdateJobTemplateOutcomeCallable;
@@ -217,6 +226,7 @@ namespace Aws
217226
typedef std::function<void(const MediaConvertClient*, const Model::DisassociateCertificateRequest&, const Model::DisassociateCertificateOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DisassociateCertificateResponseReceivedHandler;
218227
typedef std::function<void(const MediaConvertClient*, const Model::GetJobRequest&, const Model::GetJobOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetJobResponseReceivedHandler;
219228
typedef std::function<void(const MediaConvertClient*, const Model::GetJobTemplateRequest&, const Model::GetJobTemplateOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetJobTemplateResponseReceivedHandler;
229+
typedef std::function<void(const MediaConvertClient*, const Model::GetJobsQueryResultsRequest&, const Model::GetJobsQueryResultsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetJobsQueryResultsResponseReceivedHandler;
220230
typedef std::function<void(const MediaConvertClient*, const Model::GetPolicyRequest&, const Model::GetPolicyOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetPolicyResponseReceivedHandler;
221231
typedef std::function<void(const MediaConvertClient*, const Model::GetPresetRequest&, const Model::GetPresetOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetPresetResponseReceivedHandler;
222232
typedef std::function<void(const MediaConvertClient*, const Model::GetQueueRequest&, const Model::GetQueueOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetQueueResponseReceivedHandler;
@@ -229,6 +239,7 @@ namespace Aws
229239
typedef std::function<void(const MediaConvertClient*, const Model::ProbeRequest&, const Model::ProbeOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ProbeResponseReceivedHandler;
230240
typedef std::function<void(const MediaConvertClient*, const Model::PutPolicyRequest&, const Model::PutPolicyOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > PutPolicyResponseReceivedHandler;
231241
typedef std::function<void(const MediaConvertClient*, const Model::SearchJobsRequest&, const Model::SearchJobsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > SearchJobsResponseReceivedHandler;
242+
typedef std::function<void(const MediaConvertClient*, const Model::StartJobsQueryRequest&, const Model::StartJobsQueryOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > StartJobsQueryResponseReceivedHandler;
232243
typedef std::function<void(const MediaConvertClient*, const Model::TagResourceRequest&, const Model::TagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > TagResourceResponseReceivedHandler;
233244
typedef std::function<void(const MediaConvertClient*, const Model::UntagResourceRequest&, const Model::UntagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UntagResourceResponseReceivedHandler;
234245
typedef std::function<void(const MediaConvertClient*, const Model::UpdateJobTemplateRequest&, const Model::UpdateJobTemplateOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateJobTemplateResponseReceivedHandler;

generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioDescription.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,15 @@ namespace Model
160160

161161
///@{
162162
/**
163-
* Indicates the language of the audio output track. The ISO 639 language specified
164-
* in the 'Language Code' drop down will be used when 'Follow Input Language Code'
165-
* is not selected or when 'Follow Input Language Code' is selected but there is no
166-
* ISO 639 language code specified by the input.
163+
* Specify the language for your output audio track. To follow the input language:
164+
* Leave blank. When you do, also set Language code control to Follow input. If no
165+
* input language is detected MediaConvert will not write an output language code.
166+
* To follow the input langauge, but fall back to a specified language code if
167+
* there is no input language to follow: Enter an ISO 639-2 three-letter language
168+
* code in all capital letters. When you do, also set Language code control to
169+
* Follow input. To specify the language code: Enter an ISO 639 three-letter
170+
* language code in all capital letters. When you do, also set Language code
171+
* control to Use configured.
167172
*/
168173
inline LanguageCode GetLanguageCode() const { return m_languageCode; }
169174
inline bool LanguageCodeHasBeenSet() const { return m_languageCodeHasBeenSet; }

generated/src/aws-cpp-sdk-mediaconvert/include/aws/mediaconvert/model/AudioProperties.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ namespace Model
7070

7171
///@{
7272
/**
73-
* The frame rate of the video or audio track.
73+
* The frame rate of the video or audio track, expressed as a fraction with
74+
* numerator and denominator values.
7475
*/
7576
inline const FrameRate& GetFrameRate() const { return m_frameRate; }
7677
inline bool FrameRateHasBeenSet() const { return m_frameRateHasBeenSet; }

0 commit comments

Comments
 (0)