From 0232a795cb04da798b29a2ca4bf9919b6394b7df Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sun, 18 Oct 2020 23:28:36 -0700 Subject: [PATCH] remove deprecated SetCustomTransport from docs (#1400) --- README.md | 1 - README_zh_CN.md | 1 - api-stat.go | 2 +- docs/API.md | 57 +++++++++++++++++++---------------------------- docs/zh_CN/API.md | 47 +++++++++++++++----------------------- 5 files changed, 42 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index d289f615af..bc49b06d8b 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,6 @@ The full API Reference is available here. ### API Reference : Client custom settings * [`SetAppInfo`](http://docs.min.io/docs/golang-client-api-reference#SetAppInfo) -* [`SetCustomTransport`](http://docs.min.io/docs/golang-client-api-reference#SetCustomTransport) * [`TraceOn`](http://docs.min.io/docs/golang-client-api-reference#TraceOn) * [`TraceOff`](http://docs.min.io/docs/golang-client-api-reference#TraceOff) diff --git a/README_zh_CN.md b/README_zh_CN.md index 0911b0905a..e0447fb9d2 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -174,7 +174,6 @@ mc ls play/mymusic/ ### API文档 : 客户端自定义设置 * [`SetAppInfo`](http://docs.min.io/docs/golang-client-api-reference#SetAppInfo) -* [`SetCustomTransport`](http://docs.min.io/docs/golang-client-api-reference#SetCustomTransport) * [`TraceOn`](http://docs.min.io/docs/golang-client-api-reference#TraceOn) * [`TraceOff`](http://docs.min.io/docs/golang-client-api-reference#TraceOff) diff --git a/api-stat.go b/api-stat.go index ecc31c0340..aa81cc4377 100644 --- a/api-stat.go +++ b/api-stat.go @@ -103,7 +103,7 @@ func (c Client) statObject(ctx context.Context, bucketName, objectName string, o if resp != nil { if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusPartialContent { - if resp.StatusCode == http.StatusBadRequest && opts.VersionID != "" { + if resp.StatusCode == http.StatusBadRequest && opts.VersionID != "" && deleteMarker { errResp := ErrorResponse{ StatusCode: resp.StatusCode, Code: "MethodNotAllowed", diff --git a/docs/API.md b/docs/API.md index 0647319cc1..9db822b8fd 100644 --- a/docs/API.md +++ b/docs/API.md @@ -58,29 +58,29 @@ func main() { } ``` -| Bucket operations | Object operations | Presigned operations | Bucket Policy/Notification Operations | Client custom settings | -| :--- | :--- | :--- | :--- | :--- | -| [`MakeBucket`](#MakeBucket) | [`GetObject`](#GetObject) | [`PresignedGetObject`](#PresignedGetObject) | [`SetBucketPolicy`](#SetBucketPolicy) | [`SetAppInfo`](#SetAppInfo) | -| | [`PutObject`](#PutObject) | [`PresignedPutObject`](#PresignedPutObject) | [`GetBucketPolicy`](#GetBucketPolicy) | [`SetCustomTransport`](#SetCustomTransport) | | -| [`ListBuckets`](#ListBuckets) | [`CopyObject`](#CopyObject) | [`PresignedHeadObject`](#PresignedHeadObject) | [`SetBucketNotification`](#SetBucketNotification) | [`TraceOn`](#TraceOn) | -| [`BucketExists`](#BucketExists) | [`StatObject`](#StatObject) | [`PresignedPostPolicy`](#PresignedPostPolicy) | [`GetBucketNotification`](#GetBucketNotification) | [`TraceOff`](#TraceOff) | -| [`RemoveBucket`](#RemoveBucket) | [`RemoveObject`](#RemoveObject) | | [`RemoveAllBucketNotification`](#RemoveAllBucketNotification) | [`SetS3TransferAccelerate`](#SetS3TransferAccelerate) | -| [`ListObjects`](#ListObjects) | [`RemoveObjects`](#RemoveObjects) | | [`ListenBucketNotification`](#ListenBucketNotification) | | -| | [`RemoveIncompleteUpload`](#RemoveIncompleteUpload) | | [`SetBucketLifecycle`](#SetBucketLifecycle) | | -| [`ListIncompleteUploads`](#ListIncompleteUploads) | [`FPutObject`](#FPutObject) | | [`GetBucketLifecycle`](#GetBucketLifecycle) | | -| [`SetBucketTagging`](#SetBucketTagging) | [`FGetObject`](#FGetObject) | | [`SetObjectLockConfig`](#SetObjectLockConfig) | | -| [`GetBucketTagging`](#GetBucketTagging) | [`ComposeObject`](#ComposeObject) | | [`GetObjectLockConfig`](#GetObjectLockConfig) | | -| [`RemoveBucketTagging`](#RemoveBucketTagging) | | | [`EnableVersioning`](#EnableVersioning) | | -| [`SetBucketReplication`](#SetBucketReplication) | | | [`DisableVersioning`](#DisableVersioning) | | -| [`GetBucketReplication`](#GetBucketReplication) | [`PutObjectRetention`](#PutObjectRetention) | | [`GetBucketEncryption`](#GetBucketEncryption) | | -| [`RemoveBucketReplication`](#RemoveBucketReplication) | [`GetObjectRetention`](#GetObjectRetention) | | [`RemoveBucketEncryption`](#RemoveBucketEncryption) | | -| | [`PutObjectLegalHold`](#PutObjectLegalHold) | | | | -| | [`GetObjectLegalHold`](#GetObjectLegalHold) | | | | -| | [`SelectObjectContent`](#SelectObjectContent) | | | | -| | [`PutObjectTagging`](#PutObjectTagging) | | | | -| | [`GetObjectTagging`](#GetObjectTagging) | | | | -| | [`RemoveObjectTagging`](#RemoveObjectTagging) | | | | -| | | | | | +| Bucket operations | Object operations | Presigned operations | Bucket Policy/Notification Operations | Client custom settings | | +| :--- | :--- | :--- | :--- | :--- | | +| [`MakeBucket`](#MakeBucket) | [`GetObject`](#GetObject) | [`PresignedGetObject`](#PresignedGetObject) | [`SetBucketPolicy`](#SetBucketPolicy) | [`SetAppInfo`](#SetAppInfo) | | +| | [`PutObject`](#PutObject) | [`PresignedPutObject`](#PresignedPutObject) | [`GetBucketPolicy`](#GetBucketPolicy) | | | +| [`ListBuckets`](#ListBuckets) | [`CopyObject`](#CopyObject) | [`PresignedHeadObject`](#PresignedHeadObject) | [`SetBucketNotification`](#SetBucketNotification) | [`TraceOn`](#TraceOn) | | +| [`BucketExists`](#BucketExists) | [`StatObject`](#StatObject) | [`PresignedPostPolicy`](#PresignedPostPolicy) | [`GetBucketNotification`](#GetBucketNotification) | [`TraceOff`](#TraceOff) | | +| [`RemoveBucket`](#RemoveBucket) | [`RemoveObject`](#RemoveObject) | | [`RemoveAllBucketNotification`](#RemoveAllBucketNotification) | [`SetS3TransferAccelerate`](#SetS3TransferAccelerate) | | +| [`ListObjects`](#ListObjects) | [`RemoveObjects`](#RemoveObjects) | | [`ListenBucketNotification`](#ListenBucketNotification) | | | +| | [`RemoveIncompleteUpload`](#RemoveIncompleteUpload) | | [`SetBucketLifecycle`](#SetBucketLifecycle) | | | +| [`ListIncompleteUploads`](#ListIncompleteUploads) | [`FPutObject`](#FPutObject) | | [`GetBucketLifecycle`](#GetBucketLifecycle) | | | +| [`SetBucketTagging`](#SetBucketTagging) | [`FGetObject`](#FGetObject) | | [`SetObjectLockConfig`](#SetObjectLockConfig) | | | +| [`GetBucketTagging`](#GetBucketTagging) | [`ComposeObject`](#ComposeObject) | | [`GetObjectLockConfig`](#GetObjectLockConfig) | | | +| [`RemoveBucketTagging`](#RemoveBucketTagging) | | | [`EnableVersioning`](#EnableVersioning) | | | +| [`SetBucketReplication`](#SetBucketReplication) | | | [`DisableVersioning`](#DisableVersioning) | | | +| [`GetBucketReplication`](#GetBucketReplication) | [`PutObjectRetention`](#PutObjectRetention) | | [`GetBucketEncryption`](#GetBucketEncryption) | | | +| [`RemoveBucketReplication`](#RemoveBucketReplication) | [`GetObjectRetention`](#GetObjectRetention) | | [`RemoveBucketEncryption`](#RemoveBucketEncryption) | | | +| | [`PutObjectLegalHold`](#PutObjectLegalHold) | | | | | +| | [`GetObjectLegalHold`](#GetObjectLegalHold) | | | | | +| | [`SelectObjectContent`](#SelectObjectContent) | | | | | +| | [`PutObjectTagging`](#PutObjectTagging) | | | | | +| | [`GetObjectTagging`](#GetObjectTagging) | | | | | +| | [`RemoveObjectTagging`](#RemoveObjectTagging) | | | | | +| | | | | | | ## 1. Constructor @@ -2038,17 +2038,6 @@ __Example__ minioClient.SetAppInfo("myCloudApp", "1.0.0") ``` - -### SetCustomTransport(customHTTPTransport http.RoundTripper) -Overrides default HTTP transport. This is usually needed for debugging or for adding custom TLS certificates. - -__Parameters__ - -| Param | Type | Description | -|---|---|---| -|`customHTTPTransport` | _http.RoundTripper_ | Custom transport e.g, to trace API requests and responses for debugging purposes.| - - ### TraceOn(outputStream io.Writer) Enables HTTP tracing. The trace is written to the io.Writer provided. If outputStream is nil, trace is written to os.Stdout. diff --git a/docs/zh_CN/API.md b/docs/zh_CN/API.md index e799d54da9..7c5b383840 100644 --- a/docs/zh_CN/API.md +++ b/docs/zh_CN/API.md @@ -50,24 +50,24 @@ func main() { } ``` -| 操作存储桶 | 操作对象 | 操作加密对象 | Presigned操作 | 存储桶策略/通知 | 客户端自定义设置 | -| :--- | :--- | :--- | :--- | :--- | :--- | -| [`MakeBucket`](#MakeBucket) | [`GetObject`](#GetObject) | [`NewSymmetricKey`](#NewSymmetricKey) | [`PresignedGetObject`](#PresignedGetObject) | [`SetBucketPolicy`](#SetBucketPolicy) | [`SetAppInfo`](#SetAppInfo) | -| [`ListBuckets`](#ListBuckets) | [`PutObject`](#PutObject) | [`NewAsymmetricKey`](#NewAsymmetricKey) | [`PresignedPutObject`](#PresignedPutObject) | [`GetBucketPolicy`](#GetBucketPolicy) | [`SetCustomTransport`](#SetCustomTransport) | -| [`BucketExists`](#BucketExists) | [`CopyObject`](#CopyObject) | [`GetEncryptedObject`](#GetEncryptedObject) | [`PresignedPostPolicy`](#PresignedPostPolicy) | [`SetBucketNotification`](#SetBucketNotification) | [`TraceOn`](#TraceOn) | -| [`RemoveBucket`](#RemoveBucket) | [`StatObject`](#StatObject) | [`PutEncryptedObject`](#PutEncryptedObject) | | [`GetBucketNotification`](#GetBucketNotification) | [`TraceOff`](#TraceOff) | -| [`ListObjects`](#ListObjects) | [`RemoveObject`](#RemoveObject) | [`NewSSEInfo`](#NewSSEInfo) | | [`RemoveAllBucketNotification`](#RemoveAllBucketNotification) | [`SetS3TransferAccelerate`](#SetS3TransferAccelerate) | -| [`ListObjectsV2`](#ListObjectsV2) | [`RemoveObjects`](#RemoveObjects) | [`FPutEncryptedObject`](#FPutEncryptedObject) | | [`ListenBucketNotification`](#ListenBucketNotification) | | -| [`ListIncompleteUploads`](#ListIncompleteUploads) | [`RemoveIncompleteUpload`](#RemoveIncompleteUpload) | | | | | -| | [`FPutObject`](#FPutObject) | | | | | -| | [`FGetObject`](#FGetObject) | | | | | -| | [`ComposeObject`](#ComposeObject) | | | | | -| | [`NewSourceInfo`](#NewSourceInfo) | | | | | -| | [`NewDestinationInfo`](#NewDestinationInfo) | | | | | -| | [`PutObjectWithContext`](#PutObjectWithContext) | | | | -| | [`GetObjectWithContext`](#GetObjectWithContext) | | | | -| | [`FPutObjectWithContext`](#FPutObjectWithContext) | | | | -| | [`FGetObjectWithContext`](#FGetObjectWithContext) | | | | +| 操作存储桶 | 操作对象 | 操作加密对象 | Presigned操作 | 存储桶策略/通知 | 客户端自定义设置 | +| :--- | :--- | :--- | :--- | :--- | :--- | +| [`MakeBucket`](#MakeBucket) | [`GetObject`](#GetObject) | [`NewSymmetricKey`](#NewSymmetricKey) | [`PresignedGetObject`](#PresignedGetObject) | [`SetBucketPolicy`](#SetBucketPolicy) | [`SetAppInfo`](#SetAppInfo) | +| [`ListBuckets`](#ListBuckets) | [`PutObject`](#PutObject) | [`NewAsymmetricKey`](#NewAsymmetricKey) | [`PresignedPutObject`](#PresignedPutObject) | [`GetBucketPolicy`](#GetBucketPolicy) | | +| [`BucketExists`](#BucketExists) | [`CopyObject`](#CopyObject) | [`GetEncryptedObject`](#GetEncryptedObject) | [`PresignedPostPolicy`](#PresignedPostPolicy) | [`SetBucketNotification`](#SetBucketNotification) | [`TraceOn`](#TraceOn) | +| [`RemoveBucket`](#RemoveBucket) | [`StatObject`](#StatObject) | [`PutEncryptedObject`](#PutEncryptedObject) | | [`GetBucketNotification`](#GetBucketNotification) | [`TraceOff`](#TraceOff) | +| [`ListObjects`](#ListObjects) | [`RemoveObject`](#RemoveObject) | [`NewSSEInfo`](#NewSSEInfo) | | [`RemoveAllBucketNotification`](#RemoveAllBucketNotification) | [`SetS3TransferAccelerate`](#SetS3TransferAccelerate) | +| [`ListObjectsV2`](#ListObjectsV2) | [`RemoveObjects`](#RemoveObjects) | [`FPutEncryptedObject`](#FPutEncryptedObject) | | [`ListenBucketNotification`](#ListenBucketNotification) | | +| [`ListIncompleteUploads`](#ListIncompleteUploads) | [`RemoveIncompleteUpload`](#RemoveIncompleteUpload) | | | | | +| | [`FPutObject`](#FPutObject) | | | | | +| | [`FGetObject`](#FGetObject) | | | | | +| | [`ComposeObject`](#ComposeObject) | | | | | +| | [`NewSourceInfo`](#NewSourceInfo) | | | | | +| | [`NewDestinationInfo`](#NewDestinationInfo) | | | | | +| | [`PutObjectWithContext`](#PutObjectWithContext) | | | | | +| | [`GetObjectWithContext`](#GetObjectWithContext) | | | | | +| | [`FPutObjectWithContext`](#FPutObjectWithContext) | | | | | +| | [`FGetObjectWithContext`](#FGetObjectWithContext) | | | | | ## 1. 构造函数 @@ -1757,17 +1757,6 @@ __示例__ minioClient.SetAppInfo("myCloudApp", "1.0.0") ``` - -### SetCustomTransport(customHTTPTransport http.RoundTripper) -重写默认的HTTP transport，通常用于调试或者添加自定义的TLS证书。 - -__参数__ - -| 参数 | 类型 | 描述 | -|---|---|---| -|`customHTTPTransport` | _http.RoundTripper_ | 自定义的transport，例如：为了调试对API请求响应进行追踪。| - - ### TraceOn(outputStream io.Writer) 开启HTTP tracing。追踪信息输出到io.Writer，如果outputstream为nil，则trace写入到os.Stdout标准输出。