aws-sdk-codecommit 1.21.0 → 1.22.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -16,6 +16,10 @@ module Aws::CodeCommit
16
16
  AdditionalData = Shapes::StringShape.new(name: 'AdditionalData')
17
17
  Arn = Shapes::StringShape.new(name: 'Arn')
18
18
  AuthorDoesNotExistException = Shapes::StructureShape.new(name: 'AuthorDoesNotExistException')
19
+ BatchDescribeMergeConflictsError = Shapes::StructureShape.new(name: 'BatchDescribeMergeConflictsError')
20
+ BatchDescribeMergeConflictsErrors = Shapes::ListShape.new(name: 'BatchDescribeMergeConflictsErrors')
21
+ BatchDescribeMergeConflictsInput = Shapes::StructureShape.new(name: 'BatchDescribeMergeConflictsInput')
22
+ BatchDescribeMergeConflictsOutput = Shapes::StructureShape.new(name: 'BatchDescribeMergeConflictsOutput')
19
23
  BatchGetRepositoriesInput = Shapes::StructureShape.new(name: 'BatchGetRepositoriesInput')
20
24
  BatchGetRepositoriesOutput = Shapes::StructureShape.new(name: 'BatchGetRepositoriesOutput')
21
25
  BeforeCommitIdAndAfterCommitIdAreSameException = Shapes::StructureShape.new(name: 'BeforeCommitIdAndAfterCommitIdAreSameException')
@@ -29,6 +33,7 @@ module Aws::CodeCommit
29
33
  BranchNameIsTagNameException = Shapes::StructureShape.new(name: 'BranchNameIsTagNameException')
30
34
  BranchNameList = Shapes::ListShape.new(name: 'BranchNameList')
31
35
  BranchNameRequiredException = Shapes::StructureShape.new(name: 'BranchNameRequiredException')
36
+ CapitalBoolean = Shapes::BooleanShape.new(name: 'CapitalBoolean')
32
37
  ChangeTypeEnum = Shapes::StringShape.new(name: 'ChangeTypeEnum')
33
38
  ClientRequestToken = Shapes::StringShape.new(name: 'ClientRequestToken')
34
39
  ClientRequestTokenRequiredException = Shapes::StructureShape.new(name: 'ClientRequestTokenRequiredException')
@@ -55,6 +60,13 @@ module Aws::CodeCommit
55
60
  CommitMessageLengthExceededException = Shapes::StructureShape.new(name: 'CommitMessageLengthExceededException')
56
61
  CommitName = Shapes::StringShape.new(name: 'CommitName')
57
62
  CommitRequiredException = Shapes::StructureShape.new(name: 'CommitRequiredException')
63
+ Conflict = Shapes::StructureShape.new(name: 'Conflict')
64
+ ConflictDetailLevelTypeEnum = Shapes::StringShape.new(name: 'ConflictDetailLevelTypeEnum')
65
+ ConflictMetadata = Shapes::StructureShape.new(name: 'ConflictMetadata')
66
+ ConflictMetadataList = Shapes::ListShape.new(name: 'ConflictMetadataList')
67
+ ConflictResolution = Shapes::StructureShape.new(name: 'ConflictResolution')
68
+ ConflictResolutionStrategyTypeEnum = Shapes::StringShape.new(name: 'ConflictResolutionStrategyTypeEnum')
69
+ Conflicts = Shapes::ListShape.new(name: 'Conflicts')
58
70
  Content = Shapes::StringShape.new(name: 'Content')
59
71
  CreateBranchInput = Shapes::StructureShape.new(name: 'CreateBranchInput')
60
72
  CreateCommitInput = Shapes::StructureShape.new(name: 'CreateCommitInput')
@@ -63,6 +75,8 @@ module Aws::CodeCommit
63
75
  CreatePullRequestOutput = Shapes::StructureShape.new(name: 'CreatePullRequestOutput')
64
76
  CreateRepositoryInput = Shapes::StructureShape.new(name: 'CreateRepositoryInput')
65
77
  CreateRepositoryOutput = Shapes::StructureShape.new(name: 'CreateRepositoryOutput')
78
+ CreateUnreferencedMergeCommitInput = Shapes::StructureShape.new(name: 'CreateUnreferencedMergeCommitInput')
79
+ CreateUnreferencedMergeCommitOutput = Shapes::StructureShape.new(name: 'CreateUnreferencedMergeCommitOutput')
66
80
  CreationDate = Shapes::TimestampShape.new(name: 'CreationDate')
67
81
  Date = Shapes::StringShape.new(name: 'Date')
68
82
  DefaultBranchCannotBeDeletedException = Shapes::StructureShape.new(name: 'DefaultBranchCannotBeDeletedException')
@@ -76,6 +90,8 @@ module Aws::CodeCommit
76
90
  DeleteFileOutput = Shapes::StructureShape.new(name: 'DeleteFileOutput')
77
91
  DeleteRepositoryInput = Shapes::StructureShape.new(name: 'DeleteRepositoryInput')
78
92
  DeleteRepositoryOutput = Shapes::StructureShape.new(name: 'DeleteRepositoryOutput')
93
+ DescribeMergeConflictsInput = Shapes::StructureShape.new(name: 'DescribeMergeConflictsInput')
94
+ DescribeMergeConflictsOutput = Shapes::StructureShape.new(name: 'DescribeMergeConflictsOutput')
79
95
  DescribePullRequestEventsInput = Shapes::StructureShape.new(name: 'DescribePullRequestEventsInput')
80
96
  DescribePullRequestEventsOutput = Shapes::StructureShape.new(name: 'DescribePullRequestEventsOutput')
81
97
  Description = Shapes::StringShape.new(name: 'Description')
@@ -89,6 +105,7 @@ module Aws::CodeCommit
89
105
  EncryptionKeyNotFoundException = Shapes::StructureShape.new(name: 'EncryptionKeyNotFoundException')
90
106
  EncryptionKeyUnavailableException = Shapes::StructureShape.new(name: 'EncryptionKeyUnavailableException')
91
107
  EventDate = Shapes::TimestampShape.new(name: 'EventDate')
108
+ ExceptionName = Shapes::StringShape.new(name: 'ExceptionName')
92
109
  File = Shapes::StructureShape.new(name: 'File')
93
110
  FileContent = Shapes::BlobShape.new(name: 'FileContent')
94
111
  FileContentAndSourceFileSpecifiedException = Shapes::StructureShape.new(name: 'FileContentAndSourceFileSpecifiedException')
@@ -100,8 +117,12 @@ module Aws::CodeCommit
100
117
  FileMetadata = Shapes::StructureShape.new(name: 'FileMetadata')
101
118
  FileModeRequiredException = Shapes::StructureShape.new(name: 'FileModeRequiredException')
102
119
  FileModeTypeEnum = Shapes::StringShape.new(name: 'FileModeTypeEnum')
120
+ FileModes = Shapes::StructureShape.new(name: 'FileModes')
103
121
  FileNameConflictsWithDirectoryNameException = Shapes::StructureShape.new(name: 'FileNameConflictsWithDirectoryNameException')
104
122
  FilePathConflictsWithSubmodulePathException = Shapes::StructureShape.new(name: 'FilePathConflictsWithSubmodulePathException')
123
+ FilePaths = Shapes::ListShape.new(name: 'FilePaths')
124
+ FileSize = Shapes::IntegerShape.new(name: 'FileSize')
125
+ FileSizes = Shapes::StructureShape.new(name: 'FileSizes')
105
126
  FileTooLargeException = Shapes::StructureShape.new(name: 'FileTooLargeException')
106
127
  FilesMetadata = Shapes::ListShape.new(name: 'FilesMetadata')
107
128
  Folder = Shapes::StructureShape.new(name: 'Folder')
@@ -126,14 +147,19 @@ module Aws::CodeCommit
126
147
  GetFileOutput = Shapes::StructureShape.new(name: 'GetFileOutput')
127
148
  GetFolderInput = Shapes::StructureShape.new(name: 'GetFolderInput')
128
149
  GetFolderOutput = Shapes::StructureShape.new(name: 'GetFolderOutput')
150
+ GetMergeCommitInput = Shapes::StructureShape.new(name: 'GetMergeCommitInput')
151
+ GetMergeCommitOutput = Shapes::StructureShape.new(name: 'GetMergeCommitOutput')
129
152
  GetMergeConflictsInput = Shapes::StructureShape.new(name: 'GetMergeConflictsInput')
130
153
  GetMergeConflictsOutput = Shapes::StructureShape.new(name: 'GetMergeConflictsOutput')
154
+ GetMergeOptionsInput = Shapes::StructureShape.new(name: 'GetMergeOptionsInput')
155
+ GetMergeOptionsOutput = Shapes::StructureShape.new(name: 'GetMergeOptionsOutput')
131
156
  GetPullRequestInput = Shapes::StructureShape.new(name: 'GetPullRequestInput')
132
157
  GetPullRequestOutput = Shapes::StructureShape.new(name: 'GetPullRequestOutput')
133
158
  GetRepositoryInput = Shapes::StructureShape.new(name: 'GetRepositoryInput')
134
159
  GetRepositoryOutput = Shapes::StructureShape.new(name: 'GetRepositoryOutput')
135
160
  GetRepositoryTriggersInput = Shapes::StructureShape.new(name: 'GetRepositoryTriggersInput')
