now all apis are generated by api-generated, includes the unrecommanded ones

Author: bachue

storage/bucket.go

@@ -20,6 +20,7 @@ import (
 	"github.com/qiniu/go-sdk/v7/internal/clientv2"
 	"github.com/qiniu/go-sdk/v7/storagev2/apis"
 	"github.com/qiniu/go-sdk/v7/storagev2/apis/batch_ops"
+	"github.com/qiniu/go-sdk/v7/storagev2/apis/get_bucket_domains_v3"
 	"github.com/qiniu/go-sdk/v7/storagev2/backoff"
 	"github.com/qiniu/go-sdk/v7/storagev2/chooser"
 	"github.com/qiniu/go-sdk/v7/storagev2/http_client"
@@ -917,19 +918,31 @@ type DomainInfo struct {
 
 // ListBucketDomains 返回绑定在存储空间中的域名信息
 func (m *BucketManager) ListBucketDomains(bucket string) (info []DomainInfo, err error) {
-	reqURL := fmt.Sprintf("%s/v3/domains?tbl=%s", getUcHost(m.Cfg.UseHTTPS), bucket)
-	c, err := m.getUCClient()
+	toDomainInfo := func(info *get_bucket_domains_v3.DomainInfo) DomainInfo {
+		return DomainInfo{
+			Domain:  info.Domain,
+			Tbl:     info.Bucket,
+			Owner:   int(info.OwnerId),
+			Refresh: info.AutoRefresh,
+			Ctime:   int(info.CreatedTime),
+			Utime:   int(info.UpdatedTime),
+		}
+	}
+	response, err := m.apiClient.GetBucketDomainsV3(
+		context.Background(),
+		&apis.GetBucketDomainsV3Request{
+			BucketName: bucket,
+		},
+		m.makeRequestOptions(),
+	)
 	if err != nil {
-		return
+		return nil, err
 	}
-	err = clientv2.DoAndDecodeJsonResponse(c, clientv2.RequestParams{
-		Context: context.Background(),
-		Method:  clientv2.RequestMethodGet,
-		Url:     reqURL,
-		Header:  nil,
-		GetBody: nil,
-	}, &info)
-	return info, err
+	domainInfos := make([]DomainInfo, 0, len(response.DomainInfos))
+	for _, domainInfo := range response.DomainInfos {
+		domainInfos = append(domainInfos, toDomainInfo(&domainInfo))
+	}
+	return domainInfos, nil
 }
 
 // Prefetch 用来同步镜像空间的资源和镜像源资源内容
@@ -945,52 +958,42 @@ func (m *BucketManager) Prefetch(bucket, key string) error {
 }
 
 // SetImage 用来设置空间镜像源
-func (m *BucketManager) SetImage(siteURL, bucket string) (err error) {
-	reqURL := fmt.Sprintf("%s%s", getUcHost(m.Cfg.UseHTTPS), uriSetImage(siteURL, bucket))
-	c, err := m.getUCClient()
-	if err != nil {
-		return
-	}
-	return clientv2.DoAndDecodeJsonResponse(c, clientv2.RequestParams{
-		Context: context.Background(),
-		Method:  clientv2.RequestMethodPost,
-		Url:     reqURL,
-		Header:  nil,
-		GetBody: nil,
-	}, nil)
+func (m *BucketManager) SetImage(siteURL, bucket string) error {
+	_, err := m.apiClient.SetBucketImage(
+		context.Background(),
+		&apis.SetBucketImageRequest{
+			Bucket: bucket,
+			Url:    siteURL,
+		},
+		m.makeRequestOptions(),
+	)
+	return err
 }
 
 // SetImageWithHost 用来设置空间镜像源，额外添加回源Host头部
-func (m *BucketManager) SetImageWithHost(siteURL, bucket, host string) (err error) {
-	reqURL := fmt.Sprintf("%s%s", getUcHost(m.Cfg.UseHTTPS),
-		uriSetImageWithHost(siteURL, bucket, host))
-	c, err := m.getUCClient()
-	if err != nil {
-		return
-	}
-	return clientv2.DoAndDecodeJsonResponse(c, clientv2.RequestParams{
-		Context: context.Background(),
-		Method:  clientv2.RequestMethodPost,
-		Url:     reqURL,
-		Header:  nil,
-		GetBody: nil,
-	}, nil)
+func (m *BucketManager) SetImageWithHost(siteURL, bucket, host string) error {
+	_, err := m.apiClient.SetBucketImage(
+		context.Background(),
+		&apis.SetBucketImageRequest{
+			Bucket: bucket,
+			Url:    siteURL,
+			Host:   host,
+		},
+		m.makeRequestOptions(),
+	)
+	return err
 }
 
 // UnsetImage 用来取消空间镜像源设置
-func (m *BucketManager) UnsetImage(bucket string) (err error) {
-	reqURL := fmt.Sprintf("%s%s", getUcHost(m.Cfg.UseHTTPS), uriUnsetImage(bucket))
-	c, err := m.getUCClient()
-	if err != nil {
-		return
-	}
-	return clientv2.DoAndDecodeJsonResponse(c, clientv2.RequestParams{
-		Context: context.Background(),
-		Method:  clientv2.RequestMethodPost,
-		Url:     reqURL,
-		Header:  nil,
-		GetBody: nil,
-	}, nil)
+func (m *BucketManager) UnsetImage(bucket string) error {
+	_, err := m.apiClient.UnsetBucketImage(
+		context.Background(),
+		&apis.UnsetBucketImageRequest{
+			Bucket: bucket,
+		},
+		m.makeRequestOptions(),
+	)
+	return err
 }
 
 type AsyncFetchParam struct {
@@ -1254,21 +1257,6 @@ func URIRestoreAr(bucket, key string, afterDay int) string {
 	return fmt.Sprintf("/restoreAr/%s/freezeAfterDays/%d", EncodedEntry(bucket, key), afterDay)
 }
 
-func uriSetImage(siteURL, bucket string) string {
-	return fmt.Sprintf("/image/%s/from/%s", bucket,
-		base64.URLEncoding.EncodeToString([]byte(siteURL)))
-}
-
-func uriSetImageWithHost(siteURL, bucket, host string) string {
-	return fmt.Sprintf("/image/%s/from/%s/host/%s", bucket,
-		base64.URLEncoding.EncodeToString([]byte(siteURL)),
-		base64.URLEncoding.EncodeToString([]byte(host)))
-}
-
-func uriUnsetImage(bucket string) string {
-	return fmt.Sprintf("/unimage/%s", bucket)
-}
-
 // EncodedEntry 生成URL Safe Base64编码的 Entry
 func EncodedEntry(bucket, key string) string {
 	entry := fmt.Sprintf("%s:%s", bucket, key)

storage/region.go

@@ -3,23 +3,14 @@ package storage
 import (
 	"context"
 	"fmt"
-	"net"
-	"net/http"
 	"strings"
-	"time"
 
 	"github.com/qiniu/go-sdk/v7/auth"
-	"github.com/qiniu/go-sdk/v7/client"
 	"github.com/qiniu/go-sdk/v7/internal/clientv2"
-	"github.com/qiniu/go-sdk/v7/internal/hostprovider"
 	"github.com/qiniu/go-sdk/v7/storagev2/apis"
-	"github.com/qiniu/go-sdk/v7/storagev2/backoff"
-	"github.com/qiniu/go-sdk/v7/storagev2/chooser"
 	"github.com/qiniu/go-sdk/v7/storagev2/defaults"
 	"github.com/qiniu/go-sdk/v7/storagev2/http_client"
 	region_v2 "github.com/qiniu/go-sdk/v7/storagev2/region"
-	"github.com/qiniu/go-sdk/v7/storagev2/resolver"
-	"github.com/qiniu/go-sdk/v7/storagev2/retrier"
 )
 
 // 存储所在的地区，例如华东，华南，华北
@@ -286,23 +277,6 @@ func getUcHost(useHttps bool) string {
 	return endpoint(useHttps, host)
 }
 
-// 不带 scheme
-func getUcBackupHosts() []string {
-	var hosts []string
-	if len(UcHost) > 0 {
-		hosts = append(hosts, removeHostScheme(UcHost))
-	}
-
-	for _, host := range ucHosts {
-		if len(host) > 0 {
-			hosts = append(hosts, removeHostScheme(host))
-		}
-	}
-
-	hosts = removeRepeatStringItem(hosts)
-	return hosts
-}
-
 func getUcEndpoint(useHttps bool) region_v2.EndpointsProvider {
 	ucHosts := make([]string, 0, 1+len(ucHosts))
 	if len(UcHost) > 0 {
@@ -371,7 +345,7 @@ func GetRegionsInfoWithOptions(mac *auth.Credentials, options UCApiOptions) ([]R
 		},
 	}).GetRegions(
 		context.Background(),
-		&apis.GetRegionsRequest{},
+		&apis.GetRegionsRequest{Credentials: mac},
 		&apis.Options{OverwrittenBucketHosts: getUcEndpoint(options.UseHttps)},
 	)
 	if err != nil {
@@ -386,109 +360,3 @@ func GetRegionsInfoWithOptions(mac *auth.Credentials, options UCApiOptions) ([]R
 	}
 	return regions, nil
 }
-
-type ucClientConfig struct {
-	// 非 uc query api 需要去除默认域名 defaultApiHost
-	IsUcQueryApi bool
-
-	// 单域名重试次数
-	RetryMax int
-
-	// 主备域名冻结时间（默认：600s），当一个域名请求失败（单个域名会被重试 TryTimes 次），会被冻结一段时间，使用备用域名进行重试，在冻结时间内，域名不能被使用，当一个操作中所有域名竣备冻结操作不在进行重试，返回最后一次操作的错误。
-	HostFreezeDuration time.Duration
-
-	// 域名解析器
-	Resolver resolver.Resolver
-
-	// 域名选择器
-	Chooser chooser.Chooser
-
-	// 退避器
-	Backoff backoff.Backoff
-
-	// 重试器
-	Retrier retrier.Retrier
-
-	// 签名前回调函数
-	BeforeSign func(*http.Request)
-
-	// 签名后回调函数
-	AfterSign func(*http.Request)
-
-	// 签名失败回调函数
-	SignError func(*http.Request, error)
-
-	// 域名解析前回调函数
-	BeforeResolve func(*http.Request)
-
-	// 域名解析后回调函数
-	AfterResolve func(*http.Request, []net.IP)
-
-	// 域名解析错误回调函数
-	ResolveError func(*http.Request, error)
-
-	// 退避前回调函数
-	BeforeBackoff func(*http.Request, *retrier.RetrierOptions, time.Duration)
-
-	// 退避后回调函数
-	AfterBackoff func(*http.Request, *retrier.RetrierOptions, time.Duration)
-
-	// 请求前回调函数
-	BeforeRequest func(*http.Request, *retrier.RetrierOptions)
-
-	// 请求后回调函数
-	AfterResponse func(*http.Request, *http.Response, *retrier.RetrierOptions, error)
-
-	// 自定义客户端
-	Client *client.Client
-}
-
-func getUCClient(config ucClientConfig, mac *auth.Credentials) clientv2.Client {
-	allHosts := getUcBackupHosts()
-	var hosts []string = nil
-	if !config.IsUcQueryApi {
-		// 非 uc query api 去除 defaultApiHost
-		for _, host := range allHosts {
-			if host != defaultApiHost {
-				hosts = append(hosts, host)
-			}
-		}
-	} else {
-		hosts = allHosts
-	}
-
-	is := []clientv2.Interceptor{
-		clientv2.NewHostsRetryInterceptor(clientv2.HostsRetryConfig{
-			RetryMax:           len(hosts),
-			HostFreezeDuration: config.HostFreezeDuration,
-			HostProvider:       hostprovider.NewWithHosts(hosts),
-			Retrier:            config.Retrier,
-		}),
-		clientv2.NewSimpleRetryInterceptor(clientv2.SimpleRetryConfig{
-			RetryMax:      config.RetryMax,
-			Backoff:       config.Backoff,
-			Resolver:      config.Resolver,
-			Chooser:       config.Chooser,
-			Retrier:       config.Retrier,
-			BeforeResolve: config.BeforeResolve,
-			AfterResolve:  config.AfterResolve,
-			ResolveError:  config.ResolveError,
-			BeforeBackoff: config.BeforeBackoff,
-			AfterBackoff:  config.AfterBackoff,
-			BeforeRequest: config.BeforeRequest,
-			AfterResponse: config.AfterResponse,
-		}),
-	}
-
-	if mac != nil {
-		is = append(is, clientv2.NewAuthInterceptor(clientv2.AuthConfig{
-			Credentials: mac,
-			TokenType:   auth.TokenQiniu,
-			BeforeSign:  config.BeforeSign,
-			AfterSign:   config.AfterSign,
-			SignError:   config.SignError,
-		}))
-	}
-
-	return clientv2.NewClient(clientv2.NewClientWithClientV1(config.Client), is...)
-}