aws-sdk-codecommit 1.23.0 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12abb1cd156eb51fc38e5ee96e3b2a4dda46ee9e
-  data.tar.gz: e1ccde22f8c71cdff4fafae5c05901af22b7b66a
+  metadata.gz: 42a360f3d6bf155b4d67ff15bb1a5fc613c884f0
+  data.tar.gz: d7f2648fde4e23486b3b056a730ddf4b0e074169
 SHA512:
-  metadata.gz: 220631bff95acde73a698ac5efe409aa7b1048a8b17562c1bc2005fff2bb042370bebad620309919dae9961ceb5090287faff1acfa61aa011133e641bb3af60d
-  data.tar.gz: '048c86a0964a214665579b8f057195b8000d58a605c2e4e12156f3001f8eb3bc476956674c23f3fc9a6fa508a0457438254aa0bc73b202892e26af8e54279f06'
+  metadata.gz: 1cdf82fbc0dba759fb38d4e1b2511b83616c11f02803bd06fe785dea56300e8116fefc83627ea02358c9181348a69da1f79e16391895fb45e5d6731f92cb8e8d
+  data.tar.gz: 0c06d8398bb7e4c154c4140fd0ba231afb732e94068bc2184069362b4c10b7278c73dba581ce830f67274d78471bbeb2b832bd2e50c575c8ca6139208e10cfec

data/lib/aws-sdk-codecommit.rb

@@ -42,6 +42,6 @@ require_relative 'aws-sdk-codecommit/customizations'
 # @service
 module Aws::CodeCommit
 
-  GEM_VERSION = '1.23.0'
+  GEM_VERSION = '1.24.0'
 
 end

data/lib/aws-sdk-codecommit/client.rb

@@ -728,9 +728,11 @@ module Aws::CodeCommit
       req.send_request(options)
     end
 
-    # Creates an unerferenced commit that represents the result of merging
+    # Creates an unreferenced commit that represents the result of merging
     # two branches using a specified merge strategy. This can help you
-    # determine the outcome of a potential merge.
+    # determine the outcome of a potential merge. This API cannot be used
+    # with the fast-forward merge strategy, as that strategy does not create
+    # a merge commit.
     #
     # <note markdown="1"> This unreferenced merge commit can only be accessed using the
     # GetCommit API or through git commands such as git fetch. To retrieve
@@ -2479,9 +2481,10 @@ module Aws::CodeCommit
       req.send_request(options)
     end
 
-    # Closes a pull request and attempts to merge the source commit of a
-    # pull request into the specified destination branch for that pull
-    # request at the specified commit using the fast-forward merge strategy.
+    # Attempts to merge the source commit of a pull request into the
+    # specified destination branch for that pull request at the specified
+    # commit using the fast-forward merge strategy. If the merge is
+    # successful, it closes the pull request.
     #
     # @option params [required, String] :pull_request_id
     #   The system-generated ID of the pull request. To get this ID, use
@@ -2539,9 +2542,10 @@ module Aws::CodeCommit
       req.send_request(options)
     end
 
-    # Closes a pull request and attempts to merge the source commit of a
-    # pull request into the specified destination branch for that pull
-    # request at the specified commit using the squash merge strategy.
+    # Attempts to merge the source commit of a pull request into the
+    # specified destination branch for that pull request at the specified
+    # commit using the squash merge strategy. If the merge is successful, it
+    # closes the pull request.
     #
     # @option params [required, String] :pull_request_id
     #   The system-generated ID of the pull request. To get this ID, use
@@ -2660,9 +2664,10 @@ module Aws::CodeCommit
       req.send_request(options)
     end
 
-    # Closes a pull request and attempts to merge the source commit of a
-    # pull request into the specified destination branch for that pull
-    # request at the specified commit using the three-way merge strategy.
+    # Attempts to merge the source commit of a pull request into the
+    # specified destination branch for that pull request at the specified
+    # commit using the three-way merge strategy. If the merge is successful,
+    # it closes the pull request.
     #
     # @option params [required, String] :pull_request_id
     #   The system-generated ID of the pull request. To get this ID, use
@@ -2791,6 +2796,11 @@ module Aws::CodeCommit
     #   To establish the directionality of the comparison, the full commit ID
     #   of the 'before' commit.
     #
+    #   <note markdown="1"> This is required for commenting on any commit unless that commit is
+    #   the initial commit.
+    #
+    #    </note>
+    #
     # @option params [required, String] :after_commit_id
     #   To establish the directionality of the comparison, the full commit ID
     #   of the 'after' commit.
@@ -3568,7 +3578,7 @@ module Aws::CodeCommit
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-codecommit'
-      context[:gem_version] = '1.23.0'
+      context[:gem_version] = '1.24.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-codecommit/client_api.rb

@@ -241,6 +241,7 @@ module Aws::CodeCommit
     MaximumConflictResolutionEntriesExceededException = Shapes::StructureShape.new(name: 'MaximumConflictResolutionEntriesExceededException')
     MaximumFileContentToLoadExceededException = Shapes::StructureShape.new(name: 'MaximumFileContentToLoadExceededException')
     MaximumFileEntriesExceededException = Shapes::StructureShape.new(name: 'MaximumFileEntriesExceededException')