136
161
  GetRepositoryTriggersOutput = Shapes::StructureShape.new(name: 'GetRepositoryTriggersOutput')
162
+ HunkContent = Shapes::StringShape.new(name: 'HunkContent')
137
163
  IdempotencyParameterMismatchException = Shapes::StructureShape.new(name: 'IdempotencyParameterMismatchException')
138
164
  InvalidActorArnException = Shapes::StructureShape.new(name: 'InvalidActorArnException')
139
165
  InvalidAuthorArnException = Shapes::StructureShape.new(name: 'InvalidAuthorArnException')
@@ -143,6 +169,9 @@ module Aws::CodeCommit
143
169
  InvalidCommentIdException = Shapes::StructureShape.new(name: 'InvalidCommentIdException')
144
170
  InvalidCommitException = Shapes::StructureShape.new(name: 'InvalidCommitException')
145
171
  InvalidCommitIdException = Shapes::StructureShape.new(name: 'InvalidCommitIdException')
172
+ InvalidConflictDetailLevelException = Shapes::StructureShape.new(name: 'InvalidConflictDetailLevelException')
173
+ InvalidConflictResolutionException = Shapes::StructureShape.new(name: 'InvalidConflictResolutionException')
174
+ InvalidConflictResolutionStrategyException = Shapes::StructureShape.new(name: 'InvalidConflictResolutionStrategyException')
146
175
  InvalidContinuationTokenException = Shapes::StructureShape.new(name: 'InvalidContinuationTokenException')
147
176
  InvalidDeletionParameterException = Shapes::StructureShape.new(name: 'InvalidDeletionParameterException')
148
177
  InvalidDescriptionException = Shapes::StructureShape.new(name: 'InvalidDescriptionException')
@@ -151,6 +180,8 @@ module Aws::CodeCommit
151
180
  InvalidFileLocationException = Shapes::StructureShape.new(name: 'InvalidFileLocationException')
152
181
  InvalidFileModeException = Shapes::StructureShape.new(name: 'InvalidFileModeException')
153
182
  InvalidFilePositionException = Shapes::StructureShape.new(name: 'InvalidFilePositionException')
183
+ InvalidMaxConflictFilesException = Shapes::StructureShape.new(name: 'InvalidMaxConflictFilesException')
184
+ InvalidMaxMergeHunksException = Shapes::StructureShape.new(name: 'InvalidMaxMergeHunksException')
154
185
  InvalidMaxResultsException = Shapes::StructureShape.new(name: 'InvalidMaxResultsException')
155
186
  InvalidMergeOptionException = Shapes::StructureShape.new(name: 'InvalidMergeOptionException')
156
187
  InvalidOrderException = Shapes::StructureShape.new(name: 'InvalidOrderException')
@@ -162,6 +193,8 @@ module Aws::CodeCommit
162
193
  InvalidPullRequestStatusUpdateException = Shapes::StructureShape.new(name: 'InvalidPullRequestStatusUpdateException')
163
194
  InvalidReferenceNameException = Shapes::StructureShape.new(name: 'InvalidReferenceNameException')
164
195
  InvalidRelativeFileVersionEnumException = Shapes::StructureShape.new(name: 'InvalidRelativeFileVersionEnumException')
196
+ InvalidReplacementContentException = Shapes::StructureShape.new(name: 'InvalidReplacementContentException')
197
+ InvalidReplacementTypeException = Shapes::StructureShape.new(name: 'InvalidReplacementTypeException')
165
198
  InvalidRepositoryDescriptionException = Shapes::StructureShape.new(name: 'InvalidRepositoryDescriptionException')
166
199
  InvalidRepositoryNameException = Shapes::StructureShape.new(name: 'InvalidRepositoryNameException')
167
200
  InvalidRepositoryTriggerBranchNameException = Shapes::StructureShape.new(name: 'InvalidRepositoryTriggerBranchNameException')
@@ -176,16 +209,23 @@ module Aws::CodeCommit
176
209
  InvalidSystemTagUsageException = Shapes::StructureShape.new(name: 'InvalidSystemTagUsageException')
177
210
  InvalidTagKeysListException = Shapes::StructureShape.new(name: 'InvalidTagKeysListException')
178
211
  InvalidTagsMapException = Shapes::StructureShape.new(name: 'InvalidTagsMapException')
212
+ InvalidTargetBranchException = Shapes::StructureShape.new(name: 'InvalidTargetBranchException')
179
213
  InvalidTargetException = Shapes::StructureShape.new(name: 'InvalidTargetException')
180
214
  InvalidTargetsException = Shapes::StructureShape.new(name: 'InvalidTargetsException')
181
215
  InvalidTitleException = Shapes::StructureShape.new(name: 'InvalidTitleException')
216
+ IsBinaryFile = Shapes::StructureShape.new(name: 'IsBinaryFile')
182
217
  IsCommentDeleted = Shapes::BooleanShape.new(name: 'IsCommentDeleted')
218
+ IsContentConflict = Shapes::BooleanShape.new(name: 'IsContentConflict')
219
+ IsFileModeConflict = Shapes::BooleanShape.new(name: 'IsFileModeConflict')
220
+ IsHunkConflict = Shapes::BooleanShape.new(name: 'IsHunkConflict')
183
221
  IsMergeable = Shapes::BooleanShape.new(name: 'IsMergeable')
184
222
  IsMerged = Shapes::BooleanShape.new(name: 'IsMerged')
185
223
  IsMove = Shapes::BooleanShape.new(name: 'IsMove')
224
+ IsObjectTypeConflict = Shapes::BooleanShape.new(name: 'IsObjectTypeConflict')
186
225
  KeepEmptyFolders = Shapes::BooleanShape.new(name: 'KeepEmptyFolders')
187
226
  LastModifiedDate = Shapes::TimestampShape.new(name: 'LastModifiedDate')
188
227
  Limit = Shapes::IntegerShape.new(name: 'Limit')
228
+ LineNumber = Shapes::IntegerShape.new(name: 'LineNumber')
189
229
  ListBranchesInput = Shapes::StructureShape.new(name: 'ListBranchesInput')
190
230
  ListBranchesOutput = Shapes::StructureShape.new(name: 'ListBranchesOutput')
191
231
  ListPullRequestsInput = Shapes::StructureShape.new(name: 'ListPullRequestsInput')
@@ -198,24 +238,45 @@ module Aws::CodeCommit
198
238
  ManualMergeRequiredException = Shapes::StructureShape.new(name: 'ManualMergeRequiredException')
199
239
  MaxResults = Shapes::IntegerShape.new(name: 'MaxResults')
200
240
  MaximumBranchesExceededException = Shapes::StructureShape.new(name: 'MaximumBranchesExceededException')
241
+ MaximumConflictResolutionEntriesExceededException = Shapes::StructureShape.new(name: 'MaximumConflictResolutionEntriesExceededException')
242
+ MaximumFileContentToLoadExceededException = Shapes::StructureShape.new(name: 'MaximumFileContentToLoadExceededException')
201
243
  MaximumFileEntriesExceededException = Shapes::StructureShape.new(name: 'MaximumFileEntriesExceededException')
202
244
  MaximumOpenPullRequestsExceededException = Shapes::StructureShape.new(name: 'MaximumOpenPullRequestsExceededException')
203
245
  MaximumRepositoryNamesExceededException = Shapes::StructureShape.new(name: 'MaximumRepositoryNamesExceededException')
204
246
  MaximumRepositoryTriggersExceededException = Shapes::StructureShape.new(name: 'MaximumRepositoryTriggersExceededException')
247
+ MergeBranchesByFastForwardInput = Shapes::StructureShape.new(name: 'MergeBranchesByFastForwardInput')
248
+ MergeBranchesByFastForwardOutput = Shapes::StructureShape.new(name: 'MergeBranchesByFastForwardOutput')
249
+ MergeBranchesBySquashInput = Shapes::StructureShape.new(name: 'MergeBranchesBySquashInput')
250
+ MergeBranchesBySquashOutput = Shapes::StructureShape.new(name: 'MergeBranchesBySquashOutput')
251
+ MergeBranchesByThreeWayInput = Shapes::StructureShape.new(name: 'MergeBranchesByThreeWayInput')
252
+ MergeBranchesByThreeWayOutput = Shapes::StructureShape.new(name: 'MergeBranchesByThreeWayOutput')
253
+ MergeHunk = Shapes::StructureShape.new(name: 'MergeHunk')
254
+ MergeHunkDetail = Shapes::StructureShape.new(name: 'MergeHunkDetail')
255
+ MergeHunks = Shapes::ListShape.new(name: 'MergeHunks')
205
256
  MergeMetadata = Shapes::StructureShape.new(name: 'MergeMetadata')
257
+ MergeOperations = Shapes::StructureShape.new(name: 'MergeOperations')
206
258
  MergeOptionRequiredException = Shapes::StructureShape.new(name: 'MergeOptionRequiredException')
207
259
  MergeOptionTypeEnum = Shapes::StringShape.new(name: 'MergeOptionTypeEnum')
260
+ MergeOptions = Shapes::ListShape.new(name: 'MergeOptions')
208
261
  MergePullRequestByFastForwardInput = Shapes::StructureShape.new(name: 'MergePullRequestByFastForwardInput')
