aws-sdk-core 2.11.290 → 2.11.291
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/apis/codebuild/2016-10-06/api-2.json +6 -0
- data/apis/codecommit/2015-04-13/api-2.json +950 -7
- data/apis/codecommit/2015-04-13/paginators-1.json +10 -0
- data/apis/personalize-events/2018-03-22/api-2.json +91 -0
- data/apis/personalize-events/2018-03-22/examples-1.json +5 -0
- data/apis/personalize-events/2018-03-22/paginators-1.json +4 -0
- data/apis/personalize-runtime/2018-05-22/api-2.json +132 -0
- data/apis/personalize-runtime/2018-05-22/examples-1.json +5 -0
- data/apis/personalize-runtime/2018-05-22/paginators-1.json +4 -0
- data/apis/personalize/2018-05-22/api-2.json +1695 -0
- data/apis/personalize/2018-05-22/examples-1.json +5 -0
- data/apis/personalize/2018-05-22/paginators-1.json +58 -0
- data/lib/aws-sdk-core.rb +3 -0
- data/lib/aws-sdk-core/personalize.rb +6 -0
- data/lib/aws-sdk-core/personalizeevents.rb +6 -0
- data/lib/aws-sdk-core/personalizeruntime.rb +6 -0
- data/lib/aws-sdk-core/version.rb +1 -1
- data/service-models.json +12 -0
- metadata +14 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: af180c5bbff9913e89371d20fc8207c76a4a9669
|
4
|
+
data.tar.gz: 5657ffbabfd612da44d4a13523fcfc19c0108d4c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ae160a39fbdeb80ef4c7330c8b33ef2eaca1402eb1504561fbc488103f65494a74d84ebbcba0a457d973541cd7f3e951f00ade5da5b5b4381692dfa74cf384a5
|
7
|
+
data.tar.gz: 8579f2c569c2f4aa28de8c4476b6e09441b41ec9a394d33c68e74350e0c6b32c43571f2ee6ee1293aaf2d9aed9760677b6deec2ca968485e28cff8d7306a07fd
|
@@ -479,6 +479,8 @@
|
|
479
479
|
"description":{"shape":"ProjectDescription"},
|
480
480
|
"source":{"shape":"ProjectSource"},
|
481
481
|
"secondarySources":{"shape":"ProjectSources"},
|
482
|
+
"sourceVersion":{"shape":"String"},
|
483
|
+
"secondarySourceVersions":{"shape":"ProjectSecondarySourceVersions"},
|
482
484
|
"artifacts":{"shape":"ProjectArtifacts"},
|
483
485
|
"secondaryArtifacts":{"shape":"ProjectArtifactsList"},
|
484
486
|
"cache":{"shape":"ProjectCache"},
|
@@ -845,6 +847,8 @@
|
|
845
847
|
"description":{"shape":"ProjectDescription"},
|
846
848
|
"source":{"shape":"ProjectSource"},
|
847
849
|
"secondarySources":{"shape":"ProjectSources"},
|
850
|
+
"sourceVersion":{"shape":"String"},
|
851
|
+
"secondarySourceVersions":{"shape":"ProjectSecondarySourceVersions"},
|
848
852
|
"artifacts":{"shape":"ProjectArtifacts"},
|
849
853
|
"secondaryArtifacts":{"shape":"ProjectArtifactsList"},
|
850
854
|
"cache":{"shape":"ProjectCache"},
|
@@ -1178,6 +1182,8 @@
|
|
1178
1182
|
"description":{"shape":"ProjectDescription"},
|
1179
1183
|
"source":{"shape":"ProjectSource"},
|
1180
1184
|
"secondarySources":{"shape":"ProjectSources"},
|
1185
|
+
"sourceVersion":{"shape":"String"},
|
1186
|
+
"secondarySourceVersions":{"shape":"ProjectSecondarySourceVersions"},
|
1181
1187
|
"artifacts":{"shape":"ProjectArtifacts"},
|
1182
1188
|
"secondaryArtifacts":{"shape":"ProjectArtifactsList"},
|
1183
1189
|
"cache":{"shape":"ProjectCache"},
|
@@ -13,6 +13,37 @@
|
|
13
13
|
"uid":"codecommit-2015-04-13"
|
14
14
|
},
|
15
15
|
"operations":{
|
16
|
+
"BatchDescribeMergeConflicts":{
|
17
|
+
"name":"BatchDescribeMergeConflicts",
|
18
|
+
"http":{
|
19
|
+
"method":"POST",
|
20
|
+
"requestUri":"/"
|
21
|
+
},
|
22
|
+
"input":{"shape":"BatchDescribeMergeConflictsInput"},
|
23
|
+
"output":{"shape":"BatchDescribeMergeConflictsOutput"},
|
24
|
+
"errors":[
|
25
|
+
{"shape":"RepositoryNameRequiredException"},
|
26
|
+
{"shape":"InvalidRepositoryNameException"},
|
27
|
+
{"shape":"RepositoryDoesNotExistException"},
|
28
|
+
{"shape":"MergeOptionRequiredException"},
|
29
|
+
{"shape":"InvalidMergeOptionException"},
|
30
|
+
{"shape":"InvalidContinuationTokenException"},
|
31
|
+
{"shape":"CommitRequiredException"},
|
32
|
+
{"shape":"CommitDoesNotExistException"},
|
33
|
+
{"shape":"InvalidCommitException"},
|
34
|
+
{"shape":"TipsDivergenceExceededException"},
|
35
|
+
{"shape":"InvalidMaxConflictFilesException"},
|
36
|
+
{"shape":"InvalidMaxMergeHunksException"},
|
37
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
38
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
39
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
40
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
41
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
42
|
+
{"shape":"EncryptionKeyDisabledException"},
|
43
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
44
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
45
|
+
]
|
46
|
+
},
|
16
47
|
"BatchGetRepositories":{
|
17
48
|
"name":"BatchGetRepositories",
|
18
49
|
"http":{
|
@@ -166,6 +197,51 @@
|
|
166
197
|
{"shape":"TagPolicyException"}
|
167
198
|
]
|
168
199
|
},
|
200
|
+
"CreateUnreferencedMergeCommit":{
|
201
|
+
"name":"CreateUnreferencedMergeCommit",
|
202
|
+
"http":{
|
203
|
+
"method":"POST",
|
204
|
+
"requestUri":"/"
|
205
|
+
},
|
206
|
+
"input":{"shape":"CreateUnreferencedMergeCommitInput"},
|
207
|
+
"output":{"shape":"CreateUnreferencedMergeCommitOutput"},
|
208
|
+
"errors":[
|
209
|
+
{"shape":"RepositoryNameRequiredException"},
|
210
|
+
{"shape":"InvalidRepositoryNameException"},
|
211
|
+
{"shape":"RepositoryDoesNotExistException"},
|
212
|
+
{"shape":"TipsDivergenceExceededException"},
|
213
|
+
{"shape":"CommitRequiredException"},
|
214
|
+
{"shape":"InvalidCommitException"},
|
215
|
+
{"shape":"CommitDoesNotExistException"},
|
216
|
+
{"shape":"MergeOptionRequiredException"},
|
217
|
+
{"shape":"InvalidMergeOptionException"},
|
218
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
219
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
220
|
+
{"shape":"InvalidConflictResolutionException"},
|
221
|
+
{"shape":"ManualMergeRequiredException"},
|
222
|
+
{"shape":"MaximumConflictResolutionEntriesExceededException"},
|
223
|
+
{"shape":"MultipleConflictResolutionEntriesException"},
|
224
|
+
{"shape":"ReplacementTypeRequiredException"},
|
225
|
+
{"shape":"InvalidReplacementTypeException"},
|
226
|
+
{"shape":"ReplacementContentRequiredException"},
|
227
|
+
{"shape":"InvalidReplacementContentException"},
|
228
|
+
{"shape":"PathRequiredException"},
|
229
|
+
{"shape":"InvalidPathException"},
|
230
|
+
{"shape":"FileContentSizeLimitExceededException"},
|
231
|
+
{"shape":"FolderContentSizeLimitExceededException"},
|
232
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
233
|
+
{"shape":"FileModeRequiredException"},
|
234
|
+
{"shape":"InvalidFileModeException"},
|
235
|
+
{"shape":"NameLengthExceededException"},
|
236
|
+
{"shape":"InvalidEmailException"},
|
237
|
+
{"shape":"CommitMessageLengthExceededException"},
|
238
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
239
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
240
|
+
{"shape":"EncryptionKeyDisabledException"},
|
241
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
242
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
243
|
+
]
|
244
|
+
},
|
169
245
|
"DeleteBranch":{
|
170
246
|
"name":"DeleteBranch",
|
171
247
|
"http":{
|
@@ -254,6 +330,39 @@
|
|
254
330
|
{"shape":"EncryptionKeyUnavailableException"}
|
255
331
|
]
|
256
332
|
},
|
333
|
+
"DescribeMergeConflicts":{
|
334
|
+
"name":"DescribeMergeConflicts",
|
335
|
+
"http":{
|
336
|
+
"method":"POST",
|
337
|
+
"requestUri":"/"
|
338
|
+
},
|
339
|
+
"input":{"shape":"DescribeMergeConflictsInput"},
|
340
|
+
"output":{"shape":"DescribeMergeConflictsOutput"},
|
341
|
+
"errors":[
|
342
|
+
{"shape":"RepositoryNameRequiredException"},
|
343
|
+
{"shape":"InvalidRepositoryNameException"},
|
344
|
+
{"shape":"RepositoryDoesNotExistException"},
|
345
|
+
{"shape":"MergeOptionRequiredException"},
|
346
|
+
{"shape":"InvalidMergeOptionException"},
|
347
|
+
{"shape":"InvalidContinuationTokenException"},
|
348
|
+
{"shape":"CommitRequiredException"},
|
349
|
+
{"shape":"CommitDoesNotExistException"},
|
350
|
+
{"shape":"InvalidCommitException"},
|
351
|
+
{"shape":"TipsDivergenceExceededException"},
|
352
|
+
{"shape":"PathRequiredException"},
|
353
|
+
{"shape":"InvalidPathException"},
|
354
|
+
{"shape":"FileDoesNotExistException"},
|
355
|
+
{"shape":"InvalidMaxMergeHunksException"},
|
356
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
357
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
358
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
359
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
360
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
361
|
+
{"shape":"EncryptionKeyDisabledException"},
|
362
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
363
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
364
|
+
]
|
365
|
+
},
|
257
366
|
"DescribePullRequestEvents":{
|
258
367
|
"name":"DescribePullRequestEvents",
|
259
368
|
"http":{
|
@@ -488,6 +597,30 @@
|
|
488
597
|
{"shape":"EncryptionKeyUnavailableException"}
|
489
598
|
]
|
490
599
|
},
|
600
|
+
"GetMergeCommit":{
|
601
|
+
"name":"GetMergeCommit",
|
602
|
+
"http":{
|
603
|
+
"method":"POST",
|
604
|
+
"requestUri":"/"
|
605
|
+
},
|
606
|
+
"input":{"shape":"GetMergeCommitInput"},
|
607
|
+
"output":{"shape":"GetMergeCommitOutput"},
|
608
|
+
"errors":[
|
609
|
+
{"shape":"RepositoryNameRequiredException"},
|
610
|
+
{"shape":"InvalidRepositoryNameException"},
|
611
|
+
{"shape":"RepositoryDoesNotExistException"},
|
612
|
+
{"shape":"CommitRequiredException"},
|
613
|
+
{"shape":"InvalidCommitException"},
|
614
|
+
{"shape":"CommitDoesNotExistException"},
|
615
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
616
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
617
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
618
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
619
|
+
{"shape":"EncryptionKeyDisabledException"},
|
620
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
621
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
622
|
+
]
|
623
|
+
},
|
491
624
|
"GetMergeConflicts":{
|
492
625
|
"name":"GetMergeConflicts",
|
493
626
|
"http":{
|
@@ -502,12 +635,43 @@
|
|
502
635
|
{"shape":"RepositoryDoesNotExistException"},
|
503
636
|
{"shape":"MergeOptionRequiredException"},
|
504
637
|
{"shape":"InvalidMergeOptionException"},
|
638
|
+
{"shape":"InvalidContinuationTokenException"},
|
639
|
+
{"shape":"CommitRequiredException"},
|
640
|
+
{"shape":"CommitDoesNotExistException"},
|
641
|
+
{"shape":"InvalidCommitException"},
|
642
|
+
{"shape":"TipsDivergenceExceededException"},
|
643
|
+
{"shape":"InvalidMaxConflictFilesException"},
|
644
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
505
645
|
{"shape":"InvalidDestinationCommitSpecifierException"},
|
506
646
|
{"shape":"InvalidSourceCommitSpecifierException"},
|
647
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
648
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
649
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
650
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
651
|
+
{"shape":"EncryptionKeyDisabledException"},
|
652
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
653
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
654
|
+
]
|
655
|
+
},
|
656
|
+
"GetMergeOptions":{
|
657
|
+
"name":"GetMergeOptions",
|
658
|
+
"http":{
|
659
|
+
"method":"POST",
|
660
|
+
"requestUri":"/"
|
661
|
+
},
|
662
|
+
"input":{"shape":"GetMergeOptionsInput"},
|
663
|
+
"output":{"shape":"GetMergeOptionsOutput"},
|
664
|
+
"errors":[
|
665
|
+
{"shape":"RepositoryNameRequiredException"},
|
666
|
+
{"shape":"InvalidRepositoryNameException"},
|
667
|
+
{"shape":"RepositoryDoesNotExistException"},
|
507
668
|
{"shape":"CommitRequiredException"},
|
508
669
|
{"shape":"CommitDoesNotExistException"},
|
509
670
|
{"shape":"InvalidCommitException"},
|
510
671
|
{"shape":"TipsDivergenceExceededException"},
|
672
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
673
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
674
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
511
675
|
{"shape":"EncryptionIntegrityChecksFailedException"},
|
512
676
|
{"shape":"EncryptionKeyAccessDeniedException"},
|
513
677
|
{"shape":"EncryptionKeyDisabledException"},
|
@@ -645,6 +809,131 @@
|
|
645
809
|
{"shape":"InvalidResourceArnException"}
|
646
810
|
]
|
647
811
|
},
|
812
|
+
"MergeBranchesByFastForward":{
|
813
|
+
"name":"MergeBranchesByFastForward",
|
814
|
+
"http":{
|
815
|
+
"method":"POST",
|
816
|
+
"requestUri":"/"
|
817
|
+
},
|
818
|
+
"input":{"shape":"MergeBranchesByFastForwardInput"},
|
819
|
+
"output":{"shape":"MergeBranchesByFastForwardOutput"},
|
820
|
+
"errors":[
|
821
|
+
{"shape":"RepositoryNameRequiredException"},
|
822
|
+
{"shape":"InvalidRepositoryNameException"},
|
823
|
+
{"shape":"RepositoryDoesNotExistException"},
|
824
|
+
{"shape":"TipsDivergenceExceededException"},
|
825
|
+
{"shape":"CommitRequiredException"},
|
826
|
+
{"shape":"InvalidCommitException"},
|
827
|
+
{"shape":"CommitDoesNotExistException"},
|
828
|
+
{"shape":"InvalidTargetBranchException"},
|
829
|
+
{"shape":"InvalidBranchNameException"},
|
830
|
+
{"shape":"BranchNameRequiredException"},
|
831
|
+
{"shape":"BranchNameIsTagNameException"},
|
832
|
+
{"shape":"BranchDoesNotExistException"},
|
833
|
+
{"shape":"ManualMergeRequiredException"},
|
834
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
835
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
836
|
+
{"shape":"EncryptionKeyDisabledException"},
|
837
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
838
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
839
|
+
]
|
840
|
+
},
|
841
|
+
"MergeBranchesBySquash":{
|
842
|
+
"name":"MergeBranchesBySquash",
|
843
|
+
"http":{
|
844
|
+
"method":"POST",
|
845
|
+
"requestUri":"/"
|
846
|
+
},
|
847
|
+
"input":{"shape":"MergeBranchesBySquashInput"},
|
848
|
+
"output":{"shape":"MergeBranchesBySquashOutput"},
|
849
|
+
"errors":[
|
850
|
+
{"shape":"RepositoryNameRequiredException"},
|
851
|
+
{"shape":"InvalidRepositoryNameException"},
|
852
|
+
{"shape":"RepositoryDoesNotExistException"},
|
853
|
+
{"shape":"TipsDivergenceExceededException"},
|
854
|
+
{"shape":"CommitRequiredException"},
|
855
|
+
{"shape":"InvalidCommitException"},
|
856
|
+
{"shape":"CommitDoesNotExistException"},
|
857
|
+
{"shape":"InvalidTargetBranchException"},
|
858
|
+
{"shape":"InvalidBranchNameException"},
|
859
|
+
{"shape":"BranchNameRequiredException"},
|
860
|
+
{"shape":"BranchNameIsTagNameException"},
|
861
|
+
{"shape":"BranchDoesNotExistException"},
|
862
|
+
{"shape":"ManualMergeRequiredException"},
|
863
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
864
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
865
|
+
{"shape":"InvalidConflictResolutionException"},
|
866
|
+
{"shape":"MaximumConflictResolutionEntriesExceededException"},
|
867
|
+
{"shape":"MultipleConflictResolutionEntriesException"},
|
868
|
+
{"shape":"ReplacementTypeRequiredException"},
|
869
|
+
{"shape":"InvalidReplacementTypeException"},
|
870
|
+
{"shape":"ReplacementContentRequiredException"},
|
871
|
+
{"shape":"InvalidReplacementContentException"},
|
872
|
+
{"shape":"PathRequiredException"},
|
873
|
+
{"shape":"InvalidPathException"},
|
874
|
+
{"shape":"FileContentSizeLimitExceededException"},
|
875
|
+
{"shape":"FolderContentSizeLimitExceededException"},
|
876
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
877
|
+
{"shape":"FileModeRequiredException"},
|
878
|
+
{"shape":"InvalidFileModeException"},
|
879
|
+
{"shape":"NameLengthExceededException"},
|
880
|
+
{"shape":"InvalidEmailException"},
|
881
|
+
{"shape":"CommitMessageLengthExceededException"},
|
882
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
883
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
884
|
+
{"shape":"EncryptionKeyDisabledException"},
|
885
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
886
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
887
|
+
]
|
888
|
+
},
|
889
|
+
"MergeBranchesByThreeWay":{
|
890
|
+
"name":"MergeBranchesByThreeWay",
|
891
|
+
"http":{
|
892
|
+
"method":"POST",
|
893
|
+
"requestUri":"/"
|
894
|
+
},
|
895
|
+
"input":{"shape":"MergeBranchesByThreeWayInput"},
|
896
|
+
"output":{"shape":"MergeBranchesByThreeWayOutput"},
|
897
|
+
"errors":[
|
898
|
+
{"shape":"RepositoryNameRequiredException"},
|
899
|
+
{"shape":"InvalidRepositoryNameException"},
|
900
|
+
{"shape":"RepositoryDoesNotExistException"},
|
901
|
+
{"shape":"TipsDivergenceExceededException"},
|
902
|
+
{"shape":"CommitRequiredException"},
|
903
|
+
{"shape":"InvalidCommitException"},
|
904
|
+
{"shape":"CommitDoesNotExistException"},
|
905
|
+
{"shape":"InvalidTargetBranchException"},
|
906
|
+
{"shape":"InvalidBranchNameException"},
|
907
|
+
{"shape":"BranchNameRequiredException"},
|
908
|
+
{"shape":"BranchNameIsTagNameException"},
|
909
|
+
{"shape":"BranchDoesNotExistException"},
|
910
|
+
{"shape":"ManualMergeRequiredException"},
|
911
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
912
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
913
|
+
{"shape":"InvalidConflictResolutionException"},
|
914
|
+
{"shape":"MaximumConflictResolutionEntriesExceededException"},
|
915
|
+
{"shape":"MultipleConflictResolutionEntriesException"},
|
916
|
+
{"shape":"ReplacementTypeRequiredException"},
|
917
|
+
{"shape":"InvalidReplacementTypeException"},
|
918
|
+
{"shape":"ReplacementContentRequiredException"},
|
919
|
+
{"shape":"InvalidReplacementContentException"},
|
920
|
+
{"shape":"PathRequiredException"},
|
921
|
+
{"shape":"InvalidPathException"},
|
922
|
+
{"shape":"FileContentSizeLimitExceededException"},
|
923
|
+
{"shape":"FolderContentSizeLimitExceededException"},
|
924
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
925
|
+
{"shape":"FileModeRequiredException"},
|
926
|
+
{"shape":"InvalidFileModeException"},
|
927
|
+
{"shape":"NameLengthExceededException"},
|
928
|
+
{"shape":"InvalidEmailException"},
|
929
|
+
{"shape":"CommitMessageLengthExceededException"},
|
930
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
931
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
932
|
+
{"shape":"EncryptionKeyDisabledException"},
|
933
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
934
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
935
|
+
]
|
936
|
+
},
|
648
937
|
"MergePullRequestByFastForward":{
|
649
938
|
"name":"MergePullRequestByFastForward",
|
650
939
|
"http":{
|
@@ -662,6 +951,7 @@
|
|
662
951
|
{"shape":"TipOfSourceReferenceIsDifferentException"},
|
663
952
|
{"shape":"ReferenceDoesNotExistException"},
|
664
953
|
{"shape":"InvalidCommitIdException"},
|
954
|
+
{"shape":"RepositoryNotAssociatedWithPullRequestException"},
|
665
955
|
{"shape":"RepositoryNameRequiredException"},
|
666
956
|
{"shape":"InvalidRepositoryNameException"},
|
667
957
|
{"shape":"RepositoryDoesNotExistException"},
|
@@ -672,6 +962,98 @@
|
|
672
962
|
{"shape":"EncryptionKeyUnavailableException"}
|
673
963
|
]
|
674
964
|
},
|
965
|
+
"MergePullRequestBySquash":{
|
966
|
+
"name":"MergePullRequestBySquash",
|
967
|
+
"http":{
|
968
|
+
"method":"POST",
|
969
|
+
"requestUri":"/"
|
970
|
+
},
|
971
|
+
"input":{"shape":"MergePullRequestBySquashInput"},
|
972
|
+
"output":{"shape":"MergePullRequestBySquashOutput"},
|
973
|
+
"errors":[
|
974
|
+
{"shape":"PullRequestAlreadyClosedException"},
|
975
|
+
{"shape":"PullRequestDoesNotExistException"},
|
976
|
+
{"shape":"PullRequestIdRequiredException"},
|
977
|
+
{"shape":"InvalidPullRequestIdException"},
|
978
|
+
{"shape":"InvalidCommitIdException"},
|
979
|
+
{"shape":"ManualMergeRequiredException"},
|
980
|
+
{"shape":"TipOfSourceReferenceIsDifferentException"},
|
981
|
+
{"shape":"TipsDivergenceExceededException"},
|
982
|
+
{"shape":"NameLengthExceededException"},
|
983
|
+
{"shape":"InvalidEmailException"},
|
984
|
+
{"shape":"CommitMessageLengthExceededException"},
|
985
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
986
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
987
|
+
{"shape":"InvalidConflictResolutionException"},
|
988
|
+
{"shape":"ReplacementTypeRequiredException"},
|
989
|
+
{"shape":"InvalidReplacementTypeException"},
|
990
|
+
{"shape":"MultipleConflictResolutionEntriesException"},
|
991
|
+
{"shape":"ReplacementContentRequiredException"},
|
992
|
+
{"shape":"MaximumConflictResolutionEntriesExceededException"},
|
993
|
+
{"shape":"PathRequiredException"},
|
994
|
+
{"shape":"InvalidPathException"},
|
995
|
+
{"shape":"InvalidFileModeException"},
|
996
|
+
{"shape":"InvalidReplacementContentException"},
|
997
|
+
{"shape":"FileContentSizeLimitExceededException"},
|
998
|
+
{"shape":"FolderContentSizeLimitExceededException"},
|
999
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
1000
|
+
{"shape":"RepositoryNameRequiredException"},
|
1001
|
+
{"shape":"InvalidRepositoryNameException"},
|
1002
|
+
{"shape":"RepositoryDoesNotExistException"},
|
1003
|
+
{"shape":"RepositoryNotAssociatedWithPullRequestException"},
|
1004
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
1005
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
1006
|
+
{"shape":"EncryptionKeyDisabledException"},
|
1007
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
1008
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
1009
|
+
]
|
1010
|
+
},
|
1011
|
+
"MergePullRequestByThreeWay":{
|
1012
|
+
"name":"MergePullRequestByThreeWay",
|
1013
|
+
"http":{
|
1014
|
+
"method":"POST",
|
1015
|
+
"requestUri":"/"
|
1016
|
+
},
|
1017
|
+
"input":{"shape":"MergePullRequestByThreeWayInput"},
|
1018
|
+
"output":{"shape":"MergePullRequestByThreeWayOutput"},
|
1019
|
+
"errors":[
|
1020
|
+
{"shape":"PullRequestAlreadyClosedException"},
|
1021
|
+
{"shape":"PullRequestDoesNotExistException"},
|
1022
|
+
{"shape":"PullRequestIdRequiredException"},
|
1023
|
+
{"shape":"InvalidPullRequestIdException"},
|
1024
|
+
{"shape":"InvalidCommitIdException"},
|
1025
|
+
{"shape":"ManualMergeRequiredException"},
|
1026
|
+
{"shape":"TipOfSourceReferenceIsDifferentException"},
|
1027
|
+
{"shape":"TipsDivergenceExceededException"},
|
1028
|
+
{"shape":"NameLengthExceededException"},
|
1029
|
+
{"shape":"InvalidEmailException"},
|
1030
|
+
{"shape":"CommitMessageLengthExceededException"},
|
1031
|
+
{"shape":"InvalidConflictDetailLevelException"},
|
1032
|
+
{"shape":"InvalidConflictResolutionStrategyException"},
|
1033
|
+
{"shape":"InvalidConflictResolutionException"},
|
1034
|
+
{"shape":"ReplacementTypeRequiredException"},
|
1035
|
+
{"shape":"InvalidReplacementTypeException"},
|
1036
|
+
{"shape":"MultipleConflictResolutionEntriesException"},
|
1037
|
+
{"shape":"ReplacementContentRequiredException"},
|
1038
|
+
{"shape":"MaximumConflictResolutionEntriesExceededException"},
|
1039
|
+
{"shape":"PathRequiredException"},
|
1040
|
+
{"shape":"InvalidPathException"},
|
1041
|
+
{"shape":"InvalidFileModeException"},
|
1042
|
+
{"shape":"InvalidReplacementContentException"},
|
1043
|
+
{"shape":"FileContentSizeLimitExceededException"},
|
1044
|
+
{"shape":"FolderContentSizeLimitExceededException"},
|
1045
|
+
{"shape":"MaximumFileContentToLoadExceededException"},
|
1046
|
+
{"shape":"RepositoryNameRequiredException"},
|
1047
|
+
{"shape":"InvalidRepositoryNameException"},
|
1048
|
+
{"shape":"RepositoryDoesNotExistException"},
|
1049
|
+
{"shape":"RepositoryNotAssociatedWithPullRequestException"},
|
1050
|
+
{"shape":"EncryptionIntegrityChecksFailedException"},
|
1051
|
+
{"shape":"EncryptionKeyAccessDeniedException"},
|
1052
|
+
{"shape":"EncryptionKeyDisabledException"},
|
1053
|
+
{"shape":"EncryptionKeyNotFoundException"},
|
1054
|
+
{"shape":"EncryptionKeyUnavailableException"}
|
1055
|
+
]
|
1056
|
+
},
|
675
1057
|
"PostCommentForComparedCommit":{
|
676
1058
|
"name":"PostCommentForComparedCommit",
|
677
1059
|
"http":{
|
@@ -1054,6 +1436,60 @@
|
|
1054
1436
|
},
|
1055
1437
|
"exception":true
|
1056
1438
|
},
|
1439
|
+
"BatchDescribeMergeConflictsError":{
|
1440
|
+
"type":"structure",
|
1441
|
+
"required":[
|
1442
|
+
"filePath",
|
1443
|
+
"exceptionName",
|
1444
|
+
"message"
|
1445
|
+
],
|
1446
|
+
"members":{
|
1447
|
+
"filePath":{"shape":"Path"},
|
1448
|
+
"exceptionName":{"shape":"ExceptionName"},
|
1449
|
+
"message":{"shape":"Message"}
|
1450
|
+
}
|
1451
|
+
},
|
1452
|
+
"BatchDescribeMergeConflictsErrors":{
|
1453
|
+
"type":"list",
|
1454
|
+
"member":{"shape":"BatchDescribeMergeConflictsError"}
|
1455
|
+
},
|
1456
|
+
"BatchDescribeMergeConflictsInput":{
|
1457
|
+
"type":"structure",
|
1458
|
+
"required":[
|
1459
|
+
"repositoryName",
|
1460
|
+
"destinationCommitSpecifier",
|
1461
|
+
"sourceCommitSpecifier",
|
1462
|
+
"mergeOption"
|
1463
|
+
],
|
1464
|
+
"members":{
|
1465
|
+
"repositoryName":{"shape":"RepositoryName"},
|
1466
|
+
"destinationCommitSpecifier":{"shape":"CommitName"},
|
1467
|
+
"sourceCommitSpecifier":{"shape":"CommitName"},
|
1468
|
+
"mergeOption":{"shape":"MergeOptionTypeEnum"},
|
1469
|
+
"maxMergeHunks":{"shape":"MaxResults"},
|
1470
|
+
"maxConflictFiles":{"shape":"MaxResults"},
|
1471
|
+
"filePaths":{"shape":"FilePaths"},
|
1472
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
1473
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"},
|
1474
|
+
"nextToken":{"shape":"NextToken"}
|
1475
|
+
}
|
1476
|
+
},
|
1477
|
+
"BatchDescribeMergeConflictsOutput":{
|
1478
|
+
"type":"structure",
|
1479
|
+
"required":[
|
1480
|
+
"conflicts",
|
1481
|
+
"destinationCommitId",
|
1482
|
+
"sourceCommitId"
|
1483
|
+
],
|
1484
|
+
"members":{
|
1485
|
+
"conflicts":{"shape":"Conflicts"},
|
1486
|
+
"nextToken":{"shape":"NextToken"},
|
1487
|
+
"errors":{"shape":"BatchDescribeMergeConflictsErrors"},
|
1488
|
+
"destinationCommitId":{"shape":"ObjectId"},
|
1489
|
+
"sourceCommitId":{"shape":"ObjectId"},
|
1490
|
+
"baseCommitId":{"shape":"ObjectId"}
|
1491
|
+
}
|
1492
|
+
},
|
1057
1493
|
"BatchGetRepositoriesInput":{
|
1058
1494
|
"type":"structure",
|
1059
1495
|
"required":["repositoryNames"],
|
@@ -1134,6 +1570,7 @@
|
|
1134
1570
|
},
|
1135
1571
|
"exception":true
|
1136
1572
|
},
|
1573
|
+
"CapitalBoolean":{"type":"boolean"},
|
1137
1574
|
"ChangeTypeEnum":{
|
1138
1575
|
"type":"string",
|
1139
1576
|
"enum":[
|
@@ -1282,6 +1719,60 @@
|
|
1282
1719
|
},
|
1283
1720
|
"exception":true
|
1284
1721
|
},
|
1722
|
+
"Conflict":{
|
1723
|
+
"type":"structure",
|
1724
|
+
"members":{
|
1725
|
+
"conflictMetadata":{"shape":"ConflictMetadata"},
|
1726
|
+
"mergeHunks":{"shape":"MergeHunks"}
|
1727
|
+
}
|
1728
|
+
},
|
1729
|
+
"ConflictDetailLevelTypeEnum":{
|
1730
|
+
"type":"string",
|
1731
|
+
"enum":[
|
1732
|
+
"FILE_LEVEL",
|
1733
|
+
"LINE_LEVEL"
|
1734
|
+
]
|
1735
|
+
},
|
1736
|
+
"ConflictMetadata":{
|
1737
|
+
"type":"structure",
|
1738
|
+
"members":{
|
1739
|
+
"filePath":{"shape":"Path"},
|
1740
|
+
"fileSizes":{"shape":"FileSizes"},
|
1741
|
+
"fileModes":{"shape":"FileModes"},
|
1742
|
+
"objectTypes":{"shape":"ObjectTypes"},
|
1743
|
+
"numberOfConflicts":{"shape":"NumberOfConflicts"},
|
1744
|
+
"isBinaryFile":{"shape":"IsBinaryFile"},
|
1745
|
+
"contentConflict":{"shape":"IsContentConflict"},
|
1746
|
+
"fileModeConflict":{"shape":"IsFileModeConflict"},
|
1747
|
+
"objectTypeConflict":{"shape":"IsObjectTypeConflict"},
|
1748
|
+
"mergeOperations":{"shape":"MergeOperations"}
|
1749
|
+
}
|
1750
|
+
},
|
1751
|
+
"ConflictMetadataList":{
|
1752
|
+
"type":"list",
|
1753
|
+
"member":{"shape":"ConflictMetadata"}
|
1754
|
+
},
|
1755
|
+
"ConflictResolution":{
|
1756
|
+
"type":"structure",
|
1757
|
+
"members":{
|
1758
|
+
"replaceContents":{"shape":"ReplaceContentEntries"},
|
1759
|
+
"deleteFiles":{"shape":"DeleteFileEntries"},
|
1760
|
+
"setFileModes":{"shape":"SetFileModeEntries"}
|
1761
|
+
}
|
1762
|
+
},
|
1763
|
+
"ConflictResolutionStrategyTypeEnum":{
|
1764
|
+
"type":"string",
|
1765
|
+
"enum":[
|
1766
|
+
"NONE",
|
1767
|
+
"ACCEPT_SOURCE",
|
1768
|
+
"ACCEPT_DESTINATION",
|
1769
|
+
"AUTOMERGE"
|
1770
|
+
]
|
1771
|
+
},
|
1772
|
+
"Conflicts":{
|
1773
|
+
"type":"list",
|
1774
|
+
"member":{"shape":"Conflict"}
|
1775
|
+
},
|
1285
1776
|
"Content":{"type":"string"},
|
1286
1777
|
"CreateBranchInput":{
|
1287
1778
|
"type":"structure",
|
@@ -1363,6 +1854,35 @@
|
|
1363
1854
|
"repositoryMetadata":{"shape":"RepositoryMetadata"}
|
1364
1855
|
}
|
1365
1856
|
},
|
1857
|
+
"CreateUnreferencedMergeCommitInput":{
|
1858
|
+
"type":"structure",
|
1859
|
+
"required":[
|
1860
|
+
"repositoryName",
|
1861
|
+
"sourceCommitSpecifier",
|
1862
|
+
"destinationCommitSpecifier",
|
1863
|
+
"mergeOption"
|
1864
|
+
],
|
1865
|
+
"members":{
|
1866
|
+
"repositoryName":{"shape":"RepositoryName"},
|
1867
|
+
"sourceCommitSpecifier":{"shape":"CommitName"},
|
1868
|
+
"destinationCommitSpecifier":{"shape":"CommitName"},
|
1869
|
+
"mergeOption":{"shape":"MergeOptionTypeEnum"},
|
1870
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
1871
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"},
|
1872
|
+
"authorName":{"shape":"Name"},
|
1873
|
+
"email":{"shape":"Email"},
|
1874
|
+
"commitMessage":{"shape":"Message"},
|
1875
|
+
"keepEmptyFolders":{"shape":"KeepEmptyFolders"},
|
1876
|
+
"conflictResolution":{"shape":"ConflictResolution"}
|
1877
|
+
}
|
1878
|
+
},
|
1879
|
+
"CreateUnreferencedMergeCommitOutput":{
|
1880
|
+
"type":"structure",
|
1881
|
+
"members":{
|
1882
|
+
"commitId":{"shape":"ObjectId"},
|
1883
|
+
"treeId":{"shape":"ObjectId"}
|
1884
|
+
}
|
1885
|
+
},
|
1366
1886
|
"CreationDate":{"type":"timestamp"},
|
1367
1887
|
"Date":{"type":"string"},
|
1368
1888
|
"DefaultBranchCannotBeDeletedException":{
|
@@ -1459,6 +1979,44 @@
|
|
1459
1979
|
"repositoryId":{"shape":"RepositoryId"}
|
1460
1980
|
}
|
1461
1981
|
},
|
1982
|
+
"DescribeMergeConflictsInput":{
|
1983
|
+
"type":"structure",
|
1984
|
+
"required":[
|
1985
|
+
"repositoryName",
|
1986
|
+
"destinationCommitSpecifier",
|
1987
|
+
"sourceCommitSpecifier",
|
1988
|
+
"mergeOption",
|
1989
|
+
"filePath"
|
1990
|
+
],
|
1991
|
+
"members":{
|
1992
|
+
"repositoryName":{"shape":"RepositoryName"},
|
1993
|
+
"destinationCommitSpecifier":{"shape":"CommitName"},
|
1994
|
+
"sourceCommitSpecifier":{"shape":"CommitName"},
|
1995
|
+
"mergeOption":{"shape":"MergeOptionTypeEnum"},
|
1996
|
+
"maxMergeHunks":{"shape":"MaxResults"},
|
1997
|
+
"filePath":{"shape":"Path"},
|
1998
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
1999
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"},
|
2000
|
+
"nextToken":{"shape":"NextToken"}
|
2001
|
+
}
|
2002
|
+
},
|
2003
|
+
"DescribeMergeConflictsOutput":{
|
2004
|
+
"type":"structure",
|
2005
|
+
"required":[
|
2006
|
+
"conflictMetadata",
|
2007
|
+
"mergeHunks",
|
2008
|
+
"destinationCommitId",
|
2009
|
+
"sourceCommitId"
|
2010
|
+
],
|
2011
|
+
"members":{
|
2012
|
+
"conflictMetadata":{"shape":"ConflictMetadata"},
|
2013
|
+
"mergeHunks":{"shape":"MergeHunks"},
|
2014
|
+
"nextToken":{"shape":"NextToken"},
|
2015
|
+
"destinationCommitId":{"shape":"ObjectId"},
|
2016
|
+
"sourceCommitId":{"shape":"ObjectId"},
|
2017
|
+
"baseCommitId":{"shape":"ObjectId"}
|
2018
|
+
}
|
2019
|
+
},
|
1462
2020
|
"DescribePullRequestEventsInput":{
|
1463
2021
|
"type":"structure",
|
1464
2022
|
"required":["pullRequestId"],
|
@@ -1533,6 +2091,7 @@
|
|
1533
2091
|
"exception":true
|
1534
2092
|
},
|
1535
2093
|
"EventDate":{"type":"timestamp"},
|
2094
|
+
"ExceptionName":{"type":"string"},
|
1536
2095
|
"File":{
|
1537
2096
|
"type":"structure",
|
1538
2097
|
"members":{
|
@@ -1602,6 +2161,14 @@
|
|
1602
2161
|
"SYMLINK"
|
1603
2162
|
]
|
1604
2163
|
},
|
2164
|
+
"FileModes":{
|
2165
|
+
"type":"structure",
|
2166
|
+
"members":{
|
2167
|
+
"source":{"shape":"FileModeTypeEnum"},
|
2168
|
+
"destination":{"shape":"FileModeTypeEnum"},
|
2169
|
+
"base":{"shape":"FileModeTypeEnum"}
|
2170
|
+
}
|
2171
|
+
},
|
1605
2172
|
"FileNameConflictsWithDirectoryNameException":{
|
1606
2173
|
"type":"structure",
|
1607
2174
|
"members":{
|
@@ -1614,6 +2181,19 @@
|
|
1614
2181
|
},
|
1615
2182
|
"exception":true
|
1616
2183
|
},
|
2184
|
+
"FilePaths":{
|
2185
|
+
"type":"list",
|
2186
|
+
"member":{"shape":"Path"}
|
2187
|
+
},
|
2188
|
+
"FileSize":{"type":"long"},
|
2189
|
+
"FileSizes":{
|
2190
|
+
"type":"structure",
|
2191
|
+
"members":{
|
2192
|
+
"source":{"shape":"FileSize"},
|
2193
|
+
"destination":{"shape":"FileSize"},
|
2194
|
+
"base":{"shape":"FileSize"}
|
2195
|
+
}
|
2196
|
+
},
|
1617
2197
|
"FileTooLargeException":{
|
1618
2198
|
"type":"structure",
|
1619
2199
|
"members":{
|
@@ -1832,6 +2412,30 @@
|
|
1832
2412
|
"subModules":{"shape":"SubModuleList"}
|
1833
2413
|
}
|
1834
2414
|
},
|
2415
|
+
"GetMergeCommitInput":{
|
2416
|
+
"type":"structure",
|
2417
|
+
"required":[
|
2418
|
+
"repositoryName",
|
2419
|
+
"sourceCommitSpecifier",
|
2420
|
+
"destinationCommitSpecifier"
|
2421
|
+
],
|
2422
|
+
"members":{
|
2423
|
+
"repositoryName":{"shape":"RepositoryName"},
|
2424
|
+
"sourceCommitSpecifier":{"shape":"CommitName"},
|
2425
|
+
"destinationCommitSpecifier":{"shape":"CommitName"},
|
2426
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
2427
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"}
|
2428
|
+
}
|
2429
|
+
},
|
2430
|
+
"GetMergeCommitOutput":{
|
2431
|
+
"type":"structure",
|
2432
|
+
"members":{
|
2433
|
+
"sourceCommitId":{"shape":"ObjectId"},
|
2434
|
+
"destinationCommitId":{"shape":"ObjectId"},
|
2435
|
+
"baseCommitId":{"shape":"ObjectId"},
|
2436
|
+
"mergedCommitId":{"shape":"ObjectId"}
|
2437
|
+
}
|
2438
|
+
},
|
1835
2439
|
"GetMergeConflictsInput":{
|
1836
2440
|
"type":"structure",
|
1837
2441
|
"required":[
|
@@ -1844,7 +2448,11 @@
|
|
1844
2448
|
"repositoryName":{"shape":"RepositoryName"},
|
1845
2449
|
"destinationCommitSpecifier":{"shape":"CommitName"},
|
1846
2450
|
"sourceCommitSpecifier":{"shape":"CommitName"},
|
1847
|
-
"mergeOption":{"shape":"MergeOptionTypeEnum"}
|
2451
|
+
"mergeOption":{"shape":"MergeOptionTypeEnum"},
|
2452
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
2453
|
+
"maxConflictFiles":{"shape":"MaxResults"},
|
2454
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"},
|
2455
|
+
"nextToken":{"shape":"NextToken"}
|
1848
2456
|
}
|
1849
2457
|
},
|
1850
2458
|
"GetMergeConflictsOutput":{
|
@@ -1852,12 +2460,46 @@
|
|
1852
2460
|
"required":[
|
1853
2461
|
"mergeable",
|
1854
2462
|
"destinationCommitId",
|
1855
|
-
"sourceCommitId"
|
2463
|
+
"sourceCommitId",
|
2464
|
+
"conflictMetadataList"
|
1856
2465
|
],
|
1857
2466
|
"members":{
|
1858
2467
|
"mergeable":{"shape":"IsMergeable"},
|
1859
|
-
"destinationCommitId":{"shape":"
|
1860
|
-
"sourceCommitId":{"shape":"
|
2468
|
+
"destinationCommitId":{"shape":"ObjectId"},
|
2469
|
+
"sourceCommitId":{"shape":"ObjectId"},
|
2470
|
+
"baseCommitId":{"shape":"ObjectId"},
|
2471
|
+
"conflictMetadataList":{"shape":"ConflictMetadataList"},
|
2472
|
+
"nextToken":{"shape":"NextToken"}
|
2473
|
+
}
|
2474
|
+
},
|
2475
|
+
"GetMergeOptionsInput":{
|
2476
|
+
"type":"structure",
|
2477
|
+
"required":[
|
2478
|
+
"repositoryName",
|
2479
|
+
"sourceCommitSpecifier",
|
2480
|
+
"destinationCommitSpecifier"
|
2481
|
+
],
|
2482
|
+
"members":{
|
2483
|
+
"repositoryName":{"shape":"RepositoryName"},
|
2484
|
+
"sourceCommitSpecifier":{"shape":"CommitName"},
|
2485
|
+
"destinationCommitSpecifier":{"shape":"CommitName"},
|
2486
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
2487
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"}
|
2488
|
+
}
|
2489
|
+
},
|
2490
|
+
"GetMergeOptionsOutput":{
|
2491
|
+
"type":"structure",
|
2492
|
+
"required":[
|
2493
|
+
"mergeOptions",
|
2494
|
+
"sourceCommitId",
|
2495
|
+
"destinationCommitId",
|
2496
|
+
"baseCommitId"
|
2497
|
+
],
|
2498
|
+
"members":{
|
2499
|
+
"mergeOptions":{"shape":"MergeOptions"},
|
2500
|
+
"sourceCommitId":{"shape":"ObjectId"},
|
2501
|
+
"destinationCommitId":{"shape":"ObjectId"},
|
2502
|
+
"baseCommitId":{"shape":"ObjectId"}
|
1861
2503
|
}
|
1862
2504
|
},
|
1863
2505
|
"GetPullRequestInput":{
|
@@ -1901,6 +2543,7 @@
|
|
1901
2543
|
"triggers":{"shape":"RepositoryTriggersList"}
|
1902
2544
|
}
|
1903
2545
|
},
|
2546
|
+
"HunkContent":{"type":"string"},
|
1904
2547
|
"IdempotencyParameterMismatchException":{
|
1905
2548
|
"type":"structure",
|
1906
2549
|
"members":{
|
@@ -1955,6 +2598,24 @@
|
|
1955
2598
|
},
|
1956
2599
|
"exception":true
|
1957
2600
|
},
|
2601
|
+
"InvalidConflictDetailLevelException":{
|
2602
|
+
"type":"structure",
|
2603
|
+
"members":{
|
2604
|
+
},
|
2605
|
+
"exception":true
|
2606
|
+
},
|
2607
|
+
"InvalidConflictResolutionException":{
|
2608
|
+
"type":"structure",
|
2609
|
+
"members":{
|
2610
|
+
},
|
2611
|
+
"exception":true
|
2612
|
+
},
|
2613
|
+
"InvalidConflictResolutionStrategyException":{
|
2614
|
+
"type":"structure",
|
2615
|
+
"members":{
|
2616
|
+
},
|
2617
|
+
"exception":true
|
2618
|
+
},
|
1958
2619
|
"InvalidContinuationTokenException":{
|
1959
2620
|
"type":"structure",
|
1960
2621
|
"members":{
|
@@ -2003,6 +2664,18 @@
|
|
2003
2664
|
},
|
2004
2665
|
"exception":true
|
2005
2666
|
},
|
2667
|
+
"InvalidMaxConflictFilesException":{
|
2668
|
+
"type":"structure",
|
2669
|
+
"members":{
|
2670
|
+
},
|
2671
|
+
"exception":true
|
2672
|
+
},
|
2673
|
+
"InvalidMaxMergeHunksException":{
|
2674
|
+
"type":"structure",
|
2675
|
+
"members":{
|
2676
|
+
},
|
2677
|
+
"exception":true
|
2678
|
+
},
|
2006
2679
|
"InvalidMaxResultsException":{
|
2007
2680
|
"type":"structure",
|
2008
2681
|
"members":{
|
@@ -2069,6 +2742,18 @@
|
|
2069
2742
|
},
|
2070
2743
|
"exception":true
|
2071
2744
|
},
|
2745
|
+
"InvalidReplacementContentException":{
|
2746
|
+
"type":"structure",
|
2747
|
+
"members":{
|
2748
|
+
},
|
2749
|
+
"exception":true
|
2750
|
+
},
|
2751
|
+
"InvalidReplacementTypeException":{
|
2752
|
+
"type":"structure",
|
2753
|
+
"members":{
|
2754
|
+
},
|
2755
|
+
"exception":true
|
2756
|
+
},
|
2072
2757
|
"InvalidRepositoryDescriptionException":{
|
2073
2758
|
"type":"structure",
|
2074
2759
|
"members":{
|
@@ -2153,6 +2838,12 @@
|
|
2153
2838
|
},
|
2154
2839
|
"exception":true
|
2155
2840
|
},
|
2841
|
+
"InvalidTargetBranchException":{
|
2842
|
+
"type":"structure",
|
2843
|
+
"members":{
|
2844
|
+
},
|
2845
|
+
"exception":true
|
2846
|
+
},
|
2156
2847
|
"InvalidTargetException":{
|
2157
2848
|
"type":"structure",
|
2158
2849
|
"members":{
|
@@ -2171,16 +2862,29 @@
|
|
2171
2862
|
},
|
2172
2863
|
"exception":true
|
2173
2864
|
},
|
2865
|
+
"IsBinaryFile":{
|
2866
|
+
"type":"structure",
|
2867
|
+
"members":{
|
2868
|
+
"source":{"shape":"CapitalBoolean"},
|
2869
|
+
"destination":{"shape":"CapitalBoolean"},
|
2870
|
+
"base":{"shape":"CapitalBoolean"}
|
2871
|
+
}
|
2872
|
+
},
|
2174
2873
|
"IsCommentDeleted":{"type":"boolean"},
|
2874
|
+
"IsContentConflict":{"type":"boolean"},
|
2875
|
+
"IsFileModeConflict":{"type":"boolean"},
|
2876
|
+
"IsHunkConflict":{"type":"boolean"},
|
2175
2877
|
"IsMergeable":{"type":"boolean"},
|
2176
2878
|
"IsMerged":{"type":"boolean"},
|
2177
2879
|
"IsMove":{"type":"boolean"},
|
2880
|
+
"IsObjectTypeConflict":{"type":"boolean"},
|
2178
2881
|
"KeepEmptyFolders":{"type":"boolean"},
|
2179
2882
|
"LastModifiedDate":{"type":"timestamp"},
|
2180
2883
|
"Limit":{
|
2181
2884
|
"type":"integer",
|
2182
2885
|
"box":true
|
2183
2886
|
},
|
2887
|
+
"LineNumber":{"type":"integer"},
|
2184
2888
|
"ListBranchesInput":{
|
2185
2889
|
"type":"structure",
|
2186
2890
|
"required":["repositoryName"],
|
@@ -2266,6 +2970,18 @@
|
|
2266
2970
|
},
|
2267
2971
|
"exception":true
|
2268
2972
|
},
|
2973
|
+
"MaximumConflictResolutionEntriesExceededException":{
|
2974
|
+
"type":"structure",
|
2975
|
+
"members":{
|
2976
|
+
},
|
2977
|
+
"exception":true
|
2978
|
+
},
|
2979
|
+
"MaximumFileContentToLoadExceededException":{
|
2980
|
+
"type":"structure",
|
2981
|
+
"members":{
|
2982
|
+
},
|
2983
|
+
"exception":true
|
2984
|
+
},
|
2269
2985
|
"MaximumFileEntriesExceededException":{
|
2270
2986
|
"type":"structure",
|
2271
2987
|
"members":{
|
@@ -2290,11 +3006,118 @@
|
|
2290
3006
|
},
|
2291
3007
|
"exception":true
|
2292
3008
|
},
|
3009
|
+
"MergeBranchesByFastForwardInput":{
|
3010
|
+
"type":"structure",
|
3011
|
+
"required":[
|
3012
|
+
"repositoryName",
|
3013
|
+
"sourceCommitSpecifier",
|
3014
|
+
"destinationCommitSpecifier"
|
3015
|
+
],
|
3016
|
+
"members":{
|
3017
|
+
"repositoryName":{"shape":"RepositoryName"},
|
3018
|
+
"sourceCommitSpecifier":{"shape":"CommitName"},
|
3019
|
+
"destinationCommitSpecifier":{"shape":"CommitName"},
|
3020
|
+
"targetBranch":{"shape":"BranchName"}
|
3021
|
+
}
|
3022
|
+
},
|
3023
|
+
"MergeBranchesByFastForwardOutput":{
|
3024
|
+
"type":"structure",
|
3025
|
+
"members":{
|
3026
|
+
"commitId":{"shape":"ObjectId"},
|
3027
|
+
"treeId":{"shape":"ObjectId"}
|
3028
|
+
}
|
3029
|
+
},
|
3030
|
+
"MergeBranchesBySquashInput":{
|
3031
|
+
"type":"structure",
|
3032
|
+
"required":[
|
3033
|
+
"repositoryName",
|
3034
|
+
"sourceCommitSpecifier",
|
3035
|
+
"destinationCommitSpecifier"
|
3036
|
+
],
|
3037
|
+
"members":{
|
3038
|
+
"repositoryName":{"shape":"RepositoryName"},
|
3039
|
+
"sourceCommitSpecifier":{"shape":"CommitName"},
|
3040
|
+
"destinationCommitSpecifier":{"shape":"CommitName"},
|
3041
|
+
"targetBranch":{"shape":"BranchName"},
|
3042
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
3043
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"},
|
3044
|
+
"authorName":{"shape":"Name"},
|
3045
|
+
"email":{"shape":"Email"},
|
3046
|
+
"commitMessage":{"shape":"Message"},
|
3047
|
+
"keepEmptyFolders":{"shape":"KeepEmptyFolders"},
|
3048
|
+
"conflictResolution":{"shape":"ConflictResolution"}
|
3049
|
+
}
|
3050
|
+
},
|
3051
|
+
"MergeBranchesBySquashOutput":{
|
3052
|
+
"type":"structure",
|
3053
|
+
"members":{
|
3054
|
+
"commitId":{"shape":"ObjectId"},
|
3055
|
+
"treeId":{"shape":"ObjectId"}
|
3056
|
+
}
|
3057
|
+
},
|
3058
|
+
"MergeBranchesByThreeWayInput":{
|
3059
|
+
"type":"structure",
|
3060
|
+
"required":[
|
3061
|
+
"repositoryName",
|
3062
|
+
"sourceCommitSpecifier",
|
3063
|
+
"destinationCommitSpecifier"
|
3064
|
+
],
|
3065
|
+
"members":{
|
3066
|
+
"repositoryName":{"shape":"RepositoryName"},
|
3067
|
+
"sourceCommitSpecifier":{"shape":"CommitName"},
|
3068
|
+
"destinationCommitSpecifier":{"shape":"CommitName"},
|
3069
|
+
"targetBranch":{"shape":"BranchName"},
|
3070
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
3071
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"},
|
3072
|
+
"authorName":{"shape":"Name"},
|
3073
|
+
"email":{"shape":"Email"},
|
3074
|
+
"commitMessage":{"shape":"Message"},
|
3075
|
+
"keepEmptyFolders":{"shape":"KeepEmptyFolders"},
|
3076
|
+
"conflictResolution":{"shape":"ConflictResolution"}
|
3077
|
+
}
|
3078
|
+
},
|
3079
|
+
"MergeBranchesByThreeWayOutput":{
|
3080
|
+
"type":"structure",
|
3081
|
+
"members":{
|
3082
|
+
"commitId":{"shape":"ObjectId"},
|
3083
|
+
"treeId":{"shape":"ObjectId"}
|
3084
|
+
}
|
3085
|
+
},
|
3086
|
+
"MergeHunk":{
|
3087
|
+
"type":"structure",
|
3088
|
+
"members":{
|
3089
|
+
"isConflict":{"shape":"IsHunkConflict"},
|
3090
|
+
"source":{"shape":"MergeHunkDetail"},
|
3091
|
+
"destination":{"shape":"MergeHunkDetail"},
|
3092
|
+
"base":{"shape":"MergeHunkDetail"}
|
3093
|
+
}
|
3094
|
+
},
|
3095
|
+
"MergeHunkDetail":{
|
3096
|
+
"type":"structure",
|
3097
|
+
"members":{
|
3098
|
+
"startLine":{"shape":"LineNumber"},
|
3099
|
+
"endLine":{"shape":"LineNumber"},
|
3100
|
+
"hunkContent":{"shape":"HunkContent"}
|
3101
|
+
}
|
3102
|
+
},
|
3103
|
+
"MergeHunks":{
|
3104
|
+
"type":"list",
|
3105
|
+
"member":{"shape":"MergeHunk"}
|
3106
|
+
},
|
2293
3107
|
"MergeMetadata":{
|
2294
3108
|
"type":"structure",
|
2295
3109
|
"members":{
|
2296
3110
|
"isMerged":{"shape":"IsMerged"},
|
2297
|
-
"mergedBy":{"shape":"Arn"}
|
3111
|
+
"mergedBy":{"shape":"Arn"},
|
3112
|
+
"mergeCommitId":{"shape":"CommitId"},
|
3113
|
+
"mergeOption":{"shape":"MergeOptionTypeEnum"}
|
3114
|
+
}
|
3115
|
+
},
|
3116
|
+
"MergeOperations":{
|
3117
|
+
"type":"structure",
|
3118
|
+
"members":{
|
3119
|
+
"source":{"shape":"ChangeTypeEnum"},
|
3120
|
+
"destination":{"shape":"ChangeTypeEnum"}
|
2298
3121
|
}
|
2299
3122
|
},
|
2300
3123
|
"MergeOptionRequiredException":{
|
@@ -2305,7 +3128,15 @@
|
|
2305
3128
|
},
|
2306
3129
|
"MergeOptionTypeEnum":{
|
2307
3130
|
"type":"string",
|
2308
|
-
"enum":[
|
3131
|
+
"enum":[
|
3132
|
+
"FAST_FORWARD_MERGE",
|
3133
|
+
"SQUASH_MERGE",
|
3134
|
+
"THREE_WAY_MERGE"
|
3135
|
+
]
|
3136
|
+
},
|
3137
|
+
"MergeOptions":{
|
3138
|
+
"type":"list",
|
3139
|
+
"member":{"shape":"MergeOptionTypeEnum"}
|
2309
3140
|
},
|
2310
3141
|
"MergePullRequestByFastForwardInput":{
|
2311
3142
|
"type":"structure",
|
@@ -2316,7 +3147,7 @@
|
|
2316
3147
|
"members":{
|
2317
3148
|
"pullRequestId":{"shape":"PullRequestId"},
|
2318
3149
|
"repositoryName":{"shape":"RepositoryName"},
|
2319
|
-
"sourceCommitId":{"shape":"
|
3150
|
+
"sourceCommitId":{"shape":"ObjectId"}
|
2320
3151
|
}
|
2321
3152
|
},
|
2322
3153
|
"MergePullRequestByFastForwardOutput":{
|
@@ -2325,8 +3156,64 @@
|
|
2325
3156
|
"pullRequest":{"shape":"PullRequest"}
|
2326
3157
|
}
|
2327
3158
|
},
|
3159
|
+
"MergePullRequestBySquashInput":{
|
3160
|
+
"type":"structure",
|
3161
|
+
"required":[
|
3162
|
+
"pullRequestId",
|
3163
|
+
"repositoryName"
|
3164
|
+
],
|
3165
|
+
"members":{
|
3166
|
+
"pullRequestId":{"shape":"PullRequestId"},
|
3167
|
+
"repositoryName":{"shape":"RepositoryName"},
|
3168
|
+
"sourceCommitId":{"shape":"ObjectId"},
|
3169
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
3170
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"},
|
3171
|
+
"commitMessage":{"shape":"Message"},
|
3172
|
+
"authorName":{"shape":"Name"},
|
3173
|
+
"email":{"shape":"Email"},
|
3174
|
+
"keepEmptyFolders":{"shape":"KeepEmptyFolders"},
|
3175
|
+
"conflictResolution":{"shape":"ConflictResolution"}
|
3176
|
+
}
|
3177
|
+
},
|
3178
|
+
"MergePullRequestBySquashOutput":{
|
3179
|
+
"type":"structure",
|
3180
|
+
"members":{
|
3181
|
+
"pullRequest":{"shape":"PullRequest"}
|
3182
|
+
}
|
3183
|
+
},
|
3184
|
+
"MergePullRequestByThreeWayInput":{
|
3185
|
+
"type":"structure",
|
3186
|
+
"required":[
|
3187
|
+
"pullRequestId",
|
3188
|
+
"repositoryName"
|
3189
|
+
],
|
3190
|
+
"members":{
|
3191
|
+
"pullRequestId":{"shape":"PullRequestId"},
|
3192
|
+
"repositoryName":{"shape":"RepositoryName"},
|
3193
|
+
"sourceCommitId":{"shape":"ObjectId"},
|
3194
|
+
"conflictDetailLevel":{"shape":"ConflictDetailLevelTypeEnum"},
|
3195
|
+
"conflictResolutionStrategy":{"shape":"ConflictResolutionStrategyTypeEnum"},
|
3196
|
+
"commitMessage":{"shape":"Message"},
|
3197
|
+
"authorName":{"shape":"Name"},
|
3198
|
+
"email":{"shape":"Email"},
|
3199
|
+
"keepEmptyFolders":{"shape":"KeepEmptyFolders"},
|
3200
|
+
"conflictResolution":{"shape":"ConflictResolution"}
|
3201
|
+
}
|
3202
|
+
},
|
3203
|
+
"MergePullRequestByThreeWayOutput":{
|
3204
|
+
"type":"structure",
|
3205
|
+
"members":{
|
3206
|
+
"pullRequest":{"shape":"PullRequest"}
|
3207
|
+
}
|
3208
|
+
},
|
2328
3209
|
"Message":{"type":"string"},
|
2329
3210
|
"Mode":{"type":"string"},
|
3211
|
+
"MultipleConflictResolutionEntriesException":{
|
3212
|
+
"type":"structure",
|
3213
|
+
"members":{
|
3214
|
+
},
|
3215
|
+
"exception":true
|
3216
|
+
},
|
2330
3217
|
"MultipleRepositoriesInPullRequestException":{
|
2331
3218
|
"type":"structure",
|
2332
3219
|
"members":{
|
@@ -2347,8 +3234,26 @@
|
|
2347
3234
|
},
|
2348
3235
|
"exception":true
|
2349
3236
|
},
|
3237
|
+
"NumberOfConflicts":{"type":"integer"},
|
2350
3238
|
"ObjectId":{"type":"string"},
|
2351
3239
|
"ObjectSize":{"type":"long"},
|
3240
|
+
"ObjectTypeEnum":{
|
3241
|
+
"type":"string",
|
3242
|
+
"enum":[
|
3243
|
+
"FILE",
|
3244
|
+
"DIRECTORY",
|
3245
|
+
"GIT_LINK",
|
3246
|
+
"SYMBOLIC_LINK"
|
3247
|
+
]
|
3248
|
+
},
|
3249
|
+
"ObjectTypes":{
|
3250
|
+
"type":"structure",
|
3251
|
+
"members":{
|
3252
|
+
"source":{"shape":"ObjectTypeEnum"},
|
3253
|
+
"destination":{"shape":"ObjectTypeEnum"},
|
3254
|
+
"base":{"shape":"ObjectTypeEnum"}
|
3255
|
+
}
|
3256
|
+
},
|
2352
3257
|
"OrderEnum":{
|
2353
3258
|
"type":"string",
|
2354
3259
|
"enum":[
|
@@ -2699,6 +3604,44 @@
|
|
2699
3604
|
"AFTER"
|
2700
3605
|
]
|
2701
3606
|
},
|
3607
|
+
"ReplaceContentEntries":{
|
3608
|
+
"type":"list",
|
3609
|
+
"member":{"shape":"ReplaceContentEntry"}
|
3610
|
+
},
|
3611
|
+
"ReplaceContentEntry":{
|
3612
|
+
"type":"structure",
|
3613
|
+
"required":[
|
3614
|
+
"filePath",
|
3615
|
+
"replacementType"
|
3616
|
+
],
|
3617
|
+
"members":{
|
3618
|
+
"filePath":{"shape":"Path"},
|
3619
|
+
"replacementType":{"shape":"ReplacementTypeEnum"},
|
3620
|
+
"content":{"shape":"FileContent"},
|
3621
|
+
"fileMode":{"shape":"FileModeTypeEnum"}
|
3622
|
+
}
|
3623
|
+
},
|
3624
|
+
"ReplacementContentRequiredException":{
|
3625
|
+
"type":"structure",
|
3626
|
+
"members":{
|
3627
|
+
},
|
3628
|
+
"exception":true
|
3629
|
+
},
|
3630
|
+
"ReplacementTypeEnum":{
|
3631
|
+
"type":"string",
|
3632
|
+
"enum":[
|
3633
|
+
"KEEP_BASE",
|
3634
|
+
"KEEP_SOURCE",
|
3635
|
+
"KEEP_DESTINATION",
|
3636
|
+
"USE_NEW_CONTENT"
|
3637
|
+
]
|
3638
|
+
},
|
3639
|
+
"ReplacementTypeRequiredException":{
|
3640
|
+
"type":"structure",
|
3641
|
+
"members":{
|
3642
|
+
},
|
3643
|
+
"exception":true
|
3644
|
+
},
|
2702
3645
|
"RepositoryDescription":{
|
2703
3646
|
"type":"string",
|
2704
3647
|
"max":1000
|