Merge remote-tracking branch 'upstream/master' into refactor-client

minio · May 21, 2023 · 68650a8 · 68650a8
2 parents 2781c16 + e6eb60d
commit 68650a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/docs/API.md b/docs/API.md
@@ -42,7 +42,7 @@ var s3Client = new Minio.Client({
 | [`getBucketTagging`](#getBucketTagging)               | [`removeIncompleteUpload`](#removeIncompleteUpload) |                                               |                                                               |                                                       |     |
 | [`setBucketTagging`](#setBucketTagging)               | [`putObjectRetention`](#putObjectRetention)         |                                               |                                                               |                                                       |     |
 | [`removeBucketTagging`](#removeBucketTagging)         | [`getObjectRetention`](#getObjectRetention)         |                                               |                                                               |                                                       |     |
-| [`setBucketLifecycle`](#setBucketLifecycle)           | [`putObjectTagging`](#putObjectTagging)             |                                               |                                                               |                                                       |     |
+| [`setBucketLifecycle`](#setBucketLifecycle)           | [`setObjectTagging`](#setObjectTagging)             |                                               |                                                               |                                                       |     |
 | [`getBucketLifecycle`](#getBucketLifecycle)           | [`removeObjectTagging`](#removeObjectTagging)       |                                               |                                                               |                                                       |     |
 | [`removeBucketLifecycle`](#removeBucketLifecycle)     | [`getObjectTagging`](#getObjectTagging)             |                                               |                                                               |                                                       |     |
 | [`setObjectLockConfig`](#setObjectLockConfig)         | [`getObjectLegalHold`](#getObjectLegalHold)         |                                               |                                                               |                                                       |     |
@@ -1487,8 +1487,6 @@ minioClient.getObjectRetention('bucketname', 'bucketname', { versionId: "my-vers
 })
 ```
 
-<a name="putObjectTagging"></a>
-### putObjectTagging(bucketName, objectName, tags[, putOpts, callback])
 <a name="setObjectTagging"></a>
 ### setObjectTagging(bucketName, objectName, tags[, putOpts, callback])
 

diff --git a/tests/functional/functional-tests.js b/tests/functional/functional-tests.js
@@ -2498,7 +2498,7 @@ describe('functional tests', function () {
         },
       )
 
-      step(`putObjectTagging  object_bucketName:${tagsBucketName}, objectName:${tagObjName},`, (done) => {
+      step(`setObjectTagging  object_bucketName:${tagsBucketName}, objectName:${tagObjName},`, (done) => {
         client.setObjectTagging(tagsBucketName, tagObjName, { 'test-tag-key-obj': 'test-tag-value-obj' }, (err) => {
           if (err && err.code === 'NotImplemented') {
             return done()