209
262
  MergePullRequestByFastForwardOutput = Shapes::StructureShape.new(name: 'MergePullRequestByFastForwardOutput')
263
+ MergePullRequestBySquashInput = Shapes::StructureShape.new(name: 'MergePullRequestBySquashInput')
264
+ MergePullRequestBySquashOutput = Shapes::StructureShape.new(name: 'MergePullRequestBySquashOutput')
265
+ MergePullRequestByThreeWayInput = Shapes::StructureShape.new(name: 'MergePullRequestByThreeWayInput')
266
+ MergePullRequestByThreeWayOutput = Shapes::StructureShape.new(name: 'MergePullRequestByThreeWayOutput')
210
267
  Message = Shapes::StringShape.new(name: 'Message')
211
268
  Mode = Shapes::StringShape.new(name: 'Mode')
269
+ MultipleConflictResolutionEntriesException = Shapes::StructureShape.new(name: 'MultipleConflictResolutionEntriesException')
212
270
  MultipleRepositoriesInPullRequestException = Shapes::StructureShape.new(name: 'MultipleRepositoriesInPullRequestException')
213
271
  Name = Shapes::StringShape.new(name: 'Name')
214
272
  NameLengthExceededException = Shapes::StructureShape.new(name: 'NameLengthExceededException')
215
273
  NextToken = Shapes::StringShape.new(name: 'NextToken')
216
274
  NoChangeException = Shapes::StructureShape.new(name: 'NoChangeException')
275
+ NumberOfConflicts = Shapes::IntegerShape.new(name: 'NumberOfConflicts')
217
276
  ObjectId = Shapes::StringShape.new(name: 'ObjectId')
218
277
  ObjectSize = Shapes::IntegerShape.new(name: 'ObjectSize')
278
+ ObjectTypeEnum = Shapes::StringShape.new(name: 'ObjectTypeEnum')
279
+ ObjectTypes = Shapes::StructureShape.new(name: 'ObjectTypes')
219
280
  OrderEnum = Shapes::StringShape.new(name: 'OrderEnum')
220
281
  ParentCommitDoesNotExistException = Shapes::StructureShape.new(name: 'ParentCommitDoesNotExistException')
221
282
  ParentCommitIdOutdatedException = Shapes::StructureShape.new(name: 'ParentCommitIdOutdatedException')
@@ -260,6 +321,11 @@ module Aws::CodeCommit
260
321
  ReferenceNameRequiredException = Shapes::StructureShape.new(name: 'ReferenceNameRequiredException')
261
322
  ReferenceTypeNotSupportedException = Shapes::StructureShape.new(name: 'ReferenceTypeNotSupportedException')
262
323
  RelativeFileVersionEnum = Shapes::StringShape.new(name: 'RelativeFileVersionEnum')
324
+ ReplaceContentEntries = Shapes::ListShape.new(name: 'ReplaceContentEntries')
325
+ ReplaceContentEntry = Shapes::StructureShape.new(name: 'ReplaceContentEntry')
326
+ ReplacementContentRequiredException = Shapes::StructureShape.new(name: 'ReplacementContentRequiredException')
327
+ ReplacementTypeEnum = Shapes::StringShape.new(name: 'ReplacementTypeEnum')
328
+ ReplacementTypeRequiredException = Shapes::StructureShape.new(name: 'ReplacementTypeRequiredException')
263
329
  RepositoryDescription = Shapes::StringShape.new(name: 'RepositoryDescription')
264
330
  RepositoryDoesNotExistException = Shapes::StructureShape.new(name: 'RepositoryDoesNotExistException')
265
331
  RepositoryId = Shapes::StringShape.new(name: 'RepositoryId')
@@ -340,6 +406,33 @@ module Aws::CodeCommit
340
406
  UserInfo = Shapes::StructureShape.new(name: 'UserInfo')
341
407
  blob = Shapes::BlobShape.new(name: 'blob')
342
408
 
409
+ BatchDescribeMergeConflictsError.add_member(:file_path, Shapes::ShapeRef.new(shape: Path, required: true, location_name: "filePath"))
410
+ BatchDescribeMergeConflictsError.add_member(:exception_name, Shapes::ShapeRef.new(shape: ExceptionName, required: true, location_name: "exceptionName"))
411
+ BatchDescribeMergeConflictsError.add_member(:message, Shapes::ShapeRef.new(shape: Message, required: true, location_name: "message"))
412
+ BatchDescribeMergeConflictsError.struct_class = Types::BatchDescribeMergeConflictsError
413
+
414
+ BatchDescribeMergeConflictsErrors.member = Shapes::ShapeRef.new(shape: BatchDescribeMergeConflictsError)
415
+
416
+ BatchDescribeMergeConflictsInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
417
+ BatchDescribeMergeConflictsInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
418
+ BatchDescribeMergeConflictsInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
419
+ BatchDescribeMergeConflictsInput.add_member(:merge_option, Shapes::ShapeRef.new(shape: MergeOptionTypeEnum, required: true, location_name: "mergeOption"))
420
+ BatchDescribeMergeConflictsInput.add_member(:max_merge_hunks, Shapes::ShapeRef.new(shape: MaxResults, location_name: "maxMergeHunks"))
421
+ BatchDescribeMergeConflictsInput.add_member(:max_conflict_files, Shapes::ShapeRef.new(shape: MaxResults, location_name: "maxConflictFiles"))
422
+ BatchDescribeMergeConflictsInput.add_member(:file_paths, Shapes::ShapeRef.new(shape: FilePaths, location_name: "filePaths"))
423
+ BatchDescribeMergeConflictsInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
424
+ BatchDescribeMergeConflictsInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
425
+ BatchDescribeMergeConflictsInput.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
426
+ BatchDescribeMergeConflictsInput.struct_class = Types::BatchDescribeMergeConflictsInput
427
+
428
+ BatchDescribeMergeConflictsOutput.add_member(:conflicts, Shapes::ShapeRef.new(shape: Conflicts, required: true, location_name: "conflicts"))
429
+ BatchDescribeMergeConflictsOutput.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
430
+ BatchDescribeMergeConflictsOutput.add_member(:errors, Shapes::ShapeRef.new(shape: BatchDescribeMergeConflictsErrors, location_name: "errors"))
431
+ BatchDescribeMergeConflictsOutput.add_member(:destination_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "destinationCommitId"))
432
+ BatchDescribeMergeConflictsOutput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "sourceCommitId"))
433
+ BatchDescribeMergeConflictsOutput.add_member(:base_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "baseCommitId"))
434
+ BatchDescribeMergeConflictsOutput.struct_class = Types::BatchDescribeMergeConflictsOutput
435
+
343
436
  BatchGetRepositoriesInput.add_member(:repository_names, Shapes::ShapeRef.new(shape: RepositoryNameList, required: true, location_name: "repositoryNames"))
344
437
  BatchGetRepositoriesInput.struct_class = Types::BatchGetRepositoriesInput
345
438
 
@@ -402,6 +495,31 @@ module Aws::CodeCommit
402
495
  Commit.add_member(:additional_data, Shapes::ShapeRef.new(shape: AdditionalData, location_name: "additionalData"))
403
496
  Commit.struct_class = Types::Commit
404
497
 
498
+ Conflict.add_member(:conflict_metadata, Shapes::ShapeRef.new(shape: ConflictMetadata, location_name: "conflictMetadata"))
499
+ Conflict.add_member(:merge_hunks, Shapes::ShapeRef.new(shape: MergeHunks, location_name: "mergeHunks"))
500
+ Conflict.struct_class = Types::Conflict
501
+
502
+ ConflictMetadata.add_member(:file_path, Shapes::ShapeRef.new(shape: Path, location_name: "filePath"))
503
+ ConflictMetadata.add_member(:file_sizes, Shapes::ShapeRef.new(shape: FileSizes, location_name: "fileSizes"))
504
+ ConflictMetadata.add_member(:file_modes, Shapes::ShapeRef.new(shape: FileModes, location_name: "fileModes"))
505
+ ConflictMetadata.add_member(:object_types, Shapes::ShapeRef.new(shape: ObjectTypes, location_name: "objectTypes"))
506
+ ConflictMetadata.add_member(:number_of_conflicts, Shapes::ShapeRef.new(shape: NumberOfConflicts, location_name: "numberOfConflicts"))
507
+ ConflictMetadata.add_member(:is_binary_file, Shapes::ShapeRef.new(shape: IsBinaryFile, location_name: "isBinaryFile"))
508
+ ConflictMetadata.add_member(:content_conflict, Shapes::ShapeRef.new(shape: IsContentConflict, location_name: "contentConflict"))
509
+ ConflictMetadata.add_member(:file_mode_conflict, Shapes::ShapeRef.new(shape: IsFileModeConflict, location_name: "fileModeConflict"))
510
+ ConflictMetadata.add_member(:object_type_conflict, Shapes::ShapeRef.new(shape: IsObjectTypeConflict, location_name: "objectTypeConflict"))
511
+ ConflictMetadata.add_member(:merge_operations, Shapes::ShapeRef.new(shape: MergeOperations, location_name: "mergeOperations"))
512
+ ConflictMetadata.struct_class = Types::ConflictMetadata
513
+
514
+ ConflictMetadataList.member = Shapes::ShapeRef.new(shape: ConflictMetadata)
515
+
516
+ ConflictResolution.add_member(:replace_contents, Shapes::ShapeRef.new(shape: ReplaceContentEntries, location_name: "replaceContents"))
517
+ ConflictResolution.add_member(:delete_files, Shapes::ShapeRef.new(shape: DeleteFileEntries, location_name: "deleteFiles"))
518
+ ConflictResolution.add_member(:set_file_modes, Shapes::ShapeRef.new(shape: SetFileModeEntries, location_name: "setFileModes"))
519
+ ConflictResolution.struct_class = Types::ConflictResolution
520
+
521
+ Conflicts.member = Shapes::ShapeRef.new(shape: Conflict)
522
+
405
523
  CreateBranchInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