+    MaximumItemsToCompareExceededException = Shapes::StructureShape.new(name: 'MaximumItemsToCompareExceededException')
     MaximumOpenPullRequestsExceededException = Shapes::StructureShape.new(name: 'MaximumOpenPullRequestsExceededException')
     MaximumRepositoryNamesExceededException = Shapes::StructureShape.new(name: 'MaximumRepositoryNamesExceededException')
     MaximumRepositoryTriggersExceededException = Shapes::StructureShape.new(name: 'MaximumRepositoryTriggersExceededException')
@@ -1322,6 +1323,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
@@ -1498,6 +1500,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
         o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
@@ -1609,6 +1612,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
@@ -1893,6 +1897,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: InvalidSourceCommitSpecifierException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
@@ -1922,6 +1927,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: InvalidConflictDetailLevelException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidConflictResolutionStrategyException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionIntegrityChecksFailedException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyAccessDeniedException)
         o.errors << Shapes::ShapeRef.new(shape: EncryptionKeyDisabledException)
@@ -2113,6 +2119,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
         o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
@@ -2158,6 +2165,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: FileModeRequiredException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidFileModeException)
         o.errors << Shapes::ShapeRef.new(shape: NameLengthExceededException)
@@ -2227,6 +2235,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
         o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)
@@ -2270,6 +2279,7 @@ module Aws::CodeCommit
         o.errors << Shapes::ShapeRef.new(shape: FileContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: FolderContentSizeLimitExceededException)
         o.errors << Shapes::ShapeRef.new(shape: MaximumFileContentToLoadExceededException)
+        o.errors << Shapes::ShapeRef.new(shape: MaximumItemsToCompareExceededException)
         o.errors << Shapes::ShapeRef.new(shape: RepositoryNameRequiredException)
         o.errors << Shapes::ShapeRef.new(shape: InvalidRepositoryNameException)
         o.errors << Shapes::ShapeRef.new(shape: RepositoryDoesNotExistException)

data/lib/aws-sdk-codecommit/types.rb

@@ -527,7 +527,8 @@ module Aws::CodeCommit
     #
     # @!attribute [rw] object_type_conflict
     #   A boolean value (true or false) indicating whether there are
-    #   conflicts in the object type of a file.
+    #   conflicts between the branches in the object type of a file, folder,
+    #   or submodule.
     #   @return [Boolean]
     #
     # @!attribute [rw] merge_operations
@@ -580,7 +581,8 @@ module Aws::CodeCommit
     #       }
     #
     # @!attribute [rw] replace_contents
-    #   Information about how a conflict in a merge will be resolved.
+    #   Files that will have content replaced as part of the merge conflict
+    #   resolution.
     #   @return [Array<Types::ReplaceContentEntry>]
     #
     # @!attribute [rw] delete_files
@@ -2306,7 +2308,8 @@ module Aws::CodeCommit
     #   @return [String]
     #
     # @!attribute [rw] conflict_metadata_list
-    #   A list of metadata for any conflicts found.
+    #   A list of metadata for any conflicting files. If the specified merge
+    #   strategy is FAST\_FORWARD\_MERGE, this list will always be empty.
     #   @return [Array<Types::ConflictMetadata>]
     #
     # @!attribute [rw] next_token
@@ -3098,7 +3101,10 @@ module Aws::CodeCommit
     #   A Boolean value indicating whether a combination of hunks contains a
     #   conflict. Conflicts occur when the same file or the same lines in a
     #   file were modified in both the source and destination of a merge or
-    #   pull request. Valid values include true, false, and null.
+    #   pull request. Valid values include true, false, and null. This will
+    #   be true when the hunk represents a conflict and one or more files
+    #   contains a line conflict. File mode conflicts in a merge will not
+    #   set this to be true.
     #   @return [Boolean]
     #
     # @!attribute [rw] source
@@ -3130,15 +3136,16 @@ module Aws::CodeCommit
     # in a merge or pull request operation.
     #
     # @!attribute [rw] start_line
-    #   The line number where a merge conflict begins.
+    #   The start position of the hunk in the merge result.
     #   @return [Integer]
     #
     # @!attribute [rw] end_line
-    #   The line number where a merge conflict ends.
+    #   The end position of the hunk in the merge result.
     #   @return [Integer]
     #
     # @!attribute [rw] hunk_content
-    #   The base-64 encoded content of the hunk that contains the conflict.
+    #   The base-64 encoded content of the hunk merged region that might or
+    #   might not contain a conflict.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/MergeHunkDetail AWS API Documentation
@@ -3534,6 +3541,11 @@ module Aws::CodeCommit
     # @!attribute [rw] before_commit_id
     #   To establish the directionality of the comparison, the full commit
     #   ID of the 'before' commit.
+    #
+    #   <note markdown="1"> This is required for commenting on any commit unless that commit is
+    #   the initial commit.
+    #
+    #    </note>
     #   @return [String]
     #
     # @!attribute [rw] after_commit_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-codecommit
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.24.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core