aws-sdk-codecommit 1.23.0 → 1.24.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/aws-sdk-codecommit.rb +1 -1
- data/lib/aws-sdk-codecommit/client.rb +22 -12
- data/lib/aws-sdk-codecommit/client_api.rb +10 -0
- data/lib/aws-sdk-codecommit/types.rb +19 -7
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 42a360f3d6bf155b4d67ff15bb1a5fc613c884f0
|
4
|
+
data.tar.gz: d7f2648fde4e23486b3b056a730ddf4b0e074169
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1cdf82fbc0dba759fb38d4e1b2511b83616c11f02803bd06fe785dea56300e8116fefc83627ea02358c9181348a69da1f79e16391895fb45e5d6731f92cb8e8d
|
7
|
+
data.tar.gz: 0c06d8398bb7e4c154c4140fd0ba231afb732e94068bc2184069362b4c10b7278c73dba581ce830f67274d78471bbeb2b832bd2e50c575c8ca6139208e10cfec
|
data/lib/aws-sdk-codecommit.rb
CHANGED
@@ -728,9 +728,11 @@ module Aws::CodeCommit
|
|
728
728
|
req.send_request(options)
|
729
729
|
end
|
730
730
|
|
731
|
-
# Creates an
|
731
|
+
# Creates an unreferenced commit that represents the result of merging
|
732
732
|
# two branches using a specified merge strategy. This can help you
|
733
|
-
# determine the outcome of a potential merge.
|
733
|
+
# determine the outcome of a potential merge. This API cannot be used
|
734
|
+
# with the fast-forward merge strategy, as that strategy does not create
|
735
|
+
# a merge commit.
|
734
736
|
#
|
735
737
|
# <note markdown="1"> This unreferenced merge commit can only be accessed using the
|
736
738
|
# GetCommit API or through git commands such as git fetch. To retrieve
|
@@ -2479,9 +2481,10 @@ module Aws::CodeCommit
|
|
2479
2481
|
req.send_request(options)
|
2480
2482
|
end
|
2481
2483
|
|
2482
|
-
#
|
2483
|
-
#
|
2484
|
-
#
|
2484
|
+
# Attempts to merge the source commit of a pull request into the
|
2485
|
+
# specified destination branch for that pull request at the specified
|
2486
|
+
# commit using the fast-forward merge strategy. If the merge is
|
2487
|
+
# successful, it closes the pull request.
|
2485
2488
|
#
|
2486
2489
|
# @option params [required, String] :pull_request_id
|
2487
2490
|
# The system-generated ID of the pull request. To get this ID, use
|
@@ -2539,9 +2542,10 @@ module Aws::CodeCommit
|
|
2539
2542
|
req.send_request(options)
|
2540
2543
|
end
|
2541
2544
|
|
2542
|
-
#
|
2543
|
-
#
|
2544
|
-
#
|
2545
|
+
# Attempts to merge the source commit of a pull request into the
|
2546
|
+
# specified destination branch for that pull request at the specified
|
2547
|
+
# commit using the squash merge strategy. If the merge is successful, it
|
2548
|
+
# closes the pull request.
|
2545
2549
|
#
|
2546
2550
|
# @option params [required, String] :pull_request_id
|
2547
2551
|
# The system-generated ID of the pull request. To get this ID, use
|
@@ -2660,9 +2664,10 @@ module Aws::CodeCommit
|
|
2660
2664
|
req.send_request(options)
|
2661
2665
|
end
|
2662
2666
|
|
2663
|
-
#
|
2664
|
-
#
|
2665
|
-
#
|
2667
|
+
# Attempts to merge the source commit of a pull request into the
|
2668
|
+
# specified destination branch for that pull request at the specified
|
2669
|
+
# commit using the three-way merge strategy. If the merge is successful,
|
2670
|
+
# it closes the pull request.
|
2666
2671
|
#
|
2667
2672
|
# @option params [required, String] :pull_request_id
|
2668
2673
|
# The system-generated ID of the pull request. To get this ID, use
|
@@ -2791,6 +2796,11 @@ module Aws::CodeCommit
|
|
2791
2796
|
# To establish the directionality of the comparison, the full commit ID
|
2792
2797
|
# of the 'before' commit.
|
2793
2798
|
#
|
2799
|
+
# <note markdown="1"> This is required for commenting on any commit unless that commit is
|
2800
|
+
# the initial commit.
|
2801
|
+
#
|
2802
|
+
# </note>
|
2803
|
+
#
|
2794
2804
|
# @option params [required, String] :after_commit_id
|
2795
2805
|
# To establish the directionality of the comparison, the full commit ID
|
2796
2806
|
# of the 'after' commit.
|
@@ -3568,7 +3578,7 @@ module Aws::CodeCommit
|
|
3568
3578
|
params: params,
|
3569
3579
|
config: config)
|
3570
3580
|
context[:gem_name] = 'aws-sdk-codecommit'
|
3571
|
-
context[:gem_version] = '1.
|
3581
|
+
context[:gem_version] = '1.24.0'
|
3572
3582
|
Seahorse::Client::Request.new(handlers, context)
|
3573
3583
|
end
|
3574
3584
|
|
@@ -241,6 +241,7 @@ module Aws::CodeCommit
|
|
241
241
|
MaximumConflictResolutionEntriesExceededException = Shapes::StructureShape.new(name: 'MaximumConflictResolutionEntriesExceededException')
|
242
242
|
MaximumFileContentToLoadExceededException = Shapes::StructureShape.new(name: 'MaximumFileContentToLoadExceededException')
|
243
243
|
MaximumFileEntriesExceededException = Shapes::StructureShape.new(name: 'MaximumFileEntriesExceededException')
|
244
|
+
MaximumItemsToCompareExceededException = Shapes::StructureShape.new(name: 'MaximumItemsToCompareExceededException')
|
244
245
|
MaximumOpenPullRequestsExceededException = Shapes::StructureShape.new(name: 'MaximumOpenPullRequestsExceededException')
|
245
246
|
MaximumRepositoryNamesExceededException = Shapes::StructureShape.new(name: 'MaximumRepositoryNamesExceededException')
|
246
247
|
MaximumRepositoryTriggersExceededException = Shapes::StructureShape.new(name: 'MaximumRepositoryTriggersExceededException')
|
@@ -1322,6 +1323,7 @@ module Aws::CodeCommit
|
|
1322
1323
|
o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
|
1323
1324
|
o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
|
1324
1325
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
1326
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
1325
1327
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
|
1326
1328
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
|
1327
1329
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
|
@@ -1498,6 +1500,7 @@ module Aws::CodeCommit
|
|
1498
1500
|
o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
|
1499
1501
|
o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
|
1500
1502
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
1503
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
1501
1504
|
o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
|
1502
1505
|
o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
|
1503
1506
|
o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
|
@@ -1609,6 +1612,7 @@ module Aws::CodeCommit
|
|
1609
1612
|
o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
|
1610
1613
|
o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
|
1611
1614
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
1615
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
1612
1616
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
|
1613
1617
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
|
1614
1618
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
|
@@ -1893,6 +1897,7 @@ module Aws::CodeCommit
|
|
1893
1897
|
o.errors << Shapes::ShapeRef.new(shape: InvalidSourceCommitSpecifierException)
|
1894
1898
|
o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
|
1895
1899
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
1900
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
1896
1901
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
|
1897
1902
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
|
1898
1903
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
|
@@ -1922,6 +1927,7 @@ module Aws::CodeCommit
|
|
1922
1927
|
o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
|
1923
1928
|
o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
|
1924
1929
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
1930
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
1925
1931
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
|
1926
1932
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
|
1927
1933
|
o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
|
@@ -2113,6 +2119,7 @@ module Aws::CodeCommit
|
|
2113
2119
|
o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
|
2114
2120
|
o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
|
2115
2121
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
2122
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
2116
2123
|
o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
|
2117
2124
|
o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
|
2118
2125
|
o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
|
@@ -2158,6 +2165,7 @@ module Aws::CodeCommit
|
|
2158
2165
|
o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
|
2159
2166
|
o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
|
2160
2167
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
2168
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
2161
2169
|
o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
|
2162
2170
|
o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
|
2163
2171
|
o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
|
@@ -2227,6 +2235,7 @@ module Aws::CodeCommit
|
|
2227
2235
|
o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
|
2228
2236
|
o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
|
2229
2237
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
2238
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
2230
2239
|
o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
|
2231
2240
|
o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
|
2232
2241
|
o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
|
@@ -2270,6 +2279,7 @@ module Aws::CodeCommit
|
|
2270
2279
|
o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
|
2271
2280
|
o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
|
2272
2281
|
o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
|
2282
|
+
o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
|
2273
2283
|
o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
|
2274
2284
|
o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
|
2275
2285
|
o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
|
@@ -527,7 +527,8 @@ module Aws::CodeCommit
|
|
527
527
|
#
|
528
528
|
# @!attribute [rw] object_type_conflict
|
529
529
|
# A boolean value (true or false) indicating whether there are
|
530
|
-
# conflicts in the object type of a file
|
530
|
+
# conflicts between the branches in the object type of a file, folder,
|
531
|
+
# or submodule.
|
531
532
|
# @return [Boolean]
|
532
533
|
#
|
533
534
|
# @!attribute [rw] merge_operations
|
@@ -580,7 +581,8 @@ module Aws::CodeCommit
|
|
580
581
|
# }
|
581
582
|
#
|
582
583
|
# @!attribute [rw] replace_contents
|
583
|
-
#
|
584
|
+
# Files that will have content replaced as part of the merge conflict
|
585
|
+
# resolution.
|
584
586
|
# @return [Array<Types::ReplaceContentEntry>]
|
585
587
|
#
|
586
588
|
# @!attribute [rw] delete_files
|
@@ -2306,7 +2308,8 @@ module Aws::CodeCommit
|
|
2306
2308
|
# @return [String]
|
2307
2309
|
#
|
2308
2310
|
# @!attribute [rw] conflict_metadata_list
|
2309
|
-
# A list of metadata for any
|
2311
|
+
# A list of metadata for any conflicting files. If the specified merge
|
2312
|
+
# strategy is FAST\_FORWARD\_MERGE, this list will always be empty.
|
2310
2313
|
# @return [Array<Types::ConflictMetadata>]
|
2311
2314
|
#
|
2312
2315
|
# @!attribute [rw] next_token
|
@@ -3098,7 +3101,10 @@ module Aws::CodeCommit
|
|
3098
3101
|
# A Boolean value indicating whether a combination of hunks contains a
|
3099
3102
|
# conflict. Conflicts occur when the same file or the same lines in a
|
3100
3103
|
# file were modified in both the source and destination of a merge or
|
3101
|
-
# pull request. Valid values include true, false, and null.
|
3104
|
+
# pull request. Valid values include true, false, and null. This will
|
3105
|
+
# be true when the hunk represents a conflict and one or more files
|
3106
|
+
# contains a line conflict. File mode conflicts in a merge will not
|
3107
|
+
# set this to be true.
|
3102
3108
|
# @return [Boolean]
|
3103
3109
|
#
|
3104
3110
|
# @!attribute [rw] source
|
@@ -3130,15 +3136,16 @@ module Aws::CodeCommit
|
|
3130
3136
|
# in a merge or pull request operation.
|
3131
3137
|
#
|
3132
3138
|
# @!attribute [rw] start_line
|
3133
|
-
# The
|
3139
|
+
# The start position of the hunk in the merge result.
|
3134
3140
|
# @return [Integer]
|
3135
3141
|
#
|
3136
3142
|
# @!attribute [rw] end_line
|
3137
|
-
# The
|
3143
|
+
# The end position of the hunk in the merge result.
|
3138
3144
|
# @return [Integer]
|
3139
3145
|
#
|
3140
3146
|
# @!attribute [rw] hunk_content
|
3141
|
-
# The base-64 encoded content of the hunk that
|
3147
|
+
# The base-64 encoded content of the hunk merged region that might or
|
3148
|
+
# might not contain a conflict.
|
3142
3149
|
# @return [String]
|
3143
3150
|
#
|
3144
3151
|
# @see http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/MergeHunkDetail AWS API Documentation
|
@@ -3534,6 +3541,11 @@ module Aws::CodeCommit
|
|
3534
3541
|
# @!attribute [rw] before_commit_id
|
3535
3542
|
# To establish the directionality of the comparison, the full commit
|
3536
3543
|
# ID of the 'before' commit.
|
3544
|
+
#
|
3545
|
+
# <note markdown="1"> This is required for commenting on any commit unless that commit is
|
3546
|
+
# the initial commit.
|
3547
|
+
#
|
3548
|
+
# </note>
|
3537
3549
|
# @return [String]
|
3538
3550
|
#
|
3539
3551
|
# @!attribute [rw] after_commit_id
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: aws-sdk-codecommit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.24.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Amazon Web Services
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-06-
|
11
|
+
date: 2019-06-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk-core
|