406
524
  CreateBranchInput.add_member(:branch_name, Shapes::ShapeRef.new(shape: BranchName, required: true, location_name: "branchName"))
407
525
  CreateBranchInput.add_member(:commit_id, Shapes::ShapeRef.new(shape: CommitId, required: true, location_name: "commitId"))
@@ -443,6 +561,23 @@ module Aws::CodeCommit
443
561
  CreateRepositoryOutput.add_member(:repository_metadata, Shapes::ShapeRef.new(shape: RepositoryMetadata, location_name: "repositoryMetadata"))
444
562
  CreateRepositoryOutput.struct_class = Types::CreateRepositoryOutput
445
563
 
564
+ CreateUnreferencedMergeCommitInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
565
+ CreateUnreferencedMergeCommitInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
566
+ CreateUnreferencedMergeCommitInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
567
+ CreateUnreferencedMergeCommitInput.add_member(:merge_option, Shapes::ShapeRef.new(shape: MergeOptionTypeEnum, required: true, location_name: "mergeOption"))
568
+ CreateUnreferencedMergeCommitInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
569
+ CreateUnreferencedMergeCommitInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
570
+ CreateUnreferencedMergeCommitInput.add_member(:author_name, Shapes::ShapeRef.new(shape: Name, location_name: "authorName"))
571
+ CreateUnreferencedMergeCommitInput.add_member(:email, Shapes::ShapeRef.new(shape: Email, location_name: "email"))
572
+ CreateUnreferencedMergeCommitInput.add_member(:commit_message, Shapes::ShapeRef.new(shape: Message, location_name: "commitMessage"))
573
+ CreateUnreferencedMergeCommitInput.add_member(:keep_empty_folders, Shapes::ShapeRef.new(shape: KeepEmptyFolders, location_name: "keepEmptyFolders"))
574
+ CreateUnreferencedMergeCommitInput.add_member(:conflict_resolution, Shapes::ShapeRef.new(shape: ConflictResolution, location_name: "conflictResolution"))
575
+ CreateUnreferencedMergeCommitInput.struct_class = Types::CreateUnreferencedMergeCommitInput
576
+
577
+ CreateUnreferencedMergeCommitOutput.add_member(:commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "commitId"))
578
+ CreateUnreferencedMergeCommitOutput.add_member(:tree_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "treeId"))
579
+ CreateUnreferencedMergeCommitOutput.struct_class = Types::CreateUnreferencedMergeCommitOutput
580
+
446
581
  DeleteBranchInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
447
582
  DeleteBranchInput.add_member(:branch_name, Shapes::ShapeRef.new(shape: BranchName, required: true, location_name: "branchName"))
448
583
  DeleteBranchInput.struct_class = Types::DeleteBranchInput
@@ -483,6 +618,25 @@ module Aws::CodeCommit
483
618
  DeleteRepositoryOutput.add_member(:repository_id, Shapes::ShapeRef.new(shape: RepositoryId, location_name: "repositoryId"))
484
619
  DeleteRepositoryOutput.struct_class = Types::DeleteRepositoryOutput
485
620
 
621
+ DescribeMergeConflictsInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
622
+ DescribeMergeConflictsInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
623
+ DescribeMergeConflictsInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
624
+ DescribeMergeConflictsInput.add_member(:merge_option, Shapes::ShapeRef.new(shape: MergeOptionTypeEnum, required: true, location_name: "mergeOption"))
625
+ DescribeMergeConflictsInput.add_member(:max_merge_hunks, Shapes::ShapeRef.new(shape: MaxResults, location_name: "maxMergeHunks"))
626
+ DescribeMergeConflictsInput.add_member(:file_path, Shapes::ShapeRef.new(shape: Path, required: true, location_name: "filePath"))
627
+ DescribeMergeConflictsInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
628
+ DescribeMergeConflictsInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
629
+ DescribeMergeConflictsInput.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
630
+ DescribeMergeConflictsInput.struct_class = Types::DescribeMergeConflictsInput
631
+
632
+ DescribeMergeConflictsOutput.add_member(:conflict_metadata, Shapes::ShapeRef.new(shape: ConflictMetadata, required: true, location_name: "conflictMetadata"))
633
+ DescribeMergeConflictsOutput.add_member(:merge_hunks, Shapes::ShapeRef.new(shape: MergeHunks, required: true, location_name: "mergeHunks"))
634
+ DescribeMergeConflictsOutput.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
635
+ DescribeMergeConflictsOutput.add_member(:destination_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "destinationCommitId"))
636
+ DescribeMergeConflictsOutput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "sourceCommitId"))
637
+ DescribeMergeConflictsOutput.add_member(:base_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "baseCommitId"))
638
+ DescribeMergeConflictsOutput.struct_class = Types::DescribeMergeConflictsOutput
639
+
486
640
  DescribePullRequestEventsInput.add_member(:pull_request_id, Shapes::ShapeRef.new(shape: PullRequestId, required: true, location_name: "pullRequestId"))
487
641
  DescribePullRequestEventsInput.add_member(:pull_request_event_type, Shapes::ShapeRef.new(shape: PullRequestEventType, location_name: "pullRequestEventType"))
488
642
  DescribePullRequestEventsInput.add_member(:actor_arn, Shapes::ShapeRef.new(shape: Arn, location_name: "actorArn"))
@@ -514,6 +668,18 @@ module Aws::CodeCommit
514
668
  FileMetadata.add_member(:file_mode, Shapes::ShapeRef.new(shape: FileModeTypeEnum, location_name: "fileMode"))
515
669
  FileMetadata.struct_class = Types::FileMetadata
516
670
 
671
+ FileModes.add_member(:source, Shapes::ShapeRef.new(shape: FileModeTypeEnum, location_name: "source"))
672
+ FileModes.add_member(:destination, Shapes::ShapeRef.new(shape: FileModeTypeEnum, location_name: "destination"))
673
+ FileModes.add_member(:base, Shapes::ShapeRef.new(shape: FileModeTypeEnum, location_name: "base"))
674
+ FileModes.struct_class = Types::FileModes
675
+
676
+ FilePaths.member = Shapes::ShapeRef.new(shape: Path)
677
+
678
+ FileSizes.add_member(:source, Shapes::ShapeRef.new(shape: FileSize, location_name: "source"))
679
+ FileSizes.add_member(:destination, Shapes::ShapeRef.new(shape: FileSize, location_name: "destination"))
680
+ FileSizes.add_member(:base, Shapes::ShapeRef.new(shape: FileSize, location_name: "base"))
681
+ FileSizes.struct_class = Types::FileSizes
682
+
517
683
  FilesMetadata.member = Shapes::ShapeRef.new(shape: FileMetadata)
518
684
 
519
685
  Folder.add_member(:tree_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "treeId"))
@@ -613,17 +779,50 @@ module Aws::CodeCommit
613
779
  GetFolderOutput.add_member(:sub_modules, Shapes::ShapeRef.new(shape: SubModuleList, location_name: "subModules"))
614
780
  GetFolderOutput.struct_class = Types::GetFolderOutput
615
781
 
782
+ GetMergeCommitInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
783
+ GetMergeCommitInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
784
+ GetMergeCommitInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
785
+ GetMergeCommitInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
786
+ GetMergeCommitInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
787
+ GetMergeCommitInput.struct_class = Types::GetMergeCommitInput
788
+
789
+ GetMergeCommitOutput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "sourceCommitId"))
790
+ GetMergeCommitOutput.add_member(:destination_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "destinationCommitId"))
791
+ GetMergeCommitOutput.add_member(:base_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "baseCommitId"))
792
+ GetMergeCommitOutput.add_member(:merged_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "mergedCommitId"))
793
+ GetMergeCommitOutput.struct_class = Types::GetMergeCommitOutput
794
+
616
795
  GetMergeConflictsInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
617
796
  GetMergeConflictsInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
618
797
  GetMergeConflictsInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
619
798
  GetMergeConflictsInput.add_member(:merge_option, Shapes::ShapeRef.new(shape: MergeOptionTypeEnum, required: true, location_name: "mergeOption"))
799
+ GetMergeConflictsInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
800
+ GetMergeConflictsInput.add_member(:max_conflict_files, Shapes::ShapeRef.new(shape: MaxResults, location_name: "maxConflictFiles"))
801
+ GetMergeConflictsInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
802
+ GetMergeConflictsInput.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
620
803
  GetMergeConflictsInput.struct_class = Types::GetMergeConflictsInput
621
804
 
622
805
  GetMergeConflictsOutput.add_member(:mergeable, Shapes::ShapeRef.new(shape: IsMergeable, required: true, location_name: "mergeable"))
623
- GetMergeConflictsOutput.add_member(:destination_commit_id, Shapes::ShapeRef.new(shape: CommitId, required: true, location_name: "destinationCommitId"))
624
- GetMergeConflictsOutput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: CommitId, required: true, location_name: "sourceCommitId"))
806
+ GetMergeConflictsOutput.add_member(:destination_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "destinationCommitId"))
807
+ GetMergeConflictsOutput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "sourceCommitId"))
808
+ GetMergeConflictsOutput.add_member(:base_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "baseCommitId"))
809
+ GetMergeConflictsOutput.add_member(:conflict_metadata_list, Shapes::ShapeRef.new(shape: ConflictMetadataList, required: true, location_name: "conflictMetadataList"))
810
+ GetMergeConflictsOutput.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
625
811
  GetMergeConflictsOutput.struct_class = Types::GetMergeConflictsOutput
626
812
 
813
+ GetMergeOptionsInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
814
+ GetMergeOptionsInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
815
+ GetMergeOptionsInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
816
+ GetMergeOptionsInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
817
+ GetMergeOptionsInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
818
+ GetMergeOptionsInput.struct_class = Types::GetMergeOptionsInput
819
+
820
+ GetMergeOptionsOutput.add_member(:merge_options, Shapes::ShapeRef.new(shape: MergeOptions, required: true, location_name: "mergeOptions"))
821
+ GetMergeOptionsOutput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "sourceCommitId"))
822
+ GetMergeOptionsOutput.add_member(:destination_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "destinationCommitId"))
823
+ GetMergeOptionsOutput.add_member(:base_commit_id, Shapes::ShapeRef.new(shape: ObjectId, required: true, location_name: "baseCommitId"))
824
+ GetMergeOptionsOutput.struct_class = Types::GetMergeOptionsOutput
825
+
627
826
  GetPullRequestInput.add_member(:pull_request_id, Shapes::ShapeRef.new(shape: PullRequestId, required: true, location_name: "pullRequestId"))
628
827
  GetPullRequestInput.struct_class = Types::GetPullRequestInput
629
828
 
@@ -643,6 +842,11 @@ module Aws::CodeCommit
643
842
  GetRepositoryTriggersOutput.add_member(:triggers, Shapes::ShapeRef.new(shape: RepositoryTriggersList, location_name: "triggers"))
644
843
  GetRepositoryTriggersOutput.struct_class = Types::GetRepositoryTriggersOutput
645
844
 
845
+ IsBinaryFile.add_member(:source, Shapes::ShapeRef.new(shape: CapitalBoolean, location_name: "source"))
846
+ IsBinaryFile.add_member(:destination, Shapes::ShapeRef.new(shape: CapitalBoolean, location_name: "destination"))
847
+ IsBinaryFile.add_member(:base, Shapes::ShapeRef.new(shape: CapitalBoolean, location_name: "base"))
848
+ IsBinaryFile.struct_class = Types::IsBinaryFile
849
+
646
850
  ListBranchesInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
647
851
  ListBranchesInput.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
648
852
  ListBranchesInput.struct_class = Types::ListBranchesInput
@@ -684,18 +888,118 @@ module Aws::CodeCommit
684
888
  Location.add_member(:relative_file_version, Shapes::ShapeRef.new(shape: RelativeFileVersionEnum, location_name: "relativeFileVersion"))
685
889
  Location.struct_class = Types::Location
686
890
 
891
+ MergeBranchesByFastForwardInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
892
+ MergeBranchesByFastForwardInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
893
+ MergeBranchesByFastForwardInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
894
+ MergeBranchesByFastForwardInput.add_member(:target_branch, Shapes::ShapeRef.new(shape: BranchName, location_name: "targetBranch"))
895
+ MergeBranchesByFastForwardInput.struct_class = Types::MergeBranchesByFastForwardInput
896
+
897
+ MergeBranchesByFastForwardOutput.add_member(:commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "commitId"))
898
+ MergeBranchesByFastForwardOutput.add_member(:tree_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "treeId"))
899
+ MergeBranchesByFastForwardOutput.struct_class = Types::MergeBranchesByFastForwardOutput
900
+
901
+ MergeBranchesBySquashInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
902
+ MergeBranchesBySquashInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
903
+ MergeBranchesBySquashInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
904
+ MergeBranchesBySquashInput.add_member(:target_branch, Shapes::ShapeRef.new(shape: BranchName, location_name: "targetBranch"))
905
+ MergeBranchesBySquashInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
906
+ MergeBranchesBySquashInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
907
+ MergeBranchesBySquashInput.add_member(:author_name, Shapes::ShapeRef.new(shape: Name, location_name: "authorName"))
908
+ MergeBranchesBySquashInput.add_member(:email, Shapes::ShapeRef.new(shape: Email, location_name: "email"))
909
+ MergeBranchesBySquashInput.add_member(:commit_message, Shapes::ShapeRef.new(shape: Message, location_name: "commitMessage"))
910
+ MergeBranchesBySquashInput.add_member(:keep_empty_folders, Shapes::ShapeRef.new(shape: KeepEmptyFolders, location_name: "keepEmptyFolders"))
911
+ MergeBranchesBySquashInput.add_member(:conflict_resolution, Shapes::ShapeRef.new(shape: ConflictResolution, location_name: "conflictResolution"))
912
+ MergeBranchesBySquashInput.struct_class = Types::MergeBranchesBySquashInput
913
+
914
+ MergeBranchesBySquashOutput.add_member(:commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "commitId"))
915
+ MergeBranchesBySquashOutput.add_member(:tree_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "treeId"))
916
+ MergeBranchesBySquashOutput.struct_class = Types::MergeBranchesBySquashOutput
917
+
918
+ MergeBranchesByThreeWayInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
919
+ MergeBranchesByThreeWayInput.add_member(:source_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "sourceCommitSpecifier"))
920
+ MergeBranchesByThreeWayInput.add_member(:destination_commit_specifier, Shapes::ShapeRef.new(shape: CommitName, required: true, location_name: "destinationCommitSpecifier"))
921
+ MergeBranchesByThreeWayInput.add_member(:target_branch, Shapes::ShapeRef.new(shape: BranchName, location_name: "targetBranch"))
922
+ MergeBranchesByThreeWayInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
923
+ MergeBranchesByThreeWayInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
924
+ MergeBranchesByThreeWayInput.add_member(:author_name, Shapes::ShapeRef.new(shape: Name, location_name: "authorName"))
925
+ MergeBranchesByThreeWayInput.add_member(:email, Shapes::ShapeRef.new(shape: Email, location_name: "email"))
926
+ MergeBranchesByThreeWayInput.add_member(:commit_message, Shapes::ShapeRef.new(shape: Message, location_name: "commitMessage"))
927
+ MergeBranchesByThreeWayInput.add_member(:keep_empty_folders, Shapes::ShapeRef.new(shape: KeepEmptyFolders, location_name: "keepEmptyFolders"))
928
+ MergeBranchesByThreeWayInput.add_member(:conflict_resolution, Shapes::ShapeRef.new(shape: ConflictResolution, location_name: "conflictResolution"))
929
+ MergeBranchesByThreeWayInput.struct_class = Types::MergeBranchesByThreeWayInput
930
+
931
+ MergeBranchesByThreeWayOutput.add_member(:commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "commitId"))
932
+ MergeBranchesByThreeWayOutput.add_member(:tree_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "treeId"))
933
+ MergeBranchesByThreeWayOutput.struct_class = Types::MergeBranchesByThreeWayOutput
934
+
935
+ MergeHunk.add_member(:is_conflict, Shapes::ShapeRef.new(shape: IsHunkConflict, location_name: "isConflict"))
936
+ MergeHunk.add_member(:source, Shapes::ShapeRef.new(shape: MergeHunkDetail, location_name: "source"))
937
+ MergeHunk.add_member(:destination, Shapes::ShapeRef.new(shape: MergeHunkDetail, location_name: "destination"))
938
+ MergeHunk.add_member(:base, Shapes::ShapeRef.new(shape: MergeHunkDetail, location_name: "base"))
939
+ MergeHunk.struct_class = Types::MergeHunk
940
+
941
+ MergeHunkDetail.add_member(:start_line, Shapes::ShapeRef.new(shape: LineNumber, location_name: "startLine"))
942
+ MergeHunkDetail.add_member(:end_line, Shapes::ShapeRef.new(shape: LineNumber, location_name: "endLine"))
943
+ MergeHunkDetail.add_member(:hunk_content, Shapes::ShapeRef.new(shape: HunkContent, location_name: "hunkContent"))
944
+ MergeHunkDetail.struct_class = Types::MergeHunkDetail
945
+
946
+ MergeHunks.member = Shapes::ShapeRef.new(shape: MergeHunk)
947
+
687
948
  MergeMetadata.add_member(:is_merged, Shapes::ShapeRef.new(shape: IsMerged, location_name: "isMerged"))
688
949
  MergeMetadata.add_member(:merged_by, Shapes::ShapeRef.new(shape: Arn, location_name: "mergedBy"))
950
+ MergeMetadata.add_member(:merge_commit_id, Shapes::ShapeRef.new(shape: CommitId, location_name: "mergeCommitId"))
951
+ MergeMetadata.add_member(:merge_option, Shapes::ShapeRef.new(shape: MergeOptionTypeEnum, location_name: "mergeOption"))
689
952
  MergeMetadata.struct_class = Types::MergeMetadata
690
953
 
954
+ MergeOperations.add_member(:source, Shapes::ShapeRef.new(shape: ChangeTypeEnum, location_name: "source"))
955
+ MergeOperations.add_member(:destination, Shapes::ShapeRef.new(shape: ChangeTypeEnum, location_name: "destination"))
956
+ MergeOperations.struct_class = Types::MergeOperations
957
+
958
+ MergeOptions.member = Shapes::ShapeRef.new(shape: MergeOptionTypeEnum)
959
+
691
960
  MergePullRequestByFastForwardInput.add_member(:pull_request_id, Shapes::ShapeRef.new(shape: PullRequestId, required: true, location_name: "pullRequestId"))
692
961
  MergePullRequestByFastForwardInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
693
- MergePullRequestByFastForwardInput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: CommitId, location_name: "sourceCommitId"))
962
+ MergePullRequestByFastForwardInput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "sourceCommitId"))
694
963
  MergePullRequestByFastForwardInput.struct_class = Types::MergePullRequestByFastForwardInput
695
964
 
696
965
  MergePullRequestByFastForwardOutput.add_member(:pull_request, Shapes::ShapeRef.new(shape: PullRequest, location_name: "pullRequest"))
697
966
  MergePullRequestByFastForwardOutput.struct_class = Types::MergePullRequestByFastForwardOutput
698
967
 
968
+ MergePullRequestBySquashInput.add_member(:pull_request_id, Shapes::ShapeRef.new(shape: PullRequestId, required: true, location_name: "pullRequestId"))
969
+ MergePullRequestBySquashInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
970
+ MergePullRequestBySquashInput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "sourceCommitId"))
971
+ MergePullRequestBySquashInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
972
+ MergePullRequestBySquashInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
973
+ MergePullRequestBySquashInput.add_member(:commit_message, Shapes::ShapeRef.new(shape: Message, location_name: "commitMessage"))
974
+ MergePullRequestBySquashInput.add_member(:author_name, Shapes::ShapeRef.new(shape: Name, location_name: "authorName"))
975
+ MergePullRequestBySquashInput.add_member(:email, Shapes::ShapeRef.new(shape: Email, location_name: "email"))
976
+ MergePullRequestBySquashInput.add_member(:keep_empty_folders, Shapes::ShapeRef.new(shape: KeepEmptyFolders, location_name: "keepEmptyFolders"))
977
+ MergePullRequestBySquashInput.add_member(:conflict_resolution, Shapes::ShapeRef.new(shape: ConflictResolution, location_name: "conflictResolution"))
978
+ MergePullRequestBySquashInput.struct_class = Types::MergePullRequestBySquashInput
979
+
980
+ MergePullRequestBySquashOutput.add_member(:pull_request, Shapes::ShapeRef.new(shape: PullRequest, location_name: "pullRequest"))
981
+ MergePullRequestBySquashOutput.struct_class = Types::MergePullRequestBySquashOutput
982
+
983
+ MergePullRequestByThreeWayInput.add_member(:pull_request_id, Shapes::ShapeRef.new(shape: PullRequestId, required: true, location_name: "pullRequestId"))
984
+ MergePullRequestByThreeWayInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
985
+ MergePullRequestByThreeWayInput.add_member(:source_commit_id, Shapes::ShapeRef.new(shape: ObjectId, location_name: "sourceCommitId"))
986
+ MergePullRequestByThreeWayInput.add_member(:conflict_detail_level, Shapes::ShapeRef.new(shape: ConflictDetailLevelTypeEnum, location_name: "conflictDetailLevel"))
987
+ MergePullRequestByThreeWayInput.add_member(:conflict_resolution_strategy, Shapes::ShapeRef.new(shape: ConflictResolutionStrategyTypeEnum, location_name: "conflictResolutionStrategy"))
988
+ MergePullRequestByThreeWayInput.add_member(:commit_message, Shapes::ShapeRef.new(shape: Message, location_name: "commitMessage"))
989
+ MergePullRequestByThreeWayInput.add_member(:author_name, Shapes::ShapeRef.new(shape: Name, location_name: "authorName"))
990
+ MergePullRequestByThreeWayInput.add_member(:email, Shapes::ShapeRef.new(shape: Email, location_name: "email"))
991
+ MergePullRequestByThreeWayInput.add_member(:keep_empty_folders, Shapes::ShapeRef.new(shape: KeepEmptyFolders, location_name: "keepEmptyFolders"))
992
+ MergePullRequestByThreeWayInput.add_member(:conflict_resolution, Shapes::ShapeRef.new(shape: ConflictResolution, location_name: "conflictResolution"))
993
+ MergePullRequestByThreeWayInput.struct_class = Types::MergePullRequestByThreeWayInput
994
+
995
+ MergePullRequestByThreeWayOutput.add_member(:pull_request, Shapes::ShapeRef.new(shape: PullRequest, location_name: "pullRequest"))
996
+ MergePullRequestByThreeWayOutput.struct_class = Types::MergePullRequestByThreeWayOutput
997
+
998
+ ObjectTypes.add_member(:source, Shapes::ShapeRef.new(shape: ObjectTypeEnum, location_name: "source"))
999
+ ObjectTypes.add_member(:destination, Shapes::ShapeRef.new(shape: ObjectTypeEnum, location_name: "destination"))
1000
+ ObjectTypes.add_member(:base, Shapes::ShapeRef.new(shape: ObjectTypeEnum, location_name: "base"))
1001
+ ObjectTypes.struct_class = Types::ObjectTypes
1002
+
699
1003
  ParentList.member = Shapes::ShapeRef.new(shape: ObjectId)
700
1004
 
701
1005
  PostCommentForComparedCommitInput.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, required: true, location_name: "repositoryName"))
@@ -829,6 +1133,14 @@ module Aws::CodeCommit
829
1133
  PutRepositoryTriggersOutput.add_member(:configuration_id, Shapes::ShapeRef.new(shape: RepositoryTriggersConfigurationId, location_name: "configurationId"))
830
1134
  PutRepositoryTriggersOutput.struct_class = Types::PutRepositoryTriggersOutput
831
1135
 
1136
+ ReplaceContentEntries.member = Shapes::ShapeRef.new(shape: ReplaceContentEntry)
1137
+
1138
+ ReplaceContentEntry.add_member(:file_path, Shapes::ShapeRef.new(shape: Path, required: true, location_name: "filePath"))
1139
+ ReplaceContentEntry.add_member(:replacement_type, Shapes::ShapeRef.new(shape: ReplacementTypeEnum, required: true, location_name: "replacementType"))
1140
+ ReplaceContentEntry.add_member(:content, Shapes::ShapeRef.new(shape: FileContent, location_name: "content"))
1141
+ ReplaceContentEntry.add_member(:file_mode, Shapes::ShapeRef.new(shape: FileModeTypeEnum, location_name: "fileMode"))
1142
+ ReplaceContentEntry.struct_class = Types::ReplaceContentEntry
1143
+
832
1144
  RepositoryMetadata.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "accountId"))
833
1145
  RepositoryMetadata.add_member(:repository_id, Shapes::ShapeRef.new(shape: RepositoryId, location_name: "repositoryId"))
834
1146
  RepositoryMetadata.add_member(:repository_name, Shapes::ShapeRef.new(shape: RepositoryName, location_name: "repositoryName"))
@@ -989,6 +1301,34 @@ module Aws::CodeCommit
989
1301
  "uid" => "codecommit-2015-04-13",
990
1302
  }
991
1303
 
1304
+ api.add_operation(:batch_describe_merge_conflicts, Seahorse::Model::Operation.new.tap do |o|
1305
+ o.name = "BatchDescribeMergeConflicts"
1306
+ o.http_method = "POST"
1307
+ o.http_request_uri = "/"
1308
+ o.input = Shapes::ShapeRef.new(shape: BatchDescribeMergeConflictsInput)
1309
+ o.output = Shapes::ShapeRef.new(shape: BatchDescribeMergeConflictsOutput)
1310
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
1311
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
1312
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
1313
+ o.errors << Shapes::ShapeRef.new(shape: MergeOptionRequiredException)
1314
+ o.errors << Shapes::ShapeRef.new(shape: InvalidMergeOptionException)
1315
+ o.errors << Shapes::ShapeRef.new(shape: InvalidContinuationTokenException)
1316
+ o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
1317
+ o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
1318
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
1319
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
1320
+ o.errors << Shapes::ShapeRef.new(shape: InvalidMaxConflictFilesException)
1321
+ o.errors << Shapes::ShapeRef.new(shape: InvalidMaxMergeHunksException)
1322
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
1323
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
1324
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
1325
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
1326
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
1327
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
1328
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
1329
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
1330
+ end)
1331
+
992
1332
  api.add_operation(:batch_get_repositories, Seahorse::Model::Operation.new.tap do |o|
993
1333
  o.name = "BatchGetRepositories"
994
1334
  o.http_method = "POST"
@@ -1128,6 +1468,48 @@ module Aws::CodeCommit
1128
1468
  o.errors << Shapes::ShapeRef.new(shape: TagPolicyException)
1129
1469
  end)
1130
1470
 
1471
+ api.add_operation(:create_unreferenced_merge_commit, Seahorse::Model::Operation.new.tap do |o|
1472
+ o.name = "CreateUnreferencedMergeCommit"
1473
+ o.http_method = "POST"
1474
+ o.http_request_uri = "/"
1475
+ o.input = Shapes::ShapeRef.new(shape: CreateUnreferencedMergeCommitInput)
1476
+ o.output = Shapes::ShapeRef.new(shape: CreateUnreferencedMergeCommitOutput)
1477
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
1478
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
1479
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
1480
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
1481
+ o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
1482
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
1483
+ o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
1484
+ o.errors << Shapes::ShapeRef.new(shape: MergeOptionRequiredException)
1485
+ o.errors << Shapes::ShapeRef.new(shape: InvalidMergeOptionException)
1486
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
1487
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
1488
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionException)
1489
+ o.errors << Shapes::ShapeRef.new(shape: ManualMergeRequiredException)
1490
+ o.errors << Shapes::ShapeRef.new(shape: MaximumConflictResolutionEntriesExceededException)
1491
+ o.errors << Shapes::ShapeRef.new(shape: MultipleConflictResolutionEntriesException)
1492
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementTypeRequiredException)
1493
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementTypeException)
1494
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementContentRequiredException)
1495
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementContentException)
1496
+ o.errors << Shapes::ShapeRef.new(shape: PathRequiredException)
1497
+ o.errors << Shapes::ShapeRef.new(shape: InvalidPathException)
1498
+ o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
1499
+ o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
1500
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
1501
+ o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
1502
+ o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
1503
+ o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
1504
+ o.errors << Shapes::ShapeRef.new(shape: InvalidEmailException)
1505
+ o.errors << Shapes::ShapeRef.new(shape: CommitMessageLengthExceededException)
1506
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
1507
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
1508
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
1509
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
1510
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
1511
+ end)
1512
+
1131
1513
  api.add_operation(:delete_branch, Seahorse::Model::Operation.new.tap do |o|
1132
1514
  o.name = "DeleteBranch"
1133
1515
  o.http_method = "POST"
@@ -1204,6 +1586,42 @@ module Aws::CodeCommit
1204
1586
  o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
1205
1587
  end)
1206
1588
 
1589
+ api.add_operation(:describe_merge_conflicts, Seahorse::Model::Operation.new.tap do |o|
1590
+ o.name = "DescribeMergeConflicts"
1591
+ o.http_method = "POST"
1592
+ o.http_request_uri = "/"
1593
+ o.input = Shapes::ShapeRef.new(shape: DescribeMergeConflictsInput)
1594
+ o.output = Shapes::ShapeRef.new(shape: DescribeMergeConflictsOutput)
1595
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
1596
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
1597
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
1598
+ o.errors << Shapes::ShapeRef.new(shape: MergeOptionRequiredException)
1599
+ o.errors << Shapes::ShapeRef.new(shape: InvalidMergeOptionException)
1600
+ o.errors << Shapes::ShapeRef.new(shape: InvalidContinuationTokenException)
1601
+ o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
1602
+ o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
1603
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
1604
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
1605
+ o.errors << Shapes::ShapeRef.new(shape: PathRequiredException)
1606
+ o.errors << Shapes::ShapeRef.new(shape: InvalidPathException)
1607
+ o.errors << Shapes::ShapeRef.new(shape: FileDoesNotExistException)
1608
+ o.errors << Shapes::ShapeRef.new(shape: InvalidMaxMergeHunksException)
1609
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
1610
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
1611
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
1612
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
1613
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
1614
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
1615
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
1616
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
1617
+ o[:pager] = Aws::Pager.new(
1618
+ limit_key: "max_merge_hunks",
1619
+ tokens: {
1620
+ "next_token" => "next_token"
1621
+ }
1622
+ )
1623
+ end)
1624
+
1207
1625
  api.add_operation(:describe_pull_request_events, Seahorse::Model::Operation.new.tap do |o|
1208
1626
  o.name = "DescribePullRequestEvents"
1209
1627
  o.http_method = "POST"
@@ -1432,6 +1850,27 @@ module Aws::CodeCommit
1432
1850
  o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
1433
1851
  end)
1434
1852
 
1853
+ api.add_operation(:get_merge_commit, Seahorse::Model::Operation.new.tap do |o|
1854
+ o.name = "GetMergeCommit"
1855
+ o.http_method = "POST"
1856
+ o.http_request_uri = "/"
1857
+ o.input = Shapes::ShapeRef.new(shape: GetMergeCommitInput)
1858
+ o.output = Shapes::ShapeRef.new(shape: GetMergeCommitOutput)
1859
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
1860
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
1861
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
1862
+ o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
1863
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
1864
+ o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
1865
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
1866
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
1867
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
1868
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
1869
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
1870
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
1871
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
1872
+ end)
1873
+
1435
1874
  api.add_operation(:get_merge_conflicts, Seahorse::Model::Operation.new.tap do |o|
1436
1875
  o.name = "GetMergeConflicts"
1437
1876
  o.http_method = "POST"
@@ -1443,12 +1882,46 @@ module Aws::CodeCommit
1443
1882
  o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
1444
1883
  o.errors << Shapes::ShapeRef.new(shape: MergeOptionRequiredException)
1445
1884
  o.errors << Shapes::ShapeRef.new(shape: InvalidMergeOptionException)
1885
+ o.errors << Shapes::ShapeRef.new(shape: InvalidContinuationTokenException)
1886
+ o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
1887
+ o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
1888
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
1889
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
1890
+ o.errors << Shapes::ShapeRef.new(shape: InvalidMaxConflictFilesException)
1891
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
1446
1892
  o.errors << Shapes::ShapeRef.new(shape: InvalidDestinationCommitSpecifierException)
1447
1893
  o.errors << Shapes::ShapeRef.new(shape: InvalidSourceCommitSpecifierException)
1894
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
1895
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
1896
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
1897
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
1898
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
1899
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
1900
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
1901
+ o[:pager] = Aws::Pager.new(
1902
+ limit_key: "max_conflict_files",
1903
+ tokens: {
1904
+ "next_token" => "next_token"
1905
+ }
1906
+ )
1907
+ end)
1908
+
1909
+ api.add_operation(:get_merge_options, Seahorse::Model::Operation.new.tap do |o|
1910
+ o.name = "GetMergeOptions"
1911
+ o.http_method = "POST"
1912
+ o.http_request_uri = "/"
1913
+ o.input = Shapes::ShapeRef.new(shape: GetMergeOptionsInput)
1914
+ o.output = Shapes::ShapeRef.new(shape: GetMergeOptionsOutput)
1915
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
1916
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
1917
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
1448
1918
  o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
1449
1919
  o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
1450
1920
  o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
1451
1921
  o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
1922
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
1923
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
1924
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
1452
1925
  o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
1453
1926
  o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
1454
1927
  o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
@@ -1581,6 +2054,122 @@ module Aws::CodeCommit
1581
2054
  o.errors << Shapes::ShapeRef.new(shape: InvalidResourceArnException)
1582
2055
  end)
1583
2056
 
2057
+ api.add_operation(:merge_branches_by_fast_forward, Seahorse::Model::Operation.new.tap do |o|
2058
+ o.name = "MergeBranchesByFastForward"
2059
+ o.http_method = "POST"
2060
+ o.http_request_uri = "/"
2061
+ o.input = Shapes::ShapeRef.new(shape: MergeBranchesByFastForwardInput)
2062
+ o.output = Shapes::ShapeRef.new(shape: MergeBranchesByFastForwardOutput)
2063
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
2064
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
2065
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
2066
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
2067
+ o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
2068
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
2069
+ o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
2070
+ o.errors << Shapes::ShapeRef.new(shape: InvalidTargetBranchException)
2071
+ o.errors << Shapes::ShapeRef.new(shape: InvalidBranchNameException)
2072
+ o.errors << Shapes::ShapeRef.new(shape: BranchNameRequiredException)
2073
+ o.errors << Shapes::ShapeRef.new(shape: BranchNameIsTagNameException)
2074
+ o.errors << Shapes::ShapeRef.new(shape: BranchDoesNotExistException)
2075
+ o.errors << Shapes::ShapeRef.new(shape: ManualMergeRequiredException)
2076
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
2077
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
2078
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
2079
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
2080
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
2081
+ end)
2082
+
2083
+ api.add_operation(:merge_branches_by_squash, Seahorse::Model::Operation.new.tap do |o|
2084
+ o.name = "MergeBranchesBySquash"
2085
+ o.http_method = "POST"
2086
+ o.http_request_uri = "/"
2087
+ o.input = Shapes::ShapeRef.new(shape: MergeBranchesBySquashInput)
2088
+ o.output = Shapes::ShapeRef.new(shape: MergeBranchesBySquashOutput)
2089
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
2090
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
2091
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
2092
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
2093
+ o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
2094
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
2095
+ o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
2096
+ o.errors << Shapes::ShapeRef.new(shape: InvalidTargetBranchException)
2097
+ o.errors << Shapes::ShapeRef.new(shape: InvalidBranchNameException)
2098
+ o.errors << Shapes::ShapeRef.new(shape: BranchNameRequiredException)
2099
+ o.errors << Shapes::ShapeRef.new(shape: BranchNameIsTagNameException)
2100
+ o.errors << Shapes::ShapeRef.new(shape: BranchDoesNotExistException)
2101
+ o.errors << Shapes::ShapeRef.new(shape: ManualMergeRequiredException)
2102
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
2103
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
2104
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionException)
2105
+ o.errors << Shapes::ShapeRef.new(shape: MaximumConflictResolutionEntriesExceededException)
2106
+ o.errors << Shapes::ShapeRef.new(shape: MultipleConflictResolutionEntriesException)
2107
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementTypeRequiredException)
2108
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementTypeException)
2109
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementContentRequiredException)
2110
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementContentException)
2111
+ o.errors << Shapes::ShapeRef.new(shape: PathRequiredException)
2112
+ o.errors << Shapes::ShapeRef.new(shape: InvalidPathException)
2113
+ o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
2114
+ o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
2115
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
2116
+ o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
2117
+ o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
2118
+ o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
2119
+ o.errors << Shapes::ShapeRef.new(shape: InvalidEmailException)
2120
+ o.errors << Shapes::ShapeRef.new(shape: CommitMessageLengthExceededException)
2121
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
2122
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
2123
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
2124
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
2125
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
2126
+ end)
2127
+
2128
+ api.add_operation(:merge_branches_by_three_way, Seahorse::Model::Operation.new.tap do |o|
2129
+ o.name = "MergeBranchesByThreeWay"
2130
+ o.http_method = "POST"
2131
+ o.http_request_uri = "/"
2132
+ o.input = Shapes::ShapeRef.new(shape: MergeBranchesByThreeWayInput)
2133
+ o.output = Shapes::ShapeRef.new(shape: MergeBranchesByThreeWayOutput)
2134
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
2135
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
2136
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
2137
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
2138
+ o.errors << Shapes::ShapeRef.new(shape: CommitRequiredException)
2139
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitException)
2140
+ o.errors << Shapes::ShapeRef.new(shape: CommitDoesNotExistException)
2141
+ o.errors << Shapes::ShapeRef.new(shape: InvalidTargetBranchException)
2142
+ o.errors << Shapes::ShapeRef.new(shape: InvalidBranchNameException)
2143
+ o.errors << Shapes::ShapeRef.new(shape: BranchNameRequiredException)
2144
+ o.errors << Shapes::ShapeRef.new(shape: BranchNameIsTagNameException)
2145
+ o.errors << Shapes::ShapeRef.new(shape: BranchDoesNotExistException)
2146
+ o.errors << Shapes::ShapeRef.new(shape: ManualMergeRequiredException)
2147
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
2148
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
2149
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionException)
2150
+ o.errors << Shapes::ShapeRef.new(shape: MaximumConflictResolutionEntriesExceededException)
2151
+ o.errors << Shapes::ShapeRef.new(shape: MultipleConflictResolutionEntriesException)
2152
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementTypeRequiredException)
2153
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementTypeException)
2154
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementContentRequiredException)
2155
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementContentException)
2156
+ o.errors << Shapes::ShapeRef.new(shape: PathRequiredException)
2157
+ o.errors << Shapes::ShapeRef.new(shape: InvalidPathException)
2158
+ o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
2159
+ o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
2160
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
2161
+ o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
2162
+ o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
2163
+ o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
2164
+ o.errors << Shapes::ShapeRef.new(shape: InvalidEmailException)
2165
+ o.errors << Shapes::ShapeRef.new(shape: CommitMessageLengthExceededException)
2166
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
2167
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
2168
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
2169
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
2170
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
2171
+ end)
2172
+
1584
2173
  api.add_operation(:merge_pull_request_by_fast_forward, Seahorse::Model::Operation.new.tap do |o|
1585
2174
  o.name = "MergePullRequestByFastForward"
1586
2175
  o.http_method = "POST"
@@ -1595,9 +2184,96 @@ module Aws::CodeCommit
1595
2184
  o.errors << Shapes::ShapeRef.new(shape: TipOfSourceReferenceIsDifferentException)
1596
2185
  o.errors << Shapes::ShapeRef.new(shape: ReferenceDoesNotExistException)
1597
2186
  o.errors << Shapes::ShapeRef.new(shape: InvalidCommitIdException)
2187
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNotAssociatedWithPullRequestException)
2188
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
2189
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
2190
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
2191
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
2192
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
2193
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
2194
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
2195
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
2196
+ end)
2197
+
2198
+ api.add_operation(:merge_pull_request_by_squash, Seahorse::Model::Operation.new.tap do |o|
2199
+ o.name = "MergePullRequestBySquash"
2200
+ o.http_method = "POST"
2201
+ o.http_request_uri = "/"
2202
+ o.input = Shapes::ShapeRef.new(shape: MergePullRequestBySquashInput)
2203
+ o.output = Shapes::ShapeRef.new(shape: MergePullRequestBySquashOutput)
2204
+ o.errors << Shapes::ShapeRef.new(shape: PullRequestAlreadyClosedException)
2205
+ o.errors << Shapes::ShapeRef.new(shape: PullRequestDoesNotExistException)
2206
+ o.errors << Shapes::ShapeRef.new(shape: PullRequestIdRequiredException)
2207
+ o.errors << Shapes::ShapeRef.new(shape: InvalidPullRequestIdException)
2208
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitIdException)
2209
+ o.errors << Shapes::ShapeRef.new(shape: ManualMergeRequiredException)
2210
+ o.errors << Shapes::ShapeRef.new(shape: TipOfSourceReferenceIsDifferentException)
2211
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
2212
+ o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
2213
+ o.errors << Shapes::ShapeRef.new(shape: InvalidEmailException)
2214
+ o.errors << Shapes::ShapeRef.new(shape: CommitMessageLengthExceededException)
2215
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
2216
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
2217
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionException)
2218
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementTypeRequiredException)
2219
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementTypeException)
2220
+ o.errors << Shapes::ShapeRef.new(shape: MultipleConflictResolutionEntriesException)
2221
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementContentRequiredException)
2222
+ o.errors << Shapes::ShapeRef.new(shape: MaximumConflictResolutionEntriesExceededException)
2223
+ o.errors << Shapes::ShapeRef.new(shape: PathRequiredException)
2224
+ o.errors << Shapes::ShapeRef.new(shape: InvalidPathException)
2225
+ o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
2226
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementContentException)
2227
+ o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
2228
+ o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
2229
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
2230
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
2231
+ o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
2232
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
2233
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNotAssociatedWithPullRequestException)
2234
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
2235
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
2236
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
2237
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyNotFoundException)
2238
+ o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyUnavailableException)
2239
+ end)
2240
+
2241
+ api.add_operation(:merge_pull_request_by_three_way, Seahorse::Model::Operation.new.tap do |o|
2242
+ o.name = "MergePullRequestByThreeWay"
2243
+ o.http_method = "POST"
2244
+ o.http_request_uri = "/"
2245
+ o.input = Shapes::ShapeRef.new(shape: MergePullRequestByThreeWayInput)
2246
+ o.output = Shapes::ShapeRef.new(shape: MergePullRequestByThreeWayOutput)
2247
+ o.errors << Shapes::ShapeRef.new(shape: PullRequestAlreadyClosedException)
2248
+ o.errors << Shapes::ShapeRef.new(shape: PullRequestDoesNotExistException)
2249
+ o.errors << Shapes::ShapeRef.new(shape: PullRequestIdRequiredException)
2250
+ o.errors << Shapes::ShapeRef.new(shape: InvalidPullRequestIdException)
2251
+ o.errors << Shapes::ShapeRef.new(shape: InvalidCommitIdException)
2252
+ o.errors << Shapes::ShapeRef.new(shape: ManualMergeRequiredException)
2253
+ o.errors << Shapes::ShapeRef.new(shape: TipOfSourceReferenceIsDifferentException)
2254
+ o.errors << Shapes::ShapeRef.new(shape: TipsDivergenceExceededException)
2255
+ o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
2256
+ o.errors << Shapes::ShapeRef.new(shape: InvalidEmailException)
2257
+ o.errors << Shapes::ShapeRef.new(shape: CommitMessageLengthExceededException)
2258
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
2259
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
2260
+ o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionException)
2261
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementTypeRequiredException)
2262
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementTypeException)
2263
+ o.errors << Shapes::ShapeRef.new(shape: MultipleConflictResolutionEntriesException)
2264
+ o.errors << Shapes::ShapeRef.new(shape: ReplacementContentRequiredException)
2265
+ o.errors << Shapes::ShapeRef.new(shape: MaximumConflictResolutionEntriesExceededException)
2266
+ o.errors << Shapes::ShapeRef.new(shape: PathRequiredException)
2267
+ o.errors << Shapes::ShapeRef.new(shape: InvalidPathException)
2268
+ o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
2269
+ o.errors << Shapes::ShapeRef.new(shape: InvalidReplacementContentException)
2270
+ o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
2271
+ o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
2272
+ o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
1598
2273
  o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
1599
2274
  o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
1600
2275
  o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
2276
+ o.errors << Shapes::ShapeRef.new(shape: RepositoryNotAssociatedWithPullRequestException)
1601
2277
  o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
1602
2278
  o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
1603
2279
  o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)